From c88ffd2d5f6bf91a4d0525d10d93871edb604101 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 17:11:21 -0700
Subject: [PATCH] tamarin-prover: migrate to by-name

---
 .../ta/tamarin-prover/package.nix}                   | 12 ++++++++----
 pkgs/top-level/all-packages.nix                      |  9 ---------
 2 files changed, 8 insertions(+), 13 deletions(-)
 rename pkgs/{applications/science/logic/tamarin-prover/default.nix => by-name/ta/tamarin-prover/package.nix} (95%)

diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/by-name/ta/tamarin-prover/package.nix
similarity index 95%
rename from pkgs/applications/science/logic/tamarin-prover/default.nix
rename to pkgs/by-name/ta/tamarin-prover/package.nix
index d26ca2578397..f9fc7fbbb31d 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/by-name/ta/tamarin-prover/package.nix
@@ -1,5 +1,5 @@
 {
-  haskellPackages,
+  haskell,
   fetchFromGitHub,
   lib,
   stdenv,
@@ -8,11 +8,15 @@
   which,
   buildNpmPackage,
   maude,
-  graphviz,
+  graphviz-nox,
   glibcLocales,
 }:
 
 let
+  # 2025-03-07: dependency fclabels doesn't compile with GHC >= 9.8
+  # https://github.com/sebastiaanvisser/fclabels/issues/46
+  haskellPackages = haskell.packages.ghc96;
+
   inherit (haskellPackages) mkDerivation;
 
   version = "1.12.0";
@@ -177,7 +181,7 @@ mkDerivation (
       makeWrapper
       which
       maude
-      graphviz
+      graphviz-nox
     ];
     postInstall = ''
       wrapProgram $out/bin/tamarin-prover \
@@ -190,7 +194,7 @@ mkDerivation (
           lib.makeBinPath [
             which
             maude
-            graphviz
+            graphviz-nox
           ]
         }
       # so that the package can be used as a vim plugin to install syntax coloration
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72f3e478cbb3..8aea356cda63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3873,15 +3873,6 @@ with pkgs;
     callPackage ../development/tools/misc/coreboot-toolchain { }
   );
 
-  tamarin-prover = (
-    callPackage ../applications/science/logic/tamarin-prover {
-      # 2025-03-07: dependency fclabels doesn't compile with GHC >= 9.8
-      # https://github.com/sebastiaanvisser/fclabels/issues/46
-      haskellPackages = haskell.packages.ghc96;
-      graphviz = graphviz-nox;
-    }
-  );
-
   inherit
     (callPackage ../development/compilers/haxe {
     })