summary refs log tree commit diff
path: root/pkgs/development/ruby-modules/bundler-env
diff options
context:
space:
mode:
authorMichael Fellinger <m.fellinger@gmail.com>2016-04-13 11:25:41 +0200
committerMichael Fellinger <m.fellinger@gmail.com>2016-04-13 11:25:41 +0200
commitfe87240e687fec33af3cad3cf36374948a040e5e (patch)
treeec81aa9bc4c99e5ba8f3be4239f7bb5fb752f440 /pkgs/development/ruby-modules/bundler-env
parent551296a1cec0b9751ab96c420a7481e322ea127d (diff)
downloadnixpkgs-fe87240e687fec33af3cad3cf36374948a040e5e.tar
nixpkgs-fe87240e687fec33af3cad3cf36374948a040e5e.tar.gz
nixpkgs-fe87240e687fec33af3cad3cf36374948a040e5e.tar.bz2
nixpkgs-fe87240e687fec33af3cad3cf36374948a040e5e.tar.lz
nixpkgs-fe87240e687fec33af3cad3cf36374948a040e5e.tar.xz
nixpkgs-fe87240e687fec33af3cad3cf36374948a040e5e.tar.zst
nixpkgs-fe87240e687fec33af3cad3cf36374948a040e5e.zip
bundler-env: Gemfile.lock is frozen
Diffstat (limited to 'pkgs/development/ruby-modules/bundler-env')
-rw-r--r--pkgs/development/ruby-modules/bundler-env/default.nix7
-rw-r--r--pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb1
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"])