From ddd1f7b52b1ee8eeb3dd9427aa814e0e1615dbba Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 2 Sep 2013 23:50:19 +0300 Subject: [PATCH] Get rid of old rake derivation that doesn't build --- .../development/ruby-modules/rake/default.nix | 22 ------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 pkgs/development/ruby-modules/rake/default.nix diff --git a/pkgs/development/ruby-modules/rake/default.nix b/pkgs/development/ruby-modules/rake/default.nix deleted file mode 100644 index e1cec53aaa06..000000000000 --- a/pkgs/development/ruby-modules/rake/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, ruby}: - -stdenv.mkDerivation { - name = "rake-0.8.1"; - src = fetchurl { - url = "http://rubyforge.org/frs/download.php/29752/rake-0.8.1.tgz"; - sha256 = "1kggvkkj609hj1xvpadzchki66i7ynz3qq4nc2hmfkf536fx8c03"; - }; - buildInputs = [ruby]; - patchPhase = '' - sed -i install.rb \ - -e 's/$bindir = destdir + $bindir/prefix = CONFIG["prefix"];$bindir = $bindir.slice(prefix.length..$bindir.length);$bindir = destdir + $bindir/' \ - -e 's/$sitedir = destdir + $sitedir/$sitedir = $sitedir.slice(prefix.length..$sitedir.length);$sitedir = destdir + $sitedir/' - ''; - buildPhase = "true"; - installPhase = '' - mkdir -p $out/lib - mkdir -p $out/bin - export DESTDIR=$out - ruby install.rb - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0d79b1aefad..999265a12495 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3206,7 +3206,7 @@ let rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { }); - rake = callPackage ../development/ruby-modules/rake { }; + rake = rubyLibs.rake; rubySqlite3 = callPackage ../development/ruby-modules/sqlite3 { };