Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/build-tarball.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -52,6 +53,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/coverage-windows.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand All@@ -49,6 +50,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand Down
39 changes: 9 additions & 30 deletions .github/workflows/nix-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,12 @@ 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]

Expand DownExpand Up@@ -47,7 +49,9 @@ jobs:
with:
fetch-depth: 2
persist-credentials: false
sparse-checkout: '*.nix'
sparse-checkout: |
shell.nix
tools/nix/
sparse-checkout-cone-mode: false

- uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
Expand All@@ -60,39 +64,14 @@ jobs:
name: nodejs

- name: Compute requisites after 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: |
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
run: ./tools/nix/list-requisites.sh > 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
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
# 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

- name: Output diff
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-linux.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand All@@ -27,6 +28,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-macos.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -53,6 +54,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-shared.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -96,6 +97,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand Down
62 changes: 62 additions & 0 deletions tools/nix/list-requisites.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
#!/bin/sh

set -ex

BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)

OPTIONAL_FLAGS=$(nix-instantiate -I "nixpkgs=$BASE_DIR/tools/nix/pkgs.nix" --eval --strict --raw -E "
(import <nixpkgs> {}).lib.concatMapStrings
(n: ''--arg \${n} true '')
(builtins.filter
(n: builtins.match ''with[A-Z].+'' n != null)
(builtins.attrNames (builtins.functionArgs (import $BASE_DIR/shell.nix))))
"
)

DRV=$(
cd "$BASE_DIR"
# shellcheck disable=SC2086
nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
$OPTIONAL_FLAGS \
--arg sharedLibDeps '{
# Using an empty set as some build dependencies are required only in the absence of shared deps (e.g. Cargo).
# We pass the shared deps as devTools below so they are still accounted for.
}' \
--arg pkcs11 'import ./tools/nix/pkcs11.nix {
# Passing an import call rather than "true" to workaround sharedLibDeps being empty.
}' \
--arg devTools '
let
pkgs = import <nixpkgs> { };
sharedLibDepsFn = import ./tools/nix/sharedLibDeps.nix;
in
(import ./tools/nix/devTools.nix { })
++ pkgs.lib.flatten (
with (pkgs.callPackage ./tools/nix/v8.nix { });
[
# We do not want to build V8 here, but still want to list its requisites.
buildInputs
nativeBuildInputs
propagatedBuildInputs
propagatedNativeBuildInputs
(pkgs.callPackage ./tools/nix/non-v8-deps-mock.nix { })
]
)
++ builtins.attrValues (
{
# Additional packages we are using across the codebase
inherit (pkgs) nixfmt-tree sccache;
}
// import ./tools/nix/openssl-matrix.nix { }
// sharedLibDepsFn (
pkgs.lib.filterAttrs (n: v: builtins.match "with[A-Z].+" n != null) (
builtins.functionArgs sharedLibDepsFn
)
)
)'
)
REFS=$(nix-store --query --references "$DRV")
STORE_PATHS=$(echo "$REFS" | xargs nix-store --realise)
REQUISITES=$(echo "$STORE_PATHS" | xargs nix-store --query --requisites)

echo "$REQUISITES" | sort -k1.45 | uniq
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/build-tarball.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -52,6 +53,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/coverage-windows.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand All@@ -49,6 +50,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand Down
39 changes: 9 additions & 30 deletions .github/workflows/nix-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,12 @@ 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]

Expand DownExpand Up@@ -47,7 +49,9 @@ jobs:
with:
fetch-depth: 2
persist-credentials: false
sparse-checkout: '*.nix'
sparse-checkout: |
shell.nix
tools/nix/
sparse-checkout-cone-mode: false

- uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
Expand All@@ -60,39 +64,14 @@ jobs:
name: nodejs

- name: Compute requisites after 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: |
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
run: ./tools/nix/list-requisites.sh > 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
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
# 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

- name: Output diff
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-linux.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand All@@ -27,6 +28,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-macos.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -53,6 +54,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-shared.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -96,6 +97,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand Down
62 changes: 62 additions & 0 deletions tools/nix/list-requisites.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
#!/bin/sh

set -ex

BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)

