Revert "jekyll: Update the dependencies"

This reverts commit f14b6ea.

This commit added IFD to Nixpkgs, where
Nixpkgs should be IFD-free. (Import
from derivation.)

pkgs/applications/misc/jekyll/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+gem 'jekyll'
+gem 'jekyll-feed'
+gem 'jekyll-paginate'
+gem 'rdiscount'
+gem 'RedCloth'
+gem 'minima'

pkgs/applications/misc/jekyll/basic/Gemfile.lock → pkgs/applications/misc/jekyll/Gemfile.lock

@@ -1,11 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.10)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
+    RedCloth (4.3.2)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     colorator (1.1.0)
@@ -16,10 +12,6 @@ GEM
     eventmachine (1.2.5)
     ffi (1.9.21)
     forwardable-extended (2.6.0)
-    gemoji (3.0.0)
-    html-pipeline (2.7.1)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -36,42 +28,33 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.5.0)
-      jekyll (~> 3.0)
-    jekyll-mentions (1.2.0)
-      activesupport (~> 4.0)
-      html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
+    jekyll-feed (0.9.3)
+      jekyll (~> 3.3)
+    jekyll-paginate (1.1.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.4.0)
       jekyll (~> 3.3)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
     jekyll-watch (2.0.0)
       listen (~> 3.0)
-    jemoji (0.9.0)
-      activesupport (~> 4.0, >= 4.2.9)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
     kramdown (1.16.2)
     liquid (4.0.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
+    minima (2.3.0)
+      jekyll (~> 3.5)
+      jekyll-feed (~> 0.9)
+      jekyll-seo-tag (~> 2.1)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)
     public_suffix (3.0.2)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
+    rdiscount (2.2.0.1)
     rouge (3.1.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
@@ -80,22 +63,17 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 4.2)
+  RedCloth
   jekyll
-  jekyll-avatar
-  jekyll-mentions
-  jekyll-seo-tag
-  jekyll-sitemap
-  jemoji
-  rouge
+  jekyll-feed
+  jekyll-paginate
+  minima
+  rdiscount
 
 BUNDLED WITH
    1.14.6

pkgs/applications/misc/jekyll/default.nix

@@ -1,16 +1,12 @@
-{ stdenv, lib, bundlerEnv, ruby
-, withOptionalDependencies ? false
-}:
+{ stdenv, lib, bundlerEnv, ruby }:
 
 bundlerEnv rec {
   name = pname + "-" + version;
   pname = "jekyll";
-  version = (import "${gemdir}/gemset.nix").jekyll.version;
+  version = (import ./gemset.nix).jekyll.version;
 
   inherit ruby;
-  gemdir = if withOptionalDependencies
-    then ./full
-    else ./basic;
+  gemdir = ./.;
 
   meta = with lib; {
     description = "Simple, blog aware, static site generator";