Merge pull request #81442 from manveru/bundler-2.1.4

bundler: 1.17.3 -> 2.1.4

pkgs/applications/audio/tree-from-tags/Gemfile.lock

@@ -10,4 +10,4 @@ DEPENDENCIES
   taglib-ruby
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock

@@ -14,4 +14,4 @@ DEPENDENCIES
   neovim
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/applications/graphics/image_optim/Gemfile.lock

@@ -20,4 +20,4 @@ DEPENDENCIES
   image_optim
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

pkgs/applications/misc/doing/Gemfile.lock

@@ -22,4 +22,4 @@ DEPENDENCIES
   doing (= 1.0.10pre)
 
 BUNDLED WITH
-   1.14.6
+   2.1.4

pkgs/applications/misc/gollum/Gemfile.lock

@@ -110,4 +110,4 @@ DEPENDENCIES
   gollum
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/applications/misc/jekyll/basic/Gemfile.lock

@@ -98,4 +98,4 @@ DEPENDENCIES
   jemoji
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/applications/misc/jekyll/full/Gemfile.lock

@@ -149,4 +149,4 @@ DEPENDENCIES
   yajl-ruby (~> 1.4)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/applications/misc/pt/Gemfile.lock

@@ -66,4 +66,4 @@ DEPENDENCIES
   pt
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock

@@ -18,4 +18,4 @@ DEPENDENCIES
   taskjuggler
 
 BUNDLED WITH
-   1.10.5
+   2.1.4

pkgs/applications/misc/taskjuggler/Gemfile.lock

@@ -18,4 +18,4 @@ DEPENDENCIES
   taskjuggler
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock

@@ -22,4 +22,4 @@ DEPENDENCIES
   terraform_landscape
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock

@@ -10,4 +10,4 @@ DEPENDENCIES
   wayback_machine_downloader!
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/applications/office/ledger-web/Gemfile.lock

@@ -58,4 +58,4 @@ DEPENDENCIES
   ledger_web
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/applications/office/timetrap/Gemfile.lock

@@ -16,4 +16,4 @@ DEPENDENCIES
   timetrap
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock

@@ -24,4 +24,4 @@ DEPENDENCIES
   atlassian-stash
 
 BUNDLED WITH
-   1.13.6
+   2.1.4

pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock

@@ -23,4 +23,4 @@ DEPENDENCIES
   git_fame
 
 BUNDLED WITH
-   1.14.6
+   2.1.4

pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock

