diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index a5d97b65b2f3..32ff517178cb 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -1,8 +1,8 @@ -{ lib, buildDunePackage, fetchurl, makeWrapper -, curly, fmt, bos, cmdliner, re, rresult, logs +{ lib, buildDunePackage, fetchurl, makeWrapper, fetchpatch +, curly, fmt, bos, cmdliner, re, rresult, logs, fpath , odoc, opam-format, opam-core, opam-state, yojson, astring , opam, git, findlib, mercurial, bzip2, gnutar, coreutils -, alcotest, mdx +, alcotest }: # don't include dune as runtime dep, so user can @@ -10,33 +10,36 @@ let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ]; in buildDunePackage rec { pname = "dune-release"; - version = "1.5.0"; + version = "1.5.2"; minimumOCamlVersion = "4.06"; src = fetchurl { url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "1lyfaczskdbqnhmpiy6wga9437frds3m8prfk2rhwyb96h69y3pv"; + sha256 = "1r6bz1zz1al5y762ws3w98d8bnyi5ipffajgczixacmbrxvp3zgx"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core - rresult logs odoc bos yojson astring ]; - checkInputs = [ alcotest mdx ] ++ runtimeInputs; + rresult logs odoc bos yojson astring fpath ]; + checkInputs = [ alcotest ] ++ runtimeInputs; doCheck = true; useDune2 = true; + patches = [ + # add missing git config calls to avoid failing due to the lack of a global git config + (fetchpatch { + name = "tests-missing-git-config.patch"; + url = "https://github.com/ocamllabs/dune-release/commit/87e7ffe2a9c574620d4e2fc0d79eed8772eab973.patch"; + sha256 = "0wrzcpzr54dwrdjdc75mijh78xk4bmsmqs1pci06fb2nf03vbd2k"; + }) + ]; + postPatch = '' # remove check for curl in PATH, since curly is patched # to have a fixed path to the binary in nix store sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml - - # ignore weird yes error message - sed -i 's/yes |/yes 2>\/dev\/null |/' \ - tests/bin/no_doc/run.t \ - tests/bin/draft/run.t \ - tests/bin/url-file/run.t ''; preCheck = ''