colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dune_3: 3.13.1 -> 3.14.0 (#288510)

Browse Source 
* dune_3: 3.13.1 -> 3.14.0

Diff: https://github.com/ocaml/dune/compare/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
This commit is contained in:
Mario Rodas 2024-02-14 01:10:50 -05:00 committed by GitHub
parent d6745ed014
commit 58a5225e39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/ocaml/dune-release/default.nix
View File

@ -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 ];

8
pkgs/development/tools/ocaml/dune/3.nix
View File

@ -1,4 +1,4 @@
{ 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}"
@ -6,11 +6,11 @@ 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 ];
@ -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 = {