From b01d034d937f26a86454ce69edabce55077ebff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= <tmuehlbacher@posteo.net>
Date: Fri, 18 Apr 2025 18:18:38 +0200
Subject: [PATCH 1/2] isync: 1.5.0-unstable-2024-09-29 -> 1.5.1

Fixes among other things `--dry-run` actually still making some changes.

Release notes: https://sourceforge.net/projects/isync/files/isync/1.5.1/
---
 pkgs/tools/networking/isync/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index 14d57703a320..b3a9df02831f 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -20,12 +20,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "isync";
-  version = "1.5.0-unstable-2024-09-29";
+  version = "1.5.1";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/isync/isync";
-    rev = "3c4b5f1c83a568f18c14c93aab95c9a853edfd15";
-    hash = "sha256-MRjWr88sxd3C+YTMCqEymxmLj5h+uJKh9mcG+aEqf64=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-l0jL4CzAdFtQGekbywic1Kuihy3ZQi4ozhSEcbJI0t0=";
   };
 
   # Fixes "Fatal: buffer too small" error
@@ -33,8 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   env.NIX_CFLAGS_COMPILE = "-DQPRINTF_BUFF=4000";
 
   autoreconfPhase = ''
-    echo "1.5.0-3c4b5" > VERSION
-    echo "See https://sourceforge.net/p/isync/isync/ci/3c4b5f1c83a568f18c14c93aab95c9a853edfd15/log/?path=" > ChangeLog
+    echo "${finalAttrs.version}" > VERSION
     ./autogen.sh
   '';
 

From 4cbe8cbd500ebef0a174a3df295bb34f3734e8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= <tmuehlbacher@posteo.net>
Date: Fri, 18 Apr 2025 18:21:03 +0200
Subject: [PATCH 2/2] isync: stop using `with lib;`; fix meta.changelog

The changelog url was trying to link to a nonexistent release for
`lib.version`.
---
 pkgs/tools/networking/isync/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index b3a9df02831f..017e6dd96ada 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -60,19 +60,19 @@ stdenv.mkDerivation (finalAttrs: {
         }"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://isync.sourceforge.net/";
     # https://sourceforge.net/projects/isync/
-    changelog = "https://sourceforge.net/p/isync/isync/ci/v${version}/tree/NEWS";
+    changelog = "https://sourceforge.net/p/isync/isync/ci/v${finalAttrs.version}/tree/NEWS";
     description = "Free IMAP and MailDir mailbox synchronizer";
     longDescription = ''
       mbsync (formerly isync) is a command line application which synchronizes
       mailboxes. Currently Maildir and IMAP4 mailboxes are supported. New
       messages, message deletions and flag changes can be propagated both ways.
     '';
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ primeos ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ primeos ];
     mainProgram = "mbsync";
   };
 })