From b42be7312db3bdc079b9969e58033be3670672b8 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 30 Aug 2018 14:56:09 +0200 Subject: [PATCH] asciidoctor: 1.5.6.2 -> 1.5.7.1 --- .../typesetting/asciidoctor/Gemfile.lock | 10 +- .../tools/typesetting/asciidoctor/default.nix | 2 +- pkgs/tools/typesetting/asciidoctor/gemset.nix | 104 ++++++++++++++++-- 3 files changed, 99 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 6c52a2c416a1..04f9029e6e5a 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -5,7 +5,7 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) afm (0.2.2) - asciidoctor (1.5.6.2) + asciidoctor (1.5.7.1) asciidoctor-bespoke (1.0.0.alpha.1) asciidoctor (>= 1.5.0) slim (~> 3.0.6) @@ -36,7 +36,7 @@ GEM addressable hashery (2.1.2) htmlentities (4.3.4) - i18n (1.0.0) + i18n (1.1.0) concurrent-ruby (~> 1.0) json (2.1.0) mathematical (1.6.11) @@ -66,10 +66,10 @@ GEM prawn-templates (0.1.1) pdf-reader (~> 2.0) prawn (~> 2.2) - public_suffix (3.0.2) + public_suffix (3.0.3) pygments.rb (1.2.1) multi_json (>= 1.0.0) - rack (2.0.4) + rack (2.0.5) ruby-enum (0.7.2) i18n ruby-rc4 (0.1.5) @@ -79,7 +79,7 @@ GEM tilt (>= 1.3.3, < 2.1) source_map (3.0.1) json - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) temple (0.8.0) diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 1f6a7054b9e3..7001b6e36423 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -37,7 +37,7 @@ bundlerApp { # For some reason 'mathematical.so' is missing cairo and glib in its RPATH, add them explicitly here postFixup = lib.optionalString stdenv.isLinux '' - soPath="$out/lib/ruby/gems/2.4.0/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so" + soPath="$out/${ruby.gemPath}/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so" ${patchelf}/bin/patchelf \ --set-rpath "${lib.makeLibraryPath [ glib cairo ]}:$(${patchelf}/bin/patchelf --print-rpath "$soPath")" \ "$soPath" diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index 4ae146d289ba..8b960fa3d930 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -1,6 +1,8 @@ { addressable = { dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; @@ -9,6 +11,8 @@ version = "2.5.2"; }; afm = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "06kj9hgd0z8pj27bxp2diwqh6fv7qhwwm17z64rhdc4sfn76jgn8"; @@ -17,6 +21,8 @@ version = "0.2.2"; }; Ascii85 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0658m37jjjn6drzqg1gk4p6c205mgp7g1jh2d00n4ngghgmz5qvs"; @@ -25,15 +31,19 @@ version = "1.0.3"; }; asciidoctor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zq3az4836nxkc8g5wnnbzmarw7663s1ky6gf8pc04sfpa8n2l3f"; + sha256 = "0v52bzc72cvg7zfgq27pa4mgyf29dx9m20fghrw1xmvwgd519n1w"; type = "gem"; }; - version = "1.5.6.2"; + version = "1.5.7.1"; }; asciidoctor-bespoke = { dependencies = ["asciidoctor" "slim" "thread_safe"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1awy933sswxvi2hxpll3rh9phxcvmqhrbb91m6ibjchnf7qsl3zk"; @@ -43,6 +53,8 @@ }; asciidoctor-diagram = { dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0rj02i00d9hkzqzzrk5al9rn8yv5x0wsnrv9y6j4k8rfylm69c1r"; @@ -52,6 +64,8 @@ }; asciidoctor-latex = { dependencies = ["asciidoctor" "htmlentities" "opal"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "02qvn1ngp4s9y22vk23zzssd4w1bpyk84akjwiq6nqn8im6s4awz"; @@ -61,6 +75,8 @@ }; asciidoctor-mathematical = { dependencies = ["asciidoctor" "mathematical" "ruby-enum"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "18igbvs70dnlrzgl62jcc0vfxhlb4r7v9bq3qf1v80l17lvq1x8f"; @@ -70,6 +86,8 @@ }; asciidoctor-pdf = { dependencies = ["asciidoctor" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1899c071hfmzqg9822v7rg8y8iqlfy3dhpfy32ignzap6cajlsqg"; @@ -78,6 +96,8 @@ version = "1.5.0.alpha.16"; }; coderay = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; @@ -86,6 +106,8 @@ version = "1.1.2"; }; concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; @@ -95,6 +117,8 @@ }; css_parser = { dependencies = ["addressable"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61"; @@ -103,6 +127,8 @@ version = "1.6.0"; }; hashery = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qj8815bf7q6q7llm5rzdz279gzmpqmqqicxnzv066a020iwqffj"; @@ -111,6 +137,8 @@ version = "2.1.2"; }; htmlentities = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; @@ -120,14 +148,18 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "191c2xzlvn42sb8dz6gjy0qaigri4chfvflg3d4k6n58flm0yp65"; + sha256 = "0ppvmla21hssvrfm8g1n2fnb4lxn4yhy9qmmba0imanflgldrjmr"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; @@ -137,6 +169,8 @@ }; mathematical = { dependencies = ["ruby-enum"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "06xkr613hmzbhmm6zv92zlcjyfp0a6i2b3q3hg24lmj4j5l85p21"; @@ -145,6 +179,8 @@ version = "1.6.11"; }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; @@ -154,6 +190,8 @@ }; opal = { dependencies = ["source_map" "sprockets"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0dmdxhmg43ibd4bsldssslsz8870hzknwcxiv9l1838lh6hd390k"; @@ -162,6 +200,8 @@ version = "0.6.3"; }; pdf-core = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "19llwch2wfg51glb0kff0drfp3n6nb9vim4zlvzckxysksvxpby1"; @@ -171,6 +211,8 @@ }; pdf-reader = { dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1b3ig4wpcgdbqa7yw0ahwbmikkkywn2a22bfmrknl5ls7g066x45"; @@ -179,6 +221,8 @@ version = "2.1.0"; }; polyglot = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; @@ -188,6 +232,8 @@ }; prawn = { dependencies = ["pdf-core" "ttfunk"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1qdjf1v6sfl44g3rqxlg8k4jrzkwaxgvh2l4xws97a8f3xv4na4m"; @@ -197,6 +243,8 @@ }; prawn-icon = { dependencies = ["prawn"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pz8n7ajkfmflw05dib2l9qkzkfzwwbzx63qcvjr14k1dnbpx7qk"; @@ -206,6 +254,8 @@ }; prawn-svg = { dependencies = ["css_parser" "prawn"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0fykcs10q2j6h04riav1kzrw77mga6gh1rxbh7q0ab6gkr0wamzx"; @@ -215,6 +265,8 @@ }; prawn-table = { dependencies = ["prawn"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nxd6qmxqwl850icp18wjh5k0s3amxcajdrkjyzpfgq0kvilcv9k"; @@ -224,6 +276,8 @@ }; prawn-templates = { dependencies = ["pdf-reader" "prawn"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1gs894sj9zdlwx59h3rk4p0l3y8r18p22zhnfiyx9lngsa56gcrj"; @@ -232,15 +286,19 @@ version = "0.1.1"; }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; "pygments.rb" = { dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0lbvnwvz770ambm4d6lxgc2097rydn5rcc5d6986bnkzyxfqqjnv"; @@ -249,15 +307,19 @@ version = "1.2.1"; }; rack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mfriw2r2913dv8qf3p87n7yal3qfsrs478x2qz106v8vhmxa017"; + sha256 = "158hbn7rlc3czp2vivvam44dv6vmzz16qrh5dbzhfxbfsgiyrqw1"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; ruby-enum = { dependencies = ["i18n"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; @@ -266,6 +328,8 @@ version = "0.7.2"; }; ruby-rc4 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00vci475258mmbvsdqkmqadlwn6gj9m01sp7b5a3zd90knil1k00"; @@ -274,6 +338,8 @@ version = "0.1.5"; }; safe_yaml = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; @@ -283,6 +349,8 @@ }; slim = { dependencies = ["temple" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0zwz083xsbnlrma1pfkzrqc1fqm90fidn915vlifvkzl5fs43pvl"; @@ -292,6 +360,8 @@ }; source_map = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0fviv92glr51v2zqy4i5jzi3hzpvjrcwyrxddcfr84ki65zb7pkv"; @@ -301,14 +371,18 @@ }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sv3zk5hwxyjvg7iy9sggjc7k3mfxxif7w8p260rharfyib939ar"; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; type = "gem"; }; - version = "3.7.1"; + version = "3.7.2"; }; temple = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq"; @@ -317,6 +391,8 @@ version = "0.8.0"; }; thread_safe = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -325,6 +401,8 @@ version = "0.3.6"; }; tilt = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; @@ -334,6 +412,8 @@ }; treetop = { dependencies = ["polyglot"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0wpl5z33796nz2ah44waflrd1girbra281d9i3m9nz4ylg1ljg5b"; @@ -342,6 +422,8 @@ version = "1.5.3"; }; ttfunk = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1mgrnqla5n51v4ivn844albsajkck7k6lviphfqa8470r46c58cd"; @@ -349,4 +431,4 @@ }; version = "1.5.1"; }; -} +} \ No newline at end of file