From 092b433c333ba418d4bde633f4630bd2e1a02a05 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 17:07:18 -0700
Subject: [PATCH] statverif: migrae to by-name

---
 .../st/statverif/package.nix}                     | 15 +++++++++------
 pkgs/top-level/all-packages.nix                   |  4 ----
 2 files changed, 9 insertions(+), 10 deletions(-)
 rename pkgs/{applications/science/logic/statverif/default.nix => by-name/st/statverif/package.nix} (77%)

diff --git a/pkgs/applications/science/logic/statverif/default.nix b/pkgs/by-name/st/statverif/package.nix
similarity index 77%
rename from pkgs/applications/science/logic/statverif/default.nix
rename to pkgs/by-name/st/statverif/package.nix
index 6e6090ffaa14..8aabfaba4798 100644
--- a/pkgs/applications/science/logic/statverif/default.nix
+++ b/pkgs/by-name/st/statverif/package.nix
@@ -2,20 +2,23 @@
   lib,
   stdenv,
   fetchurl,
-  ocaml,
+  ocaml-ng,
 }:
 
-stdenv.mkDerivation rec {
+let
+  ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "statverif";
   version = "1.86pl4";
 
   src = fetchurl {
-    url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz";
+    url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${finalAttrs.version}.tar.gz";
     sha256 = "163vdcixs764jj8xa08w80qm4kcijf7xj911yp8jvz6pi1q5g13i";
   };
 
   pf-patch = fetchurl {
-    url = "http://markryan.eu/research/statverif/files/proverif-${version}-statverif-2657ab4.patch";
+    url = "http://markryan.eu/research/statverif/files/proverif-${finalAttrs.version}-statverif-2657ab4.patch";
     sha256 = "113jjhi1qkcggbsmbw8fa9ln8vs7vy2r288szks7rn0jjn0wxmbw";
   };
 
@@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ ocaml ];
 
-  patchPhase = "patch -p1 < ${pf-patch}";
+  patchPhase = "patch -p1 < ${finalAttrs.pf-patch}";
   buildPhase = "./build";
   installPhase = ''
     mkdir -p $out/bin
@@ -38,4 +41,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.thoughtpolice ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea82fe155297..72f3e478cbb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10747,10 +10747,6 @@ with pkgs;
     inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
   };
 
-  statverif = callPackage ../applications/science/logic/statverif {
-    ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
-  };
-
   why3 = callPackage ../applications/science/logic/why3 { coqPackages = coqPackages_8_20; };
 
   tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {