Skip to content

Commit

Permalink
Merge pull request #12 from sagittaros/bundler-setup-check
Browse files Browse the repository at this point in the history
We need GEM_HOME for git sources
  • Loading branch information
inscapist authored Feb 21, 2023
2 parents c3a5fa0 + ff4c0aa commit ce2b0e6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
5 changes: 2 additions & 3 deletions modules/ruby-env/ruby-env.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,12 @@ let
nativeBuildInputs = [ makeBinaryWrapper ];
dontUnpack = true;

# setting this makes life somewhat more difficult for developers
# set GEM_HOME ${rubyEnv}/${ruby.gemPath}
buildPhase = ''
mkdir -p $out/bin
for i in ${ruby}/bin/*; do
makeWrapper "$i" $out/bin/$(basename "$i") \
--set GEM_PATH ${rubyEnv}/${ruby.gemPath}
--set GEM_PATH ${rubyEnv}/${ruby.gemPath} \
--set GEM_HOME ${rubyEnv}/${ruby.gemPath}
done
'';

Expand Down
12 changes: 6 additions & 6 deletions tests/tiny_app/gemset.nix
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,12 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5";
target = "ruby";
type = "gem";
};
targets = [];
version = "1.1.10";
version = "1.2.0";
};
crass = {
groups = ["default"];
Expand Down Expand Up @@ -262,12 +262,12 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj";
sha256 = "040bxzfd7mz1p6z4bc9vk5yrf762hdllvf98hmk848fq28xc5dsk";
target = "ruby";
type = "gem";
};
targets = [];
version = "1.0.0";
version = "1.0.1";
};
i18n = {
dependencies = ["concurrent-ruby"];
Expand Down Expand Up @@ -525,12 +525,12 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14xjykbmngjhb4p02b7yghf0gqgqjfpi6i028x9g6q6xs782ci3j";
sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb";
target = "ruby";
type = "gem";
};
targets = [];
version = "2.2.5";
version = "2.2.6.2";
};
rack-test = {
dependencies = ["rack"];
Expand Down

0 comments on commit ce2b0e6

Please sign in to comment.