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

Merge master into staging-next

parents 7dd6245c cd567da6

nixos/doc/manual/release-notes/rl-2311.section.md

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 


## Other Notable Changes {#sec-release-23.11-notable-changes}



- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.



- A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant.



- `services.nginx` gained a `defaultListen` option at server-level with support for PROXY protocol listeners, also `proxyProtocol` is now exposed in `services.nginx.virtualHosts.<name>.listen` option. It is now possible to run PROXY listeners and non-PROXY listeners at a server-level, see [#213510](https://github.com/NixOS/nixpkgs/pull/213510/) for more details.

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+9 −0
Original line number Diff line number Diff line
@@ -187,6 +187,15 @@ in 
      xdg.mime.enable = true;

      xdg.icons.enable = true;



      xdg.portal.enable = true;

      xdg.portal.extraPortals = [

        pkgs.xdg-desktop-portal-xapp

        (pkgs.xdg-desktop-portal-gtk.override {

          # Do not build portals that we already have.

          buildPortalsInGnome = false;

        })

      ];



      # Override GSettings schemas

      environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";

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

+208 −196

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix

+39 −39
Original line number Diff line number Diff line
@@ -269,12 +269,12 @@ 
  };

  cue = buildGrammar {

    language = "cue";

    version = "0.0.0+rev=f83fd9a";

    version = "0.0.0+rev=971130a";

    src = fetchFromGitHub {

      owner = "eonpatapon";

      repo = "tree-sitter-cue";

      rev = "f83fd9abbece9becb5232c517b9d47ff141e237a";

      hash = "sha256-3XAECPbUOeH51mAfrHZ8takklAeIQES9opoWfQ0ps24=";

      rev = "971130aa1d2da22098d75062c024bb1250ff9d62";

      hash = "sha256-s1Y4lGB8DAcZ4ugUs088DXHMDrT46zNeIvZLqZK493s=";

    };

    meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue";

  };
@@ -436,12 +436,12 @@ 
  };

  erlang = buildGrammar {

    language = "erlang";

    version = "0.0.0+rev=13a6a51";

    version = "0.0.0+rev=6228b1d";

    src = fetchFromGitHub {

      owner = "WhatsApp";

      repo = "tree-sitter-erlang";

      rev = "13a6a51d1bda845f756971773dd6049b80a3cffc";

      hash = "sha256-xy4/AZPHv9V0gzLRXOmUcFyKzLDCgOyqBH8HNYE8GRk=";

      rev = "6228b1df25f25dbd69e4e0342c4c65eb9b5e957d";

      hash = "sha256-1oM9mLtUU2u2GiSFULFvfqnUtHg9XvmMxXz6qLOP//Q=";

    };

    meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";

  };
@@ -722,12 +722,12 @@ 
  };

  haskell = buildGrammar {

    language = "haskell";

    version = "0.0.0+rev=c5cb0c8";

    version = "0.0.0+rev=e002d60";

    src = fetchFromGitHub {

      owner = "tree-sitter";

      repo = "tree-sitter-haskell";

      rev = "c5cb0c860a399308305f44792bc4853737c40c07";

      hash = "sha256-9UwKxMEMoVVMUO1DIGxoJI7FUksackZmVYnKDXBpxCo=";

      rev = "e002d60072c73ab09bafedc82d3e35a4349ca6c0";

      hash = "sha256-BHpZjxWARMiInJ3S7nhOcRflKK7oR6pM+CqJgUbK3aQ=";

    };

    meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";

  };
@@ -832,12 +832,12 @@ 
  };

  ispc = buildGrammar {

    language = "ispc";

    version = "0.0.0+rev=a5c2fd4";

    version = "0.0.0+rev=848e588";

    src = fetchFromGitHub {

      owner = "fab4100";

      repo = "tree-sitter-ispc";

      rev = "a5c2fd44a6a7fe4230c72d651c1b9b2d28fc20fe";

      hash = "sha256-IctYjlsb2lPITj6aD22ovORd7O4Cxxe3mSo8kLPBHlo=";

      rev = "848e58874ffa2f7e540a6ec01ab9652b26995f37";

      hash = "sha256-xHX7N3pJbU8c4apoDXEm2VXOn9NH9atG8YfwSMyhHZ4=";

    };

    meta.homepage = "https://github.com/fab4100/tree-sitter-ispc";

  };
