Unverified Commit 0f4c38fd authored by Jhonas Wernery's avatar Jhonas Wernery Committed by GitHub
Browse files

electron-{source,bin,chromedriver}: updates (#501579)

parents 0818a636 889f33c9

pkgs/development/tools/electron/41-skia-patchdir.patch→pkgs/development/tools/electron/40-angle-patchdir.patch

+11 −0
Original line number Diff line number Diff line 
diff --git a/electron/patches/config.json b/electron/patches/config.json

index ed42ff8123..7af1c839cc 100644

index f5dbe8600f..9e1e5e0704 100644

--- a/electron/patches/config.json

+++ b/electron/patches/config.json

@@ -12,6 +12,6 @@

   { "patch_dir": "src/electron/patches/ReactiveObjC", "repo": "src/third_party/squirrel.mac/vendor/ReactiveObjC" },

   { "patch_dir": "src/electron/patches/webrtc", "repo": "src/third_party/webrtc" },

@@ -15,5 +15,5 @@

   { "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },

-  { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia/src" },

+  { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },

   { "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" }

   { "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" }

 ]

pkgs/development/tools/electron/binary/info.json

+20 −20
Original line number Diff line number Diff line
@@ -12,35 +12,35 @@ 
    },

    "39": {

        "hashes": {

            "aarch64-darwin": "1910b2b857e0ee6d2ebd57ead75c3ace7d367a6bb9ccd6a48f8d2b23d93ffe67",

            "aarch64-linux": "856848216c549a783b39f8d84dd93668d71da0d804e3bba709265804e5b4ba94",

            "armv7l-linux": "56602fe1579eec07d810389ccf3d10c3d50e994f0319048f4f3057f8b24aa97b",

            "headers": "0pi0nf8dk7sxj2a8k57zmwy39slph8j18icgpkgqyq5pfl5skmci",

            "x86_64-darwin": "9d80221dd2621a9526047be09379e32bbfc9dd57331e41bc0826aadbb69f632a",

            "x86_64-linux": "3977017548b5dfdf78e1342cbe251c7ee7a127e52514903e181fa92143b0fa3a"

            "aarch64-darwin": "86fa117ba10e36149ca33d7c22de2cfc3fb7490ca88b07ce953d2efe1f2a41cd",

            "aarch64-linux": "fd721650a0e25829b76d307e944383be828533cdddd53e44a0b772e96e3e019b",

            "armv7l-linux": "5d0a75a53cdba1ecfc678910084802fe500f13f470310ae1d2c66840d3c7390b",

            "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",

            "x86_64-darwin": "5dfe5559fd283c3962221c674b30a5b986895b644b1b4bc179e0c7673a14f1cf",

            "x86_64-linux": "233b2775f1c46e5ebd5afeb4fb95ce9fda61229bad20aef1031468eb54b3656e"

        },

        "version": "39.8.2"

        "version": "39.8.7"

    },

    "40": {

        "hashes": {

            "aarch64-darwin": "fdcd3e3500a09c7191b3e5375f7bf884bde1068b013e9f7786d4572364fadd22",

            "aarch64-linux": "13b4d4b73d1ed96b647e26f5117cd79180db1d8cf3bf344e6c13c506693bf988",

            "armv7l-linux": "af746bd31ef1801eba08cae6935fd6f576262c311d3f641a8accc4c2f0f4b986",

            "aarch64-darwin": "7a400c28aeba7bdf691ff03d2a620b76c7f8c75fdfac1f4543a8dc13b039fa24",

            "aarch64-linux": "5af0073c52a8dc729e118340b5f50c4b2932bd94ba992e1c5380fe1545330373",

            "armv7l-linux": "8f65d16758cdec2d4474732fb60e1f28e1829b4ee7ba67fcb9b5b6510652e667",

            "headers": "1jrcg0yqbi7xxlk7hanqbxvj2p4d7r2dqikbbawqvb7iakw4m5iv",

            "x86_64-darwin": "96f9f69e6a91dff7defcfe6c6a9ff3d366478dbbb0ae6ff4f74fe779ea1bb893",

            "x86_64-linux": "3eba5cc2ebe1d33395188c22c4b2310658db18699ee55b6a7a003a388321b761"

            "x86_64-darwin": "2600d89b2ffa452bb5dc2fe11f0f7719ae001273f6f6c68988140986e5f95508",

            "x86_64-linux": "3bce6ee4e4e481f7ce6d0be384f6c539ce16e0b9b7f46115aec6516770f6c26d"

        },

        "version": "40.8.2"

        "version": "40.8.5"

    },

    "41": {

        "hashes": {

            "aarch64-darwin": "8e18ef53da62bca6132508721c1f94e06b5773b48d366b95e593479892f0a2fe",

            "aarch64-linux": "5eff34c3c28f7a35d8f90ba23b58e5d5125b7f8fb39be12416dc61fe28b24c21",

            "armv7l-linux": "963b9ddbad8f6003807544c485fc548554ced3cfedcf0b8c130ba724b5560952",

            "headers": "0ndgpbszlnimvrmxjwlx15xds9csjsxpi6ix36cfq9dbvr6dn85m",

            "x86_64-darwin": "446bd464236cec71fdfb5562bae5d092cbf27ed5213feac39b7667081578b9c6",

            "x86_64-linux": "9f1f347dc81e94b1207fc6ae4c1f1d189d26d3356da6f99e7e46087c84d28f10"

            "aarch64-darwin": "e018684f96c873415fbea4713fc7db96b6d1e2bd3db4513e2b8c1887ec83a719",

            "aarch64-linux": "f8983c877df8f2b93c76d35e45af9df82c9eb5f294b183f8fe5930e5155fdc4e",

            "armv7l-linux": "71e8db75ab19d3c403c5476fdec120bbd19750b0c4cbe9086ff729e0e0c712c4",

            "headers": "0620qjyndlq9kg9ypr9l7l97bd6z5fxx5sa2am0nh7z4cxvx5rz7",

            "x86_64-darwin": "fb3750bcfccc0146065708bf065288252da02489d51414a6d5b77d04f94a3f2a",

            "x86_64-linux": "fb0b31f5bb2b248d571c08ab57437c08a69b57f63ccdf9e55d6692b6132848d4"

        },

        "version": "41.0.2"

        "version": "41.2.0"

    }

}

