asciidoctor: 1.5.7.1 -> 2.0.10

There has been a new major version, so it seems good to upgrade.

I had to drop two plugins:
- `asciidoctor-latex` seems dead, and hasn't had any commits since 2015.
- `asciidoctor-bespoke` also hasn't been updated for over a year, and
doesn't seem to be compatible with the new version.

4 files changed, 57 insertions, 200 deletions

diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/tools/typesetting/asciidoctor/Gemfile
index 54509c601e36..4edebabc4cdd 100644
--- a/pkgs/tools/typesetting/asciidoctor/Gemfile
+++ b/pkgs/tools/typesetting/asciidoctor/Gemfile
@@ -1,9 +1,7 @@
 source 'https://rubygems.org'
 gem 'asciidoctor'
 gem 'asciidoctor-diagram'
-gem 'asciidoctor-bespoke'
 gem 'asciidoctor-pdf'
-gem 'asciidoctor-latex'
 gem 'asciidoctor-mathematical'
 gem 'coderay'
 gem 'pygments.rb'
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
index 59e8fd06ef2d..7416bd0268e2 100644
--- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
+++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
@@ -2,51 +2,39 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     afm (0.2.2)
-    asciidoctor (1.5.7.1)
-    asciidoctor-bespoke (1.0.0.alpha.1)
-      asciidoctor (>= 1.5.0)
-      slim (~> 3.0.6)
-      thread_safe (~> 0.3.5)
-    asciidoctor-diagram (1.5.9)
-      asciidoctor (~> 1.5.0)
-    asciidoctor-latex (1.5.0.17.dev)
-      asciidoctor (~> 1.5, >= 1.5.2)
-      htmlentities (~> 4.3)
-      opal (~> 0.6.3)
-    asciidoctor-mathematical (0.2.2)
-      asciidoctor (~> 1.5, >= 1.5.0)
+    asciidoctor (2.0.10)
+    asciidoctor-diagram (1.5.18)
+      asciidoctor (>= 1.5.0, < 3.x)
+    asciidoctor-mathematical (0.3.0)
+      asciidoctor (~> 2.0, >= 2.0.0)
       mathematical (~> 1.5, >= 1.5.8)
       ruby-enum (~> 0.4)
-    asciidoctor-pdf (1.5.0.alpha.16)
-      asciidoctor (>= 1.5.0)
-      prawn (>= 1.3.0, < 2.3.0)
-      prawn-icon (= 1.3.0)
-      prawn-svg (>= 0.21.0, < 0.28.0)
-      prawn-table (= 0.2.2)
-      prawn-templates (>= 0.0.3, <= 0.1.1)
-      safe_yaml (~> 1.0.4)
-      thread_safe (~> 0.3.6)
-      treetop (= 1.5.3)
+    asciidoctor-pdf (1.5.0.alpha.18)
+      asciidoctor (>= 1.5.3, < 3.0.0)
+      concurrent-ruby (~> 1.1.0)
+      prawn (~> 2.2.0)
+      prawn-icon (~> 2.3.0)
+      prawn-svg (~> 0.29.0)
+      prawn-table (~> 0.2.0)
+      prawn-templates (~> 0.1.0)
+      safe_yaml (~> 1.0.0)
+      thread_safe (~> 0.3.0)
+      treetop (~> 1.5.0)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    css_parser (1.6.0)
+    concurrent-ruby (1.1.5)
+    css_parser (1.7.0)
       addressable
     hashery (2.1.2)
-    htmlentities (4.3.4)
-    i18n (1.1.0)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    mathematical (1.6.11)
+    mathematical (1.6.12)
       ruby-enum (~> 0.4)
     multi_json (1.13.1)
-    opal (0.6.3)
-      source_map
-      sprockets
     pdf-core (0.7.0)
-    pdf-reader (2.1.0)
+    pdf-reader (2.2.0)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
@@ -56,35 +44,24 @@ GEM
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
-    prawn-icon (1.3.0)
+    prawn-icon (2.3.0)
       prawn (>= 1.1.0, < 3.0.0)
-    prawn-svg (0.27.1)
-      css_parser (~> 1.3)
+    prawn-svg (0.29.1)
+      css_parser (~> 1.6)
       prawn (>= 0.11.1, < 3)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     prawn-templates (0.1.1)
       pdf-reader (~> 2.0)
       prawn (~> 2.2)
