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

(cherry picked from commit 791f072) I left out the firefox-bin bits, as they didn't apply anyway.
NixOS · Jun 16, 2017 · 69380c9 · 69380c9
1 parent 852827b
commit 69380c9
Show file tree

Hide file tree

Showing 4 changed files with 599 additions and 588 deletions.
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -44,7 +44,7 @@
 assert stdenv.isLinux;
 
 # imports `version` and `sources`
-with (import ./sources.nix);
+with (import ./release_sources.nix);
 
 let
   arch = if stdenv.system == "i686-linux"
@@ -151,6 +151,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/";
   };