@@ -1165,12 +1165,12 @@ 
  };

  nickel = buildGrammar {

    language = "nickel";

    version = "0.0.0+rev=3a79438";

    version = "0.0.0+rev=b1a4718";

    src = fetchFromGitHub {

      owner = "nickel-lang";

      repo = "tree-sitter-nickel";

      rev = "3a794388773f2424a97b2186828aa3fac4c66ce6";

      hash = "sha256-NLgbTl1Te/lHTGra4DdxLtqIg6yXf5lfyl37qpp8SNQ=";

      rev = "b1a4718601ebd29a62bf3a7fd1069a99ccf48093";

      hash = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU=";

    };

    meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";

  };
@@ -1187,12 +1187,12 @@ 
  };

  nix = buildGrammar {

    language = "nix";

    version = "0.0.0+rev=6b71a81";

    version = "0.0.0+rev=02878b4";

    src = fetchFromGitHub {

      owner = "cstrahan";

      repo = "tree-sitter-nix";

      rev = "6b71a810c0acd49b980c50fc79092561f7cee307";

      hash = "sha256-uTgSj4zz8WvzwIr7UO78F45nzVSjjitdtKY8GV4iL+w=";

      rev = "02878b40ac77d2889833519c6b6e9e63cfc690e6";

      hash = "sha256-9E4iQ7jr52ckmQJBrF9Vdwanrgm2I+Gi1lbC46I+4/g=";

    };

    meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";

  };
@@ -1220,24 +1220,24 @@ 
  };

  ocaml = buildGrammar {

    language = "ocaml";

    version = "0.0.0+rev=a09c63f";

    version = "0.0.0+rev=1155941";

    src = fetchFromGitHub {

      owner = "tree-sitter";

      repo = "tree-sitter-ocaml";

      rev = "a09c63f4d754d2d2dffb7265f6e6f39c9e6e6db1";

      hash = "sha256-6Zz/7XRmiBoXzAt41vCMvaV2LmT7co0Gsbt0nTz+0nA=";

      rev = "11559418d8de82a2313504dc5bec9983d17ea4e9";

      hash = "sha256-QLZ+ukkYDZGi+hEzaoP98mQRZPXpAbVXt1RlQREafiw=";

    };

    location = "ocaml";

    meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";

  };

  ocaml_interface = buildGrammar {

    language = "ocaml_interface";

    version = "0.0.0+rev=a09c63f";

    version = "0.0.0+rev=1155941";

    src = fetchFromGitHub {

      owner = "tree-sitter";

      repo = "tree-sitter-ocaml";

      rev = "a09c63f4d754d2d2dffb7265f6e6f39c9e6e6db1";

      hash = "sha256-6Zz/7XRmiBoXzAt41vCMvaV2LmT7co0Gsbt0nTz+0nA=";

      rev = "11559418d8de82a2313504dc5bec9983d17ea4e9";

      hash = "sha256-QLZ+ukkYDZGi+hEzaoP98mQRZPXpAbVXt1RlQREafiw=";

    };

    location = "interface";

    meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
@@ -1311,23 +1311,23 @@ 
  };

  php = buildGrammar {

    language = "php";

    version = "0.0.0+rev=1a40581";

    version = "0.0.0+rev=ff6a35b";

    src = fetchFromGitHub {

      owner = "tree-sitter";

      repo = "tree-sitter-php";

      rev = "1a40581b7a899201d7c2b4684ee34490bc306bd6";

      hash = "sha256-tSgCGV1w3gbt9Loar3+Auo2r7hqZwB7X+/g9Dfatp8I=";

      rev = "ff6a35badb0fe373575196bd728a8a53e9be70bd";

      hash = "sha256-mjpomE8jFusmBjXkFFCnliQ2oKhGYK5DRuIO8GPfb+c=";

    };

    meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";

  };

  phpdoc = buildGrammar {

    language = "phpdoc";

    version = "0.0.0+rev=2f4d16c";

    version = "0.0.0+rev=2d20f39";

    src = fetchFromGitHub {

      owner = "claytonrcarter";

      repo = "tree-sitter-phpdoc";

      rev = "2f4d16c861b5a454b577d057f247f9902d7b47f5";

      hash = "sha256-7oriB1AWNvedT1JRoCYuF2m5+E9MYr85Lg38KRZ+BKo=";

      rev = "2d20f39476348c2682761ce7251914031a7c013f";

      hash = "sha256-uJEUAMIJ/Bq0YhcQ78UxWcK4LM6qoum+Ett03qli+Os=";

    };

    meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc";

  };
