summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorCharles Strahan <charles.c.strahan@gmail.com>2014-12-30 21:05:00 -0500
committerCharles Strahan <charles.c.strahan@gmail.com>2014-12-30 21:05:00 -0500
commit94dd4b97211d413e80735c4f3e228187202c4564 (patch)
treea84604359d2f7f92b85d3010c159c904c3f27d31 /pkgs/development
parent74a4f01fe4f9d0fe982181e9b2a932824b6d50b3 (diff)
downloadnixpkgs-94dd4b97211d413e80735c4f3e228187202c4564.tar
nixpkgs-94dd4b97211d413e80735c4f3e228187202c4564.tar.gz
nixpkgs-94dd4b97211d413e80735c4f3e228187202c4564.tar.bz2
nixpkgs-94dd4b97211d413e80735c4f3e228187202c4564.tar.lz
nixpkgs-94dd4b97211d413e80735c4f3e228187202c4564.tar.xz
nixpkgs-94dd4b97211d413e80735c4f3e228187202c4564.tar.zst
nixpkgs-94dd4b97211d413e80735c4f3e228187202c4564.zip
ruby: WIP
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/interpreters/ruby/bundler-head.nix18
-rw-r--r--pkgs/development/interpreters/ruby/bundler.nix12
-rw-r--r--pkgs/development/libraries/xapian/bindings/1.0.x.nix1
-rw-r--r--pkgs/development/libraries/xapian/bindings/default.nix1
4 files changed, 27 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
new file mode 100644
index 00000000000..62169759bf5
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -0,0 +1,18 @@
+{ buildRubyGem, coreutils, fetchgit }:
+
+buildRubyGem {
+  name = "bundler-HEAD";
+  src = fetchgit {
+    url = "https://github.com/bundler/bundler.git";
+    rev = "17919e790cd8f6fb369d6afc81f0afec6fb5ad8b";
+    sha256 = "10gqashaax0i18gs95pijqsnpnwfj9v3va5rpxps0v597d16px9b";
+    leaveDotGit = true;
+  };
+  dontPatchShebangs = true;
+  postInstall = ''
+    find $out -type f -perm +0100 | while read f; do
+      substituteInPlace $f \
+         --replace "/usr/bin/env" "${coreutils}/bin/env"
+    done
+  '';
+}
diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/interpreters/ruby/bundler.nix
index a66aa08c1f5..cbec8d0ad75 100644
--- a/pkgs/development/interpreters/ruby/bundler.nix
+++ b/pkgs/development/interpreters/ruby/bundler.nix
@@ -1,7 +1,13 @@
-{ buildRubyGem }:
+{ buildRubyGem, coreutils }:
 
 buildRubyGem {
-  name = "bundler-1.7.4";
-  sha256 = "122k07z60780mr00zfbbw04v9xlw1fhxjsx4g2rbm66hxlnlnh89";
+  name = "bundler-1.7.9";
+  sha256 = "1gd201rh17xykab9pbqp0dkxfm7b9jri02llyvmrc0c5bz2vhycm";
   dontPatchShebangs = true;
+  postInstall = ''
+    find $out -type f -perm +0100 | while read f; do
+      substituteInPlace $f \
+         --replace "/usr/bin/env" "${coreutils}/bin/env"
+    done
+  '';
 }
diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix
index 2d44542e8fd..5d69f73d797 100644
--- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix
+++ b/pkgs/development/libraries/xapian/bindings/1.0.x.nix
@@ -42,7 +42,6 @@ composableDerivation.composableDerivation {} rec {
            name = "ruby";
            enable = {
              buildInputs = [ ruby ];
-             # export same env vars as in rubyPackages 
              preConfigure = ''
                export RUBY_LIB=$out/${ruby.libPath}
                export RUBY_LIB_ARCH=$RUBY_LIB
diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix
index 8c1a4069748..740b71c59a7 100644
--- a/pkgs/development/libraries/xapian/bindings/default.nix
+++ b/pkgs/development/libraries/xapian/bindings/default.nix
@@ -42,7 +42,6 @@ composableDerivation.composableDerivation {} rec {
            name = "ruby";
            enable = {
              buildInputs = [ ruby ];
-             # export same env vars as in rubyPackages 
              preConfigure = ''
                export RUBY_LIB=$out/${ruby.libPath}
                export RUBY_LIB_ARCH=$RUBY_LIB