From 62d173f9c81debc92e341da29bf8a29e8b9ec28b Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 3 Sep 2025 23:39:44 +0200 Subject: [PATCH] gclient2nix: update, fix for electron_38 Fixes error: ``` File "/nix/store/x95xf16qsvblyxgcag1fqmrsqm7px6rk-depot_tools-452fe3b/gclient_eval.py", line 643, in _convert raise ValueError('invalid "and" operand %r (inside %r)' % ValueError: invalid "and" operand 'checkout_riscv64' (inside 'checkout_linux and checkout_riscv64 and non_git_source') ``` --- pkgs/by-name/gc/gclient2nix/gclient2nix.py | 2 +- pkgs/by-name/gc/gclient2nix/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gc/gclient2nix/gclient2nix.py b/pkgs/by-name/gc/gclient2nix/gclient2nix.py index b443ee6000ca..e24cdce9be96 100755 --- a/pkgs/by-name/gc/gclient2nix/gclient2nix.py +++ b/pkgs/by-name/gc/gclient2nix/gclient2nix.py @@ -91,7 +91,7 @@ class Repo: }, **{ f"checkout_{arch}": True - for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc"] + for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc", "riscv64"] }, }, "", diff --git a/pkgs/by-name/gc/gclient2nix/package.nix b/pkgs/by-name/gc/gclient2nix/package.nix index f3df6a2c5a01..660062a0c3b1 100644 --- a/pkgs/by-name/gc/gclient2nix/package.nix +++ b/pkgs/by-name/gc/gclient2nix/package.nix @@ -68,8 +68,8 @@ runCommand "gclient2nix" # substitutions depot_tools_checkout = fetchgit { url = "https://chromium.googlesource.com/chromium/tools/depot_tools"; - rev = "452fe3be37f78fbecefa1b4b0d359531bcd70d0d"; - hash = "sha256-8IiJOm0FLa/u1Vd96tb33Ruj4IUTCeYgBpTk88znhPw="; + rev = "fa63ec7437108dcb3a611c6a6c5f3d96771e9581"; + hash = "sha256-hRIwhIdRF2GbyXbpOdi/lla+/XYM+gKosoK+T+kYYu0="; }; passthru = {