Skip to content

Commit 0389a68

Browse files
authored
Merge pull request #278855 from vbgl/ocaml-uunf-15.1.0
ocamlPackages.uunf: 15.0.0 → 15.1.0
2 parents 20451a0 + cec13ba commit 0389a68

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner
1+
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, cmdliner
22
, cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1"
3+
, version ? if lib.versionAtLeast ocaml.version "4.14" then "15.1.0" else "15.0.0"
34
}:
45

56
let
67
pname = "uunf";
78
webpage = "https://erratique.ch/software/${pname}";
8-
version = "15.0.0";
9+
hash = {
10+
"15.0.0" = "sha256-B/prPAwfqS8ZPS3fyDDIzXWRbKofwOCyCfwvh9veuug=";
11+
"15.1.0" = "sha256-D8yvb7hVWaYxMqMZ5089/5tWDfvyGXKUOjhfU/4zSeQ=";
12+
}."${version}";
913
in
1014

1115
if lib.versionOlder ocaml.version "4.03"
@@ -18,15 +22,13 @@ stdenv.mkDerivation {
1822

1923
src = fetchurl {
2024
url = "${webpage}/releases/${pname}-${version}.tbz";
21-
sha256 = "sha256-B/prPAwfqS8ZPS3fyDDIzXWRbKofwOCyCfwvh9veuug=";
25+
inherit hash;
2226
};
2327

2428
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
2529
buildInputs = [ topkg uutf ]
2630
++ lib.optional cmdlinerSupport cmdliner;
2731

28-
propagatedBuildInputs = [ uchar ];
29-
3032
strictDeps = true;
3133

3234
prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384";

0 commit comments

Comments
 (0)