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

ocamlPackages.ssl: 0.5.3 -> 0.5.4

Browse Source
This commit is contained in:
Vincent Laporte 2017-10-05 17:09:50 +00:00
parent eeda400b30
commit 9e754a6f86
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/opa/default.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
buildInputs = [ which perl jdk openssl coreutils zlib ncurses
makeWrapper gcc binutils gnumake nodejs
] ++ (with ocamlPackages; [
ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph camlp4
ocaml findlib ssl cryptokit camlzip ulex ocamlgraph camlp4
]);
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";

4
pkgs/development/ocaml-modules/eliom/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
js_of_ocaml, react, lwt, calendar, cryptokit, tyxml,
ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
ipaddr, ocamlnet, ssl, ocaml_pcre, ocaml_optcomp,
reactivedata, opam, ppx_tools, ppx_deriving, findlib
, ocamlbuild
}:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec
propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
ocsigen_deriving js_of_ocaml
calendar cryptokit ocamlnet react ocaml_ssl ocaml_pcre ];
calendar cryptokit ocamlnet react ssl ocaml_pcre ];
installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";

4
pkgs/development/ocaml-modules/lwt/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
, react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
, react, ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
, ppx_tools, result, cppo
, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
@ -30,7 +30,7 @@ buildOcaml rec {
++ stdenv.lib.optional ppxSupport ppx_tools;
propagatedBuildInputs = [ result ]
++ optionals [ react ocaml_ssl ]
++ optionals [ react ssl ]
++ [ libev ];
configureScript = "ocaml setup.ml -configure";

6
pkgs/development/ocaml-modules/ocsigen-server/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, which, react, ocaml_ssl,
{ stdenv, fetchurl, ocaml, findlib, which, react, ssl,
lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
, camlzip, pgocaml
@ -17,7 +17,7 @@ stdenv.mkDerivation {
sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
};
buildInputs = [ocaml which findlib react ocaml_ssl lwt
buildInputs = [ocaml which findlib react ssl lwt
ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ];
@ -31,7 +31,7 @@ stdenv.mkDerivation {
''
rm -rf $out/var/run
wrapProgram $out/bin/ocsigenserver \
--prefix CAML_LD_LIBRARY_PATH : "${mkpath ocaml_ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
--prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
'';
dontPatchShebangs = true;

6
pkgs/development/ocaml-modules/ssl/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ssl-${version}";
version = "0.5.3";
version = "0.5.4";
src = fetchzip {
url = "https://github.com/savonet/ocaml-ssl/releases/download/0.5.3/ocaml-ssl-${version}.tar.gz";
sha256 = "0h2k19zpdvq1gqwrmmgkibw4j48l71vv6ajzxs0wi71y80c1vhwm";
url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz";
sha256 = "01sy3f94b463ff7dmkfsv67jh8g8h20wh7npjwqilniif7lgf4l3";
};
buildInputs = [which ocaml findlib];

4
pkgs/top-level/ocaml-packages.nix
View File

@ -439,8 +439,6 @@ let
ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { };
ocaml_ssl = callPackage ../development/ocaml-modules/ssl { };
ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { };
ocf = callPackage ../development/ocaml-modules/ocf { };
@ -606,6 +604,8 @@ let
sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
ssl = callPackage ../development/ocaml-modules/ssl { };
stog = callPackage ../applications/misc/stog { };
stringext = callPackage ../development/ocaml-modules/stringext { };