58776b8 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

asciidoctor: 2.0.15 -> 2.0.16; darwin fix

commit58776b89143b9e8cc52ae04c5c847ab6705235da authorhappysalada <raphael@megzari.com> dateThu 4 Nov 2021, 16:56 (5 years ago) parent1b2c294

3 files changed+56−53

compare with master

unifiedsplit

pkgs/development/ruby-modules/gem-config/default.nix+4−1 pkgs/tools/typesetting/asciidoctor/Gemfile.lock+20−20 pkgs/tools/typesetting/asciidoctor/gemset.nix+32−32

pkgs/development/ruby-modules/gem-config/default.nix+4−1

@@ -437,7 +437,10 @@ in

437437 "--with-xslt-include=${libxslt.dev}/include"

438438 "--with-exslt-lib=${libxslt.out}/lib"

439439 "--with-exslt-include=${libxslt.dev}/include"

440− ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";

440+ ] ++ lib.optionals stdenv.isDarwin [

441+ "--with-iconv-dir=${libiconv}"

442+ "--with-opt-include=${libiconv}/include"

443+ ];

441444 };

442445

443446 openssl = attrs: {

pkgs/tools/typesetting/asciidoctor/Gemfile.lock+20−20

@@ -2,17 +2,17 @@ GEM

22 remote: https://rubygems.org/

33 specs:

44 Ascii85 (1.1.0)

5− addressable (2.7.0)

5+ addressable (2.8.0)

66 public_suffix (>= 2.0.2, < 5.0)

77 afm (0.2.2)

8− asciidoctor (2.0.15)

9− asciidoctor-diagram (2.1.2)

8+ asciidoctor (2.0.16)

9+ asciidoctor-diagram (2.2.1)

1010 asciidoctor (>= 1.5.7, < 3.x)

11− asciidoctor-diagram-ditaamini (~> 1.0.0)

11+ asciidoctor-diagram-ditaamini (~> 1.0)

1212 asciidoctor-diagram-plantuml (~> 1.2021)

1313 rexml

14− asciidoctor-diagram-ditaamini (1.0.0)

15− asciidoctor-diagram-plantuml (1.2021.7)

14+ asciidoctor-diagram-ditaamini (1.0.1)

15+ asciidoctor-diagram-plantuml (1.2021.8)

1616 asciidoctor-epub3 (1.5.1)

1717 asciidoctor (>= 1.5.6, < 3.0.0)

1818 gepub (~> 1.0.0)

@@ -21,7 +21,7 @@ GEM

2121 asciidoctor (~> 2.0)

2222 asciimath (~> 2.0)

2323 mathematical (~> 1.6.0)

24− asciidoctor-pdf (1.6.0)

24+ asciidoctor-pdf (1.6.1)

2525 asciidoctor (~> 2.0)

2626 concurrent-ruby (~> 1.1)

2727 prawn (~> 2.4.0)

@@ -35,25 +35,25 @@ GEM

3535 asciidoctor (>= 2.0.0, < 3.0.0)

3636 concurrent-ruby (~> 1.0)

3737 thread_safe (~> 0.3.5)

38− asciimath (2.0.2)

38+ asciimath (2.0.3)

3939 coderay (1.1.3)

4040 concurrent-ruby (1.1.9)

41− css_parser (1.9.0)

41+ css_parser (1.10.0)

4242 addressable

43− gepub (1.0.13)

44− nokogiri (>= 1.8.2, < 1.12)

43+ gepub (1.0.15)

44+ nokogiri (>= 1.8.2, < 2.0)

4545 rubyzip (> 1.1.1, < 2.4)

4646 hashery (2.1.2)

47− i18n (1.8.10)

47+ i18n (1.8.11)

4848 concurrent-ruby (~> 1.0)

4949 mathematical (1.6.14)

5050 ruby-enum (~> 0.4)

5151 mime-types (3.3.1)

5252 mime-types-data (~> 3.2015)

53− mime-types-data (3.2021.0225)

54− mini_portile2 (2.5.3)

55− nokogiri (1.11.7)

56− mini_portile2 (~> 2.5.0)

53+ mime-types-data (3.2021.0901)

54+ mini_portile2 (2.6.1)

55+ nokogiri (1.12.5)

56+ mini_portile2 (~> 2.6.1)

5757 racc (~> 1.4)

5858 pdf-core (0.9.0)

5959 pdf-reader (2.5.0)

@@ -79,13 +79,13 @@ GEM

7979 prawn (~> 2.2)

8080 public_suffix (4.0.6)

8181 pygments.rb (2.2.0)

82− racc (1.5.2)

82+ racc (1.6.0)

8383 rexml (3.2.5)

84− rouge (3.26.0)

84+ rouge (3.26.1)

8585 ruby-enum (0.9.0)

8686 i18n

8787 ruby-rc4 (0.1.5)

88− rubyzip (2.3.0)

88+ rubyzip (2.3.2)

8989 safe_yaml (1.0.5)

9090 thread_safe (0.3.6)

9191 treetop (1.6.11)

@@ -107,4 +107,4 @@ DEPENDENCIES

107107 rouge

108108

109109BUNDLED WITH

110− 2.1.4

110+ 2.2.24

pkgs/tools/typesetting/asciidoctor/gemset.nix+32−32

@@ -5,10 +5,10 @@

55 platforms = [];

66 source = {

77 remotes = ["https://rubygems.org"];

8− sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";

8+ sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";

99 type = "gem";

1010 };

11− version = "2.7.0";

11+ version = "2.8.0";

1212 };

