diff options
| author | Luca Bruno <lucabru@src.gnome.org> | 2014-11-08 15:56:32 +0100 |
|---|---|---|
| committer | Luca Bruno <lucabru@src.gnome.org> | 2014-11-08 15:56:40 +0100 |
| commit | 83221f3886c8b74f78edbad5a1541de0837a0f24 (patch) | |
| tree | f9a53d659e562acf0637ffb42f013aebf460a947 /pkgs/development/compilers/ocaml | |
| parent | 7f3c95e6b7d40df043652b2fca54b0997e7a1937 (diff) | |
| parent | aa2fd47e9dee4e36e4bd494601e0ae5d9b40a78f (diff) | |
| download | nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.gz nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.bz2 nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.lz nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.xz nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.zst nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.zip | |
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
Diffstat (limited to 'pkgs/development/compilers/ocaml')
| -rw-r--r-- | pkgs/development/compilers/ocaml/3.12.1.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/ocaml/4.00.1.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/ocaml/4.01.0.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/ocaml/4.02.0.nix | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 16c3cb1d7872..6488d94cc08e 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "3.12"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 5b1e69b86b08..4e888e143223 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "4.00"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index 5e3cb61c3398..d178285834ff 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "4.01"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/4.02.0.nix b/pkgs/development/compilers/ocaml/4.02.0.nix index b6753cc6297c..4b5805e2448e 100644 --- a/pkgs/development/compilers/ocaml/4.02.0.nix +++ b/pkgs/development/compilers/ocaml/4.02.0.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "4.02"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; |