Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5ad94f33519f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2f1eacc949fe
Choose a head ref
  • 4 commits
  • 8 files changed
  • 1 contributor

Commits on Apr 24, 2019

  1. gollum: Update the dependencies (security, CVE-2019-11068) 

    (cherry picked from commit 87cb3b3)
    @primeos
    primeos committed Apr 24, 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
    0672cdd View commit details

  2. jekyll: Update the dependencies (security, CVE-2019-11068) 

    (cherry picked from commit 9d720a9)
    @primeos
    primeos committed Apr 24, 2019
    Copy the full SHA
    f5751bd View commit details

  3. html-proofer: Update the dependencies (security, CVE-2019-11068) 

    (cherry picked from commit e0e5dca)
    @primeos
    primeos committed Apr 24, 2019
    Copy the full SHA
    29d4199 View commit details

  4. Merge pull request #60150 from primeos/security-backports-for-19.03 

    [19.03] Security backports for gollum, jekyll, and html-proofer
    @primeos
    primeos authored Apr 24, 2019
    Copy the full SHA
    2f1eacc View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/gollum/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ GEM
mime-types-data (3.2019.0331)
mini_portile2 (2.4.0)
mustache (0.99.8)
nokogiri (1.10.2)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
posix-spawn (0.3.13)
rack (1.6.11)
@@ -55,7 +55,7 @@ GEM
unf (~> 0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unf_ext (0.0.7.6)
useragent (0.16.10)

PLATFORMS
8 changes: 4 additions & 4 deletions pkgs/applications/misc/gollum/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -151,10 +151,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2";
sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
type = "gem";
};
version = "1.10.2";
version = "1.10.3";
};
posix-spawn = {
groups = ["default"];
@@ -266,10 +266,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf";
type = "gem";
};
version = "0.0.7.5";
version = "0.0.7.6";
};
useragent = {
groups = ["default"];
44 changes: 22 additions & 22 deletions pkgs/applications/misc/jekyll/basic/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.10)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0)
concurrent-ruby (1.1.1)
concurrent-ruby (1.1.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
ffi (1.9.25)
ffi (1.10.0)
forwardable-extended (2.6.0)
gemoji (3.0.0)
html-pipeline (2.8.4)
html-pipeline (2.11.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
@@ -38,42 +38,42 @@ GEM
safe_yaml (~> 1.0)
jekyll-avatar (0.6.0)
jekyll (~> 3.0)
jekyll-mentions (1.4.1)
jekyll-mentions (1.5.1)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.5.0)
jekyll (~> 3.3)
jekyll-sitemap (1.2.0)
jekyll-seo-tag (2.6.0)
jekyll (~> 3.3)
jekyll-watch (2.1.2)
jekyll-sitemap (1.3.1)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
jemoji (0.10.1)
jemoji (0.11.0)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (~> 3.0)
jekyll (>= 3.0, < 5.0)
kramdown (1.17.0)
liquid (4.0.1)
liquid (4.0.3)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.0.3)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-inotify (0.10.0)
ffi (~> 1.0)
rouge (3.3.0)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.6.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -96,4 +96,4 @@ DEPENDENCIES
rouge

BUNDLED WITH
1.16.4
1.17.2
Loading