From 6410340ea92be069fd1ae65b1e79494416946dd8 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Dec 2020 17:48:18 +0100 Subject: ocamlPackages.opam-file-format: 2.0.0 -> 2.1.2 --- .../ocaml-modules/opam-file-format/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix index ee9961d1533e..04079fcb4761 100644 --- a/pkgs/development/ocaml-modules/opam-file-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix @@ -1,21 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib }: +{ stdenv, lib, fetchpatch, fetchFromGitHub, ocaml, findlib }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.1.2"; name = "ocaml${ocaml.version}-opam-file-format-${version}"; src = fetchFromGitHub { owner = "ocaml"; repo = "opam-file-format"; rev = version; - sha256 = "0fqb99asnair0043hhc8r158d6krv5nzvymd0xwycr5y72yrp0hv"; + sha256 = "19xppn2s3yjid8jc1wh8gdf5mgmlpzby2cf2slmnbyrgln3vj6i2"; }; buildInputs = [ ocaml findlib ]; installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; - patches = [ ./optional-static.patch ]; + patches = [ + ./optional-static.patch + # fix no implementation error for OpamParserTypes + # can be removed at next release presumably + (fetchpatch { + url = "https://github.com/ocaml/opam-file-format/pull/41/commits/2a9a92ec334e0bf2adf8d2b4c1b83f1f9f68df8f.patch"; + sha256 = "090nl7yciyyidmbjfryw3wyx7srh6flnrr4zgyhv4kvjsvq944y2"; + }) + ]; meta = { description = "Parser and printer for the opam file syntax"; -- cgit v1.2.3