Merge master into staging-next

nixos/modules/i18n/input-method/default.nix

@@ -22,13 +22,12 @@ let
         preferLocalBuild = true;
         allowSubstitutes = false;
         buildInputs = [
-          pkgs.gtk2
           cfg.package
         ];
       }
       ''
         mkdir -p $out/etc/gtk-2.0/
-        GTK_PATH=${cfg.package}/lib/gtk-2.0/ gtk-query-immodules-2.0 > $out/etc/gtk-2.0/immodules.cache
+        GTK_PATH=${cfg.package}/lib/gtk-2.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk2.dev "gtk-query-immodules-2.0"} > $out/etc/gtk-2.0/immodules.cache
       '';
 
   gtk3_cache =
@@ -37,13 +36,12 @@ let
         preferLocalBuild = true;
         allowSubstitutes = false;
         buildInputs = [
-          pkgs.gtk3
           cfg.package
         ];
       }
       ''
         mkdir -p $out/etc/gtk-3.0/
-        GTK_PATH=${cfg.package}/lib/gtk-3.0/ gtk-query-immodules-3.0 > $out/etc/gtk-3.0/immodules.cache
+        GTK_PATH=${cfg.package}/lib/gtk-3.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk3.dev "gtk-query-immodules-3.0"} > $out/etc/gtk-3.0/immodules.cache
       '';
 
 in
@@ -107,8 +105,12 @@ in
     environment.systemPackages = [
       cfg.package
     ]
-    ++ lib.optional cfg.enableGtk2 gtk2_cache
-    ++ lib.optional cfg.enableGtk3 gtk3_cache;
+    ++ lib.optional (
+      cfg.enableGtk2 && (pkgs.stdenv.hostPlatform.emulatorAvailable pkgs.buildPackages)
+    ) gtk2_cache
+    ++ lib.optional (
+      cfg.enableGtk3 && (pkgs.stdenv.hostPlatform.emulatorAvailable pkgs.buildPackages)
+    ) gtk3_cache;
   };
 
   meta = {

pkgs/by-name/ai/aide/package.nix

@@ -14,15 +14,18 @@
   libgcrypt,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "aide";
   version = "0.19.2";
 
   src = fetchurl {
-    url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-I3YrBfRhEe3rPIoFAWyHMcAb24wfkb5IwVbDGrhedMQ=";
+    # We specifically want the tar.gz, so fetchFromGitHub is not suitable here
+    url = "https://github.com/aide/aide/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    hash = "sha256-I3YrBfRhEe3rPIoFAWyHMcAb24wfkb5IwVbDGrhedMQ=";
   };
 
+  nativeBuildInputs = [ pkg-config ];
+
   buildInputs = [
     flex
     bison
@@ -35,8 +38,6 @@ stdenv.mkDerivation rec {
     libgcrypt
   ];
 
-  nativeBuildInputs = [ pkg-config ];
-
   configureFlags = [
     "--with-posix-acl"
     "--with-selinux"
@@ -46,11 +47,11 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://aide.github.io/";
-    changelog = "https://github.com/aide/aide/blob/v${version}/ChangeLog";
+    changelog = "https://github.com/aide/aide/blob/v${finalAttrs.version}/ChangeLog";
     description = "File and directory integrity checker";
     mainProgram = "aide";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ happysalada ];
     platforms = lib.platforms.linux;
   };
-}
+})

pkgs/by-name/ai/aider-chat/fix-tree-sitter.patch

@@ -0,0 +1,21 @@
+diff --git a/aider/repomap.py b/aider/repomap.py
+index 23eee239..0a40f2e6 100644
+--- a/aider/repomap.py
++++ b/aider/repomap.py
+@@ -16,6 +16,7 @@ from grep_ast import TreeContext, filename_to_lang
+ from pygments.lexers import guess_lexer_for_filename
+ from pygments.token import Token
+ from tqdm import tqdm
++from tree_sitter import QueryCursor
+ 
+ from aider.dump import dump
+ from aider.special import filter_important_files
+@@ -286,7 +287,7 @@ class RepoMap:
+ 
+         # Run the tags queries
+         query = language.query(query_scm)
+-        captures = query.captures(tree.root_node)
++        captures = QueryCursor(query).captures(tree.root_node)
+ 
+         saw = set()
+         if USING_TSL_PACK:

pkgs/by-name/ai/aider-chat/package.nix

