From 772c6b674c24db58fc3d4caaf6a4c77048dfcf73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Feb 2022 18:31:28 +0000 Subject: [PATCH 1/3] gmsh: 4.9.2 -> 4.9.4 --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index fe34a82679a8..4c701e55b40e 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.9.2"; + version = "4.9.4"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-26KB4DNYT12gfi2Y1656PcSBcjyybCxye2X8ILMBYYw="; + sha256 = "sha256-rP8zQtGQfEKaS+PkWW7UT2zUP9WpSrdWZ/SGPNzy92k="; }; buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL From 61dc066799b568a9cf0bed291d9cd3bbcafc35d8 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Feb 2022 16:13:53 +0000 Subject: [PATCH 2/3] gmsh: enable for darwin --- pkgs/applications/science/math/gmsh/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 4c701e55b40e..4c22bb9bdf66 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -12,10 +12,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-rP8zQtGQfEKaS+PkWW7UT2zUP9WpSrdWZ/SGPNzy92k="; }; - buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL - libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext - xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE - opencascade-occt + buildInputs = [ + blas lapack gmm fltk libjpeg zlib opencascade-occt + ] ++ lib.optionals (!stdenv.isDarwin) [ + libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes + xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM + xorg.libICE ]; nativeBuildInputs = [ cmake gfortran ]; @@ -23,7 +25,6 @@ stdenv.mkDerivation rec { meta = { description = "A three-dimensional finite element mesh generator"; homepage = "https://gmsh.info/"; - platforms = [ "x86_64-linux" ]; license = lib.licenses.gpl2Plus; }; } From 83ea8999d458e4393359a590937aad3507133dde Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Feb 2022 16:15:57 +0000 Subject: [PATCH 3/3] gmsh: enable tests --- pkgs/applications/science/math/gmsh/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 4c22bb9bdf66..76fc20c4b048 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gfortran ]; + doCheck = true; + meta = { description = "A three-dimensional finite element mesh generator"; homepage = "https://gmsh.info/";