Merge #26601: thunderbird*: 52.1.1 -> 52.2.0 (security)

NixOS · Jun 15, 2017 · 791f072 · 791f072
1 parent 0b50967
commit 791f072
Show file tree

Hide file tree

Showing 6 changed files with 604 additions and 604 deletions.
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -170,6 +170,10 @@ stdenv.mkDerivation {
   passthru.ffmpegSupport = true;
   passthru.updateScript = import ./update.nix {
     inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl;
+    baseUrl =
+      if channel == "devedition"
+        then "http://archive.mozilla.org/pub/devedition/releases/"
+        else "http://archive.mozilla.org/pub/firefox/releases/";
   };
   meta = with stdenv.lib; {
     description = "Mozilla Firefox, free web browser (binary package)";

diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -9,15 +9,10 @@
 , gnupg
 , baseName ? "firefox"
 , basePath ? "pkgs/applications/networking/browsers/firefox-bin"
+, baseUrl
 }:
 
 let
-
-  baseUrl =
-    if channel == "devedition"
-      then "http://archive.mozilla.org/pub/devedition/releases/"
-      else "http://archive.mozilla.org/pub/firefox/releases/";
-
   isBeta =
     channel != "release";
 

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -46,7 +46,7 @@
 assert stdenv.isLinux;
 
 # imports `version` and `sources`
-with (import ./sources.nix);
+with (import ./release_sources.nix);
 
 let
   arch = if stdenv.system == "i686-linux"
@@ -163,6 +163,7 @@ stdenv.mkDerivation {
   passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
     inherit name writeScript xidel coreutils gnused gnugrep curl gnupg;
     baseName = "thunderbird";
+    channel = "release";
     basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
     baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
   };