From 830a385b5f3f9a03c4f44f08071c655f9d85c2b3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 26 Oct 2022 09:56:24 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.stdint:=200.7.0=20=E2=86=92=200.7?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/stdint/default.nix | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix index 2a4bf2bb6335..cec0ec818300 100644 --- a/pkgs/development/ocaml-modules/stdint/default.nix +++ b/pkgs/development/ocaml-modules/stdint/default.nix @@ -1,26 +1,18 @@ -{ lib, fetchurl, fetchpatch, buildDunePackage, ocaml, qcheck }: +{ lib, fetchurl, buildDunePackage, ocaml, qcheck }: buildDunePackage rec { pname = "stdint"; - version = "0.7.0"; + version = "0.7.2"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/andrenth/ocaml-stdint/releases/download/${version}/stdint-${version}.tbz"; - sha256 = "4fcc66aef58e2b96e7af3bbca9d910aa239e045ba5fb2400aaef67d0041252dc"; + sha256 = "sha256-FWAZjYvJx68+qVLEDavoJmZpQhDsw/35u/60MhHpd+Y="; }; - patches = [ - # fix test bug, remove at next release - (fetchpatch { - url = "https://github.com/andrenth/ocaml-stdint/commit/fc64293f99f597cdfd4470954da6fb323988e2af.patch"; - sha256 = "0nxck14vfjfzldsf8cdj2jg1cvhnyh37hqnrcxbdkqmpx4rxkbxs"; - }) - ]; - # 1. disable remaining broken tests, see # https://github.com/andrenth/ocaml-stdint/issues/59 # 2. fix tests to liberal test range @@ -30,9 +22,7 @@ buildDunePackage rec { --replace 'test "An integer should perform left-shifts correctly"' \ 'skip "An integer should perform left-shifts correctly"' \ --replace 'test "Logical shifts must not sign-extend"' \ - 'skip "Logical shifts must not sign-extend"' \ - --replace 'let pos_int = QCheck.map_same_type abs in_range' \ - 'let pos_int = QCheck.int_range 0 maxi' + 'skip "Logical shifts must not sign-extend"' ''; doCheck = lib.versionAtLeast ocaml.version "4.08";