brew-src: 5.0.12 -> 5.1.1

flake.lock

@@ -3,16 +3,16 @@
     "brew-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1769363988,
-        "narHash": "sha256-BiGPeulrDVetXP+tjxhMcGLUROZAtZIhU5m4MqawCfM=",
+        "lastModified": 1774235677,
+        "narHash": "sha256-0ryNYmzDAeRlrzPTAgmzGH/Cgc8iv/LBN6jWGUANvIk=",
         "owner": "Homebrew",
         "repo": "brew",
-        "rev": "d01011cac6d72032c75fd2cd9489909e95d9faf2",
+        "rev": "894a3d23ac0c8aaf561b9874b528b9cb2e839201",
         "type": "github"
       },
       "original": {
         "owner": "Homebrew",
-        "ref": "5.0.12",
+        "ref": "5.1.1",
         "repo": "brew",
         "type": "github"
       }

flake.nix

@@ -3,7 +3,7 @@
 
   inputs = {
     brew-src = {
-      url = "github:Homebrew/brew/5.0.12";
+      url = "github:Homebrew/brew/5.1.1";
       flake = false;
     };
   };

modules/brew.tail.sh

@@ -15,6 +15,10 @@ BIN_BREW_EXPORTED_VARS=(
   HOMEBREW_USER_CONFIG_HOME
   HOMEBREW_ORIGINAL_BREW_FILE
 )
+BIN_BREW_EXPORTED_VARS_REGEX="^($(
+  IFS='|'
+  echo "${BIN_BREW_EXPORTED_VARS[*]}"
+))(=|$)"
 
 # Load Homebrew's variable configuration files from disk.
 export_homebrew_env_file() {
@@ -22,18 +26,20 @@ export_homebrew_env_file() {
 
   env_file="${1}"
   [[ -r "${env_file}" ]] || return 0
+
   while read -r line
   do
     # only load variables defined in env_config.rb
     [[ "${line}" =~ ^(HOMEBREW_|SUDO_ASKPASS=|(all|no|ftp|https?)_proxy=) ]] || continue
 
     # forbid overriding variables that are set in this file
-    local invalid_variable
-    for VAR in "${BIN_BREW_EXPORTED_VARS[@]}"
-    do
-      [[ "${line}" = "${VAR}"* ]] && invalid_variable="${VAR}"
-    done
-    [[ -n "${invalid_variable:-}" ]] && continue
+    [[ "${line}" =~ ${BIN_BREW_EXPORTED_VARS_REGEX} ]] && continue
+
+    if [[ "${line}" == HOMEBREW_EXPERIMENTAL_RUST_FRONTEND=* ]]
+    then
+      echo "Warning: Ignoring HOMEBREW_EXPERIMENTAL_RUST_FRONTEND. This cannot be set in an env file." >&2
+      continue
+    fi
 
     export "${line?}"
   done <"${env_file}"
@@ -58,6 +64,9 @@ export_homebrew_env_file "${HOMEBREW_PREFIX}/etc/homebrew/brew.env"
 if [[ -n "${XDG_CONFIG_HOME-}" ]]
 then
   HOMEBREW_USER_CONFIG_HOME="${XDG_CONFIG_HOME}/homebrew"
+elif [[ -n "${HOMEBREW_XDG_CONFIG_HOME-}" ]]
+then
+  HOMEBREW_USER_CONFIG_HOME="${HOMEBREW_XDG_CONFIG_HOME}/homebrew"
 else
   HOMEBREW_USER_CONFIG_HOME="${HOME}/.homebrew"
 fi
@@ -119,6 +128,7 @@ USED_BY_HOMEBREW_VARS=(
   VSCODE_IPC_HOOK_CLI
   WSL_DISTRO_NAME
   XDG_CACHE_HOME
+  XDG_CONFIG_HOME
   XDG_DATA_DIRS
   XDG_RUNTIME_DIR
   ZDOTDIR

modules/default.nix

@@ -35,7 +35,7 @@ let
   tools = pkgs.callPackage ../pkgs { };
 
   brew = if cfg.patchBrew then patchBrew cfg.package else cfg.package;
-  ruby = pkgs.ruby_3_4;
+  ruby = pkgs.ruby_4_0;
 
   # Sadly, we cannot replace coreutils since the GNU implementations
   # behave differently.
@@ -305,10 +305,17 @@ let
       --replace-fail 'for DIR in "''${HOMEBREW_REPOSITORY}"' "for DIR in "
 
     # Disable vendored Ruby
+    #
+    # Homebrew passes --disable=gems,rubyopt ($HOMEBREW_RUBY_DISABLE_OPTIONS)
+    # and inserts vendored libraries into LOAD_PATH (vendor/bundle/bundler/setup.rb, standalone/init.rb).
+    # Instead of re-enabling gems, we add in additional required gems into LOAD_PATH.
     ruby_sh="$out/Library/Homebrew/utils/ruby.sh"
-    if [[ -e "$ruby_sh" ]] && grep "setup-ruby-path" "$ruby_sh"; then
-      chmod u+w "$ruby_sh"
+    bundler_setup_rb="$out/Library/Homebrew/vendor/bundle/bundler/setup.rb"
+    if [[ -e "$ruby_sh" ]] && grep "setup-ruby-path" "$ruby_sh" >/dev/null; then
+      >&2 echo "Patching vendored Ruby..."
+      chmod u+w "$ruby_sh" "$bundler_setup_rb"
       echo -e "setup-ruby-path() { export HOMEBREW_RUBY_PATH=\"${ruby}/bin/ruby\"; }" >>"$ruby_sh"
+      echo -e "$:.unshift \"${ruby.gems.fiddle}/${ruby.gemPath}/gems/fiddle-${ruby.gems.fiddle.version}/lib\"" >>"$bundler_setup_rb"
     fi
   '' + lib.optionalString (brew ? version) ''
     # Embed version number instead of checking with git