b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #237304 from vbgl/ocaml-mariadb-fix-for-ocaml-5

Browse source 
ocamlPackages: fixes for OCaml ≥ 5.0
This commit is contained in:
Ulrik Strid 2023-06-13 08:37:57 +02:00 committed by GitHub
parent 2dd9125a84 03dc92bce1
commit f5f4bba439
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/ocaml-modules/ansiterminal/default.nix
View file

@ -9,6 +9,10 @@ buildDunePackage rec {
hash = "sha256-q3OyGLajAmfSu8QzEtzzE5gbiwvsVV2SsGuHZkst0w4=";
};
postPatch = ''
substituteInPlace src/dune --replace 'libraries unix bytes' 'libraries unix'
'';
doCheck = true;
meta = with lib; {

1
pkgs/development/ocaml-modules/bz2/default.nix
View file

@ -1,6 +1,7 @@
{ lib, stdenv, fetchFromGitLab, ocaml, findlib, bzip2, autoreconfHook }:
if lib.versionOlder ocaml.version "4.02"
|| lib.versionAtLeast ocaml.version "5.0"
then throw "bz2 is not available for OCaml ${ocaml.version}"
else

15
pkgs/development/ocaml-modules/mariadb/default.nix
View file

@ -1,5 +1,6 @@
{ lib, fetchurl, stdenv
, ocaml, findlib, ocamlbuild
, fetchpatch
, ocaml, findlib, ocamlbuild, camlp-streams
, ctypes, mariadb, libmysqlclient }:
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
@ -14,8 +15,18 @@ stdenv.mkDerivation rec {
sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM=";
};
patches = fetchpatch {
url = "https://github.com/andrenth/ocaml-mariadb/commit/9db2e4d8dec7c584213d0e0f03d079a36a35d9d5.patch";
hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE=";
};
postPatch = ''
substituteInPlace setup.ml --replace '#use "topfind"' \
'#directory "${findlib}/lib/ocaml/${ocaml.version}/site-lib/";; #use "topfind"'
'';
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ mariadb libmysqlclient ];
buildInputs = [ mariadb libmysqlclient camlp-streams ocamlbuild ];
propagatedBuildInputs = [ ctypes ];
strictDeps = true;