summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2021-07-26 04:20:00 +0000
committerMario Rodas <marsam@users.noreply.github.com>2021-07-26 04:20:00 +0000
commitbef038a48687766a2d5163105ee46cd544162af0 (patch)
tree0efd1ee044f96be3a2b40eb00ca6d1cae88f49f5 /pkgs
parent5a7e27afe1af320b73034aab50fd1564014c6f98 (diff)
downloadnixpkgs-bef038a48687766a2d5163105ee46cd544162af0.tar
nixpkgs-bef038a48687766a2d5163105ee46cd544162af0.tar.gz
nixpkgs-bef038a48687766a2d5163105ee46cd544162af0.tar.bz2
nixpkgs-bef038a48687766a2d5163105ee46cd544162af0.tar.lz
nixpkgs-bef038a48687766a2d5163105ee46cd544162af0.tar.xz
nixpkgs-bef038a48687766a2d5163105ee46cd544162af0.tar.zst
nixpkgs-bef038a48687766a2d5163105ee46cd544162af0.zip
dune-release: 1.4.0 -> 1.5.0
https://github.com/ocamllabs/dune-release/releases/tag/1.5.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/ocaml/dune-release/default.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix
index 60a9bfba58f..0eb56d3f539 100644
--- a/pkgs/development/tools/ocaml/dune-release/default.nix
+++ b/pkgs/development/tools/ocaml/dune-release/default.nix
@@ -1,6 +1,6 @@
 { lib, buildDunePackage, fetchurl, makeWrapper
 , curly, fmt, bos, cmdliner, re, rresult, logs
-, odoc, opam-format, opam-core, opam-state, yojson
+, odoc, opam-format, opam-core, opam-state, yojson, astring
 , opam, git, findlib, mercurial, bzip2, gnutar, coreutils
 , alcotest, mdx
 }:
@@ -10,18 +10,18 @@
 let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ];
 in buildDunePackage rec {
   pname = "dune-release";
-  version = "1.4.0";
+  version = "1.5.0";
 
   minimumOCamlVersion = "4.06";
 
   src = fetchurl {
     url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz";
-    sha256 = "1frinv1rsrm30q6jclicsswpshkdwwdgxx7sp6q9w4c2p211n1ln";
+    sha256 = "1lyfaczskdbqnhmpiy6wga9437frds3m8prfk2rhwyb96h69y3pv";
   };
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core
-                  rresult logs odoc bos yojson ];
+                  rresult logs odoc bos yojson astring ];
   checkInputs = [ alcotest mdx ] ++ runtimeInputs;
   doCheck = true;
 
@@ -44,6 +44,11 @@ in buildDunePackage rec {
     sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t
   '';
 
+  preCheck = ''
+    # it fails when it tries to reference "./make_check_deterministic.exe"
+    rm -fr tests/bin/check
+  '';
+
   # tool specific env vars have been deprecated, use PATH
   preFixup = ''
     wrapProgram $out/bin/dune-release \