From 96e436d6a3f15c21dff48d007c79eb9f1a930941 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 28 Nov 2011 15:52:46 +0000 Subject: [PATCH] Opa does not compile with ocaml before version 3.12.0 svn path=/nixpkgs/trunk/; revision=30584 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 408cd2e7c4c..464d87efc04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2407,8 +2407,6 @@ let ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; - opa = callPackage ../development/compilers/opa { }; - ounit = callPackage ../development/ocaml-modules/ounit { }; ulex = callPackage ../development/ocaml-modules/ulex { }; @@ -2423,6 +2421,8 @@ let ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1; ocamlPackages_3_12_0 = mkOcamlPackages ocaml_3_12_0 pkgs.ocamlPackages_3_12_0; + opa = let callPackage = newScope pkgs.ocamlPackages_3_12_0; in callPackage ../development/compilers/opa { }; + opencxx = callPackage ../development/compilers/opencxx { gcc = gcc33; };