Documentation: update just-the-docs to 0.4.0.rc1

This allows us to drop all our patches, which have now been applied
upstream.

Signed-off-by: Alyssa Ross <hi@alyssa.is>

4 files changed, 8 insertions, 43 deletions

diff --git a/Documentation/Gemfile b/Documentation/Gemfile
index 13e9b5a..51180ad 100644
--- a/Documentation/Gemfile
+++ b/Documentation/Gemfile
@@ -6,4 +6,4 @@ source "https://rubygems.org"
 
 gem "jekyll"
 gem "jekyll-asciidoc"
-gem "just-the-docs"
+gem "just-the-docs", ">= 0.4.0.rc1", "< 0.5"
diff --git a/Documentation/Gemfile.lock b/Documentation/Gemfile.lock
index 78b0e70..b5b8626 100644
--- a/Documentation/Gemfile.lock
+++ b/Documentation/Gemfile.lock
@@ -39,10 +39,10 @@ GEM
       jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    just-the-docs (0.3.3)
+    just-the-docs (0.4.0.rc1)
       jekyll (>= 3.8.5)
-      jekyll-seo-tag (~> 2.0)
-      rake (>= 12.3.1, < 13.1.0)
+      jekyll-seo-tag (>= 2.0)
+      rake (>= 12.3.1)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -74,7 +74,7 @@ PLATFORMS
 DEPENDENCIES
   jekyll
   jekyll-asciidoc
-  just-the-docs
+  just-the-docs (>= 0.4.0.rc1, < 0.5)
 
 BUNDLED WITH
    2.3.9
diff --git a/Documentation/gemset.nix b/Documentation/gemset.nix
index ba83b5e..3c726bd 100644
--- a/Documentation/gemset.nix
+++ b/Documentation/gemset.nix
@@ -163,10 +163,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yq0r19izs2pgjh80qrll9yf8jr5hymk45f85f5xh57x6g3as85a";
+      sha256 = "1m9yb8aw9xq774q91sv690hsm6c39gv1ph3cbkmk0fiwd7jdwxs2";
       type = "gem";
     };
-    version = "0.3.3";
+    version = "0.4.0.rc1";
   };
   kramdown = {
     dependencies = ["rexml"];
diff --git a/Documentation/jekyll.nix b/Documentation/jekyll.nix
index 1aa8524..bc804b1 100644
--- a/Documentation/jekyll.nix
+++ b/Documentation/jekyll.nix
@@ -3,46 +3,11 @@
 
 { pkgs ? import <nixpkgs> {} }: pkgs.callPackage (
 
-{ lib, bundlerApp, defaultGemConfig, fetchFromGitHub, fetchpatch }:
+{ bundlerApp }:
 
 bundlerApp {
   pname = "jekyll";
   gemdir = ./.;
   exes = [ "jekyll" ];
-
-  gemConfig = defaultGemConfig // {
-    # We override Just the Docs to improve AsciiDoc support.
-    just-the-docs = attrs:
-      let super = defaultGemConfig.just-the-docs or (lib.const {}) attrs; in
-      super // {
-        # The gem tarball doesn't contain e.g. the SCSS files.
-        src = fetchFromGitHub {
-          owner = "just-the-docs";
-          repo = "just-the-docs";
-          rev = assert attrs.version == "0.3.3"; "8bc53f8f45ce6a11be0559c764d39d90f2434ec1";
-          sha256 = "sha256-pvct9Ob/TzTZvj2YVZ36FtU2Uo465p3aUc0NCd/0oWo=";
-        };
-
-        patches = super.patches or attrs.patches or [] ++ [
-          (fetchpatch {
-            url = "https://github.com/just-the-docs/just-the-docs/compare/3a834d24ab1bda72f481f1e630f28fb9ba78ce64...7627fdb73decc0dd9264729a4ac302065c81bf24.patch";
-            sha256 = "sha256-5jWAlNvkCPu/U4aTrzal8GxoWmcSSKiKAwzu5pjCrPE=";
-          })
-
-          # Don't use domains in links, which would require different
-          # configuration when running locally vs on the website.
-          # https://github.com/just-the-docs/just-the-docs/pull/544
-          (fetchpatch {
-            url = "https://github.com/just-the-docs/just-the-docs/commit/7bb40aa3c71d989339322ad946cfdd8287717a94.patch";
-            sha256 = "sha256-3e6N1B9lAgSYVRMLLvhsfOP5CXuespKJk/pyGdbK4wg=";
-          })
-        ];
-
-        postPatch = ''
-          substituteInPlace just-the-docs.gemspec \
-              --replace 'git ls-files -z' 'find * -print0'
-        '';
-      };
-  };
 }
 ) { }