pkgs/development/tools/electron/chromedriver/info.json

+20 −20
Original line number Diff line number Diff line
@@ -12,35 +12,35 @@ 
    },

    "39": {

        "hashes": {

            "aarch64-darwin": "0f8398b79fb1d6a0036be18c24caef2d48dab9e8980ff6a7f0f658e11df86ca0",

            "aarch64-linux": "45083a530bd03781dd759720519c805c046f392d88e2404268392446f896e265",

            "armv7l-linux": "09a6548e5abc4e1589870031bf35edb00b506da10102bb5d1b52fc069b7c1b34",

            "headers": "0pi0nf8dk7sxj2a8k57zmwy39slph8j18icgpkgqyq5pfl5skmci",

            "x86_64-darwin": "f9995e244e0c703b0c1e06bcad2b1b9feca79d4437901e3b9dfa1f635b03884b",

            "x86_64-linux": "713570bbe7877fa950cbb533197cfb12aa7ff85d4db7e1fc9ad6ac57ca5733c9"

            "aarch64-darwin": "2e2a3533f9969ded3b11eb0baa5357abeb652975d9bcaea0b0725c9bd0866061",

            "aarch64-linux": "a8caf72372eb47deb336dc440eb183c30d228b3fef5349dac7571d86103f117c",

            "armv7l-linux": "5d5f02b2e28e8328435d2fd83207098e69dc3e5fecbbbdc2612792370ab2c4ec",

            "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",

            "x86_64-darwin": "c74882bcbdd53f6e8cd65906809ac446bb032dce3ce8f109e2376d49b9b394ee",

            "x86_64-linux": "e336dc2dce9d11d44f6eb5b5cc655d3311a9a109ea184625da3ac51181c3ad27"

        },

        "version": "39.8.2"

        "version": "39.8.7"

    },

    "40": {

        "hashes": {

            "aarch64-darwin": "9e6e4b4ed6a76dae4528c2d89d7df2dcf6f9c998f87e84fae346006403612448",

            "aarch64-linux": "bff62b17117e6f574067efe776bfb64760a5ec1167e7cd69995cc549778d5c53",

            "armv7l-linux": "87ec532bb5dbec921e8772099b928c2ababb3f07b163c1bcd0c620eab7d4a4b4",

            "aarch64-darwin": "60a199b111b7cb032f6400371064cfa75457c13fd1699aa25dae2ca780e10b63",

            "aarch64-linux": "6dec383c6f0779daffdd7b8e106d7a4261bc798acf7c250195a98de79f0e92d5",

            "armv7l-linux": "57304ae9d455ba9be1fc079138ccaa1c4f168dece10aec970477beea7b92270f",

            "headers": "1jrcg0yqbi7xxlk7hanqbxvj2p4d7r2dqikbbawqvb7iakw4m5iv",

            "x86_64-darwin": "f3e196a27eee46e58965747041f1e6ec55ac089a433ed18aa3cebcc0072ae896",

            "x86_64-linux": "7cbc40681c71bbdd56f7f3dd9cbb8912fbffb9044e9e6a2e363583103b26c60f"

            "x86_64-darwin": "6e774f3ae2d69accc3745e09f39fce6dc18d7cbe63e2698dfb7f36a2881b2f05",

            "x86_64-linux": "804d1cd1c20c44691e071a2f9a25e42cfd28f4ccfd4368552072e37ad18ad807"

        },

        "version": "40.8.2"

        "version": "40.8.5"

    },

    "41": {

        "hashes": {

            "aarch64-darwin": "b24542ea11f192425a8416524bd710cad3e0bf61f4ef6f8e0bb772034f445798",

            "aarch64-linux": "04c82fd4c384197e088921a1fc80d0ecf2e26437c1e61d9d1a448e177fc901bd",

            "armv7l-linux": "d991063e2c9006fe2561b13e267860400958d78a75bb9e1abec7732d215a6996",

            "headers": "0ndgpbszlnimvrmxjwlx15xds9csjsxpi6ix36cfq9dbvr6dn85m",

            "x86_64-darwin": "1b42ad2c246480b994f939ebcda435a48e048bdcda278316c02ed657489ba29e",

            "x86_64-linux": "43c41b02eddc944300c516e218c46a12db924cfa5d9559023085adc3aa18c564"

            "aarch64-darwin": "9f8e18fec80a8a93d123549e379f1524c61bdd7c005d90a4df02a5aa5c9b779b",

            "aarch64-linux": "83c9570411fb2ed83548b08b1a95928a3828ecb5f8a5f7c862f4188611420614",

            "armv7l-linux": "217ffd04268cd8f459e1f6be0cd81431f45a04af3175073e0e56a4f15068e372",

            "headers": "0620qjyndlq9kg9ypr9l7l97bd6z5fxx5sa2am0nh7z4cxvx5rz7",

            "x86_64-darwin": "9e7fc8ded16d5f4c82373a4b048d48beec8529b6126bad188f08fc7923f8b40d",

            "x86_64-linux": "84009c924c7e5feabee8066f7dbf54abf1997d033d9156a6a36e3b8cf9f0b148"

        },

        "version": "41.0.2"

        "version": "41.2.0"

    }

}

