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

Merge pull request #311552 from vbgl/ocaml-52-etc 

Small fixes for OCaml 5.2
parents ea9b756c 2b9f51e1

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

+7 −3
Original line number Diff line number Diff line 
{ lib, buildDunePackage, fetchurl

{ lib, buildDunePackage, fetchurl, fetchpatch

, astring, cmdliner, fmt, re, stdlib-shims, uutf, ocaml-syntax-shims

}:
@@ -6,13 +6,17 @@ buildDunePackage rec { 
  pname = "alcotest";

  version = "1.7.0";



  duneVersion = "3";



  src = fetchurl {

    url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz";

    hash = "sha256-gSus2zS0XoiZXgfXMGvasvckee8ZlmN/HV0fQWZ5At8=";

  };



  # Fix tests with OCaml 5.2

  patches = fetchpatch {

    url = "https://github.com/mirage/alcotest/commit/aa437168b258db97680021116af176c55e1bd53b.patch";

    hash = "sha256-cytuJFg4Mft47LsAEcz2zvzyy1wNzMdeLK+cjaFANpo=";

  };



  nativeBuildInputs = [ ocaml-syntax-shims ];



  propagatedBuildInputs = [ astring cmdliner fmt re stdlib-shims uutf ];

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

+4 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }:



if lib.versionAtLeast ocaml.version "5.2"

then throw "ppx_tools is not available for OCaml ${ocaml.version}"

else



let param =

  let v6_6 = {

    version = "6.6";
@@ -58,7 +62,6 @@ then 
  buildDunePackage {

    inherit pname src meta;

    inherit (param) version buildInputs nativeBuildInputs;

    duneVersion = "3";

  }

else

  stdenv.mkDerivation {