mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-21 08:01:31 +00:00
electron-source.electron_40: remove, electron_40-bin: mark as insecure (#537854)
This commit is contained in:
@@ -1,13 +0,0 @@
|
||||
diff --git a/electron/patches/config.json b/electron/patches/config.json
|
||||
index f5dbe8600f..9e1e5e0704 100644
|
||||
--- a/electron/patches/config.json
|
||||
+++ b/electron/patches/config.json
|
||||
@@ -15,5 +15,5 @@
|
||||
{ "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
|
||||
{ "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
|
||||
{ "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
|
||||
- { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" },
|
||||
+ { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" },
|
||||
{ "patch_dir": "src/electron/patches/pdfium", "repo": "src/third_party/pdfium" },
|
||||
{ "patch_dir": "src/electron/patches/libaom", "repo": "src/third_party/libaom/source/libaom" }
|
||||
]
|
||||
@@ -61,7 +61,7 @@ let
|
||||
];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
# https://www.electronjs.org/docs/latest/tutorial/electron-timelines
|
||||
knownVulnerabilities = lib.optional (lib.versionOlder version "40.0.0") "Electron version ${version} is EOL";
|
||||
knownVulnerabilities = lib.optional (lib.versionOlder version "41.0.0") "Electron version ${version} is EOL";
|
||||
};
|
||||
|
||||
fetcher =
|
||||
|
||||
@@ -106,12 +106,6 @@ in
|
||||
|
||||
src = null;
|
||||
|
||||
patches =
|
||||
base.patches
|
||||
++ lib.optionals (lib.versions.major info.version == "40") [
|
||||
./40-angle-patchdir.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p third_party/jdk/current/bin
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -4858,10 +4858,7 @@ with pkgs;
|
||||
in
|
||||
{
|
||||
electron_39 = electron_39-bin;
|
||||
electron_40 = getElectronPkg {
|
||||
src = electron-source.electron_40;
|
||||
bin = electron_40-bin;
|
||||
};
|
||||
electron_40 = electron_40-bin;
|
||||
electron_41 = getElectronPkg {
|
||||
src = electron-source.electron_41;
|
||||
bin = electron_41-bin;
|
||||
|
||||
Reference in New Issue
Block a user