summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
authorMatthew Maurer <matthew.r.maurer@gmail.com>2018-03-01 12:10:41 -0500
committerMatthew Maurer <matthew.r.maurer@gmail.com>2018-03-01 17:22:43 -0500
commita9409104a0462bca4ae171bf809d9bbc8ba5933d (patch)
tree75f684807bab39461591f8e886a1bb8f526a9de0 /pkgs/development/ocaml-modules
parent48cc8c2fffdae1724b8858e3ba2b7cf4018e1f00 (diff)
downloadnixlib-a9409104a0462bca4ae171bf809d9bbc8ba5933d.tar
nixlib-a9409104a0462bca4ae171bf809d9bbc8ba5933d.tar.gz
nixlib-a9409104a0462bca4ae171bf809d9bbc8ba5933d.tar.bz2
nixlib-a9409104a0462bca4ae171bf809d9bbc8ba5933d.tar.lz
nixlib-a9409104a0462bca4ae171bf809d9bbc8ba5933d.tar.xz
nixlib-a9409104a0462bca4ae171bf809d9bbc8ba5933d.tar.zst
nixlib-a9409104a0462bca4ae171bf809d9bbc8ba5933d.zip
bap: 1.2 -> 1.4
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r--pkgs/development/ocaml-modules/bap/default.nix21
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index ea151d1e0e5c..8c42783c9780 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -1,18 +1,21 @@
-{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, utop, which, makeWrapper, writeText, ocaml}:
+{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis,
+ bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp,
+ utop,
+ which, makeWrapper, writeText, ocaml}:
 
 buildOcaml rec {
   name = "bap";
-  version = "1.2.0";
+  version = "1.4.0";
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap";
     rev = "v${version}";
-    sha256 = "0dn1gvj73pma0rsw8r50cmjddibnf42w1kbskb2vpzq0kb79jlkw";
+    sha256 = "0329m65x8q5q8vgvsqgyz2vz7q6qkh2rh11j7x29hckk3fzxsf8g";
   };
 
   sigs = fetchurl {
      url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip";
-     sha256 = "0mpsq2pinbrynlisnh8j3nrlamlsls7lza0bkqnm9szqjjdmcgfn";
+     sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19";
   };
 
   createFindlibDestdir = true;
@@ -28,7 +31,7 @@ buildOcaml rec {
                   llvm_38
                   utop ];
 
-  propagatedBuildInputs = [ bitstring camlzip cmdliner core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi
+  propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
                             piqi-ocaml uuidm frontc ounit ];
 
   installPhase = ''
@@ -45,11 +48,7 @@ buildOcaml rec {
 
   disableIda = "--disable-ida --disable-fsi-benchmark";
 
-  doCheck = true;
-
-  checkTarget = "check test";
-
-  configureFlags = "--enable-everything --enable-tests ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config";
+  configureFlags = "--enable-everything ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config";
 
   BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)";
 
@@ -58,6 +57,6 @@ buildOcaml rec {
     homepage = https://github.com/BinaryAnalysisPlatform/bap/;
     maintainers = [ maintainers.maurer ];
     license = licenses.mit;
-    broken = versionAtLeast ocaml.version "4.03";
+    broken = versionOlder ocaml.version "4.03";
   };
 }