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: 8dc1ffb22fc2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60855a7c19d6
Choose a head ref
  • 3 commits
  • 8 files changed
  • 1 contributor

Commits on Feb 28, 2020

  1. gollum: Update the dependencies (security, CVE-2020-7595) 

    This updates nokogiri to 1.10.8 for CVE-2020-7595 [0].

[0]: sparklemotion/nokogiri#1992

(cherry picked from commit a0d61c0)
    @primeos
    primeos committed Feb 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    81a208a View commit details

  2. jekyll: Update the dependencies (security, CVE-2020-7595) 

    This updates nokogiri to 1.10.8 for CVE-2020-7595 [0].

[0]: sparklemotion/nokogiri#1992

(cherry picked from commit 9b0defc)
    @primeos
    primeos committed Feb 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    31b4a68 View commit details

  3. html-proofer: Update the dependencies (security, CVE-2020-7595) 

    This updates nokogiri to 1.10.8 for CVE-2020-7595 [0].

[0]: sparklemotion/nokogiri#1992

(cherry picked from commit ad0c620)
    @primeos
    primeos committed Feb 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    60855a7 View commit details
14 changes: 6 additions & 8 deletions pkgs/applications/misc/gollum/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -6,10 +6,10 @@ GEM
gemojione (3.3.0)
json
github-markup (1.7.0)
gitlab-grit (2.8.2)
charlock_holmes (~> 0.6)
gitlab-grit (2.8.3)
charlock_holmes (~> 0.7)
diff-lcs (~> 1.1)
mime-types (>= 1.16)
mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3)
gollum (4.1.4)
gemojione (~> 3.2)
@@ -31,15 +31,13 @@ GEM
twitter-text (= 1.14.7)
json (2.3.0)
kramdown (1.9.0)
mime-types (3.3)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mime-types (2.99.3)
mini_portile2 (2.4.0)
mustache (0.99.8)
nokogiri (1.10.7)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
posix-spawn (0.3.13)
rack (1.6.12)
rack (1.6.13)
rack-protection (1.5.5)
rack
rouge (2.2.1)
27 changes: 8 additions & 19 deletions pkgs/applications/misc/gollum/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -46,10 +46,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
sha256 = "0xvcizc4856xlvara1zzwl6j61vxxshzcrdagp58xzfl68vbi63p";
type = "gem";
};
version = "2.8.2";
version = "2.8.3";
};
gollum = {
dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"];
@@ -105,25 +105,14 @@
version = "1.9.0";
};
mime-types = {
dependencies = ["mime-types-data"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g7l18igjb9z7q4b2ykvyxyvjxlx5pwsmx5z3ibdbr6372xgfglk";
sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9";
type = "gem";
};
version = "3.3";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh";
type = "gem";
};
version = "3.2019.1009";
version = "2.99.3";
};
mini_portile2 = {
groups = ["default"];
@@ -151,10 +140,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln";
sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
type = "gem";
};
version = "1.10.7";
version = "1.10.8";
};
posix-spawn = {
groups = ["default"];
@@ -171,10 +160,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1riq0z408dwvqcqrpq05bp2w879l4sjxzb4cbrbx55kpi6h2g1cj";
sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0";
type = "gem";
};
version = "1.6.12";
version = "1.6.13";
};
rack-protection = {
dependencies = ["rack"];
32 changes: 16 additions & 16 deletions pkgs/applications/misc/jekyll/basic/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.1)
activesupport (6.0.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -10,19 +10,19 @@ GEM
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
colorator (1.1.0)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
ffi (1.11.2)
ffi (1.12.2)
forwardable-extended (2.6.0)
gemoji (3.0.1)
html-pipeline (2.12.2)
html-pipeline (2.12.3)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (1.7.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
jekyll (4.0.0)
addressable (~> 2.4)
@@ -44,11 +44,11 @@ GEM
jekyll-mentions (1.5.1)
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (2.0.1)
jekyll-sass-converter (2.1.0)
sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.6.1)
jekyll (>= 3.3, < 5.0)
jekyll-sitemap (1.3.1)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
@@ -60,31 +60,31 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.2.0)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.4.0)
minitest (5.13.0)
nokogiri (1.10.5)
minitest (5.14.0)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.1)
public_suffix (4.0.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
rouge (3.13.0)
rouge (3.16.0)
safe_yaml (1.0.5)
sassc (2.2.1)
ffi (~> 1.9)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
tzinfo (1.2.5)
tzinfo (1.2.6)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
zeitwerk (2.2.1)
unicode-display_width (1.6.1)
zeitwerk (2.2.2)

PLATFORMS
ruby
64 changes: 32 additions & 32 deletions pkgs/applications/misc/jekyll/basic/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "190xv21yz03zz8nlfly557ir859jr5zkwi89naziy65hskdnkw1s";
sha256 = "1dd6gh66ffdbhsxv33rxxsiciqyhhkm69l1yqspwdj2brvh1jzl1";
type = "gem";
};
version = "6.0.1";
version = "6.0.2.1";
};
addressable = {
dependencies = ["public_suffix"];
@@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
type = "gem";
};
version = "1.1.5";
version = "1.1.6";
};
em-websocket = {
dependencies = ["eventmachine" "http_parser.rb"];
@@ -67,10 +67,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cbads5da12lb3j0mg2hjrd57s5qkkairxh2y6r9bqyblb5b8xbw";
sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
type = "gem";
};
version = "1.11.2";
version = "1.12.2";
};
forwardable-extended = {
groups = ["default"];
@@ -98,10 +98,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19hc7njr029pzqljpfhzhdi0p2rgn8ihn3bdnai2apy6nj1g1sg2";
sha256 = "1x5i330yks7pb1jxcbm9n6gslkgaqhyvl13d0cqxmxzkcajvb7z4";
type = "gem";
};
version = "2.12.2";
version = "2.12.3";
};
"http_parser.rb" = {
groups = ["default"];
@@ -119,10 +119,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hmypvx9iyc0b4hski7aic2xzm09cg1c7q1qlpnk3k8s5acxzyhl";
sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm";
type = "gem";
};
version = "1.7.0";
version = "1.8.2";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@@ -163,10 +163,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xjzqpp35qr2vnf2zpak0srn773mp21glcq81a0iqpnrva7h80m3";
sha256 = "04ncr44wrilz26ayqwlg7379yjnkb29mvx4j04i62b7czmdrc9dv";
type = "gem";
};
version = "2.0.1";
version = "2.1.0";
};
jekyll-seo-tag = {
dependencies = ["jekyll"];
@@ -185,10 +185,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d3wqvbn37b24ag31xchb5hhnwfl6fnw6pyzp434jggbssxy0a5m";
sha256 = "0622rwsn5i0m5xcyzdn86l68wgydqwji03lqixdfm1f1xdfqrq0d";
type = "gem";
};
version = "1.3.1";
version = "1.4.0";
};
jekyll-watch = {
dependencies = ["listen"];
@@ -249,10 +249,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j3s7bprp2jfhgb959wd1h98978zg3207nl87yg8k5w7k08f7snb";
sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi";
type = "gem";
};
version = "3.2.0";
version = "3.2.1";
};
mercenary = {
groups = ["default"];
@@ -279,21 +279,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi";
sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
type = "gem";
};
version = "5.13.0";
version = "5.14.0";
};
nokogiri = {
dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
type = "gem";
};
version = "1.10.5";
version = "1.10.8";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -311,10 +311,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7";
type = "gem";
};
version = "4.0.1";
version = "4.0.3";
};
rb-fsevent = {
groups = ["default"];
@@ -332,20 +332,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
type = "gem";
};
version = "0.10.0";
version = "0.10.1";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y90nx9ph9adnrpcsvs2adca2l3dyz8am2d2kzxkwd3a086ji7aw";
sha256 = "1ivsvkwdxl44q4xl8bnf6kqmvy47n98akcvlfmhaz0614zlf4bxi";
type = "gem";
};
version = "3.13.0";
version = "3.16.0";
};
safe_yaml = {
groups = ["default"];
@@ -395,29 +395,29 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
type = "gem";
};
version = "1.2.5";
version = "1.2.6";
};
unicode-display_width = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x";
type = "gem";
};
version = "1.6.0";
version = "1.6.1";
};
zeitwerk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w7w7y4jr6pcbgnzmh113fh8wz0f00xixl7qvf2rpvnanb68d5gw";
sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1";
type = "gem";
};
version = "2.2.1";
version = "2.2.2";
};
}
Loading