From 8d839aa80913351d74bbcab1ca22de66ef9bbcd6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Jul 2024 08:01:17 +0200 Subject: [PATCH] ocamlPackages.opam-format: clean --- pkgs/development/ocaml-modules/opam-format/default.nix | 7 +------ pkgs/top-level/ocaml-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/opam-format/default.nix b/pkgs/development/ocaml-modules/opam-format/default.nix index 1360c6281636..00d0b146fb71 100644 --- a/pkgs/development/ocaml-modules/opam-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-format/default.nix @@ -1,19 +1,14 @@ -{ lib, buildDunePackage, unzip, opam-core, opam-file-format }: +{ lib, buildDunePackage, opam-core, opam-file-format }: buildDunePackage rec { pname = "opam-format"; - useDune2 = true; - inherit (opam-core) src version; - minimalOCamlVersion = "4.02.3"; - # get rid of check for curl at configure time # opam-format does not call curl at run time configureFlags = [ "--disable-checks" ]; - nativeBuildInputs = [ unzip ]; propagatedBuildInputs = [ opam-core opam-file-format ]; meta = opam-core.meta // { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a45a12c0d31f..da8b7108816d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1384,9 +1384,7 @@ let opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { }; - opam-format = callPackage ../development/ocaml-modules/opam-format { - inherit (pkgs) unzip; - }; + opam-format = callPackage ../development/ocaml-modules/opam-format { }; opam-repository = callPackage ../development/ocaml-modules/opam-repository { };