From 6eeea6effda7636f003603d96b0a7b98d40ed50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 14 Oct 2016 00:03:12 +0200 Subject: [PATCH] Python: more evaluation fixups. --- pkgs/applications/gis/grass/default.nix | 2 +- pkgs/applications/graphics/mcomix/default.nix | 2 +- pkgs/applications/misc/bleachbit/default.nix | 2 +- pkgs/applications/misc/calibre/default.nix | 2 +- pkgs/applications/misc/cherrytree/default.nix | 3 --- pkgs/applications/misc/gramps/default.nix | 2 +- .../applications/misc/hamster-time-tracker/default.nix | 2 +- pkgs/applications/misc/roxterm/default.nix | 2 +- .../networking/instant-messengers/gajim/default.nix | 2 +- .../instant-messengers/pybitmessage/default.nix | 2 +- .../networking/p2p/transmission-remote-cli/default.nix | 1 - pkgs/applications/networking/p2p/tribler/default.nix | 2 -- pkgs/applications/office/beancount/bean-add.nix | 2 +- pkgs/applications/office/keepnote/default.nix | 2 +- pkgs/applications/office/zim/default.nix | 2 +- .../git-and-tools/fast-export/default.nix | 2 +- .../git-and-tools/git-remote-hg/default.nix | 2 +- pkgs/applications/video/miro/default.nix | 2 +- pkgs/applications/video/pitivi/default.nix | 2 +- .../virtualization/virt-manager/default.nix | 2 +- pkgs/applications/virtualization/virtinst/default.nix | 2 +- pkgs/applications/virtualization/xen/generic.nix | 2 -- pkgs/applications/window-managers/qtile/default.nix | 2 +- pkgs/games/mnemosyne/default.nix | 1 - pkgs/misc/solfege/default.nix | 4 ++-- pkgs/os-specific/linux/apparmor/default.nix | 1 - pkgs/os-specific/linux/iotop/default.nix | 2 -- pkgs/tools/networking/httpie/default.nix | 2 +- pkgs/tools/networking/offlineimap/default.nix | 4 ++-- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 2 +- pkgs/tools/networking/wicd/default.nix | 2 +- pkgs/tools/package-management/nixops/generic.nix | 1 - pkgs/tools/security/tor/tor-arm.nix | 2 +- pkgs/top-level/all-packages.nix | 8 ++------ pkgs/top-level/python-packages.nix | 10 +++++----- 35 files changed, 34 insertions(+), 51 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 5773718b0a4..fb6c76be079 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 c88c3337c92..20c01f77bbf 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 84a122d6fd7..e67480fb3c7 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 d2e618b105b..61e1f31a8c8 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 4198a9f32b2..43e41284f14 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 d750aea01ef..4dcb5be8a21 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 3191c00e9ec..b8bd514c9ff 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 6473d1c25c5..738e8deb094 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 cc0c07daca4..e03b99aa171 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 9675b5d5315..ec4eb91d6ab 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 ddb37a3f64b..fc803fa2745 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 210dbaf41c8..89027191654 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 ca003da9c46..3afb7ce4b10 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 3f3b5c2966c..b8d04baf356 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 ec33388f086..cda8fc63a12 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 bb3bc806a68..474faa30467 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 68c680ca979..547f5f997b9 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 9e08f2fffb1..0652ac7e664 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 d487f07e3d6..c2c64bfa496 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 5cda21066b5..0964e1b4814 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 36fe43b1d3d..04223d9a9e9 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 2f65322c356..3ebb08e4ffd 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 d170c9b7478..4b9da41b028 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 \ diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 0d419c08b00..c1bde5fcbc3 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -14,7 +14,6 @@ in pythonPackages.buildPythonApplication rec { pyqt4 matplotlib cherrypy - sqlite3 webob ]; preConfigure = '' diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 8e9083d9922..114e18dc93f 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo -, ghostscript, pysqlite, librsvg, gdk_pixbuf, txt2man, timidity, mpg123 +, ghostscript, librsvg, gdk_pixbuf, txt2man, timidity, mpg123 , alsaUtils, vorbis-tools, csound, lilypond , makeWrapper }: @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig python pygtk gettext texinfo - ghostscript pysqlite librsvg gdk_pixbuf txt2man makeWrapper + ghostscript librsvg gdk_pixbuf txt2man makeWrapper ]; preBuild = '' diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index f58a7557ce3..b576ca71d58 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -82,7 +82,6 @@ let buildInputs = [ perl pythonPackages.python - pythonPackages.readline libapparmor libapparmor.python ]; diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index 505468d849a..b1372e09ae5 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -8,8 +8,6 @@ pythonPackages.buildPythonApplication rec { sha256 = "0nzprs6zqax0cwq8h7hnszdl3d2m4c2d4vjfxfxbnjfs9sia5pis"; }; - propagatedBuildInputs = [ pythonPackages.curses ]; - doCheck = false; meta = { diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index c960528322b..a3c0d47d3e7 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0jvzxr8r6cy6ipknkw95qf8rz69nqdv5nky87h1vcp5pf8mgza1h"; }; - propagatedBuildInputs = with pythonPackages; [ pygments requests2 curses ]; + propagatedBuildInputs = with pythonPackages; [ pygments requests2 ]; doCheck = false; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 564eea23184..93541bd0603 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, sqlite3 }: +{ stdenv, fetchFromGitHub, pythonPackages, }: pythonPackages.buildPythonApplication rec { version = "7.0.6"; @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = [ sqlite3 pythonPackages.six ]; + propagatedBuildInputs = [ pythonPackages.six ]; meta = { description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers"; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index b01566bed07..6b88d2d2b7d 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -34,7 +34,7 @@ pythonPackages.buildPythonApplication rec { # The `backup' command requires `sqlite3'. propagatedBuildInputs = with pythonPackages; [ - twisted foolscap nevow simplejson zfec pycryptopp sqlite3 darcsver + twisted foolscap nevow simplejson zfec pycryptopp darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface service-identity ]; diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index d693b8db953..2613fe7ab09 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.urwid})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in rm po/ast.po ''; diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 7948ebc43fb..666efaecfc9 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -14,7 +14,6 @@ pythonPackages.buildPythonApplication { pythonPath = [ pythonPackages.prettytable pythonPackages.boto - pythonPackages.sqlite3 pythonPackages.hetzner pythonPackages.libcloud pythonPackages.azure-storage diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix index 1857cfcbe22..432b1cbfcee 100644 --- a/pkgs/tools/security/tor/tor-arm.nix +++ b/pkgs/tools/security/tor/tor-arm.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { cp -R src/TorCtl $out/libexec wrapProgram $out/bin/arm \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pythonPackages.curses}):$out/libexec:$PYTHONPATH" \ + --prefix PYTHONPATH : "$(toPythonPath $out):$out/libexec:$PYTHONPATH" \ --set TERMINFO "${ncurses.out}/share/terminfo" \ --set TERM "xterm" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0514b6c3fc..81b03c290a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2955,9 +2955,7 @@ in odt2txt = callPackage ../tools/text/odt2txt { }; - offlineimap = callPackage ../tools/networking/offlineimap { - inherit (pythonPackages) sqlite3; - }; + offlineimap = callPackage ../tools/networking/offlineimap { }; oh-my-zsh = callPackage ../shells/oh-my-zsh { }; @@ -16918,9 +16916,7 @@ in nut = callPackage ../applications/misc/nut { }; - solfege = callPackage ../misc/solfege { - pysqlite = pkgs.pythonPackages.sqlite3; - }; + solfege = callPackage ../misc/solfege { }; disnix = callPackage ../tools/package-management/disnix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9abcd96648a..5f6c2e2ac88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -901,7 +901,7 @@ in { windowsSupport = true; propagatedBuildInputs = with self; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six readline + pycrypto paramiko jinja2 pyyaml httplib2 boto six ] ++ optional windowsSupport pywinrm; meta = with stdenv.lib; { @@ -6794,7 +6794,7 @@ in { repo = "GateOne"; sha256 = "1ghrawlqwv7wnck6alqpbwy9mpv0y21cw2jirrvsxaracmvgk6vv"; }; - propagatedBuildInputs = with self; [tornado futures html5lib readline pkgs.openssl pkgs.cacert pkgs.openssh]; + propagatedBuildInputs = with self; [tornado futures html5lib pkgs.openssl pkgs.cacert pkgs.openssh]; meta = { homepage = https://liftoffsoftware.com/; description = "GateOne is a web-based terminal emulator and SSH client"; @@ -15689,7 +15689,7 @@ in { sha256 = "1v49sym6mrci9dxy0a7cpbp4bv6fg2ijj6rwk4wzg18c2x4qzkhn"; }; - propagatedBuildInputs = with self; [ curses livestreamer ]; + propagatedBuildInputs = with self; [ livestreamer ]; meta = { homepage = https://github.com/gapato/livestreamer-curses; @@ -21931,7 +21931,7 @@ in { disabled = isPy3k; - propagatedBuildInputs = with self; [ pkgs.root readline numpy matplotlib ]; + propagatedBuildInputs = with self; [ pkgs.root numpy matplotlib ]; meta = { homepage = "http://www.rootpy.org"; @@ -22003,7 +22003,7 @@ in { url = "mirror://pypi/r/ropper/${name}.tar.gz"; sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87"; }; - propagatedBuildInputs = with self; [ capstone filebytes readline ]; + propagatedBuildInputs = with self; [ capstone filebytes ]; meta = with pkgs.stdenv.lib; { homepage = "https://scoding.de/ropper/"; license = licenses.gpl2;