cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ocamlPackages.bap: 2.1.0 → 2.2.0

Browse source 
libbap: 2019-11-15 → 2020-11-25
This commit is contained in:
Vincent Laporte 2021-02-22 08:57:51 +01:00 committed by Vincent Laporte
parent 36aa10c0ea
commit 554827b5a7
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/libbap/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation {
pname = "libbap";
version = "master-2019-11-15";
version = "master-2020-11-25";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap-bindings";
rev = "1a30dd3e1df18c432a83a7038b555662d6982ae3";
sha256 = "140gmak2kymh3r0fagb6ms66lmvwhhqj8pcd3qxc1p4ar330fwrh";
rev = "3193cb31e1b1f2455406ea0c819dad9dfa2ba10d";
sha256 = "0m4spva3z6fgbwlg4zq53l5p227dic893q2qq65pvzxyf7k7nmil";
};
nativeBuildInputs = [ autoreconfHook which ];

24
pkgs/development/ocaml-modules/bap/default.nix
View file

@ -2,28 +2,26 @@
, ocaml, findlib, ocamlbuild, ocaml_oasis
, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp
, utop, libxml2, ncurses
, linenoise
, ppx_bap
, ppx_bitstring
, ppx_tools_versioned
, yojson
, which, makeWrapper, writeText
, z3
}:
if !lib.versionAtLeast ocaml.version "4.07"
if !lib.versionAtLeast ocaml.version "4.08"
then throw "BAP is not available for OCaml ${ocaml.version}"
else
if lib.versionAtLeast core_kernel.version "0.13"
then throw "BAP needs core_kernel-0.12 (hence OCaml 4.07)"
else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-bap-${version}";
version = "2.1.0";
version = "2.2.0";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap";
rev = "v${version}";
sha256 = "10fkr6p798ad18j4h9bvp9dg4pmjdpv3hmj7k389i0vhqniwi5xq";
sha256 = "0c53sps6ba9n5cjdmapi8ylzlpcc11pksijp9swzlwgxyz5d276f";
};
sigs = fetchurl {
@ -41,12 +39,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis
llvm ppx_bitstring ppx_tools_versioned
linenoise
ounit
ppx_bitstring
z3
utop libxml2 ncurses ];
propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
piqi-ocaml uuidm frontc ounit ];
propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_bap core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
piqi-ocaml uuidm frontc yojson ];
installPhase = ''
export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR;
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
patches = [ ./curses_is_ncurses.patch ];
preConfigure = ''
substituteInPlace oasis/elf --replace bitstring.ppx ppx_bitstring
substituteInPlace oasis/elf-loader --replace bitstring.ppx ppx_bitstring
'';
configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ];

2
pkgs/top-level/all-packages.nix
View file

@ -14693,7 +14693,7 @@ in
libbacktrace = callPackage ../development/libraries/libbacktrace { };
libbap = callPackage ../development/libraries/libbap {
inherit (ocaml-ng.ocamlPackages_4_07) bap ocaml findlib ctypes;
inherit (ocaml-ng.ocamlPackages) bap ocaml findlib ctypes;
};
libbass = (callPackage ../development/libraries/audio/libbass { }).bass;

2
pkgs/top-level/python-packages.nix
View file

@ -878,7 +878,7 @@ in {
bandit = callPackage ../development/python-modules/bandit { };
bap = callPackage ../development/python-modules/bap { bap = pkgs.ocaml-ng.ocamlPackages_4_07.bap; };
bap = callPackage ../development/python-modules/bap { inherit (pkgs.ocaml-ng.ocamlPackages) bap; };
baron = callPackage ../development/python-modules/baron { };