cdecl-blocks: fix build

pkgs/by-name/cd/cdecl-blocks/cdecl-2.5-lex.patch

@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1643b74..8f1ae11 100644
---- a/Makefile
-+++ b/Makefile
-@@ -33,7 +33,7 @@ c++decl: cdgram.c cdlex.c cdecl.c
- 	rm -f cdecl
- 
- cdlex.c: cdlex.l
--	lex cdlex.l && mv lex.yy.c cdlex.c
-+	flex cdlex.l && mv lex.yy.c cdlex.c
- 
- cdgram.c: cdgram.y
- 	yacc cdgram.y && mv y.tab.c cdgram.c

pkgs/by-name/cd/cdecl-blocks/package.nix

@@ -15,20 +15,11 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "ridiculousfish";
     repo = "cdecl-blocks";
-    rev = "1e6e1596771183d9bb90bcf152d6bc2055219a7e";
-    hash = "sha256-5XuiYkFe+QvVBRIXRieKoE0zbISMvU1iLgEfkw6GnlE=";
+    rev = "0fdb58f78bdc96409b07fa2945673e2d80c74557";
+    hash = "sha256-gR+a7J20oZMnHkM1LNwQOQaUt1BO84K5CzvaASHAnRE=";
   };
 
-  patches = [
-    ./cdecl-2.5-lex.patch
-    # when `USE_READLINE` is enabled, this option will not be present
-    ./test_remove_interactive_line.patch
-  ];
-
-  prePatch = ''
-    substituteInPlace cdecl.c \
-      --replace 'getline' 'cdecl_getline'
-  '';
+  patches = [ ./test_remove_interactive_line.patch ];
 
   strictDeps = true;
 

pkgs/by-name/cd/cdecl-blocks/test_remove_interactive_line.patch

@@ -1,6 +1,18 @@
---- a/test_expected_output.txt	2024-05-07 05:47:13.184419240 +0200
-+++ b/test_expected_output.txt	2024-05-07 05:48:38.980122345 +0200
-@@ -26,7 +26,6 @@
+diff --git a/testset_expected_output.txt b/testset_expected_output.txt
+index 10d7eb3..ffe8184 100644
+--- a/testset_expected_output.txt
++++ b/testset_expected_output.txt
+@@ -26,7 +26,6 @@ Valid set options (and command line equivalents) are:
+ 	options
+ 	create (-c), nocreate
+ 	prompt, noprompt (-q)
+-	interactive (-i), nointeractive
+ 	ritchie (-r), preansi (-p), ansi (-a) or cplusplus (-+)
+ 
+ Current set values are:
+--- a/testset_cpp_expected_output.txt
++++ b/testset_cpp_expected_output.txt
+@@ -26,7 +26,6 @@ Valid set options (and command line equivalents) are:
  	options
  	create (-c), nocreate
  	prompt, noprompt (-q)