diff options
| author | Morgan Jones <me@numin.it> | 2024-04-09 19:34:02 -0700 |
|---|---|---|
| committer | Morgan Jones <me@numin.it> | 2024-04-09 19:41:50 -0700 |
| commit | 80d57056bcee596bcd66b7d5d9f4b51bb99a1c9f (patch) | |
| tree | 2273786b1fc29487e014a4dfed911cf0203a46a4 | |
| parent | Merge pull request #301926 from otavio/mcumgr (diff) | |
| download | nixpkgs-80d57056bcee596bcd66b7d5d9f4b51bb99a1c9f.tar.gz | |
klee: 3.0 -> 3.1
| -rw-r--r-- | pkgs/applications/science/logic/klee/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/klee/klee-uclibc.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index 68f68355f816..4f17558b340e 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -6,7 +6,6 @@ , clang , llvm , python3 -, zlib , z3 , stp , cryptominisat @@ -45,13 +44,13 @@ let }; in stdenv.mkDerivation rec { pname = "klee"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "klee"; repo = "klee"; rev = "v${version}"; - hash = "sha256-y5lWmtIcLAthQ0oHYQNd+ir75YaxHZR9Jgiz+ZUFQjY="; + hash = "sha256-5js1N8qVF0lCkahSU3ojT7+p/a9IaUpPWhIyFHEzqto="; }; nativeBuildInputs = [ cmake ]; @@ -98,6 +97,9 @@ in stdenv.mkDerivation rec { patchShebangs . ''; + # https://github.com/klee/klee/issues/1690 + hardeningDisable = [ "fortify" ]; + doCheck = true; passthru = { diff --git a/pkgs/applications/science/logic/klee/klee-uclibc.nix b/pkgs/applications/science/logic/klee/klee-uclibc.nix index 91086ae84627..a8e459a6bdae 100644 --- a/pkgs/applications/science/logic/klee/klee-uclibc.nix +++ b/pkgs/applications/science/logic/klee/klee-uclibc.nix @@ -26,12 +26,12 @@ let }); in stdenv.mkDerivation rec { pname = "klee-uclibc"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "klee"; repo = "klee-uclibc"; rev = "klee_uclibc_v${version}"; - sha256 = "sha256-xQ8GWa0Gmd3lbwKodJhrsZeuR4j7NT4zIUh+kNhVY/w="; + sha256 = "sha256-sogQK5Ed0k5tf4rrYwCKT4YRKyEovgT25p0BhGvJ1ok="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4b6d202885e..20e4039b1e33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32435,7 +32435,7 @@ with pkgs; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; - klee = callPackage ../applications/science/logic/klee (with llvmPackages_12; { + klee = callPackage ../applications/science/logic/klee (with llvmPackages_13; { clang = clang; llvm = llvm; stdenv = stdenv; |