Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix

4 files changed, 136 insertions, 129 deletions

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index a5af880728a1..43e04ed8a396 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "1szf6c44g209pcjq5nvfhlp3nzcm3lrcwv4spsxmwy13hiaccvrr";
   };
 
-  buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian sphinx python ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
+  buildInputs = [ bash emacs glib gmime gnupg pkgconfig talloc xapian sphinx python ]
+    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames
+    ++ stdenv.lib.optional (!stdenv.isDarwin) gdb;
 
   patchPhase = ''
     find test -type f -exec \
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 70d01f5df3ea..0f8b4f00c8ba 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation {
     ++ optional sslSupport openssl
     ++ optional gpgSupport gpgme;
 
-  configureFlags = optionalString sslSupport "--enable-ssl";
+  configureFlags = optional sslSupport "--enable-ssl"
+                ++ optional gpgSupport "--enable-gpgme";
 
   meta = {
     homepage = http://sylpheed.sraoss.jp/en/;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index e51c3f68d7f6..595272b900af 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,117 +4,117 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "31.3.0";
+  version = "31.4.0";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha1 = "2579ce59d7c26bdd345732d6ab164fbf6e531b0a"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "55b912f4424b06972cc9d3b14cab3eaa75abdff0"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "101de138543ae46b667cc9800e45d30a59c31ea0"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "0e290b8222ec3085d2848eb219fa2a950ab38f96"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "80db08139076f5e2810edd931af353bc3c9f6326"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "0569479306e0e5fbaa9b87d9f547eec875cdc673"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "072900fc768486d525fa89ef4a289b3135ec7d1e"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "b99da8534a06e89380b8a9c62e7ac848995cd648"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "89303e18aa4bc22b1cb91f4d990eb2e3896336e9"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "142a507fd977c81e18580acea9dc3e60fb6e6cca"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "987b861d55d333d552e22fd6ce4d5d8fa3031e95"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "8c088d8f374e4cab6477ed5e071861d3875513fb"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "0517ffca37a556548a9b8ded4d7084df0ad70d53"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "a617ae22a924d458ed633e5728f44838d0b42c64"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "9ae7115dfc0c11528ec276d62925815f93f49dd0"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "2155ef2017e5411a9279b66142306f5d5b9b2b0d"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "dfb5ee11a096128f53cebe016156e34aa762a5be"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "8549835e2c3a120aea39c274d7cb1c7f54035649"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "3032a8b87835781d919cab8862057a2612a52af3"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "6a9a99636cbfbff3950c5f31681ed2aefbb170b9"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "33bd8a4a7cdaab9937a7880f17c27177a667f1f5"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "e32d2382a8322cb65ed3b2b4d634cc818bf94d58"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "2e85dcaa7450e2cd605ab41849693c6eb94aa4b8"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "5a229b46fca9bfe736254bc9a65259c5722dac37"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "40d0e9a5530812d2ffc471f9c1e9c64ec39bc3aa"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "5dc64b9a0fa7e4df1ed232b56478d52986c3b4ad"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "5b3cec2e5ddfd9a12eadc5ac270aba85acfe0051"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "bceb273367d49b927f5de022009fdd27b707d4eb"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "9911086185272ac2a5c6ee9b36170f1a7352b5a4"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "df164ccdb2ec8ac50c663fe5771a63cb51b991a8"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "1e98b4c19dc16e52a65e66a0b518626924a098b1"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "2153b56a7336fdba78797025ebba8deb0c5796ed"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "864ae993a8e87b09ba2ebfa5d12a8cc9b36c9c27"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "ad4a01b18e2c9d38d048f9ee28a19c00dd1dc122"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "d2ebe588dda618a29de4af0fbadbdd1daddd059c"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "3c5eb0bb4dec968678c812eda5d723b50ca2f150"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "c71f67ab5942cb49add9a044d6eeb69523f416c9"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "60c5a7037de5439ffebc39980c87e5e1065e2d8c"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "09d4f2786ede2aff43250d4ed8f151f73c1cb983"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "839bea8234ccc71f9402487f022a3fcee13da341"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "07635c04802c1023a9c6ec6d66c2d9ed9c210800"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "ff584fe726ca1be184c453d2eec250577d7747b4"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "3cbb34e8eba1ad0db2f25b51390b6b66efbdbd6b"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "78703fbf8e9c7cf4db1522baaea837450972f568"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "1aab34a16224d84c958aa65f4a0e8100a96003f4"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "a8beb35a764b040a1d495e8e34623a884c1911c8"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "73fe49520af05bb79e20c202836fce347466c957"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "1780d0a0f342fc6c64e9365a548c13770f9d02f3"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "f2c570b88fe3368fa30a53f42357a02b610acb36"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "b3bb417879fd039222062f2df8f64811c1472cd6"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "3369f82671a7e56ca24161ac2a1dd7cd0ae9ba85"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "996b00fb13c2cfd826597eb817bdf8098b523f1b"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "c805817f9463d74bb73cad273d91c15d04ef1786"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "20abe54c61fa4760a507da630c1b919cfe36cf6a"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "76e1659be7d8fbfcd2a6b0bcefdc3988d59e81fa"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "cff15be3455dcf7ed714e8e69d34dc2ad016b60f"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "be8238cddd980bbd7de2a21541b260fd6689a8d7"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "1fcabd1b1b43ac25f7f5d2eca896ba7d5ea82102"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "df18fd291ffbb80323dfd823aa04692bcf6f251f"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "196fae349e7b06029e9738a12fb78f24ca691598"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "a888ba62981b73d96ba39892a3372b36f0ffb2b3"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "00e2be4b037a37429ee708d49c82af5ffafe8ca1"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "634ea25e7246ff1c23a0d57bdf928372ca867cd6"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "cfa4acb0970ab87f44e3bbfe46717d1664c63e99"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "50d2764febdfb206c704cc0eb14e0679e42dffc3"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "1a975a34ddcb0637957def46bd6cc3785a9630df"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c0cf3563e2322724447d1c6730a7d4674c9bad7a"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "0c7267858bf95345dc09f9b03b56283e3198f8a4"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "8c8db046ca1f21c11d00914613010836e0c5aefc"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "acd50182d4e1f255ef70bf3d7dfc9ef963535def"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "ca1728b39e052bd9975d2b2ec8cffa6290098316"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "05a3bed8b8c0ccea66ceef02184f4ecd95e141f8"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "e0aa8fca5e1df6adf5b5bf41d9c8f2a195e5b598"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "fd4f63140ffc56095c7b66a3ff560409a43ad018"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "9dc57337681fd57c5eb51240463e25543385d23d"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "2c27721db5b96a8d488ce7a74e3ebf350f71f76a"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "c4d3e3f02375533bfb734155327832b4bcddbbe5"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "81d1cfacaf3f6a2830af0fceda7ac463867afa90"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "f59639147c77344d7fbe49c8c3320ec382ce261c"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "76d04ef5ac5ce644c04621adcc08059f4d509cdd"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "a9d4485e9740572e1c5b8579a171c381797c3f97"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "9d699390b577ec97842e75118ee6f0579c386fe0"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "e03991f23cd9da6e5f14e37a4f84faee64f529b1"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "7137b302ed8c1079ed8f7efa2eaaeaeeb900cc28"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "7cc98ffeebf3f450c5f29b177eca3e127184c89d"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "c087c970e9456d60265f7f9f6be83100b3990ef9"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "4197c63d5669be0cd6856d17883f5dbb9690438f"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "753e858aba8212d86ce9a6855dfaa2223d2ce3bd"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "64ca38cce9a99b7cf281faf0c53e5b646cb8e7f7"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "78e10824e31d2aee74d852d7b657dd3239cfbaa2"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "6d38031ef73b82a11193fe2333ba7bfc31e0da49"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "c1ba73354f662da9f541978b5611acc41ee60356"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "3bc7482b81a754abc01e4c1face0aa4e65aa3ea6"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "2463ac4d17d95c41e5bfebf31c3127e3404caa02"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "28f762f06a526f93b9a3ff3bd5a52a1bd4c6b314"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "69bbca2b8cea57a76cb3791029f0d55da8383594"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ddbfd64533c198deeb3e56cb137af3707cc22912"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "992b3a896d619393a829b0b404f6c69bc6d11263"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "dcc7382a20d316eabd500c9d7cfaa84b9e406d43"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "4202e74f6cb4e7bb22ae08a5e28d02cac8dd4861"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "1cb9db5a71df0990758a93728d1cccc229797aaa"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "8406829869881ed3228f44531c32106f51ef8671"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "e9d259c9872336d96e854208d08d0d09aeb98f47"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "3a65b5a21c2310dcb243abbf1cfdc7ec097a6018"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "60070b3d0488aa80aa331cfb0ea1f37301d074d4"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "ffe662b33db700fe795972a08320370592de365b"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "9722b296495a4ac01bb80952df97a1f1a92eed27"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "014e0cd18afceeb662d7c2e9f4541e7a4ef0260a"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "f5174db5a7852d27bdfcca4b57fdf5ffd5294680"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "0014eea1f648f9ddcf977f56f7a82044b41c136e"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "5e6592c5f0569fb56613ed34db895a2fa6c77f66"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "7f270aebf5de8c2f4a988d87b37cbdf12542a86a"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "611bbfb96b6f2b39c9a7b83311ba7f96e0294501"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "5b8dbb29e1dfce40d0414b75a2e889e40ba62b1b"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "8aef167276d82e3243912f1773ce42bc5831d6a8"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "81448779fcdcace457e7b3e37262345df9b100ec"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "4f82e7bfd24086e98721c6283156781a0a65e23f"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "c3ddd6613f7591ff7d4aad1e39358f7107e56b5d"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "68340eea06073ddf2c64f2808d5136295962ebb5"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "c080fda6eb86414e3157a54befcd9bf7e5a87148"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "087a853427912f6aef3802851cf61d8c36aaad93"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "b574ee98d1771d4a4be77a5e1f7573d03329d497"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "4e56ed5b93e8aede015b4ba3b86d0121f5225e21"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "8ca5266e9ad8c1f24a9426cd41b4f9af764308b1"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "3e612559375de82f227fbdfad847bef58392ed64"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "3aeb7ca07b82258353b1085705e6f0f18c3a3813"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "7d09b5f73738ea9ea16c515434299df8654bbc1e"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "3c7b5dafca343afa0be3d107078c42d525149ab7"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "5273088e2ad5278fbec29a3d80ff81123807bdb1"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "d18893827828640ff83df8b3d340ed96312d4bfb"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "dc0f3ecb015568805634ee78f5ec314d2502ae63"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "ca7c336b9902c7f109c58e20d944c019cc3003dd"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "a7164e94562e7c711e0a8ca98cb9994c75aa4538"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f53acad0af7a080e310b7a875b6cb6776d691fcd"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "7c31b23b0dfe89c17c0eef61cc605f2ea6a5fca3"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "f837d7d1916d687e4482abb87b74de90c4131b4d"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "80d6ad181ba25b3b65eb9fd990f03a1aadd68a7b"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "f40f6514a2357aecabdc34708bbc819fb6546a70"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "7c0d9500321fe5c854ba7f1f11cd1cfcec895919"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "afa2780e35a8fb95b26f43595c2e7729e7d37360"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "711bf1da10758f784e5c31b3673eb612604775b9"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "02ee282d0b54ad6490e742f7a3b29763bf1d0545"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "940125468f0129138e20a048fe09d3d489bab478"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "357a64c3b49e3d058ed715de24296fa6533dbe59"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "abe4633376f244efffbd3faa7be4381a5dce0dcc"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "f401ae0b0e51603249f6a7b925166bf287023dc7"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "f563e7f6638da931c3e8b3b8055d8ea1923af204"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "5ebfc7889ad5fa147c50e70a66b42238dc289ffd"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "a7c6c74459ac9ecae0b325765ae9fb3e2adab1c5"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "923de165c7eb693316d4a81ad13e32636c1de990"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6685e21a2b20ebb35da479604dfbf719b0822c3e"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "35d4f00f26c3bc18c7a6ebcc6d6d2ccd0a4499d4"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "7ad9d25363f3b98085758fb2815d4fbf0b898b28"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "ddb0b68b311e51f602248924b4b49481a64ac175"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "216df56d5dde4f27d0f14cfaafd7af08a2732bf2"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "4c30c0ba4bbe22522565679b49b06d62673fbd74"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "7f67f2fe2166d207f7fa39feb85faae4595cbdbc"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "f5949cb31f01b11cb6a43a045798da64abea52af"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "c6d784d2cd3f3baf6737dfd2d28c03f9b1c37623"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "b5598bc5a19b45ee17cfd259f7da581735f90430"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "21699446dbcc9e0fb53e06dafec8efdbf6ab484b"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "e64a219956f4aa017ee742cc1768567052593282"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "a60b5d60e8436355ee24029a4398168108ce8aea"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "583af341312ea29b50a7eaa86d2c9758ce2f5735"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "2471ebfc64a84e8711d7bc26783a16d6300ada07"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "d67b28477e36501a03ce8fd79a23090d068a696e"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "f53018a38f84c7e4fc8d5a3ee952478d4a1c9ebe"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "f886bcdb98af1c217a837c10a5e0737cbd357ef0"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "000d8e56b62768aee6dba9cb14b733f78908e751"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "27ffbd773f977b67903a62b9131b1dcda27dd7f2"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "cd743c00682001094d3a7decd8396b6ce9b1e67e"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "64b8ba26bb1f85788321bd2ba38b4813859ebede"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "445731309b578c262547f22364dfe1fd0eaf68d5"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "9bc2efd19b17c0e09b55e6ae310e59147212d726"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "35a275d39c2a780b86749891c14ee77ca36f03bf"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "c70f2f57e1fd8c40da949a18314c30380728f7bd"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c94ace97f23a6fce1e736bb334ddf6af3d5a0ff4"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b00717ab99a47ef3477fecb79d55dc5817c60c1e"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "a5864e976675278cb9fb7e65c1edb88f704557f1"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "dba80bc2bc1ec67ba932525d05253803292bc9d8"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "161e1361b1ecc5f1ee31227b7e65705ab5355432"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "8051e55e5f7fbc42c7d75b5ad28834d11b699833"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "91c8812e39baaa1974d4d1c316c7c08022f3408f"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "948a679c843cee3f8da80f0a45b5416c7cc3b37c"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "43005f6337f33171f745f2e493d8cf2a8371d143"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "78fea3bc7e24eb96aefb2e52b01657437fc9dfd6"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0a5b4e14446c0f8f44004178f873bb289176e1b6"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "727d4a82754118749ea48e4b7ab6d182570957ad"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8b4418f18b3569991ff2aca4528e70dd49247d81"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "0ffbee08f3e43fde37913679037d59b68a47d49b"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "79606026969e837b4b9a1be73b71b0b183757504"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "0680dfa0417688e2ad6307b10f90c766db139789"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "d06f4e7f748ffa8202bfc1dc0c4bc94894feb223"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "a998af6413eec1123c9e4698ce217dc856c2bb4e"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "062a1ba9c8a5c06972895ebb11e12d90a50c450d"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "fd149bdbdc4a697cfab1d04b818b09718a3b945c"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "50105a554db09e57ad99aee5c3b9c9f35eef3431"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "ed360ef7cbf2ecc70b08922c27cdf3525c392137"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "34dee72d71916209a3cad28e6adfa1b3270567c6"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "cfe76d345c17ab8711a723779d263c3baa0016ff"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "391a923ff56ba6adf15817b12eec4555ede578fe"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "b6c3ad0b50610fd2470a2366c58a2e4947a96698"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "f422d3adca0f15b70d53c9c9b9bae09d651ef535"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "d3c8c82a0531a20480ac93dc6e0c981068a327fc"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "9d7ab49903107da8cd9859d09ae62dea661130a9"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "24f770326910db0ebd3d521b7573f57c4db2afdd"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "b93a538462e364202cf0a7ef9867f3bcaad5256d"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "b2c6c917b6575002f2f9f548ba1ae0aa3bd7a064"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "e0d34774514f264bb02a2c5db76270bc228e80a8"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "8119ba8f521da39af4d729fe52841c76e6a9c6f1"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "76b9c748286ac40cb77b2dfe98e44b1ebadc6d9b"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "779ed971dac93d55e45a63e0ff4d3f6118317116"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "784a6432f04dc12f6abb405e4375540bb3c1bfac"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "d6ec1ca2015c723d05e4f7a6e6006cb0f5f45667"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "e494cb50a3c99b4e96794544b1a7948663d0ae28"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "e9a8d6fb2b9328f7ea80c0d7be9943daaf37e71d"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "14624e631eb3bdfb9cde339dbf132e048f68f1c3"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "1197fa99680d978b10c41ccac7183117c264f375"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "78c73c73363b41b3ae36cea01cc64bc715602278"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "76faeef7919eb2fb594773502ee5202ed11b67e4"; }
   ];
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index e6ba7e21dc8e..5124b78d071f 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, m4, gtk, pango, perl, python, zip, libIDL
+{ stdenv, fetchurl, pkgconfig, which, m4, gtk, pango, perl, python, zip, libIDL
 , libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
@@ -13,7 +13,7 @@
   enableOfficialBranding ? false
 }:
 
