about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@gmail.com>2019-08-08 16:24:23 +0200
committerGitHub <noreply@github.com>2019-08-08 16:24:23 +0200
commita0d54b2e5f72ee537e791c534825472f22581481 (patch)
treeb2594e1a0b1dfb59b879a6b4569861c12016f06d /pkgs/top-level
parentef000297d86ec62240824ddaeda3ea1ed4755d13 (diff)
parent0a643dd96d7394d4b589c2ce113ded404d9767a3 (diff)
downloadnixlib-a0d54b2e5f72ee537e791c534825472f22581481.tar
nixlib-a0d54b2e5f72ee537e791c534825472f22581481.tar.gz
nixlib-a0d54b2e5f72ee537e791c534825472f22581481.tar.bz2
nixlib-a0d54b2e5f72ee537e791c534825472f22581481.tar.lz
nixlib-a0d54b2e5f72ee537e791c534825472f22581481.tar.xz
nixlib-a0d54b2e5f72ee537e791c534825472f22581481.tar.zst
nixlib-a0d54b2e5f72ee537e791c534825472f22581481.zip
Merge pull request #66038 from jonringer/bump-ase
python3Packages.ase: 3.17.0 -> 3.18.0
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/python-packages.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a734228fa542..6b89401cb958 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -183,7 +183,10 @@ in {
 
   asciitree = callPackage ../development/python-modules/asciitree { };
 
-  ase = callPackage ../development/python-modules/ase { };
+  ase = if isPy27 then
+          callPackage ../development/python-modules/ase/3.17.nix { }
+        else
+          callPackage ../development/python-modules/ase { };
 
   asn1crypto = callPackage ../development/python-modules/asn1crypto { };