Merge pull request #80540 from flokli/scikits-odes-2.6.1
python.pkgs.scikits-odes: 2.4.0-9-g93075ae -> 2.6.1
This commit is contained in:
commit
f545816c62
@ -1,52 +0,0 @@
|
|||||||
{ stdenv
|
|
||||||
, cmake
|
|
||||||
, fetchurl
|
|
||||||
, python
|
|
||||||
, liblapack
|
|
||||||
, gfortran
|
|
||||||
, lapackSupport ? true }:
|
|
||||||
|
|
||||||
let liblapackShared = liblapack.override {
|
|
||||||
shared = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
|
||||||
pname = "sundials";
|
|
||||||
version = "3.2.1";
|
|
||||||
|
|
||||||
buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran ];
|
|
||||||
nativeBuildInputs = [ cmake ];
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
|
|
||||||
sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchurl {
|
|
||||||
# https://github.com/LLNL/sundials/pull/19
|
|
||||||
url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch";
|
|
||||||
sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples"
|
|
||||||
] ++ stdenv.lib.optionals (lapackSupport) [
|
|
||||||
"-DSUNDIALS_INDEX_TYPE=int32_t"
|
|
||||||
"-DLAPACK_ENABLE=ON"
|
|
||||||
"-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}"
|
|
||||||
];
|
|
||||||
|
|
||||||
# flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3
|
|
||||||
doCheck = false;
|
|
||||||
checkPhase = "make test";
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
description = "Suite of nonlinear differential/algebraic equation solvers";
|
|
||||||
homepage = https://computation.llnl.gov/projects/sundials;
|
|
||||||
platforms = platforms.all;
|
|
||||||
maintainers = with maintainers; [ flokli idontgetoutmuch ];
|
|
||||||
license = licenses.bsd3;
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,7 +1,7 @@
|
|||||||
{ stdenv
|
{ stdenv
|
||||||
, lib
|
, lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchPypi
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, cython
|
, cython
|
||||||
, enum34
|
, enum34
|
||||||
@ -11,19 +11,16 @@
|
|||||||
, pytest
|
, pytest
|
||||||
, python
|
, python
|
||||||
, scipy
|
, scipy
|
||||||
, sundials_3
|
, sundials
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "scikits.odes";
|
pname = "scikits.odes";
|
||||||
version = "2.4.0-9-g93075ae";
|
version = "2.6.1";
|
||||||
|
|
||||||
# we fetch github instead of Pypi, as we want #104 and #105, which don't apply cleanly on 2.4.0
|
src = fetchPypi {
|
||||||
src = fetchFromGitHub {
|
inherit pname version;
|
||||||
owner = "bmcage";
|
sha256 = "0kbf2n16h9s35x6pavlx6sff0pqr68i0x0609z92a4vadni32n6b";
|
||||||
repo = "odes";
|
|
||||||
rev = "93075ae25c409f572f13ca7207fada5706f73c73";
|
|
||||||
sha256 = "161rab7hy6r1a9xw1zby9xhnnmxi0zwdpzxfpjkw9651xn2k5xyw";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -33,7 +30,7 @@ buildPythonPackage rec {
|
|||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
numpy
|
numpy
|
||||||
sundials_3
|
sundials
|
||||||
scipy
|
scipy
|
||||||
] ++ lib.optionals (!isPy3k) [ enum34 ];
|
] ++ lib.optionals (!isPy3k) [ enum34 ];
|
||||||
|
|
||||||
|
@ -423,6 +423,7 @@ mapAliases ({
|
|||||||
smbclient = samba; # added 2018-04-25
|
smbclient = samba; # added 2018-04-25
|
||||||
slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
|
slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
|
||||||
slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
|
slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
|
||||||
|
sundials_3 = throw "removed 2020-02. outdated and no longer needed";
|
||||||
net_snmp = net-snmp; # added 2019-12-21
|
net_snmp = net-snmp; # added 2019-12-21
|
||||||
spaceOrbit = space-orbit; # addewd 2016-05-23
|
spaceOrbit = space-orbit; # addewd 2016-05-23
|
||||||
speech_tools = speech-tools; # added 2018-04-25
|
speech_tools = speech-tools; # added 2018-04-25
|
||||||
|
@ -14400,8 +14400,6 @@ in
|
|||||||
|
|
||||||
sundials = callPackage ../development/libraries/sundials { };
|
sundials = callPackage ../development/libraries/sundials { };
|
||||||
|
|
||||||
sundials_3 = callPackage ../development/libraries/sundials/3.x.nix { };
|
|
||||||
|
|
||||||
sutils = callPackage ../tools/misc/sutils { };
|
sutils = callPackage ../tools/misc/sutils { };
|
||||||
|
|
||||||
svrcore = callPackage ../development/libraries/svrcore { };
|
svrcore = callPackage ../development/libraries/svrcore { };
|
||||||
|
Loading…
Reference in New Issue
Block a user