summary refs log tree commit diff
path: root/pkgs/applications/networking/mailreaders
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/networking/mailreaders')
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb2
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix2
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird/default.nix4
-rw-r--r--pkgs/applications/networking/mailreaders/trojita/default.nix41
4 files changed, 45 insertions, 4 deletions
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb
index 07374a827f2e..43b41658413e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb
@@ -29,7 +29,7 @@ puts(<<"EOH")
 # This file is generated from generate_sources.rb. DO NOT EDIT.
 # Execute the following command to update the file.
 #
-# ruby generate_sources.rb 45.1.0 > sources.nix
+# ruby generate_sources.rb 45.1.1 > sources.nix
 
 {
   version = "#{version}";
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 227babe397d4..7af00e17b37b 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -1,7 +1,7 @@
 # This file is generated from generate_sources.rb. DO NOT EDIT.
 # Execute the following command to update the file.
 #
-# ruby generate_sources.rb 45.1.0 > sources.nix
+# ruby generate_sources.rb 45.1.1 > sources.nix
 
 {
   version = "45.1.1";
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index cd919566138c..09a5959890d7 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -13,7 +13,7 @@
   enableOfficialBranding ? false
 }:
 
-let version = "45.1.0"; in
+let version = "45.1.1"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
-    sha256 = "0293cwnqj4ys629ra87577c7snv4p8x2nbs1kzcnjpc96vjypsca";
+    sha256 = "13kiida7smgl3bz1hx88hdvi2mj4z5b726gcw7nndxml60y10z8h";
   };
 
   buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx
diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix
new file mode 100644
index 000000000000..892d9d8fa578
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/trojita/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, lib
+, fetchgit
+, cmake
+, qtbase
+, qtwebkit
+, makeQtWrapper
+}:
+
+stdenv.mkDerivation rec {
+  name = "trojita-${version}";
+  version = "0.7";
+
+  src = fetchgit {
+    url = "https://anongit.kde.org/trojita.git";
+    rev = "065d527c63e8e4a3ca0df73994f848b52e14ed58";
+    sha256 = "1zlwhir33hha2p3l08wnb4njnfdg69j88ycf1fa4q3x86qm3r7hw";
+  };
+
+  buildInputs = [
+    cmake
+    qtbase
+    qtwebkit
+  ];
+
+  nativeBuildInputs = [
+    makeQtWrapper
+  ];
+
+  postInstall = ''
+    wrapQtProgram "$out/bin/trojita"
+  '';
+
+
+  meta = {
+    description = "A Qt IMAP e-mail client";
+    homepage = http://trojita.flaska.net/;
+    license = with lib.licenses; [ gpl2 gpl3 ];
+  };
+
+}