-    public_suffix (3.0.3)
+    public_suffix (3.1.0)
     pygments.rb (1.2.1)
       multi_json (>= 1.0.0)
-    rack (2.0.6)
     ruby-enum (0.7.2)
       i18n
     ruby-rc4 (0.1.5)
-    safe_yaml (1.0.4)
-    slim (3.0.9)
-      temple (>= 0.7.6, < 0.9)
-      tilt (>= 1.3.3, < 2.1)
-    source_map (3.0.1)
-      json
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    temple (0.8.0)
+    safe_yaml (1.0.5)
     thread_safe (0.3.6)
-    tilt (2.0.8)
     treetop (1.5.3)
       polyglot (~> 0.3)
     ttfunk (1.5.1)
@@ -94,13 +71,11 @@ PLATFORMS
 
 DEPENDENCIES
   asciidoctor
-  asciidoctor-bespoke
   asciidoctor-diagram
-  asciidoctor-latex
   asciidoctor-mathematical
   asciidoctor-pdf
   coderay
   pygments.rb
 
 BUNDLED WITH
-   1.16.4
+   1.17.2
diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix
index 8c4b93ab2656..760cc41609e5 100644
--- a/pkgs/tools/typesetting/asciidoctor/default.nix
+++ b/pkgs/tools/typesetting/asciidoctor/default.nix
@@ -11,8 +11,6 @@ bundlerApp {
 
   exes = [
     "asciidoctor"
-    "asciidoctor-bespoke"
-    "asciidoctor-latex"
     "asciidoctor-pdf"
     "asciidoctor-safe"
   ];
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix
index 034ab174e8a3..aef9061e1302 100644
--- a/pkgs/tools/typesetting/asciidoctor/gemset.nix
+++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix
@@ -5,10 +5,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+      sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
       type = "gem";
     };
-    version = "2.5.2";
+    version = "2.6.0";
   };
   afm = {
     groups = ["default"];
@@ -35,21 +35,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0v52bzc72cvg7zfgq27pa4mgyf29dx9m20fghrw1xmvwgd519n1w";
+      sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz";
       type = "gem";
     };
-    version = "1.5.7.1";
-  };
-  asciidoctor-bespoke = {
-    dependencies = ["asciidoctor" "slim" "thread_safe"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1awy933sswxvi2hxpll3rh9phxcvmqhrbb91m6ibjchnf7qsl3zk";
-      type = "gem";
-    };
-    version = "1.0.0.alpha.1";
+    version = "2.0.10";
   };
   asciidoctor-diagram = {
     dependencies = ["asciidoctor"];
@@ -57,21 +46,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rj02i00d9hkzqzzrk5al9rn8yv5x0wsnrv9y6j4k8rfylm69c1r";
-      type = "gem";
-    };
-    version = "1.5.9";
-  };
-  asciidoctor-latex = {
-    dependencies = ["asciidoctor" "htmlentities" "opal"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "02qvn1ngp4s9y22vk23zzssd4w1bpyk84akjwiq6nqn8im6s4awz";
+      sha256 = "095ar1hj96mi9vxnjjdkj7yzc3lp4wjxh4qsijx9inqflbcw7x71";
       type = "gem";
     };
-    version = "1.5.0.17.dev";
+    version = "1.5.18";
   };
   asciidoctor-mathematical = {
     dependencies = ["asciidoctor" "mathematical" "ruby-enum"];
@@ -79,21 +57,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18igbvs70dnlrzgl62jcc0vfxhlb4r7v9bq3qf1v80l17lvq1x8f";
+      sha256 = "1n6qhfp6xc5jlqkscr9g7zzp9f2cv28jzcqzawhl8vjgcny7i6j3";
       type = "gem";
     };
-    version = "0.2.2";
+    version = "0.3.0";
   };
   asciidoctor-pdf = {
-    dependencies = ["asciidoctor" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop"];
+    dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1899c071hfmzqg9822v7rg8y8iqlfy3dhpfy32ignzap6cajlsqg";
+      sha256 = "19rgi43abhkyv85r2gnwqq6kxwsn29hhv4clnnmln58d7s589n0j";
       type = "gem";
     };
-    version = "1.5.0.alpha.16";
+    version = "1.5.0.alpha.18";
   };
   coderay = {
     groups = ["default"];
@@ -110,10 +88,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+      sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.1.5";
   };
   css_parser = {
     dependencies = ["addressable"];
@@ -121,10 +99,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61";
+      sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.7.0";
   };
   hashery = {
     groups = ["default"];
@@ -136,36 +114,16 @@
     };
     version = "2.1.2";
   };
