Merge older staging with added firefox-related updates

19 files changed, 47 insertions, 58 deletions

diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix
index 3e315e2d1a75..ea0ce8cb5f30 100644
--- a/pkgs/applications/audio/dr14_tmeter/default.nix
+++ b/pkgs/applications/audio/dr14_tmeter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python3Packages, pkgs }:
 
 python3Packages.buildPythonApplication rec {
-  name = "dr14_tmeter-${version}";
+  pname = "dr14_tmeter";
   version = "1.0.16";
 
   disabled = !python3Packages.isPy3k;
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 678ea529dc44..571f0a925adb 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -4,7 +4,7 @@
 }:
 
 python3Packages.buildPythonApplication rec {
-  name = "gpodder-${version}";
+  pname = "gpodder";
   version = "3.10.3";
 
   format = "other";
diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix
index fae8d3e4b605..0434b00c7053 100644
--- a/pkgs/applications/audio/gtklick/default.nix
+++ b/pkgs/applications/audio/gtklick/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, pythonPackages, gettext, klick}:
 
 pythonPackages.buildPythonApplication rec {
-  name = "gtklick-${version}";
-  namePrefix = "";
+  pname = "gtklick";
   version = "0.6.4";
 
   src = fetchurl {
-    url = "http://das.nasophon.de/download/${name}.tar.gz";
+    url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
     sha256 = "7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137";
   };
 
diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix
index d0c3eab69154..2cb90081c68b 100644
--- a/pkgs/applications/audio/lastfmsubmitd/default.nix
+++ b/pkgs/applications/audio/lastfmsubmitd/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "lastfmsubmitd-${version}";
-  namePrefix = ""; 
+  pname = "lastfmsubmitd";
   version = "1.0.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix
index fff166493339..d2ef7434c4db 100644
--- a/pkgs/applications/audio/lastwatch/default.nix
+++ b/pkgs/applications/audio/lastwatch/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchgit, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  name = "lastwatch-${version}";
-  namePrefix = "";
+  pname = "lastwatch";
   version = "0.4.1";
 
   src = fetchgit {
diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix
index cee3469e3f53..b9b840682d74 100644
--- a/pkgs/applications/audio/mimms/default.nix
+++ b/pkgs/applications/audio/mimms/default.nix
@@ -1,31 +1,31 @@
 { fetchurl, stdenv, pythonPackages, libmms }:
 
-let version = "3.2";
-in
-  pythonPackages.buildPythonApplication {
-    name = "mimms-${version}";
-    src = fetchurl {
-      url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2";
-      sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml";
-    };
+pythonPackages.buildPythonApplication rec {
+  pname = "mimms";
+  version = "3.2";
 
-    postInstall = ''
-      wrapProgram $out/bin/mimms \
-        --prefix LD_LIBRARY_PATH : ${libmms}/lib
-    '';
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2";
+    sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml";
+  };
+
+  postInstall = ''
+    wrapProgram $out/bin/mimms \
+      --prefix LD_LIBRARY_PATH : ${libmms}/lib
+  '';
 
-    meta = {
-      homepage = https://savannah.nongnu.org/projects/mimms/;
-      license = stdenv.lib.licenses.gpl3;
-      description = "An mms (e.g. mms://) stream downloader";
+  meta = {
+    homepage = https://savannah.nongnu.org/projects/mimms/;
+    license = stdenv.lib.licenses.gpl3;
+    description = "An mms (e.g. mms://) stream downloader";
 
-      longDescription = ''
-        mimms is a program designed to allow you to download streams
-        using the MMS protocol and save them to your computer, as
-        opposed to watching them live. Similar functionality is
-        available in full media player suites such as Xine, MPlayer,
-        and VLC, but mimms is quick and easy to use and, for the time
-        being, remains a useful program.
-      '';
-    };
-  }
+    longDescription = ''
+      mimms is a program designed to allow you to download streams
+      using the MMS protocol and save them to your computer, as
+      opposed to watching them live. Similar functionality is
+      available in full media player suites such as Xine, MPlayer,
+      and VLC, but mimms is quick and easy to use and, for the time
+      being, remains a useful program.
+    '';
+  };
+}
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index ad280d382d02..753a273a08cc 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -3,8 +3,7 @@
 }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-${version}";
