From 5750c4a1f5379f5d462e0c661079d0f9ebf3c6f5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 3 Jun 2026 10:28:27 +0200 Subject: [PATCH] =?UTF-8?q?dune:=203.22.2=20=E2=86=92=203.23.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/du/dune/package.nix | 3 ++- .../ocaml-modules/dune-configurator/default.nix | 5 ++++- pkgs/development/ocaml-modules/stdune/default.nix | 7 ++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/du/dune/package.nix b/pkgs/by-name/du/dune/package.nix index 0dfaf0a82ca8..0f50adc7b00f 100644 --- a/pkgs/by-name/du/dune/package.nix +++ b/pkgs/by-name/du/dune/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, buildPackages, - version ? "3.22.2", + version ? "3.23.1", }: let # needed for pkgsStatic @@ -21,6 +21,7 @@ stdenv.mkDerivation { "https://github.com/ocaml/dune/releases/download/${version}/dune-${sfx}${version}.tbz"; hash = { + "3.23.1" = "sha256-k7TnFX9rqP62HPxfhgCO/SxZA3unigF9krSr8wYyNI8="; "3.22.2" = "sha256-wsz4vGsXr6R8RQKXNXSWMDqnyGgOMpt52Yxo41AToRg="; "3.21.1" = "sha256-hPeoLG2ApxJPOEfppInoDPvq+3vtNXOsAShu9W/QjZQ="; "2.9.3" = "sha256:1ml8bxym8sdfz25bx947al7cvsi2zg5lcv7x9w6xb01cmdryqr9y"; diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix index d17a866141b9..2ede486e1a14 100644 --- a/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -1,14 +1,17 @@ { lib, buildDunePackage, + ocaml, dune, csexp, + version ? if lib.versionAtLeast ocaml.version "4.13" then dune.version else "3.22.2", }: buildDunePackage { pname = "dune-configurator"; + inherit version; - inherit (dune) src version; + inherit (dune.override { inherit version; }) src; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/stdune/default.nix b/pkgs/development/ocaml-modules/stdune/default.nix index 04b3fc3d1267..f4d61e9241f9 100644 --- a/pkgs/development/ocaml-modules/stdune/default.nix +++ b/pkgs/development/ocaml-modules/stdune/default.nix @@ -1,5 +1,7 @@ { + lib, buildDunePackage, + ocaml, dune, dyn, ordering, @@ -7,11 +9,14 @@ csexp, fs-io, top-closure, + version ? if lib.versionAtLeast ocaml.version "4.13" then dune.version else "3.22.2", }: buildDunePackage { pname = "stdune"; - inherit (dune) version src; + inherit version; + + inherit (dune.override { inherit version; }) src; dontAddPrefix = true;