dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #194251 from tjni/atomman

Browse Source 
python310Packages.atomman: 1.4.5 -> 1.4.6
This commit is contained in:
Fabian Affolter 2022-10-04 08:43:40 +02:00 committed by GitHub
commit f5dba44696
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/development/python-modules/atomman/default.nix
View File

@ -4,7 +4,6 @@
, cython , cython
, datamodeldict , datamodeldict
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, matplotlib , matplotlib
, numericalunits , numericalunits
, numpy , numpy
@ -18,47 +17,27 @@
, pythonAtLeast , pythonAtLeast
, requests , requests
, scipy , scipy
, setuptools
, toolz , toolz
, xmltodict , xmltodict
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.4.5"; version = "1.4.6";
pname = "atomman"; pname = "atomman";
format = "setuptools"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "usnistgov"; owner = "usnistgov";
repo = "atomman"; repo = "atomman";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-wXz/uHjXKHVKJu/HoFF2mADSBLp6UGF9ivOp2ZOz/Ys="; hash = "sha256-tcsxtFbBdMC6+ixzqhnR+5UNwcQmnPQSvuyNA2IYelI=";
}; };
patches = [ nativeBuildInputs = [
# Fix several tests that are failing on master. setuptools
# 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=";
})
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [