diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-02-12 20:52:37 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-02-12 20:52:37 -0500 |
| commit | 4450327c062a41f7df2f6756057df4ebb6548011 (patch) | |
| tree | 2ed26d98213dee575a1e008e1c9d54df570d985a /pkgs | |
| parent | 8378afaf763b5297db9dec2ea904e590345f6cbf (diff) | |
| download | nixlib-4450327c062a41f7df2f6756057df4ebb6548011.tar nixlib-4450327c062a41f7df2f6756057df4ebb6548011.tar.gz nixlib-4450327c062a41f7df2f6756057df4ebb6548011.tar.bz2 nixlib-4450327c062a41f7df2f6756057df4ebb6548011.tar.lz nixlib-4450327c062a41f7df2f6756057df4ebb6548011.tar.xz nixlib-4450327c062a41f7df2f6756057df4ebb6548011.tar.zst nixlib-4450327c062a41f7df2f6756057df4ebb6548011.zip | |
flow: pin ocaml to ocaml_4_02
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/analysis/flow/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index a63e9f65e5cb..c1cb4412b9ca 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, ocaml_4_02, libelf, cf-private, CoreServices }: +{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }: with lib; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp bin/flow $out/bin/ ''; - buildInputs = [ ocaml_4_02 libelf ] + buildInputs = [ ocaml libelf ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad48f262d2a..855de099cbac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6363,6 +6363,7 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; + ocaml = ocaml_4_02; }; framac = callPackage ../development/tools/analysis/frama-c { }; @@ -15600,7 +15601,7 @@ with pkgs; wmii_hg = callPackage ../applications/window-managers/wmii-hg { }; wordnet = callPackage ../applications/misc/wordnet { }; - + worker = callPackage ../applications/misc/worker { }; workrave = callPackage ../applications/misc/workrave { |