Unverified Commit 9b2025ae authored by Vincent Laporte's avatar Vincent Laporte Committed by GitHub
Browse files

ocaml-ng.ocamlPackages_5_4: init at 5.4.0 (#449330)

parents 2d4649ef 6e07221e

pkgs/development/compilers/ocaml/5.4.nix

0 → 100644
+6 −0
Original line number Diff line number Diff line 
import ./generic.nix {

  major_version = "5";

  minor_version = "4";

  patch_version = "0";

  sha256 = "sha256-36qKLhHHmbwXZdi+9EkRQG7l9IAwJxkDgqk5+IyRImY=";

}

pkgs/development/ocaml-modules/bistro/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -48,6 +48,6 @@ buildDunePackage rec { 
    description = "Build and execute typed scientific workflows";

    maintainers = [ lib.maintainers.vbgl ];

    license = lib.licenses.gpl2;

    meta.broken = lib.versionAtLeast ppxlib.version "0.36";

    broken = lib.versionAtLeast ppxlib.version "0.36";

  };

}

pkgs/development/ocaml-modules/kcas/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildDunePackage,

  fetchurl,

  ocaml,

  domain-local-await,

  domain-local-timeout,

  alcotest,
@@ -29,7 +30,7 @@ buildDunePackage rec { 
    backoff

  ];



  doCheck = true;

  doCheck = !lib.versionAtLeast ocaml.version "5.4";

  nativeCheckInputs = [ mdx.bin ];

  checkInputs = [

    alcotest

pkgs/development/ocaml-modules/morbig/default.nix

+29 −26
Original line number Diff line number Diff line 
{

  lib,

  ocaml,

  buildDunePackage,

  fetchFromGitHub,

  menhir,
@@ -9,7 +10,11 @@ 
  yojson,

}:



buildDunePackage rec {

lib.throwIf (lib.versionAtLeast ocaml.version "5.4")

  "morbig is not available for OCaml ${ocaml.version}"



  buildDunePackage

  rec {

    pname = "morbig";

    version = "0.11.0";
@@ -17,11 +22,9 @@ buildDunePackage rec { 
      owner = "colis-anr";

      repo = pname;

      rev = "v${version}";

    sha256 = "sha256-fOBaJHHP/Imi9UDLflI52OdKDcmMxpl+NH3pfofmv/o=";

      hash = "sha256-fOBaJHHP/Imi9UDLflI52OdKDcmMxpl+NH3pfofmv/o=";

    };



  duneVersion = "3";



    nativeBuildInputs = [

      menhir

    ];

pkgs/development/ocaml-modules/notty/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildDunePackage,

  fetchurl,

  fetchpatch,

  cppo,

  uutf,

  lwt,
@@ -18,6 +19,12 @@ buildDunePackage rec { 
    sha256 = "sha256-dGWfsUBz20Q4mJiRqyTyS++Bqkl9rBbZpn+aHJwgCCQ=";

  };



  # Compatibility with OCaml 5.4

  patches = fetchpatch {

    url = "https://github.com/pqwy/notty/commit/a4d62f467e257196a5192da2184bd021dfd948b7.patch";

    hash = "sha256-p1eUuCvQKLj8uBeGyT2+i9WOYy4rk84pf9L3QioJDNY=";

  };



  nativeBuildInputs = [ cppo ];



  propagatedBuildInputs = [