From a97cf72a27fc3171a9eaad99369bd9aed579629e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 29 Sep 2014 23:54:20 +0200 Subject: [PATCH 1/3] ocaml-sexplib: propagate the dependency to typeconv And requires camlp4 --- pkgs/development/ocaml-modules/sexplib/108.08.00.nix | 10 ++++++---- pkgs/development/ocaml-modules/sexplib/default.nix | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index 3e73b562e7e..3dbb0ea8e81 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, typeconv}: +{stdenv, fetchurl, ocaml, findlib, typeconv, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,14 +14,16 @@ stdenv.mkDerivation { sha256 = "11z1k1d7dbb5m957klgalimpr0r602xp5zkkbgbffib1bphasarg"; }; - buildInputs = [ocaml findlib typeconv ]; + buildInputs = [ocaml findlib]; + propagatedBuildInputs = [typeconv camlp4]; createFindlibDestdir = true; - meta = { + meta = with stdenv.lib; { homepage = https://ocaml.janestreet.com/; description = "Library for serializing OCaml values to and from S-expressions"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; + maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix index 6f744778875..a32c6a0e2ce 100644 --- a/pkgs/development/ocaml-modules/sexplib/default.nix +++ b/pkgs/development/ocaml-modules/sexplib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv}: +{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,14 +14,16 @@ stdenv.mkDerivation { sha256 = "0qh0zqp5nakqpmmhh4x7cg03vqj3j2bj4zj0nqdlksai188p9ila"; }; - buildInputs = [ocaml findlib ocaml_typeconv ]; + buildInputs = [ocaml findlib]; + propagatedBuildInputs = [ocaml_typeconv camlp4]; createFindlibDestdir = true; - meta = { + meta = with stdenv.lib; { homepage = https://ocaml.janestreet.com/; description = "Library for serializing OCaml values to and from S-expressions"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; + maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms; }; } From e9304fe03977347e20e0dc2bb7669906f4ede9a7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 30 Sep 2014 00:15:05 +0200 Subject: [PATCH 2/3] ocaml-ipaddr: update 2.4.0 -> 2.5.0 --- .../ocaml-modules/ocaml-ipaddr/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix index e96f3f179a9..09cfe1c350d 100644 --- a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix @@ -1,15 +1,23 @@ -{ocaml, findlib, stdenv, fetchurl}: - +{ocaml, findlib, stdenv, fetchurl, ocaml_sexplib}: +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; stdenv.mkDerivation { - name = "ocaml-ipaddr-2.4.0"; + name = "ocaml-ipaddr-2.5.0"; src = fetchurl { - url = https://github.com/mirage/ocaml-ipaddr/archive/2.4.0.tar.gz; - sha256 = "0g7qg35w3vzcg37798rhbx7iia83286md3gj5gdhs1qgizlg56wx"; + url = https://github.com/mirage/ocaml-ipaddr/archive/2.5.0.tar.gz; + sha256 = "0zpslxzjs5zdw20j3jaf6fr0w2imnidhrzggmnvwp198r76aq917"; }; buildInputs = [ocaml findlib]; + propagatedBuildInputs = [ocaml_sexplib]; createFindlibDestdir = true; + + meta = with stdenv.lib; { + description = "An OCaml library for manipulation of IP (and MAC) address representations"; + license = licenses.isc; + maintainers = [ maintainers.vbgl ]; + platforms = ocaml.meta.platforms; + }; } From 7adab7e25efc5fdce639e93543db98c2d07532dc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 30 Sep 2014 06:25:31 +0200 Subject: [PATCH 3/3] ocaml-tyxml: update 3.0.0 -> 3.1.1 --- .../ocaml-modules/tyxml/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index 02ac7f381e5..648f0a9cd17 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,29 +1,24 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_oasis}: +{stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4}: stdenv.mkDerivation { - name = "tyxml-3.0.0"; + name = "tyxml-3.1.1"; src = fetchurl { - url = http://ocsigen.org/download/tyxml-3.0.0.tar.gz; - sha256 = "0cvbmyg4g0lg4f23032cjlxqklisccbjgj47117wm6gva8xi7xa3"; + url = http://github.com/ocsigen/tyxml/archive/3.1.1.tar.gz; + sha256 = "1r8im382r68kn8qy0857nv3y7h42i6ajyclxzmigfai7v2xdd05z"; }; - buildInputs = [ocaml findlib ocaml_oasis]; + buildInputs = [ocaml findlib ocaml_oasis camlp4]; createFindlibDestdir = true; - configurePhase = '' - make setup-dev.exe - ./setup-dev.exe -configure --prefix $out - ''; - - meta = { + meta = with stdenv.lib; { homepage = http://ocsigen.org/tyxml/; description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML ouput, using static typing"; - license = "LGPL"; + license = licenses.lgpl21; platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.gal_bolle + maintainers = with maintainers; [ + gal_bolle vbgl ]; };