diff options
| author | Aristid Breitkreuz <aristidb@gmail.com> | 2014-11-08 23:40:44 +0100 |
|---|---|---|
| committer | Aristid Breitkreuz <aristidb@gmail.com> | 2014-11-08 23:40:44 +0100 |
| commit | bf39c2e79219702b6900c0f3775e171f8b78592a (patch) | |
| tree | 467903a0dbb53286af42702ddbe64d3b3d850454 /pkgs | |
| parent | 67a2a58314274ec5865d49198700eefd2c1a22a9 (diff) | |
| parent | f72c460abf9a92692ff7566823bf98227934ce00 (diff) | |
| download | nixlib-bf39c2e79219702b6900c0f3775e171f8b78592a.tar nixlib-bf39c2e79219702b6900c0f3775e171f8b78592a.tar.gz nixlib-bf39c2e79219702b6900c0f3775e171f8b78592a.tar.bz2 nixlib-bf39c2e79219702b6900c0f3775e171f8b78592a.tar.lz nixlib-bf39c2e79219702b6900c0f3775e171f8b78592a.tar.xz nixlib-bf39c2e79219702b6900c0f3775e171f8b78592a.tar.zst nixlib-bf39c2e79219702b6900c0f3775e171f8b78592a.zip | |
Merge pull request #4902 from mstarzyk/ocaml
ocaml: 4.02.0 -> 4.02.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/ocaml/4.02.1.nix (renamed from pkgs/development/compilers/ocaml/4.02.0.nix) | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ocaml/4.02.0.nix b/pkgs/development/compilers/ocaml/4.02.1.nix index 4b5805e2448e..18f9d3736506 100644 --- a/pkgs/development/compilers/ocaml/4.02.0.nix +++ b/pkgs/development/compilers/ocaml/4.02.1.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { x11lib = x11env + "/lib"; x11inc = x11env + "/include"; - name = "ocaml-4.02.0"; + name = "ocaml-4.02.1"; src = fetchurl { url = "http://caml.inria.fr/pub/distrib/ocaml-4.02/${name}.tar.xz"; - sha256 = "1ml5r8vzbwqhnq8jlps6jfgf0vym4nyrnr95mrbym6v5j2gabmw7"; + sha256 = "1p7lqvh64xpykh99014mz21q8fs3qyjym2qazhhbq8scwldv1i38"; }; prefixKey = "-prefix "; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7ced7307c1d..8dc5b292ac28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3527,7 +3527,7 @@ let ocaml_4_01_0 = callPackage ../development/compilers/ocaml/4.01.0.nix { }; - ocaml_4_02_0 = callPackage ../development/compilers/ocaml/4.02.0.nix { }; + ocaml_4_02_1 = callPackage ../development/compilers/ocaml/4.02.1.nix { }; orc = callPackage ../development/compilers/orc { }; @@ -3787,8 +3787,8 @@ let // { camlimages = ocamlPackages_3_12_1.camlimages_4_0; }; ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1; ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0; - ocamlPackages_4_02_0 = mkOcamlPackages ocaml_4_02_0 pkgs.ocamlPackages_4_02_0; - ocamlPackages_latest = ocamlPackages_4_02_0; + ocamlPackages_4_02_1 = mkOcamlPackages ocaml_4_02_1 pkgs.ocamlPackages_4_02_1; + ocamlPackages_latest = ocamlPackages_4_02_1; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; |