Merge pull request #85979 from doronbehar/update-mailnag

mailnag: 1.3.0 -> 2.0.0

pkgs/applications/networking/mailreaders/mailnag/default.nix

@@ -1,28 +1,49 @@
-{ stdenv, fetchurl, gettext, gtk3, pythonPackages
+{ stdenv
-, gdk-pixbuf, libnotify, gst_all_1
+, fetchFromGitHub
-, libgnome-keyring3
+, gettext
-, wrapGAppsHook, gnome3
+, gtk3
-# otherwise passwords are stored unencrypted
+, pythonPackages
-, withGnomeKeyring ? true
+, gdk-pixbuf
+, libnotify
+, gst_all_1
+, libsecret
+, wrapGAppsHook
+, gsettings-desktop-schemas
+, glib
+, gobject-introspection
 }:
 
-let
+pythonPackages.buildPythonApplication rec {
-  inherit (pythonPackages) python;
-in pythonPackages.buildPythonApplication rec {
   pname = "mailnag";
-  version = "1.3.0";
+  version = "2.0.0";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/pulb/mailnag/archive/v${version}.tar.gz";
+    owner = "pulb";
-    sha256 = "0cp5pad6jzd5c14pddbi9ap5bi78wjhk1x2p0gbblmvmcasw309s";
+    repo = "mailnag";
+    rev = "v${version}";
+    sha256 = "0q97v9i96br22z3h6r2mz79i68ib8m8x42yxky78szfrf8j60i30";
   };
+  preFixup = ''
+    substituteInPlace $out/${pythonPackages.python.sitePackages}/Mailnag/common/dist_cfg.py \
+      --replace "/usr/" $out/
+    for desktop_file in $out/share/applications/*.desktop; do
+      substituteInPlace "$desktop_file" \
+      --replace "/usr/bin" $out/bin
+    done
+  '';
 
   buildInputs = [
-    gtk3 gdk-pixbuf libnotify gst_all_1.gstreamer
+    gtk3
-    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+    gdk-pixbuf
+    glib
+    libnotify
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
     gst_all_1.gst-plugins-bad
-    gnome3.adwaita-icon-theme
+    gobject-introspection
-  ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3;
+    libsecret
+  ];
 
   nativeBuildInputs = [
     gettext
@@ -30,20 +51,17 @@ in pythonPackages.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with pythonPackages; [
-    pygobject3 dbus-python pyxdg
+    gsettings-desktop-schemas
+    pygobject3
+    dbus-python
+    pyxdg
   ];
 
-  buildPhase = "";
-
-  installPhase = "${python}/bin/python setup.py install --prefix=$out";
-
-  doCheck = false;
-
   meta = with stdenv.lib; {
     description = "An extensible mail notification daemon";
     homepage = "https://github.com/pulb/mailnag";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ doronbehar ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -5123,7 +5123,7 @@ in
   mailhog = callPackage ../servers/mail/mailhog {};
 
   mailnag = callPackage ../applications/networking/mailreaders/mailnag {
-    pythonPackages = python2Packages;
+    pythonPackages = python3Packages;
   };
 
   mailsend = callPackage ../tools/networking/mailsend { };