-
+  pname = "mopidy";
   version = "2.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix
index e58cddd42942..e9c5198092d5 100644
--- a/pkgs/applications/audio/mopidy/gmusic.nix
+++ b/pkgs/applications/audio/mopidy/gmusic.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-gmusic-${version}";
+  pname = "mopidy-gmusic";
   version = "2.0.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/mopidy/local-images.nix b/pkgs/applications/audio/mopidy/local-images.nix
index 063821544aed..3e10904f3e69 100644
--- a/pkgs/applications/audio/mopidy/local-images.nix
+++ b/pkgs/applications/audio/mopidy/local-images.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-local-images-${version}";
-
+  pname = "mopidy-local-images";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mopidy/local-sqlite.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix
index 7aebc43dabbb..6d0cc370ff34 100644
--- a/pkgs/applications/audio/mopidy/local-sqlite.nix
+++ b/pkgs/applications/audio/mopidy/local-sqlite.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-local-sqlite-${version}";
-
+  pname = "mopidy-local-sqlite";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
index d2f525bffd1d..b0abefd7a1fd 100644
--- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix
+++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-musicbox-webclient-${version}";
-
+  pname = "mopidy-musicbox-webclient";
   version = "2.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix
index 098812961649..0fda09fd5220 100644
--- a/pkgs/applications/audio/mopidy/soundcloud.nix
+++ b/pkgs/applications/audio/mopidy/soundcloud.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-soundcloud-${version}";
-
+  pname = "mopidy-soundcloud";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix
index 034a07bf027d..4b75af5ed579 100644
--- a/pkgs/applications/audio/mopidy/spotify-tunigo.nix
+++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-spotify-tunigo-${version}";
-
+  pname = "mopidy-spotify-tunigo";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix
index 64b5ee629b33..9a6e1bef994c 100644
--- a/pkgs/applications/audio/mopidy/spotify.nix
+++ b/pkgs/applications/audio/mopidy/spotify.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-spotify-${version}";
+  pname = "mopidy-spotify";
   version = "3.1.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix
index d3eb8539a19c..b8e22a41cabf 100644
--- a/pkgs/applications/audio/mopidy/youtube.nix
+++ b/pkgs/applications/audio/mopidy/youtube.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-youtube-${version}";
-
+  pname = "mopidy-youtube";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 677c60399e52..26f35f258651 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,11 +1,10 @@
 { stdenv, python2Packages, fetchurl, gettext, chromaprint }:
 
 let
-  version = "1.4.2";
   pythonPackages = python2Packages;
-in pythonPackages.buildPythonApplication {
-  name = "picard-${version}";
-  namePrefix = "";
+in pythonPackages.buildPythonApplication rec {
+  pname = "picard";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz";
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index 69c79c76c8d4..e96b6f1909a5 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
 
 python2Packages.buildPythonApplication rec {
-  name = "puddletag-${version}";
+  pname = "puddletag";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index e7073d0c95e9..f1a22bd839a0 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -8,7 +8,7 @@
 
 let optionals = stdenv.lib.optionals; in
 python3.pkgs.buildPythonApplication rec {
-  name = "quodlibet${tag}-${version}";
+  pname = "quodlibet${tag}";
   version = "4.1.0";
 
   # XXX, tests fail
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 55c3dfa92e30..a3d418cd4fe4 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -4,7 +4,7 @@
 let
   inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2;
 in buildPythonApplication rec {
-  name = "sonata-${version}";
+  pname = "sonata";
   version = "1.7b1";
 
   src = fetchFromGitHub {