From 47ba1c051206d7415e81094188fb501ed59e0cfd Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Sun, 13 Oct 2024 21:48:12 -0400
Subject: [PATCH 1/2] bear: reformat using RFC style

---
 .../tools/build-managers/bear/default.nix     | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index 13f16c9171b6..7ad10220c053 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -1,21 +1,23 @@
-{ lib, stdenv
-, fetchFromGitHub
-, cmake
-, ninja
-, pkg-config
-, grpc
-, protobuf
-, openssl
-, nlohmann_json
-, gtest
-, spdlog
-, c-ares
-, zlib
-, sqlite
-, re2
-, lit
-, python3
-, coreutils
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  pkg-config,
+  grpc,
+  protobuf,
+  openssl,
+  nlohmann_json,
+  gtest,
+  spdlog,
+  c-ares,
+  zlib,
+  sqlite,
+  re2,
+  lit,
+  python3,
+  coreutils,
 }:
 
 stdenv.mkDerivation rec {

From 6eb298a40f902220428aba21e9cc066d88008072 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Sun, 13 Oct 2024 21:48:46 -0400
Subject: [PATCH 2/2] bear: fix build failure

---
 pkgs/development/tools/build-managers/bear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index 7ad10220c053..489181187c4e 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -6,7 +6,7 @@
   ninja,
   pkg-config,
   grpc,
-  protobuf,
+  protobuf_25,
   openssl,
   nlohmann_json,
   gtest,
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     grpc
-    protobuf
+    protobuf_25
     openssl
     nlohmann_json
     gtest