Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dune_3: 3.13.1 -> 3.14.0 #288510

Merged
merged 3 commits into from
Feb 14, 2024
Merged

dune_3: 3.13.1 -> 3.14.0 #288510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c3ed69
dune_3: 3.13.1 -> 3.14.0
marsam Feb 13, 2024
0f57d67
dune-release: fix tests for dune 3.14
marsam Feb 13, 2024
f8fed37
dune_3: add dune-release as reverse dependency to passthru.tests
marsam Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkgs/development/tools/ocaml/dune-release/default.nix
View file
Open in desktop
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
View file
Open in desktop
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
Loading