diff options
| author | Fabian Affolter <fabian@affolter-engineering.ch> | 2022-10-04 08:43:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-04 08:43:40 +0200 |
| commit | f5dba446962cbb08d3e7c21fb9476724aa2d199e (patch) | |
| tree | 81f11b9c908e62acfa987f075c203823fbd127bb /pkgs | |
| parent | 490a05c4a82236a86e1e1a4822f714c972e8c4f0 (diff) | |
| parent | f9c2d606a1e478daeec4eddb5ecab453e69a5124 (diff) | |
Merge pull request #194251 from tjni/atomman
python310Packages.atomman: 1.4.5 -> 1.4.6
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/atomman/default.nix | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index d703240cec451..ca2075cab7a30 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -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 = [ |