Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5dd330ef0ea6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 05f8b1f5bb9a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 28, 2019

  1. solargraph: 0.35.2 -> 0.37.2

    @azuzunaga
    azuzunaga committed Oct 28, 2019
    Copy the full SHA
    58311d9 View commit details

  2. Merge pull request #72131 from azuzunaga/solargraph/update/0.37.2 

    solargraph: 0.35.2 -> 0.37.2
    @mmahut
    mmahut authored Oct 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    05f8b1f View commit details
Showing with 24 additions and 35 deletions.
  1. +8 −9 pkgs/development/ruby-modules/solargraph/Gemfile.lock
  2. +16 −26 pkgs/development/ruby-modules/solargraph/gemset.nix
17 changes: 8 additions & 9 deletions pkgs/development/ruby-modules/solargraph/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -5,38 +5,37 @@ GEM
backport (1.1.2)
htmlentities (4.3.4)
jaro_winkler (1.5.3)
kramdown (1.17.0)
mini_portile2 (2.4.0)
nokogiri (1.10.3)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
parallel (1.17.0)
parser (2.6.3.0)
parallel (1.18.0)
parser (2.6.5.0)
ast (~> 2.4.0)
rainbow (3.0.0)
reverse_markdown (1.1.0)
reverse_markdown (1.3.0)
nokogiri
rubocop (0.74.0)
rubocop (0.75.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-progressbar (1.10.1)
solargraph (0.35.2)
solargraph (0.37.2)
backport (~> 1.1)
bundler (>= 1.17.2)
htmlentities (~> 4.3, >= 4.3.4)
jaro_winkler (~> 1.5)
kramdown (~> 1.16)
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)
tilt (~> 2.0)
yard (~> 0.9)
thor (0.20.3)
tilt (2.0.9)
tilt (2.0.10)
unicode-display_width (1.6.0)
yard (0.9.20)

42 changes: 16 additions & 26 deletions pkgs/development/ruby-modules/solargraph/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -39,16 +39,6 @@
};
version = "1.5.3";
};
kramdown = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
type = "gem";
};
version = "1.17.0";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
@@ -65,31 +55,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
type = "gem";
};
version = "1.10.3";
version = "1.10.4";
};
parallel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
sha256 = "091p5zrzzyg3fg48jhdz9lzjf2r9r3akra2cd46yd4nza3xgxshz";
type = "gem";
};
version = "1.17.0";
version = "1.18.0";
};
parser = {
dependencies = ["ast"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn";
sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw";
type = "gem";
};
version = "2.6.3.0";
version = "2.6.5.0";
};
rainbow = {
groups = ["default"];
@@ -107,21 +97,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w7y5n74daajvl9gixr91nh8670d7mkgspkk3ql71m8azq3nffbg";
sha256 = "1zb9n227b5s4cg942sc0g3n1bdx9fpcvq5m6w7ap0yc116ivv5w2";
type = "gem";
};
version = "1.1.0";
version = "1.3.0";
};
rubocop = {
dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk";
sha256 = "0s5q1i7776yklkcwwx6ibm2mwnjky6wv7rpa3xhn8448854is31n";
type = "gem";
};
version = "0.74.0";
version = "0.75.1";
};
ruby-progressbar = {
groups = ["default"];
@@ -134,15 +124,15 @@
version = "1.10.1";
};
solargraph = {
dependencies = ["backport" "htmlentities" "jaro_winkler" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
dependencies = ["backport" "htmlentities" "jaro_winkler" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1r0a7nfb0cwg2d7awbmvzk14594w7vkx844sshl9jpzkjx1asa9n";
sha256 = "0w20g68i6djc2vyx3awzvn15brdfpcwbna27r0903h5djcmnr8a0";
type = "gem";
};
version = "0.35.2";
version = "0.37.2";
};
thor = {
groups = ["default"];
@@ -159,10 +149,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
type = "gem";
};
version = "2.0.9";
version = "2.0.10";
};
unicode-display_width = {
groups = ["default"];
@@ -184,4 +174,4 @@
};
version = "0.9.20";
};
}
}