gollum: add additional dependenciesorigin/backport-130683-to-release-21.05

(cherry picked from commit 3bdccfedaf0078eac4cae00e0646d8f0a8c1cfcf)

4 files changed, 121 insertions, 3 deletions

diff --git a/pkgs/applications/misc/gollum/Gemfile b/pkgs/applications/misc/gollum/Gemfile
index 525f54838b75..a15179970b3d 100644
--- a/pkgs/applications/misc/gollum/Gemfile
+++ b/pkgs/applications/misc/gollum/Gemfile
@@ -1,2 +1,8 @@
 source 'https://rubygems.org'
 gem 'gollum'
+
+gem 'asciidoctor'
+gem 'creole'
+gem 'wikicloth'
+gem 'org-ruby'
+gem 'RedCloth'
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index 73bc5d068d73..4d0d9adf7725 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -1,9 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    RedCloth (4.3.2)
+    asciidoctor (2.0.15)
+    builder (3.2.4)
     concurrent-ruby (1.1.8)
     crass (1.0.6)
+    creole (0.5.0)
     execjs (2.7.0)
+    expression_parser (0.9.0)
     ffi (1.14.2)
     gemojione (4.3.3)
       json
@@ -36,6 +41,7 @@ GEM
     gollum-rugged_adapter (1.0)
       mime-types (>= 1.15)
       rugged (~> 0.99)
+    htmlentities (4.3.4)
     json (2.5.1)
     kramdown (2.3.0)
       rexml
@@ -59,6 +65,8 @@ GEM
       racc (~> 1.4)
     octicons (12.1.0)
       nokogiri (>= 1.6.3.1)
+    org-ruby (0.9.12)
+      rubypants (~> 0.2)
     racc (1.5.2)
     rack (2.2.3)
     rack-protection (2.1.0)
@@ -71,6 +79,7 @@ GEM
     rss (0.2.9)
       rexml
     ruby2_keywords (0.0.4)
+    rubypants (0.7.1)
     rugged (0.99.0)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -105,12 +114,23 @@ GEM
       unf_ext
     unf_ext (0.0.7.7)
     useragent (0.16.10)
+    wikicloth (0.8.3)
+      builder
+      expression_parser
+      htmlentities
+      nokogiri
+      twitter-text
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  RedCloth
+  asciidoctor
+  creole
   gollum
+  org-ruby
+  wikicloth
 
 BUNDLED WITH
-   2.1.4
+   2.2.20
diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
index 4a365b5a17ed..59bb05f85ced 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, bundlerEnv, ruby, makeWrapper, bundlerUpdateScript
-, git }:
+, git, docutils, perl }:
 
 stdenv.mkDerivation rec {
   pname = "gollum";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   in ''
     mkdir -p $out/bin
     makeWrapper ${env}/bin/gollum $out/bin/gollum \
-      --prefix PATH ":" ${lib.makeBinPath [ git ]}
+      --prefix PATH ":" ${lib.makeBinPath [ git docutils perl]}
     makeWrapper ${env}/bin/gollum-migrate-tags $out/bin/gollum-migrate-tags \
       --prefix PATH ":" ${lib.makeBinPath [ git ]}
   '';
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index 690eba645dc1..8b0822d9a533 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -1,4 +1,24 @@
 {
+  asciidoctor = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k3lijm4dmiz977bfmpclk5glj5jwv7bidamwwwywm60ywb0n4n4";
+      type = "gem";
+    };
+    version = "2.0.15";
+  };
+  builder = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
+      type = "gem";
+    };
+    version = "3.2.4";
+  };
   concurrent-ruby = {
     groups = ["default"];
     platforms = [];
@@ -19,6 +39,16 @@
     };
     version = "1.0.6";
   };
+  creole = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
   execjs = {
     groups = ["default"];
     platforms = [];
@@ -29,6 +59,16 @@
     };
     version = "2.7.0";
   };
+  expression_parser = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
   ffi = {
     groups = ["default"];
     platforms = [];
@@ -93,6 +133,16 @@
     };
     version = "1.0";
   };
+  htmlentities = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
+      type = "gem";
+    };
+    version = "4.3.4";
+  };
   json = {
     groups = ["default"];
     platforms = [];
@@ -231,6 +281,17 @@
     };
     version = "12.1.0";
   };
+  org-ruby = {
+    dependencies = ["rubypants"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk";
+      type = "gem";
+    };
+    version = "0.9.12";
+  };
   racc = {
     groups = ["default"];
     platforms = [];
@@ -283,6 +344,16 @@
     };
     version = "0.10.1";
   };
+  RedCloth = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy";
+      type = "gem";
+    };
+    version = "4.3.2";
+  };
   rexml = {
     groups = ["default"];
     platforms = [];
@@ -324,6 +395,16 @@
     };
     version = "0.0.4";
   };
+  rubypants = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kv2way45d2dz3h5b7wxyw36clvlwrz7ydf6699d0za5vm56gsrh";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
   rugged = {
     groups = ["default"];
     platforms = [];
@@ -484,4 +565,15 @@
     };
     version = "0.16.10";
   };
+  wikicloth = {
+    dependencies = ["builder" "expression_parser" "htmlentities" "nokogiri" "twitter-text"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c78r1rg93mb5rcrfxl01b162ma9sh46dhjksc4c9dngg62nhbjh";
+      type = "gem";
+    };
+    version = "0.8.3";
+  };
 }