pkgs/development/tools/electron/common.nix

+2 −2
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ in 
    ++ lib.optionals (lib.versions.major info.version == "39") [

      ./39-angle-patchdir.patch

    ]

    ++ lib.optionals (lib.versions.major info.version == "41") [

      ./41-skia-patchdir.patch

    ++ lib.optionals (lib.versions.major info.version == "40") [

      ./40-angle-patchdir.patch

    ];



  postPatch = ''

pkgs/development/tools/electron/info.json

+31 −31
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ 
            },

            "src/electron": {

                "args": {

                    "hash": "sha256-RveQxDKnvEMdijWO1w3qVME64bc/EPosyv5qS1BUQTc=",

                    "hash": "sha256-RrqxAum+OEmuh/f2PfPFDulmU3LhTqUtwww8Nb+F7NI=",

                    "owner": "electron",

                    "repo": "electron",

                    "tag": "v39.8.2"

                    "tag": "v39.8.7"

                },

                "fetcher": "fetchFromGitHub"

            },
@@ -1342,10 +1342,10 @@ 
                "fetcher": "fetchFromGitiles"

            }

        },

        "electron_yarn_hash": "sha256-l24z99s6gwdwkAnFex/tFxLpOlN72SS0j1rWP0V3LmA=",

        "electron_yarn_hash": "sha256-HCnJJqfgcilB+Cl2OaezL9Uu1xk0ZBdVEXg2VDR1dwU=",

        "modules": "140",

        "node": "22.22.1",

        "version": "39.8.2"

        "version": "39.8.7"

    },

    "40": {

        "chrome": "144.0.7559.236",
@@ -1404,10 +1404,10 @@ 
            },

            "src/electron": {

                "args": {

                    "hash": "sha256-ft8q4spa4DiNH+rinT83KZHENA1gFHA0L8fLq+uO2MY=",

                    "hash": "sha256-Uvgjmq/xfD1IjYMC2CSmNHGWtsV9V2RJmtKhhRKITyM=",

                    "owner": "electron",

                    "repo": "electron",

                    "tag": "v40.8.2"

                    "tag": "v40.8.5"

                },

                "fetcher": "fetchFromGitHub"

            },
