Merge pull request #13124 from FRidh/buildPythonApplication

buildPythonApplication: use new function for Python applications

18 files changed, 22 insertions, 22 deletions

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 55337bf1d3ad6..7b724ca3d019a 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 b11e1ac0fa79f..c0a137d7de921 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 314361329c75e..ea182d73a5bae 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 2cffb0ebacf4a..168a67a53f000 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 b337dbf6d8212..cee3469e3f532 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 00468db767a2d..6984593cd4172 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 6bf73c0218571..ee3134f5fd82f 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 b7a1fbf2f08cd..abb9c50d71c5a 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 e13a1a978fdcc..b2bca838cee25 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 c81de3e0d062e..098812961649e 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 ab07b0f1f68e0..4d7c1cb732661 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 f44f95be140c8..3a717344aef59 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 efd1425e25541..2942cba95f0f3 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 ae53008d58c47..29426f43de13e 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 df76b8073b668..2373bbc549d57 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 4095d672f8286..1083f9434a942 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 38c679d7a3e42..56ec046110230 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 74ce6a2c15f0f..e23a54043682e 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 = "";