From 7986b718f3129332454f105d86fb30ab78812943 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 13:52:23 +0200 Subject: Remove pycairo from top-level See #11567. --- pkgs/applications/misc/gramps/default.nix | 9 ++++--- pkgs/applications/search/catfish/default.nix | 2 +- .../version-management/meld/default.nix | 20 +++++++-------- pkgs/applications/video/miro/default.nix | 27 +++++++++---------- pkgs/tools/X11/xpra/default.nix | 2 +- pkgs/tools/networking/wicd/default.nix | 30 ++++++++++++---------- pkgs/tools/security/nmap/default.nix | 11 ++++---- pkgs/top-level/all-packages.nix | 4 --- pkgs/top-level/python-packages.nix | 5 ++-- 9 files changed, 53 insertions(+), 57 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 79393eee7f1..d750aea01ef 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, gtk3, pythonPackages, python, pycairo, pygobject3, intltool, +{ stdenv, fetchurl, gtk3, pythonPackages, intltool, pango, gsettings_desktop_schemas }: -pythonPackages.buildPythonApplication rec { +let + inherit (pythonPackages) python buildPythonApplication; +in buildPythonApplication rec { version = "4.1.1"; name = "gramps-${version}"; - namePrefix = ""; buildInputs = [ intltool gtk3 ]; @@ -16,7 +17,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060"; }; - pythonPath = [ pygobject3 pango pycairo pythonPackages.bsddb ]; + pythonPath = with pythonPackages; [ pygobject3 pycairo bsddb ] ++ [ pango ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index bad10a8607a..f6df5fc496d 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils, pycairo, +{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils, gnome3, pythonPackages, wrapGAppsHook }: pythonPackages.buildPythonApplication rec { diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 99e45438984..503ae4e90b9 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, wrapGAppsHook -, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo, file +{ stdenv, fetchurl, itstool, pythonPackages, intltool, wrapGAppsHook +, libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file }: let minor = "3.16"; version = "${minor}.2"; -in - -buildPythonApplication rec { + inherit (pythonPackages) python buildPythonApplication pycairo pygobject3; +in buildPythonApplication rec { name = "meld-${version}"; - namePrefix = ""; src = fetchurl { url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; @@ -18,19 +16,19 @@ buildPythonApplication rec { }; buildInputs = [ - python27 intltool wrapGAppsHook itstool libxml2 + intltool wrapGAppsHook itstool libxml2 gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo gnome3.defaultIconTheme gnome3.dconf file ]; propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ]; installPhase = '' - mkdir -p "$out/lib/${python27.libPrefix}/site-packages" + mkdir -p "$out/lib/${python.libPrefix}/site-packages" - export PYTHONPATH="$out/lib/${python27.libPrefix}/site-packages:$PYTHONPATH" + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ${python27}/bin/${python27.executable} setup.py install \ - --install-lib=$out/lib/${python27.libPrefix}/site-packages \ + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ --prefix="$out" mkdir -p $out/share/gsettings-schemas/$name diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 07d60fe4764..266f3978b99 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python, buildPythonApplication, pythonPackages, pkgconfig -, pyrex096, ffmpeg, boost, glib, pygobject, gtk2, webkitgtk2, libsoup, pygtk -, taglib, sqlite, pycurl, mutagen, pycairo, pythonDBus, pywebkitgtk +{ stdenv, fetchurl, pkgconfig +, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup +, taglib, sqlite , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas , gst_python, gst_plugins_base, gst_plugins_good, gst_ffmpeg , enableBonjour ? false, avahi ? null @@ -10,10 +10,11 @@ assert enableBonjour -> avahi != null; with stdenv.lib; -buildPythonApplication rec { - name = "miro-${version}"; - namePrefix = ""; +let + inherit (pythonPackages) python buildPythonApplication; version = "6.0"; +in buildPythonApplication rec { + name = "miro-${version}"; src = fetchurl { url = "http://ftp.osuosl.org/pub/pculture.org/miro/src/${name}.tar.gz"; @@ -56,7 +57,7 @@ buildPythonApplication rec { preInstall = '' # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix - ${python}/bin/${python.executable} setup.py install_data --root=$out + ${python.interpreter} setup.py install_data --root=$out sed -i '/data_files=data_files/d' setup.py ''; @@ -68,14 +69,14 @@ buildPythonApplication rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; - buildInputs = [ - pkgconfig pyrex096 ffmpeg boost glib pygobject gtk2 webkitgtk2 libsoup - pygtk taglib gsettings_desktop_schemas sqlite + buildInputs = with pythonPackages; [ pygtk pygobject ] ++ [ + pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk2 libsoup + taglib gsettings_desktop_schemas sqlite ]; - propagatedBuildInputs = [ - pygobject pygtk pycurl python.modules.sqlite3 mutagen pycairo pythonDBus - pywebkitgtk libtorrentRasterbar + propagatedBuildInputs = with pythonPackages; [ + pygobject pygtk pycurl sqlite3 mutagen pycairo dbus + pywebkitgtk] ++ [ libtorrentRasterbar gst_python gst_plugins_base gst_plugins_good gst_ffmpeg ] ++ optional enableBonjour avahi; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 4964e47ddc0..27a3deca736 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pythonPackages, pkgconfig -, xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo +, xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 8013e6d00cd..fe6ad74c236 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,8 +1,11 @@ -{stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus, - wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute, iputils, - pythonPackages, locale ? "C" }: +{ stdenv, fetchurl, pythonPackages +, wpa_supplicant, dhcp, dhcpcd, wirelesstools +, nettools, openresolv, iproute, iputils +, locale ? "C" }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygobject dbus pyGtkGlade pycairo; +in stdenv.mkDerivation rec { name = "wicd-${version}"; version = "1.7.2.4"; @@ -11,9 +14,8 @@ stdenv.mkDerivation rec { sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw"; }; - buildInputs = [ - python pythonPackages.Babel - pythonPackages.urwid pythonPackages.notify + buildInputs = with pythonPackages; [ + python Babel urwid notify ]; patches = [ @@ -31,20 +33,20 @@ stdenv.mkDerivation rec { # !!! Should use makeWrapper. postPatch = '' # We don't have "python2". - substituteInPlace wicd/wicd-daemon.py --replace 'misc.find_path("python2")' "'${python}/bin/python'" + substituteInPlace wicd/wicd-daemon.py --replace 'misc.find_path("python2")' "'${python.interpreter}'" substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${dbus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in 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 ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus})\$\{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 ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus}):$(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 ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in rm po/ast.po ''; @@ -90,7 +92,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - python setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages + python setup.py install --prefix=$out --install-lib=$out/${python.sitePackages} mkdir -p $out/share/other cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 415f8f52a47..f9c7dba5660 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -2,16 +2,15 @@ , graphicalSupport ? false , libX11 ? null , gtk ? null -, python ? null -, pygtk ? null +, pythonPackages , makeWrapper ? null -, pygobject ? null -, pycairo ? null -, pysqlite ? null }: with stdenv.lib; -stdenv.mkDerivation rec { + +let + inherit (pythonPackages) python pygtk pygobject pycairo pysqlite; +in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; version = "7.12"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a95b7103208..cec1083f250 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2775,7 +2775,6 @@ in nmap = callPackage ../tools/security/nmap { }; nmap_graphical = callPackage ../tools/security/nmap { - inherit (pythonPackages) pysqlite; graphicalSupport = true; }; @@ -8757,7 +8756,6 @@ in minmay = callPackage ../development/libraries/minmay { }; miro = callPackage ../applications/video/miro { - inherit (pythonPackages) pywebkitgtk pycurl mutagen; avahi = avahi.override { withLibdnssdCompat = true; }; @@ -10052,8 +10050,6 @@ in bsddb3 = pythonPackages.bsddb3; - pycairo = pythonPackages.pycairo; - pycapnp = pythonPackages.pycapnp; pycrypto = pythonPackages.pycrypto; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d713bc9e138..833cc92d259 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -240,8 +240,7 @@ in modules // { pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}"; - pycairo = callPackage ../development/python-modules/pycairo { - }; + pycairo = callPackage ../development/python-modules/pycairo { }; pycangjie = if isPy3k then callPackage ../development/python-modules/pycangjie { } else throw "pycangjie not supported for interpreter ${python.executable}"; @@ -26219,7 +26218,7 @@ in modules // { sha256 = "472a4403fd5b5364939aee10e78f171b1489e5f6bfe6f150ed9cae8476410114"; }; - propagatedBuildInputs = with self; [ django_1_5 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ]; + propagatedBuildInputs = with self; [ django_1_5 django_tagging modules.sqlite3 whisper pycairo ldap memcached ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ -- cgit 1.4.1