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: 41f3ceded84f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 05e93475f39b
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on May 19, 2018

  1. jekyll: 3.8.1 -> 3.8.2

    @primeos
    primeos committed May 19, 2018
    Copy the full SHA
    05e9347 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/misc/jekyll/basic/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -13,17 +13,17 @@ GEM
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.6)
eventmachine (1.2.7)
ffi (1.9.23)
forwardable-extended (2.6.0)
gemoji (3.0.0)
html-pipeline (2.7.2)
html-pipeline (2.8.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.1)
jekyll (3.8.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
12 changes: 6 additions & 6 deletions pkgs/applications/misc/jekyll/basic/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -45,10 +45,10 @@
eventmachine = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0";
sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
type = "gem";
};
version = "1.2.6";
version = "1.2.7";
};
ffi = {
source = {
@@ -78,10 +78,10 @@
dependencies = ["activesupport" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp";
sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
type = "gem";
};
version = "2.7.2";
version = "2.8.0";
};
"http_parser.rb" = {
source = {
@@ -104,10 +104,10 @@
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6";
sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8";
type = "gem";
};
version = "3.8.1";
version = "3.8.2";
};
jekyll-avatar = {
dependencies = ["jekyll"];
12 changes: 6 additions & 6 deletions pkgs/applications/misc/jekyll/full/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -20,21 +20,21 @@ GEM
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.6)
eventmachine (1.2.7)
execjs (2.7.0)
faraday (0.15.0)
faraday (0.15.1)
multipart-post (>= 1.2, < 3)
fast-stemmer (1.0.2)
ffi (1.9.23)
forwardable-extended (2.6.0)
gemoji (3.0.0)
html-pipeline (2.7.2)
html-pipeline (2.8.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.1)
jekyll (3.8.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -92,7 +92,7 @@ GEM
multipart-post (2.0.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
octokit (4.8.0)
octokit (4.9.0)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
@@ -103,7 +103,7 @@ GEM
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdiscount (2.2.0.1)
rdoc (6.0.3)
rdoc (6.0.4)
redcarpet (3.4.0)
rouge (3.1.1)
ruby_dep (1.5.0)
24 changes: 12 additions & 12 deletions pkgs/applications/misc/jekyll/full/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -79,10 +79,10 @@
eventmachine = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0";
sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
type = "gem";
};
version = "1.2.6";
version = "1.2.7";
};
execjs = {
source = {
@@ -96,10 +96,10 @@
dependencies = ["multipart-post"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dv1vcxxyw4vy0r2diiml0r8zqk1csrksfxv8nkrw61xlf2daaaa";
sha256 = "0q3z6mm6ym11jrzi1hqcwi0mkydb5m980g8is6ggkcxrinmx2nxx";
type = "gem";
};
version = "0.15.0";
version = "0.15.1";
};
fast-stemmer = {
source = {
@@ -137,10 +137,10 @@
dependencies = ["activesupport" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp";
sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
type = "gem";
};
version = "2.7.2";
version = "2.8.0";
};
"http_parser.rb" = {
source = {
@@ -163,10 +163,10 @@
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6";
sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8";
type = "gem";
};
version = "3.8.1";
version = "3.8.2";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -379,10 +379,10 @@
dependencies = ["sawyer"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg";
sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298";
type = "gem";
};
version = "4.8.0";
version = "4.9.0";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -438,10 +438,10 @@
rdoc = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ia6gq4fnwkm29j34yncg74w0nq5iyyrcjjhmkwzmzw9dbs0zy8a";
sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7";
type = "gem";
};
version = "6.0.3";
version = "6.0.4";
};
redcarpet = {
source = {