From 933c2425d9e0bfa58aec5f3d4024120002ba7d5b Mon Sep 17 00:00:00 2001
From: Daniël de Kok <me@danieldk.eu>
Date: Fri, 12 Feb 2021 10:37:16 +0100
Subject: doc: fix syntax error in BLAS/LAPACK overlay example

Attribute-values pairs were not properly terminated by a semicolon.
---
 doc/using/overlays.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml
index 9ffbb4edd98..8bda235d43d 100644
--- a/doc/using/overlays.xml
+++ b/doc/using/overlays.xml
@@ -236,10 +236,11 @@ self: super:
 {
   blas = super.blas.override {
     blasProvider = self.mkl;
-  }
+  };
+
   lapack = super.lapack.override {
     lapackProvider = self.mkl;
-  }
+  };
 }
 </programlisting>
      <para>
-- 
cgit 1.4.1


From 503a772e024b03eb7dd3dd9a08a9a40d655609cc Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 8 Feb 2021 17:47:22 +0000
Subject: doc: use lib.cleanSource

Otherwise, running "nix-build" in the doc directory would create a
result symlink, so running "nix-build" again would produce a different
derivation, and so on forever, because the result symlink would keep
changing and wasn't ignored.
---
 doc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/default.nix b/doc/default.nix
index 543a3874170..25389fa2da7 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -15,7 +15,7 @@ in pkgs.stdenv.mkDerivation {
     xmlformat
   ];
 
-  src = ./.;
+  src = lib.cleanSource ./.;
 
   makeFlags = [
     "PANDOC_LUA_FILTERS_DIR=${pkgs.pandoc-lua-filters}/share/pandoc/filters"
-- 
cgit 1.4.1