From 68eb2c2379826ea8ada3403e737fefcb963a1e4a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 31 May 2017 07:45:28 +0000 Subject: ocamlPackages.re2: mark broken on darwin --- pkgs/development/ocaml-modules/janestreet/default.nix | 9 ++------- pkgs/tools/misc/patdiff/default.nix | 1 - pkgs/top-level/ocaml-packages.nix | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 98a303e2a676..d6acbaa71422 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -1,4 +1,4 @@ -{ lib, janePackage, ocamlbuild, cryptokit, ctypes, magic-mime, +{ stdenv, lib, janePackage, ocamlbuild, cryptokit, ctypes, magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, openssl }: @@ -328,7 +328,7 @@ rec { propagatedBuildInputs = [ core_kernel ]; meta = { description = "OCaml bindings for RE2"; - platforms = lib.platforms.linux; + broken = stdenv.isDarwin; }; }; @@ -348,7 +348,6 @@ rec { ''; meta = { description = "Jane Street Capital's standard library overlay"; - inherit (re2.meta) platforms; }; }; @@ -416,7 +415,6 @@ rec { propagatedBuildInputs = [ core_extended async ]; meta = { description = "Shell helpers for Async"; - inherit (core_extended.meta) platforms; }; }; @@ -479,7 +477,6 @@ rec { propagatedBuildInputs = [ core_extended ]; meta = { description = "Micro-benchmarking library for OCaml"; - inherit (core_extended.meta) platforms; }; }; @@ -489,7 +486,6 @@ rec { propagatedBuildInputs = [ core_extended ]; meta = { description = "Profiling library"; - inherit (core_extended.meta) platforms; }; }; @@ -513,7 +509,6 @@ rec { propagatedBuildInputs = [ async core_extended cryptokit magic-mime ounit ]; meta = { description = "E-mail message parser"; - inherit (core_extended.meta) platforms; }; }; diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix index 6e3c635f87aa..908da587d4b2 100644 --- a/pkgs/tools/misc/patdiff/default.nix +++ b/pkgs/tools/misc/patdiff/default.nix @@ -8,6 +8,5 @@ janePackage { buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre ]; meta = { description = "File Diff using the Patience Diff algorithm"; - inherit (core_extended.meta) platforms; }; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ab82597b9e58..708cb3748801 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -594,7 +594,7 @@ let janeStreet = import ../development/ocaml-modules/janestreet { inherit lib janePackage ocamlbuild ctypes cryptokit magic-mime; inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith; - openssl = pkgs.openssl; + inherit (pkgs) stdenv openssl; }; js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {}; -- cgit 1.4.1