diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science/math')
6 files changed, 43 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/applications/science/math/caffe/default.nix b/nixpkgs/pkgs/applications/science/math/caffe/default.nix index 6595f0b846dd..25f7229a845a 100644 --- a/nixpkgs/pkgs/applications/science/math/caffe/default.nix +++ b/nixpkgs/pkgs/applications/science/math/caffe/default.nix @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { || cudaSupport || !(leveldbSupport -> (leveldb != null && snappy != null)) || !(cudnnSupport -> (hasCudnn && cudaSupport)) - || !(ncclSupport -> cudaSupport) + || !(ncclSupport -> (cudaSupport && !nccl.meta.unsupported)) || !(pythonSupport -> (python != null && numpy != null)) ; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/applications/science/math/gmsh/default.nix b/nixpkgs/pkgs/applications/science/math/gmsh/default.nix index 4d9b3afe31ca..62a0c3c405df 100644 --- a/nixpkgs/pkgs/applications/science/math/gmsh/default.nix +++ b/nixpkgs/pkgs/applications/science/math/gmsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg +{ lib, stdenv, fetchurl, fetchpatch, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg , zlib, libGL, libGLU, xorg, opencascade-occt , python ? null, enablePython ? false }: @@ -24,7 +24,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./fix-python.patch ]; + patches = [ + ./fix-python.patch + + # Pull upstream fix git gcc-13: + # https://gitlab.onelab.info/gmsh/gmsh/-/issues/2416 + (fetchpatch { + name = "gcc-13-p1.patch"; + url = "https://gitlab.onelab.info/gmsh/gmsh/-/commit/fb81a9c9026700e078de947b4522cb39e543a86b.patch"; + hash = "sha256-1GInFqQZvOgflC3eQTjmZ9uBGFASRNCpCwDACN3yTQ4="; + }) + (fetchpatch { + name = "gcc-13-p2.patch"; + url = "https://gitlab.onelab.info/gmsh/gmsh/-/commit/aceb09c807b78ea26555f99fcb16c4f87c31fb5a.patch"; + hash = "sha256-6FI0hIvj8hglCvxoKV0GzT2/F/Wz+ddkxV/TLzzJBLU="; + }) + ]; postPatch = '' substituteInPlace api/gmsh.py --subst-var-by LIBPATH ${placeholder "out"}/lib/libgmsh.so diff --git a/nixpkgs/pkgs/applications/science/math/mathematica/versions.nix b/nixpkgs/pkgs/applications/science/math/mathematica/versions.nix index 74422621c7b4..3bbf70433471 100644 --- a/nixpkgs/pkgs/applications/science/math/mathematica/versions.nix +++ b/nixpkgs/pkgs/applications/science/math/mathematica/versions.nix @@ -8,6 +8,20 @@ let versions = [ { + version = "14.0.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-NzMhGQZq6o6V4UdtJxUH/yyP2s7wjTR86SRA7lW7JfI="; + installer = "Mathematica_14.0.0_LINUX.sh"; + } + { + version = "14.0.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-UrcBEg6G6nbVX++X0z0oG5JjieXL0AquAqtjzY5EBn4="; + installer = "Mathematica_14.0.0_BNDL_LINUX.sh"; + } + { version = "13.3.1"; lang = "en"; language = "English"; diff --git a/nixpkgs/pkgs/applications/science/math/primecount/default.nix b/nixpkgs/pkgs/applications/science/math/primecount/default.nix index 706cbe28f2c7..c3e2565989ed 100644 --- a/nixpkgs/pkgs/applications/science/math/primecount/default.nix +++ b/nixpkgs/pkgs/applications/science/math/primecount/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "primecount"; - version = "7.9"; + version = "7.10"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primecount"; rev = "v${version}"; - hash = "sha256-0sn6WnrI6Umrsz3lvFIzFi8/fEAqh1qhWxtNPPq5SyA="; + hash = "sha256-z7sHGR6zZSTV1PbL0WPGHf52CYQ572KC1yznCuIEJbQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/math/primesieve/default.nix b/nixpkgs/pkgs/applications/science/math/primesieve/default.nix index 24f583a3346b..20da1d342831 100644 --- a/nixpkgs/pkgs/applications/science/math/primesieve/default.nix +++ b/nixpkgs/pkgs/applications/science/math/primesieve/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "primesieve"; - version = "11.1"; + version = "11.2"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${version}"; - hash = "sha256-b6X3zhoJsO3UiWfeW4zbKsaoofIWArJi5usof3efQ0k="; + hash = "sha256-HtVuUS4dmTC7KosyBhqZ0QRstvon9WMxYf9Ocs1XIrs="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/science/math/readstat/default.nix b/nixpkgs/pkgs/applications/science/math/readstat/default.nix index 08555d12640f..6abae18c5c66 100644 --- a/nixpkgs/pkgs/applications/science/math/readstat/default.nix +++ b/nixpkgs/pkgs/applications/science/math/readstat/default.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { url = "https://github.com/WizardMac/ReadStat/commit/211c342a1cfe46fb7fb984730dd7a29ff4752f35.patch"; hash = "sha256-nkaEgusylVu7NtzSzBklBuOnqO9qJPovf0qn9tTE6ls="; }) + + # Backport use-after-free: + # https://github.com/WizardMac/ReadStat/pull/298 + (fetchpatch { + url = "https://github.com/WizardMac/ReadStat/commit/718d49155e327471ed9bf4a8c157f849f285b46c.patch"; + hash = "sha256-9hmuFa05b4JlxSzquIxXArOGhbi27A+3y5gH1IDg+R0="; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; |