OPTIONAL_FLAGS=$(nix-instantiate -I "nixpkgs=$BASE_DIR/tools/nix/pkgs.nix" --eval --strict --raw -E "
(import <nixpkgs> {}).lib.concatMapStrings
(n: ''--arg \${n} true '')
(builtins.filter
(n: builtins.match ''with[A-Z].+'' n != null)
(builtins.attrNames (builtins.functionArgs (import $BASE_DIR/shell.nix))))
"
)

DRV=$(
cd "$BASE_DIR"
# shellcheck disable=SC2086
nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
$OPTIONAL_FLAGS \
--arg sharedLibDeps '{
# Using an empty set as some build dependencies are required only in the absence of shared deps (e.g. Cargo).
# We pass the shared deps as devTools below so they are still accounted for.
}' \
--arg pkcs11 'import ./tools/nix/pkcs11.nix {
# Passing an import call rather than "true" to workaround sharedLibDeps being empty.
}' \
--arg devTools '
let
pkgs = import <nixpkgs> { };
sharedLibDepsFn = import ./tools/nix/sharedLibDeps.nix;
in
(import ./tools/nix/devTools.nix { })
++ pkgs.lib.flatten (
with (pkgs.callPackage ./tools/nix/v8.nix { });
[
# We do not want to build V8 here, but still want to list its requisites.
buildInputs
nativeBuildInputs
propagatedBuildInputs
propagatedNativeBuildInputs
(pkgs.callPackage ./tools/nix/non-v8-deps-mock.nix { })
]
)
++ builtins.attrValues (
{
# Additional packages we are using across the codebase
inherit (pkgs) nixfmt-tree sccache;
}
// import ./tools/nix/openssl-matrix.nix { }
// sharedLibDepsFn (
pkgs.lib.filterAttrs (n: v: builtins.match "with[A-Z].+" n != null) (
builtins.functionArgs sharedLibDepsFn
)
)
)'
)
REFS=$(nix-store --query --references "$DRV")
STORE_PATHS=$(echo "$REFS" | xargs nix-store --realise)
REQUISITES=$(echo "$STORE_PATHS" | xargs nix-store --query --requisites)

echo "$REQUISITES" | sort -k1.45 | uniq
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/build-tarball.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -52,6 +53,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/coverage-windows.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand All@@ -49,6 +50,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand Down
39 changes: 9 additions & 30 deletions .github/workflows/nix-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,12 @@ 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]

Expand DownExpand Up@@ -47,7 +49,9 @@ jobs:
with:
fetch-depth: 2
persist-credentials: false
sparse-checkout: '*.nix'
sparse-checkout: |
shell.nix
tools/nix/
sparse-checkout-cone-mode: false

- uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
Expand All@@ -60,39 +64,14 @@ jobs:
name: nodejs

- name: Compute requisites after 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: |
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
run: ./tools/nix/list-requisites.sh > 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
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
# 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

- name: Output diff
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-linux.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand All@@ -27,6 +28,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-macos.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -53,6 +54,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-shared.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -96,6 +97,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand Down
62 changes: 62 additions & 0 deletions tools/nix/list-requisites.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
#!/bin/sh

set -ex

BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)

OPTIONAL_FLAGS=$(nix-instantiate -I "nixpkgs=$BASE_DIR/tools/nix/pkgs.nix" --eval --strict --raw -E "
(import <nixpkgs> {}).lib.concatMapStrings
(n: ''--arg \${n} true '')
(builtins.filter
(n: builtins.match ''with[A-Z].+'' n != null)
(builtins.attrNames (builtins.functionArgs (import $BASE_DIR/shell.nix))))
"
)

DRV=$(
cd "$BASE_DIR"
# shellcheck disable=SC2086
nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
$OPTIONAL_FLAGS \
--arg sharedLibDeps '{
# Using an empty set as some build dependencies are required only in the absence of shared deps (e.g. Cargo).
# We pass the shared deps as devTools below so they are still accounted for.
}' \
--arg pkcs11 'import ./tools/nix/pkcs11.nix {
# Passing an import call rather than "true" to workaround sharedLibDeps being empty.
}' \
--arg devTools '
let
pkgs = import <nixpkgs> { };
sharedLibDepsFn = import ./tools/nix/sharedLibDeps.nix;
in
(import ./tools/nix/devTools.nix { })
++ pkgs.lib.flatten (
with (pkgs.callPackage ./tools/nix/v8.nix { });
[
# We do not want to build V8 here, but still want to list its requisites.
buildInputs
nativeBuildInputs
propagatedBuildInputs
propagatedNativeBuildInputs
(pkgs.callPackage ./tools/nix/non-v8-deps-mock.nix { })
]
)
++ builtins.attrValues (
{
# Additional packages we are using across the codebase
inherit (pkgs) nixfmt-tree sccache;
}
// import ./tools/nix/openssl-matrix.nix { }
// sharedLibDepsFn (
pkgs.lib.filterAttrs (n: v: builtins.match "with[A-Z].+" n != null) (
builtins.functionArgs sharedLibDepsFn
)
)
)'
)
REFS=$(nix-store --query --references "$DRV")
STORE_PATHS=$(echo "$REFS" | xargs nix-store --realise)
REQUISITES=$(echo "$STORE_PATHS" | xargs nix-store --query --requisites)

echo "$REQUISITES" | sort -k1.45 | uniq
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/build-tarball.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -52,6 +53,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/coverage-windows.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand All@@ -49,6 +50,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand Down
39 changes: 9 additions & 30 deletions .github/workflows/nix-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,12 @@ 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]

Expand DownExpand Up@@ -47,7 +49,9 @@ jobs:
with:
fetch-depth: 2
persist-credentials: false
sparse-checkout: '*.nix'
sparse-checkout: |
shell.nix
tools/nix/
sparse-checkout-cone-mode: false

- uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
Expand All@@ -60,39 +64,14 @@ jobs:
name: nodejs

- name: Compute requisites after 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: |
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
run: ./tools/nix/list-requisites.sh > 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
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
# 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

- name: Output diff
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-linux.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand All@@ -27,6 +28,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-macos.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -53,6 +54,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-shared.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -96,6 +97,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand Down
62 changes: 62 additions & 0 deletions tools/nix/list-requisites.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
#!/bin/sh

set -ex

BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)

OPTIONAL_FLAGS=$(nix-instantiate -I "nixpkgs=$BASE_DIR/tools/nix/pkgs.nix" --eval --strict --raw -E "
(import <nixpkgs> {}).lib.concatMapStrings
(n: ''--arg \${n} true '')
(builtins.filter
(n: builtins.match ''with[A-Z].+'' n != null)
(builtins.attrNames (builtins.functionArgs (import $BASE_DIR/shell.nix))))
"
)

DRV=$(
cd "$BASE_DIR"
# shellcheck disable=SC2086
nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
$OPTIONAL_FLAGS \
--arg sharedLibDeps '{
# Using an empty set as some build dependencies are required only in the absence of shared deps (e.g. Cargo).
# We pass the shared deps as devTools below so they are still accounted for.
}' \
--arg pkcs11 'import ./tools/nix/pkcs11.nix {
# Passing an import call rather than "true" to workaround sharedLibDeps being empty.
}' \
--arg devTools '
let
pkgs = import <nixpkgs> { };
sharedLibDepsFn = import ./tools/nix/sharedLibDeps.nix;
in
(import ./tools/nix/devTools.nix { })
++ pkgs.lib.flatten (
with (pkgs.callPackage ./tools/nix/v8.nix { });
[
# We do not want to build V8 here, but still want to list its requisites.
buildInputs
nativeBuildInputs
propagatedBuildInputs
propagatedNativeBuildInputs
(pkgs.callPackage ./tools/nix/non-v8-deps-mock.nix { })
]
)
++ builtins.attrValues (
{
# Additional packages we are using across the codebase
inherit (pkgs) nixfmt-tree sccache;
}
// import ./tools/nix/openssl-matrix.nix { }
// sharedLibDepsFn (
pkgs.lib.filterAttrs (n: v: builtins.match "with[A-Z].+" n != null) (
builtins.functionArgs sharedLibDepsFn
)
)
)'
)
REFS=$(nix-store --query --references "$DRV")
STORE_PATHS=$(echo "$REFS" | xargs nix-store --realise)
REQUISITES=$(echo "$STORE_PATHS" | xargs nix-store --query --requisites)

echo "$REQUISITES" | sort -k1.45 | uniq
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/build-tarball.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -52,6 +53,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/coverage-windows.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand All@@ -49,6 +50,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand Down
39 changes: 9 additions & 30 deletions .github/workflows/nix-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,12 @@ 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]

Expand DownExpand Up@@ -47,7 +49,9 @@ jobs:
with:
fetch-depth: 2
persist-credentials: false
sparse-checkout: '*.nix'
sparse-checkout: |
shell.nix
tools/nix/
sparse-checkout-cone-mode: false

- uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
Expand All@@ -60,39 +64,14 @@ jobs:
name: nodejs

- name: Compute requisites after 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: |
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
run: ./tools/nix/list-requisites.sh > 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
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
# 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

- name: Output diff
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-linux.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand All@@ -27,6 +28,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-macos.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -53,6 +54,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-shared.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -96,6 +97,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand Down
62 changes: 62 additions & 0 deletions tools/nix/list-requisites.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
#!/bin/sh

set -ex

BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)

OPTIONAL_FLAGS=$(nix-instantiate -I "nixpkgs=$BASE_DIR/tools/nix/pkgs.nix" --eval --strict --raw -E "
(import <nixpkgs> {}).lib.concatMapStrings
(n: ''--arg \${n} true '')
(builtins.filter
(n: builtins.match ''with[A-Z].+'' n != null)
(builtins.attrNames (builtins.functionArgs (import $BASE_DIR/shell.nix))))
"
)

DRV=$(
cd "$BASE_DIR"
# shellcheck disable=SC2086
nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
$OPTIONAL_FLAGS \
--arg sharedLibDeps '{
# Using an empty set as some build dependencies are required only in the absence of shared deps (e.g. Cargo).
# We pass the shared deps as devTools below so they are still accounted for.
}' \
--arg pkcs11 'import ./tools/nix/pkcs11.nix {
# Passing an import call rather than "true" to workaround sharedLibDeps being empty.
}' \
--arg devTools '
let
pkgs = import <nixpkgs> { };
sharedLibDepsFn = import ./tools/nix/sharedLibDeps.nix;
in
(import ./tools/nix/devTools.nix { })
++ pkgs.lib.flatten (
with (pkgs.callPackage ./tools/nix/v8.nix { });
[
# We do not want to build V8 here, but still want to list its requisites.
buildInputs
nativeBuildInputs
propagatedBuildInputs
propagatedNativeBuildInputs
(pkgs.callPackage ./tools/nix/non-v8-deps-mock.nix { })
]
)
++ builtins.attrValues (
{
# Additional packages we are using across the codebase
inherit (pkgs) nixfmt-tree sccache;
}
// import ./tools/nix/openssl-matrix.nix { }
// sharedLibDepsFn (
pkgs.lib.filterAttrs (n: v: builtins.match "with[A-Z].+" n != null) (
builtins.functionArgs sharedLibDepsFn
)
)
)'
)
REFS=$(nix-store --query --references "$DRV")
STORE_PATHS=$(echo "$REFS" | xargs nix-store --realise)
REQUISITES=$(echo "$STORE_PATHS" | xargs nix-store --query --requisites)

echo "$REQUISITES" | sort -k1.45 | uniq
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/build-tarball.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -52,6 +53,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/coverage-windows.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand All@@ -49,6 +50,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand Down
39 changes: 9 additions & 30 deletions .github/workflows/nix-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,12 @@ 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]

Expand DownExpand Up@@ -47,7 +49,9 @@ jobs:
with:
fetch-depth: 2
persist-credentials: false
sparse-checkout: '*.nix'
sparse-checkout: |
shell.nix
tools/nix/
sparse-checkout-cone-mode: false

- uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
Expand All@@ -60,39 +64,14 @@ jobs:
name: nodejs

- name: Compute requisites after 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: |
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
run: ./tools/nix/list-requisites.sh > 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
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
# 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

- name: Output diff
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-linux.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand All@@ -27,6 +28,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-macos.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -53,6 +54,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-shared.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -96,6 +97,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand Down
62 changes: 62 additions & 0 deletions tools/nix/list-requisites.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
#!/bin/sh

set -ex

BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)

OPTIONAL_FLAGS=$(nix-instantiate -I "nixpkgs=$BASE_DIR/tools/nix/pkgs.nix" --eval --strict --raw -E "
(import <nixpkgs> {}).lib.concatMapStrings
(n: ''--arg \${n} true '')
(builtins.filter
(n: builtins.match ''with[A-Z].+'' n != null)
(builtins.attrNames (builtins.functionArgs (import $BASE_DIR/shell.nix))))
"
)

DRV=$(
cd "$BASE_DIR"
# shellcheck disable=SC2086
nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
$OPTIONAL_FLAGS \
--arg sharedLibDeps '{
# Using an empty set as some build dependencies are required only in the absence of shared deps (e.g. Cargo).
# We pass the shared deps as devTools below so they are still accounted for.
}' \
--arg pkcs11 'import ./tools/nix/pkcs11.nix {
# Passing an import call rather than "true" to workaround sharedLibDeps being empty.
}' \
--arg devTools '
let
pkgs = import <nixpkgs> { };
sharedLibDepsFn = import ./tools/nix/sharedLibDeps.nix;
in
(import ./tools/nix/devTools.nix { })
++ pkgs.lib.flatten (
with (pkgs.callPackage ./tools/nix/v8.nix { });
[
# We do not want to build V8 here, but still want to list its requisites.
buildInputs
nativeBuildInputs
propagatedBuildInputs
propagatedNativeBuildInputs
(pkgs.callPackage ./tools/nix/non-v8-deps-mock.nix { })
]
)
++ builtins.attrValues (
{
# Additional packages we are using across the codebase
inherit (pkgs) nixfmt-tree sccache;
}
// import ./tools/nix/openssl-matrix.nix { }
// sharedLibDepsFn (
pkgs.lib.filterAttrs (n: v: builtins.match "with[A-Z].+" n != null) (
builtins.functionArgs sharedLibDepsFn
)
)
)'
)
REFS=$(nix-store --query --references "$DRV")
STORE_PATHS=$(echo "$REFS" | xargs nix-store --realise)
REQUISITES=$(echo "$STORE_PATHS" | xargs nix-store --query --requisites)

echo "$REQUISITES" | sort -k1.45 | uniq
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/build-tarball.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -52,6 +53,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/coverage-windows.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand All@@ -49,6 +50,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand Down
39 changes: 9 additions & 30 deletions .github/workflows/nix-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,12 @@ 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]

Expand DownExpand Up@@ -47,7 +49,9 @@ jobs:
with:
fetch-depth: 2
persist-credentials: false
sparse-checkout: '*.nix'
sparse-checkout: |
shell.nix
tools/nix/
sparse-checkout-cone-mode: false

- uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
Expand All@@ -60,39 +64,14 @@ jobs:
name: nodejs

- name: Compute requisites after 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: |
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
run: ./tools/nix/list-requisites.sh > 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
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
# 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

- name: Output diff
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-linux.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand All@@ -27,6 +28,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-macos.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -53,6 +54,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-shared.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -96,6 +97,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand Down
62 changes: 62 additions & 0 deletions tools/nix/list-requisites.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
#!/bin/sh

set -ex

BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)

OPTIONAL_FLAGS=$(nix-instantiate -I "nixpkgs=$BASE_DIR/tools/nix/pkgs.nix" --eval --strict --raw -E "
(import <nixpkgs> {}).lib.concatMapStrings
(n: ''--arg \${n} true '')
(builtins.filter
(n: builtins.match ''with[A-Z].+'' n != null)
(builtins.attrNames (builtins.functionArgs (import $BASE_DIR/shell.nix))))
"
)

DRV=$(
cd "$BASE_DIR"
# shellcheck disable=SC2086
nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
$OPTIONAL_FLAGS \
--arg sharedLibDeps '{
# Using an empty set as some build dependencies are required only in the absence of shared deps (e.g. Cargo).
# We pass the shared deps as devTools below so they are still accounted for.
}' \
--arg pkcs11 'import ./tools/nix/pkcs11.nix {
# Passing an import call rather than "true" to workaround sharedLibDeps being empty.
}' \
--arg devTools '
let
pkgs = import <nixpkgs> { };
sharedLibDepsFn = import ./tools/nix/sharedLibDeps.nix;
in
(import ./tools/nix/devTools.nix { })
++ pkgs.lib.flatten (
with (pkgs.callPackage ./tools/nix/v8.nix { });
[
# We do not want to build V8 here, but still want to list its requisites.
buildInputs
nativeBuildInputs
propagatedBuildInputs
propagatedNativeBuildInputs
(pkgs.callPackage ./tools/nix/non-v8-deps-mock.nix { })
]
)
++ builtins.attrValues (
{
# Additional packages we are using across the codebase
inherit (pkgs) nixfmt-tree sccache;
}
// import ./tools/nix/openssl-matrix.nix { }
// sharedLibDepsFn (
pkgs.lib.filterAttrs (n: v: builtins.match "with[A-Z].+" n != null) (
builtins.functionArgs sharedLibDepsFn
)
)
)'
)
REFS=$(nix-store --query --references "$DRV")
STORE_PATHS=$(echo "$REFS" | xargs nix-store --realise)
REQUISITES=$(echo "$STORE_PATHS" | xargs nix-store --query --requisites)

