mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-22 08:30:57 +00:00
Merge release-25.11 into staging-next-25.11
This commit is contained in:
@@ -128,7 +128,6 @@
|
||||
"Pandapip1": 45835846,
|
||||
"a-kenji": 65275785,
|
||||
"drakon64": 6444703,
|
||||
"michaelBelsanti": 62124625,
|
||||
"thefossguy": 44400303
|
||||
},
|
||||
"name": "COSMIC"
|
||||
@@ -847,6 +846,18 @@
|
||||
},
|
||||
"name": "Radicle"
|
||||
},
|
||||
"redis": {
|
||||
"description": "Maintain Redis, related packages, module, and tests.",
|
||||
"id": 17932473,
|
||||
"maintainers": {
|
||||
"Hythera": 87016780,
|
||||
"MiniHarinn": 52773156,
|
||||
"debtquity": 225436867,
|
||||
"kybe236": 118068228
|
||||
},
|
||||
"members": {},
|
||||
"name": "Redis"
|
||||
},
|
||||
"reproducible": {
|
||||
"description": "Team that is interested in reproducible builds",
|
||||
"id": 7625643,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,11 +9,11 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "140.11.0esr";
|
||||
version = "140.12.0esr";
|
||||
applicationName = "Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "d06adb3ef4de1324e3d61872d70de31ab08ac013f33903549bed28c6ebcc5b4dee94bb36388282c1935d77d1a564079f3adbf08d6bb80284a899cbb3d861300c";
|
||||
sha512 = "3d598dd964bca074d11b71f84d586811b0a736bdd4d1e6cedb9286c56b1e11584e85ca1d0369c9b2f8d9e4d0eaf014d1b9232a96e71ac25f71fa9ed0807f642d";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "151.0.4";
|
||||
version = "152.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "7df6099411843764321e1480b058530193bf134f590b97aadf053603c356c34599f42d6b83d739c2d6440a78cd81dd0b19fd2ddc2a59746d6bbe7e39f00b7e04";
|
||||
sha512 = "2c7adf367004063ee9f3385e692f612d8e5c0c10662bf294996c118001e43dec12ca8cb4fd70e67a25a903dbf5adf83d22e487f04bf3f930da2a815c80378ceb";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "palemoon-bin";
|
||||
version = "34.3.0";
|
||||
version = "34.3.0.1";
|
||||
|
||||
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
|
||||
|
||||
@@ -171,11 +171,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
{
|
||||
gtk3 = fetchzip {
|
||||
urls = urlRegionVariants "gtk3";
|
||||
hash = "sha256-yoZqZJLxgDIxIeyrn6VW6c6iKpU84ZDsJbCz3yf4gdU=";
|
||||
hash = "sha256-U9OwgiQMVOayt5Krlina2s33wS55HuLN255tkVyQxoY=";
|
||||
};
|
||||
gtk2 = fetchzip {
|
||||
urls = urlRegionVariants "gtk2";
|
||||
hash = "sha256-QhrW1ZD1ouPvWJLvnIEMHgTViGNBshFlT6Ax0l0xGv8=";
|
||||
hash = "sha256-Yzr2ovHKFFNIem1PXTaajlxVKXB5frZQ/kfOL+jsmtE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -327,6 +327,17 @@ buildStdenv.mkDerivation {
|
||||
# https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
|
||||
./139-wayland-drag-animation.patch
|
||||
]
|
||||
# Revert WebAuthn PRF support for security keys, which uses
|
||||
# AuthenticationServices declarations first available in SDK 26.4.
|
||||
++
|
||||
lib.optionals (lib.versionAtLeast version "152" && lib.versionOlder apple-sdk_26.version "26.4")
|
||||
[
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mozilla-firefox/firefox/commit/f93c08b69a84009d794c20ce648605b70beef389.patch";
|
||||
hash = "sha256-/m/y+m/eOe17XRqCIfsFHz3Sp1GT0e/xeKgfBCwlcQo=";
|
||||
revert = true;
|
||||
})
|
||||
]
|
||||
# Revert apple sdk bump to 26.1, 26.2 and 26.4
|
||||
++
|
||||
lib.optionals (lib.versionAtLeast version "151" && lib.versionOlder apple-sdk_26.version "26.4")
|
||||
|
||||
@@ -178,11 +178,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "149.0.7827.114";
|
||||
version = "149.0.7827.155";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-GVvehY+e5thM3nHYMQd/uI8HTnjvL/w8UeRpUWouzlA=";
|
||||
hash = "sha256-g0PHfyCIpOQ2bw3+Tmiu+jt+eTJs0so71+tjxhHwZVY=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -292,11 +292,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "149.0.7827.115";
|
||||
version = "149.0.7827.156";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/ny2unjynyv52nhojnzjueghuma_149.0.7827.115/GoogleChrome-149.0.7827.115.dmg";
|
||||
hash = "sha256-q1jMxveB5FFA+wA5a5mnSPWoQFkNHQ20x51R8A/yUsk=";
|
||||
url = "http://dl.google.com/release2/chrome/acfqxa67egsofsrqnco2a4sd4pta_149.0.7827.156/GoogleChrome-149.0.7827.156.dmg";
|
||||
hash = "sha256-fd7IqNxvaMO28Yhlc4gk8M+P7Sq+ZrplRXbnrxPDcvw=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
120
pkgs/by-name/ra/radarr/deps.json
generated
120
pkgs/by-name/ra/radarr/deps.json
generated
@@ -1,13 +1,13 @@
|
||||
[
|
||||
{
|
||||
"pname": "Azure.Core",
|
||||
"version": "1.47.1",
|
||||
"hash": "sha256-YJR1bDI9H9lr6p/9QcOWEhnpMD8ePyxxO39S32VAOak="
|
||||
"version": "1.50.0",
|
||||
"hash": "sha256-8Pjz0/2wTLK5uY7G5qrxQr4CsmrjiR8gL4g6zJymj5s="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Identity",
|
||||
"version": "1.14.2",
|
||||
"hash": "sha256-PpGcGQrzcEzDtTm65gLmjWrt8yavst4VOKDlr+NuLQo="
|
||||
"version": "1.17.1",
|
||||
"hash": "sha256-pjNnhL/sCFy+BWNMAgj+l6aGoOp4ngrFO/61RIgzBEU="
|
||||
},
|
||||
{
|
||||
"pname": "BouncyCastle.Cryptography",
|
||||
@@ -26,8 +26,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Dapper",
|
||||
"version": "2.1.66",
|
||||
"hash": "sha256-e5n/wnAFGPDSe30oQQ0fanXrvFZYYa+qCDSTHtfQmPw="
|
||||
"version": "2.1.79",
|
||||
"hash": "sha256-QIGZ+vlnwhSl+nnVZ//s3uwFh/vKJ5kDpgGkmpMjhmw="
|
||||
},
|
||||
{
|
||||
"pname": "Diacritical.Net",
|
||||
@@ -111,13 +111,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "IPAddressRange",
|
||||
"version": "6.2.0",
|
||||
"hash": "sha256-g3brzbKKPZS23cbttpr5CCYoZHm+dvH43/gXLuZYmFg="
|
||||
"version": "6.3.0",
|
||||
"hash": "sha256-RM3Bm07HzaKAMY64JiuJ2xCT399Bhj/Asyv1+o3kdNo="
|
||||
},
|
||||
{
|
||||
"pname": "MailKit",
|
||||
"version": "4.15.1",
|
||||
"hash": "sha256-ZI2ASxX1dY53YxWRii0Dow4aojR8VCEWzCWZLrH7wPw="
|
||||
"version": "4.16.0",
|
||||
"hash": "sha256-4yyFxq8pJVTIgAJkyAYcuV2+/ZirENgUSk1OSD/gKIo="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.ApplicationInsights",
|
||||
@@ -126,24 +126,19 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Cryptography.Internal",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-CS/I8fajxwimZC2WNpN5ai/hEVU6Pk4El8hKNr/QgfU="
|
||||
"version": "8.0.27",
|
||||
"hash": "sha256-3GmpnUmBfk45cWCfkoeN+9ANom7LrJsakZvIT8kIagk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Cryptography.KeyDerivation",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-fXjTm7dua1WoGVSkGX6swTFvsNwdhAJvI3Y6onrR3p4="
|
||||
"version": "8.0.27",
|
||||
"hash": "sha256-FGqqp3fruL4r1ImEMcDRqvgl+uxkQqngkRRfXhc7EWI="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.Cryptography",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-p9aO+aVi4Vl8bRsYRFGJyc9Mqd2wkQ12RwWDwBhdt4I="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeCoverage",
|
||||
"version": "17.10.0",
|
||||
@@ -156,8 +151,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Data.SqlClient",
|
||||
"version": "6.1.1",
|
||||
"hash": "sha256-IBVkAipJyF7KO9uid+5QyfVzWEeY/BbQUofKc6zQoW0="
|
||||
"version": "6.1.5",
|
||||
"hash": "sha256-XpGL/oKQWn+FmYNmKB6CMmWbPEuCDX/xdOMqljS0vvs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Data.SqlClient.SNI.runtime",
|
||||
@@ -346,24 +341,24 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Identity.Client",
|
||||
"version": "4.73.1",
|
||||
"hash": "sha256-cd5ArtDvQK4gdX8M0GHQEsCFWlqpdm6lxvaM2yMHkhc="
|
||||
"version": "4.80.0",
|
||||
"hash": "sha256-vtuXCu0ykTYJjvlSSWMjC9EGJQXZ1dqgpaMeD4FmlGQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Identity.Client.Extensions.Msal",
|
||||
"version": "4.73.1",
|
||||
"hash": "sha256-wc4oHBGKCJhAqNIyD4LlugCFvmyiW5iVzGYP88bnWqs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Abstractions",
|
||||
"version": "6.35.0",
|
||||
"hash": "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q="
|
||||
"version": "4.78.0",
|
||||
"hash": "sha256-0s9wa8HkFhnzmAz+TGxtA3qTX3dZiIoPcTWGLgY8mAg="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Abstractions",
|
||||
"version": "7.7.1",
|
||||
"hash": "sha256-v83O6Gb8s4wGhbRPvOA95t0LSX+MAhF6WpA6qZeK2XM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Abstractions",
|
||||
"version": "8.14.0",
|
||||
"hash": "sha256-bkCuz1Wj56N+LHWLvHKLcCtIRqBK+3k5vD2qfB7xXKk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.JsonWebTokens",
|
||||
"version": "7.7.1",
|
||||
@@ -476,8 +471,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "MimeKit",
|
||||
"version": "4.15.1",
|
||||
"hash": "sha256-MI4Wr+JWoxR9wsYhKmW8j1EdJ59W/O4jv5D9Zb8mEUw="
|
||||
"version": "4.16.0",
|
||||
"hash": "sha256-yWGXVm+EHvBSsZlVHdWdD+rVwdf/5hHxsUfJMSd2Afo="
|
||||
},
|
||||
{
|
||||
"pname": "Mono.Nat",
|
||||
@@ -522,23 +517,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "Newtonsoft.Json",
|
||||
"version": "13.0.3",
|
||||
"hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
|
||||
"version": "13.0.4",
|
||||
"hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk="
|
||||
},
|
||||
{
|
||||
"pname": "NLog",
|
||||
"version": "5.4.0",
|
||||
"hash": "sha256-l2R0UHHCL02KPMC96e62AL2ONFD0PAty619y9UnD25A="
|
||||
"version": "5.5.1",
|
||||
"hash": "sha256-cLAAj2QWWhbfh4vgnE/fLq5Rpr3uTe4ufnVWTig0nEo="
|
||||
},
|
||||
{
|
||||
"pname": "NLog.Extensions.Logging",
|
||||
"version": "5.4.0",
|
||||
"hash": "sha256-9pVBguAKnjmbtKM3wBVBEzovXkoEXgqvB4IhiayAkVo="
|
||||
"version": "5.5.0",
|
||||
"hash": "sha256-gdhJP9V5lDHgRS8gpFDgW6CkkLKo+tACCqPvERLaZ68="
|
||||
},
|
||||
{
|
||||
"pname": "NLog.Layouts.ClefJsonLayout",
|
||||
"version": "1.0.3",
|
||||
"hash": "sha256-Rgf3s3Q9TXdzZHwb+VCBupazvmrgAPZcrKGBhV9Jh6Q="
|
||||
"version": "1.0.5",
|
||||
"hash": "sha256-mBHH0OlpW0dCa34jI2xBTg1J7EDfmNJqjdRJOA3khWQ="
|
||||
},
|
||||
{
|
||||
"pname": "NLog.Targets.Syslog",
|
||||
@@ -552,8 +547,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Npgsql",
|
||||
"version": "9.0.3",
|
||||
"hash": "sha256-X3F05GNj3vNVl++VOV5TMYE5dvEe6cx0k+5yWo2Q/+o="
|
||||
"version": "9.0.5",
|
||||
"hash": "sha256-5AF0qiVQwfKUqCXSFb+oJhe3Q1wwK9F9+Q9/A4RTIdo="
|
||||
},
|
||||
{
|
||||
"pname": "NUnit",
|
||||
@@ -572,8 +567,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Polly",
|
||||
"version": "8.6.0",
|
||||
"hash": "sha256-wlvYcfcOExa3LopwRFO4axW682jkUZvioHe+kznspHk="
|
||||
"version": "8.6.6",
|
||||
"hash": "sha256-0BrOttCw+HQYB24Y2uMy2vo0P5/txUlhELC8FlyLKps="
|
||||
},
|
||||
{
|
||||
"pname": "Polly.Contrib.WaitAndRetry",
|
||||
@@ -582,8 +577,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Polly.Core",
|
||||
"version": "8.6.0",
|
||||
"hash": "sha256-NEGMMQ+3+i4ytsGekKfP1trUe0mRZP7MV0eBiSFXHW8="
|
||||
"version": "8.6.6",
|
||||
"hash": "sha256-y6/a4OWrUlRfe0J8qdhBRmYRDi6K2y+kwhEVCIUOjvU="
|
||||
},
|
||||
{
|
||||
"pname": "RestSharp",
|
||||
@@ -829,8 +824,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "SourceGear.sqlite3",
|
||||
"version": "3.50.4.2",
|
||||
"hash": "sha256-NsahZ3lW1JYXMq4NOH5nM/EhdjV05sbrhjsGNIinb+M="
|
||||
"version": "3.50.4.5",
|
||||
"hash": "sha256-yPOyLiK4QoTfE3IED0hFl1JJYjmt8RBB3fp1a1CwvqE="
|
||||
},
|
||||
{
|
||||
"pname": "Swashbuckle.AspNetCore.Annotations",
|
||||
@@ -859,8 +854,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.ClientModel",
|
||||
"version": "1.5.1",
|
||||
"hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow="
|
||||
"version": "1.8.0",
|
||||
"hash": "sha256-ZWVhuw3IRk9rZXkXERhesEET2KMMzHjUH/HDI288WK8="
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections",
|
||||
@@ -899,8 +894,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Data.SQLite",
|
||||
"version": "2.0.2",
|
||||
"hash": "sha256-s++mcixhc+QaQKzdXZ6quK8kH5WWWmU0mESZNNuP/ck="
|
||||
"version": "2.0.3",
|
||||
"hash": "sha256-2TzEFt0nJjK1g8Gi5RMII7TOpG4vi9UzvJI3JxuPnKA="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.Debug",
|
||||
@@ -919,8 +914,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.DiagnosticSource",
|
||||
"version": "6.0.1",
|
||||
"hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="
|
||||
"version": "8.0.1",
|
||||
"hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.EventLog",
|
||||
@@ -944,8 +939,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Drawing.Common",
|
||||
"version": "8.0.20",
|
||||
"hash": "sha256-+NEKutfbGO9q1Yig45K1X8n/+gEZOQYNGlXRhbexvzA="
|
||||
"version": "8.0.27",
|
||||
"hash": "sha256-lxN0ZYNBAHdT0x45JuNSJ2L2uBdruqsDCAT4KVrmejs="
|
||||
},
|
||||
{
|
||||
"pname": "System.Formats.Asn1",
|
||||
@@ -1107,11 +1102,6 @@
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.CompilerServices.Unsafe",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.Extensions",
|
||||
"version": "4.3.0",
|
||||
@@ -1244,8 +1234,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "8.0.5",
|
||||
"hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
|
||||
"version": "8.0.6",
|
||||
"hash": "sha256-qD3WF3jQO9+TLuBWwJhz3iKDArJqcRiy7EdrCQhrtes="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.RegularExpressions",
|
||||
@@ -1284,8 +1274,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.ValueTuple",
|
||||
"version": "4.6.1",
|
||||
"hash": "sha256-Hb87MPcNdHQRlREDzFEKU8ZqtKN26bjyAiimJmm6LWI="
|
||||
"version": "4.6.2",
|
||||
"hash": "sha256-dv0ONmorkGVf0V1Vewt5UEGXdINYy1eP4xk/bZe92ao="
|
||||
},
|
||||
{
|
||||
"pname": "System.Xml.ReaderWriter",
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
applyPatches,
|
||||
}:
|
||||
let
|
||||
version = "6.1.1.10360";
|
||||
version = "6.2.1.10461";
|
||||
# The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
|
||||
# the already patched lockfile to `fetchYarnDeps`.
|
||||
src = applyPatches {
|
||||
@@ -29,7 +29,7 @@ let
|
||||
owner = "Radarr";
|
||||
repo = "Radarr";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-AtvuZFAF+KJmEp46KWrA9qHv3+IejSXxUyol2W8BWdk=";
|
||||
hash = "sha256-gDEMahF0uhwlOisD0gWzY3M17mXftKBm9gN5Uaatqsk=";
|
||||
};
|
||||
postPatch = ''
|
||||
mv src/NuGet.config NuGet.Config
|
||||
@@ -67,7 +67,7 @@ buildDotnetModule {
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-Ng7ZsUfGBKtNktJeuI4Q6+tMN2ZPj+pVSQ+0Ssy5gRc=";
|
||||
hash = "sha256-FrYvTYSxUDP68a4n0isEaHxRNFL25N3LNQJVFBOLdyE=";
|
||||
};
|
||||
|
||||
ffprobe = lib.optionalDrvAttr withFFmpeg (lib.getExe' servarr-ffmpeg "ffprobe");
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 95734ddc06af1e98a0a6165d382c353c423c6e63 Mon Sep 17 00:00:00 2001
|
||||
From: "tsrk." <tsrk@tsrk.me>
|
||||
Date: Sun, 24 May 2026 05:14:44 +0200
|
||||
Subject: [PATCH 4/4] Upgrade Electron 14 to force removal of remote module
|
||||
Cc: Freya Murphy <freya@freyacat.org>
|
||||
|
||||
Signed-off-by: tsrk. <tsrk@tsrk.me>
|
||||
---
|
||||
package.json | 2 +-
|
||||
src/background.js | 1 -
|
||||
2 files changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/package.json b/package.json
|
||||
index 54a0ec9..9404be1 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -80,7 +80,7 @@
|
||||
"acorn": "^8",
|
||||
"babel-loader": "^8.1.2",
|
||||
"css-loader": "^3.5",
|
||||
- "electron": "^9.0.0",
|
||||
+ "electron": "^14.2.9",
|
||||
"electron-builder-squirrel-windows": "24.13.3",
|
||||
"electron-devtools-assembler": "^1.2.0",
|
||||
"electron-icon-builder": "^1.0.2",
|
||||
diff --git a/src/background.js b/src/background.js
|
||||
index 6fa2256..3a4b6d7 100644
|
||||
--- a/src/background.js
|
||||
+++ b/src/background.js
|
||||
@@ -750,7 +750,6 @@ async function createWindow () {
|
||||
// MOD: disable isolation to get
|
||||
// collection to work with electron 35
|
||||
contextIsolation: false,
|
||||
- enableRemoteModule: true,
|
||||
plugins: true,
|
||||
webviewTag: true
|
||||
}
|
||||
--
|
||||
2.51.2
|
||||
|
||||
@@ -31,11 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
./0002-disable-update-check.patch
|
||||
./0003-make-compatible-with-native-electron.patch
|
||||
./0004-Upgrade-Electron-14-to-force-removal-of-remote-module.patch
|
||||
];
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-mo5Ir/pLoqc6K/0AOJqKC0yup7vx9UrNfQ+casIgBCo=";
|
||||
yarnLock = ./yarn.lock;
|
||||
hash = "sha256-CKWFtIZBASGx/1tBR8n7aKPqfj4P9dCAPIzee/DIOP8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -49,6 +50,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
# Replace lockfile with our own (sync offline cache)
|
||||
cp -f ${./yarn.lock} yarn.lock
|
||||
|
||||
# setup yarn
|
||||
fixup-yarn-lock yarn.lock
|
||||
yarn config --offline set ignore-engines true
|
||||
|
||||
15326
pkgs/by-name/un/unofficial-homestuck-collection/yarn.lock
Normal file
15326
pkgs/by-name/un/unofficial-homestuck-collection/yarn.lock
Normal file
File diff suppressed because it is too large
Load Diff
@@ -27,9 +27,9 @@ let
|
||||
"20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
|
||||
"21.1.7".officialRelease.sha256 = "sha256-SaRJ7+iZMhhBdcUDuJpMAY4REQVhrvYMqI2aq3Kz08o=";
|
||||
"23.0.0-git".gitRelease = {
|
||||
rev = "47ef7495ad781b742a0c4435ca72590d297ba8bf";
|
||||
rev-version = "23.0.0-unstable-2026-06-07";
|
||||
sha256 = "sha256-5x3wvNti/OCmdam0tUmkiiq/ONn23m4mcTh491hWLVA=";
|
||||
rev = "625facd4375f6bfa5de501d0559bd262062e2dc3";
|
||||
rev-version = "23.0.0-unstable-2026-06-14";
|
||||
sha256 = "sha256-myNSe9+nBTd28BnEmq+Ysp0kiY6KtOJSmbnGjQgGxRI=";
|
||||
};
|
||||
}
|
||||
// llvmVersions;
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
|
||||
|
||||
import ./generic.nix {
|
||||
version = "3.124";
|
||||
hash = "sha256-bMUMyb/4qkiucbkvzSY5aNS3nfaJ4XWyqf2lKnVmXfU=";
|
||||
version = "3.125";
|
||||
hash = "sha256-pIRoFJYsQZzI+hJcNzTX+WT91tfXDygWE0RrirfyBPc=";
|
||||
filename = "latest.nix";
|
||||
versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user