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