From 559c7cc2dad4a971f0519c9f4861259fca55c3d1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Tue, 19 Aug 2014 18:39:45 +0200
Subject: [PATCH 1/3] yojson: propagate build inputs (as in PR #3404)
---
pkgs/development/ocaml-modules/yojson/default.nix | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix
index 9237db080d67..562d25550dae 100644
--- a/pkgs/development/ocaml-modules/yojson/default.nix
+++ b/pkgs/development/ocaml-modules/yojson/default.nix
@@ -4,16 +4,18 @@ let
version = "1.1.8";
webpage = "http://mjambon.com/${pname}.html";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
- name = "${pname}-${version}";
+ name = "ocaml-${pname}-${version}";
src = fetchurl {
- url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
+ url = "http://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz";
sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv";
};
- buildInputs = [ ocaml findlib cppo easy-format biniou ];
+ buildInputs = [ ocaml findlib ];
+
+ propagatedBuildInputs = [ cppo easy-format biniou ];
createFindlibDestdir = true;
From e8d2f8f1092e71c951b95f5a6e1b2227e4d185a9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Tue, 19 Aug 2014 18:42:13 +0200
Subject: [PATCH 2/3] merlin: update to 1.7
---
pkgs/development/tools/ocaml/merlin/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index c0882439f5c5..8efb90a9ceff 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}:
+{stdenv, fetchurl, ocaml, findlib, yojson, menhir}:
stdenv.mkDerivation {
- name = "merlin-1.6";
+ name = "merlin-1.7";
src = fetchurl {
- url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz";
- sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy";
+ url = "https://github.com/the-lambda-church/merlin/archive/v1.7.tar.gz";
+ sha256 = "0grprrykah02g8va63lidbcb6n8sd18l2k9spb5rwlcs3xhfw42b";
};
- buildInputs = [ ocaml findlib biniou yojson menhir easy-format ];
+ buildInputs = [ ocaml findlib yojson menhir ];
prefixKey = "--prefix ";
From e2db82874cf497c0dd156680d4c4a8f3b028125c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Fri, 22 Aug 2014 14:56:33 +0200
Subject: [PATCH 3/3] Updates merlin to 1.7.1
---
pkgs/development/tools/ocaml/merlin/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 8efb90a9ceff..970c07f35464 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, ocaml, findlib, yojson, menhir}:
stdenv.mkDerivation {
- name = "merlin-1.7";
+ name = "merlin-1.7.1";
src = fetchurl {
- url = "https://github.com/the-lambda-church/merlin/archive/v1.7.tar.gz";
- sha256 = "0grprrykah02g8va63lidbcb6n8sd18l2k9spb5rwlcs3xhfw42b";
+ url = https://github.com/the-lambda-church/merlin/archive/v1.7.1.tar.gz;
+ sha256 = "c3b60c7b3fddaa2860e0d8ac0d4fed2ed60e319875734c7ac1a93df524c67aff";
};
buildInputs = [ ocaml findlib yojson menhir ];