chore(nix): improve nix devShell#scope (#11696)

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

Author: anmonteiro

flake.nix

@@ -80,7 +80,12 @@
       testBuildInputs = with pkgs;
         [ file mercurial unzip ]
         ++ lib.optionals stdenv.isLinux [ strace ];
-      testNativeBuildInputs = with pkgs; [ nodejs-slim pkg-config opam ocamlformat ];
+      testNativeBuildInputs = pkgs: with pkgs; [
+        nodejs-slim
+        pkg-config
+        opam
+        ocamlformat
+      ];
 
       docInputs = with pkgs.python3.pkgs; [
         sphinx-autobuild
@@ -97,7 +102,24 @@
         default = with pkgs; stdenv.mkDerivation {
           pname = "dune";
           version = "n/a";
-          src = ./.;
+          src =
+            let fs = lib.fileset; in
+            fs.toSource {
+              root = ./.;
+              fileset = fs.unions [
+                ./bin
+                ./boot
+                ./configure
+                ./dune-project
+                ./dune-file
+                ./src
+                ./plugin
+                ./vendor
+                ./otherlibs
+                ./Makefile
+                (fs.fileFilter (file: file.hasExt "opam" || file.hasExt "template") ./.)
+              ];
+            };
           nativeBuildInputs = with ocamlPackages; [ ocaml findlib ];
           buildInputs = lib.optionals stdenv.isDarwin [
             darwin.apple_sdk.frameworks.CoreServices
@@ -118,7 +140,7 @@
       devShells =
         let
           makeDuneDevShell =
-            { extraBuildInputs ? [ ]
+            { extraBuildInputs ? (pkgs: [ ])
             , meta ? null
             , duneFromScope ? false
             }:
@@ -134,7 +156,6 @@
                 else pkgs;
 
               inherit (pkgs') writeScriptBin stdenv;
-              inherit docInputs;
 
               duneScript =
                 writeScriptBin "dune" ''
@@ -148,7 +169,7 @@
                 export DUNE_SOURCE_ROOT=$PWD
               '';
               inherit meta;
-              nativeBuildInputs = testNativeBuildInputs
+              nativeBuildInputs = (testNativeBuildInputs pkgs')
                 ++ docInputs
                 ++ [ duneScript ];
               inputsFrom = [ pkgs'.ocamlPackages.dune_3 ];
@@ -166,7 +187,7 @@
                 odoc
                 lwt
                 patdiff
-              ] ++ extraBuildInputs);
+              ] ++ (extraBuildInputs pkgs'));
             };
         in
         {
@@ -196,7 +217,7 @@
             '';
           };
           slim-melange = makeDuneDevShell {
-            extraBuildInputs = [
+            extraBuildInputs = pkgs: [
               pkgs.ocamlPackages.melange
             ];
             meta.description = ''
@@ -205,7 +226,7 @@
             '';
           };
           slim-opam = with pkgs; mkShell {
-            nativeBuildInputs = lib.remove pkgs.ocamlformat testNativeBuildInputs;
+            nativeBuildInputs = lib.remove pkgs.ocamlformat (testNativeBuildInputs pkgs);
             buildInputs = lib.optionals stdenv.isDarwin [
               darwin.apple_sdk.frameworks.CoreServices
             ];
@@ -217,7 +238,7 @@
 
           coq =
             pkgs.mkShell {
-              nativeBuildInputs = testNativeBuildInputs;
+              nativeBuildInputs = (testNativeBuildInputs pkgs);
               # Coq requires OCaml 4.x
               inputsFrom = [ pkgs.ocaml-ng.ocamlPackages_4_14.dune_3 ];
               buildInputs = with pkgs; [
@@ -230,8 +251,8 @@
               '';
             };
           microbench = makeDuneDevShell {
-            extraBuildInputs = with pkgs.ocamlPackages; [
-              core_bench
+            extraBuildInputs = pkgs: [
+              pkgs.ocamlPackages.core_bench
             ];
             meta.description = ''
               Provides a minimal shell environment that can build the
@@ -249,7 +270,7 @@
           };
           default =
             makeDuneDevShell {
-              extraBuildInputs = (with pkgs; [
+              extraBuildInputs = pkgs: (with pkgs; [
                 # dev tools
                 ccls
               ]) ++ (with pkgs.ocamlPackages; [