public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "bundlerEnv: Use released versions of bundler"

Browse Source 
This reverts commit 7bc8b1561e044084a37e844bbb5a1b00902c654a.

This breaks some ruby gems and needs to be reworked again.
This commit is contained in:
William A. Kennington III 2015-09-20 22:05:22 -07:00
parent 700c3c93fb
commit 0a7176c5a1
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/cluster/panamax/api/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler { stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD
, ruby, libxslt, libxml2, sqlite, openssl, docker , ruby, libxslt, libxml2, sqlite, openssl, docker
, dataDir ? "/var/lib/panamax-api" }: , dataDir ? "/var/lib/panamax-api" }:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
lockfile = ./Gemfile.lock; lockfile = ./Gemfile.lock;
buildInputs = [ openssl ]; buildInputs = [ openssl ];
}; };
bundler' = bundler.override { inherit ruby; }; bundler = bundler_HEAD.override { inherit ruby; };
database_yml = builtins.toFile "database.yml" '' database_yml = builtins.toFile "database.yml" ''
production: production:
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
sha256 = "1g75y25asj33gcczpb9iwnk6f7afm1xjqyw803rr3y2h7dm6jivy"; sha256 = "1g75y25asj33gcczpb9iwnk6f7afm1xjqyw803rr3y2h7dm6jivy";
}; };
buildInputs = [ makeWrapper sqlite openssl env.ruby bundler' ]; buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ];
setSourceRoot = '' setSourceRoot = ''
mkdir -p $out/share mkdir -p $out/share

6
pkgs/applications/networking/cluster/panamax/ui/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler { stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD
, ruby, rubygemsFun, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}: , ruby, rubygemsFun, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}:
with stdenv.lib; with stdenv.lib;
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ]; buildInputs = [ openssl ];
}; };
bundler' = bundler.override { inherit ruby; }; bundler = bundler_HEAD.override { inherit ruby; };
src = fetchgit { src = fetchgit {
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
sha256 = "0vwy0gazfx3zkf2bx862jspidgn5p97d3jaq99x38qfhxp554sn9"; sha256 = "0vwy0gazfx3zkf2bx862jspidgn5p97d3jaq99x38qfhxp554sn9";
}; };
buildInputs = [ makeWrapper env.ruby openssl sqlite bundler' ]; buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ];
setSourceRoot = '' setSourceRoot = ''
mkdir -p $out/share mkdir -p $out/share

14
pkgs/development/interpreters/ruby/bundler-env/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib { stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib
, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, bundler , callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem , bundler_HEAD
, git , git
}@defs: }@defs:
@ -18,7 +18,7 @@ let
shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";
const = x: y: x; const = x: y: x;
bundler' = bundler.override { inherit ruby; }; bundler = bundler_HEAD.override { inherit ruby; };
inherit (builtins) attrValues; inherit (builtins) attrValues;
gemName = attrs: "${attrs.name}-${attrs.version}.gem"; gemName = attrs: "${attrs.name}-${attrs.version}.gem";
@ -252,7 +252,7 @@ let
buildInputs = [ buildInputs = [
ruby ruby
bundler' bundler
git git
] ++ args.buildInputs or []; ] ++ args.buildInputs or [];
@ -270,7 +270,7 @@ let
cp ${purifiedLockfile} $BUNDLE_GEMFILE.lock cp ${purifiedLockfile} $BUNDLE_GEMFILE.lock
export NIX_GEM_SOURCES=${sources} 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_HOME=$out/${ruby.gemPath}
export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME
@ -279,7 +279,7 @@ let
${allBuildFlags} ${allBuildFlags}
mkdir gems mkdir gems
cp ${bundler'}/${ruby.gemPath}/cache/bundler-*.gem gems cp ${bundler}/${bundler.ruby.gemPath}/cache/bundler-*.gem gems
${copyGems} ${copyGems}
${lib.optionalString (!documentation) '' ${lib.optionalString (!documentation) ''
@ -304,7 +304,7 @@ let
passthru = { passthru = {
inherit ruby; inherit ruby;
bundler = bundler'; inherit bundler;
env = let env = let
irbrc = builtins.toFile "irbrc" '' irbrc = builtins.toFile "irbrc" ''
@ -320,7 +320,7 @@ let
shellHook = '' shellHook = ''
export BUNDLE_GEMFILE=${derivation.bundle}/Gemfile export BUNDLE_GEMFILE=${derivation.bundle}/Gemfile
export GEM_HOME=${derivation}/${ruby.gemPath} 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 GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME
export OLD_IRBRC="$IRBRC" export OLD_IRBRC="$IRBRC"
export IRBRC=${irbrc} export IRBRC=${irbrc}