Loading pkgs/applications/networking/browsers/chromium/common.nix +1 −1 Original line number Diff line number Diff line Loading @@ -624,7 +624,7 @@ let mkdir -p third_party/jdk/current/bin '' + lib.optionalString (chromiumVersionAtLeast "142") '' + lib.optionalString (!isElectron && chromiumVersionAtLeast "142") '' cat << EOF > gpu/webgpu/dawn_commit_hash.h /* Generated by lastchange.py, do not edit.*/ #ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_ Loading pkgs/by-name/gc/gclient2nix/gclient2nix.py +1 −1 Original line number Diff line number Diff line Loading @@ -166,7 +166,7 @@ class GitilesRepo(Repo): # (making it count the compressed instead of uncompressed size) # rather than complying with it. if url == "https://chromium.googlesource.com/chromium/src.git": self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; " self.args["postFetch"] = "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); " self.args["postFetch"] += "rm -r $out/content/test/data; " self.args["postFetch"] += "rm -rf $out/courgette/testdata; " self.args["postFetch"] += "rm -r $out/extensions/test/data; " Loading pkgs/development/tools/electron/binary/info.json +11 −0 Original line number Diff line number Diff line Loading @@ -42,5 +42,16 @@ "x86_64-linux": "8e0b7f6f1eb6ceb7ac04bc6be09acc58a6ab96c3ca6f53d663b0a619c0bf06f2" }, "version": "38.4.0" }, "39": { "hashes": { "aarch64-darwin": "678e51190e5b29af4eb5842d4724db35409efb706ce17b1a40faf823720a9c70", "aarch64-linux": "8985a9b2055c17f2bdae4418af140d6accd12b28f929319f5a918ca79b0a3d43", "armv7l-linux": "54ea84c5e3b7139a24cae32ee4bb5b73eccb517174430a02da1a91aa5335759e", "headers": "12b50anxwimg8xs8595zgr02ihch49m8252r2yqlbd787rz0rg59", "x86_64-darwin": "49f6cfe1d35b8f363f62bce73925dae3b8ff44b0201d9f7095592e7275e920d5", "x86_64-linux": "4520cbd92eeed370d7cfd2b1c60135647c02b8f634d6179d8a9a3f64b64baf2f" }, "version": "39.0.0" } } pkgs/development/tools/electron/chromedriver/info.json +11 −0 Original line number Diff line number Diff line Loading @@ -42,5 +42,16 @@ "x86_64-linux": "af7e2c995608b2635ea484ed2589a7ff7f79e3b05dd8c14a332f78c13b2a6892" }, "version": "38.4.0" }, "39": { "hashes": { "aarch64-darwin": "86718e1f93188928d9daf239e55ad07d08b3601bbe603a87a9524fa70fc5414c", "aarch64-linux": "e42b6a850426d1f74305543caf688a71f41f9e4c7dcdec9d3a4522a059f2af36", "armv7l-linux": "64295d9b93c4c67386b8de714d124046e311ed87828394c897592afa51285f74", "headers": "12b50anxwimg8xs8595zgr02ihch49m8252r2yqlbd787rz0rg59", "x86_64-darwin": "46467a2331a8da420e3e23d46d2a3f968d12fed2e863f1029dd4f94e35198943", "x86_64-linux": "904052986ae1e1b42f92b2b29cf15dbd642eaf4ed4a0dcd1d4ff7cf609b8a3de" }, "version": "39.0.0" } } pkgs/development/tools/electron/common.nix +17 −0 Original line number Diff line number Diff line Loading @@ -190,6 +190,17 @@ in EOF echo -n '${info.deps."src/third_party/dawn".args.rev}' > gpu/webgpu/DAWN_VERSION '' + lib.optionalString (lib.versionAtLeast info.version "39") '' cat << EOF > gpu/webgpu/dawn_commit_hash.h /* Generated by lastchange.py, do not edit.*/ #ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_ #define GPU_WEBGPU_DAWN_COMMIT_HASH_H_ #define DAWN_COMMIT_HASH "${info.deps."src/third_party/dawn".args.rev}" #endif // GPU_WEBGPU_DAWN_COMMIT_HASH_H_ EOF '' + '' ( cd electron Loading Loading @@ -273,6 +284,12 @@ in enable_dangling_raw_ptr_feature_flag = false; clang_unsafe_buffers_paths = ""; enterprise_cloud_content_analysis = false; } // lib.optionalAttrs (lib.versionAtLeast info.version "39") { enable_linux_installer = false; enable_pdf_save_to_drive = false; } // { # other enable_widevine = false; Loading Loading
pkgs/applications/networking/browsers/chromium/common.nix +1 −1 Original line number Diff line number Diff line Loading @@ -624,7 +624,7 @@ let mkdir -p third_party/jdk/current/bin '' + lib.optionalString (chromiumVersionAtLeast "142") '' + lib.optionalString (!isElectron && chromiumVersionAtLeast "142") '' cat << EOF > gpu/webgpu/dawn_commit_hash.h /* Generated by lastchange.py, do not edit.*/ #ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_ Loading
pkgs/by-name/gc/gclient2nix/gclient2nix.py +1 −1 Original line number Diff line number Diff line Loading @@ -166,7 +166,7 @@ class GitilesRepo(Repo): # (making it count the compressed instead of uncompressed size) # rather than complying with it. if url == "https://chromium.googlesource.com/chromium/src.git": self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; " self.args["postFetch"] = "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); " self.args["postFetch"] += "rm -r $out/content/test/data; " self.args["postFetch"] += "rm -rf $out/courgette/testdata; " self.args["postFetch"] += "rm -r $out/extensions/test/data; " Loading
pkgs/development/tools/electron/binary/info.json +11 −0 Original line number Diff line number Diff line Loading @@ -42,5 +42,16 @@ "x86_64-linux": "8e0b7f6f1eb6ceb7ac04bc6be09acc58a6ab96c3ca6f53d663b0a619c0bf06f2" }, "version": "38.4.0" }, "39": { "hashes": { "aarch64-darwin": "678e51190e5b29af4eb5842d4724db35409efb706ce17b1a40faf823720a9c70", "aarch64-linux": "8985a9b2055c17f2bdae4418af140d6accd12b28f929319f5a918ca79b0a3d43", "armv7l-linux": "54ea84c5e3b7139a24cae32ee4bb5b73eccb517174430a02da1a91aa5335759e", "headers": "12b50anxwimg8xs8595zgr02ihch49m8252r2yqlbd787rz0rg59", "x86_64-darwin": "49f6cfe1d35b8f363f62bce73925dae3b8ff44b0201d9f7095592e7275e920d5", "x86_64-linux": "4520cbd92eeed370d7cfd2b1c60135647c02b8f634d6179d8a9a3f64b64baf2f" }, "version": "39.0.0" } }
pkgs/development/tools/electron/chromedriver/info.json +11 −0 Original line number Diff line number Diff line Loading @@ -42,5 +42,16 @@ "x86_64-linux": "af7e2c995608b2635ea484ed2589a7ff7f79e3b05dd8c14a332f78c13b2a6892" }, "version": "38.4.0" }, "39": { "hashes": { "aarch64-darwin": "86718e1f93188928d9daf239e55ad07d08b3601bbe603a87a9524fa70fc5414c", "aarch64-linux": "e42b6a850426d1f74305543caf688a71f41f9e4c7dcdec9d3a4522a059f2af36", "armv7l-linux": "64295d9b93c4c67386b8de714d124046e311ed87828394c897592afa51285f74", "headers": "12b50anxwimg8xs8595zgr02ihch49m8252r2yqlbd787rz0rg59", "x86_64-darwin": "46467a2331a8da420e3e23d46d2a3f968d12fed2e863f1029dd4f94e35198943", "x86_64-linux": "904052986ae1e1b42f92b2b29cf15dbd642eaf4ed4a0dcd1d4ff7cf609b8a3de" }, "version": "39.0.0" } }
pkgs/development/tools/electron/common.nix +17 −0 Original line number Diff line number Diff line Loading @@ -190,6 +190,17 @@ in EOF echo -n '${info.deps."src/third_party/dawn".args.rev}' > gpu/webgpu/DAWN_VERSION '' + lib.optionalString (lib.versionAtLeast info.version "39") '' cat << EOF > gpu/webgpu/dawn_commit_hash.h /* Generated by lastchange.py, do not edit.*/ #ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_ #define GPU_WEBGPU_DAWN_COMMIT_HASH_H_ #define DAWN_COMMIT_HASH "${info.deps."src/third_party/dawn".args.rev}" #endif // GPU_WEBGPU_DAWN_COMMIT_HASH_H_ EOF '' + '' ( cd electron Loading Loading @@ -273,6 +284,12 @@ in enable_dangling_raw_ptr_feature_flag = false; clang_unsafe_buffers_paths = ""; enterprise_cloud_content_analysis = false; } // lib.optionalAttrs (lib.versionAtLeast info.version "39") { enable_linux_installer = false; enable_pdf_save_to_drive = false; } // { # other enable_widevine = false; Loading