From a1fdc48d7eb6026d8b8a585264ca512a7ee5195d Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Fri, 1 Jan 2016 19:01:05 +0100 Subject: [PATCH 1/7] ocaml-ssl: 0.4.7 -> 0.5.2 --- pkgs/development/ocaml-modules/ssl/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index ef8ce098f3ce..f80675f88d24 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -2,15 +2,16 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.4.7"; + version = "0.5.2"; in stdenv.mkDerivation { name = "ocaml-ssl-${version}"; src = fetchurl { - url = "mirror://debian/pool/main/o/ocaml-ssl/ocaml-ssl_${version}.orig.tar.gz"; - sha256 = "0i0j89b10n3xmmawcq4qfwa42133pddw4x5nysmsnpd15srv5gp9"; + url = "http://downloads.sourceforge.net/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz"; + + sha256 = "0341rm8aqrckmhag1lrqfnl17v6n4ci8ibda62ahkkn5cxd58cpp"; }; buildInputs = [which ocaml findlib]; @@ -19,8 +20,6 @@ stdenv.mkDerivation { dontAddPrefix = true; - configureFlags = "--disable-ldconf"; - createFindlibDestdir = true; meta = { From f4c6f769f411e59101a1301f0b45c89e4625da6d Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Fri, 1 Jan 2016 17:37:36 +0100 Subject: [PATCH 2/7] lwt: 2.4.6 -> 2.5.0 --- pkgs/development/ocaml-modules/lwt/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 0c73ff6521f2..a018194a2ace 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: let - version = "2.4.6"; + version = "2.5.0"; inherit (stdenv.lib) optional getVersion versionAtLeast; ocaml_version = getVersion ocaml; in @@ -13,16 +13,15 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; - sha256 = "0idci0zadpb8hmblszsrvg6yf36w5a9y6rsdwjc3jww71dgrw5d9"; + sha256 = "0jgg51aqbnia33l7bhgirnfpqybjwzpd85qzzd9znnc1a27gv8vr"; }; buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4 ppx_tools ]; propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; - configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" ] - ++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ] - ++ optional (versionAtLeast ocaml_version "4.0" && ! versionAtLeast ocaml_version "4.02") "--enable-toplevel"; + configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"] + ++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ]; createFindlibDestdir = true; From 87f2c1dcc416f88b89e2e1500b0148efa4595b38 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Fri, 1 Jan 2016 17:38:03 +0100 Subject: [PATCH 3/7] ocsigen-server: 2.5 -> 2.6 --- pkgs/development/ocaml-modules/ocsigen-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index a6361ce1237a..a1bd7d162342 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -9,11 +9,11 @@ let mkpath = p: n: in stdenv.mkDerivation { - name = "ocsigenserver-2.5"; + name = "ocsigenserver-2.6"; src = fetchurl { - url = https://github.com/ocsigen/ocsigenserver/archive/2.5.tar.gz; - sha256 = "0ayzlzjwg199va4sclsldlcp0dnwdj45ahhg9ckb51m28c2pw46r"; + url = https://github.com/ocsigen/ocsigenserver/archive/2.6.tar.gz; + sha256 = "0638xvlr0sssvjarmdwhgh7vbgdx8wiyjwq73w1bkjfwl7qm21zp"; }; buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt From 44931d4293ba3f1d24430624086ee0c7b705fcc3 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Fri, 1 Jan 2016 17:38:30 +0100 Subject: [PATCH 4/7] js_of_ocaml: 2.5 -> 2.6 --- .../tools/ocaml/js_of_ocaml/Makefile.conf.diff | 11 ----------- pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 10 +++++----- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff index 0e3f55df6d20..e6fc96038ff8 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff +++ b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff @@ -8,14 +8,3 @@ #### ---- old/Makefile 2014-09-30 16:40:37.000000000 +0200 -+++ new/Makefile 2015-10-14 10:28:41.366815864 +0200 -@@ -52,7 +52,7 @@ - install-bin: - install -d -m 755 $(BINDIR) - install $(BIN) $(BINDIR) -- install $(TOOLS) $(BINDIR) -+ install $(TOOLS) $(BINDIR) || true - - uninstall: uninstall-lib uninstall-bin - diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index eaabd50059d3..0c57ae47c2c8 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4, - cmdliner, tyxml, reactivedata}: + cmdliner, tyxml, reactivedata, cppo, which, base64}: stdenv.mkDerivation { - name = "js_of_ocaml-2.5"; + name = "js_of_ocaml-2.6"; src = fetchurl { - url = https://github.com/ocsigen/js_of_ocaml/archive/2.5.tar.gz; - sha256 = "1prm08nf8szmd3p13ysb0yx1cy6lr671bnwsp25iny8hfbs39sjv"; + url = https://github.com/ocsigen/js_of_ocaml/archive/2.6.tar.gz; + sha256 = "0q34lrn70dvz41m78bwgriyq6dxk97g8gcyg80nvxii4jp86dw61"; }; buildInputs = [ocaml findlib menhir ocsigen_deriving - cmdliner tyxml reactivedata]; + cmdliner tyxml reactivedata cppo which base64]; propagatedBuildInputs = [ ocaml_lwt camlp4 ]; patches = [ ./Makefile.conf.diff ]; From e956922b92980e3cc404b6c56224b2a81a793ee9 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Fri, 1 Jan 2016 17:38:50 +0100 Subject: [PATCH 5/7] eliom: 4.1.0 -> 4.2.0 --- pkgs/development/ocaml-modules/eliom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 23959306d2d4..ef0a88fb2280 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -8,12 +8,12 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; stdenv.mkDerivation rec { pname = "eliom"; - version = "4.1.0"; + version = "4.2.0"; name = "${pname}-${version}"; src = fetchurl { - url = https://github.com/ocsigen/eliom/archive/4.1.0.tar.gz; - sha256 = "10v7mrq3zsbxdlg8k8xif777mbvcdpabvnd1g7p2yqivr7f1qm24"; + url = https://github.com/ocsigen/eliom/archive/4.2.tar.gz; + sha256 = "0gbqzgn6xgpq6irz2sfr92qj3hjcwl45wy0inc4ps5r15nvq1l9h"; }; patches = [ ./camlp4.patch ]; From a14c867d624f2f3a77852f4e19f416209b20f1ff Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Wed, 6 Jan 2016 15:13:56 +0100 Subject: [PATCH 6/7] js_of_ocaml: Allow caml >= 4.02 to find camlp4 --- pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 0c57ae47c2c8..ca5230d1e086 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,18 +1,24 @@ {stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4, cmdliner, tyxml, reactivedata, cppo, which, base64}: +let camlp4_patch = fetchurl { + url = "https://github.com/FlorentBecker/js_of_ocaml/commit/3b511c5bb777d5049c49d7a04c01f142de7096b9.patch"; + sha256 = "c92eda8be504cd41eb242166fc815af496243b63d4d21b169f5b62ec5ace2d39"; + }; +in + stdenv.mkDerivation { name = "js_of_ocaml-2.6"; src = fetchurl { url = https://github.com/ocsigen/js_of_ocaml/archive/2.6.tar.gz; sha256 = "0q34lrn70dvz41m78bwgriyq6dxk97g8gcyg80nvxii4jp86dw61"; }; - + buildInputs = [ocaml findlib menhir ocsigen_deriving cmdliner tyxml reactivedata cppo which base64]; propagatedBuildInputs = [ ocaml_lwt camlp4 ]; - patches = [ ./Makefile.conf.diff ]; + patches = [ ./Makefile.conf.diff camlp4_patch ]; createFindlibDestdir = true; From f5e731168b47a42fcefdc51af05acd3997de3e05 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Tue, 12 Jan 2016 16:14:07 +0100 Subject: [PATCH 7/7] cohttp: 0.17.1 -> 0.19.3 --- pkgs/development/ocaml-modules/cohttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index e219b59de5de..9a30a5e4615e 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -4,13 +4,13 @@ buildOcaml rec { name = "cohttp"; - version = "0.17.1"; + version = "0.19.3"; minimumSupportedOcamlVersion = "4.02"; src = fetchurl { url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz"; - sha256 = "fb124fb2fb5ff2e74559bf380627f6a537e208c1518ddcb01f0d37b62b55f673"; + sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv"; }; buildInputs = [ alcotest ];