diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-20 18:54:08 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-20 18:56:56 -0700 |
commit | 7bc8b1561e044084a37e844bbb5a1b00902c654a (patch) | |
tree | d40315f3805455efe6c665af5e98e0935fe0d986 /pkgs/development/interpreters | |
parent | 728199b8cffd184d1d2bfc4245d604d976476a44 (diff) | |
download | nixlib-7bc8b1561e044084a37e844bbb5a1b00902c654a.tar nixlib-7bc8b1561e044084a37e844bbb5a1b00902c654a.tar.gz nixlib-7bc8b1561e044084a37e844bbb5a1b00902c654a.tar.bz2 nixlib-7bc8b1561e044084a37e844bbb5a1b00902c654a.tar.lz nixlib-7bc8b1561e044084a37e844bbb5a1b00902c654a.tar.xz nixlib-7bc8b1561e044084a37e844bbb5a1b00902c654a.tar.zst nixlib-7bc8b1561e044084a37e844bbb5a1b00902c654a.zip |
bundlerEnv: Use released versions of bundler
We were using HEAD for unreleased features. These features are now in release builds so we should go back to using those. This also means we won't have to deal with hash mismatches for all ruby packages.
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/ruby/bundler-env/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default.nix b/pkgs/development/interpreters/ruby/bundler-env/default.nix index b51a6d49bd3d..762beffd7451 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default.nix @@ -1,5 +1,5 @@ { stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib -, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem , bundler_HEAD +, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, bundler , git }@defs: @@ -18,7 +18,7 @@ let shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; const = x: y: x; - bundler = bundler_HEAD.override { inherit ruby; }; + bundler' = bundler.override { inherit ruby; }; inherit (builtins) attrValues; gemName = attrs: "${attrs.name}-${attrs.version}.gem"; @@ -252,7 +252,7 @@ let buildInputs = [ ruby - bundler + bundler' git ] ++ args.buildInputs or []; @@ -270,7 +270,7 @@ let cp ${purifiedLockfile} $BUNDLE_GEMFILE.lock export NIX_GEM_SOURCES=${sources} - export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath} + export NIX_BUNDLER_GEMPATH=${bundler'}/${ruby.gemPath} export GEM_HOME=$out/${ruby.gemPath} export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME @@ -279,7 +279,7 @@ let ${allBuildFlags} mkdir gems - cp ${bundler}/${bundler.ruby.gemPath}/cache/bundler-*.gem gems + cp ${bundler'}/${ruby.gemPath}/cache/bundler-*.gem gems ${copyGems} ${lib.optionalString (!documentation) '' @@ -304,7 +304,7 @@ let passthru = { inherit ruby; - inherit bundler; + bundler = bundler'; env = let irbrc = builtins.toFile "irbrc" '' @@ -320,7 +320,7 @@ let shellHook = '' export BUNDLE_GEMFILE=${derivation.bundle}/Gemfile export GEM_HOME=${derivation}/${ruby.gemPath} - export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath} + export NIX_BUNDLER_GEMPATH=${bundler'}/${ruby.gemPath} export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME export OLD_IRBRC="$IRBRC" export IRBRC=${irbrc} |