Commit f0140d7

Browse files
aduh95aduh95
committed
tools: store "default" OpenSSL version in openssl-matrix.nix
To help with automating keeping in sync with the bundled version. Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #64962 Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 4c8d8af commit f0140d7

4 files changed

Lines changed: 29 additions & 5 deletions

File tree

‎tools/dep_updaters/update-nixpkgs-pin.sh‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,39 @@ TMP_FILE=$(mktemp)
2626
sed "s/$CURRENT_VERSION_SHA1/$NEW_UPSTREAM_SHA1/;s/$CURRENT_TARBALL_HASH/$NEW_TARBALL_HASH/""$NIXPKGS_PIN_FILE">"$TMP_FILE"
2727
mv "$TMP_FILE""$NIXPKGS_PIN_FILE"
2828

29+
# === Update openssl-matrix.nix ===
30+
# When bumping the pin, we want to update the openssl-matrix.nix file to keep the list in sync nixpkgs
31+
# i.e. add newly added release lines, remove newly dropped release lines), and make sure the "openssl"
32+
# attribute still refers to the same release line as the bundled version in deps/openssl/.
33+
34+
OPENSSL_MAJOR=$(awk -F= '/^MAJOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
35+
OPENSSL_MINOR=$(awk -F= '/^MINOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
36+
2937
nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
3038
let
3139
pkgs = import <nixpkgs> {};
3240
opensslAttrs = builtins.filter
3341
(n: builtins.match \"openssl_[0-9]+(_[0-9]+)?\" n != null)
3442
(builtins.attrNames pkgs);
3543
extraMatrixAttrs = [ \"boringssl\" ];
44+
default = builtins.head (builtins.filter (n:
45+
let
46+
inherit (pkgs.lib) versions;
47+
t = builtins.tryEval pkgs.\${n};
48+
v = if t.success then builtins.tryEval t.value.version else t;
49+
majorVersion = pkgs.lib.optionalString v.success (versions.major v.value);
50+
minorVersion = pkgs.lib.optionalString v.success (versions.minor v.value);
51+
in
52+
majorVersion == ''$OPENSSL_MAJOR'' && minorVersion == ''$OPENSSL_MINOR'') opensslAttrs);
3653
attrs = builtins.filter
3754
(n:
3855
let t = builtins.tryEval pkgs.\${n}; in
39-
t.success && (builtins.tryEval t.value.version).success
56+
n != default && t.success && (builtins.tryEval t.value.version).success
4057
)
4158
(opensslAttrs ++ extraMatrixAttrs);
4259
in
4360
{
44-
inherit attrs;
61+
inherit attrs default;
4562
permittedInsecurePackages = builtins.map (attr: pkgs.\${attr}.name) (
4663
builtins.filter (attr: (pkgs.\${attr}.meta.insecure)) attrs
4764
);
@@ -53,6 +70,10 @@ nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
5370
}:
5471
5572
{
73+
# "default" OpenSSL release line, should be kept in sync with the bundled version:
74+
openssl = pkgs.\(.default);
75+
76+
# Other OpenSSL variants we want to test for:
5677
inherit (pkgs)
5778
\(.attrs | sort | join("\n "))
5879
;

‎tools/nix/openssl-matrix.nix‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
}:
66

77
{
8+
# "default" OpenSSL release line, should be kept in sync with the bundled version:
9+
openssl=pkgs.openssl_3_5;
10+
11+
# Other OpenSSL variants we want to test for:
812
inherit(pkgs)
913
boringssl
1014
openssl_1_1
1115
openssl_3
12-
openssl_3_5
1316
openssl_3_6
1417
openssl_4_0
1518
;

‎tools/nix/pkcs11.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# pkcs11-provider is dlopen'd into the libcrypto Node.js itself links, so it
1111
# has to be built against that very OpenSSL. SoftHSM links OpenSSL too;
1212
# building it against the same one keeps a single libcrypto in the process.
13-
openssl ? (import./sharedLibDeps.nix{inheritpkgs;}).openssl,
13+
openssl ? (import./openssl-matrix.nix{inheritpkgs;}).openssl,
1414

1515
pin ? "1234",
1616
}:

‎tools/nix/sharedLibDeps.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
ffi=pkgs.libffiReal;
4949
})
5050
//(pkgs.lib.optionalAttrswithSSL({
51-
openssl=(import./openssl-matrix.nix{inheritpkgs;}).openssl_3_5;
51+
inherit(import./openssl-matrix.nix{inheritpkgs;})openssl;
5252
}))
5353
//(pkgs.lib.optionalAttrswithTemporal{
5454
inherit(pkgs)temporal_capi;

0 commit comments

Comments
 (0)
