nixpkgs: 2025-09-26 -> 2025-09-29

hosts/common/programs/neovim/plugins.nix

@@ -75,14 +75,13 @@ with pkgs.vimPlugins;
     #   e.g. `os.path.<C-x><C-o>`  to show available os.path items in python
     plugin = nvim-lspconfig;
     config = ''
-      local lspconfig = require("lspconfig")
       local cmp_nvim_lsp = require("cmp_nvim_lsp")
       local capabilities = cmp_nvim_lsp.default_capabilities()
 
     '' + lib.optionalString config.sane.programs.bash-language-server.enabled ''
       -- bash language server
       -- repo: <https://github.com/bash-lsp/bash-language-server>
-      lspconfig.bashls.setup {
+      vim.lsp.config('bashls', {
         capabilities = capabilities,
         filetypes = { "bash", "sh", "zsh" },  -- defaults to just `sh`
         handlers = {
@@ -92,64 +91,73 @@ with pkgs.vimPlugins;
           -- more: <https://github.com/neovim/nvim-lspconfig/issues/662>
           ['textDocument/publishDiagnostics'] = function() end
         },
-      }
+      })
+      vim.lsp.enable('bashls')
 
     '' + lib.optionalString config.sane.programs.clang-tools.enabled ''
       -- c/c++ language server
-      lspconfig.clangd.setup {
+      vim.lsp.config('clangd', {
         capabilities = capabilities,
-      }
+      })
+      vim.lsp.enable('clangd')
 
     '' + lib.optionalString config.sane.programs.ltex-ls.enabled ''
       -- LaTeX / html / markdown spellchecker
       -- repo: <https://github.com/valentjn/ltex-ls>
-      lspconfig.ltex.setup {
+      vim.lsp.config('ltex', {
         capabilities = capabilities,
-      }
+      })
+      vim.lsp.enable('ltex')
 
     '' + lib.optionalString config.sane.programs.lua-language-server.enabled ''
       -- Lua language server
-      lspconfig.lua_ls.setup {
+      vim.lsp.config('lua_ls', {
         capabilities = capabilities,
-      }
+      })
+      vim.lsp.enable('lua_ls')
 
     '' + lib.optionalString config.sane.programs.marksman.enabled ''
       -- Markdown language server
       -- repo: <https://github.com/artempyanykh/marksman>
       -- an alternative, specialized for PKMs: <https://github.com/Feel-ix-343/markdown-oxide>
-      lspconfig.marksman.setup {
+      vim.lsp.config('marksman', {
         capabilities = capabilities,
-      }
+      })
+      vim.lsp.enable('marksman')
 
     '' + lib.optionalString config.sane.programs.nil.enabled ''
       -- nix language server
       -- repo: <https://github.com/oxalica/nil>
       -- features: <https://github.com/oxalica/nil/blob/main/docs/features.md>
       -- a newer alternative is `nixd`: <https://github.com/nix-community/nixd>
-      lspconfig.nil_ls.setup {
+      vim.lsp.config('nil_ls', {
         capabilities = capabilities,
-      }
+      })
+      vim.lsp.enable('nil_ls')
 
     '' + lib.optionalString config.sane.programs.nixd.enabled ''
       -- nix language server
       -- repo: <https://github.com/nix-community/nixd>
       -- this is a bit nicer than `nil`, noting things like redundant parens, unused args, ...
-      lspconfig.nixd.setup {
+      vim.lsp.config('nixd', {
         capabilities = capabilities,
-      }
+      })
+      vim.lsp.enable('nixd')
 
     '' + lib.optionalString config.sane.programs.openscad-lsp.enabled ''
       -- openscad (.scad) language server
       -- repo: <https://github.com/Leathong/openscad-LSP>
-      lspconfig.openscad_lsp.setup {
+      vim.lsp.config('openscad_lsp', {
         capabilities = capabilities,
-      }
+      })
+      vim.lsp.enable('openscad_lsp')
 
     '' + lib.optionalString config.sane.programs.pyright.enabled ''
       -- python language server
