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

Merge staging-next into staging

parents e1fd5ee1 6e816c1a

pkgs/applications/audio/raysession/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which }:

{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which, bash }:



buildPythonApplication rec {

  pname = "raysession";
@@ -23,7 +23,7 @@ buildPythonApplication rec { 
    qttools # lrelease to build translations.

    which   # which to find lrelease.

  ];

  buildInputs = [ libjack2 ];

  buildInputs = [ libjack2 bash ];

  propagatedBuildInputs = [ pydbus pyliblo pyqt5 ];



  dontWrapQtApps = true; # The program is a python script.

pkgs/applications/editors/vim/configurable.nix

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ in stdenv.mkDerivation rec { 
    ++ lib.optional tclSupport tcl

    ++ lib.optional rubySupport ruby;



  # error: '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes

  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec";



  preConfigure = "" + lib.optionalString ftNixSupport ''

      cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim

      cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim

pkgs/applications/editors/vim/plugins/generated.nix

+12 −0
Original line number Diff line number Diff line
@@ -8317,6 +8317,18 @@ final: prev: 
    meta.homepage = "https://github.com/darfink/starsearch.vim/";

  };



  statuscol-nvim = buildVimPluginFrom2Nix {

    pname = "statuscol.nvim";

    version = "2023-04-23";

    src = fetchFromGitHub {

      owner = "luukvbaal";

      repo = "statuscol.nvim";

      rev = "b115b5d7a4ea5d4b152d61d89457cc874e08a7d1";

      sha256 = "026j7m8la14pfz9xqmw13gr1x8c9yx9ykqq4wa8x7cyf3a1s8z13";

    };

    meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";

  };



  stylish-nvim = buildVimPluginFrom2Nix {

    pname = "stylish.nvim";

    version = "2022-02-01";

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

+1 −0
Original line number Diff line number Diff line
@@ -698,6 +698,7 @@ https://github.com/cshuaimin/ssr.nvim/,HEAD, 
https://github.com/luukvbaal/stabilize.nvim/,,

https://github.com/eigenfoo/stan-vim/,,

https://github.com/darfink/starsearch.vim/,,

https://github.com/luukvbaal/statuscol.nvim/,,

https://github.com/teto/stylish.nvim/,HEAD,

https://github.com/kvrohit/substrata.nvim/,HEAD,

https://github.com/lambdalisue/suda.vim/,,

pkgs/applications/misc/klayout/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 


mkDerivation rec {

  pname = "klayout";

  version = "0.28.6";

  version = "0.28.7";



  src = fetchFromGitHub {

    owner = "KLayout";

    repo = "klayout";

    rev = "v${version}";

    hash = "sha256-Errpn2GHxVncum+6zriM9OrhrCDK8EtD2ZYVYPoyabk=";

    hash = "sha256-CA6PNoQtg59Mo7dKIgSVeC4owVuAirJ3mFds1J9IQtI=";

  };



  postPatch = ''