From 0418d8299d17e7efac7585bf7843c4a3356e9316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 6 Sep 2014 22:24:56 +0200 Subject: [PATCH] disable a bunch of python packages on pypy --- pkgs/development/python-modules/sip/4.16.nix | 4 ++-- pkgs/development/python-modules/sip/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 9 ++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/sip/4.16.nix b/pkgs/development/python-modules/sip/4.16.nix index aa1fb198438..210346062f9 100644 --- a/pkgs/development/python-modules/sip/4.16.nix +++ b/pkgs/development/python-modules/sip/4.16.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchurl, python, isPyPy }: -stdenv.mkDerivation rec { +if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { name = "sip-4.16.1"; src = fetchurl { diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index db397f95944..cf3a0149844 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchurl, python, isPyPy }: -stdenv.mkDerivation rec { +if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { name = "sip-4.14.7"; # kde410.pykde4 doesn't build with 4.15 src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 982f053da24..d1ad28a9cde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -188,12 +188,12 @@ rec { sip = import ../development/python-modules/sip { inherit (pkgs) stdenv fetchurl; - inherit python; + inherit python isPyPy; }; sip_4_16 = import ../development/python-modules/sip/4.16.nix { inherit (pkgs) stdenv fetchurl; - inherit python; + inherit python isPyPy; }; tables = import ../development/python-modules/tables { @@ -440,6 +440,7 @@ rec { apsw = buildPythonPackage rec { name = "apsw-3.7.6.2-r1"; + disabled = isPyPy; src = fetchurl { url = "http://apsw.googlecode.com/files/${name}.zip"; @@ -2005,6 +2006,7 @@ rec { eyeD3 = buildPythonPackage rec { version = "0.7.4"; name = "eyeD3-${version}"; + disabled = isPyPy; src = fetchurl { url = "http://eyed3.nicfit.net/releases/${name}.tgz"; @@ -6478,6 +6480,7 @@ rec { pyparted = buildPythonPackage rec { name = "pyparted-${version}"; version = "3.10"; + disabled = isPyPy; src = fetchurl { url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz"; @@ -8536,7 +8539,7 @@ rec { smmap = buildPythonPackage rec { name = "smmap-0.8.2"; - disabled = isPy3k; # next release will have py3k support + disabled = isPy3k || isPyPy; # next release will have py3k/pypy support meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; src = fetchurl {