From a799ad04a69f358a078b0345777e535cca73d359 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 30 Jun 2023 19:11:18 +0300
Subject: [PATCH 1/2] mswatch: Remove rec and . from end of meta.description

---
 pkgs/applications/networking/mailreaders/mswatch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mswatch/default.nix b/pkgs/applications/networking/mailreaders/mswatch/default.nix
index 41f0ac2fe488..4c16be2a65aa 100644
--- a/pkgs/applications/networking/mailreaders/mswatch/default.nix
+++ b/pkgs/applications/networking/mailreaders/mswatch/default.nix
@@ -8,7 +8,7 @@
 , glib
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "mswatch";
   # Stable release won't compile successfully
   version = "unstable-2018-11-21";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "A command-line Linux utility that efficiently directs mail synchronization between a pair of mailboxes.";
+    description = "A command-line Linux utility that efficiently directs mail synchronization between a pair of mailboxes";
     homepage = "https://mswatch.sourceforge.net/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;

From 91612045b81bc1ccd29ed4287c7d82900b951143 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 30 Jun 2023 20:43:07 +0300
Subject: [PATCH 2/2] mswatch: Use fetchsvn as a more reliable src

See also discussion at
https://github.com/NixOS/nixpkgs/pull/239140#discussion_r1248079360
---
 .../networking/mailreaders/mswatch/default.nix           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mswatch/default.nix b/pkgs/applications/networking/mailreaders/mswatch/default.nix
index 4c16be2a65aa..2706b9c4597f 100644
--- a/pkgs/applications/networking/mailreaders/mswatch/default.nix
+++ b/pkgs/applications/networking/mailreaders/mswatch/default.nix
@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, fetchzip
+, fetchsvn
 , pkg-config
 , autoreconfHook
 , bison
@@ -13,9 +13,10 @@ stdenv.mkDerivation {
   # Stable release won't compile successfully
   version = "unstable-2018-11-21";
 
-  src = fetchzip {
-    url = "https://sourceforge.net/code-snapshots/svn/m/ms/mswatch/code/mswatch-code-r369-trunk.zip";
-    hash = "sha256-czwwhchTizfgVmeknQGLijYgaFSP/45pD2yhDKj5BKw=";
+  src = fetchsvn {
+    url = "svn://svn.code.sf.net/p/mswatch/code/trunk";
+    rev = "369";
+    sha256 = "sha256-czwwhchTizfgVmeknQGLijYgaFSP/45pD2yhDKj5BKw=";
   };
   nativeBuildInputs = [
     pkg-config