@@ -242,4 +242,4 @@ DEPENDENCIES
   webmock (~> 3.4.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock

@@ -1404,4 +1404,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/applications/version-management/redmine/Gemfile.lock

@@ -225,4 +225,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

pkgs/development/compilers/matter-compiler/Gemfile.lock

@@ -10,4 +10,4 @@ DEPENDENCIES
   matter_compiler
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/mobile/cocoapods/Gemfile.lock

@@ -87,4 +87,4 @@ DEPENDENCIES
   cocoapods!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/development/ruby-modules/bundled-common/default.nix

@@ -124,7 +124,7 @@ let
           for i in ${ruby}/bin/*; do
             makeWrapper "$i" $out/bin/$(basename "$i") \
               --set BUNDLE_GEMFILE ${confFiles}/Gemfile \
-              --set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} \
+              --unset BUNDLE_PATH \
               --set BUNDLE_FROZEN 1 \
               --set GEM_HOME ${basicEnv}/${ruby.gemPath} \
               --set GEM_PATH ${basicEnv}/${ruby.gemPath}

pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb

@@ -32,10 +32,12 @@ paths.each do |path|
 #
 
 ENV["BUNDLE_GEMFILE"] = #{gemfile.dump}
-ENV["BUNDLE_PATH"] = #{bundle_path.dump}
+ENV.delete 'BUNDLE_PATH'
 ENV['BUNDLE_FROZEN'] = '1'
 
-$LOAD_PATH.unshift #{bundler_path.dump} + "/lib"
+Gem.paths = { 'GEM_HOME' => #{bundle_path.dump} }
+
+$LOAD_PATH.unshift #{File.join(bundler_path, "/lib").dump}
 
 require 'bundler'
 Bundler.setup(#{groups.map(&:dump).join(', ')})

pkgs/development/ruby-modules/bundler-app/default.nix

@@ -53,7 +53,7 @@ in
     ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)}
     ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " +
                                 "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+
-                                "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+
+                                "--unset BUNDLE_PATH "+
                                 "--set BUNDLE_FROZEN 1 "+
                                 "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+
                                 "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+

pkgs/development/ruby-modules/bundler/default.nix

@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.17.3";
+  version = "2.1.4";
-  source.sha256 = "0ln3gnk7cls81gwsbxvrmlidsfd78s6b2hzlm4d4a9wbaidzfjxw";
+  source.sha256 = "12glbb1357x91fvd004jgkw7ihlkpc9dwr349pd7j83isqhls0ah";
   dontPatchShebangs = true;
 
   postFixup = ''

pkgs/development/ruby-modules/solargraph/Gemfile.lock

@@ -52,4 +52,4 @@ DEPENDENCIES
   solargraph!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/development/tools/build-managers/drake/Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   drake
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/tools/build-managers/rake/Gemfile.lock

@@ -10,4 +10,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/tools/cadre/Gemfile.lock

@@ -16,4 +16,4 @@ DEPENDENCIES
   cadre (= 1.0.4)
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

pkgs/development/tools/cbor-diag/Gemfile.lock

@@ -18,4 +18,4 @@ DEPENDENCIES
   cbor-diag
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/tools/cddl/Gemfile.lock

@@ -27,4 +27,4 @@ DEPENDENCIES
   cddl
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/tools/chefdk/Gemfile.lock

@@ -723,4 +723,4 @@ DEPENDENCIES
   test-kitchen
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/development/tools/compass/Gemfile.lock

@@ -28,4 +28,4 @@ DEPENDENCIES
   compass!
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/tools/corundum/Gemfile.lock

@@ -53,4 +53,4 @@ DEPENDENCIES
   corundum (= 0.6.2)
 
 BUNDLED WITH
-   1.14.4
+   2.1.4

pkgs/development/tools/cucumber/Gemfile.lock

@@ -31,4 +31,4 @@ DEPENDENCIES
   cucumber
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/tools/ejson/Gemfile.lock

@@ -51,4 +51,4 @@ DEPENDENCIES
   ronn
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/tools/github-changelog-generator/Gemfile.lock

@@ -46,4 +46,4 @@ DEPENDENCIES
   github_changelog_generator (= 1.14.3)
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

pkgs/development/tools/jazzy/Gemfile.lock

@@ -100,4 +100,4 @@ DEPENDENCIES
   jazzy
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/development/tools/jsduck/Gemfile.lock

@@ -20,4 +20,4 @@ DEPENDENCIES
   jsduck
 
 BUNDLED WITH
-   1.13.6
+   2.1.4

pkgs/development/tools/misc/mdl/Gemfile.lock

@@ -18,4 +18,4 @@ DEPENDENCIES
   mdl
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

pkgs/development/tools/misc/one_gadget/Gemfile.lock

@@ -14,4 +14,4 @@ DEPENDENCIES
   one_gadget
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/tools/misc/travis/Gemfile.lock

@@ -54,4 +54,4 @@ DEPENDENCIES
   travis
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/development/tools/misc/watson-ruby/Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   watson-ruby
 
 BUNDLED WITH
-   1.14.4
+   2.1.4

pkgs/development/tools/overcommit/Gemfile.lock

@@ -14,4 +14,4 @@ DEPENDENCIES
   overcommit
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/development/tools/pry/Gemfile.lock

@@ -14,4 +14,4 @@ DEPENDENCIES
   pry
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/tools/puppet/puppet-lint/Gemfile.lock

@@ -10,4 +10,4 @@ DEPENDENCIES
   puppet-lint
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

pkgs/development/tools/redis-dump/Gemfile.lock

@@ -18,4 +18,4 @@ DEPENDENCIES
   redis-dump
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/tools/ronn/Gemfile.lock

@@ -16,4 +16,4 @@ DEPENDENCIES
   ronn
 
 BUNDLED WITH
-   1.11.2
+   2.1.4

pkgs/development/tools/rubocop/Gemfile.lock

@@ -24,4 +24,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/development/tools/sass/Gemfile.lock

@@ -18,4 +18,4 @@ DEPENDENCIES
   sass
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/tools/scss-lint/Gemfile.lock

@@ -22,4 +22,4 @@ DEPENDENCIES
   scss_lint
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

pkgs/development/tools/sqlint/Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   sqlint
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/development/tools/xcpretty/Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   1.16.4
+   2.1.4

pkgs/development/web/mailcatcher/Gemfile.lock

@@ -38,4 +38,4 @@ DEPENDENCIES
   mailcatcher
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/servers/http/showoff/Gemfile.lock

@@ -70,4 +70,4 @@ DEPENDENCIES
   showoff
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

pkgs/servers/monitoring/riemann-dash/Gemfile.lock

@@ -35,4 +35,4 @@ DEPENDENCIES
   riemann-dash (= 0.2.14)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/servers/monitoring/sensu/Gemfile.lock

@@ -159,4 +159,4 @@ DEPENDENCIES
   sensu-plugins-systemd
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/admin/fastlane/Gemfile.lock

@@ -156,4 +156,4 @@ DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/admin/oxidized/Gemfile.lock

@@ -77,4 +77,4 @@ DEPENDENCIES
   oxidized-web (= 0.13.1)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/audio/mpdcron/Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   nokogiri
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/backup/lvmsync/Gemfile.lock

@@ -16,4 +16,4 @@ DEPENDENCIES
   lvmsync
 
 BUNDLED WITH
-   1.14.6
+   2.1.4

pkgs/tools/inputmethods/fusuma/Gemfile.lock

@@ -10,4 +10,4 @@ DEPENDENCIES
   fusuma
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/tools/misc/3llo/Gemfile.lock

@@ -24,4 +24,4 @@ DEPENDENCIES
   3llo (= 0.3.0)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/misc/docker-sync/Gemfile.lock

@@ -26,4 +26,4 @@ DEPENDENCIES
   docker-sync!
 
 BUNDLED WITH
-   1.16.2
+   2.1.4

pkgs/tools/misc/fluentd/Gemfile.lock

@@ -129,4 +129,4 @@ DEPENDENCIES
   fluentd
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/misc/homesick/Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   homesick
 
 BUNDLED WITH
-   1.14.6
+   2.1.4

pkgs/tools/misc/html-proofer/Gemfile.lock

@@ -34,4 +34,4 @@ DEPENDENCIES
   html-proofer
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/tools/misc/lolcat/Gemfile.lock

@@ -16,4 +16,4 @@ DEPENDENCIES
   lolcat
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/misc/pws/Gemfile.lock

@@ -16,4 +16,4 @@ DEPENDENCIES
   pws
 
 BUNDLED WITH
-   1.11.2
+   2.1.4

pkgs/tools/misc/riemann-tools/Gemfile.lock

@@ -22,4 +22,4 @@ DEPENDENCIES
   riemann-tools
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/misc/t/Gemfile.lock

@@ -62,4 +62,4 @@ DEPENDENCIES
   twitter (~> 6.1.0)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/misc/td/Gemfile.lock

@@ -37,4 +37,4 @@ DEPENDENCIES
   td
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

pkgs/tools/misc/teamocil/Gemfile.lock

@@ -10,4 +10,4 @@ DEPENDENCIES
   teamocil
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

pkgs/tools/networking/hue-cli/Gemfile.lock

@@ -15,4 +15,4 @@ DEPENDENCIES
   hue-cli
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/networking/maphosts/Gemfile.lock

@@ -16,4 +16,4 @@ DEPENDENCIES
   maphosts
 
 BUNDLED WITH
-   1.12.5
+   2.1.4

pkgs/tools/package-management/elm-github-install/Gemfile.lock

@@ -36,4 +36,4 @@ DEPENDENCIES
   elm_install
 
 BUNDLED WITH
-   1.14.4
+   2.1.4

pkgs/tools/package-management/fpm/Gemfile.lock

@@ -44,4 +44,4 @@ DEPENDENCIES
   fpm
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/security/bundler-audit/Gemfile.lock

@@ -13,4 +13,4 @@ DEPENDENCIES
   bundler-audit
 
 BUNDLED WITH
-   1.14.6
+   2.1.4

pkgs/tools/security/metasploit/Gemfile.lock

@@ -362,4 +362,4 @@ DEPENDENCIES
   metasploit-framework!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/tools/security/wpscan/Gemfile.lock

@@ -56,4 +56,4 @@ DEPENDENCIES
   wpscan
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/tools/system/colorls/Gemfile.lock

@@ -18,4 +18,4 @@ DEPENDENCIES
   colorls
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/system/foreman/Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   foreman
 
 BUNDLED WITH
-   1.11.2
+   2.1.4

pkgs/tools/system/hiera-eyaml/Gemfile.lock

@@ -14,4 +14,4 @@ DEPENDENCIES
   hiera-eyaml
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/system/procodile/Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   procodile
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/system/r10k/Gemfile.lock

@@ -45,4 +45,4 @@ DEPENDENCIES
   r10k
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/tools/text/bcat/Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   bcat
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/text/kramdown-rfc2629/Gemfile.lock

@@ -14,4 +14,4 @@ DEPENDENCIES
   kramdown-rfc2629
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/tools/text/papertrail/Gemfile.lock

@@ -14,4 +14,4 @@ DEPENDENCIES
   papertrail
 
 BUNDLED WITH
-   1.14.4
+   2.1.4

pkgs/tools/text/reckon/Gemfile.lock

@@ -18,4 +18,4 @@ DEPENDENCIES
   reckon
 
 BUNDLED WITH
-   1.12.5
+   2.1.4

pkgs/tools/typesetting/asciidoctor/Gemfile.lock

@@ -93,4 +93,4 @@ DEPENDENCIES
   rouge
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

pkgs/tools/typesetting/docbookrx/Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   nokogiri (~> 1.8.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   kramdown-asciidoc
 
 BUNDLED WITH
-   1.17.3
+   2.1.4