From c5728f1b19e141c5ffd2f98472081f8ff3c54f9b Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 6 May 2025 08:07:04 +0800
Subject: [PATCH] astroid: 0.16 -> 0.17

Diff: https://github.com/astroidmail/astroid/compare/v0.16...v0.17
---
 .../mailreaders/astroid/default.nix           | 45 +++++++------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 365aefcc4543..796742c045af 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -2,12 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
   adwaita-icon-theme,
   gmime3,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   ronn,
   libsass,
   notmuch,
@@ -28,30 +27,21 @@
   extraPythonPackages ? [ ],
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "astroid";
-  version = "0.16";
+  version = "0.17";
 
   src = fetchFromGitHub {
     owner = "astroidmail";
     repo = "astroid";
-    rev = "v${version}";
-    sha256 = "sha256-6xQniOLNUk8tDkooDN3Tp6sb43GqoynO6+fN9yhNqZ4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-FDStUt989sQXX6kpqStrdjOdAMlLAepcDba9ul9tcps=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "symbolic-icons.patch";
-      url = "https://github.com/astroidmail/astroid/commit/7c2022f06a4146ad62e858bcaacdb4ee817851b9.patch";
-      hash = "sha256-hZHOg1wUR8Kpd6017fWzhMmG+/WQxSOCnsiyIvUcpbU=";
-    })
-    (fetchpatch {
-      # error: 'is_regular' was not declared in this scope
-      name = "boost_is_regular.patch";
-      url = "https://github.com/astroidmail/astroid/commit/abd84171dc6c4e639f3e86649ddc7ff211077244.patch";
-      hash = "sha256-IY60AnWm18ZwrCFsOvBg76UginpMo7gXBf8GT87FqW4=";
-    })
-  ];
+  postPatch = ''
+    sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
+    sed -i "s~ -geom 10x10~~g" src/config.cc
+  '';
 
   nativeBuildInputs = [
     cmake
@@ -66,7 +56,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtkmm3
     gmime3
-    webkitgtk_4_0
+    webkitgtk_4_1
     libsass
     libpeas
     python3
@@ -79,11 +69,6 @@ stdenv.mkDerivation rec {
     vim
   ];
 
-  postPatch = ''
-    sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
-    sed -i "s~ -geom 10x10~~g" src/config.cc
-  '';
-
   pythonPath = with python3.pkgs; requiredPythonModules extraPythonPackages;
   preFixup = ''
     buildPythonPath "$out $pythonPath"
@@ -92,15 +77,15 @@ stdenv.mkDerivation rec {
     )
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://astroidmail.github.io/";
     description = "GTK frontend to the notmuch mail system";
     mainProgram = "astroid";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       bdimcheff
       SuprDewd
     ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
   };
-}
+})