ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-07 04:57:26 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Small fixes for OCaml 5.2
This commit is contained in:
Ulrik Strid 2024-05-14 10:17:14 +02:00 committed by GitHub
commit 6d4e13e3f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/ocaml-modules/alcotest/default.nix
View File

@ -1,4 +1,4 @@
{ 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 ];

5
pkgs/development/ocaml-modules/ppx_tools/default.nix
View File

@ -1,5 +1,9 @@
{ 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 {