Merge remote-tracking branch 'origin/use-bun-canary' into nix-auto-updates

Author: ReStranger

flake.lock

@@ -3,10 +3,11 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    re-nixpkgs.url = "github:ReStranger/re-nixpkgs";
   };
 
   outputs =
-    { self, nixpkgs, ... }:
+    { self, nixpkgs, re-nixpkgs, ... } @ inputs:
     let
       systems = [
         "aarch64-linux"
@@ -21,7 +22,7 @@
       devShells = forEachSystem (pkgs: {
         default = pkgs.mkShell {
           packages = with pkgs; [
-            bun
+            re-nixpkgs.packages.${pkgs.system}.bun-canary
             nodejs_20
             pkg-config
             openssl
@@ -35,15 +36,15 @@
           final: _prev:
           let
             node_modules = final.callPackage ./nix/node_modules.nix {
-              inherit rev;
+              inherit rev inputs;
             };
           in
           rec {
             opencode = final.callPackage ./nix/opencode.nix {
-              inherit node_modules;
+              inherit node_modules inputs;
             };
             opencode-desktop = final.callPackage ./nix/desktop.nix {
-              inherit opencode;
+              inherit opencode inputs;
             };
           };
       };
@@ -52,16 +53,16 @@
         pkgs:
         let
           node_modules = pkgs.callPackage ./nix/node_modules.nix {
-            inherit rev;
+            inherit rev inputs;
           };
         in
         rec {
           default = opencode;
           opencode = pkgs.callPackage ./nix/opencode.nix {
-            inherit node_modules;
+            inherit node_modules inputs;
           };
           opencode-desktop = pkgs.callPackage ./nix/desktop.nix {
-            inherit opencode;
+            inherit opencode inputs;
           };
           # Updater derivation with fakeHash - build fails and reveals correct hash
           node_modules_updater = node_modules.override {

flake.nix

@@ -1,7 +1,8 @@
 {
   lib,
+  inputs,
+  pkgs,
   stdenv,
-  bun,
   nodejs,
   darwin,
   electron_41,
@@ -23,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     ;
 
   nativeBuildInputs = [
-    bun
+    inputs.re-nixpkgs.packages.${pkgs.stdenv.hostPlatform.system}.bun-canary
     nodejs
     makeWrapper
     writableTmpDirAsHomeHook

nix/desktop.nix

@@ -1,7 +1,8 @@
 {
   lib,
+  inputs,
+  pkgs,
   stdenvNoCC,
-  bun,
   rev ? "dirty",
   hash ?
     (lib.pipe ./hashes.json [
@@ -41,7 +42,7 @@ stdenvNoCC.mkDerivation {
     "SOCKS_SERVER"
   ];
 
-  nativeBuildInputs = [ bun ];
+  nativeBuildInputs = [ inputs.re-nixpkgs.packages.${pkgs.stdenv.hostPlatform.system}.bun-canary ];
 
   dontConfigure = true;
 

nix/node_modules.nix

@@ -1,8 +1,9 @@
 {
   lib,
+  inputs,
+  pkgs,
   stdenvNoCC,
   callPackage,
-  bun,
   nodejs,
   sysctl,
   makeBinaryWrapper,
@@ -19,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   inherit node_modules;
 
   nativeBuildInputs = [
-    bun
+    inputs.re-nixpkgs.packages.${pkgs.stdenv.hostPlatform.system}.bun-canary
     nodejs # for patchShebangs node_modules
     installShellFiles
     makeBinaryWrapper