Merge older staging with added firefox-related updates

9 files changed, 9 insertions, 16 deletions

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 {