diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-12 18:16:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 18:16:46 +0000 |
| commit | b23b455f9a506aba630b90252a71a7bbe8b0507d (patch) | |
| tree | 551e4cd7e3fffc23e5c6bcafde5f47fd56e187c6 /doc | |
| parent | 15db604744e5a093d38888d953886a4f67fb553c (diff) | |
| parent | e9b66b96cc57962b20996a08f27b2bda979f0a82 (diff) | |
| download | nixpkgs-b23b455f9a506aba630b90252a71a7bbe8b0507d.tar nixpkgs-b23b455f9a506aba630b90252a71a7bbe8b0507d.tar.gz nixpkgs-b23b455f9a506aba630b90252a71a7bbe8b0507d.tar.bz2 nixpkgs-b23b455f9a506aba630b90252a71a7bbe8b0507d.tar.lz nixpkgs-b23b455f9a506aba630b90252a71a7bbe8b0507d.tar.xz nixpkgs-b23b455f9a506aba630b90252a71a7bbe8b0507d.tar.zst nixpkgs-b23b455f9a506aba630b90252a71a7bbe8b0507d.zip | |
Merge master into staging-next
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/default.nix | 2 | ||||
| -rw-r--r-- | doc/using/overlays.xml | 5 |
2 files changed, 4 insertions, 3 deletions
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" 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> |