Skip to content

Commit

Permalink
dune-release: 1.3.3 → 1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sternenseemann authored and vbgl committed Aug 2, 2020
1 parent 7dd96f8 commit b37f774
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions pkgs/development/tools/ocaml/dune-release/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, buildDunePackage, fetchurl, makeWrapper
, curly, fmt, bos, cmdliner, re, rresult, logs
, odoc, opam-format, opam-core, opam-state
, odoc, opam-format, opam-core, opam-state, yojson
, opam, git, findlib, mercurial, bzip2, gnutar, coreutils
, alcotest, mdx
}:
@@ -10,27 +10,33 @@
let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ];
in buildDunePackage rec {
pname = "dune-release";
version = "1.3.3";
version = "1.4.0";

minimumOCamlVersion = "4.06";

src = fetchurl {
url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz";
sha256 = "04qmgvjh1233ri878wi5kifdd1070w5pbfkd8yk3nnqnslz35zlb";
sha256 = "1frinv1rsrm30q6jclicsswpshkdwwdgxx7sp6q9w4c2p211n1ln";
};

nativeBuildInputs = [ makeWrapper ];
buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core
rresult logs odoc bos ];
checkInputs = [ alcotest mdx ];
rresult logs odoc bos yojson ];
checkInputs = [ alcotest mdx ] ++ runtimeInputs;
doCheck = true;

useDune2 = true;

# remove check for curl in PATH, since curly is patched
# to have a fixed path to the binary in nix store
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
# set bogus user info in git so git commit doesn't fail
sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' \
tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t
# ignore weird yes error message
sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t
'';

# tool specific env vars have been deprecated, use PATH

0 comments on commit b37f774

Please sign in to comment.