diff --git a/pkgs/bun/default.nix b/pkgs/bun/default.nix deleted file mode 100644 index 02f19c58..00000000 --- a/pkgs/bun/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ bun -, fetchurl -}: - -bun.overrideAttrs rec { - version = "1.2.16"; - src = fetchurl { - url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-+DEdjXyqDZOMbEzs8KYA5enOTidaQR44oun4x30MEAI="; - }; -} diff --git a/pkgs/modules/bun/default.nix b/pkgs/modules/bun/default.nix index 6a05c0ec..397a8c42 100644 --- a/pkgs/modules/bun/default.nix +++ b/pkgs/modules/bun/default.nix @@ -1,7 +1,14 @@ +# NOTE: Unlike Node.js, nixpkgs doesn't provide versioned bun attributes (e.g., bun_1_3). +# This module uses pkgs.bun which tracks the latest version. +# +# When nixpkgs updates bun to a new major.minor version: +# 1. Add the previous version to pkgs/historical-modules/default.nix, pinned to the +# commit before the nixpkgs update +# 2. Update pkgs/upgrade-map/default.nix to chain the old version to the new one +{ bun }: { pkgs, lib, ... }: let - bun = pkgs.callPackage ../../bun { }; bun-wrapped = pkgs.lib.mkWrapper-replit_ld_library_path bun; extensions = [ ".js" ".jsx" ".cjs" ".mjs" ".ts" ".tsx" ".mts" ]; diff --git a/pkgs/modules/default.nix b/pkgs/modules/default.nix index 45bfb25e..32263030 100644 --- a/pkgs/modules/default.nix +++ b/pkgs/modules/default.nix @@ -91,7 +91,9 @@ let nodejs = pkgs.nodejs_24; }) (import ./bash) - (import ./bun) + (import ./bun { + bun = pkgs.bun; + }) (import ./c) (import ./cpp) (import ./dart) diff --git a/pkgs/modules/nodejs/default.nix b/pkgs/modules/nodejs/default.nix index 9bd3a731..8b638247 100644 --- a/pkgs/modules/nodejs/default.nix +++ b/pkgs/modules/nodejs/default.nix @@ -6,7 +6,7 @@ let short-version = lib.versions.major nodejs.version; - bun = pkgs.callPackage ../../bun { }; + bun = pkgs.bun; nodepkgs = pkgs.nodePackages.override { inherit nodejs; diff --git a/pkgs/upgrade-map/default.nix b/pkgs/upgrade-map/default.nix index c8c71945..1db5a6ad 100644 --- a/pkgs/upgrade-map/default.nix +++ b/pkgs/upgrade-map/default.nix @@ -10,6 +10,9 @@ let "bun-0.5" = "bun-0.6"; "bun-0.6" = "bun-0.7"; "bun-0.7" = "bun-1.0"; + "bun-1.0" = "bun-1.1"; + "bun-1.1" = "bun-1.2"; + "bun-1.2" = "bun-1.3"; "dart-3.0" = "dart-3.1"; "dart-3.1" = "dart-3.2"; "dart-3.2" = "dart-3.3";