Unverified Commit 65b8a0dc authored by Yureka's avatar Yureka Committed by GitHub
Browse files

electron_{39,40}: updates, electron_41: init at 41.0.2 (#499678)

parents e363afd3 75f3ff83

pkgs/development/tools/electron/39-angle-patchdir.patch

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

index f5dbe8600f..9e1e5e0704 100644

--- a/patches/config.json

+++ b/patches/config.json

@@ -14,5 +14,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" }

 ]

pkgs/development/tools/electron/41-skia-patchdir.patch

0 → 100644
+12 −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

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

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

 ]

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

+25 −14
Original line number Diff line number Diff line
@@ -23,24 +23,35 @@ 
    },

    "39": {

        "hashes": {

            "aarch64-darwin": "cc1c92a06401d52f1cf90ae7e49427ad9dea30d312d5a716b45244154df63567",

            "aarch64-linux": "0154dfe256dbef46abd34257be10cab37cb4b117a144dbbf73d22159fa28abfb",

            "armv7l-linux": "aa909cf4fbf33353c406e3d8f8850ca59353246ba8d9119b15e00aa8af105113",

            "headers": "1275z4rmfxd7q947ch09wmwhynizfs3q2nn5wgqbm257nyssz7x0",

            "x86_64-darwin": "3653bc907606b45f2a296d4c1f249ec5f85742bfc3f4315de5874b2196e15f9f",

            "x86_64-linux": "de81784fe56041b2a8549d233e2adb8776916c10fa5caa1f2d2e098a2e9b6185"

            "aarch64-darwin": "1910b2b857e0ee6d2ebd57ead75c3ace7d367a6bb9ccd6a48f8d2b23d93ffe67",

            "aarch64-linux": "856848216c549a783b39f8d84dd93668d71da0d804e3bba709265804e5b4ba94",

            "armv7l-linux": "56602fe1579eec07d810389ccf3d10c3d50e994f0319048f4f3057f8b24aa97b",

            "headers": "0pi0nf8dk7sxj2a8k57zmwy39slph8j18icgpkgqyq5pfl5skmci",

            "x86_64-darwin": "9d80221dd2621a9526047be09379e32bbfc9dd57331e41bc0826aadbb69f632a",

            "x86_64-linux": "3977017548b5dfdf78e1342cbe251c7ee7a127e52514903e181fa92143b0fa3a"

        },

        "version": "39.7.0"

        "version": "39.8.2"

    },

    "40": {

        "hashes": {

            "aarch64-darwin": "1882baecdcb4cdedb69e89cadf51fa21c4b3ba87ce0c1cfbffa10234907587cb",

            "aarch64-linux": "55798f7940332aacdac97523dc0ca480e32fa14088f4894d0a4d1bbeabc26d65",

            "armv7l-linux": "7d5e7848cb78659fe51d3996db559a01fbd53d143592158e3a6f774c1a202907",

            "headers": "1f398chh7m54l6vq52wkcml3r71q2w7kaz1kdl1r8w5pish9gk8i",

            "x86_64-darwin": "531e8bf7acb6fc1f3a6a3a8c3501a3563bbfe6bd1d49f02872bca3e71d32054a",

            "x86_64-linux": "08e551dacaa253599ed1e643fbd404d89414cb278c7f96540a71bfcf0d660e07"

        },

        "version": "40.6.1"

            "aarch64-darwin": "fdcd3e3500a09c7191b3e5375f7bf884bde1068b013e9f7786d4572364fadd22",

            "aarch64-linux": "13b4d4b73d1ed96b647e26f5117cd79180db1d8cf3bf344e6c13c506693bf988",

            "armv7l-linux": "af746bd31ef1801eba08cae6935fd6f576262c311d3f641a8accc4c2f0f4b986",

            "headers": "1jrcg0yqbi7xxlk7hanqbxvj2p4d7r2dqikbbawqvb7iakw4m5iv",

            "x86_64-darwin": "96f9f69e6a91dff7defcfe6c6a9ff3d366478dbbb0ae6ff4f74fe779ea1bb893",

            "x86_64-linux": "3eba5cc2ebe1d33395188c22c4b2310658db18699ee55b6a7a003a388321b761"

        },

        "version": "40.8.2"

    },

    "41": {

        "hashes": {

            "aarch64-darwin": "8e18ef53da62bca6132508721c1f94e06b5773b48d366b95e593479892f0a2fe",

            "aarch64-linux": "5eff34c3c28f7a35d8f90ba23b58e5d5125b7f8fb39be12416dc61fe28b24c21",

            "armv7l-linux": "963b9ddbad8f6003807544c485fc548554ced3cfedcf0b8c130ba724b5560952",

            "headers": "0ndgpbszlnimvrmxjwlx15xds9csjsxpi6ix36cfq9dbvr6dn85m",

            "x86_64-darwin": "446bd464236cec71fdfb5562bae5d092cbf27ed5213feac39b7667081578b9c6",

            "x86_64-linux": "9f1f347dc81e94b1207fc6ae4c1f1d189d26d3356da6f99e7e46087c84d28f10"

        },

        "version": "41.0.2"

    }

}

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

