From 9e754a6f86eefe47332031b63eb0088c76f8a985 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Oct 2017 17:09:50 +0000 Subject: [PATCH] ocamlPackages.ssl: 0.5.3 -> 0.5.4 --- pkgs/development/compilers/opa/default.nix | 2 +- pkgs/development/ocaml-modules/eliom/default.nix | 4 ++-- pkgs/development/ocaml-modules/lwt/default.nix | 4 ++-- pkgs/development/ocaml-modules/ocsigen-server/default.nix | 6 +++--- pkgs/development/ocaml-modules/ssl/default.nix | 6 +++--- pkgs/top-level/ocaml-packages.nix | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 9501b5a3a06e..7b9e00b105db 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index b981aa548e0b..42afec7e439d 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index c29f571a63ed..4d751dac476a 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 39375bc8ea1c..081f9edbecf9 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -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; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 81b8c28b4524..3886af37512f 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -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]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7e601e885584..e45256bd3dc4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -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 { };