From b99c0ae4ffc51781b116461fc58dca4564dc240c Mon Sep 17 00:00:00 2001
From: Matt <59450879+mattppal@users.noreply.github.com>
Date: Tue, 3 Feb 2026 11:52:58 -0800
Subject: [PATCH 1/4] bun

---
 pkgs/bun/default.nix         | 11 -----------
 pkgs/modules/bun/default.nix |  2 +-
 pkgs/modules/default.nix     |  4 +++-
 3 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/bun/default.nix

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..e25b8f85 100644
--- a/pkgs/modules/bun/default.nix
+++ b/pkgs/modules/bun/default.nix
@@ -1,7 +1,7 @@
+{ 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)

From 929b7afc5c1b62a88a7194fcfd96e6cb9e5a8d2e Mon Sep 17 00:00:00 2001
From: Matt <59450879+mattppal@users.noreply.github.com>
Date: Tue, 3 Feb 2026 11:59:21 -0800
Subject: [PATCH 2/4] bun

---
 pkgs/modules/nodejs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;

From f06f6d73cd8a79694f35fd376757af0affb8e297 Mon Sep 17 00:00:00 2001
From: Matt <59450879+mattppal@users.noreply.github.com>
Date: Tue, 3 Feb 2026 12:04:50 -0800
Subject: [PATCH 3/4] pkgs/historical-modules: Add bun 1.2.16 and update
 upgrade-map

---
 pkgs/historical-modules/default.nix | 7 +++++++
 pkgs/modules/bun/default.nix        | 7 +++++++
 pkgs/upgrade-map/default.nix        | 3 +++
 3 files changed, 17 insertions(+)

diff --git a/pkgs/historical-modules/default.nix b/pkgs/historical-modules/default.nix
index 61c576a2..78dc8a90 100644
--- a/pkgs/historical-modules/default.nix
+++ b/pkgs/historical-modules/default.nix
@@ -24,6 +24,13 @@ let
         displayVersion = "1.1.45";
       };
     }
+    {
+      moduleId = "bun-1.2";
+      commit = "a3a6925";
+      overrides = {
+        displayVersion = "1.2.16";
+      };
+    }
     {
       moduleId = "clojure-1.11";
       commit = "4327245815e8500233ed3af1cbb674bd147f673b";
diff --git a/pkgs/modules/bun/default.nix b/pkgs/modules/bun/default.nix
index e25b8f85..397a8c42 100644
--- a/pkgs/modules/bun/default.nix
+++ b/pkgs/modules/bun/default.nix
@@ -1,3 +1,10 @@
+# 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, ... }:
 
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";

From 92a6f73e24e73c2afa50cb943217758bfc0bdc96 Mon Sep 17 00:00:00 2001
From: Matt <59450879+mattppal@users.noreply.github.com>
Date: Tue, 3 Feb 2026 13:26:37 -0800
Subject: [PATCH 4/4] Update pkgs/historical-modules/default.nix

Co-authored-by: Ryan Mulligan <ryan@ryantm.com>
---
 pkgs/historical-modules/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/historical-modules/default.nix b/pkgs/historical-modules/default.nix
index 78dc8a90..61c576a2 100644
--- a/pkgs/historical-modules/default.nix
+++ b/pkgs/historical-modules/default.nix
@@ -24,13 +24,6 @@ let
         displayVersion = "1.1.45";
       };
     }
-    {
-      moduleId = "bun-1.2";
-      commit = "a3a6925";
-      overrides = {
-        displayVersion = "1.2.16";
-      };
-    }
     {
       moduleId = "clojure-1.11";
       commit = "4327245815e8500233ed3af1cbb674bd147f673b";