From 6b2b35ab55ea2f8a85cf3d145fd95f3cba401a65 Mon Sep 17 00:00:00 2001 From: luketchang Date: Wed, 6 May 2026 20:33:18 -0700 Subject: [PATCH] databricks-cli: switch to replit/databricks-cli fork Point the databricks-cli module at the Replit fork at github.com/replit/databricks-cli, branch replit-main (commit 4928653c). The fork tracks upstream v0.290.2 + 1 Replit commit, which adds --concurrency and --retry-timeout flags to `databricks sync` to mitigate 502s and let us tune in-flight request count when deploying Apps from pid2. Pinning to v0.290.2 (the same release nixpkgs is on) keeps the test skip list identical to nixpkgs upstream's, so the build matches established practice. Bumping past v0.291.0 in a future PR will require adding skip entries for the new SDK host-metadata resolver tests; that's a separate change. Slack thread: https://replit.slack.com/archives/C0A2Z9042FR/p1778082184841149 ~ written by Zerg :space_invader: ([wp-7918444a](https://zerg.zergrush.dev/chat?id=wp-7918444a)) --- pkgs/modules/databricks-cli/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/modules/databricks-cli/default.nix b/pkgs/modules/databricks-cli/default.nix index 2d1bc8a9..aa829ceb 100644 --- a/pkgs/modules/databricks-cli/default.nix +++ b/pkgs/modules/databricks-cli/default.nix @@ -1,19 +1,25 @@ { pkgs, lib, ... }: let - version = "0.286.0"; + # Replit fork of databricks/cli. Adds --concurrency and --retry-timeout + # flags to `databricks sync`. Based on upstream v0.290.2, the same release + # nixpkgs is on, so the test skip list below stays in sync with nixpkgs'. + # Source: https://github.com/replit/databricks-cli (replit-main branch) + upstreamVersion = "0.290.2"; + rev = "4928653c0620fb73b20d57dda4a26a233c2546f1"; + version = "${upstreamVersion}-replit-${builtins.substring 0 8 rev}"; databricks-cli = pkgs.buildGoModule { pname = "databricks-cli"; inherit version; src = pkgs.fetchFromGitHub { - owner = "databricks"; - repo = "cli"; - rev = "v${version}"; - hash = "sha256-iCmxHjIYznqed6BMQKtuYHJNFPy+3XrNzSXfhtyzPJk="; + owner = "replit"; + repo = "databricks-cli"; + inherit rev; + hash = "sha256-wTceEtlE2EnOe2noUWTsN0DzMIJxV8yLvyQu2M3Ts8E="; }; - vendorHash = "sha256-TNUI2VQVKnxTiKQg9Bj3qDK2w3oOjO0rdrtTlFIhTzA="; + vendorHash = "sha256-8PJ2M5L8DkL4ydtUQbw0wKvt+5rVYbOAAGvURkSMm/o="; excludedPackages = [ "bundle/internal" @@ -77,8 +83,8 @@ let meta = { description = "Databricks CLI"; mainProgram = "databricks"; - homepage = "https://github.com/databricks/cli"; - changelog = "https://github.com/databricks/cli/releases/tag/v${version}"; + homepage = "https://github.com/replit/databricks-cli"; + changelog = "https://github.com/databricks/cli/releases/tag/v${upstreamVersion}"; license = lib.licenses.databricks; }; };