diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-12 18:16:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 18:16:50 +0000 |
| commit | 0667f269fc138184d930d606b2a1dc4e9e6187f7 (patch) | |
| tree | ea0e6dd7c4b2e18370a68d029a667f9831469f0f /doc | |
| parent | 037eaddcd3220434a9753afe7b5417fc1e180c18 (diff) | |
| parent | b23b455f9a506aba630b90252a71a7bbe8b0507d (diff) | |
| download | nixpkgs-0667f269fc138184d930d606b2a1dc4e9e6187f7.tar nixpkgs-0667f269fc138184d930d606b2a1dc4e9e6187f7.tar.gz nixpkgs-0667f269fc138184d930d606b2a1dc4e9e6187f7.tar.bz2 nixpkgs-0667f269fc138184d930d606b2a1dc4e9e6187f7.tar.lz nixpkgs-0667f269fc138184d930d606b2a1dc4e9e6187f7.tar.xz nixpkgs-0667f269fc138184d930d606b2a1dc4e9e6187f7.tar.zst nixpkgs-0667f269fc138184d930d606b2a1dc4e9e6187f7.zip | |
Merge staging-next into staging
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> |