diff options
Diffstat (limited to 'pkgs/development/tools/electron')
-rw-r--r-- | pkgs/development/tools/electron/binary/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/electron/binary/info.json | 42 | ||||
-rw-r--r-- | pkgs/development/tools/electron/chromedriver/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/electron/chromedriver/info.json | 14 | ||||
-rw-r--r-- | pkgs/development/tools/electron/info.json | 42 | ||||
-rwxr-xr-x | pkgs/development/tools/electron/update.py | 1 |
6 files changed, 51 insertions, 52 deletions
diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 60255d21bcb1..39f1d1011b33 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -166,5 +166,5 @@ in stdenv.mkDerivation (finalAttrs: lib.recursiveUpdate (common stdenv.hostPlatform) - ((if stdenv.isDarwin then darwin else linux) finalAttrs) + ((if stdenv.hostPlatform.isDarwin then darwin else linux) finalAttrs) ) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 8aa43f8213e5..a51217873b5b 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -45,35 +45,35 @@ }, "30": { "hashes": { - "aarch64-darwin": "2238c45a85b2c78aed00aeaf15bbfa2f64b4d13e48cc6b9bc330f24c4d214595", - "aarch64-linux": "aa422122373b84f4eb8ce937937b1b6fe8fb3975c3edafb9df85f7fba449afd4", - "armv7l-linux": "3643857e1eec3037ad6f07e755bffc64f033a7196307ff0386bf67c9cc3ec31e", - "headers": "1zpl51g8d0j6xw4h2pw1wy6qlwgxj37x4lsj377kg27y809rf5ah", - "x86_64-darwin": "6e633bf87be9f8bf46dff9733cfd0d611e018ae5df75f30735747721f91fcf43", - "x86_64-linux": "b365aac23c61dc0b18002c60937c4842e814cbe6d8e6a34e4dc211774ebaec01" + "aarch64-darwin": "d312544ea29844cf328b44b9dbde12f4fdced90cb442dfca6df36c098dbb6e7a", + "aarch64-linux": "eb31470c0d7cd6e23e7ce0d89cc93a2356c9dac8bcc997e335353b8aa995afa0", + "armv7l-linux": "224bd46983e503101c756c72d10b195f14712a7a56438718acb126017dd04edf", + "headers": "0db38ndw9rrd8ixa14761cbff6ns31b6302bzx5q4in8i4dkrrs3", + "x86_64-darwin": "faf9dcc20d525607ea205f2f6a1dfe3270f6268aa439bb0ba5646c7e4fbbd842", + "x86_64-linux": "ec4707783d39e86005f42899e30ae59e50dd5d9c7f28531ed494eb43f2361403" }, - "version": "30.4.0" + "version": "30.5.1" }, "31": { "hashes": { - "aarch64-darwin": "4cd04f75e97f6cdfee1d166c7756b9a3c7341e51a7b12255c37bd46fa5a45da5", - "aarch64-linux": "37fbede76b30bad461cbfa3efec8aef07a34f6991c71c50a69ac489623413098", - "armv7l-linux": "7a6cba2d78ef3ff776d9482121f9b2400370da23b3065bfdafc4cd83c8bbe423", - "headers": "0iclnzcihiw7bnf7nn0p56m8zz8cwn951ccf6g52d7pfr791gbnv", - "x86_64-darwin": "e177e9846bfe63eefea3ecd6a889e9865e1fba21b93179a0cde08bd7c94796ee", - "x86_64-linux": "9b95e66cb4d55bb632e37bcb6083992a5d665f0b378466a771a2948c1aab57b7" + "aarch64-darwin": "dec23ecc15f4d0503163c5f65f59114127ce6d2518af8e6547ea787372575fcb", + "aarch64-linux": "1911b1cef253d68fead45432e93740223c686ebc11c931bdd08439ec88030cfd", + "armv7l-linux": "957d888d016270b658fb558f6e2061ffaa7f71c9d2b1c73c4f122342519ba741", + "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88", + "x86_64-darwin": "4d5d21963bf833ccc25edbc2e8e884f408e24c2a39b53f1d0c30f4017ac2ba8a", + "x86_64-linux": "86b3794aba055e84f23cba5d8319ca9f23a05385d2c06fe7d78d24d2bb356b67" }, - "version": "31.4.0" + "version": "31.6.0" }, "32": { "hashes": { - "aarch64-darwin": "b0e04b765702c35341e587e41b01eb9bcb1233953ab243a0c82e9555c04b269b", - "aarch64-linux": "1bf3b53cba77e070fb0da4b32540fedc29586b2111700b897fd62e3577708d53", - "armv7l-linux": "6e52f9fd163e54cb482354645dc32d42b24c6624bbb8927d194dbbb9eaf92959", - "headers": "0gw7yvj9i3kwmxbjj6w4l442saac3pcn3g7m42kvbpbwbfds1h4d", - "x86_64-darwin": "e3bb68b37e723af4aab8d9694661e5e9ecbe7b1fbc253fe263940dafffd66864", - "x86_64-linux": "5a9980bc3c80d1d2af0965eba2bc3c0f532b4ccc29194a595cefdd4dbe98e7dc" + "aarch64-darwin": "b5f6db900997ba931c98addaef28744a0a6af0f2ec2e8e5755f7f50db2fe8bbc", + "aarch64-linux": "702326c51679ed705bc22d7e4049b29cef2d66366d3387c401836aaae0fa450c", + "armv7l-linux": "d9511449c328f90f47e499f44c6d84c6204d4a3a2caec5c5d52f176cfc77f50d", + "headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk", + "x86_64-darwin": "150ac6a59e31ad516685bdbb9cee67c7e927b872ad94ffc900fbf6616433f8ab", + "x86_64-linux": "b51e5f1296f8971d7eb4ca86606b6f5d31fb3dab8caa91dcfbfa522be5679691" }, - "version": "32.1.1" + "version": "32.1.2" } } diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix index edd648713e27..1eb1a8d870b8 100644 --- a/pkgs/development/tools/electron/chromedriver/generic.nix +++ b/pkgs/development/tools/electron/chromedriver/generic.nix @@ -92,5 +92,5 @@ let in stdenv.mkDerivation ( (common stdenv.hostPlatform) // - (if stdenv.isDarwin then darwin else linux) + (if stdenv.hostPlatform.isDarwin then darwin else linux) ) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index f80b67c66eaf..3cb6b6a756c5 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,13 +34,13 @@ }, "32": { "hashes": { - "aarch64-darwin": "3fff987133294dcc18420500292bdfc32b452cfcf72f2e89af96404aa566aa27", - "aarch64-linux": "cfd75fdd5ec2bc86483b0779f241f98f775b74e4b75407a08b3755103304421a", - "armv7l-linux": "469d23434bca0f8bd4def7d3d9d3e9ff30dfa29e65450bac88cbbc0ae1ffc09c", - "headers": "0gw7yvj9i3kwmxbjj6w4l442saac3pcn3g7m42kvbpbwbfds1h4d", - "x86_64-darwin": "2b0e23c214580716dbeedd7b6bccc2b8994cbaa7827fa34208ed22ccb4ccdf77", - "x86_64-linux": "5d824770f97216138a209f268fbcab3de64bc967046ed9ad92ec0059abef184f" + "aarch64-darwin": "7fb7b8736fcd9dbde92628e4aa951fd2c54d3136bf20c1821ce2a1b85fef3046", + "aarch64-linux": "405664c1b6529cd6c2af65778f2c84bfe262ad0b8d9d044a39d2eff2ed218828", + "armv7l-linux": "32682f487ed9307d0f40d35c4b998cee75272effd228093be3e008ca7b39e16e", + "headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk", + "x86_64-darwin": "a9e43916cbe91c9a905f2bf38d326d5dc462c3d8a7d88f52c25c1e7c1b9ce7cc", + "x86_64-linux": "d98aa7a90ebfe519700e47fa6bcb94a157483fac615920c5ee467dcc41c46702" }, - "version": "32.1.1" + "version": "32.1.2" } } diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index d7af407e417b..3999b50e9888 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -47,10 +47,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-SUwtnpYQbPRCIzTQcJnoW9sI597LP1BvqNrhcb2NNfk=", + "hash": "sha256-LkDhMO6FOS/8WgAQBs3HZ8ujkS4yBtVJR7ARxEiJIME=", "owner": "electron", "repo": "electron", - "rev": "v30.4.0" + "rev": "v30.5.1" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -276,10 +276,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-FJVFKLhVCoOdM6dbuu/DQxw0hXjg+C8a2WfF0u3Qndw=", + "hash": "sha256-3pcWLDR1Y6oJUuwtequ5pK7nGwPeOqzALVNGJYskuc0=", "owner": "nodejs", "repo": "node", - "rev": "v20.15.1" + "rev": "v20.16.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -913,8 +913,8 @@ }, "electron_yarn_hash": "0vq12z09hcm6xdrd34b01vx1c47r4zdaqrkw9db6r612xrp2xi0c", "modules": "123", - "node": "20.15.1", - "version": "30.4.0" + "node": "20.16.0", + "version": "30.5.1" }, "31": { "chrome": "126.0.6478.234", @@ -964,10 +964,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-pio5G9ATJHsM4ygKkDhmAbpZecS8p1AQUJ7LHavMq6I=", + "hash": "sha256-dw2WLjkHCt/uYXT+eZpaJ1bdB6DdMcJLjnscREp4YU8=", "owner": "electron", "repo": "electron", - "rev": "v31.4.0" + "rev": "v31.6.0" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -1211,10 +1211,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-3pcWLDR1Y6oJUuwtequ5pK7nGwPeOqzALVNGJYskuc0=", + "hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=", "owner": "nodejs", "repo": "node", - "rev": "v20.16.0" + "rev": "v20.17.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -1854,11 +1854,11 @@ }, "electron_yarn_hash": "12pcq3zzx6627igdfd5bgyismz9n21093smpd43c4aall2mn6194", "modules": "125", - "node": "20.16.0", - "version": "31.4.0" + "node": "20.17.0", + "version": "31.6.0" }, "32": { - "chrome": "128.0.6613.137", + "chrome": "128.0.6613.162", "chromium": { "deps": { "gn": { @@ -1868,15 +1868,15 @@ "version": "2024-06-11" } }, - "version": "128.0.6613.137" + "version": "128.0.6613.162" }, "chromium_npm_hash": "sha256-OBUYgjfoEZly8JLTtprfU+hlKNFSnHLheaVWhrirGJk=", "deps": { "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-H+C79mGXUaDYcDoJz25iobN3xWUJz6OplleJlTX3ilg=", + "hash": "sha256-52pb9e5XYaiIpUlazoXbmEJ/3l4uPWt9sVmF0+cVBKQ=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "128.0.6613.137", + "rev": "128.0.6613.162", "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { @@ -1905,10 +1905,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-OErkW4OrDU9WJd8iqWAUZZ5qR4vuX+laLzwTt5OMrOc=", + "hash": "sha256-RkSdNjEmXO4xsCRzp5y5suG8svNT5LSI/eVbAUDbi5c=", "owner": "electron", "repo": "electron", - "rev": "v32.1.1" + "rev": "v32.1.2" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -2788,14 +2788,14 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-bhGdJhSfvBFUh0PY9xssNinO1CKb36lxKuU3b35aV0M=", - "rev": "6f774f929205be0a49cf861b8d73a92655e1dd36", + "hash": "sha256-weN8PR9qaRcws9T5PhWyJntrJJ4sKoLwP3gTSLHU574=", + "rev": "485b9d9f88ef1c4787b183b8ccc6cdcfbc07ab1a", "url": "https://chromium.googlesource.com/v8/v8.git" } }, "electron_yarn_hash": "0jb1rs1in1bp71syim7a7p0n669kbc6as90y3zi6nd0q340cwgqa", "modules": "128", "node": "20.17.0", - "version": "32.1.1" + "version": "32.1.2" } } diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index 022306a2bacf..14ccfe6d84a3 100755 --- a/pkgs/development/tools/electron/update.py +++ b/pkgs/development/tools/electron/update.py @@ -321,7 +321,6 @@ class ElectronChromedriverRepo(ElectronBinRepo): # and it is rather pointless trying to update those. # # https://endoflife.date/electron -@memory.cache def supported_version_range() -> range: """Returns a range of electron releases that have not reached end-of-life yet""" releases_json = json.loads( |