From 174267e601bc2d525a685084d9712841b3ef93da Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 1 Jan 2021 15:29:10 +0100 Subject: [PATCH] ocamlPackages.ppx_blob: 0.7.1 -> 0.7.2 --- pkgs/development/ocaml-modules/ppx_blob/default.nix | 8 ++++---- pkgs/top-level/ocaml-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index a64ff9cbef2..ac96e56d04e 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchurl, buildDunePackage, ocaml, alcotest, ocaml-migrate-parsetree }: +{ lib, fetchurl, buildDunePackage, ocaml, alcotest, ppxlib }: buildDunePackage rec { pname = "ppx_blob"; - version = "0.7.1"; + version = "0.7.2"; useDune2 = true; src = fetchurl { url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz"; - sha256 = "0m616ri6kmawflphiwm6j4djds27v0fjvi8xjz1fq5ydc1sq8d0l"; + sha256 = "00haz1cmplk3j9ysh6j656zrldy60585fmlndmfhpd5332mxrfdw"; }; checkInputs = [ alcotest ]; - buildInputs = [ ocaml-migrate-parsetree ]; + propagatedBuildInputs = [ ppxlib ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = with lib; { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2a62a337817..e5d0f60ee5d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -916,10 +916,7 @@ let pprint = callPackage ../development/ocaml-modules/pprint { }; - ppx_blob = - if lib.versionAtLeast ocaml.version "4.02" - then callPackage ../development/ocaml-modules/ppx_blob {} - else null; + ppx_blob = callPackage ../development/ocaml-modules/ppx_blob { }; ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix {};