pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix the new Ruby interpreters (fixes #3509).

Ruby >= 2.1.0 will try to download config.{sub,guess} if not already present.
This provides both files in a pure manner, and also deletes the download script
to prevent any future confusion.

Charles Strahan e38d7cbf eca58fd0

+33 -3
+6
pkgs/development/interpreters/ruby/config.nix
··· 1 + # Ruby >= 2.1.0 tries to download config.{guess,sub} 2 + fetchgit: fetchgit { 3 + url = "git://git.sv.gnu.org/config.git"; 4 + rev = "576c839acca0e082e536fd27568b90a446ce5b96"; 5 + sha256 = "11bjngchjhj0qq0ppp8c37rfw0yhp230nvhs2jvlx15i9qbf56a0"; 6 + }
+9 -1
pkgs/development/interpreters/ruby/ruby-2.1.0.nix
··· 1 - { stdenv, fetchurl, fetchFromGitHub 1 + { stdenv, fetchurl, fetchgit, fetchFromGitHub 2 2 , zlib, zlibSupport ? true 3 3 , openssl, opensslSupport ? true 4 4 , gdbm, gdbmSupport ? true ··· 12 12 op = stdenv.lib.optional; 13 13 ops = stdenv.lib.optionals; 14 14 patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; 15 + config = import ./config.nix fetchgit; 15 16 baseruby = ruby_2_1_0.override { useRailsExpress = false; }; 16 17 in 17 18 ··· 62 63 "${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch" 63 64 "${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch" 64 65 ]; 66 + 67 + # Ruby >= 2.1.0 tries to download config.{guess,sub} 68 + postPatch = '' 69 + rm tool/config_files.rb 70 + cp ${config}/config.guess tool/ 71 + cp ${config}/config.sub tool/ 72 + ''; 65 73 66 74 configureFlags = ["--enable-shared" ] 67 75 ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
+9 -1
pkgs/development/interpreters/ruby/ruby-2.1.1.nix
··· 1 - { stdenv, fetchurl, fetchFromGitHub 1 + { stdenv, fetchurl, fetchgit, fetchFromGitHub 2 2 , zlib, zlibSupport ? true 3 3 , openssl, opensslSupport ? true 4 4 , gdbm, gdbmSupport ? true ··· 12 12 op = stdenv.lib.optional; 13 13 ops = stdenv.lib.optionals; 14 14 patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; 15 + config = import ./config.nix fetchgit; 15 16 baseruby = ruby_2_1_1.override { useRailsExpress = false; }; 16 17 in 17 18 ··· 61 62 "${patchSet}/patches/ruby/2.1.0/railsexpress/10-funny-falcon-method-cache.patch" 62 63 "${patchSet}/patches/ruby/2.1.0/railsexpress/11-backport-r44370.patch" 63 64 ]; 65 + 66 + # Ruby >= 2.1.0 tries to download config.{guess,sub} 67 + postPatch = '' 68 + rm tool/config_files.rb 69 + cp ${config}/config.guess tool/ 70 + cp ${config}/config.sub tool/ 71 + ''; 64 72 65 73 configureFlags = ["--enable-shared" ] 66 74 ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
+9 -1
pkgs/development/interpreters/ruby/ruby-2.1.2.nix
··· 1 - { stdenv, fetchurl, fetchFromGitHub 1 + { stdenv, fetchurl, fetchgit, fetchFromGitHub 2 2 , zlib, zlibSupport ? true 3 3 , openssl, opensslSupport ? true 4 4 , gdbm, gdbmSupport ? true ··· 12 12 op = stdenv.lib.optional; 13 13 ops = stdenv.lib.optionals; 14 14 patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; 15 + config = import ./config.nix fetchgit; 15 16 baseruby = ruby_2_1_2.override { useRailsExpress = false; }; 16 17 in 17 18 ··· 60 61 "${patchSet}/patches/ruby/2.1.2/railsexpress/09-aman-opt-aset-aref-str.patch" 61 62 "${patchSet}/patches/ruby/2.1.2/railsexpress/10-funny-falcon-method-cache.patch" 62 63 ]; 64 + 65 + # Ruby >= 2.1.0 tries to download config.{guess,sub} 66 + postPatch = '' 67 + rm tool/config_files.rb 68 + cp ${config}/config.guess tool/ 69 + cp ${config}/config.sub tool/ 70 + ''; 63 71 64 72 configureFlags = ["--enable-shared" ] 65 73 ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"