diff --git a/hosts/common/programs/neovim/default.nix b/hosts/common/programs/neovim/default.nix index 6d5b6d41d..ba4717d1f 100644 --- a/hosts/common/programs/neovim/default.nix +++ b/hosts/common/programs/neovim/default.nix @@ -79,8 +79,9 @@ in # - neovim vendors lua `mpack` library, # which it tries to build for the wrong platform # and its vendored version has diverged in symbol names anyway + # TODO: lift this into `overlays/cross.nix`, where i can monitor its upstreaming! postPatch = (upstream.postPatch or "") + '' - substituteInPlace src/nvim/generators/preload.lua --replace-fail \ + substituteInPlace src/gen/preload_nlua.lua --replace-fail \ "require 'nlua0'" " vim.mpack = require 'mpack' vim.mpack.encode = vim.mpack.pack diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index 3f2801f67..87bccb98a 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/master.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix @@ -8,8 +8,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "28a6e4943b04e441d316c3bfb8dec022c2668ea0"; - sha256 = "sha256-F7U8x4fgrYvJzQ15cAyh3dE1i6Jz+5Tx2qFWR6OqIT4="; - version = "0-unstable-2025-03-25"; + rev = "5b8ffb57aea5cc1a779d5291dd82ca2f89b63a6a"; + sha256 = "sha256-mpDbGs9uzNlZON04LRFwcprnMvkKTzJSxYN4JjR2dkI="; + version = "0-unstable-2025-03-27"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix index aae645c91..c30b2f07f 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "31a58da701bc6233562a24ca8142c3d5821c7d9f"; - sha256 = "sha256-1UIBF4oTcqZM7+aQwMvkAaFKsGXB88WJ45m3i56HwRI="; - version = "0-unstable-2025-03-25"; + rev = "5361f5d25432dd38c43399966bc023e479968b5e"; + sha256 = "sha256-wvWJ597dqyYxV7/nRikNSHMSgowIrb53m/IMyIgueOA="; + version = "0-unstable-2025-03-27"; branch = "staging-next"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix index 3ef76c65b..65fce1aea 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "310aba201f934137e5b770cb89d4fb17adeecbc9"; - sha256 = "sha256-4pFUh7j2+7Z/4Ec48lGfure7LEyR0f1x0rHkRdhygG0="; - version = "0-unstable-2025-03-25"; + rev = "4d4a2f8b14d5c5328e02514e5ff2f524473eb608"; + sha256 = "sha256-8ZQL9fb1Oda4cTPe3Z1+dbHUcESWwyAB3bKwvx4USws="; + version = "0-unstable-2025-03-26"; branch = "staging"; }