Merge pull request #13124 from FRidh/buildPythonApplication

buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
parent b1c8fb8685 4d06bf70f4
commit 40ca841c5c
133 changed files with 195 additions and 195 deletions
--- 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 {
--- 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";
--- 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 = "";

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

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

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

--- 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; [
--- 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 = "";
--- 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 = "";
--- 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";

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

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

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

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

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

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

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

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

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

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

--- 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 = "";
--- 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 = "";
--- 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";
--- 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 = "";
--- 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}";

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

--- 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 = "";
--- 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 = "";
--- 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 {
--- 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 = "";
--- 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 {
--- 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 = "";

--- 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 = "";
--- 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 {
--- 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 = "";

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

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

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

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

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

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

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