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.16.1 -> 3.17.0 #361854

Merged
merged 1 commit into from
Dec 16, 2024
+19 −3
Merged

dune_3: 3.16.1 -> 3.17.0 #361854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions pkgs/development/ocaml-modules/hxd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ buildDunePackage rec {

doCheck = true;

preCheck = ''
export DUNE_CACHE=disabled
'';

meta = with lib; {
description = "Hexdump in OCaml";
homepage = "https://github.com/dinosaure/hxd";
Expand Down
9 changes: 8 additions & 1 deletion pkgs/development/ocaml-modules/ocplib-simplex/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildDunePackage, logs, zarith }:
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, logs, zarith }:

buildDunePackage rec {
pname = "ocplib-simplex";
Expand All @@ -11,6 +11,13 @@ buildDunePackage rec {
hash = "sha256-fLTht+TlyJIsIAsRLmmkFKsnbSeW3BgyAyURFdnGfko=";
};

# Fix tests with dune 3.17.0
# See https://github.com/OCamlPro/ocplib-simplex/issues/35
patches = (fetchpatch {
url = "https://github.com/OCamlPro/ocplib-simplex/commit/456a744bddd397daade7959d4a49cfadafdadd33.patch";
hash = "sha256-tQUXOoRGe1AIzHcm6j2MopROxn75OE9YUP+CwcKUbVg=";
});

propagatedBuildInputs = [ logs zarith ];

doCheck = true;
Expand Down
5 changes: 5 additions & 0 deletions pkgs/development/ocaml-modules/reason-react/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ buildDunePackage {
melange
];
doCheck = true;
# Fix tests with dune 3.17.0
# See https://github.com/reasonml/reason-react/issues/870
preCheck = ''
export DUNE_CACHE=disabled
'';
meta = reason-react-ppx.meta // {
description = "Reason bindings for React.js";
};
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/tools/ocaml/dune/3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ else

stdenv.mkDerivation rec {
pname = "dune";
version = "3.16.1";
version = "3.17.0";

src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
hash = "sha256-t4GuIPh2E8KhG9BxeAngBHDILWFeFSZPmmTgMwUaw94=";
hash = "sha256-LDqmxB7Tnj1sGiktdfSAa9gDEIQa/FFnOqWc6cgWUHw=";
};

nativeBuildInputs = [ ocaml findlib ];
Expand Down
Loading