@@ -1597,23 +1597,23 @@ 
  };

  scala = buildGrammar {

    language = "scala";

    version = "0.0.0+rev=5aefc0a";

    version = "0.0.0+rev=17a19b0";

    src = fetchFromGitHub {

      owner = "tree-sitter";

      repo = "tree-sitter-scala";

      rev = "5aefc0ae4c174fa74d6e973faefa28692e081954";

      hash = "sha256-3FV3MuOx/sZ6NqeewbKhrhUFfnc1mjWpF3TetAlkkBg=";

      rev = "17a19b0f0505eec059b82e1b2fd8928f5f6f0b02";

      hash = "sha256-YvFjzxBQQmL0+Lw8olMiomu6sDiqdTTPuiygHwB3Kww=";

    };

    meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";

  };

  scheme = buildGrammar {

    language = "scheme";

    version = "0.0.0+rev=6abcfe3";

    version = "0.0.0+rev=dd9a73d";

    src = fetchFromGitHub {

      owner = "6cdh";

      repo = "tree-sitter-scheme";

      rev = "6abcfe33d976ebe3e244ca80273c7e8a070441b5";

      hash = "sha256-6lxpFk9YWVape/Oq2GFYcyNH8J38W+dmFdz+ykqBX0U=";

      rev = "dd9a73d851238881a3a9426298d69742d24b7842";

      hash = "sha256-KyR7MuZBMkQ3fWRaP1nQqo/ih2v3XM2v5tdu0SGuDOA=";

    };

    meta.homepage = "https://github.com/6cdh/tree-sitter-scheme";

  };
@@ -1630,12 +1630,12 @@ 
  };

  slint = buildGrammar {

    language = "slint";

    version = "0.0.0+rev=6f12865";

    version = "0.0.0+rev=00c8a2d";

    src = fetchFromGitHub {

      owner = "jrmoulton";

      repo = "tree-sitter-slint";

      rev = "6f128658eb22cfd15a801f52369d517c25253d5c";

      hash = "sha256-zW6WlzVSea8F1E2HJP5DPNEnxnFQMFLXnyRECiIkXR8=";

      rev = "00c8a2d3645766f68c0d0460086c0a994e5b0d85";

      hash = "sha256-R7VeGT8Bu3i6ZPUbjEm7sbGSLvK6x3DLz098hPuhgyQ=";

    };

    meta.homepage = "https://github.com/jrmoulton/tree-sitter-slint";

  };

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

+1 −0
Original line number Diff line number Diff line
@@ -622,6 +622,7 @@ https://github.com/tyru/open-browser-github.vim/,, 
https://github.com/tyru/open-browser.vim/,,

https://github.com/salkin-mada/openscad.nvim/,HEAD,

https://github.com/nvim-orgmode/orgmode/,,

https://github.com/rgroli/other.nvim/,HEAD,

https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD,

https://github.com/vuki656/package-info.nvim/,,

https://github.com/wbthomason/packer.nvim/,,