Merge pull request NixOS#13210 from NixOS/mergify/bp/2.29-maintenance/pr-13207

mergify[bot] · web-flow · commit f51b53723982 · 2025-05-15T22:32:16.000Z
dev-shell: Drop bear dependency (backport NixOS#13207)
diff --git a/packaging/dev-shell.nix b/packaging/dev-shell.nix
@@ -119,9 +119,6 @@ pkgs.nixComponents2.nix-util.overrideAttrs (
         (pkgs.writeScriptBin "pre-commit-hooks-install" modular.pre-commit.settings.installationScript)
         pkgs.buildPackages.nixfmt-rfc-style
       ]
-      # TODO: Remove the darwin check once
-      # https://github.com/NixOS/nixpkgs/pull/291814 is available
-      ++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) pkgs.buildPackages.bear
       ++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) (
         lib.hiPrio pkgs.buildPackages.clang-tools
       )

Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,6 @@ pkgs.nixComponents2.nix-util.overrideAttrs (`
`119`	`119`	`(pkgs.writeScriptBin "pre-commit-hooks-install" modular.pre-commit.settings.installationScript)`
`120`	`120`	`pkgs.buildPackages.nixfmt-rfc-style`
`121`	`121`	`]`
`122`		`- # TODO: Remove the darwin check once`
`123`		`- # https://github.com/NixOS/nixpkgs/pull/291814 is available`
`124`		`- ++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) pkgs.buildPackages.bear`
`125`	`122`	`++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) (`
`126`	`123`	`lib.hiPrio pkgs.buildPackages.clang-tools`
`127`	`124`	`)`