diff options
3 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index dcfef83f1bec..55771876fcdd 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD +{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler , ruby, libxslt, libxml2, sqlite, openssl, docker , dataDir ? "/var/lib/panamax-api" }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { lockfile = ./Gemfile.lock; buildInputs = [ openssl ]; }; - bundler = bundler_HEAD.override { inherit ruby; }; + bundler' = bundler.override { inherit ruby; }; database_yml = builtins.toFile "database.yml" '' production: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = "1g75y25asj33gcczpb9iwnk6f7afm1xjqyw803rr3y2h7dm6jivy"; }; - buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ]; + buildInputs = [ makeWrapper sqlite openssl env.ruby bundler' ]; setSourceRoot = '' mkdir -p $out/share diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix index 3dac10613625..08a433c6bdb0 100644 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD +{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler , ruby, rubygemsFun, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}: with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; }; - bundler = bundler_HEAD.override { inherit ruby; }; + bundler' = bundler.override { inherit ruby; }; src = fetchgit { rev = "refs/tags/v${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0vwy0gazfx3zkf2bx862jspidgn5p97d3jaq99x38qfhxp554sn9"; }; - buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ]; + buildInputs = [ makeWrapper env.ruby openssl sqlite bundler' ]; setSourceRoot = '' mkdir -p $out/share 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} |