Author: amiddelk Date: Sat Mar 24 22:59:08 2012 New Revision: 33399 URL: https://nixos.org/websvn/nix/?rev=33399&sc=1
Log: Recovered OCaml 3.11 by using version 3.11.2 and a patch from ocaml's bugtracker. Added: nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.2.nix - copied, changed from r32820, nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.1.nix Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix Copied and modified: nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.2.nix (from r32820, nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.1.nix) ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.1.nix Tue Mar 6 11:34:11 2012 (r32820, copy source) +++ nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.2.nix Sat Mar 24 22:59:08 2012 (r33399) @@ -8,17 +8,23 @@ stdenv.mkDerivation rec { - name = "ocaml-3.11.1"; + name = "ocaml-3.11.2"; src = fetchurl { url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2"; - sha256 = "8c36a28106d4b683a15c547dfe4cb757a53fa9247579d1cc25bd06a22cc62e50"; + sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143"; }; # Needed to avoid a SIGBUS on the final executable on mips NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else ""; - patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; + patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ] ++ + [ (fetchurl { + name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch"; + url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug"; + sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e"; + }) + ]; prefixKey = "-prefix "; configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; @@ -60,9 +66,6 @@ ''; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ - stdenv.lib.maintainers.z77z - ]; }; } Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Mar 24 19:52:46 2012 (r33398) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Mar 24 22:59:08 2012 (r33399) @@ -2382,6 +2382,8 @@ ocaml_3_10_0 = callPackage ../development/compilers/ocaml/3.10.0.nix { }; + ocaml_3_11_2 = callPackage ../development/compilers/ocaml/3.11.2.nix { }; + ocaml_3_12_1 = callPackage ../development/compilers/ocaml/3.12.1.nix { }; metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; @@ -2477,6 +2479,7 @@ ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1; ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0; + ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2; ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits