diff --git a/developmentlog.md b/developmentlog.md index 5772948..26400a4 100644 --- a/developmentlog.md +++ b/developmentlog.md @@ -46,3 +46,16 @@ Changes (`hosts/legolas/hardware-configuration.nix`): Also fixed `home/niri.nix` lid-close command from the undocumented `lockScreen lock` to the v5-canonical `session lock` (matching the `Mod+M` binding). Verify after rebuild+reboot: `/proc/cmdline` has no `deep`, and `/sys/power/mem_sleep` shows `[s2idle] deep`. + +## Bumped locally packaged packages + +Version + hash bumps for the upstream-tracking packages under `packages/`. All hashes recomputed from the actual fetched outputs (src FOD builds for the `postFetch` sources, `nurl` for plain `fetchFromGitHub`, FOD builds for `npmDepsHash`/`vendorHash`). + +- `llama-cpp-nightly` + `ui.nix`: `b9665` -> `b10034` (src + npmDepsHash). +- `llama-swap` + `ui.nix`: `v226` -> `v240` (src + vendorHash + ui npmDepsHash). UI version is inherited. +- `s2cpp`: pin `e48ce8e` (2026-04-12) -> `2c33261` (2026-05-27). +- `intel-sycl`: `nightly-2026-01-01` -> `nightly-2026-07-13` (src hash only). + +Not bumped: `qwen-asr` (still at upstream latest `1.0.3`); the model packages (`s2-model`, `whisper-models`, `z-image-models`) and `android-cli` use fixed URLs with no version tag to bump. + +Note: `intel-sycl` is packaged but not currently wired into the flake (`llama-cpp-nightly-sycl` leaves `syclStdenv = null` and is marked broken). The vc-intrinsics pin in `intel-sycl/pins` was left as-is. Builds must use `--builders ""` locally — the configured remote builder `aragon` is unreachable and its SSH retries stall fetches. diff --git a/packages/intel-sycl/default.nix b/packages/intel-sycl/default.nix index 3fa9e66..949fa1d 100644 --- a/packages/intel-sycl/default.nix +++ b/packages/intel-sycl/default.nix @@ -2,12 +2,12 @@ global: self: let inherit (global) callPackage; pins = callPackage ./pins { }; - version = "nightly-2026-01-01"; + version = "nightly-2026-07-13"; src = global.fetchFromGitHub { owner = "intel"; repo = "llvm"; rev = version; - hash = "sha256-OkSyn2KdAzptgKpTAnw//+6x8fbk/5Rjh1/6soQAjWc="; + hash = "sha256-Nm2aHYuP9ums+J+0VSIew3B3ynfYv293UxV/4AyBcMQ="; }; in { diff --git a/packages/llama-cpp-nightly/default.nix b/packages/llama-cpp-nightly/default.nix index 0a70137..6f062f6 100644 --- a/packages/llama-cpp-nightly/default.nix +++ b/packages/llama-cpp-nightly/default.nix @@ -83,13 +83,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp-nightly"; - version = "9665"; + version = "10034"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-RDE5+WP2Z2nQN7w/OeDmfaoRANBnYtgp0NQ9mMn0QmI="; + hash = "sha256-pbQyfntd8JGx+ZVnis9CzJ9dNFqBEwKwYt4iHRWiC7g="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT diff --git a/packages/llama-cpp-nightly/ui.nix b/packages/llama-cpp-nightly/ui.nix index 05f3967..b6c52df 100644 --- a/packages/llama-cpp-nightly/ui.nix +++ b/packages/llama-cpp-nightly/ui.nix @@ -6,18 +6,18 @@ buildNpmPackage (finalAttrs: { pname = "llama-cpp-nightly-ui"; - version = "9665"; + version = "10034"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-eMRNWunJyv2dsc6NmRDEDgXh7JCMT6fV1g9IrNOA6NU="; + hash = "sha256-ePZOtcxU1I14C3eJeSRg5M2HpZIO0ESTLdMfxXLdBQY="; }; sourceRoot = "source/tools/ui"; - npmDepsHash = "sha256-T6CpsyZ1zxU9uEr/9JcmABCrtaB9aCz2EpdTS0IJzX0="; + npmDepsHash = "sha256-6s9skw1wzEfm9QKktTqea3J+oudQAsS6O2VnZEMXAdw="; installPhase = '' runHook preInstall diff --git a/packages/llama-swap/package.nix b/packages/llama-swap/package.nix index d1b0f32..202977d 100644 --- a/packages/llama-swap/package.nix +++ b/packages/llama-swap/package.nix @@ -18,7 +18,7 @@ let in buildGoModule (finalAttrs: { pname = "llama-swap"; - version = "226"; + version = "240"; outputs = [ "out" @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { owner = "mostlygeek"; repo = "llama-swap"; tag = "v${finalAttrs.version}"; - hash = "sha256-V0Wev8EpjMSmMqHXJjKJ7SAKobN69232CjghTjyZXfU="; + hash = "sha256-cvxF4J9Qvi522dBGjaNZvwwY/bV3wXSE0oGFATjzD4U="; leaveDotGit = true; postFetch = '' cd "$out" @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-/IFiRXyiKL2+YfMUSHfCizNFuxj/VVuN20mwnpC12o0="; + vendorHash = "sha256-jQRnFGqQvk6my7ejnesv1pylCmEXLs9GKbQJEZdsaYg="; passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; }; diff --git a/packages/llama-swap/ui.nix b/packages/llama-swap/ui.nix index 5a0f2d9..e7a20ae 100644 --- a/packages/llama-swap/ui.nix +++ b/packages/llama-swap/ui.nix @@ -13,10 +13,10 @@ buildNpmPackage (finalAttrs: { owner = "mostlygeek"; repo = "llama-swap"; tag = "v${finalAttrs.version}"; - hash = "sha256-w27S9JQyEMKc0dUkL9ATFXhh0jaEneb55neoNdFn/68="; + hash = "sha256-WTAHPWIxUbKdB249ScUcsn3F9TFwS2SZwxleYW9/w78="; }; - npmDepsHash = "sha256-NJqEJ+XTdpPFtJJxP4CGu+JDUW7lKDcFgsixQJ3SXtQ="; + npmDepsHash = "sha256-cAdFKDhmyaYCoKqSYEuAhu29rBxs7i8uTmU2SHwTLnY="; postPatch = '' substituteInPlace vite.config.ts \ diff --git a/packages/s2cpp/default.nix b/packages/s2cpp/default.nix index 537505d..6f8bf4b 100644 --- a/packages/s2cpp/default.nix +++ b/packages/s2cpp/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "s2cpp"; - version = "0-unstable-2026-04-12"; + version = "0-unstable-2026-05-27"; src = fetchFromGitHub { owner = "rodrigomatta"; repo = "s2.cpp"; - rev = "e48ce8e1c3ee23acbac97ce078b8faab0a2da43c"; - hash = "sha256-xlDYqimbqCBidkcmt5gIgMtYLw8gdR51qD3gFD0j7xE="; + rev = "2c33261938da1a41d713768b1b391b4d368d7d2c"; + hash = "sha256-wHNhGbWbLnm9XTBHOVmAsQKuzG54Gq8i92YQFU2GLs4="; fetchSubmodules = true; };