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

Merge master into staging-next

parents acad0b3a a5e9371a

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

+10 −0
Original line number Diff line number Diff line
@@ -1426,6 +1426,16 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ 
          dbus service.

        </para>

      </listitem>

      <listitem>

        <para>

          The Mastodon package got upgraded from the major version 3 to

          4. See the

          <link xlink:href="https://github.com/mastodon/mastodon/releases/tag/v4.0.0">v4.0.0

          release notes</link> for a list of changes. On standard

          setups, no manual migration steps are required. Nevertheless,

          a database backup is recommended.

        </para>

      </listitem>

      <listitem>

        <para>

          The <literal>nomad</literal> package now defaults to 1.3,

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

+2 −0
Original line number Diff line number Diff line
@@ -439,6 +439,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). 


- There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service.



- The Mastodon package got upgraded from the major version 3 to 4. See the [v4.0.0 release notes](https://github.com/mastodon/mastodon/releases/tag/v4.0.0) for a list of changes. On standard setups, no manual migration steps are required. Nevertheless, a database backup is recommended.



- The `nomad` package now defaults to 1.3, which no longer has a downgrade path to releases 1.2 or older.



- The `nodePackages` package set now defaults to the LTS release in the `nodejs` package again, instead of being pinned to `nodejs-14_x`. Several updates to node2nix have been made for compatibility with newer Node.js and npm versions and a new `postRebuild` hook has been added for packages to perform extra build steps before the npm install step prunes dev dependencies.

nixos/tests/web-apps/mastodon.nix

+4 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ let 
in

{

  name = "mastodon";

  meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin ];

  meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin turion ];



  nodes = {

    ca = { pkgs, ... }: {
@@ -56,6 +56,9 @@ in 
    };



    server = { pkgs, ... }: {



      virtualisation.memorySize = 2048;



      networking = {

        interfaces.eth1 = {

          ipv4.addresses = [

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

+160 −148

File changed.

Preview size limit exceeded, changes collapsed.

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

+16 −6
Original line number Diff line number Diff line
@@ -23,6 +23,16 @@ 
      hash = "sha256-q1ni++SPbq5y+47fPb6TryMw86gpULwNcXwi5yjXCWI=";

    };

  };

  awk = buildGrammar {

    language = "awk";

    version = "a799bc5";

    source = fetchFromGitHub {

      owner = "Beaglefoot";

      repo = "tree-sitter-awk";

      rev = "a799bc5da7c2a84bc9a06ba5f3540cf1191e4ee3";

      hash = "sha256-A/mvLYD9+Ms/nBdAebBF2edVkFUkWyz3TiEIt4G5iWc=";

    };

  };

  bash = buildGrammar {

    language = "bash";

    version = "77cf8a7";
@@ -629,12 +639,12 @@ 
  };

  julia = buildGrammar {

    language = "julia";

    version = "58d0701";

    version = "6287135";

    source = fetchFromGitHub {

      owner = "tree-sitter";

      repo = "tree-sitter-julia";

      rev = "58d0701550b4cce02acf433eedada03b634cc524";

      hash = "sha256-ywliyXSL6A/NtqPnjRU++4C26H9MO6slz/3bIYFgGp4=";

      rev = "628713553c42f30595a3b0085bb587e9359b986a";

      hash = "sha256-vB9HnWQ+659Itu8cvd0meLbbLzn62/dDroA3vB7ZtIs=";

    };

  };

  kotlin = buildGrammar {
@@ -1004,12 +1014,12 @@ 
  };

  rego = buildGrammar {

    language = "rego";

    version = "6d70da3";

    version = "6174f05";

    source = fetchFromGitHub {

      owner = "FallenAngel97";

      repo = "tree-sitter-rego";

      rev = "6d70da3a998fd0081efc5d1019c71e74cc1568e9";

      hash = "sha256-i6XVQOQHItZsba3oNplkBbCfIYjX5bU5qyig/WyGEt4=";

      rev = "6174f05f58e8c35d8c82323dd8c599b90b3171b3";

      hash = "sha256-hO89IYKOHDLmuq+JrXJCi3tjxn3zMwjTnWxC6ld09YA=";

    };

  };

  rnoweb = buildGrammar {