diff options
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/R/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/science/math/bcal/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/math/ginac/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/math/gmsh/default.nix | 17 | ||||
-rw-r--r-- | pkgs/applications/science/math/gretl/default.nix | 4 |
5 files changed, 21 insertions, 13 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index d08078c356e..4bd237f8783 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -94,6 +94,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # disable stackprotector on aarch64-darwin for now + # https://github.com/NixOS/nixpkgs/issues/158730 + # see https://github.com/NixOS/nixpkgs/issues/127608 for a similar issue + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + setupHook = ./setup-hook.sh; meta = with lib; { diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 85bcd1b2d2f..b23b433becd 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "bcal"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "jarun"; repo = "bcal"; rev = "v${version}"; - sha256 = "sha256-1k8Q+I1Mc196QL+x4yXzRi7WLBf30U4sJyl0rXisW7k="; + sha256 = "sha256-PleWU2yyJzkUAZEvEYoCGdpEXqOgRvZK9zXTYrxRtQU="; }; buildInputs = [ readline ]; diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 78b64d7f587..1fff1156c1a 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-8WldvWsYcGHvP7pQdkjJ1tukOPczsFjBb5J4y9z14as="; + sha256 = "sha256-v811Gryviv3bg5WMKtInY6deokAyVT5QPumzjj6jtsM="; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index fe34a82679a..76fc20c4b04 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,25 +5,28 @@ 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 - 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 ]; + doCheck = true; + meta = { description = "A three-dimensional finite element mesh generator"; homepage = "https://gmsh.info/"; - platforms = [ "x86_64-linux" ]; license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index 175add544b5..b8b600c1874 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2021d"; + version = "2022a"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "sha256-zij337P/MemCwvMah2bUE3odv0Kf/KW6fUl2OgMzjuI="; + sha256 = "sha256-J+JcuCda2xYJ5aVz6UXR+nWiid6QxpDtt4DXlb6L4UA="; }; buildInputs = [ |