From a04b93fa7bf4160a9dc60d0713fff44c0fff9af6 Mon Sep 17 00:00:00 2001 From: saygo-png Date: Wed, 3 Sep 2025 19:50:00 +0200 Subject: [PATCH] treewide: Disable fixup phase for builds Signed-off-by: saygo-png --- ci/nvim-lspconfig/default.nix | 5 ++++- modules/top-level/output.nix | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ci/nvim-lspconfig/default.nix b/ci/nvim-lspconfig/default.nix index 2aa2e39d..be910049 100644 --- a/ci/nvim-lspconfig/default.nix +++ b/ci/nvim-lspconfig/default.nix @@ -19,7 +19,10 @@ let ]; }; - nvim = wrapNeovimUnstable neovim-unwrapped nvimConfig; + nvim = (wrapNeovimUnstable neovim-unwrapped nvimConfig).overrideAttrs { + dontFixup = true; + }; + in runCommand "lspconfig-servers" { diff --git a/modules/top-level/output.nix b/modules/top-level/output.nix index 350562a7..81cdfd79 100644 --- a/modules/top-level/output.nix +++ b/modules/top-level/output.nix @@ -220,7 +220,13 @@ in } ); - wrappedNeovim = pkgs.wrapNeovimUnstable package neovimConfig; + # TODO: 2025-01-06 + # Wait for user feedback on disabling the fixup phase. + # Ideally this will be upstreamed to nixpkgs. + # See https://github.com/nix-community/nixvim/pull/3660#discussion_r2326250439 + wrappedNeovim = (pkgs.wrapNeovimUnstable package neovimConfig).overrideAttrs { + dontFixup = true; + }; customRC = helpers.concatNonEmptyLines [ (helpers.wrapVimscriptForLua wrappedNeovim.initRc)