colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42551 from vbgl/ocaml-re-1.7.3

Browse Source 
ocamlPackages.re: 1.7.1 -> 1.7.3
This commit is contained in:
xeji 2018-06-26 16:50:54 +02:00 committed by GitHub
commit 9c5b6bb814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 ];

24
pkgs/development/ocaml-modules/re/default.nix
View File

@ -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;