@@ -146,6 +146,8 @@ let
     ];
 
     patches = [
+      ./fix-tree-sitter.patch
+
       (replaceVars ./fix-flake8-invoke.patch {
         flake8 = lib.getExe python3Packages.flake8;
       })

pkgs/by-name/au/audiobookshelf/package.nix

@@ -15,10 +15,10 @@
 
 let
   source = {
-    version = "2.28.0";
-    hash = "sha256-bbsiaSGIaD5oFnhk3e+SWzYxv4dsRXrgMVbe1lsj4pw=";
-    npmDepsHash = "sha256-JC2uOXV+EwS6CGwyOUTXcymFwLSz/KUqIoB4ccSGgbw=";
-    clientNpmDepsHash = "sha256-6l8apOd3R259+SlcD6P6rx1FkRnB80keoBGcfbQNhGU=";
+    version = "2.29.0";
+    hash = "sha256-Vewznln5Ny8SWfOfyusnDcO9CsTwWrOTP+W8ynnSdR0=";
+    npmDepsHash = "sha256-zk2Xw3lpy/ZBZZKSsMgdIHrKGB7yl9GYtewn9ME1guc=";
+    clientNpmDepsHash = "sha256-mDS/onnotiBTFihoSMSccF/mrdTduZj5DZfQpyzMoDY=";
   };
 
   src = fetchFromGitHub {

pkgs/by-name/ba/bant/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   buildBazelPackage,
   fetchFromGitHub,
-  bazel_6,
+  bazel_7,
   jdk,
   nix-update-script,
   cctools,
@@ -39,12 +39,14 @@ buildBazelPackage rec {
     patchShebangs scripts/create-workspace-status.sh
   '';
 
+  removeRulesCC = false;
+
   fetchAttrs = {
     hash =
       {
-        aarch64-linux = "sha256-ibv49Y0VjAvfTUwxRUH4BmzUvz8J/qfYPGnI5Tw51HA=";
-        x86_64-linux = "sha256-VHR08FB4G0LlczWtBb8AdU5tNEzBDNUZpHoB6e3HB1M=";
-        aarch64-darwin = "sha256-5uKCLDJs0tzOJ7YiKP90RIfIYrken3XFyhT5HHdzft0=";
+        aarch64-linux = "sha256-1iy2S0mmXksfwucks+HOZ2/HUGaVBqk7VlR+kO6iYZE=";
+        x86_64-linux = "sha256-YOIwwlCYlNINlYbm/vq3Jjhe+/zgrtECdMRl+vE8FgI=";
+        aarch64-darwin = "sha256-7g1deAihrjpwAxNbG7rv9dDs3FjOCuRIFieLbENKmbw=";
       }
       .${system} or (throw "No hash for system: ${system}");
   };
@@ -52,7 +54,7 @@ buildBazelPackage rec {
   nativeBuildInputs = [
     jdk
   ];
-  bazel = bazel_6;
+  bazel = bazel_7;
 
   bazelBuildFlags = [ "-c opt" ];
   bazelTestTargets = [ "//..." ];

pkgs/by-name/bi/bitwarden-desktop/package.nix

@@ -49,6 +49,8 @@ buildNpmPackage' rec {
 
     # ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron
     ./set-exe-path.patch
+    # ensure that the desktop proxy is correctly located in libexec
+    ./set-desktop-proxy-path.patch
     # on linux: don't flip fuses, don't create wrapper script, on darwin: don't try copying safari extensions, don't try re-signing app
     ./skip-afterpack-and-aftersign.patch
     # since out arch doesn't match upstream, we'll generate and use desktop_napi.node instead of desktop_napi.${platform}-${arch}.node
@@ -60,6 +62,8 @@ buildNpmPackage' rec {
     rm -r bitwarden_license
 
     substituteInPlace apps/desktop/src/main.ts --replace-fail '%%exePath%%' "$out/bin/bitwarden"
+    substituteInPlace apps/desktop/src/main/native-messaging.main.ts \
+      --replace-fail '%%desktopProxyPath%%' "$out/libexec/desktop_proxy"
 
     # force canUpdate to false
     # will open releases page instead of trying to update files
@@ -133,6 +137,10 @@ buildNpmPackage' rec {
     pushd apps/desktop/desktop_native/napi
     npm run build
     popd
+
+    pushd apps/desktop/desktop_native/proxy
+    cargo build --bin desktop_proxy --release -j $NIX_BUILD_CORES --offline
+    popd
   '';
 
   postBuild = ''
@@ -176,6 +184,8 @@ buildNpmPackage' rec {
 
   installPhase = ''
     runHook preInstall
+
+    install -Dm755 -t $out/libexec apps/desktop/desktop_native/target/release/desktop_proxy
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/Applications

pkgs/by-name/bi/bitwarden-desktop/set-desktop-proxy-path.patch

@@ -0,0 +1,13 @@
+diff --git a/apps/desktop/src/main/native-messaging.main.ts b/apps/desktop/src/main/native-messaging.main.ts
+index 30f3e03..6bbf96f 100644
+--- a/apps/desktop/src/main/native-messaging.main.ts
++++ b/apps/desktop/src/main/native-messaging.main.ts
+@@ -500,7 +500,7 @@ export class NativeMessagingMain {
+       }
+     }
+ 
+-    return path.join(path.dirname(this.exePath), `desktop_proxy${ext}`);
++    return "%%desktopProxyPath%%";
+   }
+ 
+   private homedir() {

pkgs/by-name/co/code-cursor/package.nix

@@ -16,20 +16,20 @@ let
 
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/af58d92614edb1f72bdd756615d131bf8dfa5299/linux/x64/Cursor-1.4.5-x86_64.AppImage";
-      hash = "sha256-2Hz1tXC+YkIIHWG1nO3/84oygH+wvaUtTXqvv19ZAz4=";
+      url = "https://downloads.cursor.com/production/823f58d4f60b795a6aefb9955933f3a2f0331d7b/linux/x64/Cursor-1.5.5-x86_64.AppImage";
+      hash = "sha256-eq/AQcAONs6HBpRdx2yf4MFTQ1cm/rOeaZZTq8YUF8s=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/af58d92614edb1f72bdd756615d131bf8dfa5299/linux/arm64/Cursor-1.4.5-aarch64.AppImage";
-      hash = "sha256-kKoOSxLsgeM2FJRW2HlCinhz6Ij6lpVsbWxQmTiMBSs=";
+      url = "https://downloads.cursor.com/production/823f58d4f60b795a6aefb9955933f3a2f0331d7b/linux/arm64/Cursor-1.5.5-aarch64.AppImage";
+      hash = "sha256-709MYaAnoYI+k1CPkfVzL0PvrJ4zw4wSHZvbuqLlXMQ=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/af58d92614edb1f72bdd756615d131bf8dfa5299/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-fX8ukEWKS2prNz+UopZ9a4uhDLoGYuXa6P8cSJqBang=";
+      url = "https://downloads.cursor.com/production/823f58d4f60b795a6aefb9955933f3a2f0331d7b/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-A13mVAw8mgjGlGegAzkeUi536keZwcJZkbO4ZzfMmXs=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/af58d92614edb1f72bdd756615d131bf8dfa5299/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-J/by3BOoIV2HUtcCqaCEJoPzqcFFooc/zShSmEBSw/Q=";
+      url = "https://downloads.cursor.com/production/823f58d4f60b795a6aefb9955933f3a2f0331d7b/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-Pc1pG1Vj9bf8H6Gt2bR8JANo/6oZza+L3Zlrihpg1dk=";
     };
   };
 
@@ -39,7 +39,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = finalCommandLineArgs;
 
-  version = "1.4.5";
+  version = "1.5.5";
   pname = "cursor";
 
   # You can find the current VSCode version in the About dialog:

pkgs/by-name/fc/fcitx5-mozc/package.nix

@@ -1,5 +1,5 @@
 {
-  bazel_6,
+  bazel_7,
   buildBazelPackage,
   fcitx5,
   fetchFromGitHub,
@@ -45,7 +45,7 @@ buildBazelPackage {
     sed -i -e 's|^\(LINUX_MOZC_SERVER_DIR = \).\+|\1"${mozc}/lib/mozc"|' src/config.bzl
   '';
 
-  bazel = bazel_6;
+  bazel = bazel_7;
   removeRulesCC = false;
   dontAddBazelOpts = true;
 
@@ -63,10 +63,13 @@ buildBazelPackage {
 
   fetchAttrs = {
     preInstall = ''
+      # Remove reference to buildInput
       rm -rf $bazelOut/external/fcitx5
+      # Remove reference to the host platform
+      rm -rv "$bazelOut"/external/host_platform
     '';
 
-    sha256 = "sha256-rrRp/v1pty7Py80/6I8rVVQvkeY72W+nlixUeYkjp+o=";
+    hash = "sha256-nFPGhZWvzzBOSeIa35XQbK6dHgJJSYum/5X8eAA0uCY=";
   };
 
   preConfigure = ''

pkgs/by-name/gh/ghostfolio/package.nix

@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.191.1";
+  version = "2.193.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-goaR1R1jgcZ7mPeSBYAu+kd59GCIThdjvuq1t5rTdRI=";
+    hash = "sha256-/JKE2GBRAB40ho3LrsCSMbjXq8bhGShiWoYTwTRFVPE=";
     # 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;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-RkpVmpKYHen06LxcQ1gFx6L8P/WOnjkVaHcDk8uqAKI=";
+  npmDepsHash = "sha256-bJrxClKOgbL5Dq9lUAPWPmDZG6vOFRnlkB9kl+mFvPk=";
 
   nativeBuildInputs = [
     prisma

pkgs/by-name/hi/high-tide/package.nix

@@ -13,20 +13,21 @@
   gst_all_1,
   libsecret,
   libportal,
+  alsa-utils,
   pipewire,
   nix-update-script,
 }:
 
 python313Packages.buildPythonApplication rec {
   pname = "high-tide";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "Nokse22";
     repo = "high-tide";
     tag = "v${version}";
-    hash = "sha256-lvfEqXXlDuW+30iTQ0FddcnAMZRM0BYeuxLN4++xs/0=";
+    hash = "sha256-AHdv2eazUnxgw5D4SlIzWm/wnC26zedwiAGT0OzjdZs=";
   };
 
   nativeBuildInputs = [
@@ -51,13 +52,16 @@ python313Packages.buildPythonApplication rec {
     libsecret
   ]);
 
-  dependencies = with python313Packages; [
+  dependencies = [
+    alsa-utils
+  ]
+  ++ (with python313Packages; [
     pygobject3
     tidalapi
     requests
     mpd2
     pypresence
-  ];
+  ]);
 
   dontWrapGApps = true;
 

pkgs/by-name/mo/mozc/package.nix

@@ -5,7 +5,7 @@
   qt6,
   pkg-config,
   protobuf_27,
-  bazel,
+  bazel_7,
   ibus,
   unzip,
   xdg-utils,
@@ -43,14 +43,18 @@ buildBazelPackage rec {
   dontAddBazelOpts = true;
   removeRulesCC = false;
 
-  inherit bazel;
+  bazel = bazel_7;
 
   fetchAttrs = {
-    sha256 = "sha256-+N7AhSemcfhq6j0IUeWZ0DyVvr1l5FbAkB+kahTy3pM=";
+    hash = "sha256-c+v2vWvTmwJ7MFh3VJlUh+iSINjsX66W9K0UBX5K/1s=";
 
-    # remove references of buildInputs and zip code files
     preInstall = ''
-      rm -rv $bazelOut/external/{ibus,qt_linux,zip_code_*}
+      # Remove zip code data. It will be replaced with jp-zip-codes from nixpkgs
+      rm -rv "$bazelOut"/external/zip_code_{jigyosyo,ken_all}
+      # Remove references to buildInputs
+      rm -rv "$bazelOut"/external/{ibus,qt_linux}
+      # Remove reference to the host platform
+      rm -rv "$bazelOut"/external/host_platform
     '';
   };
 

pkgs/by-name/ne/nezha/package.nix

@@ -14,7 +14,7 @@
 
 let
   pname = "nezha";
-  version = "1.13.0";
+  version = "1.13.1";
 
   frontendName = lib.removePrefix "nezha-theme-";
 
@@ -58,7 +58,7 @@ buildGo124Module {
     owner = "nezhahq";
     repo = "nezha";
     tag = "v${version}";
-    hash = "sha256-lZN9ZH70AzDCtvFnr2dxjXSKhGd/+HvN9hCydlOYpKU=";
+    hash = "sha256-BVaGlkr7lJTVewLkRoyl7JOZ4mwRaRs5JCSSFWO21Dk=";
   };
 
   proxyVendor = true;
@@ -96,7 +96,7 @@ buildGo124Module {
     GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d . -g ./cmd/dashboard/main.go -o ./cmd/dashboard/docs --parseGoList=false
   '';
 
-  vendorHash = "sha256-Pj5HfrwIuWt3Uwt2Y9Tz96B2kL7Svq5rzU1hKf/RZ4s=";
+  vendorHash = "sha256-e4FlXKE9A7WpZpafSv0Ais97cyta56ElD9pL4eIvnUk=";
 
   ldflags = [
     "-s"

pkgs/by-name/no/notify-sharp/package.nix

@@ -1,49 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitLab,
-  pkg-config,
-  autoreconfHook,
-  mono,
-  gtk-sharp-3_0,
-  dbus-sharp-1_0,
-  dbus-sharp-glib-1_0,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "notify-sharp";
-  version = "3.0.3";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "Archive";
-    repo = "notify-sharp";
-
-    rev = version;
-    sha256 = "1vm7mnmxdwrgy4mr07lfva8sa6a32f2ah5x7w8yzcmahaks3sj5m";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    autoreconfHook
-  ];
-
-  buildInputs = [
-    mono
-    gtk-sharp-3_0
-    dbus-sharp-1_0
-    dbus-sharp-glib-1_0
-  ];
-
-  dontStrip = true;
-
-  postPatch = ''
-    sed -i 's#^[ \t]*DOCDIR=.*$#DOCDIR=$out/lib/monodoc#' ./configure.ac
-  '';
-
-  meta = with lib; {
-    description = "D-Bus for .NET";
-    platforms = platforms.linux;
-    license = licenses.mit;
-  };
-}

pkgs/by-name/pe/perf_data_converter/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   buildBazelPackage,
   fetchFromGitHub,
-  bazel_6,
+  bazel_7,
   jdk,
   elfutils,
   libcap,
@@ -29,7 +29,7 @@ buildBazelPackage {
     hash = "sha256-AScXL74K0Eiajdib56+7ay3K/MMWbmeUWkRWMaEJRC8=";
   };
 
-  bazel = bazel_6;
+  bazel = bazel_7;
   bazelFlags = [
     "--registry"
     "file://${registry}"
@@ -38,8 +38,8 @@ buildBazelPackage {
   fetchAttrs = {
     hash =
       {
-        aarch64-linux = "sha256-Ksae4VC2FbkW79N5EGn/rTdj+GFKQsZCdi4LPfnzV7Y=";
-        x86_64-linux = "sha256-TYeS1bax7sA0hJLXqtE8Q5FLnIylcWPZynVE2LhvZKc=";
+        aarch64-linux = "sha256-GvuOEQfzPF5J75TRlEc4oDiXXUN4G3fMfRhMDmg3FL0=";
+        x86_64-linux = "sha256-A47JJg+GUIhR7FhufxEsfsIuSg6dd7sPNzSWiQZXIEE=";
       }
       .${system} or (throw "No hash for system: ${system}");
   };

pkgs/by-name/po/pocket-id/package.nix

@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  buildGoModule,
+  buildGo125Module,
   stdenvNoCC,
   nodejs,
   pnpm_10,
@@ -9,20 +9,20 @@
   nix-update-script,
 }:
 
-buildGoModule (finalAttrs: {
+buildGo125Module (finalAttrs: {
   pname = "pocket-id";
-  version = "1.7.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-u4H1wC5RL3p7GNL7WQkmK8DNgwKQvgxHd8TIug+Be+o=";
+    hash = "sha256-3sUkEbC96/XUR1tvCmxu56hPh7Ag/sD6/pGrq9JhHC8=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";
 
-  vendorHash = "sha256-guG/JnwUi2WeClSfAX9pRG3kLJMTvTDiJ7L54TGeSd0=";
+  vendorHash = "sha256-eNUhk76YLHtXCFaxiavM6d8CMeE+YQ+vOecDUCiTh5k=";
 
   env.CGO_ENABLED = 0;
   ldflags = [
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
     pnpmDeps = pnpm_10.fetchDeps {
       inherit (finalAttrs) pname version src;
       fetcherVersion = 1;
-      hash = "sha256-UgbclnoOqsWY5fYAGoDJON9MDtN5edw65JRleghdReE=";
+      hash = "sha256-q2oXyFVdaDfJ4NFDt26/VJVXzQLCuKXHtCx1mah6Js8=";
     };
 
     env.BUILD_OUTPUT_PATH = "dist";

pkgs/by-name/pr/protoc-gen-js/package.nix

@@ -2,23 +2,23 @@
   stdenv,
   lib,
   buildBazelPackage,
-  bazel_6,
+  bazel_7,
   fetchFromGitHub,
   cctools,
 }:
 
 buildBazelPackage rec {
   pname = "protoc-gen-js";
-  version = "3.21.2";
+  version = "3.21.4";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf-javascript";
     rev = "v${version}";
-    hash = "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=";
+    hash = "sha256-eIOtVRnHv2oz4xuVc4aL6JmhpvlODQjXHt1eJHsjnLg=";
   };
 
-  bazel = bazel_6;
+  bazel = bazel_7;
   bazelTargets = [ "generator:protoc-gen-js" ];
   bazelBuildFlags = lib.optionals stdenv.cc.isClang [
     "--cxxopt=-x"
@@ -31,7 +31,13 @@ buildBazelPackage rec {
 
   LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool";
 
-  fetchAttrs.hash = "sha256-WOBlZ0XNrl5UxIaSDxZeOfzS2a8ZkrKdTLKHBDC9UNQ=";
+  fetchAttrs = {
+    preInstall = ''
+      rm -rv "$bazelOut/external/host_platform"
+    '';
+
+    hash = "sha256-CekpXINZSr6Hysa4qrVkdchBla9pgBwRtqBiuUGPNq0=";
+  };
 
   buildAttrs.installPhase = ''
     mkdir -p $out/bin

pkgs/by-name/ve/verible/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   buildBazelPackage,
   fetchFromGitHub,
-  bazel_6,
+  bazel_7,
   jdk,
   bison,
   flex,
@@ -41,7 +41,7 @@ buildBazelPackage rec {
     hash = "sha256-/RZqBNmyBZI6CO2ffS6p8T4wse1MKytNMphXFdkTOWQ=";
   };
 
-  bazel = bazel_6;
+  bazel = bazel_7;
   bazelFlags = [
     "--//bazel:use_local_flex_bison"
     "--registry"
@@ -51,9 +51,9 @@ buildBazelPackage rec {
   fetchAttrs = {
     hash =
       {
-        aarch64-linux = "sha256-ErhBpmXhtiZbBWy506rLp4TQh5oXJQ44lw25jlVkjUM=";
-        x86_64-linux = "sha256-d8CYiqpL7rM3VvEqHSBvtgF2WLyH23jSvK7w4ChTtgU=";
-        aarch64-darwin = "sha256-lHMbziDzQpmXvsW25SgjQUkPRIRYv6TJIPTAEvhSfuA=";
+        aarch64-linux = "sha256-jgh+wEqZba30MODmgmPoQn1ErNmm40d16jB/kE2jYPg=";
+        x86_64-linux = "sha256-kiI/LX0l9ERxItsqiAyl+BP3QnLr0Ly2YVb988M4jVs=";
+        aarch64-darwin = "sha256-bkw4ErWYblzr3lQhoXSBqIBHjXzhZHeTKdT0E/YsiFQ=";
       }
       .${system} or (throw "No hash for system: ${system}");
   };

pkgs/by-name/xj/xjump/darwin.patch

@@ -1,21 +0,0 @@
---- xjump/src/main.c	2018-02-20 09:15:15.608807657 +0100
-+++ xjump-patched/src/main.c	2018-02-20 09:15:34.148949100 +0100
-@@ -604,18 +604,6 @@
-    * optimistic privilege dropping function. */
-   setgroups(0, NULL);
- 
--  if (setresgid(-1, realgid, realgid) != 0) {
--    perror("Could not drop setgid privileges.  Aborting.");
--    exit(1);
--  }
--
--  /* Dropping user privileges must come last.
--   * Otherwise we won't be able to drop group privileges anymore */
--  if (setresuid(-1, realuid, realuid) != 0) {
--    perror("Could not drop setuid privileges.  Aborting.");
--    exit(1);
--  }
--
-   /* From now on we run with regular user privileges */
- 
-   static XtActionsRec a_table[] = {

pkgs/by-name/xj/xjump/package.nix

@@ -1,43 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoconf,
-  automake,
-  libX11,
-  libXt,
-  libXpm,
-  libXaw,
-  localStateDir ? null,
-}:
-
-stdenv.mkDerivation {
-  pname = "xjump";
-  version = "2.9.3";
-  src = fetchFromGitHub {
-    owner = "hugomg";
-    repo = "xjump";
-    rev = "e7f20fb8c2c456bed70abb046c1a966462192b80";
-    sha256 = "0hq4739cvi5a47pxdc0wwkj2lmlqbf1xigq0v85qs5bq3ixmq2f7";
-  };
-  nativeBuildInputs = [
-    autoconf
-    automake
-  ];
-  buildInputs = [
-    libX11
-    libXt
-    libXpm
-    libXaw
-  ];
-  preConfigure = "autoreconf --install";
-  patches = lib.optionals stdenv.buildPlatform.isDarwin [ ./darwin.patch ];
-  configureFlags = lib.optionals (localStateDir != null) [ "--localstatedir=${localStateDir}" ];
-
-  meta = with lib; {
-    description = "Falling tower game";
-    mainProgram = "xjump";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ pmeunier ];
-  };
-}

pkgs/by-name/ya/yaml-merge/package.nix

@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   python3Packages,
+  pkgsHostTarget,
 }:
 
 stdenv.mkDerivation {
@@ -17,7 +18,11 @@ stdenv.mkDerivation {
   };
 
   pythonPath = with python3Packages; [ pyyaml ];
-  nativeBuildInputs = with python3Packages; [ wrapPython ];
+  nativeBuildInputs = [
+    # Not `python3Packages.wrapPython` to workaround `python3Packages.wrapPython.__spliced.buildHost` having the wrong `pythonHost`
+    # See https://github.com/NixOS/nixpkgs/issues/434307
+    pkgsHostTarget.python3Packages.wrapPython
+  ];
 
   installPhase = ''
     install -Dm755 yaml-merge.py $out/bin/yaml-merge

pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix

@@ -1,40 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  pkg-config,
-  mono,
-  dbus-sharp-1_0,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dbus-sharp-glib";
-  version = "0.5";
-
-  src = fetchFromGitHub {
-    owner = "mono";
-    repo = "dbus-sharp-glib";
-
-    rev = "v${version}";
-    sha256 = "0z8ylzby8n5sar7aywc8rngd9ap5qqznadsscp5v34cacdfz1gxm";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    autoreconfHook
-    mono # gmcs
-  ];
-  buildInputs = [
-    mono
-    dbus-sharp-1_0
-  ];
-
-  dontStrip = true;
-
-  meta = with lib; {
-    description = "D-Bus for .NET: GLib integration module";
-    platforms = platforms.linux;
-    license = licenses.mit;
-  };
-}

pkgs/development/libraries/dbus-sharp-glib/default.nix

@@ -1,40 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  mono,
-  dbus-sharp-2_0,
-  autoreconfHook,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dbus-sharp-glib";
-  version = "0.6";
-
-  src = fetchFromGitHub {
-    owner = "mono";
-    repo = "dbus-sharp-glib";
-
-    rev = "v${version}";
-    sha256 = "0i39kfg731as6j0hlmasgj8dyw5xsak7rl2dlimi1naphhffwzm8";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    autoreconfHook
-    mono # gmcs
-  ];
-  buildInputs = [
-    mono
-    dbus-sharp-2_0
-  ];
-
-  dontStrip = true;
-
-  meta = with lib; {
-    description = "D-Bus for .NET: GLib integration module";
-    platforms = platforms.linux;
-    license = licenses.mit;
-  };
-}

pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix

@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  mono,
-  autoreconfHook,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dbus-sharp";
-  version = "0.7";
-
-  src = fetchFromGitHub {
-    owner = "mono";
-    repo = "dbus-sharp";
-
-    rev = "v${version}";
-    sha256 = "13qlqx9wqahfpzzl59157cjxprqcx2bd40w5gb2bs3vdx058p562";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    autoreconfHook
-    mono # gmcs
-  ];
-  buildInputs = [ mono ];
-
-  dontStrip = true;
-
-  meta = with lib; {
-    description = "D-Bus for .NET";
-    platforms = platforms.linux;
-    license = licenses.mit;
-  };
-}

pkgs/development/libraries/dbus-sharp/default.nix

@@ -1,39 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  mono4,
-  autoreconfHook,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dbus-sharp";
-  version = "0.8.1";
-
-  src = fetchFromGitHub {
-    owner = "mono";
-    repo = "dbus-sharp";
-
-    rev = "v${version}";
-    sha256 = "1g5lblrvkd0wnhfzp326by6n3a9mj2bj7a7646g0ziwgsxp5w6y7";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    autoreconfHook
-    mono4 # gmcs
-  ];
-
-  # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
-  # See: https://github.com/NixOS/nixpkgs/pull/46060
-  buildInputs = [ mono4 ];
-
-  dontStrip = true;
-
-  meta = with lib; {
-    description = "D-Bus for .NET";
-    platforms = platforms.linux;
-    license = licenses.mit;
-  };
-}

pkgs/development/python-modules/distutils-cfg/default.nix

@@ -1,42 +0,0 @@
-# global distutils configuration, see http://docs.python.org/2/install/index.html#distutils-configuration-files
-
-{
-  stdenv,
-  python,
-  writeText,
-  extraCfg ? "",
-  overrideCfg ? "",
-}:
-
-let
-  distutilsCfg = writeText "distutils.cfg" (
-    if overrideCfg != "" then
-      overrideCfg
-    else
-      ''
-        [easy_install]
-
-        # don't allow network connections during build to ensure purity
-        allow-hosts = None
-
-        # make sure we always unzip installed packages otherwise setup hooks won't work
-        zip_ok = 0
-
-        ${extraCfg}
-      ''
-  );
-in
-stdenv.mkDerivation {
-  name = "${python.libPrefix}-distutils.cfg";
-
-  buildInputs = [ python ];
-
-  dontUnpack = true;
-
-  installPhase = ''
-    dest="$out/${python.sitePackages}/distutils"
-    mkdir -p $dest
-    ln -s ${python}/lib/${python.libPrefix}/distutils/* $dest
-    ln -s ${distutilsCfg} $dest/distutils.cfg
-  '';
-}

pkgs/development/python-modules/docling-core/default.nix

@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "docling-core";
-  version = "2.44.2";
+  version = "2.45.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-core";
     tag = "v${version}";
-    hash = "sha256-CLPJYt3P6DUt0lQQOQ54vXPJcoi3Kyq7eZ6OwjGkmGk=";
+    hash = "sha256-9gTGC5jATmiYNrYXWb3KCBvaa/7H5ienUSQ+wBefwdQ=";
   };
 
   build-system = [

pkgs/development/python-modules/docling-parse/default.nix

@@ -5,7 +5,7 @@
   cmake,
   pkg-config,
   cxxopts,
-  poetry-core,
+  setuptools,
   pybind11,
   zlib,
   nlohmann_json,
@@ -23,24 +23,16 @@
 
 buildPythonPackage rec {
   pname = "docling-parse";
-  version = "4.1.0";
+  version = "4.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-parse";
     tag = "v${version}";
-    hash = "sha256-1vl5Ij25NXAwhoXLJ35lcr5r479jrdKd9DxWhYbCApw=";
+    hash = "sha256-0X9fP2PiHjZs+RT+VngHvNt4U0zpXq09BnaO/5tpfY8=";
   };
 
-  patches = [
-    # Fixes test_parse unit tests
-    # export_to_textlines in docling-core >= 2.38.2 includes text direction
-    # by default, which is not included in upstream's groundtruth data.
-    # TODO: remove when docling-core version gets bumped in upstream's uv.lock
-    ./test_parse.patch
-  ];
-
   dontUseCmakeConfigure = true;
 
   nativeBuildInputs = [
@@ -49,7 +41,7 @@ buildPythonPackage rec {
   ];
 
   build-system = [
-    poetry-core
+    setuptools
   ];
 
   env.NIX_CFLAGS_COMPILE = "-I${lib.getDev utf8cpp}/include/utf8cpp";
@@ -83,6 +75,12 @@ buildPythonPackage rec {
     "pillow"
   ];
 
+  # Listed as runtime dependencies but only used in CI to build wheels
+  preBuild = ''
+    sed -i '/cibuildwheel/d' pyproject.toml
+    sed -i '/delocate/d' pyproject.toml
+  '';
+
   pythonImportsCheck = [
     "docling_parse"
   ];

pkgs/development/python-modules/docling-parse/test_parse.patch

@@ -1,20 +0,0 @@
-diff --git a/tests/test_parse.py b/tests/test_parse.py
-index 84e17ae..e1eb6ae 100644
---- a/tests/test_parse.py
-+++ b/tests/test_parse.py
-@@ -242,6 +242,7 @@ def test_reference_documents_from_filenames():
-                         cell_unit=unit,
-                         add_fontkey=True,
-                         add_fontname=False,
-+                        add_text_direction=False,
-                     )
-                     _fname = fname + f".{unit}.txt"
-                     with open(_fname, "w") as fw:
-@@ -254,6 +255,7 @@ def test_reference_documents_from_filenames():
-                         cell_unit=unit,
-                         add_fontkey=True,
-                         add_fontname=False,
-+                        add_text_direction=False,
-                     )
- 
-                     _fname = fname + f".{unit}.txt"

pkgs/development/python-modules/docling/default.nix

@@ -52,14 +52,14 @@
 
 buildPythonPackage rec {
   pname = "docling";
-  version = "2.43.0";
+  version = "2.47.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling";
     tag = "v${version}";
-    hash = "sha256-fMLED97DhfHp74GVDtdPXrJvfpKw6bOvQAaGTWZrPyE=";
+    hash = "sha256-U82hGvWXkKwZ4um0VevVoYiIfzswu5hLDYvxtqJqmHU=";
   };
 
   build-system = [
@@ -101,6 +101,8 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
+    "lxml"
+    "pypdfium2"
     "pillow"
   ];
 
@@ -167,6 +169,8 @@ buildPythonPackage rec {
     "test_confidence"
     "test_e2e_webp_conversions"
     "test_asr_pipeline_conversion"
+    "test_threaded_pipeline"
+    "test_pipeline_comparison"
 
     # AssertionError: pred_itxt==true_itxt
     "test_e2e_valid_csv_conversions"

pkgs/development/python-modules/fslpy/default.nix

@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "fslpy";
-  version = "3.21.1";
+  version = "3.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "fsl";
     repo = "fslpy";
     rev = "refs/tags/${version}";
-    hash = "sha256-O0bhzu6zZeuGJqXAwlgM8qHkgtaGCmg7xSkOqbZH2eA=";
+    hash = "sha256-lY/7TNOqGK0pRm5Rne1nrqXVQDZPkHwlZV9ITsOwp9Q=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/jaxlib/default.nix

@@ -6,7 +6,8 @@
   # Build-time dependencies:
   addDriverRunpath,
   autoAddDriverRunpath,
-  bazel_6,
+  #bazel_6,
+  bazel,
   binutils,
   buildBazelPackage,
   buildPythonPackage,
@@ -77,6 +78,9 @@ let
     # however even with that fix applied, it doesn't work for everyone:
     # https://github.com/NixOS/nixpkgs/pull/184395#issuecomment-1207287129
     platforms = platforms.linux;
+
+    # Needs update for Bazel 7.
+    broken = true;
   };
 
   # Bazel wants a merged cudnn at configuration time
@@ -221,7 +225,8 @@ let
     name = "bazel-build-${pname}-${version}";
 
     # See https://github.com/google/jax/blob/main/.bazelversion for the latest.
-    bazel = bazel_6;
+    #bazel = bazel_6;
+    bazel = bazel;
 
     src = fetchFromGitHub {
       owner = "google";

pkgs/development/python-modules/ome-zarr/default.nix

@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "ome-zarr";
-  version = "0.12.1";
+  version = "0.12.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ome";
     repo = "ome-zarr-py";
     tag = "v${version}";
-    hash = "sha256-xBznMQ5wbz0CP30cuU7Tdet9dFKLBRiyLww+iNamwnA=";
+    hash = "sha256-lwv6PHm41HFylt7b0d5LHCrCIXNWFNGg59VQvPXYtVc=";
   };
 
   build-system = [

pkgs/development/python-modules/tensorflow-probability/default.nix

@@ -12,7 +12,8 @@
   wheel,
   absl-py,
 
-  bazel_6,
+  #bazel_6,
+  bazel,
   cctools,
 
   # python package
@@ -60,7 +61,8 @@ let
       wheel
     ];
 
-    bazel = bazel_6;
+    #bazel = bazel_6;
+    bazel = bazel;
 
     bazelTargets = [ ":pip_pkg" ];
     LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool";
@@ -131,5 +133,7 @@ buildPythonPackage {
     changelog = "https://github.com/tensorflow/probability/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ GaetanLepage ];
+    # Needs update for Bazel 7.
+    broken = true;
   };
 }

pkgs/development/python-modules/transformers/default.nix

@@ -59,14 +59,14 @@
 
 buildPythonPackage rec {
   pname = "transformers";
-  version = "4.55.3";
+  version = "4.55.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "transformers";
     tag = "v${version}";
-    hash = "sha256-wvcAKcEQ2dU/7IfCB0AH45ZdpiL5ib7kPPjFRhv4Z+0=";
+    hash = "sha256-gBVFIX4wSfWVWPc0dAC9aGGjNdBhUaOfyU3C+wDr6GY=";
   };
 
   build-system = [ setuptools ];

pkgs/development/tools/build-managers/bazel/bazel_6/actions_path.patch

@@ -1,41 +0,0 @@
-diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java
-index 6fff2af..7e2877e 100644
---- a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java
-+++ b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java
-@@ -47,6 +47,16 @@ public final class PosixLocalEnvProvider implements LocalEnvProvider {
-       Map<String, String> env, BinTools binTools, String fallbackTmpDir) {
-     ImmutableMap.Builder<String, String> result = ImmutableMap.builder();
-     result.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR")));
-+
-+    // In case we are running on NixOS.
-+    // If bash is called with an unset PATH on this platform,
-+    // it will set it to /no-such-path and default tools will be missings.
-+    // See, https://github.com/NixOS/nixpkgs/issues/94222
-+    // So we ensure that minimal dependencies are present.
-+    if (!env.containsKey("PATH")){
-+        result.put("PATH", "@actionsPathPatch@");
-+    }
-+ 
-     String p = clientEnv.get("TMPDIR");
-     if (Strings.isNullOrEmpty(p)) {
-       // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR
-index 95642767c6..39d3c62461 100644
---- a/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java
-+++ b/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java
-@@ -74,6 +74,16 @@ public final class XcodeLocalEnvProvider implements LocalEnvProvider {
-
-     ImmutableMap.Builder<String, String> newEnvBuilder = ImmutableMap.builder();
-     newEnvBuilder.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR")));
-+
-+    // In case we are running on NixOS.
-+    // If bash is called with an unset PATH on this platform,
-+    // it will set it to /no-such-path and default tools will be missings.
-+    // See, https://github.com/NixOS/nixpkgs/issues/94222
-+    // So we ensure that minimal dependencies are present.
-+    if (!env.containsKey("PATH")){
-+      newEnvBuilder.put("PATH", "@actionsPathPatch@");
-+    }
-+
-     String p = clientEnv.get("TMPDIR");
-     if (Strings.isNullOrEmpty(p)) {
-       // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR

pkgs/development/tools/build-managers/bazel/bazel_6/darwin_sleep.patch

@@ -1,56 +0,0 @@
-diff --git a/src/main/native/darwin/sleep_prevention_jni.cc b/src/main/native/darwin/sleep_prevention_jni.cc
-index 67c35b201e..e50a58320e 100644
---- a/src/main/native/darwin/sleep_prevention_jni.cc
-+++ b/src/main/native/darwin/sleep_prevention_jni.cc
-@@ -33,31 +33,13 @@ static int g_sleep_state_stack = 0;
- static IOPMAssertionID g_sleep_state_assertion = kIOPMNullAssertionID;
- 
- int portable_push_disable_sleep() {
--  std::lock_guard<std::mutex> lock(g_sleep_state_mutex);
--  BAZEL_CHECK_GE(g_sleep_state_stack, 0);
--  if (g_sleep_state_stack == 0) {
--    BAZEL_CHECK_EQ(g_sleep_state_assertion, kIOPMNullAssertionID);
--    CFStringRef reasonForActivity = CFSTR("build.bazel");
--    IOReturn success = IOPMAssertionCreateWithName(
--        kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, reasonForActivity,
--        &g_sleep_state_assertion);
--    BAZEL_CHECK_EQ(success, kIOReturnSuccess);
--  }
--  g_sleep_state_stack += 1;
--  return 0;
-+  // Unreliable, disable for now
-+  return -1;
- }
- 
- int portable_pop_disable_sleep() {
--  std::lock_guard<std::mutex> lock(g_sleep_state_mutex);
--  BAZEL_CHECK_GT(g_sleep_state_stack, 0);
--  g_sleep_state_stack -= 1;
--  if (g_sleep_state_stack == 0) {
--    BAZEL_CHECK_NE(g_sleep_state_assertion, kIOPMNullAssertionID);
--    IOReturn success = IOPMAssertionRelease(g_sleep_state_assertion);
--    BAZEL_CHECK_EQ(success, kIOReturnSuccess);
--    g_sleep_state_assertion = kIOPMNullAssertionID;
--  }
--  return 0;
-+  // Unreliable, disable for now
-+  return -1;
- }
- 
- }  // namespace blaze_jni
-diff --git a/src/main/native/darwin/system_suspension_monitor_jni.cc b/src/main/native/darwin/system_suspension_monitor_jni.cc
-index 3483aa7935..51782986ec 100644
---- a/src/main/native/darwin/system_suspension_monitor_jni.cc
-+++ b/src/main/native/darwin/system_suspension_monitor_jni.cc
-@@ -83,10 +83,7 @@ void portable_start_suspend_monitoring() {
-     // Register to receive system sleep notifications.
-     // Testing needs to be done manually. Use the logging to verify
-     // that sleeps are being caught here.
--    suspend_state.connect_port = IORegisterForSystemPower(
--        &suspend_state, &notifyPortRef, SleepCallBack, &notifierObject);
--    BAZEL_CHECK_NE(suspend_state.connect_port, MACH_PORT_NULL);
--    IONotificationPortSetDispatchQueue(notifyPortRef, queue);
-+    // XXX: Unreliable, disable for now
- 
-     // Register to deal with SIGCONT.
-     // We register for SIGCONT because we can't catch SIGSTOP.

pkgs/development/tools/build-managers/bazel/bazel_6/default.nix

@@ -1,855 +0,0 @@
-{
-  stdenv,
-  callPackage,
-  lib,
-  fetchurl,
-  fetchFromGitHub,
-  installShellFiles,
-  runCommand,
-  runCommandCC,
-  makeWrapper,
-  recurseIntoAttrs,
-  # this package (through the fixpoint glass)
-  bazel_self,
-  lr,
-  xe,
-  zip,
-  unzip,
-  bash,
-  coreutils,
-  which,
-  gawk,
-  gnused,
-  gnutar,
-  gnugrep,
-  gzip,
-  findutils,
-  diffutils,
-  gnupatch,
-  # updater
-  python3,
-  writeScript,
-  # Apple dependencies
-  cctools,
-  sigtool,
-  # Allow to independently override the jdks used to build and run respectively
-  buildJdk,
-  runJdk,
-  runtimeShell,
-  # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
-  # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
-  enableNixHacks ? false,
-  file,
-  replaceVars,
-  writeTextFile,
-  writeShellApplication,
-  makeBinaryWrapper,
-}:
-
-let
-  version = "6.5.0";
-  sourceRoot = ".";
-
-  src = fetchurl {
-    url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    hash = "sha256-/InakZQVKJ8p5P8YpeAScOzppv6Dy2CWchi6xKO7PtI=";
-  };
-
-  # Update with
-  # 1. export BAZEL_SELF=$(nix-build -A bazel_6)
-  # 2. update version and hash for sources above
-  # 3. `eval $(nix-build -A bazel_6.updater)`
-  # 4. add new dependencies from the dict in ./src-deps.json if required by failing build
-  srcDeps = lib.attrsets.attrValues srcDepsSet;
-  srcDepsSet =
-    let
-      srcs = lib.importJSON ./src-deps.json;
-      toFetchurl =
-        d:
-        lib.attrsets.nameValuePair d.name (fetchurl {
-          urls = d.urls or [ d.url ];
-          sha256 = d.sha256;
-        });
-    in
-    builtins.listToAttrs (
-      map toFetchurl [
-        srcs.desugar_jdk_libs
-        srcs.io_bazel_skydoc
-        srcs.bazel_skylib
-        srcs.bazelci_rules
-        srcs.io_bazel_rules_sass
-        srcs.platforms
-        srcs.remote_java_tools_for_testing
-        srcs."coverage_output_generator-v2.6.zip"
-        srcs.build_bazel_rules_nodejs
-        srcs.android_tools_for_testing
-        srcs.openjdk_linux_vanilla
-        srcs.bazel_toolchains
-        srcs.com_github_grpc_grpc
-        srcs.upb
-        srcs.com_google_protobuf
-        srcs.rules_pkg
-        srcs.rules_cc
-        srcs.rules_java
-        srcs.rules_proto
-        srcs.rules_nodejs
-        srcs.rules_license
-        srcs.com_google_absl
-        srcs.com_googlesource_code_re2
-        srcs.com_github_cares_cares
-        srcs.com_envoyproxy_protoc_gen_validate
-        srcs.com_google_googleapis
-        srcs.bazel_gazelle
-      ]
-    );
-
-  distDir = runCommand "bazel-deps" { } ''
-    mkdir -p $out
-    for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
-  '';
-
-  defaultShellUtils =
-    # Keep this list conservative. For more exotic tools, prefer to use
-    # @rules_nixpkgs to pull in tools from the nix repository. Example:
-    #
-    # WORKSPACE:
-    #
-    #     nixpkgs_git_repository(
-    #         name = "nixpkgs",
-    #         revision = "def5124ec8367efdba95a99523dd06d918cb0ae8",
-    #     )
-    #
-    #     # This defines an external Bazel workspace.
-    #     nixpkgs_package(
-    #         name = "bison",
-    #         repositories = { "nixpkgs": "@nixpkgs//:default.nix" },
-    #     )
-    #
-    # some/BUILD.bazel:
-    #
-    #     genrule(
-    #        ...
-    #        cmd = "$(location @bison//:bin/bison) -other -args",
-    #        tools = [
-    #            ...
-    #            "@bison//:bin/bison",
-    #        ],
-    #     )
-    [
-      bash
-      coreutils
-      diffutils
-      file
-      findutils
-      gawk
-      gnugrep
-      gnupatch
-      gnused
-      gnutar
-      gzip
-      python3
-      unzip
-      which
-      zip
-    ];
-
-  defaultShellPath = lib.makeBinPath defaultShellUtils;
-
-  bashWithDefaultShellUtilsSh = writeShellApplication {
-    name = "bash";
-    runtimeInputs = defaultShellUtils;
-    text = ''
-      if [[ "$PATH" == "/no-such-path" ]]; then
-        export PATH=${defaultShellPath}
-      fi
-      exec ${bash}/bin/bash "$@"
-    '';
-  };
-
-  # Script-based interpreters in shebangs aren't guaranteed to work,
-  # especially on MacOS. So let's produce a binary
-  bashWithDefaultShellUtils = stdenv.mkDerivation {
-    name = "bash";
-    src = bashWithDefaultShellUtilsSh;
-    nativeBuildInputs = [ makeBinaryWrapper ];
-    buildPhase = ''
-      makeWrapper ${bashWithDefaultShellUtilsSh}/bin/bash $out/bin/bash
-    '';
-  };
-
-  platforms = lib.platforms.linux ++ lib.platforms.darwin;
-
-  system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
-
-  # on aarch64 Darwin, `uname -m` returns "arm64"
-  arch = with stdenv.hostPlatform; if isDarwin && isAarch64 then "arm64" else parsed.cpu.name;
-
-  bazelRC = writeTextFile {
-    name = "bazel-rc";
-    text = ''
-      startup --server_javabase=${runJdk}
-
-      # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054
-      # Most commands inherit from 'build' anyway.
-      build --distdir=${distDir}
-      fetch --distdir=${distDir}
-      query --distdir=${distDir}
-
-      build --extra_toolchains=@bazel_tools//tools/jdk:nonprebuilt_toolchain_definition
-      build --tool_java_runtime_version=local_jdk_11
-      build --java_runtime_version=local_jdk_11
-
-      # load default location for the system wide configuration
-      try-import /etc/bazel.bazelrc
-    '';
-  };
-
-in
-stdenv.mkDerivation rec {
-  pname = "bazel${lib.optionalString enableNixHacks "-hacks"}";
-  inherit version;
-
-  meta = with lib; {
-    homepage = "https://github.com/bazelbuild/bazel/";
-    description = "Build tool that builds code quickly and reliably";
-    sourceProvenance = with sourceTypes; [
-      fromSource
-      binaryBytecode # source bundles dependencies as jars
-    ];
-    license = licenses.asl20;
-    teams = [ lib.teams.bazel ];
-    mainProgram = "bazel";
-    inherit platforms;
-  };
-
-  inherit src;
-  inherit sourceRoot;
-  patches = [
-    # upb definition inside bazel sets its own copts that take precedence
-    # over flags we set externally, so need to patch them at the source
-    ./upb-clang16.patch
-
-    # Force usage of the _non_ prebuilt java toolchain.
-    # the prebuilt one does not work in nix world.
-    ./java_toolchain.patch
-
-    # Bazel integrates with apple IOKit to inhibit and track system sleep.
-    # Inside the darwin sandbox, these API calls are blocked, and bazel
-    # crashes. It seems possible to allow these APIs inside the sandbox, but it
-    # feels simpler to patch bazel not to use it at all. So our bazel is
-    # incapable of preventing system sleep, which is a small price to pay to
-    # guarantee that it will always run in any nix context.
-    #
-    # See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses
-    # NIX_BUILD_TOP env var to conditionally disable sleep features inside the
-    # sandbox.
-    #
-    # If you want to investigate the sandbox profile path,
-    # IORegisterForSystemPower can be allowed with
-    #
-    #     propagatedSandboxProfile = ''
-    #       (allow iokit-open (iokit-user-client-class "RootDomainUserClient"))
-    #     '';
-    #
-    # I do not know yet how to allow IOPMAssertion{CreateWithName,Release}
-    ./darwin_sleep.patch
-
-    # On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
-    # This is breaking the build of any C target. This patch removes the last
-    # argument if it's found to be an empty string.
-    ../trim-last-argument-to-gcc-if-empty.patch
-
-    # `java_proto_library` ignores `strict_proto_deps`
-    # https://github.com/bazelbuild/bazel/pull/16146
-    ./strict_proto_deps.patch
-
-    # On Darwin, using clang 6 to build fails because of a linker error (see #105573),
-    # but using clang 7 fails because libarclite_macosx.a cannot be found when linking
-    # the xcode_locator tool.
-    # This patch removes using the -fobjc-arc compiler option and makes the code
-    # compile without automatic reference counting. Caveat: this leaks memory, but
-    # we accept this fact because xcode_locator is only a short-lived process used during the build.
-    (replaceVars ./no-arc.patch {
-      multiBinPatch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "x86_64";
-    })
-
-    # --experimental_strict_action_env (which may one day become the default
-    # see bazelbuild/bazel#2574) hardcodes the default
-    # action environment to a non hermetic value (e.g. "/usr/local/bin").
-    # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
-    # So we are replacing this bazel paths by defaultShellPath,
-    # improving hermeticity and making it work in nixos.
-    (replaceVars ../strict_action_env.patch {
-      strictActionEnvPatch = defaultShellPath;
-    })
-
-    (replaceVars ./actions_path.patch {
-      actionsPathPatch = defaultShellPath;
-    })
-
-    # bazel reads its system bazelrc in /etc
-    # override this path to a builtin one
-    (replaceVars ../bazel_rc.patch {
-      bazelSystemBazelRCPath = bazelRC;
-    })
-  ]
-  ++ lib.optional enableNixHacks ./nix-hacks.patch;
-
-  # Additional tests that check bazel’s functionality. Execute
-  #
-  #     nix-build . -A bazel_6.tests
-  #
-  # in the nixpkgs checkout root to exercise them locally.
-  passthru.tests =
-    let
-      runLocal =
-        name: attrs: script:
-        let
-          attrs' = removeAttrs attrs [ "buildInputs" ];
-          buildInputs = attrs.buildInputs or [ ];
-        in
-        runCommandCC name (
-          {
-            inherit buildInputs;
-            preferLocalBuild = true;
-            meta.platforms = platforms;
-          }
-          // attrs'
-        ) script;
-
-      # bazel wants to extract itself into $install_dir/install every time it runs,
-      # so let’s do that only once.
-      extracted =
-        bazelPkg:
-        let
-          install_dir =
-            # `install_base` field printed by `bazel info`, minus the hash.
-            # yes, this path is kinda magic. Sorry.
-            "$HOME/.cache/bazel/_bazel_nixbld";
-        in
-        runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } ''
-          export HOME=$(mktemp -d)
-          touch WORKSPACE # yeah, everything sucks
-          install_base="$(${bazelPkg}/bin/bazel info | grep install_base)"
-          # assert it’s actually below install_dir
-          [[ "$install_base" =~ ${install_dir} ]] \
-            || (echo "oh no! $install_base but we are \
-          trying to copy ${install_dir} to $out instead!"; exit 1)
-          cp -R ${install_dir} $out
-        '';
-
-      bazelTest =
-        {
-          name,
-          bazelScript,
-          workspaceDir,
-          bazelPkg,
-          buildInputs ? [ ],
-        }:
-        let
-          be = extracted bazelPkg;
-        in
-        runLocal name
-          {
-            inherit buildInputs;
-            # Necessary for the tests to pass on Darwin with sandbox enabled.
-            __darwinAllowLocalNetworking = true;
-          }
-          (
-            # skip extraction caching on Darwin, because nobody knows how Darwin works
-            (lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-              # set up home with pre-unpacked bazel
-              export HOME=$(mktemp -d)
-              mkdir -p ${be.install_dir}
-              cp -R ${be}/install ${be.install_dir}
-
-              # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6
-              # Bazel checks whether the mtime of the install dir files
-              # is >9 years in the future, otherwise it extracts itself again.
-              # see PosixFileMTime::IsUntampered in src/main/cpp/util
-              # What the hell bazel.
-              ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {}
-            '')
-            + ''
-              # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
-              # about why to create a subdir for the workspace.
-              cp -r ${workspaceDir} wd && chmod u+w wd && cd wd
-
-              ${bazelScript}
-
-              touch $out
-            ''
-          );
-
-      bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
-
-      bazel-examples = fetchFromGitHub {
-        owner = "bazelbuild";
-        repo = "examples";
-        rev = "4183fc709c26a00366665e2d60d70521dc0b405d";
-        sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k";
-      };
-
-    in
-    (lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
-      # `extracted` doesn’t work on darwin
-      shebang = callPackage ../shebang-test.nix {
-        inherit
-          runLocal
-          extracted
-          bazelTest
-          distDir
-          ;
-        bazel = bazel_self;
-      };
-    })
-    // {
-      bashTools = callPackage ../bash-tools-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazel_self;
-      };
-      cpp = callPackage ../cpp-test.nix {
-        inherit
-          runLocal
-          bazelTest
-          bazel-examples
-          distDir
-          ;
-        bazel = bazel_self;
-      };
-      java = callPackage ../java-test.nix {
-        inherit
-          runLocal
-          bazelTest
-          bazel-examples
-          distDir
-          ;
-        bazel = bazel_self;
-      };
-      protobuf = callPackage ../protobuf-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazel_self;
-      };
-      pythonBinPath = callPackage ../python-bin-path-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazel_self;
-      };
-
-      bashToolsWithNixHacks = callPackage ../bash-tools-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazelWithNixHacks;
-      };
-
-      cppWithNixHacks = callPackage ../cpp-test.nix {
-        inherit
-          runLocal
-          bazelTest
-          bazel-examples
-          distDir
-          ;
-        bazel = bazelWithNixHacks;
-      };
-      javaWithNixHacks = callPackage ../java-test.nix {
-        inherit
-          runLocal
-          bazelTest
-          bazel-examples
-          distDir
-          ;
-        bazel = bazelWithNixHacks;
-      };
-      protobufWithNixHacks = callPackage ../protobuf-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazelWithNixHacks;
-      };
-      pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazelWithNixHacks;
-      };
-    };
-
-  src_for_updater = stdenv.mkDerivation {
-    name = "updater-sources";
-    inherit src;
-    nativeBuildInputs = [ unzip ];
-    inherit sourceRoot;
-    installPhase = ''
-      runHook preInstall
-
-      # prevent bazel version check failing in the updater
-      rm .bazelversion
-      cp -r . "$out"
-
-      runHook postInstall
-    '';
-  };
-  # update the list of workspace dependencies
-  passthru.updater = writeScript "update-bazel-deps.sh" ''
-    #!${runtimeShell}
-    (cd "${src_for_updater}" &&
-        BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
-        "$BAZEL_SELF"/bin/bazel \
-            query 'kind(http_archive, //external:*) + kind(http_file, //external:*) + kind(distdir_tar, //external:*) + kind(git_repository, //external:*)' \
-            --loading_phase_threads=1 \
-            --output build) \
-    | "${python3}"/bin/python3 "${./update-srcDeps.py}" \
-      "${builtins.toString ./src-deps.json}"
-  '';
-
-  # Necessary for the tests to pass on Darwin with sandbox enabled.
-  # Bazel starts a local server and needs to bind a local address.
-  __darwinAllowLocalNetworking = true;
-
-  postPatch =
-    let
-
-      darwinPatches = ''
-        bazelLinkFlags () {
-          eval set -- "$NIX_LDFLAGS"
-          local flag
-          for flag in "$@"; do
-            printf ' -Wl,%s' "$flag"
-          done
-        }
-
-        # Disable Bazel's Xcode toolchain detection which would configure compilers
-        # and linkers from Xcode instead of from PATH
-        export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
-
-        # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
-        export GCOV=${coreutils}/bin/false
-
-        # libcxx includes aren't added by libcxx hook
-        # https://github.com/NixOS/nixpkgs/pull/41589
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
-        # for CLang 16 compatibility in external/{absl,upb} dependencies
-        export NIX_CFLAGS_COMPILE+=" -Wno-deprecated-builtins -Wno-gnu-offsetof-extensions"
-
-        # don't use system installed Xcode to run clang, use Nix clang instead
-        sed -i -E \
-          -e "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
-          -e "s;/usr/bin/codesign;CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${sigtool}/bin/codesign;" \
-          -e "s;env -i codesign;env -i CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${sigtool}/bin/codesign;" \
-          scripts/bootstrap/compile.sh \
-          tools/osx/BUILD
-
-        substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' ""
-
-        # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
-        sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc
-
-        # clang installed from Xcode has a compatibility wrapper that forwards
-        # invocations of gcc to clang, but vanilla clang doesn't
-        sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
-
-        sed -i -e 's;"/usr/bin/libtool";_find_generic(repository_ctx, "libtool", "LIBTOOL", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
-        wrappers=( tools/cpp/osx_cc_wrapper.sh.tpl )
-        for wrapper in "''${wrappers[@]}"; do
-          sed -i -e "s,/usr/bin/gcc,${stdenv.cc}/bin/clang,g" $wrapper
-          sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
-          sed -i -e "s,/usr/bin/xcrun install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
-        done
-      '';
-
-      genericPatches = ''
-        # md5sum is part of coreutils
-        sed -i 's|/sbin/md5|md5sum|g' \
-          src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh
-
-        # replace initial value of pythonShebang variable in BazelPythonSemantics.java
-        substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \
-          --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\""
-
-        substituteInPlace src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyRuntimeInfoApi.java \
-          --replace '"#!/usr/bin/env python3"' "\"#!${python3}/bin/python\""
-
-        # substituteInPlace is rather slow, so prefilter the files with grep
-        grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
-          # If you add more replacements here, you must change the grep above!
-          # Only files containing /bin are taken into account.
-          substituteInPlace "$path" \
-            --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash \
-            --replace "/usr/bin/env bash" ${bashWithDefaultShellUtils}/bin/bash \
-            --replace "/usr/bin/env python" ${python3}/bin/python \
-            --replace /usr/bin/env ${coreutils}/bin/env \
-            --replace /bin/true ${coreutils}/bin/true
-        done
-
-        grep -rlZ /bin/ tools/python | while IFS="" read -r -d "" path; do
-          substituteInPlace "$path" \
-            --replace "/usr/bin/env python2" ${python3.interpreter} \
-            --replace "/usr/bin/env python3" ${python3}/bin/python \
-            --replace /usr/bin/env ${coreutils}/bin/env
-        done
-
-        # bazel test runner include references to /bin/bash
-        substituteInPlace tools/build_rules/test_rules.bzl \
-          --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash
-
-        for i in $(find tools/cpp/ -type f)
-        do
-          substituteInPlace $i \
-            --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash
-        done
-
-        # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
-        substituteInPlace scripts/bootstrap/compile.sh \
-            --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash
-
-        # add nix environment vars to .bazelrc
-        cat >> .bazelrc <<EOF
-        # Limit the resources Bazel is allowed to use during the build to 1/2 the
-        # available RAM and 3/4 the available CPU cores. This should help avoid
-        # overwhelming the build machine.
-        build --toolchain_resolution_debug=".*"
-        build --local_ram_resources=HOST_RAM*.5
-        build --local_cpu_resources=HOST_CPUS*.75
-
-        build --distdir=${distDir}
-        fetch --distdir=${distDir}
-        build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')"
-        build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')"
-        build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')"
-        build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')"
-        build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
-        build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
-        build --extra_toolchains=@bazel_tools//tools/jdk:nonprebuilt_toolchain_definition
-        build --verbose_failures
-        build --curses=no
-        build --features=-layering_check
-        build --experimental_strict_java_deps=off
-        build --strict_proto_deps=off
-        EOF
-
-        cat >> third_party/grpc/bazel_1.41.0.patch <<EOF
-        diff --git a/third_party/grpc/BUILD b/third_party/grpc/BUILD
-        index 39ee9f97c6..9128d20c85 100644
-        --- a/third_party/grpc/BUILD
-        +++ b/third_party/grpc/BUILD
-        @@ -28,7 +28,6 @@ licenses(["notice"])
-         package(
-             default_visibility = ["//visibility:public"],
-             features = [
-        -        "layering_check",
-                 "-parse_headers",
-             ],
-         )
-        EOF
-
-        # add the same environment vars to compile.sh
-        sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \
-            -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \
-            -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \
-            -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \
-            -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
-            -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
-            -e "/\$command \\\\$/a --tool_java_runtime_version=local_jdk_11 \\\\" \
-            -e "/\$command \\\\$/a --java_runtime_version=local_jdk_11 \\\\" \
-            -e "/\$command \\\\$/a --verbose_failures \\\\" \
-            -e "/\$command \\\\$/a --curses=no \\\\" \
-            -e "/\$command \\\\$/a --features=-layering_check \\\\" \
-            -e "/\$command \\\\$/a --experimental_strict_java_deps=off \\\\" \
-            -e "/\$command \\\\$/a --strict_proto_deps=off \\\\" \
-            -i scripts/bootstrap/compile.sh
-
-        # This is necessary to avoid:
-        # "error: no visible @interface for 'NSDictionary' declares the selector
-        # 'initWithContentsOfURL:error:'"
-        # This can be removed when the apple_sdk is upgraded beyond 10.13+
-        sed -i '/initWithContentsOfURL:versionPlistUrl/ {
-          N
-          s/error:nil\];/\];/
-        }' tools/osx/xcode_locator.m
-
-        # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
-        echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp
-        cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
-        mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
-
-        patchShebangs .
-      '';
-    in
-    lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + genericPatches;
-
-  buildInputs = [
-    buildJdk
-    bashWithDefaultShellUtils
-  ]
-  ++ defaultShellUtils;
-
-  # when a command can’t be found in a bazel build, you might also
-  # need to add it to `defaultShellPath`.
-  nativeBuildInputs = [
-    installShellFiles
-    makeWrapper
-    python3
-    unzip
-    which
-    zip
-    python3.pkgs.absl-py # Needed to build fish completion
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-    cctools
-    sigtool
-  ];
-
-  # Bazel makes extensive use of symlinks in the WORKSPACE.
-  # This causes problems with infinite symlinks if the build output is in the same location as the
-  # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a
-  # subdirectory.
-  # Failing to do this causes "infinite symlink expansion detected"
-  preBuildPhases = [ "preBuildPhase" ];
-  preBuildPhase = ''
-    mkdir bazel_src
-    shopt -s dotglob extglob
-    mv !(bazel_src) bazel_src
-  '';
-  buildPhase = ''
-    runHook preBuild
-
-    # Increasing memory during compilation might be necessary.
-    # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
-
-    # If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md
-    # and `git rev-parse --short HEAD` which would result in
-    # "3.7.0- (@non-git)" due to non-git build and incomplete changelog.
-    # Actual bazel releases use scripts/release/common.sh which is based
-    # on branch/tag information which we don't have with tarball releases.
-    # Note that .bazelversion is always correct and is based on bazel-*
-    # executable name, version checks should work fine
-    export EMBED_LABEL="${version}- (@non-git)"
-    ${bash}/bin/bash ./bazel_src/compile.sh
-    ./bazel_src/scripts/generate_bash_completion.sh \
-        --bazel=./bazel_src/output/bazel \
-        --output=./bazel_src/output/bazel-complete.bash \
-        --prepend=./bazel_src/scripts/bazel-complete-header.bash \
-        --prepend=./bazel_src/scripts/bazel-complete-template.bash
-    ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \
-        --bazel=./bazel_src/output/bazel \
-        --output=./bazel_src/output/bazel-complete.fish
-  ''
-  +
-    # disable execlog parser on darwin, since it fails to build
-    # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055
-    lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      # need to change directory for bazel to find the workspace
-      cd ./bazel_src
-      # build execlog tooling
-      export HOME=$(mktemp -d)
-      ./output/bazel build src/tools/execlog:parser_deploy.jar
-      cd -
-
-      runHook postBuild
-    '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-
-    # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel
-    # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch}
-    # The binary _must_ exist with this naming if your project contains a .bazelversion
-    # file.
-    cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
-    wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath}
-    mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
-
-  ''
-  +
-    # disable execlog parser on darwin, since it fails to build
-    # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055
-    (lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      mkdir $out/share
-      cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar
-      cat <<EOF > $out/bin/bazel-execlog
-      #!${runtimeShell} -e
-      ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@
-      EOF
-      chmod +x $out/bin/bazel-execlog
-    '')
-  + ''
-    # shell completion files
-    installShellCompletion --bash \
-      --name bazel.bash \
-      ./bazel_src/output/bazel-complete.bash
-    installShellCompletion --zsh \
-      --name _bazel \
-      ./bazel_src/scripts/zsh_completion/_bazel
-    installShellCompletion --fish \
-      --name bazel.fish \
-      ./bazel_src/output/bazel-complete.fish
-
-    runHook postInstall
-  '';
-
-  # Install check fails on `aarch64-darwin`
-  # https://github.com/NixOS/nixpkgs/issues/145587
-  doInstallCheck = stdenv.hostPlatform.system != "aarch64-darwin";
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    export TEST_TMPDIR=$(pwd)
-
-    hello_test () {
-      $out/bin/bazel test \
-        --test_output=errors \
-        examples/cpp:hello-success_test \
-        examples/java-native/src/test/java/com/example/myproject:hello
-    }
-
-    cd ./bazel_src
-
-    # If .bazelversion file is present in dist files and doesn't match `bazel` version
-    # running `bazel` command within bazel_src will fail.
-    # Let's remove .bazelversion within the test, if present it is meant to indicate bazel version
-    # to compile bazel with, not version of bazel to be built and tested.
-    rm -f .bazelversion
-
-    # test whether $WORKSPACE_ROOT/tools/bazel works
-
-    mkdir -p tools
-    cat > tools/bazel <<"EOF"
-    #!${runtimeShell} -e
-    exit 1
-    EOF
-    chmod +x tools/bazel
-
-    # first call should fail if tools/bazel is used
-    ! hello_test
-
-    cat > tools/bazel <<"EOF"
-    #!${runtimeShell} -e
-    exec "$BAZEL_REAL" "$@"
-    EOF
-
-    # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch}
-    hello_test
-
-    ## Test that the GSON serialisation files are present
-    gson_classes=$(unzip -l $($out/bin/bazel info install_base)/A-server.jar | grep -F -c _GsonTypeAdapter.class)
-    if [ "$gson_classes" -lt 10 ]; then
-      echo "Missing GsonTypeAdapter classes in A-server.jar. Lockfile generation will not work"
-      exit 1
-    fi
-
-    runHook postInstallCheck
-  '';
-
-  # Save paths to hardcoded dependencies so Nix can detect them.
-  # This is needed because the templates get tar’d up into a .jar.
-  postFixup = ''
-    mkdir -p $out/nix-support
-    echo "${defaultShellPath}" >> $out/nix-support/depends
-    # The string literal specifying the path to the bazel-rc file is sometimes
-    # stored non-contiguously in the binary due to gcc optimisations, which leads
-    # Nix to miss the hash when scanning for dependencies
-    echo "${bazelRC}" >> $out/nix-support/depends
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    echo "${cctools}" >> $out/nix-support/depends
-  '';
-
-  dontStrip = true;
-  dontPatchELF = true;
-}

pkgs/development/tools/build-managers/bazel/bazel_6/java_toolchain.patch

@@ -1,33 +0,0 @@
-diff --git a/tools/jdk/BUILD.tools b/tools/jdk/BUILD.tools
---- a/tools/jdk/BUILD.tools
-+++ b/tools/jdk/BUILD.tools
-@@ -3,6 +3,7 @@ load(
-     "DEFAULT_TOOLCHAIN_CONFIGURATION",
-     "PREBUILT_TOOLCHAIN_CONFIGURATION",
-     "VANILLA_TOOLCHAIN_CONFIGURATION",
-+    "NONPREBUILT_TOOLCHAIN_CONFIGURATION",
-     "bootclasspath",
-     "default_java_toolchain",
-     "java_runtime_files",
-@@ -321,6 +322,21 @@ alias(
-     actual = ":toolchain",
- )
- 
-+default_java_toolchain(
-+  name = "nonprebuilt_toolchain",
-+  configuration = NONPREBUILT_TOOLCHAIN_CONFIGURATION,
-+  java_runtime = "@local_jdk//:jdk",
-+)
-+
-+default_java_toolchain(
-+  name = "nonprebuilt_toolchain_java11",
-+  configuration = NONPREBUILT_TOOLCHAIN_CONFIGURATION,
-+  java_runtime = "@local_jdk//:jdk",
-+  source_version = "11",
-+  target_version = "11",
-+)
-+
-+
- RELEASES = (8, 9, 10, 11)
- 
- [

pkgs/development/tools/build-managers/bazel/bazel_6/nix-hacks.patch

@@ -1,40 +0,0 @@
-diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
-index 25fbdcac9d..49616d37df 100644
---- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
-+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
-@@ -568,22 +568,7 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
-       String content;
-       try {
-         content = FileSystemUtils.readContent(markerPath, StandardCharsets.UTF_8);
--        String markerRuleKey = readMarkerFile(content, markerData);
--        boolean verified = false;
--        if (Preconditions.checkNotNull(ruleKey).equals(markerRuleKey)) {
--          verified = handler.verifyMarkerData(rule, markerData, env);
--          if (env.valuesMissing()) {
--            return null;
--          }
--        }
--
--        if (verified) {
--          return new Fingerprint().addString(content).digestAndReset();
--        } else {
--          // So that we are in a consistent state if something happens while fetching the repository
--          markerPath.delete();
--          return null;
--        }
-+        return new Fingerprint().addString(content).digestAndReset();
-       } catch (IOException e) {
-         throw new RepositoryFunctionException(e, Transience.TRANSIENT);
-       }
-diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
-index 1a45b8a3a2..a6b73213f6 100644
---- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
-+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
-@@ -152,7 +152,6 @@ public class JavaSubprocessFactory implements SubprocessFactory {
-     ProcessBuilder builder = new ProcessBuilder();
-     builder.command(params.getArgv());
-     if (params.getEnv() != null) {
--      builder.environment().clear();
-       builder.environment().putAll(params.getEnv());
-     }
- 

pkgs/development/tools/build-managers/bazel/bazel_6/no-arc.patch

@@ -1,42 +0,0 @@
-diff --git a/tools/osx/BUILD b/tools/osx/BUILD
-index 990afe3e8c..cd5b7b1b7a 100644
---- a/tools/osx/BUILD
-+++ b/tools/osx/BUILD
-@@ -28,8 +28,8 @@ exports_files([
- ])
- 
- DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
--  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
--      -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
-+  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -framework CoreServices \
-+      -framework Foundation -arch @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \
-   env -i codesign --identifier $@ --force --sign - $@
- """
- 
-diff --git a/tools/osx/xcode_configure.bzl b/tools/osx/xcode_configure.bzl
-index 2b819f07ec..a98ce37673 100644
---- a/tools/osx/xcode_configure.bzl
-+++ b/tools/osx/xcode_configure.bzl
-@@ -127,7 +127,6 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):
-         "macosx",
-         "clang",
-         "-mmacosx-version-min=10.13",
--        "-fobjc-arc",
-         "-framework",
-         "CoreServices",
-         "-framework",
-diff --git a/tools/osx/xcode_locator.m b/tools/osx/xcode_locator.m
-index ed2ef87453..e0ce6dbdd1 100644
---- a/tools/osx/xcode_locator.m
-+++ b/tools/osx/xcode_locator.m
-@@ -21,10 +21,6 @@
- // 6,6.4,6.4.1 = 6.4.1
- // 6.3,6.3.0 = 6.3
- 
--#if !defined(__has_feature) || !__has_feature(objc_arc)
--#error "This file requires ARC support."
--#endif
--
- #import <CoreServices/CoreServices.h>
- #import <Foundation/Foundation.h>
- 

pkgs/development/tools/build-managers/bazel/bazel_6/strict_proto_deps.patch

@@ -1,21 +0,0 @@
-diff --git a/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl b/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl
-index 63f68167e4..f106e64c9b 100644
---- a/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl
-+++ b/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl
-@@ -114,6 +114,7 @@ def java_compile_for_protos(ctx, output_jar_suffix, source_jar = None, deps = []
-             exports = exports,
-             output = output_jar,
-             output_source_jar = source_jar,
-+            strict_deps = ctx.fragments.proto.strict_proto_deps(),
-             injecting_rule_kind = injecting_rule_kind,
-             javac_opts = java_toolchain.compatible_javacopts("proto"),
-             enable_jspecify = False,
-@@ -140,7 +141,7 @@ bazel_java_proto_aspect = aspect(
-     attr_aspects = ["deps", "exports"],
-     required_providers = [ProtoInfo],
-     provides = [JavaInfo, JavaProtoAspectInfo],
--    fragments = ["java"],
-+    fragments = ["java", "proto"],
- )
- 
- def bazel_java_proto_library_rule(ctx):

pkgs/development/tools/build-managers/bazel/bazel_6/upb-clang16.patch

@@ -1,30 +0,0 @@
-diff --git a/distdir_deps.bzl b/distdir_deps.bzl
-index c7fc4588e4..01e6966fca 100644
---- a/distdir_deps.bzl
-+++ b/distdir_deps.bzl
-@@ -192,6 +192,8@@ DIST_DEPS = {
-         "archive": "a5477045acaa34586420942098f5fecd3570f577.tar.gz",
-         "sha256": "cf7f71eaff90b24c1a28b49645a9ff03a9a6c1e7134291ce70901cb63e7364b5",
-         "strip_prefix": "upb-a5477045acaa34586420942098f5fecd3570f577",
-+        "patches": ["//:upb-clang16.patch"],
-+        "patch_args": ["-p1"],
-         "urls": [
-             "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz",
-             "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz",
-diff --git a/upb-clang16.patch b/upb-clang16.patch
-new file mode 100644
-index 0000000000..f81855181f
---- /dev/null
-+++ upb-clang16.patch
-@@ -0,0 +1,10 @@
-+--- a/bazel/build_defs.bzl
-++++ b/bazel/build_defs.bzl
-+@@ -43,6 +43,7 @@
-+     "-Werror=pedantic",
-+     "-Wall",
-+     "-Wstrict-prototypes",
-++    "-Wno-gnu-offsetof-extensions",
-+     # GCC (at least) emits spurious warnings for this that cannot be fixed
-+     # without introducing redundant initialization (with runtime cost):
-+     #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
-

pkgs/development/tools/build-managers/bazel/bazel_6/update-srcDeps.py

@@ -1,54 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import json
-
-if len(sys.argv) != 2:
-    print("usage: ./this-script src-deps.json < WORKSPACE", file=sys.stderr)
-    print("Takes the bazel WORKSPACE file and reads all archives into a json dict (by evaling it as python code)", file=sys.stderr)
-    print("Hail Eris.", file=sys.stderr)
-    sys.exit(1)
-
-http_archives = []
-
-# just the kw args are the dict { name, sha256, urls … }
-def http_archive(**kw):
-    http_archives.append(kw)
-# like http_file
-def http_file(**kw):
-    http_archives.append(kw)
-
-# this is inverted from http_archive/http_file and bundles multiple archives
-def _distdir_tar(**kw):
-    for archive_name in kw['archives']:
-        http_archives.append({
-            "name": archive_name,
-            "sha256": kw['sha256'][archive_name],
-            "urls": kw['urls'][archive_name]
-        })
-
-# TODO?
-def git_repository(**kw):
-    print(json.dumps(kw, sort_keys=True, indent=4), file=sys.stderr)
-    sys.exit(1)
-
-# execute the WORKSPACE like it was python code in this module,
-# using all the function stubs from above.
-exec(sys.stdin.read())
-
-# transform to a dict with the names as keys
-d = { el['name']: el for el in http_archives }
-
-def has_urls(el):
-    return ('url' in el and el['url']) or ('urls' in el and el['urls'])
-def has_sha256(el):
-    return 'sha256' in el and el['sha256']
-bad_archives = list(filter(lambda el: not has_urls(el) or not has_sha256(el), d.values()))
-if bad_archives:
-    print('Following bazel dependencies are missing url or sha256', file=sys.stderr)
-    print('Check bazel sources for master or non-checksummed dependencies', file=sys.stderr)
-    for el in bad_archives:
-        print(json.dumps(el, sort_keys=True, indent=4), file=sys.stderr)
-    sys.exit(1)
-
-with open(sys.argv[1], "w") as f:
-    print(json.dumps(d, sort_keys=True, indent=4), file=f)

pkgs/os-specific/linux/zfs/2_3.nix

@@ -12,10 +12,10 @@ callPackage ./generic.nix args {
   kernelModuleAttribute = "zfs_2_3";
 
   kernelMinSupportedMajorMinor = "4.18";
-  kernelMaxSupportedMajorMinor = "6.15";
+  kernelMaxSupportedMajorMinor = "6.16";
 
   # this package should point to the latest release.
-  version = "2.3.3";
+  version = "2.3.4";
 
   tests = {
     inherit (nixosTests.zfs) series_2_3;
@@ -29,5 +29,5 @@ callPackage ./generic.nix args {
     amarshall
   ];
 
-  hash = "sha256-NXAbyGBfpzWfm4NaP1/otTx8fOnoRV17343qUMdQp5U=";
+  hash = "sha256-8BSuDRDyqPGAiyGGxFyEZIcXB+cKsKk25jcFPrSK3GI=";
 }

pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix

@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "AlexxIT";
   domain = "xiaomi_gateway3";
-  version = "4.1.0";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "XiaomiGateway3";
     rev = "v${version}";
-    hash = "sha256-fpMrp8iVO1Gmj0c80qRr3yfdZ3fl+DOiEi1vF1GZwXU=";
+    hash = "sha256-20OA2H1HOwQKLL6Cjhp4xfTv1/BSc/XaMHX+wO+EM5s=";
   };
 
   dependencies = [ zigpy ];

pkgs/top-level/aliases.nix

@@ -504,6 +504,7 @@ mapAliases {
   bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17
   bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
   bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09
+  bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19
   BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12
   beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01
   beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
@@ -723,8 +724,12 @@ mapAliases {
   daytona-bin = throw "'daytona-bin' has been removed, as it was unmaintained in nixpkgs"; # Added 2025-07-21
   dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16
   dbench = throw "'dbench' has been removed as it is unmaintained for 14 years and broken"; # Added 2025-05-17
-  dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25
   dbus-map = throw "'dbus-map' has been dropped as it is unmaintained"; # Added 2024-11-01
+  dbus-sharp-1_0 = throw "'dbus-sharp-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
+  dbus-sharp-2_0 = throw "'dbus-sharp-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
+  dbus-sharp-glib-1_0 = throw "'dbus-sharp-glib-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
+  dbus-sharp-glib-2_0 = throw "'dbus-sharp-glib-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
+  dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25
   deadpixi-sam = deadpixi-sam-unstable;
 
   debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17
@@ -1603,6 +1608,7 @@ mapAliases {
   netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23
   nettools = net-tools; # Added 2025-06-11
   newt-go = fosrl-newt; # Added 2025-06-24
+  notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
   nextcloud29 = throw ''
     Nextcloud v29 has been removed from `nixpkgs` as the support for is dropped
     by upstream in 2025-04. Please upgrade to at least Nextcloud v30 by declaring
@@ -2460,6 +2466,7 @@ mapAliases {
   xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22
   xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2024-10-17
   xineUI = throw "'xineUI' has been renamed to/replaced by 'xine-ui'"; # Converted to throw 2024-10-17
+  xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22
   xlsxgrep = throw "'xlsxgrep' has been dropped due to lack of maintenance."; # Added 2024-11-01
   xmlada = gnatPackages.xmlada; # Added 2024-02-25
   xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18

pkgs/top-level/all-packages.nix

@@ -6585,15 +6585,7 @@ with pkgs;
 
   bandit = with python3Packages; toPythonApplication bandit;
 
-  bazel = bazel_6;
-
-  bazel_6 = callPackage ../development/tools/build-managers/bazel/bazel_6 {
-    inherit (darwin) sigtool;
-    buildJdk = jdk11_headless;
-    runJdk = jdk11_headless;
-    stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv else stdenv;
-    bazel_self = bazel_6;
-  };
+  bazel = bazel_7;
 
   bazel_7 = callPackage ../development/tools/build-managers/bazel/bazel_7 {
     inherit (darwin) sigtool;
@@ -7518,13 +7510,6 @@ with pkgs;
   db62 = callPackage ../development/libraries/db/db-6.2.nix { };
 
   dbus = callPackage ../development/libraries/dbus { };
-  dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { };
-  dbus-sharp-2_0 = callPackage ../development/libraries/dbus-sharp { };
-
-  dbus-sharp-glib-1_0 =
-    callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
-      { };
-  dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { };
 
   makeDBusConf = callPackage ../development/libraries/dbus/make-dbus-conf.nix { };