@@ -2693,10 +2693,10 @@ 
        "electron_yarn_hash": "sha256-+7UFFBC4awv3Eg7aB5fKgIysAA2QIpds7s7xN2DuoP8=",

        "modules": "143",

        "node": "24.14.0",

        "version": "40.8.2"

        "version": "40.8.5"

    },

    "41": {

        "chrome": "146.0.7680.72",

        "chrome": "146.0.7680.179",

        "chromium": {

            "deps": {

                "gn": {
@@ -2705,15 +2705,15 @@ 
                    "version": "0-unstable-2026-02-05"

                }

            },

            "version": "146.0.7680.72"

            "version": "146.0.7680.179"

        },

        "chromium_npm_hash": "sha256-ByB1Ea5tduIJZXyydeBWsoS8OPABOgwHe+dNXRssdvc=",

        "deps": {

            "src": {

                "args": {

                    "hash": "sha256-+McF03H5tyxItoSfqFpaRO/nSx6T4rjOmoHaGgkaS4s=",

                    "hash": "sha256-HTeAvITnXbFdNiKmXWlOPfWFRjJ1ES2QkY5LjwX4OII=",

                    "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",

                    "tag": "146.0.7680.72",

                    "tag": "146.0.7680.179",

                    "url": "https://chromium.googlesource.com/chromium/src.git"

                },

                "fetcher": "fetchFromGitiles"
@@ -2752,10 +2752,10 @@ 
            },

            "src/electron": {

                "args": {

                    "hash": "sha256-Bto47eWPdteTsKKrVtH6e0dI303cRbaaev3Hd2+m2nA=",

                    "hash": "sha256-Pt/BZVy3kSREabV0LvLAQN5D2v2GHBvnRKUuZ9DIQ+Y=",

                    "owner": "electron",

                    "repo": "electron",

                    "tag": "v41.0.2"

                    "tag": "v41.2.0"

                },

                "fetcher": "fetchFromGitHub"

            },
@@ -2785,8 +2785,8 @@ 
            },

            "src/third_party/angle": {

                "args": {

                    "hash": "sha256-QVtTxBBox8fiqTj0gjqvYx6HoBSlvuWIe5ki4iCQl08=",

                    "rev": "1d3190bf5633327395d694d621258978d989dffd",

                    "hash": "sha256-9Me/9kdDgcDLGP/0lLWpj294IoUp0hDD5hfFjSZbTOc=",

                    "rev": "1c0f91aaa60a1f87725840495cbfd9717e7c77c8",

                    "url": "https://chromium.googlesource.com/angle/angle.git"

                },

                "fetcher": "fetchFromGitiles"
@@ -2977,8 +2977,8 @@ 
            },

            "src/third_party/dawn": {

                "args": {

                    "hash": "sha256-Duv3kNulPtVxCLPa3bFIev64O9Y4ObJP/IZz31oPJ0E=",

                    "rev": "c46c81b25577c40de6e7e510743ae0454e0c8351",

                    "hash": "sha256-ATTNb61RG7hS1mapDw0o4ZyBeny4ONI8ZjJLpmbQaKU=",

                    "rev": "10fb89e3179bb7443e66911eb3c795c7aaf022e5",

                    "url": "https://dawn.googlesource.com/dawn.git"

                },

                "fetcher": "fetchFromGitiles"
@@ -3243,8 +3243,8 @@ 
            },

            "src/third_party/harfbuzz-ng/src": {

                "args": {

                    "hash": "sha256-pXAQYEotsqZmfaJSQFaJmZAQVzUiNrHw52z0vmbxQRQ=",

                    "rev": "fa2908bf16d2ccd6623f4d575455fea72a1a722b",

                    "hash": "sha256-2utl+HNeomIpdqS3hsYZveFfZ+ksMGRvgCaH3WVvsFw=",

                    "rev": "c24f6a29e5912332e269891fbdb1ac771d543a08",

                    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"

                },

                "fetcher": "fetchFromGitiles"
@@ -3347,8 +3347,8 @@ 
            },

            "src/third_party/libaom/source/libaom": {

                "args": {

                    "hash": "sha256-RuCmzPIR6hW8znjQH4kQqSJmIIJWtMkUQjYEVn3B9AE=",

                    "rev": "4018d3b63456eb657475e66c352bfa86f321e0f5",

                    "hash": "sha256-hLddZzWBQZ/MEF5fcCiju5ibNPSb+zhahlxdLaczdsE=",

                    "rev": "446588f90da2e3372a9352d3b2ba8ab3f342c8ce",

                    "url": "https://aomedia.googlesource.com/aom.git"

                },

                "fetcher": "fetchFromGitiles"
@@ -3628,8 +3628,8 @@ 
            },

            "src/third_party/pdfium": {

                "args": {

                    "hash": "sha256-jMoYwf63C0IHx/QcOT+LKCCYN3dJVUhC5COukkhwqx0=",

                    "rev": "67cf48602b0c8aaa9807cd185212ee078eb30b21",

                    "hash": "sha256-yfjXNWczeGwPlnAVB161OsFXiHms2IRstqKmoZ/AWFU=",

                    "rev": "bccc616f83aaed08f65d4a707dfe00e24133772b",

                    "url": "https://pdfium.googlesource.com/pdfium.git"

                },

                "fetcher": "fetchFromGitiles"
@@ -3724,8 +3724,8 @@ 
            },

            "src/third_party/skia": {

                "args": {

                    "hash": "sha256-RoLgaE5mj9UqePhnfH+BOTit04TyiAvgF7/2PLuBG4Y=",

                    "rev": "50841da4a7b7064b3cea8a851e60ef921c87a103",

                    "hash": "sha256-2/Deen9OwDgDRrm5j7Rw27Z2JUX1thX7mnKWRLJbEvM=",

                    "rev": "30d129c8800b5626c46fb83fa62db10b9b22b319",

                    "url": "https://skia.googlesource.com/skia.git"

                },

                "fetcher": "fetchFromGitiles"
@@ -3999,8 +3999,8 @@ 
            },

            "src/third_party/webrtc": {

                "args": {

                    "hash": "sha256-evtOzxwWgKUaJl9zwpQDqPp1wM7w3DzjRcLg29z9ELQ=",

                    "rev": "d1972add2a63b2a528a6471d447f82e0010b5215",

                    "hash": "sha256-g2GYFVTK8f296v7lUcYPqkI4qDoladsTpnKWb6SGRmw=",

                    "rev": "6733aa5ba16e1e1087f339d1151c80c924a6fbf8",

                    "url": "https://webrtc.googlesource.com/src.git"

                },

                "fetcher": "fetchFromGitiles"
@@ -4047,16 +4047,16 @@ 
            },

            "src/v8": {

                "args": {

                    "hash": "sha256-dsjddO/LCNAYLJ1XyDkJLJ9TToiy7pENlBryF1VcmtY=",

                    "rev": "bc343986bd4cb17e49ef15b70c4bdac710e27167",

                    "hash": "sha256-nG4goqqVAAWPMkq8296wCYhnwL93oAL+pF1oaMXyqZI=",

                    "rev": "0ad812d268a7820dba9bf848b416aeda4dd1b2e5",

                    "url": "https://chromium.googlesource.com/v8/v8.git"

                },

                "fetcher": "fetchFromGitiles"

            }

        },

        "electron_yarn_hash": "sha256-yZJjsVx1dvxj0X08n5kO8F2FWYIndbJ+ZiNIXTxsgEw=",

        "electron_yarn_hash": "sha256-tPI7O7xlvDjU5+krILVB6JhLpftMq4Bn8+KIKMjBVgA=",

        "modules": "145",

        "node": "24.14.0",

        "version": "41.0.2"

        "version": "41.2.0"

    }

}