From fe87240e687fec33af3cad3cf36374948a040e5e Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Wed, 13 Apr 2016 11:25:41 +0200
Subject: [PATCH] bundler-env: Gemfile.lock is frozen

---
 pkgs/development/ruby-modules/bundler-env/default.nix      | 7 +------
 pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index d5e2154ab3b..597acc25b30 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -40,12 +40,6 @@ let
     mkdir -p $out
     cp ${gemfile} $out/Gemfile
     cp ${lockfile} $out/Gemfile.lock
-
-    cd $out
-    chmod +w Gemfile.lock
-    export GEM_PATH=${bundler}/${ruby.gemPath}
-    ${ruby}/bin/ruby -rubygems -e \
-      "require 'bundler'; Bundler.definition.lock('Gemfile.lock')"
   '';
   envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
   bundlerEnv = buildEnv {
@@ -72,6 +66,7 @@ let
             makeWrapper "$i" $out/bin/$(basename "$i") \
               --set BUNDLE_GEMFILE ${confFiles}/Gemfile \
               --set BUNDLE_PATH ${bundlerEnv}/${ruby.gemPath} \
+              --set BUNDLE_FROZEN 1 \
               --set GEM_HOME ${bundlerEnv}/${ruby.gemPath} \
               --set GEM_PATH ${bundlerEnv}/${ruby.gemPath}
           done
diff --git a/pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb
index fa77682cfd5..8609a863e50 100644
--- a/pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb
+++ b/pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb
@@ -31,6 +31,7 @@ paths.each do |path|
 
 ENV["BUNDLE_GEMFILE"] = "#{gemfile}"
 ENV["BUNDLE_PATH"] = "#{bundle_path}"
+ENV['BUNDLE_FROZEN'] = '1'
 
 Gem.use_paths("#{bundler_gem_path}", ENV["GEM_PATH"])