Merge pull request #144084 from trofi/update-cvise

This commit is contained in:
Sandro 2021-11-30 20:03:20 +01:00 committed by GitHub
commit 5b42db3598
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions

View File

@ -1,17 +1,17 @@
{ lib, buildPythonApplication, fetchFromGitHub, bash, cmake, flex
, libclang, llvm, unifdef
, pebble, psutil, pytestCheckHook, pytest-flake8
, chardet, pebble, psutil, pytestCheckHook, pytest-flake8
}:
buildPythonApplication rec {
pname = "cvise";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "marxin";
repo = "cvise";
rev = "v${version}";
sha256 = "1x2i8nv0nncgvr07znhh2slngbrg8qcsz2zqx76bcyq9hssn6yal";
sha256 = "0cfzikkhp91hjgxjk3izzczb8d9p8v9zsfyk6iklk92n5qf1aakq";
};
patches = [
@ -21,7 +21,7 @@ buildPythonApplication rec {
nativeBuildInputs = [ cmake flex llvm.dev ];
buildInputs = [ bash libclang llvm llvm.dev unifdef ];
propagatedBuildInputs = [ pebble psutil ];
propagatedBuildInputs = [ chardet pebble psutil ];
checkInputs = [ pytestCheckHook pytest-flake8 unifdef ];
# 'cvise --command=...' generates a script with hardcoded shebang.

View File

@ -14400,7 +14400,8 @@ with pkgs;
cvehound = callPackage ../development/tools/analysis/cvehound { };
cvise = python3Packages.callPackage ../development/tools/misc/cvise {
inherit (llvmPackages_11) llvm libclang;
# cvise keeps up with fresh llvm releases and supports wide version range
inherit (llvmPackages_latest) llvm libclang;
};
cwltool = callPackage ../applications/science/misc/cwltool { };