alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

ocamlPackages.bap: 1.4.0 -> 1.6.0

Browse source 
libbap: 2018-03-01 -> 2019-04-05
This commit is contained in:
Vincent Laporte 2019-04-28 06:35:25 +00:00 committed by Vincent Laporte
parent ad1e17f5ba
commit f38bf3ba4e
4 changed files with 11 additions and 29 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 rec {
name = "libbap-${version}";
version = "master-2018-03-01";
version = "master-2019-04-05";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap-bindings";
rev = "bd125c379a784d4265c2ddcf1f6e34bde2e568d4";
sha256 = "0dp90djyjc262v1b1cw5irp424a8394y86fyprdk8z741wg56m3v";
rev = "1a89db62f1239a15d310b400f74e151c0a64f37f";
sha256 = "0mln9adjgxzhjmjayq06ahgiay4vj5kmnzdxqz3nsik9h3npycd6";
};
nativeBuildInputs = [ autoreconfHook which ];

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

@ -2,29 +2,25 @@
, ocaml, findlib, ocamlbuild, ocaml_oasis,
bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp,
utop,
ppx_tools_versioned,
which, makeWrapper, writeText
}:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-bap-${version}";
version = "1.4.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap";
rev = "v${version}";
sha256 = "0329m65x8q5q8vgvsqgyz2vz7q6qkh2rh11j7x29hckk3fzxsf8g";
sha256 = "0ryf2xb37pj2f9mc3p5prqgqrylph9qgq7q9jnbx8b03nzzpa6h6";
};
sigs = fetchurl {
url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip";
sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19";
sha256 = "0d69jd28z4g64mglq94kj5imhmk5f6sgcsh9q2nij3b0arpcliwk";
};
patches = [(fetchpatch {
url = "https://github.com/BinaryAnalysisPlatform/bap/commit/e4ee3a1e5b427e8d8991e7462b06123178c0a046.patch";
sha256 = "1yq33zd2sdacclr20g05c1q050m7x7vfbl66qdgansh23dr4fnxk";
})];
createFindlibDestdir = true;
setupHook = writeText "setupHook.sh" ''
@ -35,10 +31,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis
llvm_38
llvm_38 ppx_tools_versioned
utop ];
propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
piqi-ocaml uuidm frontc ounit ];
installPhase = ''
@ -64,6 +60,5 @@ stdenv.mkDerivation rec {
homepage = https://github.com/BinaryAnalysisPlatform/bap/;
maintainers = [ maintainers.maurer ];
license = licenses.mit;
broken = versionOlder ocaml.version "4.03";
};
}

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

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

15
pkgs/top-level/ocaml-packages.nix
View file

@ -57,20 +57,7 @@ let
base64 = callPackage ../development/ocaml-modules/base64 { };
bap = callPackage ../development/ocaml-modules/bap {
inherit (janeStreet_0_9_0) core_kernel ppx_jane parsexp;
ezjsonm = ezjsonm.override {
inherit (janeStreet_0_9_0) sexplib;
hex = hex.override {
cstruct = cstruct.override {
inherit (janeStreet_0_9_0) sexplib;
};
};
};
uri = uri_1_9.override {
inherit (janeStreet_0_9_0) ppx_sexp_conv sexplib;
};
};
bap = callPackage ../development/ocaml-modules/bap { };
batteries = callPackage ../development/ocaml-modules/batteries { };