2 Commits

3 changed files with 9 additions and 16 deletions
+5 -4
View File
@@ -14,9 +14,10 @@
version ? "1.3.13", version ? "1.3.13",
}: let }: let
# When updating `version`, compute the new hash with: # When updating `version`, compute the new hash with:
# nix store prefetch-file \ # nix store prefetch-file "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64-baseline.zip"
# "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64-baseline.zip" hash = {
hash = "sha256-nYokKSpwaAkCBdqsCloiP19pc29Sh+N7+I07QDHtx1A="; "1.3.13" = "sha256-nYokKSpwaAkCBdqsCloiP19pc29Sh+N7+I07QDHtx1A=";
};
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "bun-baseline"; pname = "bun-baseline";
@@ -24,7 +25,7 @@ in
src = fetchurl { src = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64-baseline.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64-baseline.zip";
inherit hash; hash = hash.${version};
}; };
nativeBuildInputs = nativeBuildInputs =
+3 -12
View File
@@ -13,25 +13,16 @@ with lib; let
# Intel Core i5 2640M. # Intel Core i5 2640M.
needsBaselineBun = needsBaselineBun =
pkgs.stdenv.hostPlatform.isx86_64 && !pkgs.stdenv.hostPlatform.avx2Support; pkgs.stdenv.hostPlatform.isx86_64 && !pkgs.stdenv.hostPlatform.avx2Support;
bunBaseline = pkgs.callPackage ../../../../packages/bun-baseline.nix {};
defaultPackageCli = defaultPackageCli =
if needsBaselineBun if needsBaselineBun
then then pkgs.opencode.override {bun = bunBaseline;}
pkgs.opencode.override {
bun = pkgs.callPackage ../../../../packages/bun-baseline.nix {
version = pkgs.bun.version;
};
}
else pkgs.opencode; else pkgs.opencode;
defaultPackageDesktop = defaultPackageDesktop =
if needsBaselineBun if needsBaselineBun
then then pkgs.opencode-desktop.override {bun = bunBaseline;}
pkgs.opencode-desktop.override {
bun = pkgs.callPackage ../../../../packages/bun-baseline.nix {
version = pkgs.bun.version;
};
}
else pkgs.opencode-desktop; else pkgs.opencode-desktop;
corsList = domains: lists.remove "" (lists.forEach (strings.splitString "," domains) trim); corsList = domains: lists.remove "" (lists.forEach (strings.splitString "," domains) trim);
+1
View File
@@ -106,6 +106,7 @@
); );
}; };
}; };
media.mopidy.enable = false;
}; };
manual = { manual = {