dune: 3.20.2 -> 3.21.1 (#489721)

pkgs/by-name/du/dune/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   buildPackages,
-  version ? "3.20.2",
+  version ? "3.21.1",
 }:
 let
   # needed for pkgsStatic
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
       "https://github.com/ocaml/dune/releases/download/${version}/dune-${sfx}${version}.tbz";
     hash =
       {
-        "3.20.2" = "sha256-sahrLWC9tKi5u2hhvfL58opufLXYM86Br+zOue+cpUk=";
+        "3.21.1" = "sha256-hPeoLG2ApxJPOEfppInoDPvq+3vtNXOsAShu9W/QjZQ=";
         "2.9.3" = "sha256:1ml8bxym8sdfz25bx947al7cvsi2zg5lcv7x9w6xb01cmdryqr9y";
       }
       ."${version}";

pkgs/development/ocaml-modules/chrome-trace/default.nix

@@ -13,10 +13,6 @@ buildDunePackage {
 
   dontAddPrefix = true;
 
-  preBuild = ''
-    rm -r vendor/csexp
-  '';
-
   meta = {
     description = "Chrome trace event generation library";
     inherit (dune_3.meta) homepage;

pkgs/development/ocaml-modules/dune-action-plugin/default.nix

@@ -21,10 +21,6 @@ buildDunePackage {
     dune-rpc
   ];
 
-  preBuild = ''
-    rm -r vendor/csexp
-  '';
-
   meta = {
     inherit (dune_3.meta) homepage;
     description = "API for writing dynamic Dune actions";

pkgs/development/ocaml-modules/dune-build-info/default.nix

@@ -6,7 +6,7 @@
 
 buildDunePackage {
   pname = "dune-build-info";
-  inherit (dune-action-plugin) src version preBuild;
+  inherit (dune-action-plugin) src version;
 
   dontAddPrefix = true;
 

pkgs/development/ocaml-modules/dune-configurator/default.nix

@@ -10,11 +10,6 @@ buildDunePackage {
 
   inherit (dune_3) src version patches;
 
-  # This fixes finding csexp
-  postPatch = ''
-    rm -rf vendor/pp vendor/csexp
-  '';
-
   minimalOCamlVersion = "4.05";
 
   dontAddPrefix = true;

pkgs/development/ocaml-modules/dune-glob/default.nix

@@ -3,6 +3,7 @@
   buildDunePackage,
   dune_3,
   dune-private-libs,
+  re,
 }:
 
 buildDunePackage {
@@ -13,11 +14,10 @@ buildDunePackage {
 
   dontAddPrefix = true;
 
-  propagatedBuildInputs = [ dune-private-libs ];
-
-  preBuild = ''
-    rm -r vendor/csexp
-  '';
+  propagatedBuildInputs = [
+    dune-private-libs
+    re
+  ];
 
   meta = {
     inherit (dune_3.meta) homepage;

pkgs/development/ocaml-modules/dune-private-libs/default.nix

@@ -18,10 +18,6 @@ buildDunePackage {
 
   propagatedBuildInputs = [ stdune ];
 
-  preBuild = ''
-    rm -r vendor/csexp
-  '';
-
   meta = {
     description = "Private libraries of Dune";
     maintainers = [ ];

pkgs/development/ocaml-modules/dune-rpc/default.nix

@@ -6,6 +6,7 @@
   stdune,
   ocamlc-loc,
   ordering,
+  pp,
   xdg,
   dyn,
 }:
@@ -23,14 +24,11 @@ buildDunePackage {
     stdune
     ocamlc-loc
     ordering
+    pp
     xdg
     dyn
   ];
 
-  preBuild = ''
-    rm -r vendor/csexp
-  '';
-
   meta = {
     description = "Library to connect and control a running dune instance";
     inherit (dune_3.meta) homepage;

pkgs/development/ocaml-modules/dune-site/default.nix

@@ -15,10 +15,6 @@ buildDunePackage {
 
   propagatedBuildInputs = [ dune-private-libs ];
 
-  preBuild = ''
-    rm -r vendor/csexp
-  '';
-
   meta = {
     description = "Library for embedding location information inside executable and libraries";
     inherit (dune_3.meta) homepage;

pkgs/development/ocaml-modules/dyn/default.nix

@@ -2,6 +2,7 @@
   buildDunePackage,
   dune_3,
   ordering,
+  pp,
 }:
 
 buildDunePackage {
@@ -11,7 +12,10 @@ buildDunePackage {
 
   dontAddPrefix = true;
 
-  propagatedBuildInputs = [ ordering ];
+  propagatedBuildInputs = [
+    ordering
+    pp
+  ];
 
   meta = dune_3.meta // {
     description = "Dynamic type";

pkgs/development/ocaml-modules/fs-io/default.nix

@@ -0,0 +1,12 @@
+{ buildDunePackage, dune_3 }:
+
+buildDunePackage {
+  pname = "fs-io";
+  inherit (dune_3) version src;
+
+  dontAddPrefix = true;
+
+  meta = dune_3.meta // {
+    description = "Dune's file system IO library";
+  };
+}

pkgs/development/ocaml-modules/ocamlc-loc/default.nix

@@ -11,11 +11,6 @@ buildDunePackage {
 
   dontAddPrefix = true;
 
-  preBuild = ''
-    rm -rf vendor/csexp
-    rm -rf vendor/pp
-  '';
-
   propagatedBuildInputs = [ dyn ];
 
   meta = {

pkgs/development/ocaml-modules/stdune/default.nix

@@ -3,7 +3,10 @@
   dune,
   dyn,
   ordering,
+  pp,
   csexp,
+  fs-io,
+  top-closure,
 }:
 
 buildDunePackage {
@@ -15,13 +18,12 @@ buildDunePackage {
   propagatedBuildInputs = [
     dyn
     ordering
+    pp
     csexp
+    fs-io
+    top-closure
   ];
 
-  preBuild = ''
-    rm -r vendor/csexp
-  '';
-
   meta = dune.meta // {
     description = "Dune's unstable standard library";
   };

pkgs/development/ocaml-modules/top-closure/default.nix

@@ -0,0 +1,12 @@
+{ buildDunePackage, dune_3 }:
+
+buildDunePackage {
+  pname = "top-closure";
+  inherit (dune_3) version src;
+
+  dontAddPrefix = true;
+
+  meta = dune_3.meta // {
+    description = "Dune's topological closure library";
+  };
+}

pkgs/top-level/ocaml-packages.nix

@@ -691,6 +691,8 @@ let
 
         frontc = callPackage ../development/ocaml-modules/frontc { };
 
+        fs-io = callPackage ../development/ocaml-modules/fs-io { };
+
         functory = callPackage ../development/ocaml-modules/functory { };
 
         ### G ###
@@ -2124,6 +2126,8 @@ let
 
         toml = callPackage ../development/ocaml-modules/toml { };
 
+        top-closure = callPackage ../development/ocaml-modules/top-closure { };
+
         topkg = callPackage ../development/ocaml-modules/topkg { };
 
         trace = callPackage ../development/ocaml-modules/trace { };