From 7cca325b0797da92424b6216e14ed17757b49379 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 23 Aug 2019 17:51:41 +0000 Subject: [PATCH 1/2] ocamlPackages.logs: disable for OCaml < 4.03 --- pkgs/development/ocaml-modules/logs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index 157beaac4bc..22c4216a88f 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -5,7 +5,9 @@ let webpage = "https://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "logs is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; From c21c1e8f3f1356959d4a2043ac91bb8bbadf4118 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 23 Aug 2019 17:51:53 +0000 Subject: [PATCH 2/2] ocamlPackages.ppx_tools_versioned: 5.1 -> 5.2.3 Ensures compatibility with OCaml 4.08 --- .../ppx_tools_versioned/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index 363b774aaeb..03cadad7ff4 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocaml-migrate-parsetree }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml-migrate-parsetree }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ppx_tools_versioned-${version}"; - version = "5.1"; +buildDunePackage rec { + pname = "ppx_tools_versioned"; + version = "5.2.3"; src = fetchFromGitHub { - owner = "let-def"; - repo = "ppx_tools_versioned"; + owner = "ocaml-ppx"; + repo = pname; rev = version; - sha256 = "1c7kvca67qpyr4hiy492yik5x31lmkhyhy5wpl0l0fbx7fr7l624"; + sha256 = "1hcmpnw26zf70a71r3d2c2c0mn8q084gdn1r36ynng6fv9hq6j0y"; }; - buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ ocaml-migrate-parsetree ]; - createFindlibDestdir = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/let-def/ppx_tools_versioned; description = "Tools for authors of syntactic tools (such as ppx rewriters)"; license = licenses.gpl2;