From 717656fd03ef561a9d6384c3702a16e4707547c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 13 May 2020 18:13:16 -0300
Subject: [PATCH 1/3] balsa: format with nixpkgs-fmt

---
 .../networking/mailreaders/balsa/default.nix  | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index 04d00a166aa8..5202606b9932 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -1,7 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls,
-  webkitgtk, libesmtp, openssl, libnotify, gtkspell3, gpgme,
-  libcanberra-gtk3, libsecret, gtksourceview, gobject-introspection,
-  wrapGAppsHook
+{ stdenv
+, fetchurl
+, pkgconfig
+, intltool
+, glib
+, gtk3
+, gmime
+, gnutls
+, webkitgtk
+, libesmtp
+, openssl
+, libnotify
+, gtkspell3
+, gpgme
+, libcanberra-gtk3
+, libsecret
+, gtksourceview
+, gobject-introspection
+, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {

From 7172181c3d0f4b305f38577107e1afb025ff5490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 13 May 2020 18:17:05 -0300
Subject: [PATCH 2/3] balsa: sort dependence list

---
 .../networking/mailreaders/balsa/default.nix  | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index 5202606b9932..bb4e16d17b6a 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -1,21 +1,21 @@
 { stdenv
 , fetchurl
-, pkgconfig
-, intltool
 , glib
-, gtk3
 , gmime
 , gnutls
-, webkitgtk
-, libesmtp
-, openssl
-, libnotify
-, gtkspell3
-, gpgme
-, libcanberra-gtk3
-, libsecret
-, gtksourceview
 , gobject-introspection
+, gpgme
+, gtk3
+, gtksourceview
+, gtkspell3
+, intltool
+, libcanberra-gtk3
+, libesmtp
+, libnotify
+, libsecret
+, openssl
+, pkgconfig
+, webkitgtk
 , wrapGAppsHook
 }:
 
@@ -37,18 +37,18 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib
-    gtk3
     gmime
     gnutls
-    webkitgtk
-    openssl
-    libnotify
-    gtkspell3
     gpgme
-    libcanberra-gtk3
+    gtk3
     gtksourceview
-    libsecret
+    gtkspell3
+    libcanberra-gtk3
     libesmtp
+    libnotify
+    libsecret
+    openssl
+    webkitgtk
   ];
 
   configureFlags = [

From d56c2a0b24ae92cdab3c19f054ae15e743ec376c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 13 May 2020 18:12:22 -0300
Subject: [PATCH 3/3] balsa: 2.5.9 -> 2.6.1

Remove --with-gpgme as gpg is fixed build requirement now.
---
 .../networking/mailreaders/balsa/default.nix          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index bb4e16d17b6a..055aa15b2ec8 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetchurl
 , glib
-, gmime
+, gmime3
 , gnutls
 , gobject-introspection
 , gpgme
@@ -11,6 +11,7 @@
 , intltool
 , libcanberra-gtk3
 , libesmtp
+, libical
 , libnotify
 , libsecret
 , openssl
@@ -21,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "balsa";
-  version = "2.5.9";
+  version = "2.6.1";
 
   src = fetchurl {
     url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2";
-    sha256 = "19gs1qfvbk9qx4rjmgrmvid00kl9k153zjjx8zjii2lz09w7g19i";
+    sha256 = "1xkxx801p7sbfkn0bh3cz85wra4xf1z1zhjqqc80z1z1nln7fhb4";
   };
 
   nativeBuildInputs = [
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib
-    gmime
+    gmime3
     gnutls
     gpgme
     gtk3
@@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
     gtkspell3
     libcanberra-gtk3
     libesmtp
+    libical
     libnotify
     libsecret
     openssl
@@ -53,7 +55,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-canberra"
-    "--with-gpgme"
     "--with-gtksourceview"
     "--with-libsecret"
     "--with-ssl"