-      lspconfig.pyright.setup {
+      vim.lsp.config('pyright', {
         capabilities = capabilities,
-      }
+      })
+      vim.lsp.enable('pyright')
 
     '' + lib.optionalString config.sane.programs.rust-analyzer.enabled ''
       -- Rust language server
@@ -157,23 +165,26 @@ with pkgs.vimPlugins;
       -- - thinks that `None` doesn't exist
       -- - can't autocomplete `std::` imports
       -- - but it CAN autocomplete stuff from non-std libraries (?)
-      lspconfig.rust_analyzer.setup {
+      vim.lsp.config('rust_analyzer', {
         capabilities = capabilities,
-      }
+      })
+      vim.lsp.enable('rust_analyzer')
 
     '' + lib.optionalString config.sane.programs.typescript-language-server.enabled ''
       -- Typescript language server
       -- repo: <https://github.com/typescript-language-server/typescript-language-server>
       -- requires tsconfig.json or jsconfig.json in the toplevel of the project directory
-      lspconfig.ts_ls.setup {
+      vim.lsp.config('ts_ls', {
         capabilities = capabilities,
-      }
+      })
+      vim.lsp.enable('ts_ls')
 
     '' + lib.optionalString config.sane.programs.vala-language-server.enabled ''
       -- Vala (gtk gui language) language server
-      lspconfig.vala_ls.setup {
+      vim.lsp.config('vala_ls', {
         capabilities = capabilities,
-      }
+      })
+      vim.lsp.enable('vala_ls')
     '';
   }
   {

pkgs/by-name/nixpkgs-bootstrap/master.nix

@@ -14,8 +14,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "8d16f813f69d4d12da076ff5bcc0f6fb5820f06e";
+  rev = "bebd31488142c9ddd2e7d122f4276abbbb4bedbc";
-  sha256 = "sha256-J7RD4yFV1Jz2zOlI6BnbrxWJn6cQ0RgjbclUPWKtVMQ=";
+  sha256 = "sha256-QcP/tY031tLA/v0MjtiJO42Jpm/GKEch5Q8+Bnaqf+M=";
-  version = "unstable-2025-09-26";
+  version = "unstable-2025-09-29";
   branch = "master";
 }

pkgs/by-name/nixpkgs-bootstrap/patches.nix

@@ -56,6 +56,13 @@ in
   #   hash = "sha256-cALgj+7eXd3H4WAmW6CIcxWRC3D4PoY2PWNsDxK+G9g=";
   # })
 
+  (fetchpatch' {
+    # required for pkgsCross.aarch64-multiplatform.signal-desktop to build
+    name = "boringssl: don't install test-only artifacts";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/447300";
+    hash = "sha256-hKjWQNJ1Ghf+URpvzdK2p5NobYMiZpKWOPwbJaTx24Q=";
+  })
+
   (fetchpatch' {
     name = "fractal: fix cross compilation";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/437038";

pkgs/by-name/nixpkgs-bootstrap/staging-next.nix

@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "595dedae63ed3c5be1b6cbbcf46c222932383c5a";
+  rev = "03bf26cffa2a9c117124f33b15ed6ffc3c41aca8";
-  sha256 = "sha256-jkMJhUp98xbuW09Qg1AB+nBmCVRcIlX8sBV8CJ5dFxw=";
+  sha256 = "sha256-K6ax+5eo071E5JIhtkWLr3BQpW6flGkQjgyuvHwhMcQ=";
-  version = "unstable-2025-09-26";
+  version = "unstable-2025-09-29";
   branch = "staging-next";
 }

pkgs/by-name/nixpkgs-bootstrap/staging.nix

@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "ea05cf826eec4f730a0e944df07ca84977bfa980";
+  rev = "6a8beb94ca3e8c4a90c292767d9a6728837bd7fa";
-  sha256 = "sha256-XiRhil9iyne1jXZDeUVFyiKtsIbafOtzBTPSE2Haetk=";
+  sha256 = "sha256-97Zy7whBMwrGMwFSAN9ZyCDBsOSdulcBs7AH5zOi4Nk=";
-  version = "unstable-2025-09-26";
+  version = "unstable-2025-09-29";
   branch = "staging";
 }