diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5f02e3ba495e..ca9919f46729 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -996,7 +996,7 @@
     name = "Stanislas Lange";
   };
   AngryAnt = {
-    name = "Emil Johansen";
+    name = "Emil \"AngryAnt\" Johansen";
     email = "git@eej.dk";
     matrix = "@angryant:envs.net";
     github = "AngryAnt";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 283f794b3054..c43d419e8207 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -163,6 +163,7 @@ https://github.com/coc-extensions/coc-svelte/,,
 https://github.com/iamcco/coc-tailwindcss/,,
 https://github.com/neoclide/coc.nvim/,release,
 https://github.com/manicmaniac/coconut.vim/,HEAD,
+https://github.com/Exafunction/codeium.vim/,HEAD,
 https://github.com/metakirby5/codi.vim/,,
 https://github.com/tjdevries/colorbuddy.nvim/,,
 https://github.com/lilydjwg/colorizer/,,
@@ -560,6 +561,7 @@ https://github.com/mfussenegger/nvim-lint/,,
 https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,
 https://github.com/neovim/nvim-lspconfig/,,
 https://github.com/RishabhRD/nvim-lsputils/,,
+https://github.com/sam4llis/nvim-lua-gf/,HEAD,
 https://github.com/bfredl/nvim-luadev/,HEAD,
 https://github.com/rafcamlet/nvim-luapad/,,
 https://github.com/scalameta/nvim-metals/,,
@@ -1197,6 +1199,7 @@ https://github.com/stephpy/vim-yaml/,,
 https://github.com/mindriot101/vim-yapf/,,
 https://github.com/michal-h21/vim-zettel/,HEAD,
 https://github.com/dag/vim2hs/,,
+https://github.com/monkoose/vim9-stargate/,HEAD,
 https://github.com/dominikduda/vim_current_word/,,
 https://github.com/andrep/vimacs/,,
 https://github.com/TaDaa/vimade/,,
@@ -1221,6 +1224,8 @@ https://github.com/mattn/webapi-vim/,,
 https://github.com/DingDean/wgsl.vim/,HEAD,
 https://github.com/folke/which-key.nvim/,,
 https://github.com/johnfrankmorgan/whitespace.nvim/,HEAD,
+https://github.com/lervag/wiki-ft.vim/,HEAD,
+https://github.com/lervag/wiki.vim/,HEAD,
 https://github.com/gelguy/wilder.nvim/,,
 https://github.com/gcmt/wildfire.vim/,,
 https://github.com/fgheng/winbar.nvim/,main,
diff --git a/pkgs/development/python-modules/find-libpython/default.nix b/pkgs/development/python-modules/find-libpython/default.nix
new file mode 100644
index 000000000000..21ce69e071d7
--- /dev/null
+++ b/pkgs/development/python-modules/find-libpython/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "find-libpython";
+  version = "0.3.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "find_libpython";
+    sha256 = "sha256-bn/l2a9/rW3AZstVFaDpyQpx8f6yuy+OTNu0+DJ26eU=";
+  };
+
+  disabled = pythonOlder "3.7";
+
+  pythonImportsCheck = [ "find_libpython" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = with lib; {
+    description = "Finds the libpython associated with your environment, wherever it may be hiding";
+    changelog = "https://github.com/ktbarrett/find_libpython/releases/tag/${version}";
+    homepage = "https://github.com/ktbarrett/find_libpython";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jleightcap ];
+  };
+}
diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index 76c8996dd7f8..240b77168d35 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-bNQwDttJ7YuQFrpp0alqe37/lue0CX5gB2UDRWWtTXQ=";
 
-  doCheck = false;
+  doCheck = true;
 
   subPackages = "cmd/thanos";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe8f1af63dad..7e41d9e3315e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26091,7 +26091,11 @@ with pkgs;
 
   tailspin = callPackage ../tools/misc/tailspin { };
 
-  thanos = callPackage ../servers/monitoring/thanos { };
+  thanos = callPackage ../servers/monitoring/thanos {
+    # Fails to run with go1.20 due to go4.org/unsafe/assume-no-moving-gc not being
+    # update to be compatible with Go 1.20
+    buildGoModule = buildGo119Module;
+  };
 
   trafficserver = callPackage ../servers/http/trafficserver { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ace7eaf4044e..09bbff4034be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3521,6 +3521,8 @@ self: super: with self; {
 
   findimports = callPackage ../development/python-modules/findimports { };
 
+  find-libpython = callPackage ../development/python-modules/find-libpython { };
+
   findpython = callPackage ../development/python-modules/findpython { };
 
   fingerprints = callPackage ../development/python-modules/fingerprints { };