diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 55337bf1d3a..7b724ca3d01 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, mygpoclient, intltool +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, mygpoclient, intltool , ipodSupport ? true, libgpod , gnome3 }: -buildPythonPackage rec { +buildPythonApplication rec { name = "gpodder-${version}"; namePrefix = ""; diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index b11e1ac0fa7..c0a137d7de9 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, gettext, klick}: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "gtklick-${version}"; namePrefix = ""; version = "0.6.4"; diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index 314361329c7..ea182d73a5b 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "lastfmsubmitd-${version}"; namePrefix = ""; version = "1.0.6"; diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix index 2cffb0ebacf..168a67a53f0 100644 --- a/pkgs/applications/audio/lastwatch/default.nix +++ b/pkgs/applications/audio/lastwatch/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "lastwatch-${version}"; namePrefix = ""; version = "0.4.1"; diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix index b337dbf6d82..cee3469e3f5 100644 --- a/pkgs/applications/audio/mimms/default.nix +++ b/pkgs/applications/audio/mimms/default.nix @@ -2,7 +2,7 @@ let version = "3.2"; in - pythonPackages.buildPythonPackage { + pythonPackages.buildPythonApplication { name = "mimms-${version}"; src = fetchurl { url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix index 00468db767a..6984593cd41 100644 --- a/pkgs/applications/audio/mopidy-gmusic/default.nix +++ b/pkgs/applications/audio/mopidy-gmusic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-gmusic-${version}"; version = "1.0.0"; diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix index 6bf73c02185..ee3134f5fd8 100644 --- a/pkgs/applications/audio/mopidy-moped/default.nix +++ b/pkgs/applications/audio/mopidy-moped/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-moped-${version}"; version = "0.6.0"; diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix index b7a1fbf2f08..abb9c50d71c 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy-mopify/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-mopify-${version}"; version = "1.5.8"; diff --git a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix index e13a1a978fd..b2bca838cee 100644 --- a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix +++ b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-musicbox-webclient-${version}"; version = "2.0.0"; diff --git a/pkgs/applications/audio/mopidy-soundcloud/default.nix b/pkgs/applications/audio/mopidy-soundcloud/default.nix index c81de3e0d06..09881296164 100644 --- a/pkgs/applications/audio/mopidy-soundcloud/default.nix +++ b/pkgs/applications/audio/mopidy-soundcloud/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-soundcloud-${version}"; version = "2.0.2"; diff --git a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix b/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix index ab07b0f1f68..4d7c1cb7326 100644 --- a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix +++ b/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-spotify-tunigo-${version}"; version = "0.2.1"; diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix index f44f95be140..3a717344aef 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-spotify-${version}"; version = "2.3.1"; diff --git a/pkgs/applications/audio/mopidy-youtube/default.nix b/pkgs/applications/audio/mopidy-youtube/default.nix index efd1425e255..2942cba95f0 100644 --- a/pkgs/applications/audio/mopidy-youtube/default.nix +++ b/pkgs/applications/audio/mopidy-youtube/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-youtube-${version}"; version = "2.0.1"; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index ae53008d58c..29426f43de1 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -2,7 +2,7 @@ , glib_networking, gst_plugins_good, gst_plugins_base, gst_plugins_ugly }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-${version}"; version = "1.1.2"; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index df76b8073b6..2373bbc549d 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildPythonPackage, fetchurl, gettext +{ stdenv, buildPythonApplication, fetchurl, gettext , pkgconfig, libofa, ffmpeg, chromaprint , pyqt4, mutagen, python-libdiscid }: let version = "1.3.2"; in -buildPythonPackage { +buildPythonApplication { name = "picard-${version}"; namePrefix = ""; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 4095d672f82..1083f9434a9 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv, pythonPackages, gtk3, gobjectIntrospection, libnotify , gst_all_1, wrapGAppsHook }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { pname = "pithos"; version = "1.1.2"; name = "${pname}-${version}"; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 38c679d7a3e..56ec0461102 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject, intltool +{ stdenv, fetchurl, python, buildPythonApplication, mutagen, pygtk, pygobject, intltool , pythonDBus, gst_python, withGstPlugins ? false, gst_plugins_base ? null , gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }: @@ -9,7 +9,7 @@ assert withGstPlugins -> gst_plugins_base != null let version = "2.6.3"; in -buildPythonPackage { +buildPythonApplication { # call the package quodlibet and just quodlibet name = "quodlibet-${version}" + stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 74ce6a2c15f..e23a5404368 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,11 +1,11 @@ { pkgs, stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook, - python, buildPythonPackage, isPy3k, + python, buildPythonApplication, isPy3k, gnome3, gtk3, gobjectIntrospection, dbus, pygobject3, mpd2 }: with pkgs.lib; -buildPythonPackage rec { +buildPythonApplication rec { name = "sonata-${version}"; version = "1.7b1"; namePrefix = ""; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 597f9148564..6f540d1d74a 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -1,6 +1,6 @@ { stdenv, pythonPackages, fetchgit }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "leo-editor-${version}"; namePrefix = ""; version = "5.1"; diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index 29402f3b3d8..a6dd7bcb403 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -1,6 +1,6 @@ -{ pkgs, fetchurl, tk, buildPythonPackage, pythonPackages }: +{ pkgs, fetchurl, tk, buildPythonApplication, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { version = "0.9.2"; name = "nvpy-${version}"; diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index e37c2c283e4..8d6c15129cb 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchsvn, buildPythonPackage, python, pyGtkGlade, makeWrapper, pyexiv2, pythonPackages, fbida, which }: +{ stdenv, fetchsvn, buildPythonApplication, python, pyGtkGlade, makeWrapper, pyexiv2, pythonPackages, fbida, which }: -buildPythonPackage rec { +buildPythonApplication rec { name = "jbrout-${version}"; version = "338"; diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 069a4bace28..39d17a32eec 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, python27Packages }: +{ stdenv, fetchurl, buildPythonApplication, python27Packages }: -buildPythonPackage rec { +buildPythonApplication rec { namePrefix = ""; name = "mcomix-1.01"; diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index c4b14388d1b..c3f06544bb4 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pillow, libX11, gettext }: +{ stdenv, fetchurl, buildPythonApplication, python, pygtk, pillow, libX11, gettext }: -buildPythonPackage rec { +buildPythonApplication rec { namePrefix = ""; name = "mirage-0.9.5.2"; diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 511455ba6bb..cfab4195a09 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -1,5 +1,5 @@ { stdenv, pythonPackages, fetchurl }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "bleachbit-${version}"; version = "1.8"; diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix index f046ecc9bf2..7b1bdef4eb5 100644 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ b/pkgs/applications/misc/electrum-dash/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }: +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, slowaes }: -buildPythonPackage rec { +buildPythonApplication rec { name = "electrum-dash-${version}"; version = "2.4.1"; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 632ae689f31..6025fce776c 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }: +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, slowaes }: -buildPythonPackage rec { +buildPythonApplication rec { name = "electrum-${version}"; version = "2.5.4"; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 31cdb8d1786..79393eee7f1 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk3, pythonPackages, python, pycairo, pygobject3, intltool, pango, gsettings_desktop_schemas }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "4.1.1"; name = "gramps-${version}"; namePrefix = ""; @@ -18,7 +18,7 @@ pythonPackages.buildPythonPackage rec { pythonPath = [ pygobject3 pango pycairo pythonPackages.bsddb ]; - # Same installPhase as in buildPythonPackage but without --old-and-unmanageble + # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 52298e6c297..1732a7e1fb0 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, buildPythonPackage, docbook2x, libxslt, gnome_doc_utils +{ stdenv, fetchzip, buildPythonApplication, docbook2x, libxslt, gnome_doc_utils , intltool, dbus_glib, pygobject, pygtk, pyxdg, gnome_python, dbus, sqlite3 , hicolor_icon_theme }: @@ -8,7 +8,7 @@ # # WARNING:root:Could not import wnck - workspace tracking will be disabled -buildPythonPackage rec { +buildPythonApplication rec { name = "hamster-time-tracker-1.04"; namePrefix = ""; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 22610c853e3..52a4f0dee75 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgs, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "0.7.0"; name = "khal-${version}"; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 8326347b02e..a10d434a70d 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgs, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "0.8.1"; name = "khard-${version}"; namePrefix = ""; diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 05d29ce7e09..f4243285e8e 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -3,7 +3,7 @@ let py = python27Packages; python = py.python; in -py.buildPythonPackage rec { +py.buildPythonApplication rec { name = "loxodo-0.20150124"; src = fetchgit { diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 0e6b13f9a28..7e066fbc591 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -17,7 +17,7 @@ let ]; in -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "ocropus-${version}"; version = "20150316"; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 3e8b35ba435..67b351ba906 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; version = "1.2.9"; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index a0c458baa96..9b5a9ef1501 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, octoprint, pythonPackages }: let - buildPlugin = args: pythonPackages.buildPythonPackage (args // { + buildPlugin = args: pythonPackages.buildPythonApplication (args // { buildInputs = (args.buildInputs or []) ++ [ octoprint ]; }); in { diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index 43b98035343..90149263644 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -2,7 +2,7 @@ let py = pythonPackages; in -py.buildPythonPackage rec { +py.buildPythonApplication rec { name = "pdfdiff-${version}"; version = "0.92"; diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix index e4f097469a4..1eb65a59470 100644 --- a/pkgs/applications/misc/pitz/default.nix +++ b/pkgs/applications/misc/pitz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, tempita, jinja2, pyyaml, clepy, mock +{ stdenv, fetchurl, buildPythonApplication, tempita, jinja2, pyyaml, clepy, mock , nose, decorator, docutils }: @@ -11,7 +11,7 @@ # pitz-shell is not the primary interface, so it is not critical to have it # working. Concider fixing pitz upstream. -buildPythonPackage rec { +buildPythonApplication rec { name = "pitz-1.2.4"; namePrefix = ""; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index 7420441850b..27a55f4464f 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -1,6 +1,6 @@ { stdenv, python27Packages, fetchFromGitHub }: -python27Packages.buildPythonPackage rec { +python27Packages.buildPythonApplication rec { name = "printrun-20150310"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 2f731fea1b0..bc6b4e16a37 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -11,7 +11,7 @@ let in -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "pytrainer-${version}"; version = "1.10.0"; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 19a0582a79c..14ae58a2932 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, python, w3m, file }: +{ stdenv, fetchurl, buildPythonApplication, python, w3m, file }: -buildPythonPackage rec { +buildPythonApplication rec { name = "ranger-1.7.2"; meta = { diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 2126ce23d3a..68097c2e254 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "1.8.0"; name = "rtv-${version}"; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 9a199c7ee49..55153d25cf9 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -1,5 +1,5 @@ {fetchurl, stdenv, gtk3, python34Packages, gobjectIntrospection}: -python34Packages.buildPythonPackage rec { +python34Packages.buildPythonApplication rec { name = "solaar-${version}"; version = "0.9.2"; namePrefix = ""; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 91e6c33310d..4d9197c8fd4 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -2,7 +2,7 @@ let version = "1.0"; in -python3Packages.buildPythonPackage { +python3Packages.buildPythonApplication { name = "zscroll-${version}"; # don't prefix with python version namePrefix = ""; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 61b02d2a639..1be28829e35 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, python, buildPythonPackage, qtmultimedia, pyqt5 +{ stdenv, fetchurl, python, buildPythonApplication, qtmultimedia, pyqt5 , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }: let version = "0.5.1"; in -buildPythonPackage rec { +buildPythonApplication rec { name = "qutebrowser-${version}"; namePrefix = ""; diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix index 8db1dac3b4b..37736d6edd7 100644 --- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }: -python34Packages.buildPythonPackage rec { +python34Packages.buildPythonApplication rec { version = "0.9.6"; name = "canto-curses-${version}"; diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index 0de38c259a3..b6f0ff19dc3 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python34Packages, }: -python34Packages.buildPythonPackage rec { +python34Packages.buildPythonApplication rec { version = "0.9.5"; name = "canto-daemon-${version}"; namePrefix = ""; diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index e5e8f823d27..eca53ccf2ec 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "rawdog-${version}"; version = "2.21"; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 9c75af2c77f..7b0e4d70fd9 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted , gnutls, libvpx }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "blink-${version}"; version = "1.4.2"; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 4818de49e42..673856e062a 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,9 +1,9 @@ -{ stdenv, buildPythonPackage, fetchurl, gettext, gtk3, pythonPackages +{ stdenv, buildPythonApplication, fetchurl, gettext, gtk3, pythonPackages , gdk_pixbuf, libnotify, gst_all_1 , libgnome_keyring3 ? null, networkmanager ? null }: -buildPythonPackage rec { +buildPythonApplication rec { name = "mailnag-${version}"; version = "1.1.0"; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index c43944dc597..0ace6a01b3f 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pythonPackages, gnupg1orig, makeWrapper, openssl }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mailpile-${version}"; version = "0.4.1"; diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 409da36b264..d4790edbb3e 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pygtk }: +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, pygtk }: -buildPythonPackage { +buildPythonApplication { name = "keepnote-0.7.8"; namePrefix = ""; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index d5163eef4d8..4d2396e8a11 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPythonPackage, pythonPackages, pygtk, pygobject, python }: +{ stdenv, lib, fetchurl, buildPythonApplication, pythonPackages, pygtk, pygobject, python }: # # TODO: Declare configuration options for the following optional dependencies: @@ -7,7 +7,7 @@ # - pyxdg: Need to make it work first (see setupPyInstallFlags). # -buildPythonPackage rec { +buildPythonApplication rec { name = "zim-${version}"; version = "0.63"; namePrefix = ""; diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 9e74a233236..73847624e85 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, buildPythonPackage, makeDesktopItem +{ stdenv, fetchurl, unzip, buildPythonApplication, makeDesktopItem # mandatory , pyside # recommended @@ -7,7 +7,7 @@ , ipython ? null, pylint ? null, pep8 ? null }: -buildPythonPackage rec { +buildPythonApplication rec { name = "spyder-${version}"; version = "2.3.8"; namePrefix = ""; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index c10ab14f639..44a617d70e1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pythonPackages, makeWrapper, gettext }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "git-cola-${version}"; version = "2.2.1"; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index fb6d542f479..de934db5f3b 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, python} : -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "git-review-${version}"; version = "1.25.0"; diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 43df0e5b885..4e440d4bc6a 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, buildPythonPackage }: +{ stdenv, fetchzip, buildPythonApplication }: -buildPythonPackage rec { +buildPythonApplication rec { name = "gitinspector-${version}"; version = "0.4.1"; namePrefix = ""; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 2f7c4af0024..d25decf35eb 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, makeWrapper +{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, makeWrapper , libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo }: @@ -8,7 +8,7 @@ let version = "${minor}.0"; in -buildPythonPackage rec { +buildPythonApplication rec { name = "meld-${version}"; namePrefix = ""; diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index d97aee23388..40e7d2f1883 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -4,7 +4,7 @@ let version = "0.2.3"; in -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { # Do not prefix name with python specific version identifier. namePrefix = ""; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 100e854f29b..58b29c10ae3 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: -python2Packages.buildPythonPackage rec { +python2Packages.buildPythonApplication rec { name = "rabbitvcs-${version}"; version = "0.16"; namePrefix = ""; diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index ebc0906fc6b..dde09dfe22d 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "tailor-${version}"; version = "0.9.35"; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 5e95b408bf7..ec20122d0ce 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,6 +1,6 @@ { pkgs, lib, mercurial, pyPackages ? pkgs.python27Packages }: -pkgs.buildPythonPackage rec { +pkgs.buildPythonApplication rec { name = "tortoisehg-${version}"; version = "3.6"; namePrefix = ""; diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 6520f7ac21f..ce44377260e 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,9 +1,9 @@ -{ pkgs, stdenv, fetchurl, pythonPackages, buildPythonPackage, pygtk, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }: +{ pkgs, stdenv, fetchurl, pythonPackages, buildPythonApplication, pygtk, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }: let inherit (pythonPackages) dbus; -in buildPythonPackage rec { +in buildPythonApplication rec { name = "devede-3.23.0"; namePrefix = ""; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 17bf282a459..7217f4746c8 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -2,7 +2,7 @@ , gtk3, libwnck3, keybinder, intltool, libcanberra }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "kazam-${version}"; version = "1.4.3"; namePrefix = ""; diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix index 5d1a0e4a95b..12fc7151cd0 100644 --- a/pkgs/applications/video/key-mon/default.nix +++ b/pkgs/applications/video/key-mon/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, gnome, librsvg, pygtk, pythonPackages }: +{ stdenv, fetchurl, buildPythonApplication, gnome, librsvg, pygtk, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { name = "key-mon-${version}"; version = "1.17"; namePrefix = ""; diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 6585306b289..66f249b8e4a 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pythonPackages, pkgconfig +{ stdenv, fetchurl, python, buildPythonApplication, pythonPackages, pkgconfig , pyrex096, ffmpeg, boost, glib, pygobject, gtk2, webkitgtk2, libsoup, pygtk , taglib, sqlite, pycurl, mutagen, pycairo, pythonDBus, pywebkitgtk , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas @@ -10,7 +10,7 @@ assert enableBonjour -> avahi != null; with stdenv.lib; -buildPythonPackage rec { +buildPythonApplication rec { name = "miro-${version}"; namePrefix = ""; version = "6.0"; diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix index caa72f49b94..0aacbeed055 100644 --- a/pkgs/applications/virtualization/openstack/glance.nix +++ b/pkgs/applications/virtualization/openstack/glance.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, sqlite, which, strace }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "glance-${version}"; version = "11.0.0"; namePrefix = ""; diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix index 3060dcb04cb..956f3b28152 100644 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ b/pkgs/applications/virtualization/openstack/keystone.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, xmlsec, which, openssl }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "keystone-${version}"; version = "8.0.0"; namePrefix = ""; diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix index ce44ed2913c..0520fcfc027 100644 --- a/pkgs/applications/virtualization/openstack/neutron.nix +++ b/pkgs/applications/virtualization/openstack/neutron.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, xmlsec, which, dnsmasq }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "neutron-${version}"; version = "7.0.0"; namePrefix = ""; diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix index ee139868ba0..20e250bf05c 100644 --- a/pkgs/applications/virtualization/openstack/nova.nix +++ b/pkgs/applications/virtualization/openstack/nova.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, openssl, openssh }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "nova-${version}"; version = "12.0.0"; namePrefix = ""; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index d22072f1095..60599d18922 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; with pythonPackages; -buildPythonPackage rec { +buildPythonApplication rec { name = "virt-manager-${version}"; version = "1.3.1"; namePrefix = ""; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 0dae8a76c77..f2f864506d3 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }: +{ stdenv, fetchFromGitHub, buildPythonApplication, python27Packages, pkgs }: let cairocffi-xcffib = python27Packages.cairocffi.override { pythonPath = [ python27Packages.xcffib ]; }; in -buildPythonPackage rec { +buildPythonApplication rec { name = "qtile-${version}"; version = "0.10.4"; diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 47c7c68c1ab..073a2339720 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, picocom +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, picocom , avrdude, arduino-core, avrgcclibc }: -buildPythonPackage rec { +buildPythonApplication rec { name = "ino-0.3.6"; namePrefix = ""; diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix index 715b009a17e..30fbe056926 100644 --- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix +++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchurl, coreutils, twisted }: +{ stdenv, buildPythonApplication, fetchurl, coreutils, twisted }: -buildPythonPackage (rec { +buildPythonApplication (rec { name = "buildbot-slave-0.8.10"; namePrefix = ""; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index a7c4fb89007..99c1352b4fb 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, twisted, dateutil, jinja2 +{ stdenv, buildPythonApplication, fetchurl, twisted, dateutil, jinja2 , sqlalchemy , sqlalchemy_migrate_0_7 , enableDebugClient ? false, pygobject ? null, pyGtkGlade ? null }: @@ -8,7 +8,7 @@ assert enableDebugClient -> pygobject != null && pyGtkGlade != null; -buildPythonPackage (rec { +buildPythonApplication (rec { name = "buildbot-0.8.12"; namePrefix = ""; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 5db62da06d8..f3db234cd96 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, python} : -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "devpi-client-${version}"; version = "2.3.2"; diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix index bafde1f9687..34a45fa0b84 100644 --- a/pkgs/development/tools/grabserial/default.nix +++ b/pkgs/development/tools/grabserial/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, buildPythonPackage, pythonPackages }: +{ stdenv, fetchgit, buildPythonApplication, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { name = "grabserial-20141120"; namePrefix = ""; diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix index a97dc3a249a..ade9954021a 100644 --- a/pkgs/development/tools/misc/nixbang/default.nix +++ b/pkgs/development/tools/misc/nixbang/default.nix @@ -1,7 +1,7 @@ { lib, pythonPackages, fetchFromGitHub }: let version = "0.1.2"; in -pythonPackages.buildPythonPackage { +pythonPackages.buildPythonApplication { name = "nixbang-${version}"; namePrefix = ""; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 029e76e0c99..44bf2ac855c 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages, buildPythonPackage, makeWrapper +{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages, buildPythonApplication, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/profiling/gprof2dot/default.nix b/pkgs/development/tools/profiling/gprof2dot/default.nix index 38315116eeb..154c0da93d4 100644 --- a/pkgs/development/tools/profiling/gprof2dot/default.nix +++ b/pkgs/development/tools/profiling/gprof2dot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonPackage { +pythonPackages.buildPythonApplication { name = "gprof2dot-2015-04-27"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index fd6e0a99138..58a857c2214 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, wxPython, makeDesktopItem }: +{ stdenv, fetchurl, buildPythonApplication, wxPython, makeDesktopItem }: -buildPythonPackage rec { +buildPythonApplication rec { name = "winpdb-1.4.8"; namePrefix = ""; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 8624e168f92..d4f90a906d8 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,12 +1,12 @@ { stdenv , fetchurl -, buildPythonPackage +, buildPythonApplication , pyqt4 , pythonPackages }: let version = "2.3.2"; -in buildPythonPackage rec { +in buildPythonApplication rec { name = "mnemosyne-${version}"; src = fetchurl { url = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz"; diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 0ccc0c7c6cf..04370424abb 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, lilypond, pyqt4, pygame }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "frescobaldi-${version}"; version = "2.0.16"; diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index 7481edeee7b..a83d4a2ad9f 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages }: +{ stdenv, fetchurl, buildPythonApplication, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { name = "iotop-0.6"; namePrefix = ""; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 714ff9d002c..9165e03d79c 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,6 +1,6 @@ -{ pkgs, stdenv, buildPythonPackage, pythonPackages, fetchurl, fetchFromGitHub }: +{ pkgs, stdenv, buildPythonApplication, pythonPackages, fetchurl, fetchFromGitHub }: let - matrix-angular-sdk = buildPythonPackage rec { + matrix-angular-sdk = buildPythonApplication rec { name = "matrix-angular-sdk-${version}"; version = "0.6.6"; @@ -10,7 +10,7 @@ let }; }; in -buildPythonPackage rec { +buildPythonApplication rec { name = "matrix-synapse-${version}"; version = "0.12.0"; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 6b33f5833d8..4aa65a7d8bd 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, python3Packages}: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "xonsh-${version}"; version = "0.1.3"; diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index a6af7b99651..68355d0d8aa 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, xrandr, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "arandr-0.1.8"; src = fetchurl { diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix index ad7ac7c64c8..767edbc47d5 100644 --- a/pkgs/tools/X11/winswitch/default.nix +++ b/pkgs/tools/X11/winswitch/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages +{ stdenv, fetchurl, buildPythonApplication, pythonPackages , which, xpra, xmodmap }: let - base = buildPythonPackage rec { + base = buildPythonApplication rec { name = "winswitch-${version}"; namePrefix = ""; version = "0.12.16"; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index c5b8db591c4..e0e12051bff 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages +{ stdenv, fetchurl, buildPythonApplication, pythonPackages , python, cython, pkgconfig , xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: -buildPythonPackage rec { +buildPythonApplication rec { name = "xpra-0.15.3"; namePrefix = ""; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 6e485dc0a05..5b81ec0a7ed 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage +{ stdenv, fetchurl, buildPythonApplication , python, cython, pkgconfig , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: -buildPythonPackage rec { +buildPythonApplication rec { name = "xpra-0.14.19"; namePrefix = ""; diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 2fa54796e4c..3248ac63bf7 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, pythonPackages, fetchurl }: +{ lib, buildPythonApplication, pythonPackages, fetchurl }: -buildPythonPackage rec { +buildPythonApplication rec { name = "cli53-${version}"; namePrefix = ""; # Suppress "python27-" name prefix version = "0.4.4"; diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix index 2c74a677b91..516fc20c5a7 100644 --- a/pkgs/tools/admin/letsencrypt/default.nix +++ b/pkgs/tools/admin/letsencrypt/default.nix @@ -1,6 +1,6 @@ { stdenv, pythonPackages, fetchurl, dialog }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "0.1.0"; name = "letsencrypt-${version}"; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index f6b352056fa..77c45e0ad3f 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "simp_le-2016-01-09"; src = fetchFromGitHub { diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix index 1b0c9b3992b..75f74e71be5 100644 --- a/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonPackages }: +{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { name = "beets-alternatives-${version}"; version = "0.8.2"; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 91407331d7c..4532d642411 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales -, buildPythonPackage, pythonPackages, python, imagemagick +, buildPythonApplication, pythonPackages, python, imagemagick , enableAcousticbrainz ? true , enableAcoustid ? true @@ -68,7 +68,7 @@ let testShell = "${bashInteractive}/bin/bash --norc"; completion = "${bashCompletion}/share/bash-completion/bash_completion"; -in buildPythonPackage rec { +in buildPythonApplication rec { name = "beets-${version}"; version = "1.3.17"; namePrefix = ""; @@ -103,7 +103,7 @@ in buildPythonPackage rec { ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives (import ./alternatives-plugin.nix { - inherit stdenv buildPythonPackage pythonPackages fetchFromGitHub; + inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub; }); buildInputs = with pythonPackages; [ diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index 0e2462c5ec8..4f659428c00 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, python3Packages, openssl, acl }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "attic-${version}"; version = "0.16"; namePrefix = ""; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 1ea8095bd38..208c3d4b1aa 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python3Packages, acl, lz4, openssl }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; version = "0.30.0"; namePrefix = ""; diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index c287efe8e11..0df9fa9d39f 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pythonPackages, pycrypto, attr }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "obnam-${version}"; version = "1.19.1"; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index b455c672b10..e94af89a7c6 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python3Packages, sqlite }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "s3ql"; version = "2.13"; diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index 025a998aed4..3b66ac1b491 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "wal-e-${version}"; version = "0.6.10"; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 343709dd957..d412a4e433e 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, pythonPackages}: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "dtrx-${version}"; version = "7.1"; diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index cd79f5db85b..9c44394697f 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, python, buildPythonPackage, pythonPackages }: +{ stdenv, fetchFromGitHub, python, buildPythonApplication, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { name = "gitfs-0.2.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index d4129f4d390..d3b3b716ffa 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock +{ stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock , libselinux, cryptsetup, multipath_tools, lsof, utillinux , useNixUdev ? true, udev ? null }: assert useNixUdev -> udev != null; -buildPythonPackage rec { +buildPythonApplication rec { name = "blivet-${version}"; version = "0.17-1"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 01a3caafc5d..1d983816895 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage +{ stdenv, fetchurl, python, buildPythonApplication # Propagated to blivet , useNixUdev ? true # No longer needed, but kept for backwards-compatibility with older NixOps. @@ -9,7 +9,7 @@ let blivet = import ./blivet.nix { - inherit stdenv fetchurl buildPythonPackage; + inherit stdenv fetchurl buildPythonApplication; inherit pykickstart pyparted pyblock cryptsetup multipath_tools; inherit useNixUdev; inherit (pkgs) lsof utillinux udev; @@ -48,15 +48,15 @@ let }; pykickstart = import ./pykickstart.nix { - inherit stdenv fetchurl python buildPythonPackage urlgrabber; + inherit stdenv fetchurl python buildPythonApplication urlgrabber; }; pyparted = import ./pyparted.nix { - inherit stdenv fetchurl python buildPythonPackage parted; + inherit stdenv fetchurl python buildPythonApplication parted; inherit (pkgs) pkgconfig e2fsprogs; }; -in buildPythonPackage rec { +in buildPythonApplication rec { name = "nixpart-${version}"; version = "0.4.1"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 7bc3f54c236..86479126d39 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -1,6 +1,6 @@ -{ stdenv, python, buildPythonPackage, fetchurl, urlgrabber }: +{ stdenv, python, buildPythonApplication, fetchurl, urlgrabber }: -buildPythonPackage rec { +buildPythonApplication rec { name = "pykickstart-${version}"; version = "1.99.39"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index 67f318c863e..721e5185be3 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, python, buildPythonPackage, parted, e2fsprogs }: +{ stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }: -buildPythonPackage rec { +buildPythonApplication rec { name = "pyparted-${version}"; version = "3.10"; diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 895ae99c309..ce00367c771 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, blivet }: +{ stdenv, fetchurl, buildPythonApplication, blivet }: -buildPythonPackage rec { +buildPythonApplication rec { name = "nixpart-${version}"; version = "1.0.0"; diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 219cb2139f5..e479167dc15 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, bash, buildPythonPackage }: +{ stdenv, fetchurl, bash, buildPythonApplication }: -buildPythonPackage rec { +buildPythonApplication rec { version = "1.3"; name = "apt-offline-${version}"; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 4c40afbaa0d..e54e83ef492 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -4,7 +4,7 @@ , enableBloat ? false }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "diffoscope-${version}"; version = "49"; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 0c3907b89bf..45fd27b7f4f 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, python }: +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, python }: -buildPythonPackage rec { +buildPythonApplication rec { name = "i3minator-${version}"; version = "0.0.4"; diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 78835afddef..e3adbfe3887 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -2,7 +2,7 @@ assert stdenv.isLinux; -python2Packages.buildPythonPackage rec { +python2Packages.buildPythonApplication rec { name = "trash-cli-${version}"; version = "0.12.9.14"; namePrefix = ""; diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index df7cbc04a14..d6789bf52bc 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "0.9.0"; name = "vdirsyncer-${version}"; namePrefix = ""; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 526bd6f84ae..a7bb5a3083d 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, makeWrapper, ffmpeg, zip +{ stdenv, fetchurl, buildPythonApplication, makeWrapper, ffmpeg, zip , pandoc ? null }: @@ -9,7 +9,7 @@ # case someone wants to use this derivation to build a Git version of # the tool that doesn't have the formatted man page included. -buildPythonPackage rec { +buildPythonApplication rec { name = "youtube-dl-${version}"; version = "2016.02.13"; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 8dd288b5588..d11e154817d 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage }: +{ stdenv, fetchurl, buildPythonApplication }: -buildPythonPackage rec { +buildPythonApplication rec { version = "4.49.0"; name = "getmail-${version}"; namePrefix = ""; diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index aa52e4f3ae2..4ccd09ac555 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -1,6 +1,6 @@ -{ pkgs, fetchurl, buildPythonPackage, pythonPackages }: +{ pkgs, fetchurl, buildPythonApplication, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { version = "1.8.1-beta"; name = "gmvault-${version}"; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index cc1531961b3..a3c52f7dd50 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "httpie-0.9.2"; namePrefix = ""; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 5331f71a96a..00061b3aeff 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, sqlite3 }: +{ stdenv, fetchFromGitHub, buildPythonApplication, sqlite3 }: -buildPythonPackage rec { +buildPythonApplication rec { version = "6.6.1"; name = "offlineimap-${version}"; namePrefix = ""; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index dae985febbb..5f1d6b4ef1a 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -5,7 +5,7 @@ # store path. The problem appears to be non-fatal, but there's probably # some loss of functionality because of it. -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "1.10.2"; name = "tahoe-lafs-${version}"; namePrefix = ""; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 2287671aef2..0ff741ef7e2 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "s3cmd-1.5.2"; src = fetchurl { diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 4e1391dfeb9..10b35298461 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; version = "0.3.1"; namePrefix = ""; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index ef420961a1f..8ad93095160 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python3Packages }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "urlwatch-2.0"; src = fetchurl { diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index b9b9eee8d16..023ec07dba1 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -3,7 +3,7 @@ , src, version }: -pythonPackages.buildPythonPackage { +pythonPackages.buildPythonApplication { name = "nixops-${version}"; namePrefix = ""; diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 92edd915ad7..89e72307ead 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -1,6 +1,6 @@ { lib, pythonPackages, fetchurl }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "nox-${version}"; version = "0.0.2"; namePrefix = ""; diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix index 1e84a81e524..0bc92314e02 100644 --- a/pkgs/tools/package-management/python2nix/default.nix +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "python2nix-20140927"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 667157978a3..9443eac01da 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -2,7 +2,7 @@ let version = "0.9.3"; in -pythonPackages.buildPythonPackage { +pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; namePrefix = ""; diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix index 6258f231590..089dd0de2bd 100644 --- a/pkgs/tools/security/knockknock/default.nix +++ b/pkgs/tools/security/knockknock/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, python, pycrypto, hping }: +{ stdenv, fetchFromGitHub, buildPythonApplication, python, pycrypto, hping }: -buildPythonPackage rec { +buildPythonApplication rec { rev = "bf14bbff"; name = "knockknock-r${rev}"; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index b7cefdd86ea..b78eb43782e 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,7 +1,7 @@ { stdenv, pythonPackages, fetchurl, makeWrapper, pandoc , coreutils, iptables, nettools, openssh, procps }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "sshuttle-${version}"; version = "0.76"; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 6aa3a9d5ea1..bed7d536957 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pycrypto }: +{ stdenv, fetchurl, buildPythonApplication, pycrypto }: -buildPythonPackage rec { +buildPythonApplication rec { namePrefix = ""; name = "volatility-2.4"; diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index b52c1c0f636..5aca54ad918 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, pythonPackages, buildPythonPackage }: +{ stdenv, fetchzip, pythonPackages, buildPythonApplication }: -let honcho = buildPythonPackage rec { +let honcho = buildPythonApplication rec { name = "honcho-${version}"; version = "0.6.6"; namePrefix = ""; diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 2ea4a950145..da3a77e8d2e 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "grin-1.2.1"; namePrefix = ""; diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 9ff33b2fb69..fe1e915e27b 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, buildPythonPackage, libreoffice, lpod, lxml, mistune, pillow +{ stdenv, fetchurl, buildPythonApplication, libreoffice, lpod, lxml, mistune, pillow , pygments }: -buildPythonPackage rec { +buildPythonApplication rec { name = "odpdown-${version}"; version = "0.4.1"; diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index 55f54e2cf3d..3675b5ab091 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "vnc2flv-20100207"; namePrefix = ""; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index af2779e59e3..34b6226ff98 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -2,7 +2,7 @@ let version = "0.7.6"; -in pythonPackages.buildPythonPackage rec { +in pythonPackages.buildPythonApplication rec { name = "cloud-init-${version}"; namePrefix = ""; diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index a87dd568322..7a93d96036f 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, which, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "euca2ools-2.1.4"; namePrefix = ""; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0c3f144700..d3f769e7afe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3239,7 +3239,7 @@ let solvespace = callPackage ../applications/graphics/solvespace { }; sonata = callPackage ../applications/audio/sonata { - inherit (python3Packages) buildPythonPackage python isPy3k dbus pygobject3 mpd2; + inherit (python3Packages) buildPythonApplication python isPy3k dbus pygobject3 mpd2; }; sparsehash = callPackage ../development/libraries/sparsehash { }; @@ -13297,7 +13297,7 @@ let }; qutebrowser = qt55.callPackage ../applications/networking/browsers/qutebrowser { - inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2; + inherit (python34Packages) buildPythonApplication python pyqt5 jinja2 pygments pyyaml pypeg2; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; }; @@ -14172,7 +14172,7 @@ let xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; #TODO: 'pil' is not available for python3, yet - xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonPackage python cython pygobject3 pycairo; }; + xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; }; xrestop = callPackage ../tools/X11/xrestop { };