, '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
Commit f0140d7
Browse files
aduh95aduh95
committed
tools: store "default" OpenSSL version in openssl-matrix.nix
To help with automating keeping in sync with the bundled version.
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #64962
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 4c8d8af commit f0140d7
4 files changed
Lines changed: 29 additions & 5 deletions
File tree
‎tools/dep_updaters/update-nixpkgs-pin.sh‎
Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,39 @@ TMP_FILE=$(mktemp)
2626
sed "s/$CURRENT_VERSION_SHA1/$NEW_UPSTREAM_SHA1/;s/$CURRENT_TARBALL_HASH/$NEW_TARBALL_HASH/""$NIXPKGS_PIN_FILE">"$TMP_FILE"
2727
mv "$TMP_FILE""$NIXPKGS_PIN_FILE"
2828

29+
# === Update openssl-matrix.nix ===
30+
# When bumping the pin, we want to update the openssl-matrix.nix file to keep the list in sync nixpkgs
31+
# i.e. add newly added release lines, remove newly dropped release lines), and make sure the "openssl"
32+
# attribute still refers to the same release line as the bundled version in deps/openssl/.
33+
34+
OPENSSL_MAJOR=$(awk -F= '/^MAJOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
35+
OPENSSL_MINOR=$(awk -F= '/^MINOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
36+
2937
nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
3038
 let
3139
 pkgs = import <nixpkgs> {};
3240
 opensslAttrs = builtins.filter
3341
 (n: builtins.match \"openssl_[0-9]+(_[0-9]+)?\" n != null)
3442
 (builtins.attrNames pkgs);
3543
 extraMatrixAttrs = [ \"boringssl\" ];
44+
 default = builtins.head (builtins.filter (n:
45+
 let
46+
 inherit (pkgs.lib) versions;
47+
 t = builtins.tryEval pkgs.\${n};
48+
 v = if t.success then builtins.tryEval t.value.version else t;
49+
 majorVersion = pkgs.lib.optionalString v.success (versions.major v.value);
50+
 minorVersion = pkgs.lib.optionalString v.success (versions.minor v.value);
51+
 in
52+
 majorVersion == ''$OPENSSL_MAJOR'' && minorVersion == ''$OPENSSL_MINOR'') opensslAttrs);
3653
 attrs = builtins.filter
3754
 (n:
3855
 let t = builtins.tryEval pkgs.\${n}; in
39-
 t.success && (builtins.tryEval t.value.version).success
56+
n != default && t.success && (builtins.tryEval t.value.version).success
4057
 )
4158
 (opensslAttrs ++ extraMatrixAttrs);
4259
 in
4360
 {
44-
 inherit attrs;
61+
 inherit attrs default;
4562
 permittedInsecurePackages = builtins.map (attr: pkgs.\${attr}.name) (
4663
 builtins.filter (attr: (pkgs.\${attr}.meta.insecure)) attrs
4764
 );
@@ -53,6 +70,10 @@ nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
5370
}:
5471
5572
{
73+
 # "default" OpenSSL release line, should be kept in sync with the bundled version:
74+
 openssl = pkgs.\(.default);
75+
76+
 # Other OpenSSL variants we want to test for:
5677
 inherit (pkgs)
5778
 \(.attrs | sort | join("\n "))
5879
 ;
‎tools/nix/openssl-matrix.nix‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
}:
66

77
{
8+
# "default" OpenSSL release line, should be kept in sync with the bundled version:
9+
openssl=pkgs.openssl_3_5;
10+
11+
# Other OpenSSL variants we want to test for:
812
inherit(pkgs)
913
boringssl
1014
openssl_1_1
1115
openssl_3
12-
openssl_3_5
1316
openssl_3_6
1417
openssl_4_0
1518
;
‎tools/nix/pkcs11.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# pkcs11-provider is dlopen'd into the libcrypto Node.js itself links, so it
1111
# has to be built against that very OpenSSL. SoftHSM links OpenSSL too;
1212
# building it against the same one keeps a single libcrypto in the process.
13-
openssl ? (import./sharedLibDeps.nix{inheritpkgs;}).openssl,
13+
openssl ? (import./openssl-matrix.nix{inheritpkgs;}).openssl,
1414

1515
pin ? "1234",
1616
}:
‎tools/nix/sharedLibDeps.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
ffi=pkgs.libffiReal;
4949
})
5050
//(pkgs.lib.optionalAttrswithSSL({
51-
openssl=(import./openssl-matrix.nix{inheritpkgs;}).openssl_3_5;
51+
inherit(import./openssl-matrix.nix{inheritpkgs;})openssl;
5252
}))
5353
//(pkgs.lib.optionalAttrswithTemporal{
5454
inherit(pkgs)temporal_capi;
0 commit comments
Comments
 (0)

, '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
Commit f0140d7
Browse files
aduh95aduh95
committed
tools: store "default" OpenSSL version in openssl-matrix.nix
To help with automating keeping in sync with the bundled version.
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #64962
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 4c8d8af commit f0140d7
4 files changed
Lines changed: 29 additions & 5 deletions
File tree
‎tools/dep_updaters/update-nixpkgs-pin.sh‎
Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,39 @@ TMP_FILE=$(mktemp)
2626
sed "s/$CURRENT_VERSION_SHA1/$NEW_UPSTREAM_SHA1/;s/$CURRENT_TARBALL_HASH/$NEW_TARBALL_HASH/""$NIXPKGS_PIN_FILE">"$TMP_FILE"
2727
mv "$TMP_FILE""$NIXPKGS_PIN_FILE"
2828

29+
# === Update openssl-matrix.nix ===
30+
# When bumping the pin, we want to update the openssl-matrix.nix file to keep the list in sync nixpkgs
31+
# i.e. add newly added release lines, remove newly dropped release lines), and make sure the "openssl"
32+
# attribute still refers to the same release line as the bundled version in deps/openssl/.
33+
34+
OPENSSL_MAJOR=$(awk -F= '/^MAJOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
35+
OPENSSL_MINOR=$(awk -F= '/^MINOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
36+
2937
nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
3038
 let
3139
 pkgs = import <nixpkgs> {};
3240
 opensslAttrs = builtins.filter
3341
 (n: builtins.match \"openssl_[0-9]+(_[0-9]+)?\" n != null)
3442
 (builtins.attrNames pkgs);
3543
 extraMatrixAttrs = [ \"boringssl\" ];
44+
 default = builtins.head (builtins.filter (n:
45+
 let
46+
 inherit (pkgs.lib) versions;
47+
 t = builtins.tryEval pkgs.\${n};
48+
 v = if t.success then builtins.tryEval t.value.version else t;
49+
 majorVersion = pkgs.lib.optionalString v.success (versions.major v.value);
50+
 minorVersion = pkgs.lib.optionalString v.success (versions.minor v.value);
51+
 in
52+
 majorVersion == ''$OPENSSL_MAJOR'' && minorVersion == ''$OPENSSL_MINOR'') opensslAttrs);
3653
 attrs = builtins.filter
3754
 (n:
3855
 let t = builtins.tryEval pkgs.\${n}; in
39-
 t.success && (builtins.tryEval t.value.version).success
56+
n != default && t.success && (builtins.tryEval t.value.version).success
4057
 )
4158
 (opensslAttrs ++ extraMatrixAttrs);
4259
 in
4360
 {
44-
 inherit attrs;
61+
 inherit attrs default;
4562
 permittedInsecurePackages = builtins.map (attr: pkgs.\${attr}.name) (
4663
 builtins.filter (attr: (pkgs.\${attr}.meta.insecure)) attrs
4764
 );
@@ -53,6 +70,10 @@ nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
5370
}:
5471
5572
{
73+
 # "default" OpenSSL release line, should be kept in sync with the bundled version:
74+
 openssl = pkgs.\(.default);
75+
76+
 # Other OpenSSL variants we want to test for:
5677
 inherit (pkgs)
5778
 \(.attrs | sort | join("\n "))
5879
 ;
‎tools/nix/openssl-matrix.nix‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
}:
66

77
{
8+
# "default" OpenSSL release line, should be kept in sync with the bundled version:
9+
openssl=pkgs.openssl_3_5;
10+
11+
# Other OpenSSL variants we want to test for:
812
inherit(pkgs)
913
boringssl
1014
openssl_1_1
1115
openssl_3
12-
openssl_3_5
1316
openssl_3_6
1417
openssl_4_0
1518
;
‎tools/nix/pkcs11.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# pkcs11-provider is dlopen'd into the libcrypto Node.js itself links, so it
1111
# has to be built against that very OpenSSL. SoftHSM links OpenSSL too;
1212
# building it against the same one keeps a single libcrypto in the process.
13-
openssl ? (import./sharedLibDeps.nix{inheritpkgs;}).openssl,
13+
openssl ? (import./openssl-matrix.nix{inheritpkgs;}).openssl,
1414

1515
pin ? "1234",
1616
}:
‎tools/nix/sharedLibDeps.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
ffi=pkgs.libffiReal;
4949
})
5050
//(pkgs.lib.optionalAttrswithSSL({
51-
openssl=(import./openssl-matrix.nix{inheritpkgs;}).openssl_3_5;
51+
inherit(import./openssl-matrix.nix{inheritpkgs;})openssl;
5252
}))
5353
//(pkgs.lib.optionalAttrswithTemporal{
5454
inherit(pkgs)temporal_capi;
0 commit comments
Comments
 (0)

, '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
Commit f0140d7
Browse files
aduh95aduh95
committed
tools: store "default" OpenSSL version in openssl-matrix.nix
To help with automating keeping in sync with the bundled version.
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #64962
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 4c8d8af commit f0140d7
4 files changed
Lines changed: 29 additions & 5 deletions
File tree
‎tools/dep_updaters/update-nixpkgs-pin.sh‎
Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,39 @@ TMP_FILE=$(mktemp)
2626
sed "s/$CURRENT_VERSION_SHA1/$NEW_UPSTREAM_SHA1/;s/$CURRENT_TARBALL_HASH/$NEW_TARBALL_HASH/""$NIXPKGS_PIN_FILE">"$TMP_FILE"
2727
mv "$TMP_FILE""$NIXPKGS_PIN_FILE"
2828

29+
# === Update openssl-matrix.nix ===
30+
# When bumping the pin, we want to update the openssl-matrix.nix file to keep the list in sync nixpkgs
31+
# i.e. add newly added release lines, remove newly dropped release lines), and make sure the "openssl"
32+
# attribute still refers to the same release line as the bundled version in deps/openssl/.
33+
34+
OPENSSL_MAJOR=$(awk -F= '/^MAJOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
35+
OPENSSL_MINOR=$(awk -F= '/^MINOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
36+
2937
nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
3038
 let
3139
 pkgs = import <nixpkgs> {};
3240
 opensslAttrs = builtins.filter
3341
 (n: builtins.match \"openssl_[0-9]+(_[0-9]+)?\" n != null)
3442
 (builtins.attrNames pkgs);
3543
 extraMatrixAttrs = [ \"boringssl\" ];
44+
 default = builtins.head (builtins.filter (n:
45+
 let
46+
 inherit (pkgs.lib) versions;
47+
 t = builtins.tryEval pkgs.\${n};
48+
 v = if t.success then builtins.tryEval t.value.version else t;
49+
 majorVersion = pkgs.lib.optionalString v.success (versions.major v.value);
50+
 minorVersion = pkgs.lib.optionalString v.success (versions.minor v.value);
51+
 in
52+
 majorVersion == ''$OPENSSL_MAJOR'' && minorVersion == ''$OPENSSL_MINOR'') opensslAttrs);
3653
 attrs = builtins.filter
3754
 (n:
3855
 let t = builtins.tryEval pkgs.\${n}; in
39-
 t.success && (builtins.tryEval t.value.version).success
56+
n != default && t.success && (builtins.tryEval t.value.version).success
4057
 )
4158
 (opensslAttrs ++ extraMatrixAttrs);
4259
 in
4360
 {
44-
 inherit attrs;
61+
 inherit attrs default;
4562
 permittedInsecurePackages = builtins.map (attr: pkgs.\${attr}.name) (
4663
 builtins.filter (attr: (pkgs.\${attr}.meta.insecure)) attrs
4764
 );
@@ -53,6 +70,10 @@ nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
5370
}:
5471
5572
{
73+
 # "default" OpenSSL release line, should be kept in sync with the bundled version:
74+
 openssl = pkgs.\(.default);
75+
76+
 # Other OpenSSL variants we want to test for:
5677
 inherit (pkgs)
5778
 \(.attrs | sort | join("\n "))
5879
 ;
‎tools/nix/openssl-matrix.nix‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
}:
66

77
{
8+
# "default" OpenSSL release line, should be kept in sync with the bundled version:
9+
openssl=pkgs.openssl_3_5;
10+
11+
# Other OpenSSL variants we want to test for:
812
inherit(pkgs)
913
boringssl
1014
openssl_1_1
1115
openssl_3
12-
openssl_3_5
1316
openssl_3_6
1417
openssl_4_0
1518
;
‎tools/nix/pkcs11.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# pkcs11-provider is dlopen'd into the libcrypto Node.js itself links, so it
1111
# has to be built against that very OpenSSL. SoftHSM links OpenSSL too;
1212
# building it against the same one keeps a single libcrypto in the process.
13-
openssl ? (import./sharedLibDeps.nix{inheritpkgs;}).openssl,
13+
openssl ? (import./openssl-matrix.nix{inheritpkgs;}).openssl,
1414

1515
pin ? "1234",
1616
}:
‎tools/nix/sharedLibDeps.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
ffi=pkgs.libffiReal;
4949
})
5050
//(pkgs.lib.optionalAttrswithSSL({
51-
openssl=(import./openssl-matrix.nix{inheritpkgs;}).openssl_3_5;
51+
inherit(import./openssl-matrix.nix{inheritpkgs;})openssl;
5252
}))
5353
//(pkgs.lib.optionalAttrswithTemporal{
5454
inherit(pkgs)temporal_capi;
0 commit comments
Comments
 (0)

, '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
Commit f0140d7
Browse files
aduh95aduh95
committed
tools: store "default" OpenSSL version in openssl-matrix.nix
To help with automating keeping in sync with the bundled version.
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #64962
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 4c8d8af commit f0140d7
4 files changed
Lines changed: 29 additions & 5 deletions
File tree
‎tools/dep_updaters/update-nixpkgs-pin.sh‎
Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,39 @@ TMP_FILE=$(mktemp)
2626
sed "s/$CURRENT_VERSION_SHA1/$NEW_UPSTREAM_SHA1/;s/$CURRENT_TARBALL_HASH/$NEW_TARBALL_HASH/""$NIXPKGS_PIN_FILE">"$TMP_FILE"
2727
mv "$TMP_FILE""$NIXPKGS_PIN_FILE"
2828

29+
# === Update openssl-matrix.nix ===
30+
# When bumping the pin, we want to update the openssl-matrix.nix file to keep the list in sync nixpkgs
31+
# i.e. add newly added release lines, remove newly dropped release lines), and make sure the "openssl"
32+
# attribute still refers to the same release line as the bundled version in deps/openssl/.
33+
34+
OPENSSL_MAJOR=$(awk -F= '/^MAJOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
35+
OPENSSL_MINOR=$(awk -F= '/^MINOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
36+
2937
nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
3038
 let
3139
 pkgs = import <nixpkgs> {};
3240
 opensslAttrs = builtins.filter
3341
 (n: builtins.match \"openssl_[0-9]+(_[0-9]+)?\" n != null)
3442
 (builtins.attrNames pkgs);
3543
 extraMatrixAttrs = [ \"boringssl\" ];
44+
 default = builtins.head (builtins.filter (n:
45+
 let
46+
 inherit (pkgs.lib) versions;
47+
 t = builtins.tryEval pkgs.\${n};
48+
 v = if t.success then builtins.tryEval t.value.version else t;
49+
 majorVersion = pkgs.lib.optionalString v.success (versions.major v.value);
50+
 minorVersion = pkgs.lib.optionalString v.success (versions.minor v.value);
51+
 in
52+
 majorVersion == ''$OPENSSL_MAJOR'' && minorVersion == ''$OPENSSL_MINOR'') opensslAttrs);
3653
 attrs = builtins.filter
3754
 (n:
3855
 let t = builtins.tryEval pkgs.\${n}; in
39-
 t.success && (builtins.tryEval t.value.version).success
56+
n != default && t.success && (builtins.tryEval t.value.version).success
4057
 )
4158
 (opensslAttrs ++ extraMatrixAttrs);
4259
 in
4360
 {
44-
 inherit attrs;
61+
 inherit attrs default;
4562
 permittedInsecurePackages = builtins.map (attr: pkgs.\${attr}.name) (
4663
 builtins.filter (attr: (pkgs.\${attr}.meta.insecure)) attrs
4764
 );
@@ -53,6 +70,10 @@ nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
5370
}:
5471
5572
{
73+
 # "default" OpenSSL release line, should be kept in sync with the bundled version:
74+
 openssl = pkgs.\(.default);
75+
76+
 # Other OpenSSL variants we want to test for:
5677
 inherit (pkgs)
5778
 \(.attrs | sort | join("\n "))
5879
 ;
‎tools/nix/openssl-matrix.nix‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
}:
66

77
{
8+
# "default" OpenSSL release line, should be kept in sync with the bundled version:
9+
openssl=pkgs.openssl_3_5;
10+
11+
# Other OpenSSL variants we want to test for:
812
inherit(pkgs)
913
boringssl
1014
openssl_1_1
1115
openssl_3
12-
openssl_3_5
1316
openssl_3_6
1417
openssl_4_0
1518
;
‎tools/nix/pkcs11.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# pkcs11-provider is dlopen'd into the libcrypto Node.js itself links, so it
1111
# has to be built against that very OpenSSL. SoftHSM links OpenSSL too;
1212
# building it against the same one keeps a single libcrypto in the process.
13-
openssl ? (import./sharedLibDeps.nix{inheritpkgs;}).openssl,
13+
openssl ? (import./openssl-matrix.nix{inheritpkgs;}).openssl,
1414

1515
pin ? "1234",
1616
}:
‎tools/nix/sharedLibDeps.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
ffi=pkgs.libffiReal;
4949
})
5050
//(pkgs.lib.optionalAttrswithSSL({
51-
openssl=(import./openssl-matrix.nix{inheritpkgs;}).openssl_3_5;
51+
inherit(import./openssl-matrix.nix{inheritpkgs;})openssl;
5252
}))
5353
//(pkgs.lib.optionalAttrswithTemporal{
5454
inherit(pkgs)temporal_capi;
0 commit comments
Comments
 (0)

, '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
Commit f0140d7
Browse files
aduh95aduh95
committed
tools: store "default" OpenSSL version in openssl-matrix.nix
To help with automating keeping in sync with the bundled version.
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #64962
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 4c8d8af commit f0140d7
4 files changed
Lines changed: 29 additions & 5 deletions
File tree
‎tools/dep_updaters/update-nixpkgs-pin.sh‎
Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,39 @@ TMP_FILE=$(mktemp)
2626
sed "s/$CURRENT_VERSION_SHA1/$NEW_UPSTREAM_SHA1/;s/$CURRENT_TARBALL_HASH/$NEW_TARBALL_HASH/""$NIXPKGS_PIN_FILE">"$TMP_FILE"
2727
mv "$TMP_FILE""$NIXPKGS_PIN_FILE"
2828

29+
# === Update openssl-matrix.nix ===
30+
# When bumping the pin, we want to update the openssl-matrix.nix file to keep the list in sync nixpkgs
31+
# i.e. add newly added release lines, remove newly dropped release lines), and make sure the "openssl"
32+
# attribute still refers to the same release line as the bundled version in deps/openssl/.
33+
34+
OPENSSL_MAJOR=$(awk -F= '/^MAJOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
35+
OPENSSL_MINOR=$(awk -F= '/^MINOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
36+
2937
nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
3038
 let
3139
 pkgs = import <nixpkgs> {};
3240
 opensslAttrs = builtins.filter
3341
 (n: builtins.match \"openssl_[0-9]+(_[0-9]+)?\" n != null)
3442
 (builtins.attrNames pkgs);
3543
 extraMatrixAttrs = [ \"boringssl\" ];
44+
 default = builtins.head (builtins.filter (n:
45+
 let
46+
 inherit (pkgs.lib) versions;
47+
 t = builtins.tryEval pkgs.\${n};
48+
 v = if t.success then builtins.tryEval t.value.version else t;
49+
 majorVersion = pkgs.lib.optionalString v.success (versions.major v.value);
50+
 minorVersion = pkgs.lib.optionalString v.success (versions.minor v.value);
51+
 in
52+
 majorVersion == ''$OPENSSL_MAJOR'' && minorVersion == ''$OPENSSL_MINOR'') opensslAttrs);
3653
 attrs = builtins.filter
3754
 (n:
3855
 let t = builtins.tryEval pkgs.\${n}; in
39-
 t.success && (builtins.tryEval t.value.version).success
56+
n != default && t.success && (builtins.tryEval t.value.version).success
4057
 )
4158
 (opensslAttrs ++ extraMatrixAttrs);
4259
 in
4360
 {
44-
 inherit attrs;
61+
 inherit attrs default;
4562
 permittedInsecurePackages = builtins.map (attr: pkgs.\${attr}.name) (
4663
 builtins.filter (attr: (pkgs.\${attr}.meta.insecure)) attrs
4764
 );
@@ -53,6 +70,10 @@ nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
5370
}:
5471
5572
{
73+
 # "default" OpenSSL release line, should be kept in sync with the bundled version:
74+
 openssl = pkgs.\(.default);
75+
76+
 # Other OpenSSL variants we want to test for:
5677
 inherit (pkgs)
5778
 \(.attrs | sort | join("\n "))
5879
 ;
‎tools/nix/openssl-matrix.nix‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
}:
66

77
{
8+
# "default" OpenSSL release line, should be kept in sync with the bundled version:
9+
openssl=pkgs.openssl_3_5;
10+
11+
# Other OpenSSL variants we want to test for:
812
inherit(pkgs)
913
boringssl
1014
openssl_1_1
1115
openssl_3
12-
openssl_3_5
1316
openssl_3_6
1417
openssl_4_0
1518
;
‎tools/nix/pkcs11.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# pkcs11-provider is dlopen'd into the libcrypto Node.js itself links, so it
1111
# has to be built against that very OpenSSL. SoftHSM links OpenSSL too;
1212
# building it against the same one keeps a single libcrypto in the process.
13-
openssl ? (import./sharedLibDeps.nix{inheritpkgs;}).openssl,
13+
openssl ? (import./openssl-matrix.nix{inheritpkgs;}).openssl,
1414

1515
pin ? "1234",
1616
}:
‎tools/nix/sharedLibDeps.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
ffi=pkgs.libffiReal;
4949
})
5050
//(pkgs.lib.optionalAttrswithSSL({
51-
openssl=(import./openssl-matrix.nix{inheritpkgs;}).openssl_3_5;
51+
inherit(import./openssl-matrix.nix{inheritpkgs;})openssl;
5252
}))
5353
//(pkgs.lib.optionalAttrswithTemporal{
5454
inherit(pkgs)temporal_capi;
0 commit comments
Comments
 (0)

, '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
Commit f0140d7
Browse files
aduh95aduh95
committed
tools: store "default" OpenSSL version in openssl-matrix.nix
To help with automating keeping in sync with the bundled version.
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #64962
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 4c8d8af commit f0140d7
4 files changed
Lines changed: 29 additions & 5 deletions
File tree
‎tools/dep_updaters/update-nixpkgs-pin.sh‎
Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,39 @@ TMP_FILE=$(mktemp)
2626
sed "s/$CURRENT_VERSION_SHA1/$NEW_UPSTREAM_SHA1/;s/$CURRENT_TARBALL_HASH/$NEW_TARBALL_HASH/""$NIXPKGS_PIN_FILE">"$TMP_FILE"
2727
mv "$TMP_FILE""$NIXPKGS_PIN_FILE"
2828

29+
# === Update openssl-matrix.nix ===
30+
# When bumping the pin, we want to update the openssl-matrix.nix file to keep the list in sync nixpkgs
31+
# i.e. add newly added release lines, remove newly dropped release lines), and make sure the "openssl"
32+
# attribute still refers to the same release line as the bundled version in deps/openssl/.
33+
34+
OPENSSL_MAJOR=$(awk -F= '/^MAJOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
35+
OPENSSL_MINOR=$(awk -F= '/^MINOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
36+
2937
nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
3038
 let
3139
 pkgs = import <nixpkgs> {};
3240
 opensslAttrs = builtins.filter
3341
 (n: builtins.match \"openssl_[0-9]+(_[0-9]+)?\" n != null)
3442
 (builtins.attrNames pkgs);
3543
 extraMatrixAttrs = [ \"boringssl\" ];
44+
 default = builtins.head (builtins.filter (n:
45+
 let
46+
 inherit (pkgs.lib) versions;
47+
 t = builtins.tryEval pkgs.\${n};
48+
 v = if t.success then builtins.tryEval t.value.version else t;
49+
 majorVersion = pkgs.lib.optionalString v.success (versions.major v.value);
50+
 minorVersion = pkgs.lib.optionalString v.success (versions.minor v.value);
51+
 in
52+
 majorVersion == ''$OPENSSL_MAJOR'' && minorVersion == ''$OPENSSL_MINOR'') opensslAttrs);
3653
 attrs = builtins.filter
3754
 (n:
3855
 let t = builtins.tryEval pkgs.\${n}; in
39-
 t.success && (builtins.tryEval t.value.version).success
56+
n != default && t.success && (builtins.tryEval t.value.version).success
4057
 )
4158
 (opensslAttrs ++ extraMatrixAttrs);
4259
 in
4360
 {
44-
 inherit attrs;
61+
 inherit attrs default;
4562
 permittedInsecurePackages = builtins.map (attr: pkgs.\${attr}.name) (
4663
 builtins.filter (attr: (pkgs.\${attr}.meta.insecure)) attrs
4764
 );
@@ -53,6 +70,10 @@ nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
5370
}:
5471
5572
{
73+
 # "default" OpenSSL release line, should be kept in sync with the bundled version:
74+
 openssl = pkgs.\(.default);
75+
76+
 # Other OpenSSL variants we want to test for:
5677
 inherit (pkgs)
5778
 \(.attrs | sort | join("\n "))
5879
 ;
‎tools/nix/openssl-matrix.nix‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
}:
66

77
{
8+
# "default" OpenSSL release line, should be kept in sync with the bundled version:
9+
openssl=pkgs.openssl_3_5;
10+
11+
# Other OpenSSL variants we want to test for:
812
inherit(pkgs)
913
boringssl
1014
openssl_1_1
1115
openssl_3
12-
openssl_3_5
1316
openssl_3_6
1417
openssl_4_0
1518
;
‎tools/nix/pkcs11.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# pkcs11-provider is dlopen'd into the libcrypto Node.js itself links, so it
1111
# has to be built against that very OpenSSL. SoftHSM links OpenSSL too;
1212
# building it against the same one keeps a single libcrypto in the process.
13-
openssl ? (import./sharedLibDeps.nix{inheritpkgs;}).openssl,
13+
openssl ? (import./openssl-matrix.nix{inheritpkgs;}).openssl,
1414

1515
pin ? "1234",
1616
}:
‎tools/nix/sharedLibDeps.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
ffi=pkgs.libffiReal;
4949
})
5050
//(pkgs.lib.optionalAttrswithSSL({
51-
openssl=(import./openssl-matrix.nix{inheritpkgs;}).openssl_3_5;
51+
inherit(import./openssl-matrix.nix{inheritpkgs;})openssl;
5252
}))
5353
//(pkgs.lib.optionalAttrswithTemporal{
5454
inherit(pkgs)temporal_capi;
0 commit comments
Comments
 (0)

, '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
Commit f0140d7
Browse files
aduh95aduh95
committed
tools: store "default" OpenSSL version in openssl-matrix.nix
To help with automating keeping in sync with the bundled version.
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #64962
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 4c8d8af commit f0140d7
4 files changed
Lines changed: 29 additions & 5 deletions
File tree
‎tools/dep_updaters/update-nixpkgs-pin.sh‎
Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,39 @@ TMP_FILE=$(mktemp)
2626
sed "s/$CURRENT_VERSION_SHA1/$NEW_UPSTREAM_SHA1/;s/$CURRENT_TARBALL_HASH/$NEW_TARBALL_HASH/""$NIXPKGS_PIN_FILE">"$TMP_FILE"
2727
mv "$TMP_FILE""$NIXPKGS_PIN_FILE"
2828

29+
# === Update openssl-matrix.nix ===
30+
# When bumping the pin, we want to update the openssl-matrix.nix file to keep the list in sync nixpkgs
31+
# i.e. add newly added release lines, remove newly dropped release lines), and make sure the "openssl"
32+
# attribute still refers to the same release line as the bundled version in deps/openssl/.
33+
34+
OPENSSL_MAJOR=$(awk -F= '/^MAJOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
35+
OPENSSL_MINOR=$(awk -F= '/^MINOR=[0-9]+$/ { print $2; exit }'"$BASE_DIR/deps/openssl/openssl/VERSION.dat")
36+
2937
nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
3038
 let
3139
 pkgs = import <nixpkgs> {};
3240
 opensslAttrs = builtins.filter
3341
 (n: builtins.match \"openssl_[0-9]+(_[0-9]+)?\" n != null)
3442
 (builtins.attrNames pkgs);
3543
 extraMatrixAttrs = [ \"boringssl\" ];
44+
 default = builtins.head (builtins.filter (n:
45+
 let
46+
 inherit (pkgs.lib) versions;
47+
 t = builtins.tryEval pkgs.\${n};
48+
 v = if t.success then builtins.tryEval t.value.version else t;
49+
 majorVersion = pkgs.lib.optionalString v.success (versions.major v.value);
50+
 minorVersion = pkgs.lib.optionalString v.success (versions.minor v.value);
51+
 in
52+
 majorVersion == ''$OPENSSL_MAJOR'' && minorVersion == ''$OPENSSL_MINOR'') opensslAttrs);
3653
 attrs = builtins.filter
3754
 (n:
3855
 let t = builtins.tryEval pkgs.\${n}; in
39-
 t.success && (builtins.tryEval t.value.version).success
56+
n != default && t.success && (builtins.tryEval t.value.version).success
4057
 )
4158
 (opensslAttrs ++ extraMatrixAttrs);
4259
 in
4360
 {
44-
 inherit attrs;
61+
 inherit attrs default;
4562
 permittedInsecurePackages = builtins.map (attr: pkgs.\${attr}.name) (
4663
 builtins.filter (attr: (pkgs.\${attr}.meta.insecure)) attrs
4764
 );
@@ -53,6 +70,10 @@ nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
5370
}:
5471
5572
{
73+
 # "default" OpenSSL release line, should be kept in sync with the bundled version:
74+
 openssl = pkgs.\(.default);
75+
76+
 # Other OpenSSL variants we want to test for:
5677
 inherit (pkgs)
5778
 \(.attrs | sort | join("\n "))
5879
 ;
‎tools/nix/openssl-matrix.nix‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
}:
66

77
{
8+
# "default" OpenSSL release line, should be kept in sync with the bundled version:
9+
openssl=pkgs.openssl_3_5;
10+
11+
# Other OpenSSL variants we want to test for:
812
inherit(pkgs)
913
boringssl
1014
openssl_1_1
1115
openssl_3
12-
openssl_3_5
1316
openssl_3_6
1417
openssl_4_0
1518
;
‎tools/nix/pkcs11.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# pkcs11-provider is dlopen'd into the libcrypto Node.js itself links, so it
1111
# has to be built against that very OpenSSL. SoftHSM links OpenSSL too;
1212
# building it against the same one keeps a single libcrypto in the process.
13-
openssl ? (import./sharedLibDeps.nix{inheritpkgs;}).openssl,
13+
openssl ? (import./openssl-matrix.nix{inheritpkgs;}).openssl,
1414

1515
pin ? "1234",
1616
}:
‎tools/nix/sharedLibDeps.nix‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
ffi=pkgs.libffiReal;
4949
})
5050
//(pkgs.lib.optionalAttrswithSSL({
51-
openssl=(import./openssl-matrix.nix{inheritpkgs;}).openssl_3_5;
51+
inherit(import./openssl-matrix.nix{inheritpkgs;})openssl;
5252
}))
5353
//(pkgs.lib.optionalAttrswithTemporal{
5454
inherit(pkgs)temporal_capi;
0 commit comments
Comments
 (0)