+25 −14
Original line number Diff line number Diff line
@@ -23,24 +23,35 @@ 
    },

    "39": {

        "hashes": {

            "aarch64-darwin": "92f384ac74eba40b2090394910a0c8b3373ccbf5e3cfc0ccc72eed97016520ea",

            "aarch64-linux": "58f4328a7cd5a5543374f912d9ceb65390323c92c97e8d04f6b1c1b2f3b538db",

            "armv7l-linux": "2ee72c477e8e5be7e3314ce60f9392c354e972e1ba799195616473248d8a5a38",

            "headers": "1275z4rmfxd7q947ch09wmwhynizfs3q2nn5wgqbm257nyssz7x0",

            "x86_64-darwin": "db83c6321fb82f945d9d135612425d5ec9ebaa1e8de9d33759db73c8027a5851",

            "x86_64-linux": "3252365a3e2dee003da7c29ba6a76fd4b1aa735a510d1f2b8c37256025ecd225"

            "aarch64-darwin": "0f8398b79fb1d6a0036be18c24caef2d48dab9e8980ff6a7f0f658e11df86ca0",

            "aarch64-linux": "45083a530bd03781dd759720519c805c046f392d88e2404268392446f896e265",

            "armv7l-linux": "09a6548e5abc4e1589870031bf35edb00b506da10102bb5d1b52fc069b7c1b34",

            "headers": "0pi0nf8dk7sxj2a8k57zmwy39slph8j18icgpkgqyq5pfl5skmci",

            "x86_64-darwin": "f9995e244e0c703b0c1e06bcad2b1b9feca79d4437901e3b9dfa1f635b03884b",

            "x86_64-linux": "713570bbe7877fa950cbb533197cfb12aa7ff85d4db7e1fc9ad6ac57ca5733c9"

        },

        "version": "39.7.0"

        "version": "39.8.2"

    },

    "40": {

        "hashes": {

            "aarch64-darwin": "663afbd34d0a8e74e1c362c68e26f3c0f72c05ceab595930250470a88b4b45c7",

            "aarch64-linux": "0b7a7f66a8201940bd37e96b51b3e0f538fb4646c15768693e1e0baf3b4392dc",

            "armv7l-linux": "fb3eda5052cd9653f29b980cd524835f299f22b5dbbcf40cc0e1f708f26b0384",

            "headers": "1f398chh7m54l6vq52wkcml3r71q2w7kaz1kdl1r8w5pish9gk8i",

            "x86_64-darwin": "a27f048f9feb2b28a20030f635ffa34c297a560e02a5075e4f7a05662fb68c11",

            "x86_64-linux": "8d93ee3ad02500190c9a9ebbd11c721f2f266498abbe7c2795e645141e726f4f"

        },

        "version": "40.6.1"

            "aarch64-darwin": "9e6e4b4ed6a76dae4528c2d89d7df2dcf6f9c998f87e84fae346006403612448",

            "aarch64-linux": "bff62b17117e6f574067efe776bfb64760a5ec1167e7cd69995cc549778d5c53",

            "armv7l-linux": "87ec532bb5dbec921e8772099b928c2ababb3f07b163c1bcd0c620eab7d4a4b4",

            "headers": "1jrcg0yqbi7xxlk7hanqbxvj2p4d7r2dqikbbawqvb7iakw4m5iv",

            "x86_64-darwin": "f3e196a27eee46e58965747041f1e6ec55ac089a433ed18aa3cebcc0072ae896",

            "x86_64-linux": "7cbc40681c71bbdd56f7f3dd9cbb8912fbffb9044e9e6a2e363583103b26c60f"

        },

        "version": "40.8.2"

    },

    "41": {

        "hashes": {

            "aarch64-darwin": "b24542ea11f192425a8416524bd710cad3e0bf61f4ef6f8e0bb772034f445798",

            "aarch64-linux": "04c82fd4c384197e088921a1fc80d0ecf2e26437c1e61d9d1a448e177fc901bd",

            "armv7l-linux": "d991063e2c9006fe2561b13e267860400958d78a75bb9e1abec7732d215a6996",

            "headers": "0ndgpbszlnimvrmxjwlx15xds9csjsxpi6ix36cfq9dbvr6dn85m",

            "x86_64-darwin": "1b42ad2c246480b994f939ebcda435a48e048bdcda278316c02ed657489ba29e",

            "x86_64-linux": "43c41b02eddc944300c516e218c46a12db924cfa5d9559023085adc3aa18c564"

        },

        "version": "41.0.2"

    }

}

pkgs/development/tools/electron/common.nix

+6 −0
Original line number Diff line number Diff line
@@ -128,6 +128,12 @@ in 
        url = "https://github.com/chromium/chromium/commit/9415f40bc6f853547f791e633be638c71368ce56.patch";

        hash = "sha256-+M4gI77SoQ4dYIe/iGFgIwF1fS/6KQ8s16vj8ht/rik=";

      })

    ]

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

      ./39-angle-patchdir.patch

    ]

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

      ./41-skia-patchdir.patch

    ];



  postPatch = ''