-let version = "31.2.0"; in
+let version = "31.4.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
-    sha1 = "87dff89388bd7ec51876e1bdbd82bc3fe60006b6";
+    sha1 = "00b55e28f55b84e3cd257407d797e07a363aeef8";
   };
 
   buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx
-    [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2
+    [ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2
       python dbus dbus_glib pango freetype fontconfig xlibs.libXi
       xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
       alsaLib nspr nss libnotify xlibs.pixman yasm mesa
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       hunspell libevent libstartup_notification cairo icu
     ] ++ [ m4 ];
 
-  configureFlags = [ "--enable-application=mail" ]
+  configurePhase = let configureFlags = [ "--enable-application=mail" ]
     # from firefox30Pkgs.commonConfigureFlags, but without gstreamer and libvpx
     ++ [
       "--with-system-jpeg"
@@ -63,28 +63,33 @@ stdenv.mkDerivation rec {
       "--disable-pulseaudio"
     ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
                         else [ "--disable-debug" "--enable-release"
+                               "--disable-debug-symbols"
                                "--enable-optimize" "--enable-strip" ])
     ++ [
       "--disable-javaxpcom"
       "--enable-stdcxx-compat" # Avoid dependency on libstdc++ 4.7
     ]
     ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-  configurePhase = ''
-    patchShebangs .
-
+  in ''
+    mkdir -p objdir/mozilla
+    cd objdir
     echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig
-    echo "ac_add_options --prefix='$out'" >> .mozconfig
-    echo "mk_add_options MOZ_MAKE_FLAGS='-j$NIX_BUILD_CORES'" >> .mozconfig
+    echo 'ac_add_options --prefix="'"$out"'"' >> .mozconfig
+    echo 'mk_add_options MOZ_MAKE_FLAGS="-j'"$NIX_BUILD_CORES"'"' >> .mozconfig
+    echo 'mk_add_options MOZ_OBJDIR="'`pwd`'"' >> .mozconfig
 
-    make ${makeFlags} configure
+    export MOZCONFIG=`realpath ./.mozconfig`
+
+    patchShebangs ../mozilla/mach
+    ../mozilla/mach configure
   '';
 
-  makeFlags = "-f client.mk";
-  buildFlags = "build";
+  buildPhase =  "../mozilla/mach build";
 
-  postInstall =
+  installPhase =
     ''
+      ../mozilla/mach install
+
       rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
 
       # Create a desktop item.