From 5d42e80772a0816845c857352e596da7980adad7 Mon Sep 17 00:00:00 2001
From: Timon Schelling <me@timon.zip>
Date: Fri, 27 Jun 2025 01:39:59 +0000
Subject: [PATCH 1/2] balsa: 2.6.4 -> 2.6.5, modernize

---
 pkgs/by-name/ba/balsa/package.nix | 41 +++++++++++++++++++------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ba/balsa/package.nix b/pkgs/by-name/ba/balsa/package.nix
index 6d4bbd062237..d13a4d77a6ff 100644
--- a/pkgs/by-name/ba/balsa/package.nix
+++ b/pkgs/by-name/ba/balsa/package.nix
@@ -1,41 +1,44 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
   glib,
   gmime3,
   gnutls,
-  gobject-introspection,
   gpgme,
   gtk3,
   gtksourceview4,
   gtkspell3,
-  intltool,
   libcanberra-gtk3,
   libesmtp,
   libical,
   libnotify,
   libsecret,
   openssl,
+  meson,
+  ninja,
   pkg-config,
   sqlite,
   webkitgtk_4_0,
   wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "balsa";
-  version = "2.6.4";
+  version = "2.6.5";
 
-  src = fetchurl {
-    url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.xz";
-    sha256 = "1hcgmjka2x2igdrmvzlfs12mv892kv4vzv5iy90kvcqxa625kymy";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "balsa";
+    tag = finalAttrs.version;
+    hash = "sha256-KvgDIFbXmVkTqOibKF+8UhupEDgdhje600aSbmeKZqo=";
   };
 
   nativeBuildInputs = [
+    meson
+    ninja
     pkg-config
-    intltool
-    gobject-introspection
     wrapGAppsHook3
   ];
 
@@ -57,6 +60,10 @@ stdenv.mkDerivation rec {
     webkitgtk_4_0
   ];
 
+  mesonFlags = [
+    (lib.mesonOption "sysconfdir" "etc")
+  ];
+
   configureFlags = [
     "--with-canberra"
     "--with-gtksourceview"
@@ -70,11 +77,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
-    homepage = "http://pawsa.fedorapeople.org/balsa/";
+  meta = {
     description = "E-mail client for GNOME";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.romildo ];
+    homepage = "https://gitlab.gnome.org/GNOME/balsa";
+    changelog = "https://gitlab.gnome.org/GNOME/balsa/-/blob/master/ChangeLog";
+    mainProgram = "balsa";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ romildo ];
   };
-}
+})

From d1e09e896648d27bf68e2efd4f3b2e174b3f3850 Mon Sep 17 00:00:00 2001
From: Timon Schelling <me@timon.zip>
Date: Mon, 30 Jun 2025 20:55:03 +0000
Subject: [PATCH 2/2] balsa: replace romildo with timon as maintainer

---
 pkgs/by-name/ba/balsa/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/balsa/package.nix b/pkgs/by-name/ba/balsa/package.nix
index d13a4d77a6ff..b1fbefb4e7cf 100644
--- a/pkgs/by-name/ba/balsa/package.nix
+++ b/pkgs/by-name/ba/balsa/package.nix
@@ -84,6 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "balsa";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ romildo ];
+    maintainers = with lib.maintainers; [ timon ];
   };
 })