1313 afm = {

1414 groups = ["default"];

@@ -35,10 +35,10 @@

3535 platforms = [];

3636 source = {

3737 remotes = ["https://rubygems.org"];

38− sha256 = "0k3lijm4dmiz977bfmpclk5glj5jwv7bidamwwwywm60ywb0n4n4";

38+ sha256 = "10h4pmmkbcrpy7bn76wxzkb0hriabh1k3ii1g8lm0mdji5drlhq2";

3939 type = "gem";

4040 };

41− version = "2.0.15";

41+ version = "2.0.16";

4242 };

4343 asciidoctor-diagram = {

4444 dependencies = ["asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml"];

@@ -46,30 +46,30 @@

4646 platforms = [];

4747 source = {

4848 remotes = ["https://rubygems.org"];

49− sha256 = "09ci775f7y7d6spn0fl5wfmfyxianjp4z0p3fwcrzajy63f381v9";

49+ sha256 = "1z1ilpczjaydhcwpz3yygn03yrx2ljjj55xczwkrlb8rzgh03br3";

5050 type = "gem";

5151 };

52− version = "2.1.2";

52+ version = "2.2.1";

5353 };

5454 asciidoctor-diagram-ditaamini = {

5555 groups = ["default"];

5656 platforms = [];

5757 source = {

5858 remotes = ["https://rubygems.org"];

59− sha256 = "1frnjz0j00v5hqp5macgnn6jq77jcpjy2l6hqmn5jn5ds7bmi2rl";

59+ sha256 = "1nva5n6nyns0xp77d1dxng1rjhc8ma6gyd8hczjq3h9qqxcw2q4h";

6060 type = "gem";

6161 };

62− version = "1.0.0";

62+ version = "1.0.1";

6363 };

6464 asciidoctor-diagram-plantuml = {

6565 groups = ["default"];

6666 platforms = [];

6767 source = {

6868 remotes = ["https://rubygems.org"];

69− sha256 = "1kcxwbaancxfq08fr7syg8mxsi97jiczxyp4an2x0ymq3mkss0k8";

69+ sha256 = "0n018kmqzapf5y1bacb5yyvb9jfwxdkfqnviwxivwz9322b9w6j7";

7070 type = "gem";

7171 };

72− version = "1.2021.7";

72+ version = "1.2021.8";

7373 };

7474 asciidoctor-epub3 = {

7575 dependencies = ["asciidoctor" "gepub" "mime-types"];

@@ -99,10 +99,10 @@

9999 platforms = [];

100100 source = {

101101 remotes = ["https://rubygems.org"];

102− sha256 = "0sxfz3qp2j76jlab7fb1d1ylbf0h2nnbkhg019qqch5wkd4k1iw9";

102+ sha256 = "17d3fa6ix6r5ikydqz41r620mm98s076wdg4w6ydsr655r7mvnpk";

103103 type = "gem";

104104 };

105− version = "1.6.0";

105+ version = "1.6.1";

106106 };

