aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/development/ruby-modules
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/ruby-modules')
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/bundix/default.nix2
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix2
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb6
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix2
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/bundler/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock28
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix2
-rw-r--r--nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix83
8 files changed, 91 insertions, 38 deletions
diff --git a/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix
index 353adbcea6f..34114ad9a4f 100644
--- a/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix
@@ -36,7 +36,7 @@ buildRubyGem rec {
The output is then usable by the bundlerEnv derivation to list all the
dependencies of a ruby package.
'';
- homepage = https://github.com/manveru/bundix;
+ homepage = "https://github.com/manveru/bundix";
license = "MIT";
maintainers = with lib.maintainers; [ manveru qyliss zimbatm ];
platforms = lib.platforms.all;
diff --git a/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix
index 66f33f6e31f..65416d9295b 100644
--- a/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/nixpkgs/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}
diff --git a/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
index add5db56d1d..2bf9d84caa0 100644
--- a/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
+++ b/nixpkgs/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(', ')})
diff --git a/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix
index 2fa70664323..0859f08c2f7 100644
--- a/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/nixpkgs/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} "+
diff --git a/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix
index 6190b4210cd..fc2733de3f0 100644
--- a/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "bundler";
- version = "1.17.3";
- source.sha256 = "0ln3gnk7cls81gwsbxvrmlidsfd78s6b2hzlm4d4a9wbaidzfjxw";
+ version = "2.1.4";
+ source.sha256 = "12glbb1357x91fvd004jgkw7ihlkpc9dwr349pd7j83isqhls0ah";
dontPatchShebangs = true;
postFixup = ''
diff --git a/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index c2e4840eab0..d9438a79956 100644
--- a/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -3,41 +3,47 @@ GEM
specs:
ast (2.4.0)
backport (1.1.2)
+ benchmark (0.1.0)
+ e2mmap (0.1.0)
jaro_winkler (1.5.4)
maruku (0.7.3)
mini_portile2 (2.4.0)
- nokogiri (1.10.5)
+ nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
parallel (1.19.1)
- parser (2.6.5.0)
+ parser (2.7.0.5)
ast (~> 2.4.0)
rainbow (3.0.0)
- reverse_markdown (1.3.0)
+ reverse_markdown (1.4.0)
nokogiri
- rubocop (0.77.0)
+ rexml (3.2.4)
+ rubocop (0.80.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
- parser (>= 2.6)
+ parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
+ rexml
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-progressbar (1.10.1)
- solargraph (0.38.0)
+ solargraph (0.38.6)
backport (~> 1.1)
+ benchmark
bundler (>= 1.17.2)
+ e2mmap
jaro_winkler (~> 1.5)
maruku (~> 0.7, >= 0.7.3)
nokogiri (~> 1.9, >= 1.9.1)
parser (~> 2.3)
reverse_markdown (~> 1.0, >= 1.0.5)
rubocop (~> 0.52)
- thor (~> 0.19, >= 0.19.4)
+ thor (~> 1.0)
tilt (~> 2.0)
yard (~> 0.9)
- thor (0.20.3)
+ thor (1.0.1)
tilt (2.0.10)
- unicode-display_width (1.6.0)
- yard (0.9.20)
+ unicode-display_width (1.6.1)
+ yard (0.9.24)
PLATFORMS
ruby
@@ -46,4 +52,4 @@ DEPENDENCIES
solargraph!
BUNDLED WITH
- 1.17.3
+ 2.1.4
diff --git a/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix b/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix
index ff9b1bac321..60c1aee5a00 100644
--- a/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix
@@ -9,7 +9,7 @@ bundlerApp {
meta = with lib; {
description = "IDE tools for the Ruby language";
- homepage = http://www.github.com/castwide/solargraph;
+ homepage = "http://www.github.com/castwide/solargraph";
license = licenses.mit;
maintainers = with maintainers; [ worldofpeace nicknovitski angristan ];
platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix b/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix
index e1ea15fb4e1..a6ec78b7458 100644
--- a/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -1,5 +1,6 @@
{
ast = {
+ dependencies = [];
groups = ["default"];
platforms = [];
source = {
@@ -10,6 +11,7 @@
version = "2.4.0";
};
backport = {
+ dependencies = [];
groups = ["default"];
platforms = [];
source = {
@@ -19,7 +21,30 @@
};
version = "1.1.2";
};
+ benchmark = {
+ dependencies = [];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jadlpsl504ql436a6bx8ihp0bkg3rvxg7fbi4r1bmra3cqz0h88";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ e2mmap = {
+ dependencies = [];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
jaro_winkler = {
+ dependencies = [];
groups = ["default"];
platforms = [];
source = {
@@ -30,6 +55,7 @@
version = "1.5.4";
};
maruku = {
+ dependencies = [];
groups = ["default"];
platforms = [];
source = {
@@ -40,6 +66,7 @@
version = "0.7.3";
};
mini_portile2 = {
+ dependencies = [];
groups = ["default"];
platforms = [];
source = {
@@ -55,12 +82,13 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
+ sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
type = "gem";
};
- version = "1.10.5";
+ version = "1.10.9";
};
parallel = {
+ dependencies = [];
groups = ["default"];
platforms = [];
source = {
@@ -76,12 +104,13 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw";
+ sha256 = "0iirjc36irgwpfb58jdf9gli382cj893y9caqhxas8anpzzlikgc";
type = "gem";
};
- version = "2.6.5.0";
+ version = "2.7.0.5";
};
rainbow = {
+ dependencies = [];
groups = ["default"];
platforms = [];
source = {
@@ -97,23 +126,35 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zb9n227b5s4cg942sc0g3n1bdx9fpcvq5m6w7ap0yc116ivv5w2";
+ sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ rexml = {
+ dependencies = [];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
type = "gem";
};
- version = "1.3.0";
+ version = "3.2.4";
};
rubocop = {
- dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
+ dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m88b1bgbhmmbdnz2xv6n0il0j4q5qm9jbc0vf1zsaxmxqp06nx9";
+ sha256 = "1i8pw7p4dk11xpahs0j6vlvqlv3rgapaccj933g0i34hbx392lj8";
type = "gem";
};
- version = "0.77.0";
+ version = "0.80.1";
};
ruby-progressbar = {
+ dependencies = [];
groups = ["default"];
platforms = [];
source = {
@@ -124,27 +165,29 @@
version = "1.10.1";
};
solargraph = {
- dependencies = ["backport" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
+ dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pdqpxvjj6r6gzrz9rmxfg85cmfjs4y2lyq8p5qfg3kfpqx4rhpw";
+ sha256 = "06kcqm032sq1y4pgg7cl32hv74573b1vsy79x81zglar80ybgzv4";
type = "gem";
};
- version = "0.38.0";
+ version = "0.38.6";
};
thor = {
+ dependencies = [];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+ sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
type = "gem";
};
- version = "0.20.3";
+ version = "1.0.1";
};
tilt = {
+ dependencies = [];
groups = ["default"];
platforms = [];
source = {
@@ -155,23 +198,25 @@
version = "2.0.10";
};
unicode-display_width = {
+ dependencies = [];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
+ sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x";
type = "gem";
};
- version = "1.6.0";
+ version = "1.6.1";
};
yard = {
+ dependencies = [];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny";
+ sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp";
type = "gem";
};
- version = "0.9.20";
+ version = "0.9.24";
};
-} \ No newline at end of file
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 21:49:00 +0000