Revert "tools: improve nix-changes coverage"

This reverts commit 78175c6.

PR-URL: #65560

Author: aduh95

.github/workflows/build-tarball.yml

@@ -23,7 +23,6 @@ on:
       - tools/eslint-rules/**
       - tools/eslint/**
       - tools/lint-md/**
-      - tools/nix/**
       - typings/**
       - vcbuild.bat
       - .**
@@ -53,7 +52,6 @@ on:
       - tools/eslint-rules/**
       - tools/eslint/**
       - tools/lint-md/**
-      - tools/nix/**
       - typings/**
       - vcbuild.bat
       - .**

.github/workflows/coverage-windows.yml

@@ -23,7 +23,6 @@ on:
       - tools/eslint-rules/**
       - tools/eslint/**
       - tools/lint-md/**
-      - tools/nix/**
       - typings/**
       - .**
       - '!.github/workflows/coverage-windows.yml'
@@ -50,7 +49,6 @@ on:
       - tools/eslint-rules/**
       - tools/eslint/**
       - tools/lint-md/**
-      - tools/nix/**
       - typings/**
       - .**
       - '!.github/workflows/coverage-windows.yml'

.github/workflows/nix-changes.yml

@@ -11,12 +11,10 @@ on:
       - v[0-9]+.x
     paths:
       - '**.nix'
-      - tools/nix/**
       - .github/workflows/nix-changes.yml
   pull_request:
     paths:
       - '**.nix'
-      - tools/nix/**
       - .github/workflows/nix-changes.yml
     types: [opened, synchronize, reopened, ready_for_review]
 
@@ -49,9 +47,7 @@ jobs:
         with:
           fetch-depth: 2
           persist-credentials: false
-          sparse-checkout: |
-            shell.nix
-            tools/nix/
+          sparse-checkout: '*.nix'
           sparse-checkout-cone-mode: false
 
       - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342  # v31.11.0
@@ -64,14 +60,39 @@ jobs:
           name: nodejs
 
       - name: Compute requisites after change
-        run: ./tools/nix/list-requisites.sh > requisites-${{ matrix.system }}-after.list
+        shell: bash  # See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference, we want the pipefail option.
+        run: |
+          nix-store --query --references "$(
+            nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
+              --arg devTools "
+                (import ./tools/nix/devTools.nix {})
+                ++ builtins.attrValues (
+                  { inherit (import <nixpkgs> {}) nixfmt-tree sccache; }
+                  // import ./tools/nix/openssl-matrix.nix {}
+                  // import ./tools/nix/pkcs11.nix {}
+                )")" \
+          | xargs nix-store --realise \
+          | xargs nix-store --query --requisites \
+          | sort -k1.45 \
+          > requisites-${{ matrix.system }}-after.list
 
       - name: Compute requisites before change
+        shell: bash  # See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference, we want the pipefail option.
         run: |
           git reset HEAD^ --hard
-          # TODO(aduh95): remove this once list-requisites.sh has reached `main`
-          [ -f tools/nix/list-requisites.sh ] || git checkout FETCH_HEAD -- tools/nix/list-requisites.sh
-          ./tools/nix/list-requisites.sh > requisites-${{ matrix.system }}-before.list
+          nix-store --query --references "$(
+            nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
+              --arg devTools "
+                (import ./tools/nix/devTools.nix {})
+                ++ builtins.attrValues (
+                  { inherit (import <nixpkgs> {}) nixfmt-tree sccache; }
+                  // import ./tools/nix/openssl-matrix.nix {}
+                  // import ./tools/nix/pkcs11.nix {}
+                )")" \
+          | xargs nix-store --realise \
+          | xargs nix-store --query --requisites \
+          | sort -k1.45 \
+          > requisites-${{ matrix.system }}-before.list
 
       - name: Output diff
         run: |

.github/workflows/test-linux.yml

@@ -9,7 +9,6 @@ on:
       - tools/actions/**
       - tools/clang-format/**
       - tools/dep_updaters/**
-      - tools/nix/**
       - test/internet/**
       - '**.nix'
       - .github/**
@@ -28,7 +27,6 @@ on:
       - tools/actions/**
       - tools/clang-format/**
       - tools/dep_updaters/**
-      - tools/nix/**
       - test/internet/**
       - '**.nix'
       - .github/**

.github/workflows/test-macos.yml

@@ -23,7 +23,6 @@ on:
       - tools/eslint-rules/**
       - tools/eslint/**
       - tools/lint-md/**
-      - tools/nix/**
       - typings/**
       - vcbuild.bat
       - .**
@@ -54,7 +53,6 @@ on:
       - tools/eslint-rules/**
       - tools/eslint/**
       - tools/lint-md/**
-      - tools/nix/**
       - typings/**
       - vcbuild.bat
       - .**

.github/workflows/test-shared.yml

@@ -44,7 +44,6 @@ on:
       - '!tools/nix/**'
       - '!tools/v8/**'
       - '!tools/v8_gypfiles/**'
-      - tools/nix/list-requisites.sh
       - typings/**
       - vcbuild.bat
       - .**
@@ -97,7 +96,6 @@ on:
       - '!tools/nix/**'
       - '!tools/v8/**'
       - '!tools/v8_gypfiles/**'
-      - tools/nix/list-requisites.sh
       - typings/**
       - vcbuild.bat
       - .**