107107 asciidoctor-revealjs = {

108108 dependencies = ["asciidoctor" "concurrent-ruby" "thread_safe"];

@@ -120,10 +120,10 @@

120120 platforms = [];

121121 source = {

122122 remotes = ["https://rubygems.org"];

123− sha256 = "1yq9av7rh493xqmx4cq3fjl0c6d8njxp53qw4hg2d3xkyn2lyfc5";

123+ sha256 = "0h4fz93pf96y5syxwpv0vibjf7lidv2718ikpvyd2vy8c1am8zyn";

124124 type = "gem";

125125 };

126− version = "2.0.2";

126+ version = "2.0.3";

127127 };

128128 coderay = {

129129 groups = ["default"];

@@ -151,10 +151,10 @@

151151 platforms = [];

152152 source = {

153153 remotes = ["https://rubygems.org"];

154− sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751";

154+ sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5";

155155 type = "gem";

156156 };

157− version = "1.9.0";

157+ version = "1.10.0";

158158 };

159159 gepub = {

160160 dependencies = ["nokogiri" "rubyzip"];

@@ -162,10 +162,10 @@

162162 platforms = [];

163163 source = {

164164 remotes = ["https://rubygems.org"];

165− sha256 = "01q33rkvqrhxqm8zgkhgcqhrqdfzgxswxfgiagdjxw67qdn1pids";

165+ sha256 = "08fny807zd4700f263ckc76bladjipsniyk3clv8a7x76x3fqshx";

166166 type = "gem";

167167 };

168− version = "1.0.13";

168+ version = "1.0.15";

169169 };

170170 hashery = {

171171 groups = ["default"];

@@ -183,10 +183,10 @@

183183 platforms = [];

184184 source = {

185185 remotes = ["https://rubygems.org"];

186− sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";

186+ sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf";

187187 type = "gem";

188188 };

189− version = "1.8.10";

189+ version = "1.8.11";

190190 };

191191 mathematical = {

192192 dependencies = ["ruby-enum"];

@@ -215,20 +215,20 @@

215215 platforms = [];

216216 source = {

217217 remotes = ["https://rubygems.org"];

218− sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi";

218+ sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv";

219219 type = "gem";

220220 };

221− version = "3.2021.0225";

221+ version = "3.2021.0901";

222222 };

223223 mini_portile2 = {

224224 groups = ["default"];

225225 platforms = [];

226226 source = {

227227 remotes = ["https://rubygems.org"];

228− sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k";

228+ sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq";

229229 type = "gem";

230230 };

231− version = "2.5.3";

231+ version = "2.6.1";

232232 };

233233 nokogiri = {

234234 dependencies = ["mini_portile2" "racc"];

@@ -236,10 +236,10 @@

236236 platforms = [];

237237 source = {

238238 remotes = ["https://rubygems.org"];

239− sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9";

239+ sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b";

240240 type = "gem";

241241 };

242− version = "1.11.7";

242+ version = "1.12.5";

243243 };

244244 pdf-core = {

245245 groups = ["default"];

@@ -352,10 +352,10 @@

352352 platforms = [];

353353 source = {

354354 remotes = ["https://rubygems.org"];

355− sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";

355+ sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";

356356 type = "gem";

357357 };

358− version = "1.5.2";

358+ version = "1.6.0";

359359 };

360360 rexml = {

361361 groups = ["default"];

@@ -372,10 +372,10 @@

372372 platforms = [];

373373 source = {

374374 remotes = ["https://rubygems.org"];

375− sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";

375+ sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf";

376376 type = "gem";

377377 };

378− version = "3.26.0";

378+ version = "3.26.1";

379379 };

380380 ruby-enum = {

381381 dependencies = ["i18n"];

@@ -403,10 +403,10 @@

403403 platforms = [];

404404 source = {

405405 remotes = ["https://rubygems.org"];

406− sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";

406+ sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";

407407 type = "gem";

408408 };

409− version = "2.3.0";

409+ version = "2.3.2";

410410 };

411411 safe_yaml = {

412412 groups = ["default"];