Merge master into staging-next

2021-02-12 18:16:46 +00:00
parent 15db604744 e9b66b96cc
commit b23b455f9a
71 changed files with 16848 additions and 304 deletions
@@ -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"
@@ -236,10 +236,11 @@ self: super:
 {
  blas = super.blas.override {
    blasProvider = self.mkl;
-  }
+  };
+
  lapack = super.lapack.override {
    lapackProvider = self.mkl;
-  }
+  };
 }
 </programlisting>
     <para>