diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index a70ba649d1fe..c719abc4abc7 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -2,7 +2,7 @@ let useX11 = !stdenv.isArm && !stdenv.isMips; - useNativeCompilers = !stdenv.isArm && !stdenv.isMips; + useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/4.00.0.nix b/pkgs/development/compilers/ocaml/4.00.0.nix index da065356e851..e25654a24818 100644 --- a/pkgs/development/compilers/ocaml/4.00.0.nix +++ b/pkgs/development/compilers/ocaml/4.00.0.nix @@ -2,7 +2,7 @@ let useX11 = !stdenv.isArm && !stdenv.isMips; - useNativeCompilers = !stdenv.isArm && !stdenv.isMips; + useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f150c1bff69d..ff265c03cc4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1066,8 +1066,6 @@ let mktemp = callPackage ../tools/security/mktemp { }; - mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; - modemmanager = callPackage ../tools/networking/modemmanager {}; monit = builderDefsPackage ../tools/system/monit { @@ -2484,6 +2482,8 @@ let menhir = callPackage ../development/ocaml-modules/menhir { }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { camomile = camomile_0_8_2; };