From f10e264fe8d7b7e7f526c6972157413218396786 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 25 Dec 2025 21:08:42 -0800
Subject: [PATCH] klee: 3.1-unstable-2025-07-11 -> 3.2

Still requires meta.broken = true since it has failing tests with LLVM
18, but it's not an unstable version at least.

Move to by-name while we're at it.
---
 .../logic => by-name/kl}/klee/klee-uclibc.nix    |  6 +++---
 .../default.nix => by-name/kl/klee/package.nix}  | 16 ++++++++++------
 pkgs/top-level/all-packages.nix                  |  4 ----
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename pkgs/{applications/science/logic => by-name/kl}/klee/klee-uclibc.nix (96%)
 rename pkgs/{applications/science/logic/klee/default.nix => by-name/kl/klee/package.nix} (96%)

diff --git a/pkgs/applications/science/logic/klee/klee-uclibc.nix b/pkgs/by-name/kl/klee/klee-uclibc.nix
similarity index 96%
rename from pkgs/applications/science/logic/klee/klee-uclibc.nix
rename to pkgs/by-name/kl/klee/klee-uclibc.nix
index 31ffc0d18aa3..d1d294bf09c3 100644
--- a/pkgs/applications/science/logic/klee/klee-uclibc.nix
+++ b/pkgs/by-name/kl/klee/klee-uclibc.nix
@@ -28,13 +28,13 @@ let
     }
   );
 in
-llvmPackages.stdenv.mkDerivation rec {
+llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "klee-uclibc";
   version = "1.4";
   src = fetchFromGitHub {
     owner = "klee";
     repo = "klee-uclibc";
-    rev = "klee_uclibc_v${version}";
+    rev = "klee_uclibc_v${finalAttrs.version}";
     hash = "sha256-sogQK5Ed0k5tf4rrYwCKT4YRKyEovgT25p0BhGvJ1ok=";
   };
 
@@ -113,4 +113,4 @@ llvmPackages.stdenv.mkDerivation rec {
     license = lib.licenses.lgpl3;
     maintainers = with lib.maintainers; [ numinit ];
   };
-}
+})
diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/by-name/kl/klee/package.nix
similarity index 96%
rename from pkgs/applications/science/logic/klee/default.nix
rename to pkgs/by-name/kl/klee/package.nix
index 459bfb52ade5..17f9c17fb780 100644
--- a/pkgs/applications/science/logic/klee/default.nix
+++ b/pkgs/by-name/kl/klee/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  llvmPackages,
+  llvmPackages_18,
   callPackage,
   fetchFromGitHub,
   cmake,
@@ -50,16 +50,19 @@ let
 
   # Python used for KLEE tests.
   kleePython = python3.withPackages (ps: with ps; [ tabulate ]);
+
+  # The LLVM we're using. Note that KLEE doesn't yet support 18 but this is the minimum in nixpkgs.
+  llvmPackages = llvmPackages_18;
 in
-llvmPackages.stdenv.mkDerivation {
+llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "klee";
-  version = "3.1-unstable-2025-07-11";
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner = "klee";
     repo = "klee";
-    rev = "1c9fbc1013a6000b39615cc9a5aba83e43a4bf75";
-    hash = "sha256-D93T0mBBrIhQTS42ScUHPrMoqCI55Y6Yp7snLmlriQM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8DofxLyTV8Al7ys8vSJpzf6qQV3sw940lGIZBvZqe2c=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -147,6 +150,7 @@ llvmPackages.stdenv.mkDerivation {
     "KLEE :: Feature/srem.c"
     "KLEE :: InlineAsm/RaiseAsm.c"
     "KLEE :: InlineAsm/asm_lifting.ll"
+    "KLEE :: Intrinsics/Freeze.ll"
     "KLEE :: Intrinsics/IntrinsicTrap.ll"
     "KLEE :: Intrinsics/IsConstant.ll"
     "KLEE :: Intrinsics/Missing.ll"
@@ -278,4 +282,4 @@ llvmPackages.stdenv.mkDerivation {
     # user experience and level of support.
     broken = true;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e05f2605efd..925f3216125c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11181,10 +11181,6 @@ with pkgs;
 
   klayout = libsForQt5.callPackage ../applications/misc/klayout { };
 
-  klee = callPackage ../applications/science/logic/klee {
-    llvmPackages = llvmPackages_18;
-  };
-
   kotatogram-desktop =
     callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop
       { };