firefox-bin: 48.0b1 -> 48.0b7

* removed firefox-developer-bin
* extend firefox-bin expression to accept sources as input so
  firefox-developer-bin can be packaged outside nixpkgs
* generate_sources.rb now includes full urls in the output

1 files changed, 2 insertions, 12 deletions

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index e9f6f816be51..88d9a0ccb961 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -35,18 +35,13 @@
 , libheimdal
 , libpulseaudio
 , systemd
-, channel ? "stable"
+, generated ? import ./sources.nix
 }:
 
 assert stdenv.isLinux;
 
 let
 
-  generated = if channel == "stable"    then (import ./sources.nix)
-         else if channel == "beta"      then (import ./beta_sources.nix)
-         else if channel == "developer" then (import ./dev_sources.nix)
-         else builtins.abort "Wrong channel! Channel must be one of `stable`, `beta` or `developer`";
-
   inherit (generated) version sources;
 
   arch = if stdenv.system == "i686-linux"
@@ -70,12 +65,7 @@ in
 stdenv.mkDerivation {
   name = "firefox-bin-unwrapped-${version}";
 
-  src = fetchurl {
-    url = if channel == "developer"
-            then "http://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-aurora/firefox-${version}.${source.locale}.${source.arch}.tar.bz2"
-            else "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2";
-    inherit (source) sha512;
-  };
+  src = fetchurl { inherit (source) url sha512; };
 
   phases = "unpackPhase installPhase";