diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-10-14 00:03:12 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-10-14 00:03:12 +0200 |
commit | 6eeea6effda7636f003603d96b0a7b98d40ed50d (patch) | |
tree | 6d04cf57390729af85709b2516679ff900791b22 /pkgs/applications | |
parent | efb6052f40f140aded8553aae93caa2ff35d8a7c (diff) |
Python: more evaluation fixups.
Diffstat (limited to 'pkgs/applications')
23 files changed, 19 insertions, 27 deletions
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 5773718b0a4c..fb6c76be0794 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ] - ++ (with pythonPackages; [ python dateutil wxPython30 numpy sqlite3 ]); + ++ (with pythonPackages; [ python dateutil wxPython30 numpy ]); configureFlags = [ "--with-proj-share=${proj}/share/proj" diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index c88c3337c928..20c01f77bbf8 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -9,7 +9,7 @@ python27Packages.buildPythonApplication rec { sha256 = "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy"; }; - propagatedBuildInputs = with python27Packages; [ pygtk pillow sqlite3 ]; + propagatedBuildInputs = with python27Packages; [ pygtk pillow ]; meta = { description = "Image viewer designed to handle comic books"; diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 84a122d6fd71..e67480fb3c7a 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec { substituteInPlace $out/bin/bleachbit --replace "#!/usr/bin/env python" "#!${pythonPackages.python.interpreter}" ''; - propagatedBuildInputs = with pythonPackages; [ pygtk sqlite3 ]; + propagatedBuildInputs = with pythonPackages; [ pygtk ]; meta = { homepage = "http://bleachbit.sourceforge.net"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d2e618b105b5..61e1f31a8c87 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { python pyqt5 sip poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils ] ++ (with pythonPackages; [ - apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow sqlite3 + apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow # the following are distributed with calibre, but we use upstream instead chardet cherrypy html5lib odfpy routes ]); diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 4198a9f32b25..43e41284f144 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -11,9 +11,6 @@ stdenv.mkDerivation rec { sha256 = "45f1cee4067598cf2ca8ae6f89d03789b86f9e3bf196236119868653420d7cdd"; }; - propagatedBuildInputs = with pythonPackages; - [ sqlite3 ]; - buildInputs = with pythonPackages; [ python gettext wrapPython pygtk dbus-python pygtksourceview ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index d750aea01ef0..4dcb5be8a21d 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -17,7 +17,7 @@ in buildPythonApplication rec { sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060"; }; - pythonPath = with pythonPackages; [ pygobject3 pycairo bsddb ] ++ [ pango ]; + pythonPath = with pythonPackages; [ pygobject3 pycairo ] ++ [ pango ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 3191c00e9ec9..b8bd514c9ff3 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme ]; - propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python sqlite3 ]; + propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ]; configurePhase = '' python waf configure --prefix="$out" diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index 6473d1c25c59..738e8deb0940 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { # Fix up python path so the lockfile library is on it. PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [ - pythonPackages.curses pythonPackages.lockfile + pythonPackages.lockfile ]; buildPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index cc0c07daca40..e03b99aa1718 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pythonPackages.pygobject2 pythonPackages.pyGtkGlade - pythonPackages.sqlite3 pythonPackages.pyasn1 + pythonPackages.pyasn1 pythonPackages.pyxdg pythonPackages.nbxmpp pythonPackages.pyopenssl pythonPackages.dbus-python diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 9675b5d5315a..ec4eb91d6ab1 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax"; }; - buildInputs = with pythonPackages; [ python pyqt4 wrapPython sqlite3 ] ++ [ openssl ]; + buildInputs = with pythonPackages; [ python pyqt4 wrapPython ] ++ [ openssl ]; preConfigure = '' substituteInPlace Makefile \ diff --git a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix index ddb37a3f64b7..fc803fa2745c 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { }; buildInputs = with pythonPackages; [ python wrapPython ]; - pythonPath = [ pythonPackages.curses ]; installPhase = '' install -D transmission-remote-cli $out/bin/transmission-remote-cli diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 210dbaf41c84..890271916544 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { pythonPath = [ libtorrentRasterbar pythonPackages.wxPython - pythonPackages.curses pythonPackages.apsw pythonPackages.twisted pythonPackages.gmpy @@ -32,7 +31,6 @@ stdenv.mkDerivation rec { pythonPackages.requests pythonPackages.setuptools pythonPackages.m2crypto - pythonPackages.sqlite3 ]; installPhase = diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index ca003da9c46b..3afb7ce4b10a 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "09xdsskk5rc3xsf1v1vq7nkdxrxy8w2fixx2vdv8c97ak6a4hrca"; }; - propagatedBuildInputs = with python3Packages; [ python readline ]; + propagatedBuildInputs = with python3Packages; [ python ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 3f3b5c2966c5..b8d04baf356d 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; }; - propagatedBuildInputs = with pythonPackages; [ sqlite3 pyGtkGlade ]; + propagatedBuildInputs = with pythonPackages; [ pyGtkGlade ]; # Testing fails. doCheck = false; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index ec33388f0869..cda8fc63a127 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl"; }; - propagatedBuildInputs = with pythonPackages; [ sqlite3 pyGtkGlade pyxdg pygobject2 ]; + propagatedBuildInputs = with pythonPackages; [ pyGtkGlade pyxdg pygobject2 ]; preBuild = '' export HOME=$TMP diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index bb3bc806a68a..474faa30467b 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { mv *.py $l for p in $out/bin/*.sh; do wrapProgram $p \ - --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages}" \ + --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages or []}" \ --prefix PATH : "$(dirname $(type -p python))":$l done ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 68c680ca9798..547f5f997b98 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/git-remote-hg \ - --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages}" + --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages or []}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 9e08f2fffb16..0652ac7e6642 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -75,7 +75,7 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - pygobject2 pygtk pycurl sqlite3 mutagen pycairo dbus-python + pygobject2 pygtk pycurl mutagen pycairo dbus-python pywebkitgtk] ++ [ libtorrentRasterbar gst_python gst_plugins_base gst_plugins_good gst_ffmpeg ] ++ optional enableBonjour avahi; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index d487f07e3d6d..c2c64bfa4966 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-validate ]) ++ (with python3Packages; [ - python pygobject3 gst-python pyxdg numpy pycairo sqlite3 matplotlib + python pygobject3 gst-python pyxdg numpy pycairo matplotlib dbus-python ]); diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 5cda21066b55..0964e1b4814b 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ eventlet greenlet gflags netaddr carrot routes PasteDeploy m2crypto ipy twisted - distutils_extra simplejson readline glanceclient cheetah lockfile httplib2 + distutils_extra simplejson glanceclient cheetah lockfile httplib2 urlgrabber virtinst pyGtkGlade dbus-python gnome_python pygobject3 libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 36fe43b1d3d9..04223d9a9e9d 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ setuptools eventlet greenlet gflags netaddr carrot routes PasteDeploy m2crypto ipy twisted - distutils_extra simplejson readline glanceclient cheetah lockfile httplib2 + distutils_extra simplejson glanceclient cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that # libxml2Python is a dependency of libvirt.py. libvirt libxml2Python urlgrabber diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 2f65322c3563..3ebb08e4ffde 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation { alsaLib quilt ]; - pythonPath = [ pythonPackages.curses ]; - hardeningDisable = [ "stackprotector" "fortify" "pic" ]; patches = stdenv.lib.optionals ((xenserverPatched == false) && (builtins.hasAttr "xenPatches" xenConfig)) xenConfig.xenPatches; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index d170c9b74785..4b9da41b028c 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -31,7 +31,7 @@ python27Packages.buildPythonApplication rec { buildInputs = [ pkgconfig glib libxcb cairo pango python27Packages.xcffib ]; - pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline]; + pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius ]; postInstall = '' wrapProgram $out/bin/qtile \ |