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.
NixOS · Jun 5, 2019 · 3d1e0da · 3d1e0da
1 parent bfc2ea7
commit 3d1e0da
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 200 deletions.
diff --git 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
@@ -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
@@ -11,8 +11,6 @@ bundlerApp {
 
   exes = [
     "asciidoctor"
-    "asciidoctor-bespoke"
-    "asciidoctor-latex"
     "asciidoctor-pdf"
     "asciidoctor-safe"
   ];