diff options
Diffstat (limited to 'pkgs/development/tools/analysis')
4 files changed, 37 insertions, 31 deletions
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 07f3053b9d43..70e476c4572d 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,34 +1,27 @@ -{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, - findlib, camlp4, sedlex, ocamlbuild, lwt_ppx, wtf8, dtoa }: +{ stdenv, fetchFromGitHub, lib, ocamlPackages, libelf, cf-private, CoreServices }: with lib; stdenv.mkDerivation rec { - version = "0.75.0"; + version = "0.76.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0xrcjjk16w6anpy58qa4la1jyfjs0xg5xkp58slhai996wqif24k"; + sha256 = "0r3yl4m7dhm1h4c431zp8hd2gg6k1d9bwd2371xav5q7hviwmjl6"; }; - # lwt.log is being split out into a separate package, so this can be - # removed once nixpkgs is updated. - # See https://github.com/ocsigen/lwt/issues/453#issuecomment-352897664 - postPatch = '' - substituteInPlace Makefile --replace lwt_log lwt.log - ''; - installPhase = '' mkdir -p $out/bin cp bin/flow $out/bin/ ''; - buildInputs = [ - ocaml libelf findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa - ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; + buildInputs = [ libelf + ] ++ (with ocamlPackages; [ + ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx lwt_log wtf8 dtoa + ]) ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { description = "A static type checker for JavaScript"; diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index bf1d1357f5e7..d2c27b9f4853 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = http://www.clarkware.com/software/JDepend.html; license = licenses.bsd3; platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index 4aec0f65783a..ff2b4d3b54f5 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -1,22 +1,32 @@ { stdenv, fetchFromGitHub # nativeBuildInputs -, qmake, pkgconfig, makeWrapper +, qmake, pkgconfig # Qt , qtbase, qtsvg, qtwebengine # buildInputs , radare2 , python3 }: - +let + r2 = radare2.overrideDerivation (o: { + name = "radare2-for-cutter-${version}"; + src = fetchFromGitHub { + owner = "radare"; + repo = "radare2"; + rev = "a98557bfbfa96e9f677a8c779ee78085ee5a23bb"; + sha256 = "04jl1lq3dqljb6vagzlym4wc867ayhx1v52f75rkfz0iybsh249r"; + }; + }); + version = "1.6"; +in stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.5"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0xwls8jhhigdkwyq3nf9xwcz4inm5smwinkyliwmfzvfflbbci5c"; + sha256 = "1ps52yf94yfnws3nn1iiwch2jy33dyvi7j47xkmh0m5fpdqi5xk7"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; @@ -30,8 +40,8 @@ stdenv.mkDerivation rec { --replace "include(lib_radare2.pri)" "" ''; - nativeBuildInputs = [ qmake pkgconfig makeWrapper ]; - buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ qtbase qtsvg qtwebengine r2 python3 ]; qmakeFlags = [ "CONFIG+=link_pkgconfig" @@ -42,13 +52,6 @@ stdenv.mkDerivation rec { "CUTTER_ENABLE_JUPYTER=false" ]; - # Fix crash on startup in some situations - postInstall = '' - wrapProgram $out/bin/Cutter \ - --prefix QT_PLUGIN_PATH : ${qtbase.bin}/${qtbase.qtPluginPrefix} \ - --prefix LD_LIBRARY_PATH : ${qtbase.out}/lib - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 1da6c6a1e864..1ecdd9f32ce5 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -8,14 +8,23 @@ stdenv.mkDerivation rec { sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7"; }; + patchPhase = '' + sed -i '1s;^;#include <unistd.h>\n;' src/objects/tool_object.cpp + sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_config.cpp + sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_config.cpp + sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_utils.cpp + sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_utils.cpp + ''; + buildInputs = [ qt4 ]; + nativeBuildInputs = [ qmake4Hook ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.valgrind.org/; description = "Qt4-based GUI for the Valgrind 3.6.x series"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - broken = true; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } |