From 57c8bec62d5b2ea78be89648dd8b6d5697852ba4 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 30 May 2024 20:51:35 -0700 Subject: [PATCH 01/46] github: add llvm/clang label --- .github/labeler.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 57086953f8d0..3c47566a0766 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -134,6 +134,12 @@ - any-glob-to-any-file: - lib/** +"6.topic: llvm/clang": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/development/compilers/llvm/* + "6.topic: lua": - any: - changed-files: From 77d03eb68cfb2602c5b2b8b10c214ce98648fa8a Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 30 May 2024 19:04:38 -0700 Subject: [PATCH 02/46] llvmPackages_{12,13,14,15,16,17,18,git}.lldb: add patch to remove origin variable --- .../llvm/12/lldb/gnu-install-dirs.patch | 19 +++++++++++++++++++ .../llvm/13/lldb/gnu-install-dirs.patch | 19 +++++++++++++++++++ .../llvm/common/lldb/gnu-install-dirs.patch | 19 +++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch index afc945ce2614..9a4d2b272acb 100644 --- a/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch @@ -89,3 +89,22 @@ index b5633e2..86e4738 100644 endif() get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR) finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}") +diff --git a/source/API/CMakeLists.txt b/source/API/CMakeLists.txt +index b5633e2..86e4738 100644 +--- a/source/API/CMakeLists.txt 2024-05-30 19:08:14.241656491 -0700 ++++ b/source/API/CMakeLists.txt 2024-05-30 19:08:48.218219667 -0700 +@@ -113,14 +113,6 @@ + ${option_install_prefix} + ) + +-# lib/pythonX.Y/dist-packages/lldb/_lldb.so is a symlink to lib/liblldb.so, +-# which depends on lib/libLLVM*.so (BUILD_SHARED_LIBS) or lib/libLLVM-10git.so +-# (LLVM_LINK_LLVM_DYLIB). Add an additional rpath $ORIGIN/../../../../lib so +-# that _lldb.so can be loaded from Python. +-if(LLDB_ENABLE_PYTHON AND (BUILD_SHARED_LIBS OR LLVM_LINK_LLVM_DYLIB) AND UNIX AND NOT APPLE) +- set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "\$ORIGIN/../../../../lib${LLVM_LIBDIR_SUFFIX}") +-endif() +- + if(Python3_RPATH) + set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "${Python3_RPATH}") + set_property(TARGET liblldb APPEND PROPERTY BUILD_RPATH "${Python3_RPATH}") diff --git a/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch index afc945ce2614..eba6fbabac62 100644 --- a/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch @@ -89,3 +89,22 @@ index b5633e2..86e4738 100644 endif() get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR) finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}") +diff --git a/source/API/CMakeLists.txt b/source/API/CMakeLists.txt +index b5633e2..86e4738 100644 +--- a/source/API/CMakeLists.txt 2024-05-30 21:38:39.829955586 -0700 ++++ b/source/API/CMakeLists.txt 2024-05-30 21:38:48.015673758 -0700 +@@ -112,14 +112,6 @@ + ${option_install_prefix} + ) + +-# lib/pythonX.Y/dist-packages/lldb/_lldb.so is a symlink to lib/liblldb.so, +-# which depends on lib/libLLVM*.so (BUILD_SHARED_LIBS) or lib/libLLVM-10git.so +-# (LLVM_LINK_LLVM_DYLIB). Add an additional rpath $ORIGIN/../../../../lib so +-# that _lldb.so can be loaded from Python. +-if(LLDB_ENABLE_PYTHON AND (BUILD_SHARED_LIBS OR LLVM_LINK_LLVM_DYLIB) AND UNIX AND NOT APPLE) +- set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "\$ORIGIN/../../../../lib${LLVM_LIBDIR_SUFFIX}") +-endif() +- + if(Python3_RPATH) + set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "${Python3_RPATH}") + set_property(TARGET liblldb APPEND PROPERTY BUILD_RPATH "${Python3_RPATH}") diff --git a/pkgs/development/compilers/llvm/common/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/common/lldb/gnu-install-dirs.patch index 093b9a8ba3ec..ec550764be81 100644 --- a/pkgs/development/compilers/llvm/common/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/common/lldb/gnu-install-dirs.patch @@ -47,3 +47,22 @@ index 7d48491ec89a..c04543585588 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/source/API/CMakeLists.txt b/source/API/CMakeLists.txt +index 7d48491ec89a..c04543585588 100644 +--- a/source/API/CMakeLists.txt 2024-05-30 18:59:13.449269853 -0700 ++++ b/source/API/CMakeLists.txt 2024-05-30 19:00:33.721858164 -0700 +@@ -115,14 +115,6 @@ + ${option_install_prefix} + ) + +-# lib/pythonX.Y/dist-packages/lldb/_lldb.so is a symlink to lib/liblldb.so, +-# which depends on lib/libLLVM*.so (BUILD_SHARED_LIBS) or lib/libLLVM-10git.so +-# (LLVM_LINK_LLVM_DYLIB). Add an additional rpath $ORIGIN/../../../../lib so +-# that _lldb.so can be loaded from Python. +-if(LLDB_ENABLE_PYTHON AND (BUILD_SHARED_LIBS OR LLVM_LINK_LLVM_DYLIB) AND UNIX AND NOT APPLE) +- set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "\$ORIGIN/../../../../lib${LLVM_LIBDIR_SUFFIX}") +-endif() +- + if(Python3_RPATH) + set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "${Python3_RPATH}") + set_property(TARGET liblldb APPEND PROPERTY BUILD_RPATH "${Python3_RPATH}") From 5219bcedc3aceac37461802f7563b97020d28b60 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 5 Jun 2024 07:07:06 +0200 Subject: [PATCH 03/46] python312Packages.loguru-logging-intercept: init at 0.1.4 --- .../loguru-logging-intercept/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/loguru-logging-intercept/default.nix diff --git a/pkgs/development/python-modules/loguru-logging-intercept/default.nix b/pkgs/development/python-modules/loguru-logging-intercept/default.nix new file mode 100644 index 000000000000..c25aa6dedda7 --- /dev/null +++ b/pkgs/development/python-modules/loguru-logging-intercept/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPythonPackage, + setuptools, + loguru, + fetchPypi, +}: + +buildPythonPackage rec { + pname = "loguru-logging-intercept"; + version = "0.1.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ORPBqXtQdMqK0v6n+lBFbLUPR2SEpCpvj8w2KlBjAGQ="; + }; + + build-system = [ setuptools ]; + dependencies = [ loguru ]; + + pythonImportsCheck = [ "loguru_logging_intercept" ]; + + meta = { + description = "Code to integrate Loguru with Python's standard logging module"; + homepage = "https://github.com/MatthewScholefield/loguru-logging-intercept"; + maintainers = with lib.maintainers; [ sigmanificient ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b57fde9d0f0..0aa0cd8449a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7027,6 +7027,8 @@ self: super: with self; { loguru = callPackage ../development/python-modules/loguru { }; + loguru-logging-intercept = callPackage ../development/python-modules/loguru-logging-intercept { }; + logutils = callPackage ../development/python-modules/logutils { redis-server = pkgs.redis; }; From 0ea93461ed0385930379f35ff5fe9d9a9590d251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=84=A1=E5=90=8D=E6=B0=8F?= Date: Sun, 9 Jun 2024 19:31:01 +0800 Subject: [PATCH 04/46] 24.11 rename codeName to Vicuna --- lib/trivial.nix | 2 +- nixos/doc/manual/release-notes/rl-2411.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/trivial.nix b/lib/trivial.nix index dee7eca9699a..3d9777035791 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -403,7 +403,7 @@ in { On each release the first letter is bumped and a new animal is chosen starting with that new letter. */ - codeName = "Vicuña"; + codeName = "Vicuna"; /** Returns the current nixpkgs version suffix as string. diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index e645c06f109a..28643ec11573 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -1,4 +1,4 @@ -# Release 24.11 (“Vicuña”, 2024.11/??) {#sec-release-24.11} +# Release 24.11 (“Vicuna”, 2024.11/??) {#sec-release-24.11} From 346bb482c518c548fff0f7c313d614b4c3e7340c Mon Sep 17 00:00:00 2001 From: slashformotion Date: Sun, 9 Jun 2024 15:41:53 +0200 Subject: [PATCH 05/46] lib.maintainer-list: add slashformotion --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cdda0527b2b3..4b4ee22f661c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19199,6 +19199,11 @@ githubId = 106779009; name = "Slambert"; }; + slashformotion = { + github = "slashformotion"; + githubId = 45801817; + name = "slashformotion"; + }; slbtty = { email = "shenlebantongying@gmail.com"; github = "shenlebantongying"; From 4c3cc7b115c59eb1826bd65c60dd8d218273f2ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jun 2024 07:29:35 +0000 Subject: [PATCH 06/46] syft: 1.5.0 -> 1.6.0 --- pkgs/by-name/sy/syft/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index fdd416c135b0..db459c26d00e 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; rev = "refs/tags/v${version}"; - hash = "sha256-sBV2/2AuKIMgU0oP0p2CukCMYQBSs623vV6BZBTWYqg="; + hash = "sha256-qh+iuqnLX8Qr8sOP3YobwcFdOhnlIrnoBR53ZeCPdB4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-b7iDqobrXbXy1SlyDuHDoSYdbQg3WCcHS0SAVj929qw="; + vendorHash = "sha256-CmkxbyXUvFqa3sRcT7aao+pdZxJVFQiNcwmCmWzgF5c="; nativeBuildInputs = [ installShellFiles ]; From 6ff6c421c69b7fe3eb6d7dd86756781fe415e230 Mon Sep 17 00:00:00 2001 From: Nathan Scully Date: Tue, 11 Jun 2024 21:28:45 +1000 Subject: [PATCH 07/46] pnpm: 9.1.1 -> 9.3.0 --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 6fe9bc5cbe4f..d6a47cfebf4b 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -8,8 +8,8 @@ let hash = "sha256-aR/hdu6pqKgN8g5JdvPftEoEhBzriFY4/iomF0+B5l4="; }; "9" = { - version = "9.1.1"; - hash = "sha256-lVHoA9y3oYOf31QWFTqEQGDHvOATIYzoI0EFMlBKwQs="; + version = "9.3.0"; + hash = "sha256-4fno0aFmB6Rt08FYtfen3HlFUB0cYiLUVNY9Az0dkY8="; }; }; From 62b3c73a4e0e9ddc92de1c165492fce00c5027c4 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sun, 27 Aug 2023 18:19:56 +0200 Subject: [PATCH 08/46] maintainers: add alois31 --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f8076c718c21..1bce92d5bf54 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1038,6 +1038,16 @@ githubId = 60479013; name = "Alma Cemerlic"; }; + alois31 = { + name = "Alois Wohlschlager"; + email = "alois1@gmx-topmail.de"; + matrix = "@aloisw:kde.org"; + github = "alois31"; + githubId = 36605164; + keys = [{ + fingerprint = "CA97 A822 FF24 25D4 74AF 3E4B E0F5 9EA5 E521 6914"; + }]; + }; Alper-Celik = { email = "alper@alper-celik.dev"; name = "Alper Çelik"; From ae916af7bebac5481cc998980dc7e124572e4d33 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Wed, 12 Jun 2024 09:53:39 +0200 Subject: [PATCH 09/46] vlc: 3.0.20 -> 3.0.21, add maintainer --- pkgs/by-name/vl/vlc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index 86406bdba034..eb6608d0664f 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -98,11 +98,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.20"; + version = "3.0.21"; src = fetchurl { url = "https://get.videolan.org/vlc/${finalAttrs.version}/vlc-${finalAttrs.version}.tar.xz"; - hash = "sha256-rccoW00nIc3fQOtScMraKqoQozTLVG/VWgY1NEe6KbU="; + hash = "sha256-JNu+HX367qCZTV3vC73iABdzRxNtv+Vz9bakzuJa+7A="; }; nativeBuildInputs = [ @@ -293,7 +293,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Cross-platform media player and streaming server"; homepage = "https://www.videolan.org/vlc/"; license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres alois31 ]; platforms = lib.platforms.linux; }; }) From 49e4a8e26f810427f7053f0e93ae69fbec4263a6 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Sun, 9 Jun 2024 17:58:51 +0200 Subject: [PATCH 10/46] syncthing-tray: migrate to buildGoModule --- .../misc/syncthing-tray/default.nix | 28 ------ .../applications/misc/syncthing-tray/deps.nix | 93 ------------------- pkgs/by-name/sy/syncthing-tray/package.nix | 44 +++++++++ pkgs/top-level/all-packages.nix | 2 - 4 files changed, 44 insertions(+), 123 deletions(-) delete mode 100644 pkgs/applications/misc/syncthing-tray/default.nix delete mode 100644 pkgs/applications/misc/syncthing-tray/deps.nix create mode 100644 pkgs/by-name/sy/syncthing-tray/package.nix diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix deleted file mode 100644 index e9db92df121c..000000000000 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, fetchFromGitHub, buildGoPackage, pkg-config, libappindicator-gtk3 }: - -buildGoPackage rec { - pname = "syncthing-tray"; - version = "0.7"; - - goPackagePath = "github.com/alex2108/syncthing-tray"; - - src = fetchFromGitHub { - owner = "alex2108"; - repo = "syncthing-tray"; - rev = "v${version}"; - sha256 = "0869kinnsfzb8ydd0sv9fgqsi1sy5rhqg4whfdnrv82xjc71xyw3"; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libappindicator-gtk3 ]; - - meta = with lib; { - description = "Simple application tray for syncthing"; - homepage = "https://github.com/alex2108/syncthing-tray"; - license = licenses.mit; - maintainers = with maintainers; [ nickhu ]; - mainProgram = "syncthing-tray"; - }; -} diff --git a/pkgs/applications/misc/syncthing-tray/deps.nix b/pkgs/applications/misc/syncthing-tray/deps.nix deleted file mode 100644 index 1103146ed1b7..000000000000 --- a/pkgs/applications/misc/syncthing-tray/deps.nix +++ /dev/null @@ -1,93 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/alex2108/systray"; - fetch = { - type = "git"; - url = "https://github.com/alex2108/systray"; - rev = "40e874866be2dc2c57ab031bcbde27a76b90721a"; - sha256 = "1bxnb6skb9ss0lwlwswql07ardkhm28nxglvlsxkdlmzv1dcwy1q"; - }; - } - { - goPackagePath = "github.com/getlantern/context"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/context"; - rev = "624d99b1798d7c5375ea1d3ca4c5b04d58f7c775"; - sha256 = "09yf9x6478a5z01hybr98zwa8ax3fx7l6wwsvdkxp3fdg9dqm13b"; - }; - } - { - goPackagePath = "github.com/getlantern/errors"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/errors"; - rev = "99fa440517e8f3d1e4cd8d6dbed6b41f4c1ed3d6"; - sha256 = "08rl32l5ks67hcgjxik62nd5g558mv4101kmz1ak7d3vfgg3m6i3"; - }; - } - { - goPackagePath = "github.com/getlantern/golog"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/golog"; - rev = "cca714f7feb5df8e455f409b549d384441ac4578"; - sha256 = "0gnf30n38zkx356cqc6jdv1kbzy59ddqhqndwrxsm2n2zc3b5p7q"; - }; - } - { - goPackagePath = "github.com/getlantern/hex"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/hex"; - rev = "083fba3033ad473db3dd31c9bb368473d37581a7"; - sha256 = "18q6rypmcqmcwlfzrrdcz08nff0a289saplvd9y3ifnfcqdw3j77"; - }; - } - { - goPackagePath = "github.com/getlantern/hidden"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/hidden"; - rev = "d52a649ab33af200943bb599898dbdcfdbc94cb7"; - sha256 = "0133qmp4sjq8da5di3459vc5g5nqbpqra0f558zd95js3fdmkmsi"; - }; - } - { - goPackagePath = "github.com/getlantern/ops"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/ops"; - rev = "b70875f5d689a9438bca72aefd7142a2af889b18"; - sha256 = "0cfa2bbkykbzbskmgd2an34him72z6f3y88ag1v5ffpb0d6bnar7"; - }; - } - { - goPackagePath = "github.com/getlantern/stack"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/stack"; - rev = "02f928aad224fbccd50d66edd776fc9d1e9f2f2b"; - sha256 = "0ddl5r4iw3c7p4drh4d8phl7d0ssdddsnd3xjm1lzgxylqq6r568"; - }; - } - { - goPackagePath = "github.com/oxtoacart/bpool"; - fetch = { - type = "git"; - url = "https://github.com/oxtoacart/bpool"; - rev = "4e1c5567d7c2dd59fa4c7c83d34c2f3528b025d6"; - sha256 = "01kk6dhkz96yhp3p5v2rjwq8mbrwrdsn6glqw7jp4h7g5za7yi95"; - }; - } - { - goPackagePath = "github.com/toqueteos/webbrowser"; - fetch = { - type = "git"; - url = "https://github.com/toqueteos/webbrowser"; - rev = "e2ebfdc6cb1a3fdc4fc4dbd20a0cae0c2e406792"; - sha256 = "0sgjnxrq0jgipkij8b6xiy4am9bv9zziqxxdhw15rdjc5piyk3a2"; - }; - } -] diff --git a/pkgs/by-name/sy/syncthing-tray/package.nix b/pkgs/by-name/sy/syncthing-tray/package.nix new file mode 100644 index 000000000000..2fc912de8519 --- /dev/null +++ b/pkgs/by-name/sy/syncthing-tray/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + fetchpatch, + buildGoModule, + pkg-config, + libappindicator-gtk3, +}: + +buildGoModule rec { + pname = "syncthing-tray"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "alex2108"; + repo = "syncthing-tray"; + rev = "v${version}"; + sha256 = "0869kinnsfzb8ydd0sv9fgqsi1sy5rhqg4whfdnrv82xjc71xyw3"; + }; + + vendorHash = "sha256-hGV5bivDUFEbOwU9sU+Eu5Wzz/aZtj6NUkpzHlmZTtw="; + + patches = [ + # Migrate to Go modules + (fetchpatch { + url = "https://github.com/alex2108/syncthing-tray/commit/94fac974a227cd03c566f81797a21b1bcc29adf5.patch"; + hash = "sha256-uJfnI9kGIlw4OzFoML+ulgR3keOeVB3+ox/4RtYJNXY="; + }) + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libappindicator-gtk3 ]; + + meta = { + description = "Simple application tray for syncthing"; + homepage = "https://github.com/alex2108/syncthing-tray"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + nickhu + ]; + mainProgram = "syncthing-tray"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 918237c12362..aeb0f1013b10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34573,8 +34573,6 @@ with pkgs; stc-cli = callPackage ../applications/networking/stc-cli { }; - syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; - syncthingtray = kdePackages.callPackage ../applications/misc/syncthingtray { # renamed in KF5 -> KF6 plasma-framework = kdePackages.libplasma; From e9a7f202f63ad6b3c1c27c4879581bc569469cfc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 12 Jun 2024 14:41:52 +0200 Subject: [PATCH 11/46] vimPlugins.neotest-playwright: add telescope dependency --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 870826ed8819..43de9b67d093 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1011,6 +1011,10 @@ dependencies = [ self.plenary-nvim ]; }; + neotest-playwright = super.neotest-playwright.overrideAttrs { + dependencies = [ self.telescope-nvim ]; + }; + neo-tree-nvim = super.neo-tree-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim nui-nvim ]; }; From 2de3fb4580091e6c28e211ff811123b6c2616f3b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 12 Jun 2024 14:53:24 +0200 Subject: [PATCH 12/46] lomiri.qtmir: 0.7.2-unstable-2024-01-08 -> 0.8.0-unstable-2024-03-06, switch to debian-upstream branch --- .../lomiri/development/qtmir/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/lomiri/development/qtmir/default.nix b/pkgs/desktops/lomiri/development/qtmir/default.nix index 654fd93fc59b..e22af6847699 100644 --- a/pkgs/desktops/lomiri/development/qtmir/default.nix +++ b/pkgs/desktops/lomiri/development/qtmir/default.nix @@ -34,15 +34,15 @@ stdenv.mkDerivation (finalAttrs: { # Not regular qtmir, experimental support for Mir 2.x - # Currently following https://gitlab.com/ubports/development/core/qtmir/-/tree/personal/mariogrip/desktop-development - pname = "qtmir-mir2"; - version = "0.7.2-unstable-2024-01-08"; + # Currently following https://gitlab.com/ubports/development/core/qtmir/-/tree/personal/sunweaver/debian-upstream + pname = "qtmir-debian-upstream"; + version = "0.8.0-unstable-2024-03-06"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/qtmir"; - rev = "ae0d87415d5c9ed2c4fd2284ba0807d23d564bb0"; - hash = "sha256-fE8ttCC0FNavs91pASGGG7k7nKVg2lD3JK0WTmCA3gM="; + rev = "de639c3a482ac6c59b9be02abb839a8c96158041"; + hash = "sha256-AKSzkGl6bAoR4I2lolNRUp67VS/PiZnrPpCYtTlKWKc="; }; outputs = [ @@ -83,11 +83,11 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace CMakeLists.txt \ - --replace "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \ - --replace "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/plugins/platforms" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtPluginPrefix}/platforms" \ + --replace-fail "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \ + --replace-fail "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/plugins/platforms" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtPluginPrefix}/platforms" \ substituteInPlace data/xwayland.qtmir.desktop \ - --replace '/usr/bin/Xwayland' 'Xwayland' + --replace-fail '/usr/bin/Xwayland' 'Xwayland' ''; strictDeps = true; From 6355ddc8e8e44796c66bcc2303414e8982ac01cf Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 12 Jun 2024 14:54:05 +0200 Subject: [PATCH 13/46] lomiri.qtmir: nixfmt-rfc-style --- .../lomiri/development/qtmir/default.nix | 69 +++++++++---------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/pkgs/desktops/lomiri/development/qtmir/default.nix b/pkgs/desktops/lomiri/development/qtmir/default.nix index e22af6847699..88ac0b69de9c 100644 --- a/pkgs/desktops/lomiri/development/qtmir/default.nix +++ b/pkgs/desktops/lomiri/development/qtmir/default.nix @@ -1,35 +1,36 @@ -{ stdenv -, lib -, fetchFromGitLab -, fetchpatch -, testers -, cmake -, cmake-extras -, pkg-config -, wrapQtAppsHook -, gsettings-qt -, gtest -, libqtdbustest -, libqtdbusmock -, libuuid -, lomiri-api -, lomiri-app-launch -, lomiri-url-dispatcher -, lttng-ust -, mir_2_15 -, process-cpp -, qtbase -, qtdeclarative -, qtsensors -, valgrind -, protobuf -, glm -, boost -, properties-cpp -, glib -, validatePkgConfig -, wayland -, xwayland +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + testers, + cmake, + cmake-extras, + pkg-config, + wrapQtAppsHook, + gsettings-qt, + gtest, + libqtdbustest, + libqtdbusmock, + libuuid, + lomiri-api, + lomiri-app-launch, + lomiri-url-dispatcher, + lttng-ust, + mir_2_15, + process-cpp, + qtbase, + qtdeclarative, + qtsensors, + valgrind, + protobuf, + glm, + boost, + properties-cpp, + glib, + validatePkgConfig, + wayland, + xwayland, }: stdenv.mkDerivation (finalAttrs: { @@ -153,8 +154,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl3Only; maintainers = teams.lomiri.members; platforms = platforms.linux; - pkgConfigModules = [ - "qtmirserver" - ]; + pkgConfigModules = [ "qtmirserver" ]; }; }) From e67116cda691a38f5c4f8cc20069e2223288f460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 12 Jun 2024 16:14:26 +0200 Subject: [PATCH 14/46] knot-dns: 3.3.5 -> 3.3.6 https://gitlab.nic.cz/knot/knot-dns/-/releases/v3.3.6 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index d939f4e375ed..fa7b53382c89 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "0e0bf04319581280660e8e62ab04be64a7d632331e40fc9c87e76861305db3ad"; + sha256 = "c81801e9d6c64c97777cacf47e260f46f37799180d906457a53a9f13dd0f9987"; }; outputs = [ "bin" "out" "dev" ]; From 48596fb13bc91bdc1b44bcdd6b0f87f0467d34c0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 12 Jun 2024 16:52:34 +0200 Subject: [PATCH 15/46] basedpyright: 1.12.5 -> 1.12.6 Diff: DetachHead/basedpyright@v1.12.5...v1.12.6 Changelog: https://github.com/detachhead/basedpyright/releases/tag/v1.12.6 --- pkgs/by-name/ba/basedpyright/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index f96317424a07..d591250ba2eb 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -7,13 +7,13 @@ }: let - version = "1.12.5"; + version = "1.12.6"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; - rev = "v${version}"; - hash = "sha256-fiaIkZoW0eOzVLOv9vhEk32kgKorNSG1vtNw0bIOtNU="; + rev = "refs/tags/v${version}"; + hash = "sha256-1F3T+BGamFJEDAIMz684oIn4xEDbNadEh8TTG5l8fPo="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -43,7 +43,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-bdlcGrYLnX318+MByYIzjnchl9n4+EcZKCZJgSMKyHo="; + npmDepsHash = "sha256-8nXW5Z5xTr8EXxyBylxCr7C88zmRxppe8EaspFy7b6o="; dontNpmBuild = true; # FIXME: Remove this flag when TypeScript 5.5 is released npmFlags = [ "--legacy-peer-deps" ]; @@ -59,7 +59,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-JDGNpyOBK3EwbHIHp4Zoo376MqU5u97Zj46vtuWY488="; + npmDepsHash = "sha256-ZFuCY2gveimFK5Hztj6k6PkeTpbR7XiyQyS5wPaNNts="; postPatch = '' chmod +w ../../ From 7ca220b9f6dca9515a3944ed07aec0203ea69973 Mon Sep 17 00:00:00 2001 From: slashformotion Date: Sun, 9 Jun 2024 15:42:48 +0200 Subject: [PATCH 16/46] cli-ui: init at 0.17.2 --- .../python-modules/cli-ui/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/cli-ui/default.nix diff --git a/pkgs/development/python-modules/cli-ui/default.nix b/pkgs/development/python-modules/cli-ui/default.nix new file mode 100644 index 000000000000..88f152a6fc59 --- /dev/null +++ b/pkgs/development/python-modules/cli-ui/default.nix @@ -0,0 +1,47 @@ +{ + lib, + python3Packages, + fetchPypi, + pytestCheckHook, + pythonRelaxDepsHook, + pythonOlder, + poetry-core, + colorama, + tabulate, + unidecode, +}: +python3Packages.buildPythonPackage rec { + pname = "cli-ui"; + version = "0.17.2"; + pyproject = true; + + disabled = pythonOlder "3.8.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-L2flDPR052rRYMPmYLutmL+LjfuNhHdl86Jht+E8Bfo="; + }; + + pythonRelaxDeps = [ "tabulate" ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + build-system = [ poetry-core ]; + + dependencies = [ + colorama + tabulate + unidecode + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cli_ui" ]; + + meta = with lib; { + description = "Build Nice User Interfaces In The Terminal"; + homepage = "https://github.com/your-tools/python-cli-ui"; + license = licenses.bsd3; + maintainers = with maintainers; [ slashformotion ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4bcc8ea7d138..d1e473099d64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2206,6 +2206,8 @@ self: super: with self; { clf = callPackage ../development/python-modules/clf { }; + cli-ui = callPackage ../development/python-modules/cli-ui { }; + clip = callPackage ../development/python-modules/clip { }; clip-anytorch = callPackage ../development/python-modules/clip-anytorch { }; From 1fc321ee73e3fa8d5da3f75a8ebe81761e2ceaf2 Mon Sep 17 00:00:00 2001 From: slashformotion Date: Sun, 9 Jun 2024 15:43:06 +0200 Subject: [PATCH 17/46] tbump: init at 6.11.0 --- pkgs/by-name/tb/tbump/package.nix | 41 +++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/tb/tbump/package.nix diff --git a/pkgs/by-name/tb/tbump/package.nix b/pkgs/by-name/tb/tbump/package.nix new file mode 100644 index 000000000000..2812dd2f05d0 --- /dev/null +++ b/pkgs/by-name/tb/tbump/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchPypi, + python3Packages, +}: +python3Packages.buildPythonApplication rec { + pname = "tbump"; + version = "6.11.0"; + pyproject = true; + + disabled = python3Packages.pythonOlder "3.8"; + + src = fetchPypi { + inherit version; + pname = "tbump"; + hash = "sha256-OF5xDu3wqKb/lZzx6fPP0XyHNhcTL8DsX2Ka8MNVyHA="; + }; + + pythonRelaxDeps = [ "tomlkit" ]; + + nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; + + build-system = with python3Packages; [ poetry-core ]; + + dependencies = with python3Packages; [ + docopt + schema + packaging + poetry-core + tomlkit + cli-ui + ]; + + meta = { + description = "Bump software releases"; + homepage = "https://github.com/your-tools/tbump"; + license = lib.licenses.bsd3; + mainProgram = "tbump"; + maintainers = with lib.maintainers; [ slashformotion ]; + }; +} From 205203322087c6caed9b9b3f960b356b4e845bae Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 12 Jun 2024 21:07:03 +0100 Subject: [PATCH 18/46] check-cherry-picks workflow: don't run for staging-next PRs --- .github/workflows/check-cherry-picks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml index 0bee949c3dbc..67a5506bcc19 100644 --- a/.github/workflows/check-cherry-picks.yml +++ b/.github/workflows/check-cherry-picks.yml @@ -4,6 +4,7 @@ on: branches: - 'release-**' - 'staging-**' + - '!staging-next' permissions: {} From 5beb9a86e02386a3a985cea8a7e4e6ede9cc1fea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 21:08:05 +0000 Subject: [PATCH 19/46] fermyon-spin: 2.4.2 -> 2.5.1 --- pkgs/development/tools/fermyon-spin/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/fermyon-spin/default.nix b/pkgs/development/tools/fermyon-spin/default.nix index a969baf411f8..40000e2c4ea5 100644 --- a/pkgs/development/tools/fermyon-spin/default.nix +++ b/pkgs/development/tools/fermyon-spin/default.nix @@ -17,15 +17,15 @@ let }.${system} or (throw "Unsupported system: ${system}"); packageHash = { - x86_64-linux = "sha256-LHiLkZ+VN+wPnq6OukXozQWKh7ewNaFor1ndCUlCBtU="; - aarch64-linux = "sha256-1+rLGnm+LhbYigYUcmuLICLFXUk3wjOkmxuCuuI+Xqc="; - x86_64-darwin = "sha256-mJA3VXfNr6578Q2xw0xOZccloQpeCIsjn3dVdlsnTVs="; - aarch64-darwin = "sha256-FNl3UefJWA8yJ2B44GUEK6py7DLikJrygIwsqdIjW9c="; + x86_64-linux = "sha256-gYHIfvgofT9tKYCchZoRYvioLCtp2wfaOtuVWxTyujM="; + aarch64-linux = "sha256-zW+aeUc67pa6mQQkfazShHKAvGeucswLK1eRCxzXOJM="; + x86_64-darwin = "sha256-ph+SrrxOIyG9rRS098duhvDFiNGuh0o2uemm++J+zKw="; + aarch64-darwin = "sha256-eOpRaivRhk841/TCxC4ygw27UrPkqQCMH2mme2qo8V8="; }.${system} or (throw "Unsupported system: ${system}"); in stdenv.mkDerivation rec { pname = "fermyon-spin"; - version = "2.4.2"; + version = "2.5.1"; # Use fetchurl rather than fetchzip as these tarballs are built by the project # and not by GitHub (and thus are stable) - this simplifies the update script From 254fc80f46456bca8cacc1508d18160f6b91917e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 13 Jun 2024 00:22:50 +0300 Subject: [PATCH 20/46] fermyon-spin: add a TODO comment for an updateScript --- pkgs/development/tools/fermyon-spin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/fermyon-spin/default.nix b/pkgs/development/tools/fermyon-spin/default.nix index 40000e2c4ea5..4f104d650cdf 100644 --- a/pkgs/development/tools/fermyon-spin/default.nix +++ b/pkgs/development/tools/fermyon-spin/default.nix @@ -16,6 +16,8 @@ let aarch64-darwin = "macos-aarch64"; }.${system} or (throw "Unsupported system: ${system}"); + # TODO: It'd be nice to write an update script that would update all of these + # hashes together. packageHash = { x86_64-linux = "sha256-gYHIfvgofT9tKYCchZoRYvioLCtp2wfaOtuVWxTyujM="; aarch64-linux = "sha256-zW+aeUc67pa6mQQkfazShHKAvGeucswLK1eRCxzXOJM="; From d784ed9dfa976336181966d03b6c8bd461b04eca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jun 2024 23:41:58 +0000 Subject: [PATCH 21/46] open-in-mpv: 2.2.1 -> 2.2.2 --- pkgs/applications/video/open-in-mpv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/open-in-mpv/default.nix b/pkgs/applications/video/open-in-mpv/default.nix index 1e1e29ba2dc0..855af79e964e 100644 --- a/pkgs/applications/video/open-in-mpv/default.nix +++ b/pkgs/applications/video/open-in-mpv/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "open-in-mpv"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "Baldomo"; repo = "open-in-mpv"; rev = "v${version}"; - hash = "sha256-Fa6oZMaR0ctZgYWoOXLaobc+pDRDZbDCFvRZUR+Fda4="; + hash = "sha256-dmsI4ea9L50djT/vwjswWDZ7uwMzc2q84i0T82LGjxs="; }; vendorHash = "sha256-G6GZO2+CfEAYcf7zBcqDa808A0eJjM8dq7+4VGZ+P4c="; From 5e57e65ce4295a22fa7c36cf99e5233586773383 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Jun 2024 01:44:01 +0200 Subject: [PATCH 22/46] python312Packages.libknot: 3.3.5 -> 3.3.6 --- pkgs/development/python-modules/libknot/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index eb7a21ea53ef..60c282a1e59b 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.3.5"; + version = "3.3.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-nEeDawZ/kChHQA3qoEKy+R+Uy7ogNL3ows3Yzs5OhpY="; + hash = "sha256-N96gdO5sezMyKt0QdX7ORg5DnEVSqb1j+WohvOHdYYU="; }; postPatch = '' @@ -26,7 +26,7 @@ buildPythonPackage rec { --replace "libknot.so%s" "${lib.getLib knot-dns}/lib/libknot.so%s" ''; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; pythonImportsCheck = [ "libknot" ]; @@ -35,6 +35,5 @@ buildPythonPackage rec { homepage = "https://gitlab.nic.cz/knot/knot-dns/-/tree/master/python/libknot"; license = licenses.gpl3Only; maintainers = with maintainers; [ hexa ]; - mainProgram = "libknot"; }; } From d276229c5345057410b9fe71f94520c3c2c83bc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 00:25:24 +0000 Subject: [PATCH 23/46] python311Packages.uiprotect: 0.13.0 -> 1.1.0 --- pkgs/development/python-modules/uiprotect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 678237b65c87..bae843bb4c97 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "0.13.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "uilibs"; repo = "uiprotect"; - rev = "v${version}"; - hash = "sha256-Laf8P77fLTTJqqUoGZUtGIVmitrXS1OQLeW8Gqu66NU="; + rev = "refs/tags/v${version}"; + hash = "sha256-TWErGEQot99x48Ti9rBxaq9qcrZiT/W0irdR+UxC1XI="; }; postPatch = '' From 4f12f9c47928d4537449cc840a02966db219e637 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 02:08:19 +0000 Subject: [PATCH 24/46] python311Packages.mitmproxy: 10.3.0 -> 10.3.1 --- pkgs/development/python-modules/mitmproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 32515800195f..0a6864daea63 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "10.3.0"; + version = "10.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,8 +54,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy"; - rev = "refs/tags/${version}"; - hash = "sha256-YjvGsnpQQ8GWLyKmnd3lOxesnr+F2xCNXyahZh0JQnc="; + rev = "refs/tags/v${version}"; + hash = "sha256-rIyRY1FolbdoaI4OgFG7D2/mot8NiRHalgittPzledw="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; From 6d01be69bca49674cc4e47d2f327956d4fab4e08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 02:25:58 +0000 Subject: [PATCH 25/46] home-assistant-custom-lovelace-modules.android-tv-card: 3.7.4 -> 3.8.0 --- .../custom-lovelace-modules/android-tv-card/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix index bf98c9a9438a..b3f93c0b50c4 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix @@ -5,18 +5,18 @@ buildNpmPackage rec { pname = "android-tv-card"; - version = "3.7.4"; + version = "3.8.0"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-5GdN6zCE24kGLM4ka8vHdpIEWTQAzve/1l3+5OV95i0="; + hash = "sha256-DYNfDGvCLJHhp2p9iPsxWAyPPUNI+sLwDYP6FRQA1vk="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-fVnqGe/ao0Ilk/mWbHGscYQlIIk3K0mpm1wS4F8Lio4="; + npmDepsHash = "sha256-9O5T3x3uLm5qpZwIbeo2DJ/CirRilJ17BZuT3+NDP8A="; installPhase = '' runHook preInstall From e7521ac9e28344e073080b443a9c76687d5d4d0e Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 12 Jun 2024 22:20:40 -0400 Subject: [PATCH 26/46] bitwarden-desktop: minor cleanup - Update description to match bitwarden-cli - Prefer `lib.getExe` --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 9ae3e52f3b94..beeefaabfd31 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -24,7 +24,7 @@ }: let - description = "A secure and free password manager for all of your devices"; + description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; electron = electron_28; in buildNpmPackage rec { @@ -159,7 +159,7 @@ in buildNpmPackage rec { cp -r locales resources{,.pak} $out/opt/Bitwarden popd - makeWrapper '${electron}/bin/electron' "$out/bin/bitwarden" \ + makeWrapper '${lib.getExe electron}' "$out/bin/bitwarden" \ --add-flags $out/opt/Bitwarden/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default ELECTRON_IS_DEV 0 \ From d62d9430420e2869398217c001eb15fa587ef9c4 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 12 Jun 2024 22:27:53 -0400 Subject: [PATCH 27/46] bitwarden-desktop: enforce using correct Node version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise nothing tells us we are using different than upstream. This also checks anything else in the `package.json`’s `engines` spec, e.g. npm version, which we might not care about but it’s compatible now so it’s fine. See https://docs.npmjs.com/cli/v10/using-npm/config#engine-strict --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index beeefaabfd31..e945facc1c84 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -58,7 +58,7 @@ in buildNpmPackage rec { nodejs = nodejs_18; makeCacheWritable = true; - npmFlags = [ "--legacy-peer-deps" ]; + npmFlags = [ "--engine-strict" "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; npmDepsHash = "sha256-gprJGOE/uSSM3NHpcbelB7sueObEl4o522WRHIRFmwo="; From 8b99f45d2b1dabd795d4e1112abe666716dda66f Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 12 Jun 2024 09:33:26 -0400 Subject: [PATCH 28/46] bitwarden-desktop: 2024.5.0 -> 2024.6.0 Diff: https://github.com/bitwarden/clients/compare/desktop-v2024.5.0...desktop-v2024.6.0 Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2024.6.0 --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index e945facc1c84..f10ef5d4178b 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -3,7 +3,7 @@ , cargo , copyDesktopItems , dbus -, electron_28 +, electron_29 , fetchFromGitHub , glib , gnome @@ -14,7 +14,7 @@ , makeWrapper , moreutils , napi-rs-cli -, nodejs_18 +, nodejs_20 , patchutils_0_4_2 , pkg-config , python3 @@ -26,16 +26,16 @@ let description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; - electron = electron_28; + electron = electron_29; in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.5.0"; + version = "2024.6.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-ozR46snGD5yl98FslmnTeQmd2on/0bQPEnqJ0t8wx70="; + hash = "sha256-qiUUrs23WHE3+KFsWDknuDSA6M3Zwjz9Jdjq6mn5XkE="; }; patches = [ @@ -55,12 +55,12 @@ in buildNpmPackage rec { | ${moreutils}/bin/sponge apps/desktop/src/package-lock.json ''; - nodejs = nodejs_18; + nodejs = nodejs_20; makeCacheWritable = true; npmFlags = [ "--engine-strict" "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-gprJGOE/uSSM3NHpcbelB7sueObEl4o522WRHIRFmwo="; + npmDepsHash = "sha256-Mgd15eFJtWoBqFFCsjmsnlNbcg5NDs1U7DlMkE0hIb8="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; @@ -76,7 +76,7 @@ in buildNpmPackage rec { patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-FA7B+bipYSxwIGvn/v9+wG3Km6lrwV58LbxsMlDK8q0="; + hash = "sha256-BL+j2hMwb3QGgS29Y6LjqnKscH+tEXMCOyivilHHwVI="; }; cargoRoot = "apps/desktop/desktop_native"; From 5e4fd0a2a241359dff7caaeb361f85c097781967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Thu, 13 Jun 2024 04:24:58 +0100 Subject: [PATCH 29/46] feishin: upgrade electron to v30 Addresses #319252: v27 has been EOL since 2024/04/16. --- pkgs/applications/audio/feishin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/feishin/default.nix b/pkgs/applications/audio/feishin/default.nix index 90561314fec9..98a0c5edebce 100644 --- a/pkgs/applications/audio/feishin/default.nix +++ b/pkgs/applications/audio/feishin/default.nix @@ -3,7 +3,7 @@ stdenv, buildNpmPackage, fetchFromGitHub, - electron_27, + electron_30, darwin, copyDesktopItems, makeDesktopItem, @@ -20,7 +20,7 @@ let hash = "sha256-eNGHrSF/MgRHh0CVc0l8denZIbAnPXwFCZJZcvF+Xtc="; }; - electron = electron_27; + electron = electron_30; in buildNpmPackage { inherit pname version; From fddfea5ddb1de36dc6236895d841aac2998f0c35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 04:12:15 +0000 Subject: [PATCH 30/46] xdg-terminal-exec: 0.9.3 -> 0.10.0 --- pkgs/by-name/xd/xdg-terminal-exec/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xd/xdg-terminal-exec/package.nix b/pkgs/by-name/xd/xdg-terminal-exec/package.nix index 679c43238237..c9fb7203282e 100644 --- a/pkgs/by-name/xd/xdg-terminal-exec/package.nix +++ b/pkgs/by-name/xd/xdg-terminal-exec/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "xdg-terminal-exec"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "xdg-terminal-exec"; rev = "v${finalAttrs.version}"; - hash = "sha256-zFclT+WooEpwO8zXBXpeh4bbKvQwvm4HxNKYXdNRzSA="; + hash = "sha256-u/BYhae6xf5rVhYi8uPxZeQTN7skjLbmOC8xoDcUDQk="; }; dontBuild = true; From e99a835a130c2b6d5e7c1443f1e79fe7df0142b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 13 Jun 2024 08:48:34 +0200 Subject: [PATCH 31/46] rl-2411: keep original unicode name. --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 28643ec11573..e645c06f109a 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -1,4 +1,4 @@ -# Release 24.11 (“Vicuna”, 2024.11/??) {#sec-release-24.11} +# Release 24.11 (“Vicuña”, 2024.11/??) {#sec-release-24.11} From 75d7ee7d8c938fea4d36e99ef3149fad7fb80891 Mon Sep 17 00:00:00 2001 From: shivaraj-bh Date: Thu, 13 Jun 2024 12:21:36 +0530 Subject: [PATCH 32/46] open-webui: Use `makeWrapperArgs`; Use env to disable hatch custom hook For more info, see: - Disable hatch custom hook: https://github.com/NixOS/nixpkgs/pull/316248#discussion_r1636468561 - why `makeWrapperArgs`?: https://github.com/NixOS/nixpkgs/pull/316248#discussion_r1636483491 - `pythonRelaxDepsHook` is a nativeBuildInput: https://github.com/NixOS/nixpkgs/pull/316248#discussion_r1636477762 --- pkgs/by-name/op/open-webui/package.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 074c3ab90323..353984f5fbc2 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -44,14 +44,14 @@ python3.pkgs.buildPythonApplication rec { inherit pname version src; pyproject = true; - # The custom hook tries to run `npm install` in `buildPhase`. - # We don't have to worry, as node dependencies are managed by `frontend` drv. + # Not force-including the frontend build directory as frontend is managed by the `frontend` derivation above. postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail '[tool.hatch.build.hooks.custom]' "" \ --replace-fail ', build = "open_webui/frontend"' "" ''; + env.HATCH_BUILD_NO_HOOKS = true; + pythonRelaxDeps = true; pythonRemoveDeps = [ @@ -115,17 +115,13 @@ python3.pkgs.buildPythonApplication rec { youtube-transcript-api ]; - build-system = with python3.pkgs; [ - hatchling - pythonRelaxDepsHook - ]; + build-system = with python3.pkgs; [ hatchling ]; + + nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; pythonImportsCheck = [ "open_webui" ]; - postInstall = '' - wrapProgram $out/bin/open-webui \ - --set FRONTEND_BUILD_DIR "${frontend}/share/open-webui" - ''; + makeWrapperArgs = [ "--set FRONTEND_BUILD_DIR ${frontend}/share/open-webui" ]; passthru.tests = { inherit (nixosTests) open-webui; From 4b2a8a6d8efe0ea2f568255de3b795166aed6731 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Jun 2024 09:36:56 +0200 Subject: [PATCH 33/46] pretalx: backport drf 3.15 support --- pkgs/by-name/pr/pretalx/package.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 719547e835e8..784976d06eaf 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -3,6 +3,7 @@ , gettext , python3 , fetchFromGitHub +, fetchpatch2 , plugins ? [ ] , nixosTests }: @@ -25,14 +26,6 @@ let # fails with some assertions doCheck = false; }); - - djangorestframework = prev.djangorestframework.overridePythonAttrs (oldAttrs: rec { - version = "3.14.0"; - src = oldAttrs.src.override { - rev = version; - hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; - }; - }); }; }; @@ -78,6 +71,15 @@ python.pkgs.buildPythonApplication rec { "static" ]; + patches = [ + (fetchpatch2 { + # Backport support for Djangorestframework 3.15.x + name = "pretalx-drf-3.15.patch"; + url = "https://github.com/pretalx/pretalx/commit/43a0416c6968d64ea57720abdb82f482940b11f8.patch"; + hash = "sha256-Iw1xVF7j7c712kwIk1SMbQSF0ixMUZr1BJib3KAb2HY="; + }) + ]; + postPatch = '' substituteInPlace src/pretalx/common/management/commands/rebuild.py \ --replace 'subprocess.check_call(["npm", "run", "build"], cwd=frontend_dir, env=env)' "" @@ -100,6 +102,7 @@ python.pkgs.buildPythonApplication rec { "django-csp" "django-filter" "django-hierarkey" + "djangorestframework" "markdown" "pillow" "python-dateutil" From 9320ef944f68fffc2d8400841a94b2c3594329c7 Mon Sep 17 00:00:00 2001 From: chn Date: Sat, 8 Jun 2024 10:54:11 +0800 Subject: [PATCH 34/46] utterly-round-plasma-style: update --- pkgs/data/themes/utterly-round-plasma-style/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/utterly-round-plasma-style/default.nix b/pkgs/data/themes/utterly-round-plasma-style/default.nix index 57a06ac52828..7510183b10f3 100644 --- a/pkgs/data/themes/utterly-round-plasma-style/default.nix +++ b/pkgs/data/themes/utterly-round-plasma-style/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "HimDek"; repo = pname; - rev = "c3677d5223286f69871f6745cdb3b71367229d40"; - hash = "sha256-mlqRMz0cAZnnM4xE6p7fMzhGlqCQcM4FxmDlVnbGUgQ="; + rev = "6280f69781b7fa9613b7a9c502d8d61e11fefca5"; + hash = "sha256-b0vah/rkcJH01bnDOGXQ04vrRR1c1Ijgc2HPBmToLuc="; }; installPhase = '' From f77d5bd637cd9b53f01c4ed5916e9c7483c0ccc2 Mon Sep 17 00:00:00 2001 From: chn Date: Sat, 8 Jun 2024 10:25:21 +0800 Subject: [PATCH 35/46] utterly-nord-plasma: fix installation --- pkgs/data/themes/utterly-nord-plasma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/utterly-nord-plasma/default.nix b/pkgs/data/themes/utterly-nord-plasma/default.nix index eb0cd40e983d..c35f919aedd4 100644 --- a/pkgs/data/themes/utterly-nord-plasma/default.nix +++ b/pkgs/data/themes/utterly-nord-plasma/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { mkdir -p $out/share/{color-schemes,Kvantum,plasma/look-and-feel,sddm/themes,wallpapers,konsole} cp -a look-and-feel $out/share/plasma/look-and-feel/Utterly-Nord - cp -a look-and-feel-solid $out/share/plasma/look-and-feel/Utterly-Nord-solid - cp -a look-and-feel-light $out/share/plasma/look-and-feel/Utterly-Nord-light - cp -a look-and-feel-light-solid $out/share/plasma/look-and-feel/Utterly-Nord-light-solid + cp -a look-and-feel-solid $out/share/plasma/look-and-feel/Utterly-Nord-Solid + cp -a look-and-feel-light $out/share/plasma/look-and-feel/Utterly-Nord-Light + cp -a look-and-feel-light-solid $out/share/plasma/look-and-feel/Utterly-Nord-Light-Solid cp -a *.colors $out/share/color-schemes/ From c04fadeaa6dec5cbea14efc0ec27e929f7bb42c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Jun 2024 09:56:58 +0200 Subject: [PATCH 36/46] paperless-ngx: fix drf tests --- pkgs/applications/office/paperless-ngx/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 7b3a9c97e7f6..b961ee941f69 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -57,6 +57,10 @@ let rev = version; hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; }; + nativeCheckInputs = with prev; [ + pytest7CheckHook + pytest-django + ]; }); }; }; From 48c06216f599c3b67864baed6b2b0642548ab147 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Jun 2024 09:57:23 +0200 Subject: [PATCH 37/46] tandoor-recipes: fix drf tests --- pkgs/applications/misc/tandoor-recipes/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index a0640b8ec78b..906a266b14e3 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -23,6 +23,10 @@ let rev = version; hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; }; + nativeCheckInputs = with super; [ + pytest7CheckHook + pytest-django + ]; }); }; }; From 4629a9f8223b0d093b1895002b30d57d4d491e82 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Thu, 13 Jun 2024 09:59:08 +0200 Subject: [PATCH 38/46] fluent-gtk-theme 2024-04-28 -> 2024-06-12 --- pkgs/data/themes/fluent-gtk-theme/default.nix | 157 +++++++++++------- 1 file changed, 97 insertions(+), 60 deletions(-) diff --git a/pkgs/data/themes/fluent-gtk-theme/default.nix b/pkgs/data/themes/fluent-gtk-theme/default.nix index 9efa36aa88b7..137f8a92dd1b 100644 --- a/pkgs/data/themes/fluent-gtk-theme/default.nix +++ b/pkgs/data/themes/fluent-gtk-theme/default.nix @@ -1,77 +1,114 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, gitUpdater -, gnome-themes-extra -, gtk-engine-murrine -, jdupes -, sassc -, themeVariants ? [] # default: blue -, colorVariants ? [] # default: all -, sizeVariants ? [] # default: standard -, tweaks ? [] +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gitUpdater, + gnome-themes-extra, + gtk-engine-murrine, + jdupes, + sassc, + themeVariants ? [ ], # default: blue + colorVariants ? [ ], # default: all + sizeVariants ? [ ], # default: standard + tweaks ? [ ], }: let pname = "fluent-gtk-theme"; - in -lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants -lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants -lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants -lib.checkListOfEnum "${pname}: tweaks" [ "solid" "float" "round" "blur" "noborder" "square" ] tweaks +lib.checkListOfEnum "${pname}: theme variants" + [ + "default" + "purple" + "pink" + "red" + "orange" + "yellow" + "green" + "teal" + "grey" + "all" + ] + themeVariants + lib.checkListOfEnum + "${pname}: color variants" + [ + "standard" + "light" + "dark" + ] + colorVariants + lib.checkListOfEnum + "${pname}: size variants" + [ + "standard" + "compact" + ] + sizeVariants + lib.checkListOfEnum + "${pname}: tweaks" + [ + "solid" + "float" + "round" + "blur" + "noborder" + "square" + ] + tweaks -stdenvNoCC.mkDerivation (finalAttrs: { - inherit pname; - version = "2024-04-28"; + stdenvNoCC.mkDerivation + (finalAttrs: { + inherit pname; + version = "2024-06-12"; - src = fetchFromGitHub { - owner = "vinceliuice"; - repo = "fluent-gtk-theme"; - rev = finalAttrs.version; - hash = "sha256-0zf3fHtWcrbT26jgwgsPEDDhBWErOkgXyvGwSWV8rGs="; - }; + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = "fluent-gtk-theme"; + rev = finalAttrs.version; + hash = "sha256-ONhW68UUrFiv5hxkR7XI8U/5+qM+tYLIS2OM05pqJi0="; + }; - nativeBuildInputs = [ - jdupes - sassc - ]; + nativeBuildInputs = [ + jdupes + sassc + ]; - buildInputs = [ - gnome-themes-extra - ]; + buildInputs = [ gnome-themes-extra ]; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - postPatch = '' - patchShebangs install.sh - ''; + postPatch = '' + patchShebangs install.sh + ''; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - name= HOME="$TMPDIR" ./install.sh \ - ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \ - ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ - ${lib.optionalString (sizeVariants != []) "--size " + builtins.toString sizeVariants} \ - ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \ - --icon nixos \ - --dest $out/share/themes + name= HOME="$TMPDIR" ./install.sh \ + ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ + --icon nixos \ + --dest $out/share/themes - jdupes --quiet --link-soft --recurse $out/share + jdupes --quiet --link-soft --recurse $out/share - runHook postInstall - ''; + runHook postInstall + ''; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = gitUpdater { }; - meta = { - description = "Fluent design gtk theme"; - homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ romildo ]; - }; -}) + meta = { + description = "Fluent design gtk theme"; + changelog = "https://github.com/vinceliuice/Fluent-gtk-theme/releases/tag/${finalAttrs.version}"; + homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + romildo + ]; + }; + }) From 6959071f7c372e7e8fb2ce1cb9da139b45f24750 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Thu, 13 Jun 2024 10:04:58 +0200 Subject: [PATCH 39/46] fluent-gtk-theme: move to pkgs/by-name --- .../default.nix => by-name/fl/fluent-gtk-theme/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{data/themes/fluent-gtk-theme/default.nix => by-name/fl/fluent-gtk-theme/package.nix} (100%) diff --git a/pkgs/data/themes/fluent-gtk-theme/default.nix b/pkgs/by-name/fl/fluent-gtk-theme/package.nix similarity index 100% rename from pkgs/data/themes/fluent-gtk-theme/default.nix rename to pkgs/by-name/fl/fluent-gtk-theme/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9135e7f94e33..1f2c023113ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28448,8 +28448,6 @@ with pkgs; flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { }; flat-remix-gnome = callPackage ../data/themes/flat-remix-gnome { }; - fluent-gtk-theme = callPackage ../data/themes/fluent-gtk-theme { }; - fluent-icon-theme = callPackage ../data/icons/fluent-icon-theme { }; font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4; From a06e115bbb8b6ce30331fdc7e89415c819cf2bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 13 Jun 2024 09:10:14 +0100 Subject: [PATCH 40/46] devenv: 1.0.6 -> 1.0.7 --- pkgs/by-name/de/devenv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 69893d15b58a..aef566f030eb 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -29,7 +29,7 @@ let doInstallCheck = false; }); - version = "1.0.6"; + version = "1.0.7"; in rustPlatform.buildRustPackage { pname = "devenv"; inherit version; @@ -38,10 +38,10 @@ in rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-vGmMEQohwHiTtkFm6WTKtNNYVqPJA6YxRhAizbhtCwE="; + hash = "sha256-eTbBvYwGlKExMSTyHQya6+6kdx1rtva/aVfyAZu2NUU="; }; - cargoHash = "sha256-89pivwMs/TpCQBaKFH6iUEpaid5eQOrvyz5otcFKy54="; + cargoHash = "sha256-fmxXCOrWRM4ZKwQS9vCIh7LonpifyeNGsj/td1CjedA="; nativeBuildInputs = [ makeWrapper pkg-config ]; From f50c22a7f284d257a97320d755947e94a2c612f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 13 Jun 2024 10:45:38 +0200 Subject: [PATCH 41/46] paperless-ngx: use headless ghostscript we don't need cups or X --- pkgs/applications/office/paperless-ngx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index a0764c940e3a..58456daac0e3 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -7,7 +7,7 @@ , python3 , giflib , darwin -, ghostscript +, ghostscript_headless , imagemagickBig , jbig2enc , optipng @@ -55,7 +55,7 @@ let path = lib.makeBinPath [ - ghostscript + ghostscript_headless imagemagickBig jbig2enc optipng From 43f62ef3d03338b959a26ba28222058fa3153dc1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 26 May 2024 08:26:16 +0300 Subject: [PATCH 42/46] bash-language-server: use pnpm.fetchDeps instead of node2nix --- .../ba/bash-language-server/package.nix | 73 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ba/bash-language-server/package.nix diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix new file mode 100644 index 000000000000..0e66b1e26876 --- /dev/null +++ b/pkgs/by-name/ba/bash-language-server/package.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchFromGitHub +, pnpm_8 +, nodejs +, npmHooks +, makeBinaryWrapper +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bash-language-server"; + version = "5.4.0"; + + src = fetchFromGitHub { + owner = "bash-lsp"; + repo = "bash-language-server"; + rev = "server-${finalAttrs.version}"; + hash = "sha256-yJ81oGd9aNsWQMLvDSgMVVH1//Mw/SVFYFIPsJTQYzE="; + }; + + pnpmDeps = pnpm_8.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-W25xehcxncBs9QgQBt17F5YHK0b+GDEmt27XzTkyYWg="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_8.configHook + npmHooks.npmBuildHook + makeBinaryWrapper + ]; + npmBuildScript = "compile"; + # We are only interested in the bash-language-server executable, which is + # part of the `./server` directory. From some reason, the `./vscode-client` + # directory is not included in upstream's `pnpm-workspace.yaml`, so perhaps + # that's why our ${pnpmDeps} don't include the dependencies required for it. + preBuild = '' + rm -r vscode-client + substituteInPlace tsconfig.json \ + --replace-fail '{ "path": "./vscode-client" },' "" + ''; + + installPhase = '' + runHook preInstall + + pnpm --offline \ + --frozen-lockfile --ignore-script \ + --filter=bash-language-server \ + deploy $out/lib/bash-language-server + # Cleanup directory a bit, to save space, and make fixup phase a bit faster + rm -r $out/lib/bash-language-server/src + find $out/lib/bash-language-server -name '*.ts' -delete + rm -r \ + $out/lib/bash-language-server/node_modules/.bin \ + $out/lib/bash-language-server/node_modules/*/bin + + # Create the executable, based upon what happens in npmHooks.npmInstallHook + makeWrapper ${lib.getExe nodejs} $out/bin/bash-language-server \ + --inherit-argv0 \ + --add-flags $out/lib/bash-language-server/out/cli.js + + runHook postInstall + ''; + + meta = with lib; { + description = "A language server for Bash"; + homepage = "https://github.com/bash-lsp/bash-language-server"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + mainProgram = "bash-language-server"; + platforms = platforms.all; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index cfa45ca713b8..b141c22a0acd 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -57,6 +57,7 @@ mapAliases { inherit (pkgs) asar; # added 2023-08-26 inherit (pkgs) aws-azure-login; # added 2023-09-30 balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31 + inherit (pkgs) bash-language-server; # added 2024-06-07 bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 inherit (pkgs) btc-rpc-explorer; # added 2023-08-17 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 95c447b357f5..b2e0bf0ca271 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -25,7 +25,6 @@ , "auto-changelog" , "aws-cdk" , "awesome-lint" -, "bash-language-server" , "bower" , "bower2nix" , "browserify" From b2d959d25b461e8da182c111f7d8e4cb932e4667 Mon Sep 17 00:00:00 2001 From: mathis Date: Mon, 10 Jun 2024 16:51:42 +0200 Subject: [PATCH 43/46] python312Packages.natural: init at 0.2.0 --- .../python-modules/natural/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/natural/default.nix diff --git a/pkgs/development/python-modules/natural/default.nix b/pkgs/development/python-modules/natural/default.nix new file mode 100644 index 000000000000..fc6bde5f8dc0 --- /dev/null +++ b/pkgs/development/python-modules/natural/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, setuptools +, six +, django +}: +buildPythonPackage rec { + pname = "natural"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tehmaze"; + repo = "natural"; + rev = "refs/tags/${version}"; + hash = "sha256-DERFKDGVUPcjYAxiTYWgWkPp+Myd/9CNytQWgRya570="; + }; + + build-system = [ setuptools ]; + + dependencies = [ six ]; + + nativeCheckInputs = [ django ]; + + meta = { + description = "Convert data to their natural (human-readable) format"; + homepage = "https://github.com/tehmaze/natural"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sailord vinetos ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4bcc8ea7d138..891167c18ee7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8656,6 +8656,8 @@ self: super: with self; { natasha = callPackage ../development/python-modules/natasha { }; + natural = callPackage ../development/python-modules/natural { }; + nomadnet = callPackage ../development/python-modules/nomadnet { }; noneprompt = callPackage ../development/python-modules/noneprompt { }; From 88abc8f5a7d923d62b3735c1157e60024516cd9b Mon Sep 17 00:00:00 2001 From: Wout De Puysseleir Date: Wed, 12 Jun 2024 15:42:30 +0300 Subject: [PATCH 44/46] elixir_1_17: init at 1.17.0 --- pkgs/development/beam-modules/default.nix | 5 +++++ pkgs/development/interpreters/elixir/1.17.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/elixir/1.17.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index d94bdf2b2d8e..8b93f09dd92d 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -45,6 +45,11 @@ let # BEAM-based languages. elixir = elixir_1_16; + elixir_1_17 = lib'.callElixir ../interpreters/elixir/1.17.nix { + inherit erlang; + debugInfo = true; + }; + elixir_1_16 = lib'.callElixir ../interpreters/elixir/1.16.nix { inherit erlang; debugInfo = true; diff --git a/pkgs/development/interpreters/elixir/1.17.nix b/pkgs/development/interpreters/elixir/1.17.nix new file mode 100644 index 000000000000..2e79b6b0c7e3 --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.17.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: +mkDerivation { + version = "1.17.0"; + sha256 = "sha256-RBylCfD+aCsvCqWUIvqXi3izNqqQoNfQNnQiZxz0Igg="; + # https://hexdocs.pm/elixir/1.17.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp + minimumOTPVersion = "25"; + escriptPath = "lib/elixir/scripts/generate_app.escript"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0def6bf6c19..8fb21dd9a2ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17177,7 +17177,7 @@ with pkgs; inherit (beam.interpreters) erlang erlang_27 erlang_26 erlang_25 erlang_24 - elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 + elixir elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls; erlang_nox = beam_nox.interpreters.erlang; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index d0b8b276812d..45900c8b06e2 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -61,7 +61,7 @@ in # access for example elixir built with different version of Erlang, use # `beam.packages.erlang_24.elixir`. inherit (self.packages.erlang) - elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls lfe lfe_2_1; + elixir elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls lfe lfe_2_1; }; # Helper function to generate package set with a specific Erlang version. From 268ce0e562875c1e0e846384fcd95b9241bb1214 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 13 Jun 2024 01:24:50 +0200 Subject: [PATCH 45/46] electron-source.electron_{27,28}: remove instead of marking them as EOL Follow-up to 789263837921e9a6f65c5894068585f6c7896474. We still have the EOLed `electron-{27,28}-bin` builds, that can be used instead. `electron-source.electron_{27,28}` do not build anymore due to LLVM incompatibilities. This is beneficial to users of software that still depend on those EOLed electron versions as well. Instead of wasting potentially hours of compute trying to build known broken versions from source, the working binary variants will be used. Furthermore, this allows us to cleanup the underlying chromium and electron-source derivations from now unused version conditions such as version specific patches and build flags. --- pkgs/development/tools/electron/common.nix | 1 - pkgs/development/tools/electron/info.json | 1784 -------------------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 2 insertions(+), 1787 deletions(-) diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index a615feabdad8..3514d7cdad22 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -234,7 +234,6 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { meta = with lib; { description = "Cross platform desktop application shell"; homepage = "https://github.com/electron/electron"; - knownVulnerabilities = optional (versionOlder info.version "29") "Electron version ${version} is EOL"; platforms = lib.platforms.linux; license = licenses.mit; maintainers = with maintainers; [ yayayayaka teutat3s ]; diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index cf5b041441ff..5f161f07c7e2 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1,1788 +1,4 @@ { - "27": { - "chrome": "118.0.5993.159", - "chromium": { - "deps": { - "gn": { - "hash": "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M=", - "rev": "cc56a0f98bb34accd5323316e0292575ff17a5d4", - "url": "https://gn.googlesource.com/gn", - "version": "2023-08-10" - } - }, - "version": "118.0.5993.159" - }, - "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=", - "deps": { - "src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3yFHjd3LMXVbF4LX6Bi3yJF0CDVug0cDpGFbP8Ibvk4=", - "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": "118.0.5993.159", - "url": "https://chromium.googlesource.com/chromium/src.git" - }, - "src/chrome/test/data/perf/canvas_bench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", - "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", - "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" - }, - "src/chrome/test/data/perf/frame_rate/content": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", - "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", - "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" - }, - "src/chrome/test/data/xr/webvr_info": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", - "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", - "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" - }, - "src/docs/website": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6/LSJGUVZuJe1WIBJEJO/dXZYnsby+X3EzeBbvWjUZU=", - "rev": "243c1406199960e001e1dceccafc6fc2db6897f9", - "url": "https://chromium.googlesource.com/website.git" - }, - "src/electron": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-DmDAKUUyiDASGGylDVQe2OkDVfiA1ficDG+oaMbKqdo=", - "owner": "electron", - "repo": "electron", - "rev": "v27.3.11" - }, - "src/media/cdm/api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", - "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", - "url": "https://chromium.googlesource.com/chromium/cdm.git" - }, - "src/net/third_party/quiche/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hB3gUqi/9SI9PGNkXNpli/TifI1kJEBScqRFIw7hm4c=", - "rev": "7d201495d8a5ef115787765fb12af0d5575281c1", - "url": "https://quiche.googlesource.com/quiche.git" - }, - "src/third_party/angle": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-It05E3+qG17dEbhbaX/VQJaydWOQ1mpsj95dT5IJkgo=", - "rev": "05f45adc147393562b518ca1f82a3ccba7ee40f7", - "url": "https://chromium.googlesource.com/angle/angle.git" - }, - "src/third_party/angle/third_party/VK-GL-CTS/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LWGll3KiMYndiLZBizhN+mzELjYpSxvtIctH+LO+20Q=", - "rev": "385ae8bed1f99e497cdf2f3a5640905b90e69292", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" - }, - "src/third_party/angle/third_party/glmark2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", - "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", - "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" - }, - "src/third_party/angle/third_party/rapidjson/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", - "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", - "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" - }, - "src/third_party/anonymous_tokens/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TcNIocV0p53NJCudvy8wf+fIPIP2tnkoBf1F7mEBFLs=", - "rev": "8c8d20953d502db31fec2353b199e6c22ef0236e", - "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" - }, - "src/third_party/beto-core/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-qgsPK7RyVqGRji0sTcMck1JqX9iCsYIExGoGwNZyVT0=", - "rev": "b902b346037ea3f4aadf8177021f6f917b16e648", - "url": "https://beto-core.googlesource.com/beto-core.git" - }, - "src/third_party/boringssl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-P0Aj2Puy6S1aRIHrAhmokiAmSmHfuWQR6UW/AbQFW+M=", - "rev": "85081c6b3c0b26129893c1bff6bfa42bc3ba2d2c", - "url": "https://boringssl.googlesource.com/boringssl.git" - }, - "src/third_party/breakpad/breakpad": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=", - "rev": "8988364bcddd9b194b0bf931c10bc125987330ed", - "url": "https://chromium.googlesource.com/breakpad/breakpad.git" - }, - "src/third_party/cast_core/public/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", - "rev": "71f51fd6fa45fac73848f65421081edd723297cd", - "url": "https://chromium.googlesource.com/cast_core/public" - }, - "src/third_party/catapult": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-AK85yVeCR3GKGtdW8G9Of+6UMJirJ9BNVyp9pffft7s=", - "rev": "f16ca3c78e46cefa982100444844da3fcb25390e", - "url": "https://chromium.googlesource.com/catapult.git" - }, - "src/third_party/ced/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", - "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", - "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" - }, - "src/third_party/chromium-variations": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2lP3uGdqIZY3DpxGzfDhR2dW+o3Arduaeu56Au7h/5Q=", - "rev": "e0c145ca93c0439a65bcb1607e813edfbc97520b", - "url": "https://chromium.googlesource.com/chromium-variations.git" - }, - "src/third_party/clang-format/script": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", - "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" - }, - "src/third_party/cld_3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", - "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", - "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" - }, - "src/third_party/colorama/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", - "rev": "3de9f013df4b470069d03d250224062e8cf15c49", - "url": "https://chromium.googlesource.com/external/colorama.git" - }, - "src/third_party/content_analysis_sdk/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-auHBX00DSvyMyhEsZGkpKh9KOO2RcaeP9PK6kmmMYls=", - "rev": "8d5118720805fdce0dd3ee2999c964501de4532c", - "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" - }, - "src/third_party/cpu_features/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", - "rev": "936b9ab5515dead115606559502e3864958f7f6e", - "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" - }, - "src/third_party/cpuinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oZjA2cMQMyhFcI+m6eOmdZ9A1oPAbyISeLxNyaoGivk=", - "rev": "c13d0bbb266d200a13532b5915d704c30d21081b", - "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" - }, - "src/third_party/crc32c/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", - "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", - "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" - }, - "src/third_party/cros-components/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s8pfcu5SkxXFCat76TJaDi1NTTQckZ1F+T8URCxOUdI=", - "rev": "bf7aaccb73b26c11e8bf21cb7d90314338e1743f", - "url": "https://chromium.googlesource.com/external/google3/cros_components.git" - }, - "src/third_party/cros_system_api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wq7fJVNRSiyaADrCYB0TEmWQ//BJg4GYiHZNtMb1QlI=", - "rev": "81ac4449008dffea00e4e8f251f87fabc5abe0d3", - "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" - }, - "src/third_party/crossbench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s/+y5bMj+CRnljFZ5aWKirPCsRUjckLOZ5F65WnPYSY=", - "rev": "06981428c28d66678ebec13ca1fac3785cf51bb1", - "url": "https://chromium.googlesource.com/crossbench.git" - }, - "src/third_party/dav1d/libdav1d": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-KSo2s3M3S13gY84NlAdnPsjoKfJZy7ipTlWSvUHD9Ak=", - "rev": "f8ae94eca0f53502a2cddd29a263c1edea4822a0", - "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" - }, - "src/third_party/dawn": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7iCJ1h51S/8pxQRMoDtGXzyuP6Dzxnc/1Cu4ALU8NYg=", - "rev": "deb3b674b26854204c8082ed93926207e42d3cf2", - "url": "https://dawn.googlesource.com/dawn.git" - }, - "src/third_party/dawn/third_party/dxc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-u29t+pF7aRfhRmi36YyEPcQU7gIDqsjrf38+C0YIpFk=", - "rev": "50c4c887f1ccfa1a4bfb158b7dbc93058659ed01", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" - }, - "src/third_party/dawn/third_party/dxheaders": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", - "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" - }, - "src/third_party/dawn/third_party/glfw": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", - "rev": "62e175ef9fae75335575964c845a302447c012c7", - "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" - }, - "src/third_party/dawn/third_party/khronos/EGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", - "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" - }, - "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", - "rev": "5bae8738b23d06968e7c3a41308568120943ae77", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" - }, - "src/third_party/dawn/third_party/webgpu-cts": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gbZpmcbqLisjLb6vnKKvHS6eRqjqvavvTRgxJsaE/RQ=", - "rev": "5dfa3b88f0863c3949f713804e0461c9cc34a030", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" - }, - "src/third_party/depot_tools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EXxlQGA7qwjuZ2Qg/rZinkllkdfCbKXz8c4JJEr4mtU=", - "rev": "7e251262409b3401809e57c5314dd158210355b8", - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" - }, - "src/third_party/devtools-frontend/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-D3W8U19i5pHWPLviMKbpzhiDoF6A0+tClYJcZWdbTqk=", - "rev": "bcf0ed097be848d234fb5290c1e4d69672dc5405", - "url": "https://chromium.googlesource.com/devtools/devtools-frontend" - }, - "src/third_party/dom_distiller_js/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", - "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", - "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" - }, - "src/third_party/eigen3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-c/4bf5+sJEgsKOJ34wPDNm1+6QUzETZZr/nE4SG5nKA=", - "rev": "66e8f38891841bf88ee976a316c0c78a52f0cee5", - "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" - }, - "src/third_party/electron_node": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-SI4qIix+sXWIS3WJyJoTdPb1cmSIhpLAmfa9iX/5Jlg=", - "owner": "nodejs", - "repo": "node", - "rev": "v18.17.1" - }, - "src/third_party/emoji-segmenter/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", - "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", - "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" - }, - "src/third_party/expat/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", - "rev": "441f98d02deafd9b090aea568282b28f66a50e36", - "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" - }, - "src/third_party/farmhash/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", - "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", - "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" - }, - "src/third_party/ffmpeg": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-uRgHTVaCAEaoqY20SmePQbApPmjimgggm5922KKfnbc=", - "rev": "0ba37733400593b162e5ae9ff26b384cff49c250", - "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" - }, - "src/third_party/flac": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", - "url": "https://chromium.googlesource.com/chromium/deps/flac.git" - }, - "src/third_party/flatbuffers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yibx1WMAwNajROMGVqox3naMU09RSayxUaTCJ860euo=", - "rev": "28861d1d7d5ec6ce34d4bbdc10bec4aace341167", - "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" - }, - "src/third_party/fontconfig/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", - "rev": "2fb3419a92156569bc1ec707401258c922cd0d99", - "url": "https://chromium.googlesource.com/external/fontconfig.git" - }, - "src/third_party/fp16/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" - }, - "src/third_party/freetype-testing/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", - "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", - "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" - }, - "src/third_party/freetype/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-RRieGqEeAk5AYzJqPRpF25FmxMpEYwR7AQWLzXkED50=", - "rev": "45903920b984540bb629bc89f4c010159c23a89a", - "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" - }, - "src/third_party/fuzztest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-tVtrSbLxnHrbh027cafNbqkfjq/afQxw57rW9yGsRe0=", - "rev": "25f44f341f701eccc29d22f69313a54363c6099b", - "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" - }, - "src/third_party/fxdiv/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", - "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" - }, - "src/third_party/gemmlowp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", - "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", - "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" - }, - "src/third_party/google_benchmark/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", - "rev": "b177433f3ee2513b1075140c723d73ab8901790f", - "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" - }, - "src/third_party/googletest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", - "rev": "af29db7ec28d6df1c7f0f745186884091e602e07", - "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" - }, - "src/third_party/grpc/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", - "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" - }, - "src/third_party/harfbuzz-ng/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+fClyD9Rsge9qdGF8WCv8taLTWNL8iManpXZUzDL2LM=", - "rev": "db700b5670d9475cc8ed4880cc9447b232c5e432", - "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" - }, - "src/third_party/highway/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", - "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", - "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" - }, - "src/third_party/hunspell_dictionaries": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", - "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" - }, - "src/third_party/icu": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=", - "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed", - "url": "https://chromium.googlesource.com/chromium/deps/icu.git" - }, - "src/third_party/jsoncpp/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", - "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" - }, - "src/third_party/leveldatabase/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", - "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", - "url": "https://chromium.googlesource.com/external/leveldb.git" - }, - "src/third_party/libFuzzer/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Zp8Ea/7GwmEl964MEIk3UM6IR5+FtUz8InlqZaOniDA=", - "rev": "26cc39e59b2bf5cbc20486296248a842c536878d", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" - }, - "src/third_party/libaddressinput/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", - "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", - "url": "https://chromium.googlesource.com/external/libaddressinput.git" - }, - "src/third_party/libaom/source/libaom": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Z8td6FIvHibTQsB6x/A/69xduogj2b2lteiQB6l56vE=", - "rev": "5f8db64abce68a3698fb732697ae50880bc9cac4", - "url": "https://aomedia.googlesource.com/aom.git" - }, - "src/third_party/libavif/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-KfRRGTS8kBwi9Z9wafpSwL29RU38THG2xBCvNBXtZtg=", - "rev": "b2d36b1c3bfc806694cd4ff0cb188270823fe6d8", - "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" - }, - "src/third_party/libavifinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yTv1AGtWfxXcywZycpsQBkBRLwuUJMPFKtpj7nrsc4A=", - "rev": "707919b2f8ac1920b2f7ae252c233f9c6dcf84e1", - "url": "https://aomedia.googlesource.com/libavifinfo.git" - }, - "src/third_party/libc++/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-YP1LAUaV8epDAsd9LOovdXUyzpaLgffOJcGM6VmTaKc=", - "rev": "84fb809dd6dae36d556dc0bb702c6cc2ce9d4b80", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" - }, - "src/third_party/libc++abi/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-CBUw50T/jFMXU0cR+BQH6JyEY3mHamLM6kA8YdvI24Q=", - "rev": "331847d7a5e6f8706689cf5d468e6e58c868fa10", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" - }, - "src/third_party/libdrm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", - "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", - "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" - }, - "src/third_party/libgav1/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-dT8/Mdit3Qc5Sno6DYKv1qSNr+6Lhiy24ZNNBKoVq8I=", - "rev": "df0023cc95b8e606a2fd243522d823401ef86637", - "url": "https://chromium.googlesource.com/codecs/libgav1.git" - }, - "src/third_party/libipp/libipp": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", - "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" - }, - "src/third_party/libjpeg_turbo": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bcmp8RqQYp4lRI9NfdfYgrAJsDLecJEhgRu9oosB9lQ=", - "rev": "30bdb85e302ecfc52593636b2f44af438e05e784", - "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" - }, - "src/third_party/liblouis/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", - "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", - "url": "https://chromium.googlesource.com/external/liblouis-github.git" - }, - "src/third_party/libphonenumber/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", - "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", - "url": "https://chromium.googlesource.com/external/libphonenumber.git" - }, - "src/third_party/libprotobuf-mutator/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", - "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" - }, - "src/third_party/libsrtp": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", - "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a", - "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" - }, - "src/third_party/libsync/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", - "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" - }, - "src/third_party/libunwind/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-rqmY4JNm4zuYqXs7o+1QhNnaNX4Cmt7PTJMGploHPnY=", - "rev": "a321409e66c212098e755cfae1a978bbcff1ccbb", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" - }, - "src/third_party/libvpx/source/libvpx": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5x0Sk8/DXaTCIydK79vWZgIx3IHeQbLUxoNyE7E+Sdo=", - "rev": "38a707faef72eeff89d669c553e7bfe9e08dba8f", - "url": "https://chromium.googlesource.com/webm/libvpx.git" - }, - "src/third_party/libwebm/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", - "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", - "url": "https://chromium.googlesource.com/webm/libwebm.git" - }, - "src/third_party/libwebp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-79peh0y3eeiW5cVQqVq0mUgDcGZ9BlY+OXkPZylKARY=", - "rev": "2af26267cdfcb63a88e5c74a85927a12d6ca1d76", - "url": "https://chromium.googlesource.com/webm/libwebp.git" - }, - "src/third_party/libyuv": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", - "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406", - "url": "https://chromium.googlesource.com/libyuv/libyuv.git" - }, - "src/third_party/lss": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", - "url": "https://chromium.googlesource.com/linux-syscall-support.git" - }, - "src/third_party/material_color_utilities/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oi28dWuTd6ijn/RKSPukDr5GSzYiCTM2klFb7WSMDHY=", - "rev": "234a000e507d586c20df6e3bf5b9e035bc5ce7b1", - "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" - }, - "src/third_party/minigbm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", - "rev": "3018207f4d89395cc271278fb9a6558b660885f5", - "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" - }, - "src/third_party/nan": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-tur5CExvwuSmwqBwH9o8OZWzDuifRybjEb+4/tm6exk=", - "owner": "nodejs", - "repo": "nan", - "rev": "16fa32231e2ccd89d2804b3f765319128b20c4ac" - }, - "src/third_party/nasm": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", - "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce", - "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" - }, - "src/third_party/nearby/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5d7c8WvkjmBuwcwqhxQf0wRE3qaF8fFsiqUE1sHh0nc=", - "rev": "8725391822b8901784b379a4573ab8828e7091d3", - "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" - }, - "src/third_party/neon_2_sse/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", - "rev": "a15b489e1222b2087007546b4912e21293ea86ff", - "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" - }, - "src/third_party/openh264/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", - "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", - "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" - }, - "src/third_party/openscreen/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TyZ/sZ0gnesWjKUnO2RVM2TTdpVIxsBWueHDgix0/wg=", - "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665", - "url": "https://chromium.googlesource.com/openscreen" - }, - "src/third_party/openscreen/src/third_party/tinycbor/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", - "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", - "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" - }, - "src/third_party/ots/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", - "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", - "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" - }, - "src/third_party/pdfium": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-u+El2jEnvlcQs5j5TthpKj8s255n2AhJPW+Q/s0Ljm0=", - "rev": "6e55da0c45788fdc22fa3aab7ead414fc42b74c1", - "url": "https://pdfium.googlesource.com/pdfium.git" - }, - "src/third_party/perfetto": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-/8WQO0r10Hz3yLNh1MtjE8rGfzbpDkUowA2OPwEuRvA=", - "rev": "43b72e3ce703b676c9c923b04540472d10790f56", - "url": "https://android.googlesource.com/platform/external/perfetto.git" - }, - "src/third_party/pthreadpool/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Pfvievhma1rOpbLdSrIX4KaZyRpdvrnjRzzPYl3fDQo=", - "rev": "1787867f6183f056420e532eec640cba25efafea", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" - }, - "src/third_party/pyelftools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", - "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" - }, - "src/third_party/pywebsocket3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", - "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" - }, - "src/third_party/quic_trace/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", - "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" - }, - "src/third_party/re2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9V/Q5o24sL1TJUDNifUqpyrQ2zTSrhU0Bxo9qDwd0+4=", - "rev": "87d09ef4f0307e53f1d3796843f4b90d41cfccaa", - "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" - }, - "src/third_party/ruy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hNco0Jol4vQS1bkYiXaoZ1IPHwoRq3DD3iY0TeLygew=", - "rev": "c04e5e52ae6b144f74ac032652e3c538bda15c9b", - "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" - }, - "src/third_party/securemessage/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", - "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", - "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" - }, - "src/third_party/skia": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Ck15ddYoo8pVLHcwW5P8Ei1sBQf23EGd/ySGOVSWAFQ=", - "rev": "b4f0c1163c955e42489f62d842585720cf0df0ea", - "url": "https://skia.googlesource.com/skia.git" - }, - "src/third_party/smhasher/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", - "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", - "url": "https://chromium.googlesource.com/external/smhasher.git" - }, - "src/third_party/snappy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", - "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", - "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" - }, - "src/third_party/speedometer/v3.0": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-PqrwtPFU3TI840za3UU8p+t4ZdyX0l79esEA602Mbq0=", - "rev": "5107c739c1b2a008e7293e3b489c4f80a8fb2e01", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" - }, - "src/third_party/sqlite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-35rSG+ptFMC62FsprLvAqfXZknKu40Ee6H2qpAcA3wI=", - "rev": "b7e480172bb2411f9afedefdcc69a57a12f18b7b", - "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" - }, - "src/third_party/squirrel.mac": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", - "owner": "Squirrel", - "repo": "Squirrel.Mac", - "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" - }, - "src/third_party/squirrel.mac/vendor/Mantle": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", - "owner": "Mantle", - "repo": "Mantle", - "rev": "78d3966b3c331292ea29ec38661b25df0a245948" - }, - "src/third_party/squirrel.mac/vendor/ReactiveObjC": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", - "owner": "ReactiveCocoa", - "repo": "ReactiveObjC", - "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" - }, - "src/third_party/swiftshader": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-PCPb5opTATGCCQmw8TGF09TbLL8QES+So+yaL68H//I=", - "rev": "32f9332d1d7aacbdba7c1aa5df894bb1890bb2cc", - "url": "https://swiftshader.googlesource.com/SwiftShader.git" - }, - "src/third_party/text-fragments-polyfill/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", - "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" - }, - "src/third_party/tflite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3gawK1S5+nr5yOAHgYozLWSoT1TbJmB6Md1fID6du9w=", - "rev": "91946956f81a2d9fd12a6d6baba20c997d3f8890", - "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" - }, - "src/third_party/ukey2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", - "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", - "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" - }, - "src/third_party/vulkan-deps": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xYX77wsgG+2TzS0AinFJndnID5P3/anY4TPh3cjRaIY=", - "rev": "4b7a5f2a3522cbc4e4334cdc64bfaf3f832b89c3", - "url": "https://chromium.googlesource.com/vulkan-deps" - }, - "src/third_party/vulkan-deps/glslang/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Y9AmEtFPj+sp/a5YnHChqlqgW/1kdaJ1CEbBB5r2cuI=", - "rev": "e3a711b6fc942307be7cb634698015dfd13c37fe", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" - }, - "src/third_party/vulkan-deps/spirv-cross/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-I8RXVat6//rlpmZuuC99Ar/Rct6MFce4FGKgQA2gBj0=", - "rev": "54997fb4bc3adeb47b9b9f7bb67f1c25eaca2204", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" - }, - "src/third_party/vulkan-deps/spirv-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-OqLxyrTzg1Q2zmQd0YalWtl7vX5lRJFmE2VH7fHC8/8=", - "rev": "d790ced752b5bfc06b6988baadef6eb2d16bdf96", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" - }, - "src/third_party/vulkan-deps/spirv-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wFdAzbOQdOqeuVaWl5036qkli1gkSiL5JHH82Z5cFL4=", - "rev": "4c16c35b16bbd462a0e89707ebeecc0bce956b2f", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" - }, - "src/third_party/vulkan-deps/vulkan-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9+tHkkHsP5ft6+tbofOYV1yBFDpFlJz4Q6YS8c6T5As=", - "rev": "2634c969d7dc0e983f005f7f2e665cce8449efe6", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" - }, - "src/third_party/vulkan-deps/vulkan-loader/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-q7/dYKQ3O0aSs326YbEeLlS+SciFWugBGm/G+b8RNd0=", - "rev": "d34bfafff23602e857064bea6d99a35eb63f37f2", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" - }, - "src/third_party/vulkan-deps/vulkan-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-tcaJmosHwTo38keV5qkumkLB1o1qq8v2ZmSsi2zDGoE=", - "rev": "389110e4600669d82bca042859fddf898387c0d2", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" - }, - "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7M47ZCbNwIppaotMfJTFTRsYNvSZNc0FUufoyXyUu/g=", - "rev": "dd26ae7065a9ed60c8ab517ed79bf7935394aec7", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" - }, - "src/third_party/vulkan-deps/vulkan-validation-layers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-lj6MIQctcK6gsJlLdLwQ9PHbiAtTbNIPinii8vGZdGk=", - "rev": "b89f48ae89ec064c91e8b77468cebc18c3faa682", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" - }, - "src/third_party/vulkan_memory_allocator": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-FdRPPdLZHj3RX3YzcmF58JJuIqeWQV3TDiiXPEW2lsc=", - "rev": "e87036508bb156f9986ea959323de1869e328f58", - "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" - }, - "src/third_party/wayland-protocols/gtk": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", - "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", - "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" - }, - "src/third_party/wayland-protocols/kde": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", - "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", - "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" - }, - "src/third_party/wayland-protocols/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", - "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" - }, - "src/third_party/wayland/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-aVcy7bW1cqEKbowlVgfa9FI8/oG7k5CzPZbRl+cPcX8=", - "rev": "a8c7553ec9af6462474524fd2bb4e9a7dc7217dd", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" - }, - "src/third_party/webdriver/pylib": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", - "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", - "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" - }, - "src/third_party/webgl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-h4by/1pp9oQGetZNnc1Rt5X5izgQf8ZUZDfsxQacqC0=", - "rev": "eab0468fc0405b21e59bea30a441d8e38c9db2b7", - "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" - }, - "src/third_party/webgpu-cts/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Wch3opAvU/6rJVptOKxOJssev8NhNpbYZddScTlzuMw=", - "rev": "4c8d2f67ecd03fbd3cb4c517ef8461427b6d635d", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" - }, - "src/third_party/webrtc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-KpiNGAue945kGCuQYGhxiWVUFTE1tcntSAXBZdkrE9A=", - "rev": "d8f2b0380b3ec980af35ce4b92ba6a211ec8c76d", - "url": "https://webrtc.googlesource.com/src.git" - }, - "src/third_party/weston/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-sfJm1CBGXX13pFcqeOVPqWlXrUfwjRl+rYf2BoT8Bt8=", - "rev": "775f8a1edf357f59e6b2e284297f396f4fac95a4", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" - }, - "src/third_party/wuffs/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", - "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba", - "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" - }, - "src/third_party/xdg-utils": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=", - "rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d", - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" - }, - "src/third_party/xnnpack/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-vsn3lrog5affus0qxc4TK2Z/tdd/E6hBYeUQRWoDZPQ=", - "rev": "b9d4073a6913891ce9cbd8965c8d506075d2a45a", - "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" - }, - "src/third_party/zstd/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yzv/R/GnqlXLeAjBEIev+8uM7MC0HeK0MfppnMTJ7Eg=", - "rev": "25822342be59d831bad65426ae51f5cc22157b09", - "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" - }, - "src/tools/page_cycler/acid3": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", - "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", - "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" - }, - "src/v8": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Fn4HoS7O2J3nGXFyq7r7AheRQzKy80USTQnNnC4rWqM=", - "rev": "36e4828ab658b8ad72f80974883c4c94f6e7012c", - "url": "https://chromium.googlesource.com/v8/v8.git" - } - }, - "electron_yarn_hash": "1yq854829a4q0yqyjyn2lq4l3amsqdhfd7fjcnc3mz8l2ci3n964", - "modules": "118", - "node": "18.17.1", - "version": "27.3.11" - }, - "28": { - "chrome": "120.0.6099.291", - "chromium": { - "deps": { - "gn": { - "hash": "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k=", - "rev": "e4702d7409069c4f12d45ea7b7f0890717ca3f4b", - "url": "https://gn.googlesource.com/gn", - "version": "2023-10-23" - } - }, - "version": "120.0.6099.291" - }, - "chromium_npm_hash": "sha256-zexxXAAJDnhMmh7HfBO1V1z1Yds06C3gSpXacsbjUb4=", - "deps": { - "src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-g0aRiWCPrXPKBsOsAgtLmRbOeYigtm05MrWH6/fhQs0=", - "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": "120.0.6099.291", - "url": "https://chromium.googlesource.com/chromium/src.git" - }, - "src/chrome/test/data/perf/canvas_bench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", - "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", - "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" - }, - "src/chrome/test/data/perf/frame_rate/content": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", - "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", - "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" - }, - "src/chrome/test/data/xr/webvr_info": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", - "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", - "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" - }, - "src/docs/website": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+UawYfW5FAMpv0TbzSR8qITPGUQulLIZ0mUh6ZdnmMI=", - "rev": "07714da3c28b942dc8522affed4487403e971545", - "url": "https://chromium.googlesource.com/website.git" - }, - "src/electron": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-Y0uNoq5LhlFMxQfqrTjzOokbB7Y6UUAlBCj+Nghiz5w=", - "owner": "electron", - "repo": "electron", - "rev": "v28.3.1" - }, - "src/media/cdm/api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", - "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", - "url": "https://chromium.googlesource.com/chromium/cdm.git" - }, - "src/net/third_party/quiche/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-JXWGEsJrXRXs2BrkWIC8cUBD6uvt8ftb9V5Dy2yLc/w=", - "rev": "a01a131ca6df63e774809d623f47e8cf28c574cc", - "url": "https://quiche.googlesource.com/quiche.git" - }, - "src/third_party/angle": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-aOV7kxrF8FeoHYodZjaUrDDUtpXg2gUiZg6Olv90puk=", - "rev": "6fff8ebc937f07e31473ac014a55f662248ab39a", - "url": "https://chromium.googlesource.com/angle/angle.git" - }, - "src/third_party/angle/third_party/VK-GL-CTS/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+g1yjF1yETrL1X6Cxu5mhPWXukWygg1dnawU8S9cGkA=", - "rev": "7d738783bf286e82937e431c295d4682f3767267", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" - }, - "src/third_party/angle/third_party/glmark2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", - "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", - "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" - }, - "src/third_party/angle/third_party/rapidjson/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", - "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", - "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" - }, - "src/third_party/anonymous_tokens/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2B0j9vNF8nMhmedk+ghz4JJJiDKN6jnVfdqsa4zRWeU=", - "rev": "47d423347823088a21b26262ca553eadb8e5b220", - "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" - }, - "src/third_party/beto-core/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-qgsPK7RyVqGRji0sTcMck1JqX9iCsYIExGoGwNZyVT0=", - "rev": "b902b346037ea3f4aadf8177021f6f917b16e648", - "url": "https://beto-core.googlesource.com/beto-core.git" - }, - "src/third_party/boringssl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hxPNJzWS2f4iUsNYwRvxiTL9vRrcZzZT5KpIx3+WuGM=", - "rev": "c38dc29860a72540eb2c4fdb8a8bfb27ef94ddf3", - "url": "https://boringssl.googlesource.com/boringssl.git" - }, - "src/third_party/breakpad/breakpad": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=", - "rev": "8988364bcddd9b194b0bf931c10bc125987330ed", - "url": "https://chromium.googlesource.com/breakpad/breakpad.git" - }, - "src/third_party/cast_core/public/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", - "rev": "71f51fd6fa45fac73848f65421081edd723297cd", - "url": "https://chromium.googlesource.com/cast_core/public" - }, - "src/third_party/catapult": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-jueHC5YC+WmGRtGZ8yD6QT2pVj21n1THpIz/vI9M334=", - "rev": "47efdb4b1428e549c58a6d6c2fa79c4a8ceaf9b4", - "url": "https://chromium.googlesource.com/catapult.git" - }, - "src/third_party/ced/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", - "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", - "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" - }, - "src/third_party/chromium-variations": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-cRFzDmGoyrxwPDVvatGm3EutOXtWqqlI7v7BeX5d43s=", - "rev": "cb7fe7e32de8b885ccdd6293444d8e4028b03eca", - "url": "https://chromium.googlesource.com/chromium-variations.git" - }, - "src/third_party/clang-format/script": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", - "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" - }, - "src/third_party/cld_3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", - "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", - "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" - }, - "src/third_party/colorama/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", - "rev": "3de9f013df4b470069d03d250224062e8cf15c49", - "url": "https://chromium.googlesource.com/external/colorama.git" - }, - "src/third_party/content_analysis_sdk/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", - "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", - "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" - }, - "src/third_party/cpu_features/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", - "rev": "936b9ab5515dead115606559502e3864958f7f6e", - "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" - }, - "src/third_party/cpuinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-BcSG/1aa/cyT8CCd1Qdsm/yXa5bCrmrtaRxnYjwkspY=", - "rev": "76d5e8f5b563daa65340a60fce0e9aec73a936df", - "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" - }, - "src/third_party/crc32c/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", - "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", - "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" - }, - "src/third_party/cros-components/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ZjLMlNDDN08v9SUFAuroPsu/6ADLHZAAFpv+bmaJA2Y=", - "rev": "25159cae8d540780cbeb994692ce4a3ea14cc094", - "url": "https://chromium.googlesource.com/external/google3/cros_components.git" - }, - "src/third_party/cros_system_api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wI4rx+oQ6i8yIB8NBp/O471O4pVJL3l+ez0t8I5oD/w=", - "rev": "00c21541508ea2c6863f1cda24ef88ef30309ae8", - "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" - }, - "src/third_party/crossbench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s/+y5bMj+CRnljFZ5aWKirPCsRUjckLOZ5F65WnPYSY=", - "rev": "06981428c28d66678ebec13ca1fac3785cf51bb1", - "url": "https://chromium.googlesource.com/crossbench.git" - }, - "src/third_party/dav1d/libdav1d": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9SrbxiOqXKTFf4qZ4Wqg9aoOMY8zv7NczTqN2+lXwCI=", - "rev": "47107e384bd1dc25674acf04d000a8cdc6195234", - "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" - }, - "src/third_party/dawn": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5srmcwL9Zqv91LwoBf9xuyusq1ghDo30Aj27Xo96yPc=", - "rev": "c7ed440d75861649d8a1ef4b775384f31211d902", - "url": "https://dawn.googlesource.com/dawn.git" - }, - "src/third_party/dawn/third_party/dxc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EAfTm0QZcihcU6ufBHE1QsYRggNWNKHjVZXcrUp/T+c=", - "rev": "64030a4e01e27c608b6c5f1ab5add43575e086f9", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" - }, - "src/third_party/dawn/third_party/dxheaders": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", - "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" - }, - "src/third_party/dawn/third_party/glfw": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", - "rev": "62e175ef9fae75335575964c845a302447c012c7", - "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" - }, - "src/third_party/dawn/third_party/khronos/EGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", - "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" - }, - "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", - "rev": "5bae8738b23d06968e7c3a41308568120943ae77", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" - }, - "src/third_party/dawn/third_party/webgpu-cts": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-DqQIyZU6kYYRoouIiJnJBit8l38wPu08zbJhM2BQbs4=", - "rev": "2ef3f322027bec1bb5572f5083d478148d355d79", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" - }, - "src/third_party/depot_tools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WtosDcMOV9eh0PhTbB5w3x3AYQs3Ui4h3mV0Ib0CBlc=", - "rev": "9f3b33a275e7a5b19d8ce4aba7960d2a38858681", - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" - }, - "src/third_party/devtools-frontend/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-B/2Qk5LSElBPNImlZHVF3A4g0GFE9OHG/+4QADpK+8w=", - "rev": "a6c7f00333881a7ecf7044b725052ab0c8776d6f", - "url": "https://chromium.googlesource.com/devtools/devtools-frontend" - }, - "src/third_party/dom_distiller_js/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", - "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", - "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" - }, - "src/third_party/eigen3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-mfS/l+V0If3fmXvA1p5gtyrNCU6IqWYrBbzm4jkXC3I=", - "rev": "aa6964bf3a34fd607837dd8123bc42465185c4f8", - "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" - }, - "src/third_party/electron_node": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-yvMU6dXRzHP7l6axo3g4svJ1H2edtFvX2MVMm3K1bEc=", - "owner": "nodejs", - "repo": "node", - "rev": "v18.18.2" - }, - "src/third_party/emoji-segmenter/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", - "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", - "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" - }, - "src/third_party/expat/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", - "rev": "441f98d02deafd9b090aea568282b28f66a50e36", - "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" - }, - "src/third_party/farmhash/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", - "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", - "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" - }, - "src/third_party/ffmpeg": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-lomUDmbbYW95BHEuYmm0pVqf++nYEa2XxeW4ag36tgc=", - "rev": "e1ca3f06adec15150a171bc38f550058b4bbb23b", - "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" - }, - "src/third_party/flac": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", - "url": "https://chromium.googlesource.com/chromium/deps/flac.git" - }, - "src/third_party/flatbuffers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", - "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5", - "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" - }, - "src/third_party/fontconfig/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", - "rev": "2fb3419a92156569bc1ec707401258c922cd0d99", - "url": "https://chromium.googlesource.com/external/fontconfig.git" - }, - "src/third_party/fp16/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" - }, - "src/third_party/freetype-testing/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", - "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", - "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" - }, - "src/third_party/freetype/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wyaCNPPL2CTZYY6YUUuGnN3TjHxgKeHAYsw+r88ijMI=", - "rev": "55d0287cfc31115760cb13caa346b407ef0c0ceb", - "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" - }, - "src/third_party/fuzztest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wuB/lbkVCbisZvVFuLdE8XNDuiLQcI47/Y0EqvOCytc=", - "rev": "b5dbc33890d9586e4f6a213f1bf163ad287e6aa4", - "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" - }, - "src/third_party/fxdiv/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", - "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" - }, - "src/third_party/gemmlowp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", - "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", - "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" - }, - "src/third_party/google_benchmark/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", - "rev": "b177433f3ee2513b1075140c723d73ab8901790f", - "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" - }, - "src/third_party/googletest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", - "rev": "af29db7ec28d6df1c7f0f745186884091e602e07", - "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" - }, - "src/third_party/grpc/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", - "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" - }, - "src/third_party/harfbuzz-ng/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xCsfgbsWVSiuII5zFspssrqX4NrRuhzufYSq6fdnjKQ=", - "rev": "f26fd69d858642d76413b8f4068eaf9b57c40a5f", - "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" - }, - "src/third_party/highway/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", - "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", - "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" - }, - "src/third_party/hunspell_dictionaries": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", - "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" - }, - "src/third_party/icu": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=", - "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed", - "url": "https://chromium.googlesource.com/chromium/deps/icu.git" - }, - "src/third_party/jsoncpp/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", - "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" - }, - "src/third_party/leveldatabase/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", - "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", - "url": "https://chromium.googlesource.com/external/leveldb.git" - }, - "src/third_party/libFuzzer/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", - "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" - }, - "src/third_party/libaddressinput/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", - "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", - "url": "https://chromium.googlesource.com/external/libaddressinput.git" - }, - "src/third_party/libaom/source/libaom": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6oZWYXRTZ1IC5yGvfPI19PwPU9O7mKBsW2wVxBGwU/I=", - "rev": "1dbe1c7fae2456f91ccc79fecb919e9ffea0727a", - "url": "https://aomedia.googlesource.com/aom.git" - }, - "src/third_party/libavif/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Jd/KwJJ1oeQMLg8CShTTDQhCVHEDpXcQHiA4+NXYOIA=", - "rev": "1a78d970b8315e7cc6a8601861ec75189c50c214", - "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" - }, - "src/third_party/libavifinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", - "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a", - "url": "https://aomedia.googlesource.com/libavifinfo.git" - }, - "src/third_party/libc++/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-DVO15xGxatRbUp13EoNslGEZ2QSHn97VbEBHyfMvKfQ=", - "rev": "a429c26ae25c26a569ff12390d5f9be70c5e286b", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" - }, - "src/third_party/libc++abi/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-QjCPRgFU34wZ8GG/dl+6wi2gflje3fG/x+eokb9W02c=", - "rev": "2ca9f38714b1465b9f55b5fbd0da5e4342811e2b", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" - }, - "src/third_party/libdrm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", - "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", - "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" - }, - "src/third_party/libgav1/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-dT8/Mdit3Qc5Sno6DYKv1qSNr+6Lhiy24ZNNBKoVq8I=", - "rev": "df0023cc95b8e606a2fd243522d823401ef86637", - "url": "https://chromium.googlesource.com/codecs/libgav1.git" - }, - "src/third_party/libipp/libipp": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", - "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" - }, - "src/third_party/libjpeg_turbo": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", - "rev": "9b894306ec3b28cea46e84c32b56773a98c483da", - "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" - }, - "src/third_party/liblouis/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", - "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", - "url": "https://chromium.googlesource.com/external/liblouis-github.git" - }, - "src/third_party/libphonenumber/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", - "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", - "url": "https://chromium.googlesource.com/external/libphonenumber.git" - }, - "src/third_party/libprotobuf-mutator/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", - "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" - }, - "src/third_party/libsrtp": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", - "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a", - "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" - }, - "src/third_party/libsync/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", - "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" - }, - "src/third_party/libunwind/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bQHo8CKDpqvJcVv6OzVO7LOGTqL9qHqD4n9TtRK0v5g=", - "rev": "7686b5d38c69d14932abfb1c1a66ba56c78791ad", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" - }, - "src/third_party/libvpx/source/libvpx": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UA/pf35eWFArRM+QdN6i6LK0ePWzXEsviHlf3WUgMoM=", - "rev": "424723dc025ce451dab9568239a46b18d0919b4d", - "url": "https://chromium.googlesource.com/webm/libvpx.git" - }, - "src/third_party/libwebm/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", - "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", - "url": "https://chromium.googlesource.com/webm/libwebm.git" - }, - "src/third_party/libwebp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", - "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760", - "url": "https://chromium.googlesource.com/webm/libwebp.git" - }, - "src/third_party/libyuv": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", - "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406", - "url": "https://chromium.googlesource.com/libyuv/libyuv.git" - }, - "src/third_party/lss": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", - "url": "https://chromium.googlesource.com/linux-syscall-support.git" - }, - "src/third_party/material_color_utilities/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oi28dWuTd6ijn/RKSPukDr5GSzYiCTM2klFb7WSMDHY=", - "rev": "234a000e507d586c20df6e3bf5b9e035bc5ce7b1", - "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" - }, - "src/third_party/minigbm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", - "rev": "3018207f4d89395cc271278fb9a6558b660885f5", - "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" - }, - "src/third_party/nan": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", - "owner": "nodejs", - "repo": "nan", - "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" - }, - "src/third_party/nasm": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", - "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce", - "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" - }, - "src/third_party/nearby/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9PT/tuxjREGsvSnYT2wyaL5sB52CcYPpKVKN0ZGldWU=", - "rev": "629e7ba7c964a62c97f6a882bffaec3c8490bb1e", - "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" - }, - "src/third_party/neon_2_sse/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", - "rev": "a15b489e1222b2087007546b4912e21293ea86ff", - "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" - }, - "src/third_party/openh264/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", - "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", - "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" - }, - "src/third_party/openscreen/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TyZ/sZ0gnesWjKUnO2RVM2TTdpVIxsBWueHDgix0/wg=", - "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665", - "url": "https://chromium.googlesource.com/openscreen" - }, - "src/third_party/openscreen/src/third_party/tinycbor/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", - "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", - "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" - }, - "src/third_party/ots/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", - "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", - "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" - }, - "src/third_party/pdfium": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-U1cScrfKN0F+cy307RT2iwB6RYKeCNDRnkYxzamezoY=", - "rev": "a3895af47f600e3f9677f31fa39e15bd01c18457", - "url": "https://pdfium.googlesource.com/pdfium.git" - }, - "src/third_party/perfetto": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xLx+dnUysm+HS1esu2hAqBKg/GgTJK4SQu1ZINr2aYc=", - "rev": "7ce535ddfc62d30166f35a8ed0f121da5eb0437c", - "url": "https://android.googlesource.com/platform/external/perfetto.git" - }, - "src/third_party/pthreadpool/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", - "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" - }, - "src/third_party/pyelftools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", - "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" - }, - "src/third_party/pywebsocket3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", - "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" - }, - "src/third_party/quic_trace/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", - "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" - }, - "src/third_party/re2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-m3bJlSyyhmj/7jvy7ExNX/gol7yeu1mnmyAc8u8Pr8s=", - "rev": "3d9bdbd0e208d3274a1cb1275c94d8b7626ddde2", - "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" - }, - "src/third_party/ruy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Zi3A49YqDE5S4iSpw9t9kTzitbQbcslm1zsepWX5cbw=", - "rev": "6ffa93a89376555b09134c59b84d8f5e9cfc6ce6", - "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" - }, - "src/third_party/securemessage/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", - "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", - "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" - }, - "src/third_party/skia": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-CvoJxsBN1Nyh+RPgU+aptZW5WsfGB4hmSlhyma1wO+E=", - "rev": "349c1179c43ef46f2804404952b9460dc007d76a", - "url": "https://skia.googlesource.com/skia.git" - }, - "src/third_party/smhasher/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", - "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", - "url": "https://chromium.googlesource.com/external/smhasher.git" - }, - "src/third_party/snappy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", - "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", - "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" - }, - "src/third_party/speedometer/v3.0": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-PqrwtPFU3TI840za3UU8p+t4ZdyX0l79esEA602Mbq0=", - "rev": "5107c739c1b2a008e7293e3b489c4f80a8fb2e01", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" - }, - "src/third_party/sqlite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wKsfwZpDRQzYQp6qls07uapgy9K3TWLOEUQlhIFpJtw=", - "rev": "cd9486849ba3c3ec753f556fd29c0aabee122a28", - "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" - }, - "src/third_party/squirrel.mac": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", - "owner": "Squirrel", - "repo": "Squirrel.Mac", - "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" - }, - "src/third_party/squirrel.mac/vendor/Mantle": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", - "owner": "Mantle", - "repo": "Mantle", - "rev": "78d3966b3c331292ea29ec38661b25df0a245948" - }, - "src/third_party/squirrel.mac/vendor/ReactiveObjC": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", - "owner": "ReactiveCocoa", - "repo": "ReactiveObjC", - "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" - }, - "src/third_party/swiftshader": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Im4sdDo4b96YQIKDcAmqUk8PiJzejZgSDPur3hqPPRk=", - "rev": "d9ec9befba05a8dfca09c1e88f3f7be0e4b153c6", - "url": "https://swiftshader.googlesource.com/SwiftShader.git" - }, - "src/third_party/text-fragments-polyfill/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", - "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" - }, - "src/third_party/tflite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-119/isDtopnj6MBRr3bzBvIppXw8M/ejcPx0CmIjXZU=", - "rev": "21e56c30e480ac67bed48335a5d122c59a6a6805", - "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" - }, - "src/third_party/ukey2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", - "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", - "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" - }, - "src/third_party/vulkan-deps": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-lqCUx70IeHZ7YfE9DXia7dFok/JsFu/HSIv2AGi37YI=", - "rev": "2b783ed328d3a46e6a7a21218ced6b4dd1684114", - "url": "https://chromium.googlesource.com/vulkan-deps" - }, - "src/third_party/vulkan-deps/glslang/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+Qs+Q3p11y9oUKyWEbuaQ0vx6hppFZSFbFuU0ve6rRo=", - "rev": "ebb0a8b28e5ea7a13146a24b3ad87b1966dbdfa3", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" - }, - "src/third_party/vulkan-deps/spirv-cross/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UIk5hihUPjXNzEeO2laS4dUef/rEExxXAZjMcftx+3A=", - "rev": "2de1265fca722929785d9acdec4ab728c47a0254", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" - }, - "src/third_party/vulkan-deps/spirv-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-JLFVzFNdXqxyKmg3NymIqqZmf2GAb7tYetQ6HJPsUIQ=", - "rev": "88bc5e321c2839707df8b1ab534e243e00744177", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" - }, - "src/third_party/vulkan-deps/spirv-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+HUDsp0COKlPtKidOVvUk7lN1AiFw01i5ANc3MO+qjs=", - "rev": "5084f58e5d187b16f84d2af936ff94ea2f46a00c", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" - }, - "src/third_party/vulkan-deps/vulkan-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UlaNc1NxTYulrF4Ol0rLysbLwbFR46Evq7WkWncPB8k=", - "rev": "f4bfcd885214675a6a0d7d4df07f52b511e6ea16", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" - }, - "src/third_party/vulkan-deps/vulkan-loader/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GbVr8LmwC6r7a13++5cYJXAq+H4P07quEHpTUV1qfqA=", - "rev": "7b7d15bc9f1d782e4d6ea34e61fd9a36a7952208", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" - }, - "src/third_party/vulkan-deps/vulkan-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-vnrhYM7tcDTcXH4A+2leio5Wc1+b5H+7CQISEI+SPV8=", - "rev": "f7017f23337b90a2b2ceb65a4e1050e8ad89e065", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" - }, - "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-buxOdupK/w1sFGGHrEI+On2/mR0q5whvQNKUI8dxJ60=", - "rev": "dcfce25b439a2785f2c90b184e1964898070b4f1", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" - }, - "src/third_party/vulkan-deps/vulkan-validation-layers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LJd7pkcFd8k4npEv8mJy+47xo/5CXMN75ZAtDp+v6FI=", - "rev": "281e1c1c6b51bb6b33f88c18ed4da58ac3024311", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" - }, - "src/third_party/vulkan_memory_allocator": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", - "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", - "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" - }, - "src/third_party/wayland-protocols/gtk": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", - "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", - "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" - }, - "src/third_party/wayland-protocols/kde": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", - "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", - "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" - }, - "src/third_party/wayland-protocols/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", - "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" - }, - "src/third_party/wayland/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0ICSMZhnsLqMNfqSGjqM3p4ssxptkBtt7EMCpxknW4A=", - "rev": "3fda2fbf51db54398c0155facee82cc9533958a2", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" - }, - "src/third_party/webdriver/pylib": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", - "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", - "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" - }, - "src/third_party/webgl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=", - "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed", - "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" - }, - "src/third_party/webgpu-cts/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-E39f0wy72TwQ9IM4QquqWxwDiHZOUI8hWkx2QDFcRog=", - "rev": "3dbe4ce12983ccc1ad42e228057c7d8adc17cb78", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" - }, - "src/third_party/webrtc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ju7sX1jrzg5BZOqdkcnFymRTqdFi7xkeHznKJQB1+08=", - "rev": "5ab829e4ca8f63be6b4ed1d98eee382d7307d34e", - "url": "https://webrtc.googlesource.com/src.git" - }, - "src/third_party/weston/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", - "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" - }, - "src/third_party/wuffs/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", - "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba", - "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" - }, - "src/third_party/xdg-utils": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", - "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" - }, - "src/third_party/xnnpack/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s9Avx9o+1igKulOpKhtbbkoINuh1wNercPszRaA4TZM=", - "rev": "bbbaa7352a3ea729987d3e654d37be93e8009691", - "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" - }, - "src/third_party/zstd/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-95OOpYKGve+YWzqqguQIg1emTOAuaGyYpWxrWVDOKAQ=", - "rev": "cdceb0fce59785c841bf697e00067163106064e1", - "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" - }, - "src/tools/page_cycler/acid3": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", - "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", - "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" - }, - "src/v8": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GevDXfVX4UxwTbgp2ZQbp3AFOHv5tECmyqLGIyYi5Tw=", - "rev": "71b6b5a68e0883c155e01368aace6eb6d71b85f3", - "url": "https://chromium.googlesource.com/v8/v8.git" - } - }, - "electron_yarn_hash": "117vxam1044yy2akwjfhvb5dpfnv667pwbg92ac43551xfn0slcg", - "modules": "119", - "node": "18.18.2", - "version": "28.3.1" - }, "29": { "chrome": "122.0.6261.156", "chromium": { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9135e7f94e33..7456acea8e79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18004,8 +18004,8 @@ with pkgs; electron_30-bin; electron_24 = electron_24-bin; - electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin; - electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin; + electron_27 = electron_27-bin; + electron_28 = electron_28-bin; electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron = electron_30; From fb9cdbda70e96d8570f351fd385862f50a009717 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 13 Jun 2024 01:25:31 +0200 Subject: [PATCH 46/46] chromium,electron-source: remove no longer needed version conditionals The minimum versions for both chromium and electron-source are higher than the version bounds of those conditionals. As such, they can be safely removed. This is a no-op. --- .../networking/browsers/chromium/common.nix | 28 ++++--------------- pkgs/development/tools/electron/common.nix | 4 +-- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 691a20f92c8d..3616189374d3 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -284,20 +284,6 @@ let # Rebased variant of patch right above to build M126+ with LLVM 17. # staging-next will bump LLVM to 18, so we will be able to drop this soon. ./patches/chromium-126-llvm-17.patch - ] ++ lib.optionals (!chromiumVersionAtLeast "119.0.6024.0") [ - # Fix build with at-spi2-core ≥ 2.49 - # This version is still needed for electron. - (githubPatch { - commit = "fc09363b2278893790d131c72a4ed96ec9837624"; - hash = "sha256-l60Npgs/+0ozzuKWjwiHUUV6z59ObUjAPTfXN7eXpzw="; - }) - ] ++ lib.optionals (!chromiumVersionAtLeast "121.0.6104.0") [ - # Fix build with at-spi2-core ≥ 2.49 - # https://chromium-review.googlesource.com/c/chromium/src/+/5001687 - (githubPatch { - commit = "b9bef8e9555645fc91fab705bec697214a39dbc1"; - hash = "sha256-CJ1v/qc8+nwaHQR9xsx08EEcuVRbyBfCZCm/G7hRY+4="; - }) ] ++ lib.optionals (versionRange "121" "126") [ # M121 is the first version to require the new rust toolchain. # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61 @@ -476,10 +462,6 @@ let use_system_libffi = true; # Use nixpkgs Rust compiler instead of the one shipped by Chromium. rust_sysroot_absolute = "${buildPackages.rustc}"; - # Rust is enabled for M121+, see next section: - enable_rust = false; - } // lib.optionalAttrs (chromiumVersionAtLeast "121") { - # M121 the first version to actually require a functioning rust toolchain enable_rust = true; # While we technically don't need the cache-invalidation rustc_version provides, rustc_version # is still used in some scripts (e.g. build/rust/std/find_std_rlibs.py). @@ -498,10 +480,12 @@ let } // lib.optionalAttrs ungoogled (lib.importTOML ./ungoogled-flags.toml) // (extraAttrs.gnFlags or {})); - # We cannot use chromiumVersionAtLeast in mkDerivation's env attrset due - # to infinite recursion when chromium.override is used (e.g. electron). - # To work aroud this, we use export in the preConfigure phase. - preConfigure = lib.optionalString (chromiumVersionAtLeast "121") '' + # TODO: Migrate this to env.RUSTC_BOOTSTRAP next mass-rebuild. + # Chromium expects nightly/bleeding edge rustc features to be available. + # Our rustc in nixpkgs follows stable, but since bootstrapping rustc requires + # nightly features too, we can (ab-)use RUSTC_BOOTSTRAP here as well to + # enable those features in our stable builds. + preConfigure = '' export RUSTC_BOOTSTRAP=1 ''; diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 3514d7cdad22..36cecd7ce6a6 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -49,7 +49,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { src = null; - patches = base.patches ++ lib.optional (lib.versionAtLeast info.version "29" && lib.versionOlder info.version "30") + patches = base.patches ++ lib.optional (lib.versionOlder info.version "30") (substituteAll { # disable a component that requires CIPD blobs name = "disable-screen-ai.patch"; @@ -172,10 +172,8 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { use_perfetto_client_library = false; v8_builtins_profiling_log_file = ""; enable_dangling_raw_ptr_checks = false; - } // lib.optionalAttrs (lib.versionAtLeast info.version "28") { dawn_use_built_dxc = false; v8_enable_private_mapping_fork_optimization = true; - } // lib.optionalAttrs (lib.versionAtLeast info.version "29") { v8_expose_public_symbols = true; } // {