Unverified Commit 021f9a2f authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 1ba92fc9 b4286cee

maintainers/maintainer-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -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";

pkgs/applications/editors/vim/plugins/vim-plugin-names

+5 −0
Original line number Diff line number Diff line
@@ -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,

pkgs/development/python-modules/find-libpython/default.nix

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/servers/monitoring/thanos/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ buildGoModule rec { 


  vendorHash = "sha256-bNQwDttJ7YuQFrpp0alqe37/lue0CX5gB2UDRWWtTXQ=";



  doCheck = false;

  doCheck = true;



  subPackages = "cmd/thanos";

pkgs/top-level/all-packages.nix

+5 −1
Original line number Diff line number Diff line
@@ -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 { };