Merge pull request #10194 from vbgl/ocaml-4.2.2

OCaml: 4.02.1 → 4.02.3

3 files changed, 7 insertions, 81 deletions

diff --git a/pkgs/development/compilers/ocaml/4.02.1.nix b/pkgs/development/compilers/ocaml/4.02.nix
index d70fe3384e03..7338f8b36745 100644
--- a/pkgs/development/compilers/ocaml/4.02.1.nix
+++ b/pkgs/development/compilers/ocaml/4.02.nix
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
   x11lib = x11env + "/lib";
   x11inc = x11env + "/include";
 
-  name = "ocaml-4.02.1";
+  name = "ocaml-4.02.3";
 
   src = fetchurl {
     url = "http://caml.inria.fr/pub/distrib/ocaml-4.02/${name}.tar.xz";
-    sha256 = "1p7lqvh64xpykh99014mz21q8fs3qyjym2qazhhbq8scwldv1i38";
+    sha256 = "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3";
   };
 
   patches = [ patchOcamlBuild ];
diff --git a/pkgs/development/tools/ocaml/deriving/default.nix b/pkgs/development/tools/ocaml/deriving/default.nix
deleted file mode 100644
index 55bbf3748ea9..000000000000
--- a/pkgs/development/tools/ocaml/deriving/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{stdenv, fetchurl, zlib, ocaml, findlib, ncurses
-, versionedDerivation, unzip
-, version ?
-    let match = {
-      "ocaml-3.10.0" = "for-3.10.0";
-      "ocaml-3.12.1" = "for-3.12.1";
-    }; in stdenv.lib.maybeAttr ocaml.name (throw "no matching source of ocaml-deriving for ocaml version: ${ocaml.name}") match
-}:
-
-/*
-Usage example:
-
-== main.ml ==
-type t = | A | B
-  deriving (Show)
-
-print_string (Show.show<t> (A));;
-==
-
-ocamlopt -pp $out/bin/deriving -I $d/lib -I $d/syntax nums.cmxa show.cmx main.ml
-*/
-
-versionedDerivation "ocaml-deriving" version {
-
-  "for-3.10.0" = {
-    name = "deriving-0.1.1a";
-      # ocaml: 3.10.0
-    src = fetchurl {
-      url = https://deriving.googlecode.com/files/deriving-0.1.1a.tar.gz;
-      sha256 = "0ppmqhc23kccfjn3cnd9n205ky627ni8f5djf8sppmc3lc1m97mb";
-    };
-  };
-
-  "for-3.12.1" = {
-    name = "deriving-git20100903";
-
-    # https://github.com/jaked/deriving
-    src = fetchurl {
-      name = "for-3.12.0.zip";
-      url = https://codeload.github.com/jaked/deriving/zip/c7b9cea3eb4bbfb9e09673faf725f70247c9df78;
-      sha256 = "1zrmpqb5lsjmizqs68czmfpsbz9hz30pf97w11kkby175hhj84gi";
-    };
-
-    buildInputs = [ unzip ];
-  };
-
-}
-{
-  buildInputs = [ocaml findlib];
-
-  installPhase = ''
-    # not all tests compile !?
-    # (cd tests; make)
-
-    mkdir -p $out/bin
-    cp -a lib $out/
-    cp -a syntax $out
-
-    # this allows -pp deriving
-    ln -s $out/syntax/deriving $out/bin/deriving
-  '';
-
-  meta = {
-    homepage = "https://code.google.com/p/deriving/source/checkout";
-    description = "A library of cryptographic primitives for OCaml";
-    license = stdenv.lib.licenses.mit;
-    platforms = ocaml.meta.platforms;
-    maintainers = [
-      stdenv.lib.maintainers.z77z
-    ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07afaa6587bb..2fd9ac1ca81a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4219,7 +4219,7 @@ let
 
   ocaml_4_01_0 = callPackage ../development/compilers/ocaml/4.01.0.nix { };
 
-  ocaml_4_02_1 = callPackage ../development/compilers/ocaml/4.02.1.nix { };
+  ocaml_4_02 = callPackage ../development/compilers/ocaml/4.02.nix { };
 
   orc = callPackage ../development/compilers/orc { };
 
@@ -4361,8 +4361,6 @@ let
 
     ctypes = callPackage ../development/ocaml-modules/ctypes { };
 
-    deriving = callPackage ../development/tools/ocaml/deriving { };
-
     dolog = callPackage ../development/ocaml-modules/dolog { };
 
     easy-format = callPackage ../development/ocaml-modules/easy-format { };
@@ -4660,8 +4658,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_1 = mkOcamlPackages ocaml_4_02_1 pkgs.ocamlPackages_4_02_1;
-  ocamlPackages_latest = ocamlPackages_4_02_1;
+  ocamlPackages_4_02 = mkOcamlPackages ocaml_4_02 pkgs.ocamlPackages_4_02;
+  ocamlPackages_latest = ocamlPackages_4_02;
 
   ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
 
@@ -11968,8 +11966,8 @@ let
   };
 
   llpp = callPackage ../applications/misc/llpp {
-    inherit (ocamlPackages_4_02_1) lablgl findlib;
-    ocaml = ocaml_4_02_1;
+    inherit (ocamlPackages_4_02) lablgl findlib;
+    ocaml = ocaml_4_02;
   };
 
   lmms = callPackage ../applications/audio/lmms { };