jazzy: 0.10.0 -> 0.11.0 (#68766)

* gem-config: fix sassc on darwin

By default the sassc gem compiles with LTO, but LTO is currently broken
on darwin.

* jazzy: 0.10.0 -> 0.11.0
This commit is contained in:
Lily Ballard 2019-09-14 03:17:05 -07:00 committed by zimbatm
parent aaf514d322
commit a5d5133e9c
3 changed files with 44 additions and 73 deletions

View File

@ -507,7 +507,10 @@ in
substituteInPlace lib/sassc/native.rb \ substituteInPlace lib/sassc/native.rb \
--replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")' --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")'
''; '';
}; } // (if stdenv.isDarwin then {
# https://github.com/NixOS/nixpkgs/issues/19098
buildFlags = "--disable-lto";
} else {});
scrypt = attrs: scrypt = attrs:
if stdenv.isDarwin then { if stdenv.isDarwin then {

View File

@ -1,18 +1,18 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
CFPropertyList (3.0.0) CFPropertyList (3.0.1)
activesupport (4.2.11.1) activesupport (4.2.11.1)
i18n (~> 0.7) i18n (~> 0.7)
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
atomos (0.1.3) atomos (0.1.3)
claide (1.0.2) claide (1.0.3)
cocoapods (1.7.4) cocoapods (1.7.5)
activesupport (>= 4.0.2, < 5) activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0) claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.4) cocoapods-core (= 1.7.5)
cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0)
@ -28,7 +28,7 @@ GEM
nap (~> 1.0) nap (~> 1.0)
ruby-macho (~> 1.4) ruby-macho (~> 1.4)
xcodeproj (>= 1.10.0, < 2.0) xcodeproj (>= 1.10.0, < 2.0)
cocoapods-core (1.7.4) cocoapods-core (1.7.5)
activesupport (>= 4.0.2, < 6) activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4) fuzzy_match (~> 2.0.4)
nap (~> 1.0) nap (~> 1.0)
@ -38,7 +38,7 @@ GEM
nap nap
cocoapods-search (1.0.0) cocoapods-search (1.0.0)
cocoapods-stats (1.1.0) cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1) cocoapods-trunk (1.4.0)
nap (>= 0.8, < 2.0) nap (>= 0.8, < 2.0)
netrc (~> 0.11) netrc (~> 0.11)
cocoapods-try (1.1.0) cocoapods-try (1.1.0)
@ -51,13 +51,13 @@ GEM
gh_inspector (1.1.3) gh_inspector (1.1.3)
i18n (0.9.5) i18n (0.9.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jazzy (0.10.0) jazzy (0.11.0)
cocoapods (~> 1.5) cocoapods (~> 1.5)
mustache (~> 1.1) mustache (~> 1.1)
open4 open4
redcarpet (~> 3.4) redcarpet (~> 3.4)
rouge (>= 2.0.6, < 4.0) rouge (>= 2.0.6, < 4.0)
sass (~> 3.6) sassc (~> 2.1)
sqlite3 (~> 1.3) sqlite3 (~> 1.3)
xcinvoke (~> 0.3.0) xcinvoke (~> 0.3.0)
liferaft (0.0.6) liferaft (0.0.6)
@ -68,24 +68,18 @@ GEM
nap (1.1.0) nap (1.1.0)
netrc (0.11.0) netrc (0.11.0)
open4 (1.3.4) open4 (1.3.4)
rb-fsevent (0.10.3) redcarpet (3.5.0)
rb-inotify (0.10.0) rouge (3.10.0)
ffi (~> 1.0)
redcarpet (3.4.0)
rouge (3.6.0)
ruby-macho (1.4.0) ruby-macho (1.4.0)
sass (3.7.4) sassc (2.2.0)
sass-listen (~> 4.0.0) ffi (~> 1.9)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sqlite3 (1.4.1) sqlite3 (1.4.1)
thread_safe (0.3.6) thread_safe (0.3.6)
tzinfo (1.2.5) tzinfo (1.2.5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
xcinvoke (0.3.0) xcinvoke (0.3.0)
liferaft (~> 0.0.6) liferaft (~> 0.0.6)
xcodeproj (1.11.0) xcodeproj (1.12.0)
CFPropertyList (>= 2.3.3, < 4.0) CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3) atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0) claide (>= 1.0.2, < 2.0)

