diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix index 4067588ab713..23396eb6b437 100644 --- a/pkgs/development/ocaml-modules/pyml/default.nix +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -18,6 +18,10 @@ buildDunePackage rec { hash = "sha256-0Yy5T/S3Npwt0XJmEsdXGg5AXYi9vV9UG9nMSzz/CEc="; }; + patches = [ + ./remove-stdcompat.patch + ]; + buildInputs = [ utop ]; diff --git a/pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch b/pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch new file mode 100644 index 000000000000..5d8bdb739f59 --- /dev/null +++ b/pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch @@ -0,0 +1,11 @@ +diff --git a/pyml_stubs.c b/pyml_stubs.c +index 40e3481..e7826f1 100644 +--- a/pyml_stubs.c ++++ b/pyml_stubs.c +@@ -11,7 +11,6 @@ + #include + #include + #include +-#include + #include + #include "pyml_stubs.h" diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index d75b4839a8b0..25abe8fa9679 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -7,22 +7,22 @@ buildDunePackage rec { pname = "stdcompat"; - version = "19"; + version = "21.1"; - minimalOCamlVersion = "4.06"; + minimalOCamlVersion = "4.11"; src = fetchurl { - url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"; - sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU="; + url = "https://github.com/ocamllibs/stdcompat/archive/refs/tags/${version}.tar.gz"; + sha256 = "sha256-RSJ9AgUEmt23QZCk60ETIXmkJhG7knQe+s8wNxxIHm4="; }; # Otherwise ./configure script will run and create files conflicting with dune. dontConfigure = true; meta = { - homepage = "https://github.com/thierry-martinez/stdcompat"; + homepage = "https://github.com/ocamllibs/stdcompat"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.vbgl ]; - broken = lib.versionAtLeast ocaml.version "5.2"; + broken = lib.versionAtLeast ocaml.version "5.4"; }; }