cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #41197 from vbgl/ocaml-clean-201805

Browse source 
ocamlPackages.gapi_ocaml: minor cleaning
This commit is contained in:
xeji 2018-05-31 21:20:58 +02:00 committed by GitHub
commit 41649f5fce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/ocaml-modules/gapi-ocaml/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "gapi-ocaml is not available for OCaml ${ocaml.version}" then throw "gapi-ocaml is not available for OCaml ${ocaml.version}"
@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml jbuilder findlib ]; buildInputs = [ ocaml jbuilder findlib ];
propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; inherit (jbuilder) installPhase;
createFindlibDestdir = true;
meta = { meta = {
description = "OCaml client for google services"; description = "OCaml client for google services";

1
pkgs/development/ocaml-modules/janestreet/async_ssl.nix
View file

@ -6,7 +6,6 @@ buildOcamlJane rec {
name = "async_ssl"; name = "async_ssl";
version = "113.33.07"; version = "113.33.07";
hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; 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 propagatedBuildInputs = [ ctypes async comparelib core fieldslib
herelib pipebang sexplib openssl ocaml_oasis ]; herelib pipebang sexplib openssl ocaml_oasis ];
meta = with stdenv.lib; { meta = with stdenv.lib; {