Merge remote-tracking branch 'upstream/master' into openssl-1.1

3 files changed, 30 insertions, 135 deletions

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 42f29574eef3..bb4c6c54f161 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -31,11 +31,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "claws-mail-${version}";
-  version = "3.17.3";
+  version = "3.17.4";
 
   src = fetchurl {
     url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
-    sha256 = "1wnj6c9cbmhphs2l6wfvndkk2g08rmxw0sl2c8k1k008dxd1ykjh";
+    sha256 = "00mfhaac16sv67rwiq98hr4nl5zmd1h2afswwwksdcsi3q9x23jr";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
new file mode 100644
index 000000000000..7019c309feb9
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, python3, notmuch }:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "mlarchive2maildir";
+  version = "0.0.6";
+
+  src = python3.pkgs.fetchPypi {
+    inherit pname version;
+    sha256 = "025mv890zsk25cral9cas3qgqdsszh5025khz473zs36innjd0mw";
+  };
+
+  nativeBuildInputs = with python3.pkgs; [ setuptools_scm ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    beautifulsoup4
+    click
+    click-log
+    requests
+    six
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/flokli/mlarchive2maildir;
+    description = "Imports mail from (pipermail) archives into a maildir";
+    license = licenses.mit;
+    maintainers = with maintainers; [ andir flokli ];
+  };
+}
diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
deleted file mode 100644
index 5bb24c9ded7e..000000000000
--- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
+++ /dev/null
@@ -1,133 +0,0 @@
-{ dpkg, fetchurl, lib, pkgs, stdenv
-, alsaLib
-, atk
-, cairo
-, coreutils
-, cups
-, dbus
-, desktop-file-utils
-, expat
-, fontconfig
-, freetype
-, gcc-unwrapped
-, gdk-pixbuf
-, glib
-, gnome2
-, libgnome-keyring
-, libnotify
-, makeWrapper
-, nodejs
-, nspr
-, nss
-, pango
-, python2
-, udev
-, wget
-, xorg
-}:
-
-stdenv.mkDerivation rec {
-  name = "${pkgname}-${version}";
-  pkgname = "nylas-mail-bin";
-  version = "2.0.32";
-  subVersion = "fec7941";
-
-  src =
-    if stdenv.hostPlatform.system == "x86_64-linux" then
-      fetchurl {
-        url = "https://edgehill.s3.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb";
-        sha256 = "40060aa1dc3b5187b8ed4a07b9de3427e3c5a291df98c2c82395647fa2aa4ada";
-      }
-    else
-      throw "NylasMail is not supported on ${stdenv.hostPlatform.system}";
-
-  propagatedBuildInputs = [
-    alsaLib
-    atk
-    cairo
-    coreutils
-    cups
-    dbus
-    desktop-file-utils
-    expat
-    fontconfig
-    freetype
-    gcc-unwrapped
-    gdk-pixbuf
-    glib
-    gnome2.GConf
-    gnome2.gtk
-    libgnome-keyring
-    libnotify
-    nodejs
-    nspr
-    nss
-    pango
-    python2
-    udev
-    wget
-    xorg.libX11
-    xorg.libXScrnSaver
-    xorg.libXcomposite
-    xorg.libXcursor
-    xorg.libXdamage
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libXrandr
-    xorg.libXrender
-    xorg.libXtst
-    xorg.libxkbfile
-  ];
-
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    mkdir -p $out
-
-    ${dpkg}/bin/dpkg-deb -x $src unpacked
-    mv unpacked/usr/* $out/
-
-    # Fix path in desktop file
-    substituteInPlace $out/share/applications/nylas-mail.desktop \
-      --replace /usr/bin/nylas-mail $out/bin/nylas-mail
-
-    # Patch librariess
-    noderp=$(patchelf --print-rpath $out/share/nylas-mail/libnode.so)
-    patchelf --set-rpath $noderp:$out/lib:${stdenv.cc.cc.lib}/lib:${xorg.libxkbfile.out}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
-      $out/share/nylas-mail/libnode.so
-
-    ffrp=$(patchelf --print-rpath $out/share/nylas-mail/libffmpeg.so)
-    patchelf --set-rpath $ffrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
-      $out/share/nylas-mail/libffmpeg.so
-
-    # Patch binaries
-    binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas)
-    patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \
-      --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
-      $out/share/nylas-mail/nylas
-
-    wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome-keyring}/lib";
-
-    # Fix path to bash so apm can install plugins.
-    substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \
-      --replace /bin/bash ${stdenv.shell}
-
-    wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \
-      --set PATH "${coreutils}/bin"
-    patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \
-      --set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Open-source mail client built on the modern web with Electron, React, and Flux";
-    longDescription = ''
-      Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. Nylas Mail can be enabled with it's requirements by enabling 'services.nylas-mail.enable=true'. Alternatively, make sure to have services.gnome3.gnome-keyring.enable = true; in your configuration.nix before running nylas-mail. If you happen to miss this step, you should remove ~/.nylas-mail and "~/.config/Nylas Mail" for a blank setup".
-    '';
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ johnramsden ];
-    homepage = https://nylas.com;
-    platforms = [ "x86_64-linux" ];
-  };
-}