summary refs log tree commit diff
path: root/pkgs/top-level/python-packages.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-07-26 16:18:53 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-07-26 16:18:53 +0200
commitf59e6f4037a741d41bee04e9b1ee684aae956d86 (patch)
tree7a4d525b632c96a333c4deb4550b77e518cdc1f9 /pkgs/top-level/python-packages.nix
parent38ac3b34373f1eb75ce85edca60f22ee6a2bcd85 (diff)
parent812f4749ae76262490e5e3984f8676953da1f5dc (diff)
downloadnixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar
nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.gz
nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.bz2
nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.lz
nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.xz
nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.zst
nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.zip
Merge master into staging
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r--pkgs/top-level/python-packages.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b8ccafc3ad7c..80f7a6d43598 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -573,6 +573,11 @@ in {
 
   appdirs = callPackage ../development/python-modules/appdirs { };
 
+  appleseed = disabledIf isPy3k
+    (toPythonModule (pkgs.appleseed.override {
+      inherit (self) python;
+    }));
+
   application = callPackage ../development/python-modules/application { };
 
   appnope = callPackage ../development/python-modules/appnope { };