diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2024-07-24 08:01:17 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2024-07-29 11:27:52 +0200 |
| commit | 8d839aa80913351d74bbcab1ca22de66ef9bbcd6 (patch) | |
| tree | 36b26a6f0c453ecdc277ee28300e371c02e02d3e | |
| parent | 3bb78ca87fbbc1991ae9a799a0deb235f51e78bc (diff) | |
ocamlPackages.opam-format: clean
| -rw-r--r-- | pkgs/development/ocaml-modules/opam-format/default.nix | 7 | ||||
| -rw-r--r-- | 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 1360c62816360..00d0b146fb71f 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 a45a12c0d31fb..da8b7108816d3 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 { }; |