Unverified Commit c8026692 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

Merge pull request #311389 from vbgl/ocaml-5.2.0 

ocaml-ng.ocamlPackages_5_2.ocaml: 5.2.0-β2 → 5.2.0
parents 017e73bd 3f4eb820

pkgs/development/compilers/ocaml/5.2.nix

+2 −5
Original line number Diff line number Diff line 
import ./generic.nix {

  major_version = "5";

  minor_version = "2";

  patch_version = "0-beta2";

  src = fetchTarball {

    url = "https://caml.inria.fr/pub/distrib/ocaml-5.2/ocaml-5.2.0~beta2.tar.xz";

    sha256 = "sha256:1cyw0w79j7kyr3x0ivsqm1si704b29ic33yj621dq7f125jabk00";

  };

  patch_version = "0";

  sha256 = "sha256-L0v0efUUefm/jH8WlKbqcza793T0rW2mtZ0a1JOd2Kc=";

}

pkgs/development/ocaml-modules/janestreet/0.16.nix

+8 −4
Original line number Diff line number Diff line
@@ -569,13 +569,17 @@ with self; 
    propagatedBuildInputs = [ base ppx_jane ];

  };



  ocaml-compiler-libs = janePackage {

  ocaml-compiler-libs = janePackage ({

    pname = "ocaml-compiler-libs";

    version = "0.12.4";

    hash = "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv";

    minimalOCamlVersion = "4.04.1";

    meta.description = "OCaml compiler libraries repackaged";

  };

  } // (if lib.versionAtLeast ocaml.version "5.2" then {

    version = "0.17.0";

    hash = "sha256-QaC6BWrpFblra6X1+TrlK+J3vZxLvLJZ2b0427DiQzM=";

  } else {

    version = "0.12.4";

    hash = "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv";

  }));



  ocaml-embed-file = janePackage {

    pname = "ocaml-embed-file";

pkgs/top-level/ocaml-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -2010,7 +2010,7 @@ in let inherit (pkgs) callPackage; in rec 


  ocamlPackages_5_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/5.2.nix { });



  ocamlPackages_latest = ocamlPackages_5_1;

  ocamlPackages_latest = ocamlPackages_5_2;



  ocamlPackages = ocamlPackages_5_1;