From 3886232a1c7e3da5415d60360dd9eff7d0641cb0 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 4 Oct 2025 17:39:16 +0200
Subject: [PATCH] fetchmail_7: unstable-2022-05-26 -> 7.0.0-alpha11

Fixes CVE-2025-61962.
---
 pkgs/applications/misc/fetchmail/v7.nix | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/fetchmail/v7.nix b/pkgs/applications/misc/fetchmail/v7.nix
index d9680b164b5d..5326aa73d380 100644
--- a/pkgs/applications/misc/fetchmail/v7.nix
+++ b/pkgs/applications/misc/fetchmail/v7.nix
@@ -1,32 +1,38 @@
 {
   lib,
   stdenv,
-  pkgs,
+  fetchFromGitLab,
+  openssl,
+  python3,
+  autoreconfHook,
+  pkg-config,
+  bison,
+  flex,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fetchmail";
-  version = "unstable-2022-05-26";
+  version = "7.0.0-alpha11";
 
-  src = pkgs.fetchFromGitLab {
+  src = fetchFromGitLab {
     owner = "fetchmail";
     repo = "fetchmail";
-    rev = "30b368fb8660d8fec08be1cdf2606c160b4bcb80";
+    tag = finalAttrs.version;
     hash = "sha256-83D2YlFCODK2YD+oLICdim2NtNkkJU67S3YLi8Q6ga8=";
   };
 
-  buildInputs = with pkgs; [
+  buildInputs = [
     openssl
     python3
   ];
-  nativeBuildInputs = with pkgs; [
+  nativeBuildInputs = [
     autoreconfHook
     pkg-config
     bison
     flex
   ];
 
-  configureFlags = [ "--with-ssl=${pkgs.openssl.dev}" ];
+  configureFlags = [ "--with-ssl=${openssl.dev}" ];
 
   postInstall = ''
     cp -a contrib/. $out/share/fetchmail-contrib
@@ -46,4 +52,4 @@ stdenv.mkDerivation {
     platforms = platforms.unix;
     license = licenses.gpl2Plus;
   };
-}
+})