klee: 2.2 -> 2.3

* klee: 2.2 -> 2.3

authored by

Jonas Heinrich and committed by
GitHub
fc4b3a84 b2b431c2

+33 -46
+22 -38
pkgs/applications/science/logic/klee/default.nix
··· 1 1 { lib 2 2 , callPackage 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , cmake 6 - , llvmPackages_9 7 - , clang_9 5 + , llvmPackages_11 6 + , clang 8 7 , python3 9 8 , zlib 10 9 , z3 ··· 36 35 }: 37 36 38 37 let 38 + 39 39 # Python used for KLEE tests. 40 40 kleePython = python3.withPackages (ps: with ps; [ tabulate ]); 41 41 42 42 # The klee-uclibc derivation. 43 43 kleeuClibc = callPackage ./klee-uclibc.nix { 44 - inherit clang_9 llvmPackages_9 extraKleeuClibcConfig debugRuntime runtimeAsserts; 44 + inherit clang llvmPackages_11 extraKleeuClibcConfig debugRuntime runtimeAsserts; 45 45 }; 46 + 46 47 in 47 - clang_9.stdenv.mkDerivation rec { 48 + clang.stdenv.mkDerivation rec { 49 + 48 50 pname = "klee"; 49 - version = "2.2"; 51 + version = "2.3"; 52 + 50 53 src = fetchFromGitHub { 51 54 owner = "klee"; 52 55 repo = "klee"; 53 56 rev = "v${version}"; 54 - sha256 = "Ar3BKfADjJvvP0dI9+x/l3RDs8ncx4jmO7ol4MgOr4M="; 57 + sha256 = "sha256-E1c6K6Q+LAWm342W8I00JI6+LMvqmULHZLkv9Kj5RmY="; 55 58 }; 59 + 56 60 buildInputs = [ 57 - llvmPackages_9.llvm 58 - z3 stp cryptominisat 59 - gperftools sqlite 61 + cryptominisat 62 + gperftools 63 + lit # Configure phase checking for lit 64 + llvmPackages_11.llvm 65 + sqlite 66 + stp 67 + z3 60 68 ]; 69 + 61 70 nativeBuildInputs = [ 62 - cmake clang_9 71 + clang 72 + cmake 63 73 ]; 74 + 64 75 checkInputs = [ 65 76 gtest 66 77 ··· 94 105 patchShebangs . 95 106 ''; 96 107 97 - patches = map fetchpatch [ 98 - /* This patch is currently necessary for the unit test suite to run correctly. 99 - * See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03136.html 100 - * and https://github.com/klee/klee/pull/1458 for more information. 101 - */ 102 - { 103 - name = "fix-gtest"; 104 - sha256 = "F+/6videwJZz4sDF9lnV4B8lMx6W11KFJ0Q8t1qUDf4="; 105 - url = "https://github.com/klee/klee/pull/1458.patch"; 106 - } 107 - 108 - # This patch fixes test compile issues with glibc 2.33+. 109 - { 110 - name = "fix-glibc-2.33"; 111 - sha256 = "PzxqtFyLy9KF1eA9AAKg1tu+ggRdvu7leuvXifayIcc="; 112 - url = "https://github.com/klee/klee/pull/1385.patch"; 113 - } 114 - 115 - # /etc/mtab doesn't exist in the Nix build sandbox. 116 - { 117 - name = "fix-etc-mtab-in-tests"; 118 - sha256 = "2Yb/rJA791esNNqq8uAXV+MML4YXIjPKkHBOufvyRoQ="; 119 - url = "https://github.com/klee/klee/pull/1471.patch"; 120 - } 121 - ]; 122 - 123 108 doCheck = true; 124 - checkTarget = "check"; 125 109 126 110 passthru = { 127 111 # Let the user depend on `klee.uclibc` for klee-uclibc
+11 -8
pkgs/applications/science/logic/klee/klee-uclibc.nix
··· 3 3 , fetchFromGitHub 4 4 , which 5 5 , linuxHeaders 6 - , clang_9 7 - , llvmPackages_9 6 + , clang 7 + , llvmPackages_11 8 8 , python3 9 + , curl 9 10 , debugRuntime ? true 10 11 , runtimeAsserts ? false 11 12 , extraKleeuClibcConfig ? {} ··· 23 24 "DEVEL_PREFIX" = "/"; 24 25 }); 25 26 in 26 - clang_9.stdenv.mkDerivation rec { 27 + clang.stdenv.mkDerivation rec { 27 28 pname = "klee-uclibc"; 28 - version = "1.2"; 29 + version = "1.3"; 29 30 src = fetchFromGitHub { 30 31 owner = "klee"; 31 32 repo = "klee-uclibc"; 32 33 rev = "klee_uclibc_v${version}"; 33 - sha256 = "qdrGMw+2XwpDsfxdv6swnoaoACcF5a/RWgUxUYbtPrI="; 34 + sha256 = "sha256-xQ8GWa0Gmd3lbwKodJhrsZeuR4j7NT4zIUh+kNhVY/w="; 34 35 }; 36 + 35 37 nativeBuildInputs = [ 36 - clang_9 37 - llvmPackages_9.llvm 38 + clang 39 + curl 40 + llvmPackages_11.llvm 38 41 python3 39 42 which 40 43 ]; ··· 44 47 45 48 # HACK: needed for cross-compile. 46 49 # See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03141.html 47 - KLEE_CFLAGS = "-idirafter ${clang_9}/resource-root/include"; 50 + KLEE_CFLAGS = "-idirafter ${clang}/resource-root/include"; 48 51 49 52 prePatch = '' 50 53 patchShebangs ./configure