diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-26 16:50:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-26 16:50:54 +0200 |
commit | 9c5b6bb81452f1e09f7c6abd984f9b3042598601 (patch) | |
tree | 4bcdf65e67c68b484e5c5105d50ad666056b3afa /pkgs | |
parent | fc66a3dc88b1263ec6ae7b441eb9a4231befd8b5 (diff) | |
parent | 3e60af02d3bc0f83f91987b6d6763d1046b306a5 (diff) | |
download | nixlib-9c5b6bb81452f1e09f7c6abd984f9b3042598601.tar nixlib-9c5b6bb81452f1e09f7c6abd984f9b3042598601.tar.gz nixlib-9c5b6bb81452f1e09f7c6abd984f9b3042598601.tar.bz2 nixlib-9c5b6bb81452f1e09f7c6abd984f9b3042598601.tar.lz nixlib-9c5b6bb81452f1e09f7c6abd984f9b3042598601.tar.xz nixlib-9c5b6bb81452f1e09f7c6abd984f9b3042598601.tar.zst nixlib-9c5b6bb81452f1e09f7c6abd984f9b3042598601.zip |
Merge pull request #42551 from vbgl/ocaml-re-1.7.3
ocamlPackages.re: 1.7.1 -> 1.7.3
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/ocaml-modules/bap/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/re/default.nix | 24 |
2 files changed, 24 insertions, 17 deletions
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 8c42783c9780..8882bbf66474 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,10 +1,12 @@ -{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, +{ stdenv, fetchFromGitHub, fetchurl, fetchpatch +, 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, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp, utop, - which, makeWrapper, writeText, ocaml}: + which, makeWrapper, writeText +}: -buildOcaml rec { - name = "bap"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-bap-${version}"; version = "1.4.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; @@ -18,6 +20,11 @@ buildOcaml rec { sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19"; }; + patches = [(fetchpatch { + url = "https://github.com/BinaryAnalysisPlatform/bap/commit/e4ee3a1e5b427e8d8991e7462b06123178c0a046.patch"; + sha256 = "1yq33zd2sdacclr20g05c1q050m7x7vfbl66qdgansh23dr4fnxk"; + })]; + createFindlibDestdir = true; setupHook = writeText "setupHook.sh" '' @@ -27,7 +34,7 @@ buildOcaml rec { nativeBuildInputs = [ which makeWrapper ]; - buildInputs = [ ocaml_oasis + buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis llvm_38 utop ]; diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 861ac8b3bc81..c6f1b6d17581 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "re is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - name = "ocaml-re-${version}"; - version = "1.7.1"; + name = "ocaml${ocaml.version}-re-${version}"; + version = "1.7.3"; src = fetchzip { url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; - sha256 = "1z2z4fjrpdbl0q50fdxvy3746w1vx6ybxcb0k81hqm1342nylbmw"; + sha256 = "1pb6w9wqg6gzcfaaw6ckv1bqjgjpmrzzqz7r0mp9w16qbf3i54zr"; }; - buildInputs = [ ocaml findlib ocamlbuild ounit ]; + buildInputs = [ ocaml findlib jbuilder ounit ]; - configurePhase = "ocaml setup.ml -configure --prefix $out" - + stdenv.lib.optionalString doCheck " --enable-tests"; - buildPhase = "ocaml setup.ml -build"; - doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06"; - checkPhase = "ocaml setup.ml -test"; - installPhase = "ocaml setup.ml -install"; + doCheck = true; + checkPhase = "jbuilder runtest"; - createFindlibDestdir = true; + inherit (jbuilder) installPhase; meta = { homepage = https://github.com/ocaml/ocaml-re; |