Author: kkallio Date: Mon Nov 28 15:52:46 2011 New Revision: 30584 URL: https://nixos.org/websvn/nix/?rev=30584&sc=1
Log: Opa does not compile with ocaml before version 3.12.0 Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Nov 28 15:49:14 2011 (r30583) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Nov 28 15:52:46 2011 (r30584) @@ -2407,8 +2407,6 @@ 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 @@ 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; }; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits