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: be3895937636
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: cb08cb4333a8
Choose a head ref
  • 10 commits
  • 11 files changed
  • 6 contributors

Commits on Oct 4, 2018

  1. terraform-providers.matchbox: init at 0.2.2 (#47863) 

    (cherry picked from commit e4f4e9f)
    @flokli @zimbatm
    flokli authored and zimbatm committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    acdlite Andrew Clark
    SSH Key Fingerprint: kMgJy+7AI/mxxpuyx1Qgc7NZY55dREBRubChEAYfi7I
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c02f213 View commit details

  2. nixos-option: fix #47722 when missing ~/.nix-defexpr/channels 

    The problem was that the non-fatal warning was not omitted
from the output when constructing a nix expression.
Now it seems OK for me.  When return code is OK,
the warnings don't get passed anywhere, but I expect
that won't matter for this utility.  Fatal errors are still shown.

(cherry picked from commit de93b32)
    @vcunat
    vcunat committed Oct 4, 2018
    Copy the full SHA
    c78e3b7 View commit details

  3. thunderbird: 60.0 -> 60.2.1 

    (cherry picked from commit d802524)
    @taku0 @andir
    taku0 authored and andir committed Oct 4, 2018
    Copy the full SHA
    5669552 View commit details

  4. thunderbird-bin: 60.0 -> 60.2.1 

    (cherry picked from commit d4de3b2)
    @taku0 @andir
    taku0 authored and andir committed Oct 4, 2018
    Copy the full SHA
    2006323 View commit details

  5. elvish: provide the compiled version 

    Without this fix, `elvish -version` displays "unknown"

(cherry picked from commit 9d49cf1)
    @zimbatm @Mic92
    zimbatm authored and Mic92 committed Oct 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5399898 View commit details

  6. gollum: 4.1.2 -> 4.1.3 

    (cherry picked from commit 265c5fc)
Reason: Security update: "Solves a vulnerability in the File view and
All Pages view that would allow XSS."
    @primeos
    primeos committed Oct 4, 2018
    Copy the full SHA
    69d32c2 View commit details

  7. jekyll: 3.8.3 -> 3.8.4 (security) 

    (cherry picked from commit e8a3591)
Reason: Security update: "fix include bypass of EntryFilter#filter
symlink check".
    @primeos
    primeos committed Oct 4, 2018
    Copy the full SHA
    5ca268d View commit details

  8. gollum: 4.1.3 -> 4.1.4 (security, CVE-2018-3740) 

    (cherry picked from commit 18b468e)
Reason: Security update: "Depend on new version of gollum-lib that
relies on a patched version of sanitize, which solves a vulnerability
(CVE-2018-3740). See gollum/gollum-lib#296."
    @primeos
    primeos committed Oct 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1f96d2f View commit details

  9. Merge pull request #47874 from andir/18.09/thunderbird 

    [18.09] thunderbird:  60.0 -> 60.2.1, thunderbird-bin: 60.0 -> 60.2.1
    @andir
    andir authored Oct 4, 2018
    Copy the full SHA
    7c3459b View commit details

  10. Merge pull request #47884 from primeos/security-backports-for-18.09 

    [18.09] gollum, jekyll (security backports)
    @primeos
    primeos authored Oct 4, 2018
    Copy the full SHA
    cb08cb4 View commit details
4 changes: 2 additions & 2 deletions nixos/modules/installer/tools/nixos-option.sh
View file
Original file line number Diff line number Diff line change
@@ -82,15 +82,15 @@ evalNix(){
set -e

if test $exit_code -eq 0; then
cat <<EOF
sed '/^warning: Nix search path/d' <<EOF
$result
EOF
return 0;
else
sed -n '
/^error/ { s/, at (string):[0-9]*:[0-9]*//; p; };
/^warning: Nix search path/ { p; };
' <<EOF
' >&2 <<EOF
$result
EOF
exit_code=1
46 changes: 27 additions & 19 deletions pkgs/applications/misc/gollum/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,62 @@
GEM
remote: https://rubygems.org/
specs:
charlock_holmes (0.7.3)
charlock_holmes (0.7.6)
diff-lcs (1.3)
gemojione (3.3.0)
json
github-markup (1.6.1)
gitlab-grit (2.8.1)
github-markup (1.7.0)
gitlab-grit (2.8.2)
charlock_holmes (~> 0.6)
diff-lcs (~> 1.1)
mime-types (>= 1.16, < 3)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
gollum (4.1.2)
gollum (4.1.4)
gemojione (~> 3.2)
gollum-lib (>= 4.2.7)
gollum-lib (~> 4.2, >= 4.2.10)
kramdown (~> 1.9.0)
mustache (>= 0.99.5, < 1.0.0)
sinatra (~> 1.4, >= 1.4.4)
useragent (~> 0.16.2)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
gollum-lib (4.2.7)
gollum-lib (4.2.10)
gemojione (~> 3.2)
github-markup (~> 1.6)
gollum-grit_adapter (~> 1.0)
nokogiri (>= 1.6.1, < 2.0)
rouge (~> 2.1)
sanitize (~> 2.1)
sanitize (~> 2.1.1, >= 2.1.1)
stringex (~> 2.6)
twitter-text (= 1.14.7)
json (2.1.0)
kramdown (1.9.0)
mime-types (2.99.3)
mini_portile2 (2.2.0)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mini_portile2 (2.3.0)
mustache (0.99.8)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
posix-spawn (0.3.13)
rack (1.6.8)
rack-protection (1.5.3)
rack (1.6.10)
rack-protection (1.5.5)
rack
rouge (2.1.1)
sanitize (2.1.0)
rouge (2.2.1)
sanitize (2.1.1)
nokogiri (>= 1.4.4)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
stringex (2.7.1)
stringex (2.8.4)
tilt (2.0.8)
useragent (0.16.8)
twitter-text (1.14.7)
unf (~> 0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
useragent (0.16.10)

PLATFORMS
ruby
@@ -57,4 +65,4 @@ DEPENDENCIES
gollum

BUNDLED WITH
1.15.3
1.16.3
1 change: 1 addition & 0 deletions pkgs/applications/misc/gollum/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "gollum";
# nix-shell -p bundix icu zlib
version = (import ./gemset.nix).gollum.version;

nativeBuildInputs = [ makeWrapper ];
93 changes: 64 additions & 29 deletions pkgs/applications/misc/gollum/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@
charlock_holmes = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
type = "gem";
};
version = "0.7.3";
version = "0.7.6";
};
diff-lcs = {
source = {
@@ -27,28 +27,28 @@
github-markup = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq";
sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp";
type = "gem";
};
version = "1.6.1";
version = "1.7.0";
};
gitlab-grit = {
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n";
sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
type = "gem";
};
version = "2.8.1";
version = "2.8.2";
};
gollum = {
dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "051pm2f50daiqcqy87aq4809x4c95iwwml6ca4wgvvmj5zkk6k5a";
sha256 = "0ik1b0f73lcxfwfml1h84dp6br79g0z9v6x54wvl46n9d1ndrhl7";
type = "gem";
};
version = "4.1.2";
version = "4.1.4";
};
gollum-grit_adapter = {
dependencies = ["gitlab-grit"];
@@ -60,13 +60,13 @@
version = "1.0.1";
};
gollum-lib = {
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex" "twitter-text"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq";
sha256 = "1699wiir6f2a8yawk3qg0xn3zdc10mz783v53ri1ivfnzdrm3dvf";
type = "gem";
};
version = "4.2.7";
version = "4.2.10";
};
json = {
source = {
@@ -85,20 +85,29 @@
version = "1.9.0";
};
mime-types = {
dependencies = ["mime-types-data"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9";
sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
type = "gem";
};
version = "2.99.3";
version = "3.2.2";
};
mime-types-data = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
type = "gem";
};
version = "3.2018.0812";
};
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm";
sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
type = "gem";
};
version = "2.2.0";
version = "2.3.0";
};
mustache = {
source = {
@@ -112,10 +121,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn";
sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
type = "gem";
};
version = "1.8.0";
version = "1.8.4";
};
posix-spawn = {
source = {
@@ -128,36 +137,36 @@
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza";
sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q";
type = "gem";
};
version = "1.6.8";
version = "1.6.10";
};
rack-protection = {
dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
type = "gem";
};
version = "1.5.3";
version = "1.5.5";
};
rouge = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wn6rq5qjmcwh9ixkljazv6gmg746rgbgs6av5qnk0mxim5qw11p";
sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs";
type = "gem";
};
version = "2.1.1";
version = "2.2.1";
};
sanitize = {
dependencies = ["nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
sha256 = "12ip1d80r0dgc621qn7c32bk12xxgkkg3w6q21s1ckxivcd7r898";
type = "gem";
};
version = "2.1.0";
version = "2.1.1";
};
sinatra = {
dependencies = ["rack" "rack-protection" "tilt"];
@@ -171,10 +180,10 @@
stringex = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv";
sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
type = "gem";
};
version = "2.7.1";
version = "2.8.4";
};
tilt = {
source = {
@@ -184,12 +193,38 @@
};
version = "2.0.8";
};
twitter-text = {
dependencies = ["unf"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg";
type = "gem";
};
version = "1.14.7";
};
unf = {
dependencies = ["unf_ext"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
type = "gem";
};
version = "0.1.4";
};
unf_ext = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
type = "gem";
};
version = "0.0.7.5";
};
useragent = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1139cjqyv1hk1qcw89k81ajjkqyakqgbcyvmfrsmjqi8yn9kgqhq";
sha256 = "1fv5kvq494swy0p17h9qya9r50w15xsi9zmvhzb8gh55kq6ki50p";
type = "gem";
};
version = "0.16.8";
version = "0.16.10";
};
}
18 changes: 9 additions & 9 deletions pkgs/applications/misc/jekyll/basic/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -17,13 +17,13 @@ GEM
ffi (1.9.25)
forwardable-extended (2.6.0)
gemoji (3.0.0)
html-pipeline (2.8.0)
html-pipeline (2.8.4)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.3)
jekyll (3.8.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -38,7 +38,7 @@ GEM
safe_yaml (~> 1.0)
jekyll-avatar (0.6.0)
jekyll (~> 3.0)
jekyll-mentions (1.4.0)
jekyll-mentions (1.4.1)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-sass-converter (1.5.2)
@@ -49,7 +49,7 @@ GEM
jekyll (~> 3.3)
jekyll-watch (2.0.0)
listen (~> 3.0)
jemoji (0.10.0)
jemoji (0.10.1)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (~> 3.0)
@@ -62,18 +62,18 @@ GEM
mercenary (0.3.6)
mini_portile2 (2.3.0)
minitest (5.11.3)
nokogiri (1.8.2)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (3.0.2)
public_suffix (3.0.3)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (3.1.1)
rouge (3.2.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.5.6)
sass (3.5.7)
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.14.6
1.16.3
32 changes: 16 additions & 16 deletions pkgs/applications/misc/jekyll/basic/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -78,10 +78,10 @@
dependencies = ["activesupport" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad";
type = "gem";
};
version = "2.8.0";
version = "2.8.4";
};
"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 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk";
sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw";
type = "gem";
};
version = "3.8.3";
version = "3.8.4";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -122,10 +122,10 @@
dependencies = ["html-pipeline" "jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb";
sha256 = "0hg1rlra12im62z5yml4rlll3icz1146hkcv98mk2a96fsgniwqf";
type = "gem";
};
version = "1.4.0";
version = "1.4.1";
};
jekyll-sass-converter = {
dependencies = ["sass"];
@@ -167,10 +167,10 @@
dependencies = ["gemoji" "html-pipeline" "jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25";
sha256 = "1yjbgawzmlcppmlhz5sdhjim6ki0vh0vh07mbyf05qa4994ckihs";
type = "gem";
};
version = "0.10.0";
version = "0.10.1";
};
kramdown = {
source = {
@@ -225,10 +225,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
type = "gem";
};
version = "1.8.2";
version = "1.8.4";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -242,10 +242,10 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
version = "3.0.2";
version = "3.0.3";
};
rb-fsevent = {
source = {
@@ -267,10 +267,10 @@
rouge = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3";
sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
type = "gem";
};
version = "3.1.1";
version = "3.2.1";
};
ruby_dep = {
source = {
@@ -292,10 +292,10 @@
dependencies = ["sass-listen"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61";
type = "gem";
};
version = "3.5.6";
version = "3.5.7";
};
sass-listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
32 changes: 16 additions & 16 deletions pkgs/applications/misc/jekyll/full/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -22,19 +22,19 @@ GEM
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
execjs (2.7.0)
faraday (0.15.2)
faraday (0.15.3)
multipart-post (>= 1.2, < 3)
fast-stemmer (1.0.2)
ffi (1.9.25)
forwardable-extended (2.6.0)
gemoji (3.0.0)
html-pipeline (2.8.0)
html-pipeline (2.8.4)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.3)
jekyll (3.8.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -52,15 +52,15 @@ GEM
jekyll-coffeescript (1.1.1)
coffee-script (~> 2.2)
coffee-script-source (~> 1.11.1)
jekyll-feed (0.10.0)
jekyll-feed (0.11.0)
jekyll (~> 3.3)
jekyll-gist (1.5.0)
octokit (~> 4.2)
jekyll-mentions (1.4.0)
jekyll-mentions (1.4.1)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.13.0)
jekyll-redirect-from (0.14.0)
jekyll (~> 3.3)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
@@ -70,7 +70,7 @@ GEM
jekyll (~> 3.3)
jekyll-watch (2.0.0)
listen (~> 3.0)
jemoji (0.10.0)
jemoji (0.10.1)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (~> 3.0)
@@ -83,20 +83,20 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
mime-types (3.1)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mime-types-data (3.2018.0812)
mini_portile2 (2.3.0)
minitest (5.11.3)
multi_json (1.13.1)
multipart-post (2.0.0)
nokogiri (1.8.2)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
octokit (4.9.0)
octokit (4.12.0)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (3.0.2)
public_suffix (3.0.3)
pygments.rb (1.2.1)
multi_json (>= 1.0.0)
rb-fsevent (0.10.3)
@@ -105,10 +105,10 @@ GEM
rdiscount (2.2.0.1)
rdoc (6.0.4)
redcarpet (3.4.0)
rouge (3.1.1)
rouge (3.2.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.5.6)
sass (3.5.7)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -117,7 +117,7 @@ GEM
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
thread_safe (0.3.6)
tomlrb (1.2.6)
tomlrb (1.2.7)
tzinfo (1.2.5)
thread_safe (~> 0.1)
yajl-ruby (1.3.1)
@@ -152,4 +152,4 @@ DEPENDENCIES
yajl-ruby (~> 1.3.1)

