Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-08-18 12:53:44 +02:00
125 changed files with 3217 additions and 885 deletions

View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
stdenv.mkDerivation rec {
version = "9.600.5";
pname = "armadillo";
version = "9.600.6";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
sha256 = "1gy2rb3klvzx833851qgsbh5k1ds5zffwk0rmy1k8b1g51jdd76x";
sha256 = "0wlk1yv9531vpvgja4cpy0sxykrn0p5w376kx86vl45b50yamx7g";
};
nativeBuildInputs = [ cmake ];