From 513108f8e3b0d091f5a59e983bf9eb2d6330ff69 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 20 Feb 2026 16:56:51 -0600
Subject: [PATCH 1/2] cvc3: migrate to by-name

---
 .../cv}/cvc3/cvc3-2.4.1-gccv6-fix.patch           |  0
 .../default.nix => by-name/cv/cvc3/package.nix}   | 15 ++++++++++-----
 pkgs/top-level/all-packages.nix                   |  7 -------
 3 files changed, 10 insertions(+), 12 deletions(-)
 rename pkgs/{applications/science/logic => by-name/cv}/cvc3/cvc3-2.4.1-gccv6-fix.patch (100%)
 rename pkgs/{applications/science/logic/cvc3/default.nix => by-name/cv/cvc3/package.nix} (86%)

diff --git a/pkgs/applications/science/logic/cvc3/cvc3-2.4.1-gccv6-fix.patch b/pkgs/by-name/cv/cvc3/cvc3-2.4.1-gccv6-fix.patch
similarity index 100%
rename from pkgs/applications/science/logic/cvc3/cvc3-2.4.1-gccv6-fix.patch
rename to pkgs/by-name/cv/cvc3/cvc3-2.4.1-gccv6-fix.patch
diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/by-name/cv/cvc3/package.nix
similarity index 86%
rename from pkgs/applications/science/logic/cvc3/default.nix
rename to pkgs/by-name/cv/cvc3/package.nix
index 8c5f6b146d1b..e83a7d334332 100644
--- a/pkgs/applications/science/logic/cvc3/default.nix
+++ b/pkgs/by-name/cv/cvc3/package.nix
@@ -1,13 +1,18 @@
 {
   lib,
-  stdenv,
+  gccStdenv,
   fetchurl,
   flex,
   bison,
   gmp,
   perl,
 }:
-
+let
+  gmp' = lib.overrideDerivation gmp (_: {
+    dontDisableStatic = true;
+  });
+  stdenv = gccStdenv;
+in
 stdenv.mkDerivation rec {
   pname = "cvc3";
   version = "2.4.1";
@@ -18,7 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    gmp
+    gmp'
     flex
     bison
     perl
@@ -28,8 +33,8 @@ stdenv.mkDerivation rec {
 
   # fails to configure on darwin due to gmp not found
   configureFlags = [
-    "LIBS=-L${gmp}/lib"
-    "CXXFLAGS=-I${gmp.dev}/include"
+    "LIBS=-L${gmp'}/lib"
+    "CXXFLAGS=-I${gmp'.dev}/include"
   ];
 
   postPatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1172693508bf..d0bf9920f885 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12086,13 +12086,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  cvc3 = callPackage ../applications/science/logic/cvc3 {
-    gmp = lib.overrideDerivation gmp (_: {
-      dontDisableStatic = true;
-    });
-    stdenv = gccStdenv;
-  };
-
   ekrhyper = callPackage ../applications/science/logic/ekrhyper {
     ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
   };

From 9c5805703ffe44aeae08851b2fc51c7b8693b15b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 20 Feb 2026 16:59:21 -0600
Subject: [PATCH 2/2] cvc3: modernize derivation

---
 pkgs/by-name/cv/cvc3/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cv/cvc3/package.nix b/pkgs/by-name/cv/cvc3/package.nix
index e83a7d334332..65e174884043 100644
--- a/pkgs/by-name/cv/cvc3/package.nix
+++ b/pkgs/by-name/cv/cvc3/package.nix
@@ -13,13 +13,13 @@ let
   });
   stdenv = gccStdenv;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cvc3";
   version = "2.4.1";
 
   src = fetchurl {
-    url = "https://cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym";
+    url = "https://cs.nyu.edu/acsys/cvc3/releases/${finalAttrs.version}/cvc3-${finalAttrs.version}.tar.gz";
+    hash = "sha256-1VsdYAbPusP21MCGlkVYkCw+0O+masSZz7IZPz7krPc=";
   };
 
   buildInputs = [
@@ -60,4 +60,4 @@ stdenv.mkDerivation rec {
       downloadPage = "https://cs.nyu.edu/acsys/cvc3/download.html";
     };
   };
-}
+})