diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 12:49:52 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 14:53:27 +0100 |
commit | 565bd805e6aea9258ead5449b46c5e56ae0568fb (patch) | |
tree | 81a23c558823fc865d180bb8b6318d24ec38729d /pkgs/development/ocaml-modules | |
parent | 25a78f7234ced8840610178a695078b5b08d9e6b (diff) | |
parent | 97693915e1d31478528ee72e8d1fea5aa384577b (diff) |
Merge branch 'master'
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/angstrom/default.nix | 34 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/bap/default.nix | 21 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/biniou/default.nix | 40 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/cohttp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/ctypes/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/janestreet/async_ssl.nix | 6 |
6 files changed, 60 insertions, 57 deletions
diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index c4ed5acbe1b6d..154b4890e4fc5 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,31 +1,29 @@ -{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib }: - -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" - then { - version = "0.5.1"; - sha256 = "0rm79xyszy9aqvflcc13y9xiya82z31fzmr3b3hx91pmqviymhgc"; - } else { - version = "0.4.0"; - sha256 = "019s3jwhnswa914bgj1fa6q67k0bl2ahqdaqfnavcbyii8763kh2"; - }; -in +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest, result }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "angstrom is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - inherit (param) version; - name = "ocaml-angstrom-${version}"; + version = "0.8.1"; + name = "ocaml${ocaml.version}-angstrom-${version}"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = "angstrom"; rev = "${version}"; - inherit (param) sha256; + sha256 = "067r3vy5lac1bfx947gy722amna3dbcak54nlh24vx87pmcq31qc"; }; - createFindlibDestdir = true; + buildInputs = [ ocaml findlib jbuilder alcotest ]; + propagatedBuildInputs = [ result ]; + + buildPhase = "jbuilder build -p angstrom"; + + doCheck = true; + checkPhase = "jbuilder runtest -p angstrom"; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ result cstruct ]; + inherit (jbuilder) installPhase; meta = { homepage = https://github.com/inhabitedtype/angstrom; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index ea151d1e0e5c9..8c42783c97804 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"; }; } diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 7047edf24b3e6..97c4750002e6c 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,26 +1,30 @@ { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, easy-format }: stdenv.mkDerivation rec { - version = "1.2.0"; - name = "ocaml${ocaml.version}-biniou-${version}"; - src = fetchFromGitHub { - owner = "mjambon"; - repo = "biniou"; - rev = "v${version}"; - sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; - }; + version = "1.2.0"; + name = "ocaml${ocaml.version}-biniou-${version}"; + src = fetchFromGitHub { + owner = "mjambon"; + repo = "biniou"; + rev = "v${version}"; + sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; + }; - buildInputs = [ ocaml findlib jbuilder ]; + buildInputs = [ ocaml findlib jbuilder ]; - propagatedBuildInputs = [ easy-format ]; + propagatedBuildInputs = [ easy-format ]; - inherit (jbuilder) installPhase; + postPatch = '' + patchShebangs . + ''; - meta = { - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; - description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.bsd3; - }; + inherit (jbuilder) installPhase; + + meta = { + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.bsd3; + }; } diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index ef92a005c7734..24f0e9bfd7a5a 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.0.2"; name = "ocaml${ocaml.version}-cohttp-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-cohttp"; rev = "v${version}"; - sha256 = "0h9ak2bvhmcdxickvybpg45il33xszh2ksacpjgqrnnslxnh81ig"; + sha256 = "0zgn32axmjvkmbvyfkbjcqximzc4zcfxs118b98xyrqnvwb0k7ka"; }; buildInputs = [ ocaml findlib jbuilder jsonm ppx_fields_conv ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index b419971921ba9..0ddf3cb5995c6 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,19 +1,19 @@ -{stdenv, buildOcaml, fetchurl, libffi, pkgconfig, ncurses}: +{ stdenv, buildOcaml, fetchzip, libffi, pkgconfig, ncurses, integers }: buildOcaml rec { name = "ctypes"; - version = "0.11.5"; + version = "0.13.1"; minimumSupportedOcamlVersion = "4"; - src = fetchurl { - url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "164gyrs6zxr5pyljwpjgd4knwlrkcmamsq3gvkkkvgf9rmhrl3zf"; + src = fetchzip { + url = "https://github.com/ocamllabs/ocaml-ctypes/archive/67e711ec891e087fbe1e0b4665aa525af4eaa409.tar.gz"; + sha256 = "1z84s5znr3lj84rzv6m37xxj9h7fwx4qiiykx3djf52qgk1rb2xb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ]; - propagatedBuildInputs = [ libffi ]; + propagatedBuildInputs = [ integers libffi ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index 5cd4c6064e08f..fdfd0338bb231 100644 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -1,10 +1,12 @@ -{stdenv, buildOcamlJane, fetchurl, async, comparelib, core, ctypes, openssl, - fieldslib, herelib, pipebang, sexplib, ocaml_oasis}: +{ stdenv, ocaml, buildOcamlJane, fetchurl, async, comparelib, core, ctypes +, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis, integers +}: buildOcamlJane rec { name = "async_ssl"; version = "113.33.07"; hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; + postPatch = "export CAML_LD_LIBRARY_PATH=${integers}/lib/ocaml/${ocaml.version}/site-lib/stubslibs:$CAML_LD_LIBRARY_PATH"; propagatedBuildInputs = [ ctypes async comparelib core fieldslib herelib pipebang sexplib openssl ocaml_oasis ]; meta = with stdenv.lib; { |