jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coccinelle: 1.0.6 → 1.1.0

Browse Source
This commit is contained in:
Vincent Laporte 2021-05-29 15:28:47 +02:00 committed by Vincent Laporte
parent 759d05ce9e
commit c3d87595f1
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/tools/misc/coccinelle/default.nix
View File

@ -2,36 +2,20 @@
stdenv.mkDerivation rec {
pname = "coccinelle";
version = "1.0.6";
version = "1.1.0";
src = fetchurl {
url = "http://coccinelle.lip6.fr/distrib/${pname}-${version}.tgz";
sha256 = "02g9hmwkvfl838zz690yra5jzrqjg6y6ffxkrfcsx790bhkfsll4";
url = "https://coccinelle.gitlabpages.inria.fr/website/distrib/${pname}-${version}.tar.gz";
sha256 = "0k0x4qnxzj8fymkp6y9irggcah070hj7hxq8l6ddj8ccpmjbhnsb";
};
buildInputs = with ocamlPackages; [
ocaml findlib menhir
ocaml_pcre pycaml
ocaml_pcre parmap stdcompat
python ncurses pkg-config
];
doCheck = !stdenv.isDarwin;
# The build system builds two versions of spgen:
# 'spgen' with ocamlc -custom (bytecode specially linked)
# and 'spgen.opt' using ocamlopt.
# I'm not sure of the intentions here, but the way
# the 'spgen' binary is produced results in an
# invalid/incorrect interpreter path (/lib/ld-linux*).
# We could patch it, but without knowing why it's
# finding the wrong path it seems safer to use
# the .opt version that is built correctly.
# All that said, our fix here is simple: remove 'spgen'.
# The bin/spgen entrypoint is really a bash script
# and will use spgen.opt if 'spgen' doesn't exist.
postInstall = ''
rm $out/lib/coccinelle/spgen/spgen
'';
doCheck = false;
meta = {
description = "Program to apply semantic patches to C code";

4
pkgs/top-level/all-packages.nix
View File

@ -13072,9 +13072,7 @@ in
# Does not actually depend on Qt 5
inherit (plasma5Packages) extra-cmake-modules;
coccinelle = callPackage ../development/tools/misc/coccinelle {
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
};
coccinelle = callPackage ../development/tools/misc/coccinelle { };
cpptest = callPackage ../development/libraries/cpptest { };