ocamlPackages.melange: 5.1 → 6.0.0 (#460473)
This commit is contained in:
@@ -4,7 +4,6 @@
|
|||||||
cppo,
|
cppo,
|
||||||
dune-build-info,
|
dune-build-info,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
fetchpatch,
|
|
||||||
jq,
|
jq,
|
||||||
lib,
|
lib,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
@@ -22,10 +21,15 @@
|
|||||||
let
|
let
|
||||||
pname = "melange";
|
pname = "melange";
|
||||||
versionHash =
|
versionHash =
|
||||||
if lib.versionAtLeast ocaml.version "5.3" then
|
if lib.versionAtLeast ocaml.version "5.4" then
|
||||||
{
|
{
|
||||||
version = "5.1.0-53";
|
version = "6.0.0-54";
|
||||||
hash = "sha256-96rDDzul/v+Dc+IWTNtbOKWUV8rf7HS1ZMK2LQNcpKk=";
|
hash = "sha256-689OK37ObYhopfcaJ3AmkScGC4lCu3ZOTEM6N+Npvzs=";
|
||||||
|
}
|
||||||
|
else if lib.versionAtLeast ocaml.version "5.3" then
|
||||||
|
{
|
||||||
|
version = "6.0.0-53";
|
||||||
|
hash = "sha256-jPTQvV095BPB4EDepwGJTZ9sB/60VTO4YJTj2wI39jc=";
|
||||||
}
|
}
|
||||||
else if lib.versionAtLeast ocaml.version "5.2" then
|
else if lib.versionAtLeast ocaml.version "5.2" then
|
||||||
{
|
{
|
||||||
@@ -55,14 +59,6 @@ buildDunePackage {
|
|||||||
url = "https://github.com/melange-re/${pname}/releases/download/${version}/${pname}-${version}.tbz";
|
url = "https://github.com/melange-re/${pname}/releases/download/${version}/${pname}-${version}.tbz";
|
||||||
inherit hash;
|
inherit hash;
|
||||||
};
|
};
|
||||||
patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch {
|
|
||||||
url = "https://patch-diff.githubusercontent.com/raw/melange-re/melange/pull/1352.patch";
|
|
||||||
hash = "sha256-PMf66nB743nzW4/xblHjNZFv1BS8xC9maD+eCDDUWAY=";
|
|
||||||
excludes = [
|
|
||||||
"*.opam"
|
|
||||||
"*.template"
|
|
||||||
];
|
|
||||||
});
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cppo
|
cppo
|
||||||
makeWrapper
|
makeWrapper
|
||||||
|
|||||||
Reference in New Issue
Block a user