BUNDLED WITH
1.14.6
1.16.3
60 changes: 30 additions & 30 deletions pkgs/applications/misc/jekyll/full/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -96,10 +96,10 @@
dependencies = ["multipart-post"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg";
sha256 = "16hwxc8v0z6gkanckjhx0ffgqmzpc4ywz4dfhxpjlz2mbz8d5m52";
type = "gem";
};
version = "0.15.2";
version = "0.15.3";
};
fast-stemmer = {
source = {
@@ -137,10 +137,10 @@
dependencies = ["activesupport" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad";
type = "gem";
};
version = "2.8.0";
version = "2.8.4";
};
"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 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk";
sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw";
type = "gem";
};
version = "3.8.3";
version = "3.8.4";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -190,10 +190,10 @@
dependencies = ["jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l5w2bd6dsjnc623qjw5h06n0wslh32rqkkjlkymga24cplbln8j";
sha256 = "11mlqqbkmddnyh8xfjv5k6v7c73bbi92w7vw4x1c9xvggxrjzicp";
type = "gem";
};
version = "0.10.0";
version = "0.11.0";
};
jekyll-gist = {
dependencies = ["octokit"];
@@ -208,10 +208,10 @@
dependencies = ["html-pipeline" "jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb";
sha256 = "0hg1rlra12im62z5yml4rlll3icz1146hkcv98mk2a96fsgniwqf";
type = "gem";
};
version = "1.4.0";
version = "1.4.1";
};
jekyll-paginate = {
source = {
@@ -225,10 +225,10 @@
dependencies = ["jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1crm5xqgv5asbbbaxfgky4ppib5rih59yzpa3yc94gh8b9cjixrj";
sha256 = "08xfd7fvqcq6skybxsn4d60rqn4ws2y9hkhl71wz9zrc55xhgxa4";
type = "gem";
};
version = "0.13.0";
version = "0.14.0";
};
jekyll-sass-converter = {
dependencies = ["sass"];
@@ -270,10 +270,10 @@
dependencies = ["gemoji" "html-pipeline" "jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25";
sha256 = "1yjbgawzmlcppmlhz5sdhjim6ki0vh0vh07mbyf05qa4994ckihs";
type = "gem";
};
version = "0.10.0";
version = "0.10.1";
};
kramdown = {
source = {
@@ -321,18 +321,18 @@
dependencies = ["mime-types-data"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
type = "gem";
};
version = "3.1";
version = "3.2.2";
};
mime-types-data = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
type = "gem";
};
version = "3.2016.0521";
version = "3.2018.0812";
};
mini_portile2 = {
source = {
@@ -370,19 +370,19 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
type = "gem";
};
version = "1.8.2";
version = "1.8.4";
};
octokit = {
dependencies = ["sawyer"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298";
sha256 = "1lki5vlsiijdmhaqdvr29zmcyvrlmkgi0x92hgan2194l2ikfjlh";
type = "gem";
};
version = "4.9.0";
version = "4.12.0";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -396,10 +396,10 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
version = "3.0.2";
version = "3.0.3";
};
"pygments.rb" = {
dependencies = ["multi_json"];
@@ -454,10 +454,10 @@
rouge = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3";
sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
type = "gem";
};
version = "3.1.1";
version = "3.2.1";
};
ruby_dep = {
source = {
@@ -479,10 +479,10 @@
dependencies = ["sass-listen"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61";
type = "gem";
};
version = "3.5.6";
version = "3.5.7";
};
sass-listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@@ -513,10 +513,10 @@
tomlrb = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "09gh67v8s1pr7c37490sjp782gi4wf9k9cadp4l926h1sp27bcgz";
sha256 = "1x3bg9mmma1gsl5j5kc9m8m77w6qwcq6ix2d0kwi5rcwpr7siyx6";
type = "gem";
};
version = "1.2.6";
version = "1.2.7";
};
tzinfo = {
dependencies = ["thread_safe"];
7 changes: 7 additions & 0 deletions pkgs/applications/networking/cluster/terraform-providers/data.nix
View file
Original file line number Diff line number Diff line change
@@ -609,6 +609,13 @@
version = "1.8.1";
sha256 = "0y6n7mvv1f3jqsxlvf68iq85k69fj7a333203vkvc83dba84aqki";
};
matchbox =
{
owner = "coreos";
repo = "terraform-provider-matchbox";
version = "0.2.2";
sha256 = "07lzslbl41i3h84bpsmxhvchm5kqk87yzin2yvpbq0m3m7r2f547";
};
nixos =
{
owner = "tweag";
3 changes: 3 additions & 0 deletions pkgs/applications/networking/cluster/terraform-providers/providers.txt
View file
Original file line number Diff line number Diff line change
@@ -9,5 +9,8 @@
# include all terraform-providers
terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\)

# include terraform-provider-matchbox
coreos/terraform-provider-matchbox

# include terraform-provider-nixos
tweag/terraform-provider-nixos
4 changes: 4 additions & 0 deletions pkgs/shells/elvish/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ buildGoPackage rec {

goPackagePath = "github.com/elves/elvish";
excludedPackages = [ "website" ];
buildFlagsArray = ''
-ldflags=
-X ${goPackagePath}/buildinfo.Version=${version}
'';

src = fetchFromGitHub {
repo = "elvish";