diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-14 12:01:09 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-14 12:01:09 +0200 |
commit | 11d1fdfd8bf5411218571ef9fb9441705b23c459 (patch) | |
tree | 2833140b5b35d367e92105f8cc85fd99f0bebcf9 /pkgs/applications | |
parent | 9fc37cc89cdbe183b3bf613035e45c793989575d (diff) |
Remove top-level cython and cython3
See #11567.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/blink/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/version-management/reposurgeon/default.nix | 22 |
2 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index d2a08b98c0760..e771db3795b50 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/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"; diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 55858034b1c4e..2408621b9cf90 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/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 ] ); |