Merge master into staging-next

pkgs/development/compilers/gcc/common/configure-flags.nix

@@ -176,6 +176,7 @@ let
 
     # Platform-specific flags
     ++ lib.optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
+    ++ lib.optional targetPlatform.isNetBSD "--disable-libssp" # Provided by libc.
     ++ lib.optionals hostPlatform.isSunOS [
       "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
       # On Illumos/Solaris GNU as is preferred

pkgs/development/compilers/haxe/default.nix

@@ -13,7 +13,8 @@ let
       sha
       dune_2
       luv
-      ocaml_extlib
+      (if lib.versionAtLeast version "4.2"
+      then ocaml_extlib else ocaml_extlib-1-7-7)
     ] else with ocaml-ng.ocamlPackages_4_05; [
       ocaml
       camlp4
@@ -125,6 +126,14 @@ in {
       sed -i -re 's!(let +prefix_path += +).*( +in)!\1"'"$out/"'"\2!' src/main.ml
     '';
   };
+  haxe_4_0 = generic {
+    version = "4.0.5";
+    sha256 = "0f534pchdx0m057ixnk07ab4s518ica958pvpd0vfjsrxg5yjkqa";
+  };
+  haxe_4_1 = generic {
+    version = "4.1.5";
+    sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0";
+  };
   haxe_4_2 = generic {
     version = "4.2.1";
     sha256 = "sha256-0j6M21dh8DB1gC/bPYNJrVuDbJyqQbP+61ItO5RBUcA=";