Browse Source

Remove top-level cython and cython3

See #11567.
nixos-19.03
Frederik Rietdijk 6 years ago
parent
commit
11d1fdfd8b
  1. 4
      pkgs/applications/networking/instant-messengers/blink/default.nix
  2. 22
      pkgs/applications/version-management/reposurgeon/default.nix
  3. 6
      pkgs/development/interpreters/renpy/default.nix
  4. 7
      pkgs/tools/X11/xpra/default.nix
  5. 4
      pkgs/top-level/all-packages.nix
  6. 2
      pkgs/top-level/python-packages.nix

4
pkgs/applications/networking/instant-messengers/blink/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted
{ stdenv, fetchurl, pythonPackages, libvncserver, zlib
, gnutls, libvpx, makeDesktopItem }:
pythonPackages.buildPythonApplication rec {
@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages;[ pyqt4 cjson sipsimple twisted
];
buildInputs = [ cython zlib libvncserver libvpx ];
buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ];
desktopItem = makeDesktopItem {
name = "Blink";

22
pkgs/applications/version-management/reposurgeon/default.nix

@ -1,11 +1,13 @@
{stdenv, fetchurl, makeWrapper, python27, python27Packages, git,
docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto,
cython ? null,
bazaar ? null, cvs ? null, darcs ? null, fossil ? null,
mercurial ? null, monotone ? null, rcs ? null, src ? null,
subversion ? null, cvs_fast_export ? null }:
{ stdenv, fetchurl, makeWrapper, python27Packages, git
, docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto
, bazaar ? null, cvs ? null, darcs ? null, fossil ? null
, mercurial ? null, monotone ? null, rcs ? null, src ? null
, subversion ? null, cvs_fast_export ? null }:
with stdenv; with lib;
mkDerivation rec {
let
inherit (python27Packages) python cython;
in mkDerivation rec {
name = "reposurgeon-${meta.version}";
meta = {
description = "A tool for editing version-control repository history";
@ -33,8 +35,8 @@ mkDerivation rec {
makeFlagsArray=(
XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
prefix="$out"
pyinclude="-I${python27}/include/python2.7"
pylib="-L${python27}/lib -lpython2.7"
pyinclude="-I${python}/include/python2.7"
pylib="-L${python}/lib -lpython2.7"
)
'';
@ -51,7 +53,7 @@ mkDerivation rec {
[ out git bazaar cvs darcs fossil mercurial
monotone rcs src subversion cvs_fast_export ]
);
pythonpath = makeSearchPathOutput "lib" python27.sitePackages (
pythonpath = makeSearchPathOutput "lib" python.sitePackages (
filter (x: x != null)
[ python27Packages.readline or null python27Packages.hglib or null ]
);

6
pkgs/development/interpreters/renpy/default.nix

@ -1,7 +1,9 @@
{ stdenv, fetchurl, python, cython, pkgconfig, wrapPython
, pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL
, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
}:
with pythonPackages;
stdenv.mkDerivation {
name = "renpy-6.17.6";

7
pkgs/tools/X11/xpra/default.nix

@ -1,11 +1,12 @@
{ stdenv, fetchurl, buildPythonApplication, pythonPackages
, python, cython, pkgconfig
{ stdenv, fetchurl, pythonPackages, pkgconfig
, xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo
, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config
, ffmpeg, x264, libvpx, libwebp
, libfakeXinerama }:
buildPythonApplication rec {
let
inherit (pythonPackages) python cython buildPythonApplication;
in buildPythonApplication rec {
name = "xpra-0.17.4";
namePrefix = "";
src = fetchurl {

4
pkgs/top-level/all-packages.nix

@ -4398,9 +4398,6 @@ in
cryptol = self.haskell.packages.lts.cryptol;
cython = pythonPackages.cython;
cython3 = python3Packages.cython;
devpi-client = callPackage ../development/tools/devpi-client {};
drumstick = callPackage ../development/libraries/drumstick { };
@ -5972,7 +5969,6 @@ in
regina = callPackage ../development/interpreters/regina { };
renpy = callPackage ../development/interpreters/renpy {
wrapPython = pythonPackages.wrapPython;
ffmpeg = ffmpeg_2;
};

2
pkgs/top-level/python-packages.nix

@ -21361,7 +21361,7 @@ in modules // {
sha256 = "768e568f3299966c294b7eb8cd114fc648f7bfaef422ee9cc750dd8d9d09e44b";
};
buildInputs = with self; [ pkgs.cython nose numpy six ];
buildInputs = with self; [ cython nose numpy six ];
propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy ];

Loading…
Cancel
Save