Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/development/interpreters/ruby/ruby-18.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "0g2dsn8lmiqwqsp13ryzi97qxr7742v5l7v506x6wq9aiwpk42p6";
url = "http://cache.ruby-lang.org/pub/ruby/1.8/${name}.tar.bz2";
sha256 = "b4e34703137f7bfb8761c4ea474f7438d6ccf440b3d35f39cc5e4d4e239c07e3";
};

# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
Expand All @@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
passthru = rec {
majorVersion = "1.8";
minorVersion = "7";
patchLevel = "371";
patchLevel = "374";
libPath = "lib/ruby/${majorVersion}";
gemPath = "lib/ruby/gems/${majorVersion}";
};
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/interpreters/ruby/ruby-19.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
name = "ruby-${version}";

src = fetchurl {
url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2";
sha256 = "0w1avj8qfskvkgvrjxxc1cxjm14bf1v60ipvcl5q3zpn9k14k2cx";
url = "http://cache.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2";
sha256 = "0fdc6e860d0023ba7b94c7a0cf1f7d32908b65b526246de9dfd5bb39d0d7922b";
};

# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
Expand Down Expand Up @@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
passthru = rec {
majorVersion = "1.9";
minorVersion = "3";
patchLevel = "429";
patchLevel = "484";
libPath = "lib/ruby/${majorVersion}";
gemPath = "lib/ruby/gems/${majorVersion}";
};
Expand Down
18 changes: 13 additions & 5 deletions pkgs/development/interpreters/ruby/ruby-2.0.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
name = "ruby-${version}";

src = fetchurl {
url = "ftp://ftp.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2";
sha256 = "0pr9jf01cfap93xcngyd5zpns67ffjsgaxkm0qr1r464rj9d7066";
url = "http://cache.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2";
sha256 = "3de4e4d9aff4682fa4f8ed2b70bd0d746fae17452fc3d3a8e8f505ead9105ad9";
};

# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
Expand All @@ -30,11 +30,19 @@ stdenv.mkDerivation rec {
++ (op zlibSupport zlib)
++ (op opensslSupport openssl)
++ (op gdbmSupport gdbm)
++ (op yamlSupport libyaml);
++ (op yamlSupport libyaml)
# Looks like ruby fails to build on darwin without readline even if curses
# support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're
# running on darwin
++ (op (!cursesSupport && stdenv.isDarwin) readline);

enableParallelBuilding = true;

configureFlags = ["--enable-shared" ];
configureFlags = ["--enable-shared" ]
# on darwin, we have /usr/include/tk.h -- so the configure script detects
# that tk is installed
++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);

installFlags = stdenv.lib.optionalString docSupport "install-doc";
# Bundler tries to create this directory
Expand All @@ -50,7 +58,7 @@ stdenv.mkDerivation rec {
passthru = rec {
majorVersion = "2.0";
minorVersion = "0";
patchLevel = "0";
patchLevel = "353";
libPath = "lib/ruby/${majorVersion}";
gemPath = "lib/ruby/gems/${majorVersion}";
};
Expand Down