Unverified Commit f10e264f authored by Morgan Jones's avatar Morgan Jones
Browse files

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.
parent 5a49aa56

pkgs/applications/science/logic/klee/klee-uclibc.nix→pkgs/by-name/kl/klee/klee-uclibc.nix

+3 −3
Original line number Diff line number Diff line
@@ -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 ];

  };

}
 
})

pkgs/applications/science/logic/klee/default.nix→pkgs/by-name/kl/klee/package.nix

+10 −6
Original line number Diff line number Diff line 
{

  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;

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -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

      { };