View File

@ -25,18 +25,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z"; sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8";
type = "gem"; type = "gem";
}; };
version = "3.0.0"; version = "3.0.1";
}; };
claide = { claide = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
type = "gem"; type = "gem";
}; };
version = "1.0.2"; version = "1.0.3";
}; };
cocoapods = { cocoapods = {
dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
@ -44,10 +46,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc"; sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz";
type = "gem"; type = "gem";
}; };
version = "1.7.4"; version = "1.7.5";
}; };
cocoapods-core = { cocoapods-core = {
dependencies = ["activesupport" "fuzzy_match" "nap"]; dependencies = ["activesupport" "fuzzy_match" "nap"];
@ -55,10 +57,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c"; sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4";
type = "gem"; type = "gem";
}; };
version = "1.7.4"; version = "1.7.5";
}; };
cocoapods-deintegrate = { cocoapods-deintegrate = {
groups = ["default"]; groups = ["default"];
@ -113,10 +115,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1plssgabdv6hcaq1c3gf43kf1d2prx883q8lzdr6chi5byzzs3yl"; sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5";
type = "gem"; type = "gem";
}; };
version = "1.3.1"; version = "1.4.0";
}; };
cocoapods-try = { cocoapods-try = {
source = { source = {
@ -202,15 +204,15 @@
version = "0.9.5"; version = "0.9.5";
}; };
jazzy = { jazzy = {
dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rouge" "sass" "sqlite3" "xcinvoke"]; dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rouge" "sassc" "sqlite3" "xcinvoke"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sljk5v4823h7kzf0yag7f1vf6sahpqip62xngvrhm3il9dx3j72"; sha256 = "0cwsmijhb845lrkwq1gxwa6a698vp47gdxcpav30dghrf1ikyzqm";
type = "gem"; type = "gem";
}; };
version = "0.10.0"; version = "0.11.0";
}; };
liferaft = { liferaft = {
source = { source = {
@ -284,44 +286,25 @@
}; };
version = "1.3.4"; version = "1.3.4";
}; };
rb-fsevent = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
type = "gem";
};
version = "0.10.3";
};
rb-inotify = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
type = "gem";
};
version = "0.10.0";
};
redcarpet = { redcarpet = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
type = "gem"; type = "gem";
}; };
version = "3.4.0"; version = "3.5.0";
}; };
rouge = { rouge = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0bxjfg6bgc6zpczc5nsmpd6406b97fg0hldl968rgxkz1m6hblda"; sha256 = "07j29vbgsi9v7kpx4lqpmh0hx59i420jig73dy46wx3id1i7vdqz";
type = "gem"; type = "gem";
}; };
version = "3.6.0"; version = "3.10.0";
}; };
ruby-macho = { ruby-macho = {
groups = ["default"]; groups = ["default"];
@ -333,25 +316,16 @@
}; };
version = "1.4.0"; version = "1.4.0";
}; };
sass = { sassc = {
dependencies = ["sass-listen"]; dependencies = ["ffi"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; sha256 = "178iflma5z4qk2lfzlxk8kh942skj45q6v6xwllkqng9xbjlyzkf";
type = "gem"; type = "gem";
}; };
version = "3.7.4"; version = "2.2.0";
};
sass-listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
type = "gem";
};
version = "4.0.0";
}; };
sqlite3 = { sqlite3 = {
groups = ["default"]; groups = ["default"];
@ -397,9 +371,9 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j"; sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8";
type = "gem"; type = "gem";
}; };
version = "1.11.0"; version = "1.12.0";
}; };
} }