-  htmlentities = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
-      type = "gem";
-    };
-    version = "4.3.4";
-  };
   i18n = {
     dependencies = ["concurrent-ruby"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ppvmla21hssvrfm8g1n2fnb4lxn4yhy9qmmba0imanflgldrjmr";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  json = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "1.6.0";
   };
   mathematical = {
     dependencies = ["ruby-enum"];
@@ -173,10 +131,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06xkr613hmzbhmm6zv92zlcjyfp0a6i2b3q3hg24lmj4j5l85p21";
+      sha256 = "19f9icaixg60wl8dvcxp6glbm5vpx2rsyx53sfk2rvwnzgsr42qh";
       type = "gem";
     };
-    version = "1.6.11";
+    version = "1.6.12";
   };
   multi_json = {
     groups = ["default"];
@@ -188,17 +146,6 @@
     };
     version = "1.13.1";
   };
-  opal = {
-    dependencies = ["source_map" "sprockets"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0dmdxhmg43ibd4bsldssslsz8870hzknwcxiv9l1838lh6hd390k";
-      type = "gem";
-    };
-    version = "0.6.3";
-  };
   pdf-core = {
     groups = ["default"];
     platforms = [];
@@ -215,10 +162,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1b3ig4wpcgdbqa7yw0ahwbmikkkywn2a22bfmrknl5ls7g066x45";
+      sha256 = "0aas2f5clgwpgryywrh4gihdi10afx3kbyfs1n31cinri02psd43";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.2.0";
   };
   polyglot = {
     groups = ["default"];
@@ -247,10 +194,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pz8n7ajkfmflw05dib2l9qkzkfzwwbzx63qcvjr14k1dnbpx7qk";
+      sha256 = "1nc810wdpa93z162yzjgvf7mdanfxm4bjwinjjxx5smq6wdvhdqi";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "2.3.0";
   };
   prawn-svg = {
     dependencies = ["css_parser" "prawn"];
@@ -258,10 +205,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fykcs10q2j6h04riav1kzrw77mga6gh1rxbh7q0ab6gkr0wamzx";
+      sha256 = "1wwfv6lw2diywgjp15pd3awpr8g7xkjfi10jzhmvziikakzsz6gj";
       type = "gem";
     };
-    version = "0.27.1";
+    version = "0.29.1";
   };
   prawn-table = {
     dependencies = ["prawn"];
@@ -290,10 +237,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+      sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
       type = "gem";
     };
-    version = "3.0.3";
+    version = "3.1.0";
   };
   "pygments.rb" = {
     dependencies = ["multi_json"];
@@ -306,14 +253,6 @@
     };
     version = "1.2.1";
   };
-  rack = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
-      type = "gem";
-    };
-    version = "2.0.6";
-  };
   ruby-enum = {
     dependencies = ["i18n"];
     groups = ["default"];
@@ -340,53 +279,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  slim = {
-    dependencies = ["temple" "tilt"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0zwz083xsbnlrma1pfkzrqc1fqm90fidn915vlifvkzl5fs43pvl";
-      type = "gem";
-    };
-    version = "3.0.9";
-  };
-  source_map = {
-    dependencies = ["json"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fviv92glr51v2zqy4i5jzi3hzpvjrcwyrxddcfr84ki65zb7pkv";
-      type = "gem";
-    };
-    version = "3.0.1";
-  };
-  sprockets = {
-    dependencies = ["concurrent-ruby" "rack"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
-      type = "gem";
-    };
-    version = "3.7.2";
-  };
-  temple = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq";
+      sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "1.0.5";
   };
   thread_safe = {
     groups = ["default"];
@@ -398,16 +294,6 @@
     };
     version = "0.3.6";
   };
-  tilt = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
-      type = "gem";
-    };
-    version = "2.0.8";
-  };
   treetop = {
     dependencies = ["polyglot"];
     groups = ["default"];