echo "$REQUISITES" | sort -k1.45 | uniq
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/build-tarball.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -52,6 +53,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/coverage-windows.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand All@@ -49,6 +50,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- .**
- '!.github/workflows/coverage-windows.yml'
Expand Down
39 changes: 9 additions & 30 deletions .github/workflows/nix-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,12 @@ 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]

Expand DownExpand Up@@ -47,7 +49,9 @@ jobs:
with:
fetch-depth: 2
persist-credentials: false
sparse-checkout: '*.nix'
sparse-checkout: |
shell.nix
tools/nix/
sparse-checkout-cone-mode: false

- uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
Expand All@@ -60,39 +64,14 @@ jobs:
name: nodejs

- name: Compute requisites after 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: |
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
run: ./tools/nix/list-requisites.sh > 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
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
# 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

- name: Output diff
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-linux.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand All@@ -27,6 +28,7 @@ on:
- tools/actions/**
- tools/clang-format/**
- tools/dep_updaters/**
- tools/nix/**
- test/internet/**
- '**.nix'
- .github/**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-macos.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -53,6 +54,7 @@ on:
- tools/eslint-rules/**
- tools/eslint/**
- tools/lint-md/**
- tools/nix/**
- typings/**
- vcbuild.bat
- .**
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-shared.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand DownExpand Up@@ -96,6 +97,7 @@ on:
- '!tools/nix/**'
- '!tools/v8/**'
- '!tools/v8_gypfiles/**'
- tools/nix/list-requisites.sh
- typings/**
- vcbuild.bat
- .**
Expand Down
62 changes: 62 additions & 0 deletions tools/nix/list-requisites.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
#!/bin/sh

set -ex

BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)

OPTIONAL_FLAGS=$(nix-instantiate -I "nixpkgs=$BASE_DIR/tools/nix/pkgs.nix" --eval --strict --raw -E "
(import <nixpkgs> {}).lib.concatMapStrings
(n: ''--arg \${n} true '')
(builtins.filter
(n: builtins.match ''with[A-Z].+'' n != null)
(builtins.attrNames (builtins.functionArgs (import $BASE_DIR/shell.nix))))
"
)

DRV=$(
cd "$BASE_DIR"
# shellcheck disable=SC2086
nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
$OPTIONAL_FLAGS \
--arg sharedLibDeps '{
# Using an empty set as some build dependencies are required only in the absence of shared deps (e.g. Cargo).
# We pass the shared deps as devTools below so they are still accounted for.
}' \
--arg pkcs11 'import ./tools/nix/pkcs11.nix {
# Passing an import call rather than "true" to workaround sharedLibDeps being empty.
}' \
--arg devTools '
let
pkgs = import <nixpkgs> { };
sharedLibDepsFn = import ./tools/nix/sharedLibDeps.nix;
in
(import ./tools/nix/devTools.nix { })
++ pkgs.lib.flatten (
with (pkgs.callPackage ./tools/nix/v8.nix { });
[
# We do not want to build V8 here, but still want to list its requisites.
buildInputs
nativeBuildInputs
propagatedBuildInputs
propagatedNativeBuildInputs
(pkgs.callPackage ./tools/nix/non-v8-deps-mock.nix { })
]
)
++ builtins.attrValues (
{
# Additional packages we are using across the codebase
inherit (pkgs) nixfmt-tree sccache;
}
// import ./tools/nix/openssl-matrix.nix { }
// sharedLibDepsFn (
pkgs.lib.filterAttrs (n: v: builtins.match "with[A-Z].+" n != null) (
builtins.functionArgs sharedLibDepsFn
)
)
)'
)
REFS=$(nix-store --query --references "$DRV")
STORE_PATHS=$(echo "$REFS" | xargs nix-store --realise)
REQUISITES=$(echo "$STORE_PATHS" | xargs nix-store --query --requisites)

echo "$REQUISITES" | sort -k1.45 | uniq
Loading