Merge pull request #194251 from tjni/atomman
python310Packages.atomman: 1.4.5 -> 1.4.6
This commit is contained in:
commit
f5dba44696
@ -4,7 +4,6 @@
|
||||
, cython
|
||||
, datamodeldict
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, matplotlib
|
||||
, numericalunits
|
||||
, numpy
|
||||
@ -18,47 +17,27 @@
|
||||
, pythonAtLeast
|
||||
, requests
|
||||
, scipy
|
||||
, setuptools
|
||||
, toolz
|
||||
, xmltodict
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
pname = "atomman";
|
||||
format = "setuptools";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usnistgov";
|
||||
repo = "atomman";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wXz/uHjXKHVKJu/HoFF2mADSBLp6UGF9ivOp2ZOz/Ys=";
|
||||
hash = "sha256-tcsxtFbBdMC6+ixzqhnR+5UNwcQmnPQSvuyNA2IYelI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix several tests that are failing on master.
|
||||
# https://github.com/usnistgov/atomman/pull/9
|
||||
(fetchpatch {
|
||||
name = "fix-tests-1.patch";
|
||||
url = "https://github.com/usnistgov/atomman/commit/d255977a5e0ce4584e2c886f6c55ccb9f5932731.patch";
|
||||
hash = "sha256-lBFOgcozY85JfQVsVjd51Jf9mrokwQuYdxa8l7VzkqU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-tests-2.patch";
|
||||
url = "https://github.com/usnistgov/atomman/commit/de4177f28ad7c48d482cb606f323128e2fcb86aa.patch";
|
||||
hash = "sha256-+YpwdKCT/OTue3b2GOk9Jagg26r1PTTV2Zg+GGBd8sM=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-tests-3.patch";
|
||||
url = "https://github.com/usnistgov/atomman/commit/10b168493ee883348699f1e42680423cec84bed5.patch";
|
||||
hash = "sha256-b4f3POjiceq3xApfjnKAs9dEf1trCiTIyu7hMPL0ZTw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-tests-4.patch";
|
||||
url = "https://github.com/usnistgov/atomman/commit/057d24c70427bab3c7c530251ceb5f4e27eb5c56.patch";
|
||||
hash = "sha256-FTg/GNRZ5xigGW8SpUTIw2/GEzOxwb1rsv2wGebmZOk=";
|
||||
})
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
Loading…
Reference in New Issue
Block a user