From a37d2451bc5922a908021bedd5950a94fd98d5f8 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Tue, 19 Nov 2024 06:12:30 +0100
Subject: [PATCH] fossil: 2.24 -> 2.25

- remove tclPackages.tcllib from nativeBuildInputs
  to disable the failing tests.
---
 .../version-management/fossil/default.nix     | 28 ++-----------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 77658b58f260..8d470d3f852f 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -3,7 +3,6 @@
 , tcl
 , libiconv
 , fetchurl
-, fetchpatch
 , buildPackages
 , zlib
 , openssl
@@ -18,17 +17,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fossil";
-  version = "2.24";
+  version = "2.25";
 
   src = fetchurl {
     url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz";
-    hash = "sha256-lc08F2g1vrm4lwdvpYFx/jCwspH2OHu1R0nvvfqWL0w=";
+    hash = "sha256-5O6ceBUold+yp13pET/5NB17Del1wDOzUQYLv0DS/KE=";
   };
 
   # required for build time tool `./tools/translate.c`
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  nativeBuildInputs = [ installShellFiles tcl tclPackages.tcllib ];
+  nativeBuildInputs = [ installShellFiles tcl ];
 
   buildInputs = [ zlib openssl readline which ed ]
     ++ lib.optional stdenv.hostPlatform.isDarwin libiconv
@@ -42,27 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optional (!withInternalSqlite) "--disable-internal-sqlite"
     ++ lib.optional withJson "--json";
 
-  patches = [
-    (fetchpatch {
-       url = "https://fossil-scm.org/home/vpatch?from=8be0372c10510437&to=5ad708085a90365f";
-       extraPrefix = "";
-       hash = "sha256-KxF40wiEY3R1RFM0/YOmdNiedQHzs+vyMXslnqLtqQ4=";
-       name = "fossil-disable-tests.patch";
-    })
-    (fetchpatch {
-       url = "https://fossil-scm.org/home/vpatch?from=fb4e90b662803e47&to=17c01c549e73c6b8";
-       extraPrefix = "";
-       hash = "sha256-b0JSDWEBTlLWFr5rO+g0biPzUfVsdeAw71DR7/WQKzU=";
-       name = "fossil-fix-json-test.patch";
-    })
-    (fetchpatch {
-       url = "https://fossil-scm.org/home/vpatch?from=5ad708085a90365f&to=fb4e90b662803e47";
-       extraPrefix = "";
-       hash = "sha256-bbWUrlhPxC/DQQDeC3gG0jGfxQ6F7YkxINqg3baf+j0=";
-       name = "fossil-comment-utf-tests.patch";
-    })
-  ];
-
   preBuild = ''
     export USER=nonexistent-but-specified-user
   '';