From 3028233ea5b6c4fc9aff11472ac0e8db68f29e1e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 15 Sep 2019 12:45:02 -0500 Subject: [PATCH 1/2] pythonPackages.pika: remove pyev dependency pyev support was removed from upstream https://github.com/pika/pika/pull/934#issuecomment-361714844 --- pkgs/development/python-modules/pika/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index 28ca8a3e498c..b09c4a240e51 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -1,12 +1,8 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k , nose , mock -, pyyaml -, unittest2 -, pyev , twisted , tornado }: @@ -20,11 +16,7 @@ buildPythonPackage rec { sha256 = "1gqx9avb9nwgiyw5nz08bf99v9b0hvzr1pmqn9wbhd2hnsj6p9wz"; }; - # Tests require twisted which is only availalble for python-2.x - doCheck = !isPy3k; - - buildInputs = [ nose mock pyyaml unittest2 pyev ] - ++ stdenv.lib.optionals (!isPy3k) [ twisted tornado ]; + checkInputs = [ nose mock twisted tornado ]; meta = with stdenv.lib; { description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; From b05818f3897c1cac0806ef89a6b0b09e9b3f3c76 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 15 Sep 2019 12:46:58 -0500 Subject: [PATCH 2/2] pythonPackages.pyev: drop pyev is unmaintained, and was removed from PyPI. --- .../python-modules/pyev/default.nix | 30 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/development/python-modules/pyev/default.nix diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix deleted file mode 100644 index b5ca0c7ef6cf..000000000000 --- a/pkgs/development/python-modules/pyev/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, buildPythonPackage, libev }: - -buildPythonPackage rec { - pname = "pyev"; - version = "0.9.0"; - - src = fetchurl { - url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz"; - sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; - }; - - buildInputs = [ libev ]; - - libEvSharedLibrary = - if !stdenv.isDarwin - then "${libev}/lib/libev.so.4" - else "${libev}/lib/libev.4.dylib"; - - postPatch = '' - test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; } - sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py - ''; - - meta = with stdenv.lib; { - description = "Python bindings for libev"; - homepage = https://code.google.com/p/pyev/; - license = licenses.gpl3; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62901ef20520..6bc54ebef679 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4380,8 +4380,6 @@ in { pyenchant = callPackage ../development/python-modules/pyenchant { }; - pyev = callPackage ../development/python-modules/pyev { }; - pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; pyext = callPackage ../development/python-modules/pyext { };