From 91adf1bb65a95e1ecb47e4fa4bbd7f8d969cdc48 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 16:07:29 +0100 Subject: [PATCH] python: remove PIL Remove it once and for all. --- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/python-packages.nix | 44 ------------------------------ 2 files changed, 46 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f82399764102..808a9f4b5271 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8981,8 +8981,6 @@ let numeric = callPackage ../development/python-modules/numeric { }; - pil = pythonPackages.pil; - psyco = callPackage ../development/python-modules/psyco { }; pycairo = pythonPackages.pycairo; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8621a8a8f115..ee4351537036 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13212,50 +13212,6 @@ in modules // { }; }; - - pil = buildPythonPackage rec { - name = "PIL-${version}"; - version = "1.1.7"; - - src = pkgs.fetchurl { - url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; - sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9"; - }; - - buildInputs = with self; [ python pkgs.libjpeg pkgs.zlib pkgs.freetype ]; - - disabled = isPy3k; - - postInstall = "ln -s $out/${python.sitePackages} $out/${python.sitePackages}/PIL"; - - preConfigure = '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${pkgs.freetype}")|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${pkgs.libjpeg}")|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${pkgs.zlib}")|g ;' - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # Remove impurities - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; - - checkPhase = "${python.interpreter} selftest.py"; - - meta = { - homepage = http://www.pythonware.com/products/pil/; - description = "The Python Imaging Library (PIL)"; - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - license = "http://www.pythonware.com/products/pil/license.htm"; - }; - }; - - pillow = buildPythonPackage rec { name = "Pillow-2.9.0";