git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #66038 from jonringer/bump-ase

python3Packages.ase: 3.17.0 -> 3.18.0

commita0d54b2e5f72ee537e791c534825472f22581481 authorMarek Mahut <marek.mahut@gmail.com> dateThu 8 Aug 2019, 16:24 (7 years ago) parentef000290a643dd
3 files changed+44−3
pkgs/development/python-modules/ase/3.17.nix+36 pkgs/development/python-modules/ase/default.nix+4−2 pkgs/top-level/python-packages.nix+4−1
pkgs/development/python-modules/ase/3.17.nixnew file+36
@@ -0,0 +1,36 @@
1+{ lib
2+, fetchPypi
3+, buildPythonPackage
4+, numpy
5+, scipy
6+, matplotlib
7+, flask
8+, pillow
9+, psycopg2
10+}:
11+
12+buildPythonPackage rec {
13+ pname = "ase";
14+ version = "3.17.0";
15+
16+ src = fetchPypi {
17+ inherit pname version;
18+ sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g";
19+ };
20+
21+ propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
22+
23+ checkPhase = ''
24+ $out/bin/ase test
25+ '';
26+
27+ # tests just hang most likely due to something with subprocesses and cli
28+ doCheck = false;
29+
30+ meta = with lib; {
31+ description = "Atomic Simulation Environment";
32+ homepage = https://wiki.fysik.dtu.dk/ase/;
33+ license = licenses.lgpl21Plus;
34+ maintainers = with maintainers; [ costrouc ];
35+ };
36+}
pkgs/development/python-modules/ase/default.nix+4−2
@@ -1,6 +1,7 @@
11{ lib
22, fetchPypi
33, buildPythonPackage
4+, isPy27
45, numpy
56, scipy
67, matplotlib
@@ -11,11 +12,12 @@
1112
1213buildPythonPackage rec {
1314 pname = "ase";
14− version = "3.17.0";
15+ version = "3.18.0";
16+ disabled = isPy27;
1517
1618 src = fetchPypi {
1719 inherit pname version;
18− sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g";
20+ sha256 = "1ycp1yksysiiz902gn762030sfmirxm950pwpw2rcrpjvq95zm1r";
1921 };
2022
2123 propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
pkgs/top-level/python-packages.nix+4−1
@@ -183,7 +183,10 @@ in {
183183
184184 asciitree = callPackage ../development/python-modules/asciitree { };
185185
186− ase = callPackage ../development/python-modules/ase { };
186+ ase = if isPy27 then
187+ callPackage ../development/python-modules/ase/3.17.nix { }
188+ else
189+ callPackage ../development/python-modules/ase { };
187190
188191 asn1crypto = callPackage ../development/python-modules/asn1crypto { };
189192