Unverified Commit 286f4c57 authored by Vincent Laporte's avatar Vincent Laporte Committed by GitHub
Browse files

ocamlPackages.stdcompat: 19 -> 21.1 (#480830)

parents b7e8dfec a3dc5bec

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

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ buildDunePackage rec { 
    hash = "sha256-0Yy5T/S3Npwt0XJmEsdXGg5AXYi9vV9UG9nMSzz/CEc=";

  };



  patches = [

    ./remove-stdcompat.patch

  ];



  buildInputs = [

    utop

  ];

pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
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 <stdio.h>

 #include <stdlib.h>

 #include <errno.h>

-#include <stdcompat.h>

 #include <assert.h>

 #include "pyml_stubs.h"

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

+6 −6
Original line number Diff line number Diff line
@@ -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";

  };

}