diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
| commit | 59b5bbeae91109007e36a269a94cccc865dc5175 (patch) | |
| tree | 1ee3d18aedace6d66034ea72fea571d20d8d0fee /pkgs/development/interpreters/ruby/gem_hook.patch | |
| parent | Do not use old stdenv version in faust wrap functions. (-8 alias, -15 unpatch... (diff) | |
| parent | Merge pull request #19675 from edwtjo/dictd-touchup (diff) | |
| download | nixpkgs-origin/security-updates.tar.gz | |
Merge branch master into security-updatesorigin/security-updatesgitlab.intr/security-updates
This merge mostly take the changes made to the master branch.
Some conflict happen in top-level/default.nix due to a reformating of the
code of which is computing the fix-point. This merge fixes these issues by
adding the pkgsIndex argument, needed to re-evaluate the fix-point with
another set of packages, and also re-add the second fix-point made to
support the dependencies.
Diffstat (limited to 'pkgs/development/interpreters/ruby/gem_hook.patch')
| -rw-r--r-- | pkgs/development/interpreters/ruby/gem_hook.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/pkgs/development/interpreters/ruby/gem_hook.patch b/pkgs/development/interpreters/ruby/gem_hook.patch deleted file mode 100644 index 78ff9ddbb1a9..000000000000 --- a/pkgs/development/interpreters/ruby/gem_hook.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/rubygems/lib/rubygems/installer.rb b/rubygems/lib/rubygems/installer.rb -index a88d393..8612901 100644 ---- a/rubygems/lib/rubygems/installer.rb -+++ b/rubygems/lib/rubygems/installer.rb -@@ -766,7 +766,15 @@ TEXT - # Ensures that files can't be installed outside the gem directory. - - def extract_files -- @package.extract_files gem_dir -+ ret = @package.extract_files gem_dir -+ if ENV['NIX_POST_EXTRACT_FILES_HOOK'] -+ puts -+ puts "running NIX_POST_EXTRACT_FILES_HOOK #{ENV['NIX_POST_EXTRACT_FILES_HOOK']} #{gem_dir}" -+ system("#{ENV['NIX_POST_EXTRACT_FILES_HOOK']} #{gem_dir}") -+ puts "running NIX_POST_EXTRACT_FILES_HOOK done" -+ puts -+ end -+ ret - end - - ## |