JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Python: more evaluation fixups.

Browse Source
This commit is contained in:
Vladimír Čunát 2016-10-14 00:03:12 +02:00
parent efb6052f40
commit 6eeea6effd
35 changed files with 34 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/gis/grass/default.nix
View File

@ -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"

2
pkgs/applications/graphics/mcomix/default.nix
View File

@ -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";

2
pkgs/applications/misc/bleachbit/default.nix
View File

@ -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";

2
pkgs/applications/misc/calibre/default.nix
View File

@ -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
]);

3
pkgs/applications/misc/cherrytree/default.nix
View File

@ -11,9 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "45f1cee4067598cf2ca8ae6f89d03789b86f9e3bf196236119868653420d7cdd";
};
propagatedBuildInputs = with pythonPackages;
[ sqlite3 ];
buildInputs = with pythonPackages;
[ python gettext wrapPython pygtk dbus-python pygtksourceview ];

2
pkgs/applications/misc/gramps/default.nix
View File

@ -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.

2
pkgs/applications/misc/hamster-time-tracker/default.nix
View File

@ -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"

2
pkgs/applications/misc/roxterm/default.nix
View File

@ -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 = ''

2
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -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

2
pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
View File

@ -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 \

1
pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
View File

@ -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

2
pkgs/applications/networking/p2p/tribler/default.nix
View File

@ -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 =

2
pkgs/applications/office/beancount/bean-add.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "09xdsskk5rc3xsf1v1vq7nkdxrxy8w2fixx2vdv8c97ak6a4hrca";
};
propagatedBuildInputs = with python3Packages; [ python readline ];
propagatedBuildInputs = with python3Packages; [ python ];
installPhase = ''
mkdir -p $out/bin/

2
pkgs/applications/office/keepnote/default.nix
View File

@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication {
sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh";
};
propagatedBuildInputs = with pythonPackages; [ sqlite3 pyGtkGlade ];
propagatedBuildInputs = with pythonPackages; [ pyGtkGlade ];
# Testing fails.
doCheck = false;

2
pkgs/applications/office/zim/default.nix
View File

@ -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

2
pkgs/applications/version-management/git-and-tools/fast-export/default.nix
View File

@ -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
'';

2
pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
View File

@ -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; {

2
pkgs/applications/video/miro/default.nix
View File

@ -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;

2
pkgs/applications/video/pitivi/default.nix
View File

@ -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
]);

2
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -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

2
pkgs/applications/virtualization/virtinst/default.nix
View File

@ -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

2
pkgs/applications/virtualization/xen/generic.nix
View File

@ -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;

2
pkgs/applications/window-managers/qtile/default.nix
View File

@ -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 \

1
pkgs/games/mnemosyne/default.nix
View File

@ -14,7 +14,6 @@ in pythonPackages.buildPythonApplication rec {
pyqt4
matplotlib
cherrypy
sqlite3
webob
];
preConfigure = ''

4
pkgs/misc/solfege/default.nix
View File

@ -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 = ''

1
pkgs/os-specific/linux/apparmor/default.nix
View File

@ -82,7 +82,6 @@ let
buildInputs = [
perl
pythonPackages.python
pythonPackages.readline
libapparmor
libapparmor.python
];

2
pkgs/os-specific/linux/iotop/default.nix
View File

@ -8,8 +8,6 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0nzprs6zqax0cwq8h7hnszdl3d2m4c2d4vjfxfxbnjfs9sia5pis";
};
propagatedBuildInputs = [ pythonPackages.curses ];
doCheck = false;
meta = {

2
pkgs/tools/networking/httpie/default.nix
View File

@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0jvzxr8r6cy6ipknkw95qf8rz69nqdv5nky87h1vcp5pf8mgza1h";
};
propagatedBuildInputs = with pythonPackages; [ pygments requests2 curses ];
propagatedBuildInputs = with pythonPackages; [ pygments requests2 ];
doCheck = false;

4
pkgs/tools/networking/offlineimap/default.nix
View File

@ -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";

2
pkgs/tools/networking/p2p/tahoe-lafs/default.nix
View File

@ -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
];

2
pkgs/tools/networking/wicd/default.nix
View File

@ -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
'';

1
pkgs/tools/package-management/nixops/generic.nix
View File

@ -14,7 +14,6 @@ pythonPackages.buildPythonApplication {
pythonPath =
[ pythonPackages.prettytable
pythonPackages.boto
pythonPackages.sqlite3
pythonPackages.hetzner
pythonPackages.libcloud
pythonPackages.azure-storage

2
pkgs/tools/security/tor/tor-arm.nix
View File

@ -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"
'';

8
pkgs/top-level/all-packages.nix
View File

@ -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 { };

10
pkgs/top-level/python-packages.nix
View File

@ -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;