Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-03-09 06:17:35 +00:00
committed by GitHub
19 changed files with 174 additions and 31 deletions
@@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "gmsh";
version = "4.7.1";
version = "4.8.0";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
sha256 = "0shwi41van3k0z6rnpl3sz5nh46xbyyljwfpcp8pwxbc26aw5169";
sha256 = "sha256-JYd4PEsClj+divtxfJlUyu+kY+ouChLhZZMH5qDX6ms=";
};
buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL