diff options
author | Edward Tjörnhammar <ed@cflags.cc> | 2015-08-28 07:42:17 +0200 |
---|---|---|
committer | Edward Tjörnhammar <ed@cflags.cc> | 2015-08-28 07:45:49 +0200 |
commit | 28a18999faeab25b92649027f4411e7f41d793da (patch) | |
tree | 927eedfc222ab0e815e3ebd10d65728e3428d340 | |
parent | 0d54f0de59734b07e81b03cf592c6aba602690cf (diff) |
ruby: use fetchFromSavannah to enable better availability for proxied users.
8 files changed, 18 insertions, 16 deletions
diff --git a/pkgs/development/interpreters/ruby/config.nix b/pkgs/development/interpreters/ruby/config.nix index c03c0520d7ae..c4f3160d1602 100644 --- a/pkgs/development/interpreters/ruby/config.nix +++ b/pkgs/development/interpreters/ruby/config.nix @@ -1,6 +1,8 @@ # Ruby >= 2.1.0 tries to download config.{guess,sub} -fetchgit: fetchgit { - url = "git://git.sv.gnu.org/config.git"; +{ fetchFromSavannah }: + +fetchFromSavannah { + repo = "config"; rev = "576c839acca0e082e536fd27568b90a446ce5b96"; sha256 = "11bjngchjhj0qq0ppp8c37rfw0yhp230nvhs2jvlx15i9qbf56a0"; } diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix index 95ab84eedb8e..0fe9daa50e4d 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -13,7 +13,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_1_0.override { useRailsExpress = false; }; in diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix index abd09c0f2768..8b2c04e853f8 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -13,7 +13,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_1_1.override { useRailsExpress = false; }; in diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix index 8612cd6bd439..2cad52cc56d2 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -13,7 +13,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_1_2.override { useRailsExpress = false; }; in diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix index 1ba97daac04f..50cc3484730d 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -13,7 +13,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_1_3.override { useRailsExpress = false; }; in diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.6.nix b/pkgs/development/interpreters/ruby/ruby-2.1.6.nix index b4600f5c9aff..0bf89de1d98c 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.6.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -14,7 +14,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_1_6.override { useRailsExpress = false; }; in diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix index e22e64681a3a..a29b74664001 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -14,7 +14,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_2_0.override { useRailsExpress = false; }; in diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix index 9e015ce9d7b6..df40f674989e 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -14,7 +14,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_2_2.override { useRailsExpress = false; }; in |