diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
| commit | 0518ccf5af90017df31c445f52badaff45b6b7cd (patch) | |
| tree | f60c912ecd598722d76947f6bd5230955210eb66 /pkgs/development/compilers/ocaml | |
| parent | c96407720010658b44dcd2a8801b05879105b9ff (diff) | |
| parent | 782a12e450a58b815cd702c65da75855124d1572 (diff) | |
| download | nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.gz nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.bz2 nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.lz nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.xz nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.zst nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/development/compilers/ocaml')
| -rw-r--r-- | pkgs/development/compilers/ocaml/3.10.0.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/compilers/ocaml/metaocaml-3.09.nix | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 1d68585d93a..69a6a1f5f67 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, x11, ncurses }: stdenv.mkDerivation (rec { - + name = "ocaml-3.10.0"; - + src = fetchurl { url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { configureFlags = ["-no-tk" "-x11lib" x11]; buildFlags = "world bootstrap world.opt"; buildInputs = [x11 ncurses]; - installTargets = "install installopt"; + installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://caml.inria.fr/ocaml; - license = "QPL, LGPL2 (library part)"; + license = with stdenv.lib.licenses; [ qpl lgpl2 ]; description = "Most popular variant of the Caml language"; }; diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 4313dcd7537..9b340f69e90 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, x11, ncurses }: stdenv.mkDerivation (rec { - + name = "metaocaml-3.09-alpha-30"; - + src = fetchurl { url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz"; sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd"; @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { configureFlags = ["-no-tk" "-x11lib" x11]; buildFlags = "world bootstrap world.opt"; buildInputs = [x11 ncurses]; - installTargets = "install installopt"; + installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://www.metaocaml.org/; - license = "QPL, LGPL2 (library part)"; + license = with stdenv.lib.licenses; [ qpl lgpl2 ]; desctiption = "A compiled, type-safe, multi-stage programming language"; }; |