Remove top-level cython and cython3

See #11567.

+23 -22
+2 -2
pkgs/applications/networking/instant-messengers/blink/default.nix
··· 1 - { stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted 2 , gnutls, libvpx, makeDesktopItem }: 3 4 pythonPackages.buildPythonApplication rec { ··· 18 propagatedBuildInputs = with pythonPackages;[ pyqt4 cjson sipsimple twisted 19 ]; 20 21 - buildInputs = [ cython zlib libvncserver libvpx ]; 22 23 desktopItem = makeDesktopItem { 24 name = "Blink";
··· 1 + { stdenv, fetchurl, pythonPackages, libvncserver, zlib 2 , gnutls, libvpx, makeDesktopItem }: 3 4 pythonPackages.buildPythonApplication rec { ··· 18 propagatedBuildInputs = with pythonPackages;[ pyqt4 cjson sipsimple twisted 19 ]; 20 21 + buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ]; 22 23 desktopItem = makeDesktopItem { 24 name = "Blink";
+12 -10
pkgs/applications/version-management/reposurgeon/default.nix
··· 1 - {stdenv, fetchurl, makeWrapper, python27, python27Packages, git, 2 - docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto, 3 - cython ? null, 4 - bazaar ? null, cvs ? null, darcs ? null, fossil ? null, 5 - mercurial ? null, monotone ? null, rcs ? null, src ? null, 6 - subversion ? null, cvs_fast_export ? null }: 7 with stdenv; with lib; 8 - mkDerivation rec { 9 name = "reposurgeon-${meta.version}"; 10 meta = { 11 description = "A tool for editing version-control repository history"; ··· 33 makeFlagsArray=( 34 XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" 35 prefix="$out" 36 - pyinclude="-I${python27}/include/python2.7" 37 - pylib="-L${python27}/lib -lpython2.7" 38 ) 39 ''; 40 ··· 51 [ out git bazaar cvs darcs fossil mercurial 52 monotone rcs src subversion cvs_fast_export ] 53 ); 54 - pythonpath = makeSearchPathOutput "lib" python27.sitePackages ( 55 filter (x: x != null) 56 [ python27Packages.readline or null python27Packages.hglib or null ] 57 );
··· 1 + { stdenv, fetchurl, makeWrapper, python27Packages, git 2 + , docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto 3 + , bazaar ? null, cvs ? null, darcs ? null, fossil ? null 4 + , mercurial ? null, monotone ? null, rcs ? null, src ? null 5 + , subversion ? null, cvs_fast_export ? null }: 6 + 7 with stdenv; with lib; 8 + let 9 + inherit (python27Packages) python cython; 10 + in mkDerivation rec { 11 name = "reposurgeon-${meta.version}"; 12 meta = { 13 description = "A tool for editing version-control repository history"; ··· 35 makeFlagsArray=( 36 XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" 37 prefix="$out" 38 + pyinclude="-I${python}/include/python2.7" 39 + pylib="-L${python}/lib -lpython2.7" 40 ) 41 ''; 42 ··· 53 [ out git bazaar cvs darcs fossil mercurial 54 monotone rcs src subversion cvs_fast_export ] 55 ); 56 + pythonpath = makeSearchPathOutput "lib" python.sitePackages ( 57 filter (x: x != null) 58 [ python27Packages.readline or null python27Packages.hglib or null ] 59 );
+4 -2
pkgs/development/interpreters/renpy/default.nix
··· 1 - { stdenv, fetchurl, python, cython, pkgconfig, wrapPython 2 - , pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib 3 }: 4 5 stdenv.mkDerivation { 6 name = "renpy-6.17.6";
··· 1 + { stdenv, fetchurl, pythonPackages, pkgconfig, SDL 2 + , libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib 3 }: 4 + 5 + with pythonPackages; 6 7 stdenv.mkDerivation { 8 name = "renpy-6.17.6";
+4 -3
pkgs/tools/X11/xpra/default.nix
··· 1 - { stdenv, fetchurl, buildPythonApplication, pythonPackages 2 - , python, cython, pkgconfig 3 , xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo 4 , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config 5 , ffmpeg, x264, libvpx, libwebp 6 , libfakeXinerama }: 7 8 - buildPythonApplication rec { 9 name = "xpra-0.17.4"; 10 namePrefix = ""; 11 src = fetchurl {
··· 1 + { stdenv, fetchurl, pythonPackages, pkgconfig 2 , xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo 3 , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config 4 , ffmpeg, x264, libvpx, libwebp 5 , libfakeXinerama }: 6 7 + let 8 + inherit (pythonPackages) python cython buildPythonApplication; 9 + in buildPythonApplication rec { 10 name = "xpra-0.17.4"; 11 namePrefix = ""; 12 src = fetchurl {
-4
pkgs/top-level/all-packages.nix
··· 4398 4399 cryptol = self.haskell.packages.lts.cryptol; 4400 4401 - cython = pythonPackages.cython; 4402 - cython3 = python3Packages.cython; 4403 - 4404 devpi-client = callPackage ../development/tools/devpi-client {}; 4405 4406 drumstick = callPackage ../development/libraries/drumstick { }; ··· 5972 regina = callPackage ../development/interpreters/regina { }; 5973 5974 renpy = callPackage ../development/interpreters/renpy { 5975 - wrapPython = pythonPackages.wrapPython; 5976 ffmpeg = ffmpeg_2; 5977 }; 5978
··· 4398 4399 cryptol = self.haskell.packages.lts.cryptol; 4400 4401 devpi-client = callPackage ../development/tools/devpi-client {}; 4402 4403 drumstick = callPackage ../development/libraries/drumstick { }; ··· 5969 regina = callPackage ../development/interpreters/regina { }; 5970 5971 renpy = callPackage ../development/interpreters/renpy { 5972 ffmpeg = ffmpeg_2; 5973 }; 5974
+1 -1
pkgs/top-level/python-packages.nix
··· 21361 sha256 = "768e568f3299966c294b7eb8cd114fc648f7bfaef422ee9cc750dd8d9d09e44b"; 21362 }; 21363 21364 - buildInputs = with self; [ pkgs.cython nose numpy six ]; 21365 21366 propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy ]; 21367
··· 21361 sha256 = "768e568f3299966c294b7eb8cd114fc648f7bfaef422ee9cc750dd8d9d09e44b"; 21362 }; 21363 21364 + buildInputs = with self; [ cython nose numpy six ]; 21365 21366 propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy ]; 21367