diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-11-09 13:58:34 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-01-24 21:13:00 +0000 |
| commit | ae047510bfb534f89225d26820872467e66f5328 (patch) | |
| tree | 9162aa9d6353df3ff50ab92e9ffeab4017e5bc7e | |
| parent | c9d5e5b34b734361c057a9415b80e0548eaedb3e (diff) | |
| download | nixpkgs-ae047510bfb534f89225d26820872467e66f5328.tar nixpkgs-ae047510bfb534f89225d26820872467e66f5328.tar.gz nixpkgs-ae047510bfb534f89225d26820872467e66f5328.tar.bz2 nixpkgs-ae047510bfb534f89225d26820872467e66f5328.tar.lz nixpkgs-ae047510bfb534f89225d26820872467e66f5328.tar.xz nixpkgs-ae047510bfb534f89225d26820872467e66f5328.tar.zst nixpkgs-ae047510bfb534f89225d26820872467e66f5328.zip | |
ocaml: init at 4.04
| -rw-r--r-- | pkgs/development/compilers/ocaml/4.04.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/ocaml/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix new file mode 100644 index 00000000000..7e35c9e1aa8 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.04.nix @@ -0,0 +1,6 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "04"; + patch_version = "0"; + sha256 = "1d2nk3kq4dyzz8dls45r13jprq5by3q8kshc8kvxzm8n4fnnvvb4"; +} diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index abded4b6690..0c1b7831412 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (args // rec { buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; - preConfigure = '' + preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang ''; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index eb3553f5561..16232ddc56d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -727,7 +727,9 @@ in rec ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { }) (self: super: { }); - ocamlPackages_latest = ocamlPackages_4_03; + ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { }) (self: super: { }); + + ocamlPackages_latest = ocamlPackages_4_04; ocamlPackages = ocamlPackages_4_01_0; } |