From 28a18999faeab25b92649027f4411e7f41d793da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 28 Aug 2015 07:42:17 +0200 Subject: [PATCH] ruby: use fetchFromSavannah to enable better availability for proxied users. --- pkgs/development/interpreters/ruby/config.nix | 6 ++++-- pkgs/development/interpreters/ruby/ruby-2.1.0.nix | 4 ++-- pkgs/development/interpreters/ruby/ruby-2.1.1.nix | 4 ++-- pkgs/development/interpreters/ruby/ruby-2.1.2.nix | 4 ++-- pkgs/development/interpreters/ruby/ruby-2.1.3.nix | 4 ++-- pkgs/development/interpreters/ruby/ruby-2.1.6.nix | 4 ++-- pkgs/development/interpreters/ruby/ruby-2.2.0.nix | 4 ++-- pkgs/development/interpreters/ruby/ruby-2.2.2.nix | 4 ++-- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/development/interpreters/ruby/config.nix b/pkgs/development/interpreters/ruby/config.nix index c03c0520d7a..c4f3160d160 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 95ab84eedb8..0fe9daa50e4 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 abd09c0f276..8b2c04e853f 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 8612cd6bd43..2cad52cc56d 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 1ba97daac04..50cc3484730 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 b4600f5c9af..0bf89de1d98 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 e22e64681a3..a29b7466400 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 9e015ce9d7b..df40f674989 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