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: c93d1760a928
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2f97911566ef
Choose a head ref
  • 14 commits
  • 27 files changed
  • 2 contributors

Commits on Nov 6, 2018

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5b2da1a View commit details
  2. Copy the full SHA
    9f750d9 View commit details
  3. Copy the full SHA
    3c7bbb5 View commit details
  4. Copy the full SHA
    63e5658 View commit details
  5. Copy the full SHA
    96f23c4 View commit details
  6. Copy the full SHA
    f2d0e18 View commit details
  7. Copy the full SHA
    26bf4b3 View commit details
  8. Copy the full SHA
    5c8d153 View commit details
  9. Copy the full SHA
    b593166 View commit details
  10. Copy the full SHA
    e2d72ed View commit details
  11. Copy the full SHA
    df68cd5 View commit details
  12. Copy the full SHA
    652e599 View commit details

Commits on Nov 9, 2018

  1. metasploit-framework: fix build

    > /nix/store/r2vsi140pys7jnzyk0qz1fj9aji6sq40-ruby2.5.3-rb-readline-0.5.5/lib/ruby/gems/2.5.0/gems/rb-readline-0.5.5/lib/rbreadline.rb:1097:in `<module:RbReadline>': HOME environment variable (or HOMEDRIVE and HOMEPATH) must be set and point to a directory (RuntimeError)
    Mic92 authored and alyssais committed Nov 9, 2018
    Copy the full SHA
    d45590b View commit details
  2. Merge pull request #49817 from alyssais/rack_cve

    rack: 1.6.* -> 1.6.11, 2.0.* -> 2.0.6 (CVE-2018-16470, CVE-2018-16471)
    Mic92 authored Nov 9, 2018
    Copy the full SHA
    2f97911 View commit details
Showing with 188 additions and 55 deletions.
  1. +2 −2 pkgs/applications/misc/gollum/Gemfile.lock
  2. +2 −2 pkgs/applications/misc/gollum/gemset.nix
  3. +3 −3 pkgs/applications/office/ledger-web/Gemfile.lock
  4. +10 −2 pkgs/applications/office/ledger-web/gemset.nix
  5. +1 −1 pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
  6. +2 −2 pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
  7. +1 −1 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
  8. +2 −2 pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
  9. +2 −2 pkgs/applications/version-management/redmine/Gemfile.lock
  10. +2 −2 pkgs/applications/version-management/redmine/gemset.nix
  11. +6 −0 pkgs/development/ruby-modules/gem-config/default.nix
  12. +2 −2 pkgs/development/tools/chefdk/Gemfile.lock
  13. +2 −2 pkgs/development/tools/chefdk/gemset.nix
  14. +2 −2 pkgs/development/web/mailcatcher/Gemfile.lock
  15. +9 −2 pkgs/development/web/mailcatcher/gemset.nix
  16. +2 −2 pkgs/servers/monitoring/riemann-dash/Gemfile.lock
  17. +4 −2 pkgs/servers/monitoring/riemann-dash/gemset.nix
  18. +1 −1 pkgs/servers/web-apps/frab/Gemfile.lock
  19. +69 −3 pkgs/servers/web-apps/frab/gemset.nix
  20. +2 −2 pkgs/tools/admin/oxidized/Gemfile.lock
  21. +3 −3 pkgs/tools/admin/oxidized/gemset.nix
  22. +2 −2 pkgs/tools/security/metasploit/Gemfile.lock
  23. +49 −3 pkgs/tools/security/metasploit/gemset.nix
  24. +2 −2 pkgs/tools/text/bcat/Gemfile.lock
  25. +2 −2 pkgs/tools/text/bcat/gemset.nix
  26. +2 −2 pkgs/tools/typesetting/asciidoctor/Gemfile.lock
  27. +2 −4 pkgs/tools/typesetting/asciidoctor/gemset.nix
4 changes: 2 additions & 2 deletions pkgs/applications/misc/gollum/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ GEM
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
posix-spawn (0.3.13)
rack (1.6.10)
rack (1.6.11)
rack-protection (1.5.5)
rack
rouge (2.2.1)
@@ -65,4 +65,4 @@ DEPENDENCIES
gollum

BUNDLED WITH
1.16.3
1.16.4
4 changes: 2 additions & 2 deletions pkgs/applications/misc/gollum/gemset.nix
Original file line number Diff line number Diff line change
@@ -137,10 +137,10 @@
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q";
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
type = "gem";
};
version = "1.6.10";
version = "1.6.11";
};
rack-protection = {
dependencies = ["rack"];
6 changes: 3 additions & 3 deletions pkgs/applications/office/ledger-web/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ GEM
sinatra-session
multi_json (1.12.1)
pg (0.18.4)
rack (1.6.4)
rack (1.6.11)
rack-protection (1.5.3)
rack
rack-test (0.6.3)
@@ -55,7 +55,7 @@ PLATFORMS
ruby

DEPENDENCIES
ledger_web (= 1.5.2)
ledger_web

BUNDLED WITH
1.12.5
1.16.4
12 changes: 10 additions & 2 deletions pkgs/applications/office/ledger-web/gemset.nix
Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@
version = "1.5.1";
};
ledger_web = {
dependencies = ["database_cleaner" "directory_watcher" "pg" "rack" "rspec" "sequel" "sinatra" "sinatra-contrib" "sinatra-session"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i4vagaiyayymlr41rsy4lg2cl1r011ib0ql9dgjadfy6imb4kqh";
@@ -58,10 +59,10 @@
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
type = "gem";
};
version = "1.6.4";
version = "1.6.11";
};
rack-protection = {
dependencies = ["rack"];
@@ -82,6 +83,7 @@
version = "0.6.3";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s";
@@ -90,6 +92,7 @@
version = "3.5.0";
};
rspec-core = {
dependencies = ["rspec-support"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12yndf7y6g3s1306bv1aycsmd0gjy5m172spdhx54svca2fcpzy1";
@@ -98,6 +101,7 @@
version = "3.5.2";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs";
@@ -106,6 +110,7 @@
version = "3.5.0";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24";
@@ -130,6 +135,7 @@
version = "4.37.0";
};
sinatra = {
dependencies = ["rack" "rack-protection" "tilt"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp";
@@ -138,6 +144,7 @@
version = "1.4.7";
};
sinatra-contrib = {
dependencies = ["backports" "multi_json" "rack-protection" "rack-test" "sinatra" "tilt"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vi3i0icbi2figiayxpvxbqpbn1syma7w4p4zw5mav1ln4c7jnfr";
@@ -146,6 +153,7 @@
version = "1.4.7";
};
sinatra-session = {
dependencies = ["sinatra"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "183xl8i4d2hc03afd1i52gwn2xi3vzrv02g22llhfy5wkmm44gmq";
Original file line number Diff line number Diff line change
@@ -630,7 +630,7 @@ GEM
pry (>= 0.10.4)
public_suffix (3.0.3)
pyu-ruby-sasl (0.0.3.3)
rack (1.6.10)
rack (1.6.11)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (4.4.1)
Original file line number Diff line number Diff line change
@@ -2320,10 +2320,10 @@
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q";
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
type = "gem";
};
version = "1.6.10";
version = "1.6.11";
};
rack-accept = {
dependencies = ["rack"];
Original file line number Diff line number Diff line change
@@ -659,7 +659,7 @@ GEM
pry (>= 0.10.4)
public_suffix (3.0.3)
pyu-ruby-sasl (0.0.3.3)
rack (1.6.10)
rack (1.6.11)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (4.4.1)
Original file line number Diff line number Diff line change
@@ -2441,10 +2441,10 @@
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q";
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
type = "gem";
};
version = "1.6.10";
version = "1.6.11";
};
rack-accept = {
dependencies = ["rack"];
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/redmine/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ GEM
protected_attributes (1.1.4)
activemodel (>= 4.0.1, < 5.0)
public_suffix (3.0.3)
rack (1.6.10)
rack (1.6.11)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
@@ -201,4 +201,4 @@ DEPENDENCIES
yard

BUNDLED WITH
1.16.3
1.16.4
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/redmine/gemset.nix
Original file line number Diff line number Diff line change
@@ -350,10 +350,10 @@
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q";
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
type = "gem";
};
version = "1.6.10";
version = "1.6.11";
};
rack-openid = {
dependencies = ["rack" "ruby-openid"];
6 changes: 6 additions & 0 deletions pkgs/development/ruby-modules/gem-config/default.nix
Original file line number Diff line number Diff line change
@@ -230,6 +230,12 @@ in
'';
};

metasploit-framework = attrs: {
preInstall = ''
export HOME=$TMPDIR
'';
};

msgpack = attrs: {
buildInputs = [ msgpack ];
};
4 changes: 2 additions & 2 deletions pkgs/development/tools/chefdk/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -252,7 +252,7 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.1)
rack (2.0.3)
rack (2.0.6)
rainbow (2.2.2)
rake
rake (12.3.0)
@@ -397,4 +397,4 @@ DEPENDENCIES
test-kitchen

BUNDLED WITH
1.14.6
1.16.4
4 changes: 2 additions & 2 deletions pkgs/development/tools/chefdk/gemset.nix
Original file line number Diff line number Diff line change
@@ -791,10 +791,10 @@
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kczgp2zwcrvp257dl8j4y3mnyqflxr7rn4vl9w1rwblznx9n74c";
sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
type = "gem";
};
version = "2.0.3";
version = "2.0.6";
};
rainbow = {
dependencies = ["rake"];
4 changes: 2 additions & 2 deletions pkgs/development/web/mailcatcher/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
rack (1.6.8)
rack (1.6.11)
rack-protection (1.5.3)
rack
sinatra (1.4.8)
@@ -40,4 +40,4 @@ DEPENDENCIES
mailcatcher

BUNDLED WITH
1.14.4
1.16.4
11 changes: 9 additions & 2 deletions pkgs/development/web/mailcatcher/gemset.nix
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
version = "1.0.9.1";
};
mail = {
dependencies = ["mime-types"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9";
@@ -24,6 +25,7 @@
version = "2.6.6";
};
mailcatcher = {
dependencies = ["eventmachine" "mail" "rack" "sinatra" "skinny" "sqlite3" "thin"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h6gk8n18i5f651f244al1hscjzl27fpma4vqw0qhszqqpd5p3bx";
@@ -32,6 +34,7 @@
version = "0.6.5";
};
mime-types = {
dependencies = ["mime-types-data"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
@@ -50,12 +53,13 @@
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza";
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
type = "gem";
};
version = "1.6.8";
version = "1.6.11";
};
rack-protection = {
dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
@@ -64,6 +68,7 @@
version = "1.5.3";
};
sinatra = {
dependencies = ["rack" "rack-protection" "tilt"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
@@ -72,6 +77,7 @@
version = "1.4.8";
};
skinny = {
dependencies = ["eventmachine" "thin"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y3yvx88ylgz4d2s1wskjk5rkmrcr15q3ibzp1q88qwzr5y493a9";
@@ -88,6 +94,7 @@
version = "1.3.13";
};
thin = {
dependencies = ["daemons" "eventmachine" "rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga";
4 changes: 2 additions & 2 deletions pkgs/servers/monitoring/riemann-dash/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ GEM
specs:
erubis (2.7.0)
multi_json (1.3.6)
rack (1.6.4)
rack (1.6.11)
rack-protection (1.5.3)
rack
riemann-dash (0.2.12)
@@ -27,4 +27,4 @@ DEPENDENCIES
riemann-dash (= 0.2.12)

BUNDLED WITH
1.11.2
1.16.4
6 changes: 4 additions & 2 deletions pkgs/servers/monitoring/riemann-dash/gemset.nix
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
type = "gem";
};
version = "1.6.4";
version = "1.6.11";
};
rack-protection = {
dependencies = ["rack"];
@@ -30,6 +30,7 @@
version = "1.5.3";
};
riemann-dash = {
dependencies = ["erubis" "multi_json" "sass" "sinatra" "webrick"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y2vh9vcl21b6k2wqgz1y8bbcrl07r43s6q2vkgp35z1b28xcszy";
@@ -46,6 +47,7 @@
version = "3.4.22";
};
sinatra = {
dependencies = ["rack" "rack-protection" "tilt"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp";
2 changes: 1 addition & 1 deletion pkgs/servers/web-apps/frab/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -181,7 +181,7 @@ GEM
pry-rails (0.3.4)
pry (>= 0.9.10)
puma (3.9.1)
rack (1.6.4)
rack (1.6.11)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.7.1)
Loading