Merge branch 'master' into staging

Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing

pkgs/development/ocaml-modules/camlimages/4.0.nix

@@ -32,6 +32,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
+    branch = "4.0";
     homepage = https://bitbucket.org/camlspotter/camlimages;
     description = "OCaml image processing library";
     license = licenses.lgpl2;

pkgs/development/ocaml-modules/camomile/0.8.2.nix

@@ -20,7 +20,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://camomile.sourceforge.net/;
     description = "A comprehensive Unicode library for OCaml";
-    license = "LGPL";
+    license = stdenv.lib.licenses.lgpl21;
+    branch = "0.8.2";
     platforms = ocaml.meta.platforms;
     maintainers = [
       stdenv.lib.maintainers.z77z

pkgs/development/ocaml-modules/http/default.nix

@@ -1,20 +1,15 @@
 {stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}:
 
-let
-  ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  pname = "ocaml-http";
-  version = "0.1.3";
-in
-
 stdenv.mkDerivation {
-  name = "${pname}-${version}";
+  name = "ocaml-http-0.1.5";
 
   src = fetchurl {
-    url = "http://upsilon.cc/~zack/hacking/software/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "070xw033r4pk6f4l0wcknm75y9qm4mp622a4cgzmcfhm58v6kssn";
+    url = https://forge.ocamlcore.org/frs/download.php/545/ocaml-http-0.1.5.tar.gz;
+    sha256 = "09q12b0j01iymflssxigsqggbsp8dqh9pfvkm76dv860544mygws";
   };
 
-  buildInputs = [ocaml_pcre ocamlnet ocaml findlib camlp4];
+  buildInputs = [ocaml findlib camlp4];
+  propagatedBuildInputs = [ocaml_pcre ocamlnet];
 
   createFindlibDestdir = true;
 
@@ -31,7 +26,8 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/";
+    homepage = http://ocaml-http.forge.ocamlcore.org/;
+    platforms = ocaml.meta.platforms;
     description = "do it yourself (OCaml) HTTP daemon";
     license = licenses.lgpl2;
     maintainers = with maintainers; [ roconnor vbgl ];

pkgs/development/ocaml-modules/lablgtk/2.14.0.nix

@@ -25,6 +25,7 @@ stdenv.mkDerivation (rec {
   '';
 
   meta = {
+    branch = "2.14";
     platforms = ocaml.meta.platforms;
     maintainers = [
       stdenv.lib.maintainers.z77z

pkgs/development/ocaml-modules/ocamlnet/default.nix

@@ -5,11 +5,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ocamlnet-3.7.6";
+  name = "ocamlnet-3.7.7";
 
   src = fetchurl {
-    url = http://download.camlcity.org/download/ocamlnet-3.7.6.tar.gz;
-    sha256 = "0z17kxn1cyn1x5wgajw737m9rsjwji823rxdwvv8a5239xd1whji";
+    url = http://download.camlcity.org/download/ocamlnet-3.7.7.tar.gz;
+    sha256 = "02bnks9jshpq9nqva5lky5hl009yp19cgvf1izjca620hx54d3jv";
   };
 
   buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl cryptokit];

pkgs/development/ocaml-modules/sexplib/108.08.00.nix

@@ -20,6 +20,7 @@ stdenv.mkDerivation {
   createFindlibDestdir = true;
 
   meta = with stdenv.lib; {
+    branch = "108";
     homepage = https://ocaml.janestreet.com/;
     description = "Library for serializing OCaml values to and from S-expressions";
     license = licenses.asl20;

pkgs/development/ocaml-modules/typeconv/108.08.00.nix

@@ -21,7 +21,8 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = https://ocaml.janestreet.com/;
     description = "Support library for OCaml preprocessor type conversions";
-    #license = licenses.apl20; invalid license
+    license = licenses.asl20;
+    branch = "108";
     platforms = ocaml.meta.platforms;
     maintainers = with maintainers; [ z77z ];
   };

pkgs/development/ocaml-modules/zarith/default.nix

@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll";
   };
 
-  buildInputs = [ ocaml findlib pkgconfig gmp perl ];
+  buildInputs = [ ocaml findlib pkgconfig perl ];
+  propagatedBuildInputs = [ gmp ];
 
   patchPhase = ''
     substituteInPlace ./z_pp.pl --replace '/usr/bin/perl' '${perl}/bin/perl'