diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science')
6 files changed, 19 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/applications/science/biology/mmseqs2/default.nix b/nixpkgs/pkgs/applications/science/biology/mmseqs2/default.nix index 253f4a43a81c..3e39fcb2918b 100644 --- a/nixpkgs/pkgs/applications/science/biology/mmseqs2/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/mmseqs2/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mmseqs2"; - version = "14-7e284"; + version = "15-6f452"; src = fetchFromGitHub { owner = "soedinglab"; repo = pname; rev = version; - sha256 = "sha256-pVryZGblgMEqJl5M20CHxav269yGY6Y4ci+Gxt6SHOU="; + sha256 = "sha256-L+zOWrGkCLz/wqpBuji8H4/93sDFpcfnDOE8FHq1j84="; }; nativeBuildInputs = [ cmake xxd perl installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/science/logic/lean4/default.nix b/nixpkgs/pkgs/applications/science/logic/lean4/default.nix index 12465ad9087f..ecc929cb5f0e 100644 --- a/nixpkgs/pkgs/applications/science/logic/lean4/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/lean4/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "lean4"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${version}"; - hash = "sha256-6qbCafG0bL5KxQt2gL6hV4PFDsEMM0UXfldeOOqxsaE="; + hash = "sha256-56YtHCiNMP5fJoddSokEl0ws06IwetYLer4aLCnujZA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/science/math/caffe/default.nix b/nixpkgs/pkgs/applications/science/math/caffe/default.nix index 5af927294d6c..42c160393595 100644 --- a/nixpkgs/pkgs/applications/science/math/caffe/default.nix +++ b/nixpkgs/pkgs/applications/science/math/caffe/default.nix @@ -1,12 +1,13 @@ { config, stdenv, lib , fetchFromGitHub , fetchurl +, fetchpatch , cmake , boost , gflags , glog , hdf5-cpp -, opencv3 +, opencv4 , protobuf , doxygen , blas @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; - buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 blas ] + buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv4 blas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn ++ lib.optional lmdbSupport lmdb @@ -96,6 +97,11 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + (fetchpatch { + name = "support-opencv4"; + url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch"; + hash = "sha256-ZegTvp0tTHlopQv+UzHDigs6XLkP2VfqLCWXl6aKJSI="; + }) ] ++ lib.optional pythonSupport (substituteAll { src = ./python.patch; inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy @@ -148,7 +154,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://caffe.berkeleyvision.org/"; maintainers = with maintainers; [ ]; - broken = pythonSupport && (python.isPy310); + broken = (pythonSupport && (python.isPy310)) || cudaSupport; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/nixpkgs/pkgs/applications/science/math/clp/default.nix b/nixpkgs/pkgs/applications/science/math/clp/default.nix index c7d19f044d65..52a74ff3979c 100644 --- a/nixpkgs/pkgs/applications/science/math/clp/default.nix +++ b/nixpkgs/pkgs/applications/science/math/clp/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pkg-config, coin-utils, zlib, osi }: stdenv.mkDerivation rec { - version = "1.17.8"; + version = "1.17.9"; pname = "clp"; src = fetchFromGitHub { owner = "coin-or"; repo = "Clp"; rev = "releases/${version}"; - hash = "sha256-3Z6ysoCcDVB8UePiwbZNqvO/o/jgPcv6XFkpJZBK+Os="; + hash = "sha256-kHCDji+yIf5mCoxKB2b/HaATGmwwIAPEV74tthIMeMY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/science/math/mxnet/default.nix b/nixpkgs/pkgs/applications/science/math/mxnet/default.nix index d65de87d8eb9..993da2b89898 100644 --- a/nixpkgs/pkgs/applications/science/math/mxnet/default.nix +++ b/nixpkgs/pkgs/applications/science/math/mxnet/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, fetchpatch, bash, cmake -, opencv3, gtest, blas, gomp, llvmPackages, perl +, opencv4, gtest, blas, gomp, llvmPackages, perl , cudaSupport ? config.cudaSupport, cudaPackages ? { }, nvidia_x11 , cudnnSupport ? cudaSupport }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; - buildInputs = [ opencv3 gtest blas.provider ] + buildInputs = [ opencv4 gtest blas.provider ] ++ lib.optional stdenv.cc.isGNU gomp ++ lib.optional stdenv.cc.isClang llvmPackages.openmp # FIXME: when cuda build is fixed, remove nvidia_x11, and use /run/opengl-driver/lib diff --git a/nixpkgs/pkgs/applications/science/misc/boinc/default.nix b/nixpkgs/pkgs/applications/science/misc/boinc/default.nix index 4721e946464e..45209881f7a9 100644 --- a/nixpkgs/pkgs/applications/science/misc/boinc/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/boinc/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "7.24.1"; + version = "7.24.2"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-CAzAKxNHG8ew9v2B1jK7MxfWGwTfdmDncDe7QT+twd8="; + hash = "sha256-Aaoqf53wagCkzkZUs7mVbE2Z2P6GvxiQYxPrL6ahGqA="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; |