Skip to content

Commit

Permalink
dune_3: 3.13.1 -> 3.14.0 (#288510)
Browse files Browse the repository at this point in the history
* dune_3: 3.13.1 -> 3.14.0

Diff: ocaml/dune@3.13.1...3.14.0

Changelog: https://github.com/ocaml/dune/raw/3.14.0/CHANGES.md

* dune-release: fix tests for dune 3.14

* dune_3: add dune-release as reverse dependency to passthru.tests
  • Loading branch information
marsam authored Feb 14, 2024
1 parent d6745ed commit 58a5225
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
8 changes: 8 additions & 0 deletions pkgs/development/tools/ocaml/dune-release/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ in buildDunePackage rec {
hash = "sha256-u8TgaoeDaDLenu3s1Km/Kh85WHMtvUy7C7Q+OY588Ss=";
};

patches = [
# Update tests for dune 3.14 https://github.com/tarides/dune-release/pull/486
(fetchpatch {
url = "https://github.com/tarides/dune-release/commit/fd0e11cb6d9db2acd772f5cadfb94c72bbcf67a8.patch";
hash = "sha256-At24bduds6UwGKGs8cqOn1qaZKElP9TPMSNPimMd1zQ=";
})
];

nativeBuildInputs = [ makeWrapper ] ++ runtimeInputs;
buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core
rresult logs odoc bos yojson astring fpath ];
Expand Down
8 changes: 4 additions & 4 deletions pkgs/development/tools/ocaml/dune/3.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ lib, stdenv, fetchurl, ocaml, findlib, darwin, ocaml-lsp }:
{ lib, stdenv, fetchurl, ocaml, findlib, darwin, ocaml-lsp, dune-release }:

if lib.versionOlder ocaml.version "4.08"
then throw "dune 3 is not available for OCaml ${ocaml.version}"
else

stdenv.mkDerivation rec {
pname = "dune";
version = "3.13.1";
version = "3.14.0";

src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
hash = "sha256-L+CvG0z5hknHVVtVXZ9PgdXe2HcYqJ30mI4hSlbIqRY=";
hash = "sha256-9NCdiRYmIf3/QkwlP6UMSSDSF5+1s9Heure76Xxosvw=";
};

nativeBuildInputs = [ ocaml findlib ];
Expand All @@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ];

passthru.tests = {
inherit ocaml-lsp;
inherit ocaml-lsp dune-release;
};

meta = {
Expand Down

0 comments on commit 58a5225

Please sign in to comment.