Unverified Commit 3d769188 authored by Vincent Laporte's avatar Vincent Laporte
Browse files

ocamlPackages.core_unix: fix for OCaml 5.3

parent 30b1f565

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

+8 −0
Original line number Diff line number Diff line 
{

  self,

  bash,

  fetchpatch,

  fzf,

  lib,

  openssl,
@@ -498,6 +499,13 @@ with self; 
      patchShebangs unix_pseudo_terminal/src/discover.sh

    '';

    doCheck = false; # command_validate_parsing.exe is not specified in test build deps



    # Compatibility with OCaml 5.3

    patches = lib.optional (lib.versionAtLeast ocaml.version "5.3") (fetchpatch {

      url = "https://github.com/janestreet/core_unix/commit/ebce389ac68e098f542e34400e114ac992f415af.patch";

      includes = [ "bigstring_unix/src/bigstring_unix_stubs.c" ];

      hash = "sha256-FGg2zlyp3aZFu1VeFdm7pgSPiW0HAkLYgMGTj+tqju8=";

    });

  };



  csvfields = janePackage {

pkgs/top-level/ocaml-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ let 
      then import ../development/ocaml-modules/janestreet/0.17.nix

         {

           inherit self;

           inherit (pkgs) bash fzf lib openssl zstd;

           inherit (pkgs) bash fetchpatch fzf lib openssl zstd;

         }

      else if lib.versionOlder "4.13.1" ocaml.version

      then import ../development/ocaml-modules/janestreet/0.16.nix {