From b68839485d2064a574e0825ac662912727ec62da Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 14 Mar 2021 21:06:38 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.bitstring:=204.0.1=20=E2=86=92=20?= =?UTF-8?q?4.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/bitstring/default.nix | 4 ++-- pkgs/development/ocaml-modules/bitstring/ppx.nix | 4 ++++ pkgs/top-level/ocaml-packages.nix | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index 583017d9dde..12ed4ae787d 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "bitstring"; - version = "4.0.1"; + version = "4.1.0"; useDune2 = true; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "xguerin"; repo = pname; rev = "v${version}"; - sha256 = "1z7jmgljvp52lvn3ml2cp6gssxqp4sikwyjf6ym97cycbcw0fjjm"; + sha256 = "0mghsl8b2zd2676mh1r9142hymhvzy9cw8kgkjmirxkn56wbf56b"; }; propagatedBuildInputs = [ stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/bitstring/ppx.nix b/pkgs/development/ocaml-modules/bitstring/ppx.nix index ee0a8c51f73..4d391d3458d 100644 --- a/pkgs/development/ocaml-modules/bitstring/ppx.nix +++ b/pkgs/development/ocaml-modules/bitstring/ppx.nix @@ -3,6 +3,10 @@ , ounit }: +if !lib.versionAtLeast ppxlib.version "0.18.0" +then throw "ppx_bitstring is not available with ppxlib-${ppxlib.version}" +else + buildDunePackage rec { pname = "ppx_bitstring"; inherit (bitstring) version useDune2 src; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 8b4b56d57a4..fd8165085f0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -929,7 +929,9 @@ let ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; - ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; + ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { + ppxlib = ppxlib.override { version = "0.22.0"; }; + }; ppxfind = callPackage ../development/ocaml-modules/ppxfind { };