From cec13baa2da61e8a217b5ac540d9196a7c28b018 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 5 Jan 2024 06:17:46 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.uunf:=2015.0.0=20=E2=86=92=2015.1?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/uunf/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 252468061717..4785bbd04051 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,11 +1,15 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, cmdliner , cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1" +, version ? if lib.versionAtLeast ocaml.version "4.14" then "15.1.0" else "15.0.0" }: let pname = "uunf"; webpage = "https://erratique.ch/software/${pname}"; - version = "15.0.0"; + hash = { + "15.0.0" = "sha256-B/prPAwfqS8ZPS3fyDDIzXWRbKofwOCyCfwvh9veuug="; + "15.1.0" = "sha256-D8yvb7hVWaYxMqMZ5089/5tWDfvyGXKUOjhfU/4zSeQ="; + }."${version}"; in if lib.versionOlder ocaml.version "4.03" @@ -18,15 +22,13 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "sha256-B/prPAwfqS8ZPS3fyDDIzXWRbKofwOCyCfwvh9veuug="; + inherit hash; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg uutf ] ++ lib.optional cmdlinerSupport cmdliner; - propagatedBuildInputs = [ uchar ]; - strictDeps = true; prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384";