diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 59da5473ab1..932a5811bec 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -1,20 +1,15 @@ {stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - pname = "ocaml-http"; - version = "0.1.3"; -in - stdenv.mkDerivation { - name = "${pname}-${version}"; + name = "ocaml-http-0.1.5"; src = fetchurl { - url = "http://upsilon.cc/~zack/hacking/software/${pname}/${pname}-${version}.tar.gz"; - sha256 = "070xw033r4pk6f4l0wcknm75y9qm4mp622a4cgzmcfhm58v6kssn"; + url = https://forge.ocamlcore.org/frs/download.php/545/ocaml-http-0.1.5.tar.gz; + sha256 = "09q12b0j01iymflssxigsqggbsp8dqh9pfvkm76dv860544mygws"; }; - buildInputs = [ocaml_pcre ocamlnet ocaml findlib camlp4]; + buildInputs = [ocaml findlib camlp4]; + propagatedBuildInputs = [ocaml_pcre ocamlnet]; createFindlibDestdir = true; @@ -31,7 +26,8 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/"; + homepage = http://ocaml-http.forge.ocamlcore.org/; + platforms = ocaml.meta.platforms; description = "do it yourself (OCaml) HTTP daemon"; license = licenses.lgpl2; maintainers = with maintainers; [ roconnor vbgl ]; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 06e54a67733..0948b7132a4 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ocamlnet-3.7.6"; + name = "ocamlnet-3.7.7"; src = fetchurl { - url = http://download.camlcity.org/download/ocamlnet-3.7.6.tar.gz; - sha256 = "0z17kxn1cyn1x5wgajw737m9rsjwji823rxdwvv8a5239xd1whji"; + url = http://download.camlcity.org/download/ocamlnet-3.7.7.tar.gz; + sha256 = "02bnks9jshpq9nqva5lky5hl009yp19cgvf1izjca620hx54d3jv"; }; buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl cryptokit];