From 445760731092ffa38d03eb9668b17251cf2b7b22 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 28 Mar 2023 12:37:16 -0300 Subject: [PATCH] ocamlPackages.dune-configurator: revert last commit --- .../ocaml-modules/dune-configurator/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix index 862e0d01d598..cdb1e3fc2005 100644 --- a/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -1,21 +1,17 @@ -{ lib, buildDunePackage, dune_3, csexp }: +{ lib, buildDunePackage, dune_2, csexp, result }: buildDunePackage rec { pname = "dune-configurator"; - inherit (dune_3) src version; + inherit (dune_2) src version patches; - # This fixes finding csexp - postPatch = '' - rm -rf ./vendor - ''; + duneVersion = "2"; - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.03"; - duneVersion = "3"; dontAddPrefix = true; - propagatedBuildInputs = [ csexp ]; + propagatedBuildInputs = [ csexp result ]; meta = with lib; { description = "Helper library for gathering system configuration";