Merge master into staging-next

2022-11-16 06:01:26 +00:00 · 2022-11-16 06:01:26 +00:00 · 8dadcc86ee
commit 8dadcc86ee
parent 03d934116c 41d87c3fb7
49 changed files with 662 additions and 4628 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -7939,6 +7939,13 @@
    githubId = 24509182;
    name = "Arnaud Pascal";
  };
+  lightquantum = {
+    email = "self@lightquantum.me";
+    github = "PhotonQuantum";
+    githubId = 18749973;
+    name = "Yanning Chen";
+    matrix = "@self:lightquantum.me";
+  };
  lihop = {
    email = "nixos@leroy.geek.nz";
    github = "lihop";
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@ -1012,6 +1012,24 @@ signald -d /var/lib/signald/db \
          <literal>services.syncthing.dataDir</literal>.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          <literal>services.github-runner</literal> and
+          <literal>services.github-runners.&lt;name&gt;</literal> gained
+          the option <literal>serviceOverrides</literal> which allows
+          overriding the systemd <literal>serviceConfig</literal>. If
+          you have been overriding the systemd service configuration
+          (i.e., by defining
+          <literal>systemd.services.github-runner.serviceConfig</literal>),
+          you have to use the <literal>serviceOverrides</literal> option
+          now. Example:
+        </para>
+        <programlisting>
+services.github-runner.serviceOverrides.SupplementaryGroups = [
+  &quot;docker&quot;
+];
+</programlisting>
+      </listitem>
    </itemizedlist>
  </section>
  <section xml:id="sec-release-22.11-notable-changes">
@ -1025,6 +1043,13 @@ signald -d /var/lib/signald/db \
          release notes</link> for more details.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          Configuring multiple GitHub runners is now possible through
+          <literal>services.github-runners.&lt;name&gt;</literal>. The
+          option <literal>services.github-runner</literal> remains.
+        </para>
+      </listitem>
      <listitem>
        <para>
          <literal>github-runner</literal> gained support for ephemeral
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@ -316,12 +316,22 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
  In a future release other paths will be allowed again and interpreted
  relative to `services.syncthing.dataDir`.

+- `services.github-runner` and `services.github-runners.<name>` gained the option `serviceOverrides` which allows overriding the systemd `serviceConfig`. If you have been overriding the systemd service configuration (i.e., by defining `systemd.services.github-runner.serviceConfig`), you have to use the `serviceOverrides` option now. Example:
+
+  ```
+  services.github-runner.serviceOverrides.SupplementaryGroups = [
+    "docker"
+  ];
+  ```
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

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

 - The `xplr` package has been updated from 0.18.0 to 0.19.0, which brings some breaking changes. See the [upstream release notes](https://github.com/sayanarijit/xplr/releases/tag/v0.19.0) for more details.

+- Configuring multiple GitHub runners is now possible through `services.github-runners.<name>`. The option `services.github-runner` remains.
+
 - `github-runner` gained support for ephemeral runners and registrations using a personal access token (PAT) instead of a registration token. See `services.github-runner.ephemeral` and `services.github-runner.tokenFile` for details.

 - A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`.
--- a/nixos/modules/config/gtk/gtk-icon-cache.nix
+++ b/nixos/modules/config/gtk/gtk-icon-cache.nix
@ -52,10 +52,8 @@ with lib;

    environment.extraSetup = ''
      # For each icon theme directory ...
-
-      find $out/share/icons -mindepth 1 -maxdepth 1 -print0 | while read -d $'\0' themedir
+      find $out/share/icons -exec test -d {} ';' -mindepth 1 -maxdepth 1 -print0 | while read -d $'\0' themedir
      do
-
        # In order to build the cache, the theme dir should be
        # writable. When the theme dir is a symbolic link to somewhere
        # in the nix store it is not writable and it means that only
--- a/nixos/modules/services/networking/adguardhome.nix
+++ b/nixos/modules/services/networking/adguardhome.nix
@ -51,8 +51,8 @@ in
    };

    settings = mkOption {
-      default = { };
-      type = submodule {
+      default = null;
+      type = nullOr (submodule {
        freeformType = (pkgs.formats.yaml { }).type;
        options = {
          schema_version = mkOption {
@ -79,7 +79,7 @@ in
            '';
          };
        };
-      };
+      });
      description = lib.mdDoc ''
        AdGuard Home configuration. Refer to
        <https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#configuration-file>
@ -89,6 +89,10 @@ in
        On start and if {option}`mutableSettings` is `true`,
        these options are merged into the configuration file on start, taking
        precedence over configuration changes made on the web interface.
+
+        Set this to `null` (default) for a non-declarative configuration without any
+        Nix-supplied values.
+        Declarative configurations are supplied with a default `schema_version`, `bind_host`, and `bind_port`.
        :::
      '';
    };
@ -105,15 +109,15 @@ in
  config = mkIf cfg.enable {
    assertions = [
      {
-        assertion = cfg.settings != { }
-          -> (hasAttrByPath [ "dns" "bind_host" ] cfg.settings)
+        assertion = cfg.settings != null -> cfg.mutableSettings
+          || (hasAttrByPath [ "dns" "bind_host" ] cfg.settings)
          || (hasAttrByPath [ "dns" "bind_hosts" ] cfg.settings);
        message =
          "AdGuard setting dns.bind_host or dns.bind_hosts needs to be configured for a minimal working configuration";
      }
      {
-        assertion = cfg.settings != { }
-          -> hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings;
+        assertion = cfg.settings != null -> cfg.mutableSettings
+          || hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings;
        message =
          "AdGuard setting dns.bootstrap_dns needs to be configured for a minimal working configuration";
      }
@ -128,7 +132,7 @@ in
        StartLimitBurst = 10;
      };

-      preStart = optionalString (cfg.settings != { }) ''
+      preStart = optionalString (cfg.settings != null) ''
        if    [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \
           && [ "${toString cfg.mutableSettings}" = "1" ]; then
          # Writing directly to AdGuardHome.yaml results in empty file
--- a/nixos/modules/services/web-apps/peertube.nix
+++ b/nixos/modules/services/web-apps/peertube.nix
@ -67,7 +67,11 @@ let
    node ~/dist/server/tools/peertube.js $@
  '';

-  nginxCommonHeaders = ''
+  nginxCommonHeaders = lib.optionalString cfg.enableWebHttps ''
+    add_header Strict-Transport-Security      'max-age=63072000; includeSubDomains';
+  '' + lib.optionalString config.services.nginx.virtualHosts.${cfg.localDomain}.http3 ''
+    add_header Alt-Svc                        'h3=":443"; ma=86400';
+  '' + ''
    add_header Access-Control-Allow-Origin    '*';
    add_header Access-Control-Allow-Methods   'GET, OPTIONS';
    add_header Access-Control-Allow-Headers   'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
@ -370,7 +374,7 @@ in {
    systemd.services.peertube-init-db = lib.mkIf cfg.database.createLocally {
      description = "Initialization database for PeerTube daemon";
      after = [ "network.target" "postgresql.service" ];
-      wantedBy = [ "multi-user.target" ];
+      requires = [ "postgresql.service" ];

      script = let
        psqlSetupCommands = pkgs.writeText "peertube-init.sql" ''
@ -399,7 +403,9 @@ in {
    systemd.services.peertube = {
      description = "PeerTube daemon";
      after = [ "network.target" ]
-        ++ lib.optionals cfg.redis.createLocally [ "redis.service" ]
+        ++ lib.optional cfg.redis.createLocally "redis-peertube.service"
+        ++ lib.optionals cfg.database.createLocally [ "postgresql.service" "peertube-init-db.service" ];
+      requires = lib.optional cfg.redis.createLocally "redis-peertube.service"
        ++ lib.optionals cfg.database.createLocally [ "postgresql.service" "peertube-init-db.service" ];
      wantedBy = [ "multi-user.target" ];

@ -487,6 +493,10 @@ in {
          extraConfig = ''
            client_max_body_size                        12G;
            add_header X-File-Maximum-Size              8G always;
+          '' + lib.optionalString cfg.enableWebHttps ''
+            add_header Strict-Transport-Security        'max-age=63072000; includeSubDomains';
+          '' + lib.optionalString config.services.nginx.virtualHosts.${cfg.localDomain}.http3 ''
+            add_header Alt-Svc                          'h3=":443"; ma=86400';
          '';
        };

@ -497,6 +507,10 @@ in {
          extraConfig = ''
            client_max_body_size                        6M;
            add_header X-File-Maximum-Size              4M always;
+          '' + lib.optionalString cfg.enableWebHttps ''
+            add_header Strict-Transport-Security        'max-age=63072000; includeSubDomains';
+          '' + lib.optionalString config.services.nginx.virtualHosts.${cfg.localDomain}.http3 ''
+            add_header Alt-Svc                          'h3=":443"; ma=86400';
          '';
        };

@ -560,6 +574,10 @@ in {
          priority = 1320;
          extraConfig = ''
            add_header Cache-Control                    'public, max-age=604800, immutable';
+          '' + lib.optionalString cfg.enableWebHttps ''
+            add_header Strict-Transport-Security        'max-age=63072000; includeSubDomains';
+          '' + lib.optionalString config.services.nginx.virtualHosts.${cfg.localDomain}.http3 ''
+            add_header Alt-Svc                          'h3=":443"; ma=86400';
          '';
        };

@ -718,6 +736,10 @@ in {
            rewrite ^/static/webseed/(.*)$              /$1 break;
          '';
        };
+
+        extraConfig = lib.optionalString cfg.enableWebHttps ''
+          add_header Strict-Transport-Security          'max-age=63072000; includeSubDomains';
+        '';
      };
    };

--- a/nixos/tests/adguardhome.nix
+++ b/nixos/tests/adguardhome.nix
@ -2,6 +2,15 @@
  name = "adguardhome";

  nodes = {
+    nullConf = { ... }: { services.adguardhome = { enable = true; }; };
+
+    emptyConf = { lib, ... }: {
+      services.adguardhome = {
+        enable = true;
+        settings = {};
+      };
+    };
+
    declarativeConf = { ... }: {
      services.adguardhome = {
        enable = true;
@ -34,6 +43,13 @@
  };

  testScript = ''
+    with subtest("Minimal (settings = null) config test"):
+        nullConf.wait_for_unit("adguardhome.service")
+
+    with subtest("Default config test"):
+        emptyConf.wait_for_unit("adguardhome.service")
+        emptyConf.wait_for_open_port(3000)
+
    with subtest("Declarative config test, DNS will be reachable"):
        declarativeConf.wait_for_unit("adguardhome.service")
        declarativeConf.wait_for_open_port(53)
--- a/pkgs/applications/audio/mopidy/ytmusic.nix
+++ b/pkgs/applications/audio/mopidy/ytmusic.nix
@ -1,19 +1,35 @@
-{ lib, python3Packages, mopidy }:
+{ lib
+, python3
+, mopidy
+}:

-python3Packages.buildPythonApplication rec {
+let
+  python = python3.override {
+    packageOverrides = self: super: {
+      ytmusicapi = super.ytmusicapi.overridePythonAttrs (old: rec {
+        version = "0.22.0";
+        format = "setuptools";
+        src = old.src.override {
+          inherit version;
+          hash = "sha256-CZ4uoW4UHn5C+MckQXysTdydaApn99b0UCnF5RPb7DI=";
+        };
+      });
+    };
+  };
+in python.pkgs.buildPythonApplication rec {
  pname = "mopidy-ytmusic";
  version = "0.3.7";

-  src = python3Packages.fetchPypi {
+  src = python.pkgs.fetchPypi {
    inherit version;
    pname = "Mopidy-YTMusic";
    sha256 = "0gqjvi3nfzkqvbdhihzai241p1h5p037bj2475cc93xwzyyqxcrq";
  };

  propagatedBuildInputs = [
-    mopidy
-    python3Packages.ytmusicapi
-    python3Packages.pytube
+    (mopidy.override { pythonPackages = python.pkgs; })
+    python.pkgs.ytmusicapi
+    python.pkgs.pytube
  ];

  pythonImportsCheck = [ "mopidy_ytmusic" ];
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -329,12 +329,12 @@ final: prev:

  SpaceCamp = buildVimPluginFrom2Nix {
    pname = "SpaceCamp";
-    version = "2022-07-22";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "jaredgorski";
      repo = "SpaceCamp";
-      rev = "2678fca10e731f367253f937db5f8b42de674f4f";
-      sha256 = "1rhgjxrsjy9kg1740myyfh9n6pllm2nzxm3vgm4yxr6n6q74cy6n";
+      rev = "8ff0ed105d1403a60e1f79150b8b645a3465b3a0";
+      sha256 = "06bddfpmnabhw7q8q459qa55gh3x7xqzb0lq7qpq1i4kg6qsc7ck";
    };
    meta.homepage = "https://github.com/jaredgorski/SpaceCamp/";
  };
@ -345,8 +345,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "SpaceVim";
      repo = "SpaceVim";
-      rev = "885bc3863e16ec542ce6e17172f0ca05059f61ab";
-      sha256 = "12bws3vk8ljzvwmxw8pckx4cmys37jsch0hfpjlkfdc5b23p17y8";
+      rev = "ead0478037b08da5adc6bdaff61de85cbfd93d60";
+      sha256 = "0qrj65ij1mxpk7m9j2qpi5h991al6jypcy5xzszi1yzm64ddcvi7";
    };
    meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
  };
@ -703,12 +703,12 @@ final: prev:

  aurora = buildVimPluginFrom2Nix {
    pname = "aurora";
-    version = "2022-10-26";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "aurora";
-      rev = "4a5a082e7ee778f3a5bc7cbde56bdc04ae56d858";
-      sha256 = "109hlng3xwxvq704wilik3z3cpr7asgiwyvxp4h7dqnar3wyp644";
+      rev = "87ecb98982f11bb62a61a2ed4d46676c72918a4d";
+      sha256 = "147yd7v21y8b59wj89zc103q1lp8dzmkyciby2nn8qb1kzvwvh0g";
    };
    meta.homepage = "https://github.com/ray-x/aurora/";
  };
@ -799,16 +799,28 @@ final: prev:

  barbar-nvim = buildVimPluginFrom2Nix {
    pname = "barbar.nvim";
-    version = "2022-10-26";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "romgrk";
      repo = "barbar.nvim";
-      rev = "eecabfedc9429f6184feb3b6655bc45a4ed36a7e";
-      sha256 = "0b1gnbaqb67q876hqnqv1l54xdyv76dzn7hr7drgq33nrmyxcx58";
+      rev = "47d2d3f78e3fd011202bb2f68129ca94b42c354b";
+      sha256 = "08ds5zmk4hdb6872gcwv431r5f057m6nm6amrcqmjmbqaqcwv0n2";
    };
    meta.homepage = "https://github.com/romgrk/barbar.nvim/";
  };

+  barbecue-nvim = buildVimPluginFrom2Nix {
+    pname = "barbecue.nvim";
+    version = "2022-11-13";
+    src = fetchFromGitHub {
+      owner = "utilyre";
+      repo = "barbecue.nvim";
+      rev = "7f14b47d8ebb5135724ccb7041f5ce43ec6dc839";
+      sha256 = "0n61764k2lqr59gldqchzhrbh8rgyjbfijfdpxsfp4x1aps35zks";
+    };
+    meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
+  };
+
  base16-vim = buildVimPluginFrom2Nix {
    pname = "base16-vim";
    version = "2022-09-20";
@ -1267,12 +1279,12 @@ final: prev:

  cmp-fuzzy-buffer = buildVimPluginFrom2Nix {
    pname = "cmp-fuzzy-buffer";
-    version = "2022-08-30";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "tzachar";
      repo = "cmp-fuzzy-buffer";
-      rev = "4758be3e346499bec0c7524dc3ebcc4cd60a7036";
-      sha256 = "0kcizsfm9gnpygf3bj520qbgcfag7rx3nxsc4xc7pnlgzm3cv1d2";
+      rev = "7fdc50bedc9fd0f3bc10a2110285e5715fe2de15";
+      sha256 = "0dj07y6z6p20qw2kc2js8rxwrwb48jrzgxh6jqd2410h4gw4zndf";
    };
    meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/";
  };
@ -1363,12 +1375,12 @@ final: prev:

  cmp-nvim-lsp = buildVimPluginFrom2Nix {
    pname = "cmp-nvim-lsp";
-    version = "2022-10-29";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "hrsh7th";
      repo = "cmp-nvim-lsp";
-      rev = "78924d1d677b29b3d1fe429864185341724ee5a2";
-      sha256 = "1gzn4v70wa61yyw9vfxb8m8kkabz0p35nja1l26cfhl71pnkqrka";
+      rev = "91050df7b3eeb91844bd80cde2ec5993fe91adcc";
+      sha256 = "1ka1bank3mkdgpch2c23i0109dvl48145kwfkyb5w1zy0d4m3rgq";
    };
    meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/";
  };
@ -2011,24 +2023,24 @@ final: prev:

  coq-artifacts = buildVimPluginFrom2Nix {
    pname = "coq.artifacts";
-    version = "2022-11-14";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq.artifacts";
-      rev = "8e055719b1fbf7769eadc6634c54679d1733d727";
-      sha256 = "0wjh4hbinl1ia8bljgj9qwr43phvajngz3ra4my6gmdpsbfhrrfb";
+      rev = "b85f88e9383791cd172468cdf2f2453e04e31e7e";
+      sha256 = "1160g2z9pgbhvzrg160mbvbzzhbil1l7373q5ikjf4a5fpyfvp4n";
    };
    meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
  };

  coq-thirdparty = buildVimPluginFrom2Nix {
    pname = "coq.thirdparty";
-    version = "2022-11-14";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq.thirdparty";
-      rev = "c503ac81e26c44b00307029b8cf6d16c5b41ada4";
-      sha256 = "1rgxk4b7kb5rzfcjdnvh1f8mhxmvdf1zq96am2ifhjj2n86xk0vf";
+      rev = "80169234eba842dde43130fe3c67163865318175";
+      sha256 = "0pbs5qyqrz0g49f92f3sy1l2kz5r9av2v1zwkxqnrlbx5j0cs2r3";
    };
    meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
  };
@ -2047,12 +2059,12 @@ final: prev:

  coq_nvim = buildVimPluginFrom2Nix {
    pname = "coq_nvim";
-    version = "2022-11-14";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq_nvim";
-      rev = "0137c3f16077c9b449651f18ec89ef1b7957e809";
-      sha256 = "0srfi4fsrkkjzpivlrf8va2l2j4y4qi24m2w676pnxpyh3vwwasf";
+      rev = "452dbcdebbdbe13e8aba348a44031dee37bba740";
+      sha256 = "0b6knphccqd91mj0wg1851li7c7jb9shp75bqrisgi0y4m4kx2iq";
    };
    meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
  };
@ -2373,12 +2385,12 @@ final: prev:

  deoplete-jedi = buildVimPluginFrom2Nix {
    pname = "deoplete-jedi";
-    version = "2020-12-21";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "deoplete-plugins";
      repo = "deoplete-jedi";
-      rev = "43058915007d92dc167b84dd5b8ada2d2a057a82";
-      sha256 = "0qh43mwzjsn67id6qs96p9lw1fjsgdgqmks0161hfgvbyixx2b3y";
+      rev = "4a13930764f3fbda1c06d7312d8ce2ff595d3274";
+      sha256 = "0d93vzcizi0k07iwhnrhgp9isydpl1lbik2afnbqa6660m619a2n";
    };
    meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/";
  };
@ -2783,12 +2795,12 @@ final: prev:

  fcitx-vim = buildVimPluginFrom2Nix {
    pname = "fcitx.vim";
-    version = "2022-11-09";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "lilydjwg";
      repo = "fcitx.vim";
-      rev = "fe899f6aece54d962cd75686124ce4abc3e67ec2";
-      sha256 = "1nz42r8ybwajncp3c9q8glrsxwi7psmipp4wqgf4v8jnhr4xgrm4";
+      rev = "dc95d0301b61a7db1f1badfe743fb627ea6e06d1";
+      sha256 = "1z6n9ax8mnr9p1j64hrl463kqnaf7gc08975j5n7c77rrz23bd1q";
    };
    meta.homepage = "https://github.com/lilydjwg/fcitx.vim/";
  };
@ -3012,12 +3024,12 @@ final: prev:

  fuzzy-nvim = buildVimPluginFrom2Nix {
    pname = "fuzzy.nvim";
-    version = "2022-02-20";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "tzachar";
      repo = "fuzzy.nvim";
-      rev = "d5fee69b54ef400f0ccedf37917c4782e8929424";
-      sha256 = "1xnmwmbrjsfj3v4vk57gcf4l3wl9n8jks50ds8gaawz5bpy54yff";
+      rev = "04b3d969002b5fd2db23a33aaf33a13a533cbdbd";
+      sha256 = "15c3bymh1pm4d5h3ik9m7bz56ggrfzzbmh6sn5bkssmrazqphimk";
    };
    meta.homepage = "https://github.com/tzachar/fuzzy.nvim/";
  };
@ -3455,12 +3467,12 @@ final: prev:

  haskell-tools-nvim = buildVimPluginFrom2Nix {
    pname = "haskell-tools.nvim";
-    version = "2022-11-14";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "haskell-tools.nvim";
-      rev = "a1d3699c14746b15af0520e23f54d2ed474e8be0";
-      sha256 = "0kygk9aidqcbpp2avm9zpfp2d3dcscnz6apy879w8k1lwp1f2dk8";
+      rev = "d7d38a9304205f97cee06d1afdfed5a571c08d1e";
+      sha256 = "18bvwrsxqg78000r96psd6npcl7p1gs2alf3cqfk7i1hi565mdri";
    };
    meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
  };
@ -3575,12 +3587,12 @@ final: prev:

  hydra-nvim = buildVimPluginFrom2Nix {
    pname = "hydra.nvim";
-    version = "2022-10-02";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "anuvyklack";
      repo = "hydra.nvim";
-      rev = "fa41a971765d4cce9c39185289f5a10894f66dbd";
-      sha256 = "198bkw3y3253wjamvxxkdjr54nv1bkin148v554b47yv5w156zz1";
+      rev = "aefadd3f61234d5ac51f59057965d44f63126778";
+      sha256 = "1ak0ahda6a5265g823yykz1lr7kc9jxhd84ic6nbqg4xx05haf07";
    };
    meta.homepage = "https://github.com/anuvyklack/hydra.nvim/";
  };
@ -3599,12 +3611,12 @@ final: prev:

  iceberg-vim = buildVimPluginFrom2Nix {
    pname = "iceberg.vim";
-    version = "2022-11-14";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "cocopon";
      repo = "iceberg.vim";
-      rev = "8a69612245fca4c9103a7f700b3ca87b77199f00";
-      sha256 = "1vq6yka7scdv54r02034y93y9144lsqx78jwwryzlmf5qq4pmr00";
+      rev = "a94c2a9110986cbc92d2c059ee65b52b70a4416d";
+      sha256 = "1aiarshkw8cs3kjfdj3v30294i7dj1x7pmv9j83wnssj7i4y6kp5";
    };
    meta.homepage = "https://github.com/cocopon/iceberg.vim/";
  };
@ -4032,12 +4044,12 @@ final: prev:

  legendary-nvim = buildVimPluginFrom2Nix {
    pname = "legendary.nvim";
-    version = "2022-10-30";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "mrjones2014";
      repo = "legendary.nvim";
-      rev = "cf388c44976ca8a9f950d98879b3e98d0f0f4b83";
-      sha256 = "0y0zndgs43aa30pdqjpsf1kyc65vg3klwfqqkkz3dkk75417xi2x";
+      rev = "1050be8b7f11a26048400f3dfe5ce8a0ac6a1901";
+      sha256 = "11b2q8ysf5dybf9bpfrs92syy5k4vxfmbkhy3fdkyhmslvpmd9a4";
    };
    meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
  };
@ -4584,12 +4596,12 @@ final: prev:

  mini-nvim = buildVimPluginFrom2Nix {
    pname = "mini.nvim";
-    version = "2022-11-11";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "echasnovski";
      repo = "mini.nvim";
-      rev = "9061584513afd62ad6a08757b0aacf5d656bdf36";
-      sha256 = "0pg2ckvnarmfmvqj57plg8bzflz3qxicbb5p699fhh5ggl2f5713";
+      rev = "dd0b7f85269d544aec6dee3bf48dc44ed284c462";
+      sha256 = "1y28vqp5glvdypv8ghp9x6yg7mhf74711mas16n6abn1vaimmgsp";
    };
    meta.homepage = "https://github.com/echasnovski/mini.nvim/";
  };
@ -5112,12 +5124,12 @@ final: prev:

  neotest-haskell = buildVimPluginFrom2Nix {
    pname = "neotest-haskell";
-    version = "2022-11-04";
+    version = "2022-11-14";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "neotest-haskell";
-      rev = "74b10216995909d442ce9ffb966ae3194a6da319";
-      sha256 = "184aw9vdvahcxmnhq787yh8861ai1xsai784zfkgzz1pg4s7rvbk";
+      rev = "920a68bbb4eee1f923136c94ccb29981f6cd77e8";
+      sha256 = "0np8hzqjcq2k42iiwbvql3mzgnha56war8sj79dgyr02mpf43436";
    };
    meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
  };
@ -5292,12 +5304,12 @@ final: prev:

  noice-nvim = buildVimPluginFrom2Nix {
    pname = "noice.nvim";
-    version = "2022-11-14";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "noice.nvim";
-      rev = "c11d1c6a0dc8ed44704c92d772140f1546b07166";
-      sha256 = "1vysp35x3x8krzpwpx898qrvg1k20zqz5ldj5qrgw66zydsh1i73";
+      rev = "1bce9239531f863620c5cf90c76862cf7d0f0a2b";
+      sha256 = "1mwh001r1dvkflqmpgy9qyyn4fk3yx9slzlnw8pjsjnm12grr935";
    };
    meta.homepage = "https://github.com/folke/noice.nvim/";
  };
@ -5484,12 +5496,12 @@ final: prev:

  nvim-cmp = buildNeovimPluginFrom2Nix {
    pname = "nvim-cmp";
-    version = "2022-11-13";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "hrsh7th";
      repo = "nvim-cmp";
-      rev = "aee40113c2ba3ab158955f233ca083ca9958d6f8";
-      sha256 = "0zrld4p8qhiksm4q12zn650mff6vg6xrb6b1dn8yc88ss3zkl5jx";
+      rev = "e820335208a6a46e97202592a3694d8e01b923bc";
+      sha256 = "16k3g5lfjyy04j06rz2jh8vl0pjlpsv9c7lg6vji1sh8dscznv7i";
    };
    meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
  };
@ -5976,12 +5988,12 @@ final: prev:

  nvim-scrollbar = buildVimPluginFrom2Nix {
    pname = "nvim-scrollbar";
-    version = "2022-11-12";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "petertriho";
      repo = "nvim-scrollbar";
-      rev = "02b272d1ef260352896b12a0b0ce7c116b2c8ee3";
-      sha256 = "05wchqijinbdk5yk7k7gifc9x1j06l0wxspa08jdi1qhrv2rlllx";
+      rev = "853538db5098cd07b618bcb0e4db6b729b1e9f9b";
+      sha256 = "1bxyv7rah7ccl8fs0x0r0xk824lnfjs218rlxf4xz0zr5z7gyaqs";
    };
    meta.homepage = "https://github.com/petertriho/nvim-scrollbar/";
  };
@ -6012,12 +6024,12 @@ final: prev:

  nvim-solarized-lua = buildVimPluginFrom2Nix {
    pname = "nvim-solarized-lua";
-    version = "2022-09-23";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "ishan9299";
      repo = "nvim-solarized-lua";
-      rev = "b5a77b50d1136ad4018d176722378506afee9d3a";
-      sha256 = "17is7hsbfbbxir34jwlihv1xdkhihvk85l55pky90b5ijvpki2x7";
+      rev = "f8e4e60a2873b6f1a28c837ab217deb1bfdc723e";
+      sha256 = "1v2bb9ckbhhp6jssbwcxzqlzvwifw5gk0mlrsjkvpvmvq1lgfiiy";
    };
    meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/";
  };
@ -6036,12 +6048,12 @@ final: prev:

  nvim-surround = buildVimPluginFrom2Nix {
    pname = "nvim-surround";
-    version = "2022-11-10";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "kylechui";
      repo = "nvim-surround";
-      rev = "87839e18d3953eb8cebd23a007183fd6c48863b5";
-      sha256 = "14gcn2dpiyabl59knzzq7dfj03l77dh17mz3r92wca2lxb76smd5";
+      rev = "fa7648e3ed5ec22f32de06d366cf8b80141998f0";
+      sha256 = "1fv8p3nj2ma4j9wsglxjcarsfxhryi6aqmcg9d4fpa6qsdcvlg42";
    };
    meta.homepage = "https://github.com/kylechui/nvim-surround/";
  };
@ -6060,12 +6072,12 @@ final: prev:

  nvim-tree-lua = buildVimPluginFrom2Nix {
    pname = "nvim-tree.lua";
-    version = "2022-11-13";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "nvim-tree";
      repo = "nvim-tree.lua";
-      rev = "cf908370fb046641e3aaaa6a6177c1b5d165f186";
-      sha256 = "19pqgd785j0b1nwhplhx53qi62spm699xj9mcjr8mxnb2z0x7hcg";
+      rev = "9d241e5f5889cf8d37c3a8054b3e55157549c283";
+      sha256 = "0laygscfl6rg3xnh0p5m8a4li8lpp46zxyw1smn4mackhzwqhplj";
    };
    meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
  };
@ -6168,12 +6180,12 @@ final: prev:

  nvim-web-devicons = buildVimPluginFrom2Nix {
    pname = "nvim-web-devicons";
-    version = "2022-11-12";
+    version = "2022-11-14";
    src = fetchFromGitHub {
      owner = "nvim-tree";
      repo = "nvim-web-devicons";
-      rev = "c873091fe237f22c915905c4c0c3a82cbfce5f4d";
-      sha256 = "0dawjja54p98hyrc6qigpz7993lshn820vdg0v38kdz8q3rsxgq5";
+      rev = "3b1b794bc17b7ac3df3ae471f1c18f18d1a0f958";
+      sha256 = "1yxrv5kc5prfllgfcj2h8c8b74rydwdc8hm2fwbk1d0d9jcs66w7";
    };
    meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
  };
@ -6312,12 +6324,12 @@ final: prev:

  onedarkpro-nvim = buildVimPluginFrom2Nix {
    pname = "onedarkpro.nvim";
-    version = "2022-11-13";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "onedarkpro.nvim";
-      rev = "91c2991027cb86038bdb764597054b940eadb3f8";
-      sha256 = "0ibgy5wfbvds5jy7v7005r932fp3nabyf53yrs172p16xkhgr0m9";
+      rev = "5e25c890d35c588f00f186623c885b64d98b86f2";
+      sha256 = "0xarcj9nrryyq3mk0xwk2ffgc1h1hnjgkmzv0p4ca6zkjdf3ri85";
    };
    meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
  };
@ -6372,12 +6384,12 @@ final: prev:

  orgmode = buildVimPluginFrom2Nix {
    pname = "orgmode";
-    version = "2022-11-14";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "nvim-orgmode";
      repo = "orgmode";
-      rev = "c81ff93fe0502cef3bb938543ffd44bf8ab33f69";
-      sha256 = "0bfd1yak73766d17c92cnfa0bd186a6rsvzwgl0nzg8sz0zamahw";
+      rev = "68c4f9eaf7f860780cad48d80c7f150333b24795";
+      sha256 = "1dxr4wlbvsb4cfw6lyxs9k6sz1b686af5xv3r898agjafaa96iy3";
    };
    meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
  };
@ -8144,12 +8156,12 @@ final: prev:

  tokyonight-nvim = buildVimPluginFrom2Nix {
    pname = "tokyonight.nvim";
-    version = "2022-11-11";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "tokyonight.nvim";
-      rev = "ec144d94a8dbd9c8b4f5e50d933d67a37f589ed8";
-      sha256 = "1nns9y6k5ig8ihv6xcwcvxs8drnr3mrnnfmsyv5174xr524s00yl";
+      rev = "62b4e89ea1766baa3b5343ca77d62c817f5f48d0";
+      sha256 = "1gqvynnq93dy3dchf9igvgw13ympc8zny0qjp77kq0jj77yq4jg3";
    };
    meta.homepage = "https://github.com/folke/tokyonight.nvim/";
  };
@ -9253,7 +9265,7 @@ final: prev:
      owner = "flazz";
      repo = "vim-colorschemes";
      rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9";
-      sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416";
+      sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5";
    };
    meta.homepage = "https://github.com/flazz/vim-colorschemes/";
  };
@ -9404,12 +9416,12 @@ final: prev:

  vim-dadbod-completion = buildVimPluginFrom2Nix {
    pname = "vim-dadbod-completion";
-    version = "2022-11-08";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "kristijanhusak";
      repo = "vim-dadbod-completion";
-      rev = "dd6b4fcf8a46fefd44d135bb036086bfeedcbf5b";
-      sha256 = "0zl1n6qc1ar4yhdb8v63w1vh03sg7pyd9gqgpgjxjxvgyiyrab8z";
+      rev = "01c4f7a66786095c6f00f877c616eaf34c425a06";
+      sha256 = "1kyyr6gsghs1h0654xil27acwrc3815mivdh55xvlq8cs350mbjj";
    };
    meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/";
  };
@ -9908,12 +9920,12 @@ final: prev:

  vim-fugitive = buildVimPluginFrom2Nix {
    pname = "vim-fugitive";
-    version = "2022-11-01";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "tpope";
      repo = "vim-fugitive";
-      rev = "01f3e0af928857128eec8d998948b80ed1678c18";
-      sha256 = "1pc40k8r1ps6dhilyfb1zxxlw5y401jcy97nvi573c9011yy4y2a";
+      rev = "362201bce510fce0f694093ddbac9202bedf288b";
+      sha256 = "0cfi4vf9yh3vk26i9cj0wxid515wwwjlypfyzg8lr5rdk3g2ysjb";
    };
    meta.homepage = "https://github.com/tpope/vim-fugitive/";
  };
@ -13033,12 +13045,12 @@ final: prev:

  vimtex = buildVimPluginFrom2Nix {
    pname = "vimtex";
-    version = "2022-11-10";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "vimtex";
-      rev = "34887074ebbb66584d731a12de418db2c066ba68";
-      sha256 = "0p5frm3a4m3ijvr4zaxc0f6x5wrrax6lsyirinmqybi352a7bfj6";
+      rev = "e5343cf7902021bcea5e9432b1da4c7e1528e37e";
+      sha256 = "0gkq2krqfsk4skd6v5a16d9j75mbaxmh40pyfracrsnlpzp215m1";
    };
    meta.homepage = "https://github.com/lervag/vimtex/";
  };
@ -13394,12 +13406,12 @@ final: prev:

  catppuccin-nvim = buildVimPluginFrom2Nix {
    pname = "catppuccin-nvim";
-    version = "2022-11-13";
+    version = "2022-11-14";
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "05d46987d986bc2c07342c92a89434e0f14e5999";
-      sha256 = "1ap8rkdypf4wczfi8blyxxy78hck7dbk0b7a8wi4lc2lall3kzcg";
+      rev = "0184121f9d6565610ddffa8284512b7643ee723e";
+      sha256 = "1z1h4js4yrq3js6cznsi9smh3ryl55rfhys963gj938rm423axzd";
    };
    meta.homepage = "https://github.com/catppuccin/nvim/";
  };
@ -13418,12 +13430,12 @@ final: prev:

  chad = buildVimPluginFrom2Nix {
    pname = "chad";
-    version = "2022-11-14";
+    version = "2022-11-15";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "0c9d2ac40071ff572e254d423468a476c63a74cc";
-      sha256 = "0pwbfqrkcwbqml2kn1dg2i5yd0w9vjqajykgv6g7j0dw0r06qvy3";
+      rev = "6c5a1041dd6cff273f7d53ac3be47175548c4d87";
+      sha256 = "1k67d7lv72qi5532l5bfd3hvlczx2yd00q6jvxng5mkq523m2vj3";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -1,6 +1,6 @@
 # generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py

-{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchgit, nodejs, tree-sitter }:
+{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchgit }:

 {
  agda = buildGrammar {
@ -169,11 +169,10 @@
    source = fetchFromGitHub {
      owner = "CyberShadow";
      repo = "tree-sitter-d";
-      nativeBuildInputs = [ nodejs tree-sitter ];
-      postFetch = "pushd $out && tree-sitter generate && popd";
      rev = "c2fbf21bd3aa45495fe13247e040ad5815250032";
-      hash = "sha256-JOCS72Ux1FMzf6kBVO7aqHNwJ0s3xkhzIFFV9GjJVOs=";
+      hash = "sha256-1aW3nLZ5MbsOEiJ9PH6N/bBUlRihosWa4OWRcAmT3kc=";
    };
+    generate = true;
  };
  dart = buildGrammar {
    language = "dart";
@ -191,11 +190,10 @@
    source = fetchFromGitHub {
      owner = "joelspadin";
      repo = "tree-sitter-devicetree";
-      nativeBuildInputs = [ nodejs tree-sitter ];
-      postFetch = "pushd $out && tree-sitter generate && popd";
      rev = "ea30a05d0f0446a96d8b096ad11828ad4f8ad849";
-      hash = "sha256-AZ0MAGVfeVhRHEbiqQrDpKzZsb9AMHBXC9uOJVla2fk=";
+      hash = "sha256-ZiUMIsjVMxpchxmJQ3g2yXIn+/kAWPwTzMzx3IlW93o=";
    };
+    generate = true;
  };
  diff = buildGrammar {
    language = "diff";
@ -373,11 +371,10 @@
    source = fetchFromGitHub {
      owner = "shunsambongi";
      repo = "tree-sitter-gitignore";
-      nativeBuildInputs = [ nodejs tree-sitter ];
-      postFetch = "pushd $out && tree-sitter generate && popd";
      rev = "f4685bf11ac466dd278449bcfe5fd014e94aa504";
-      hash = "sha256-Jv/DMHq5wE9avZgaVg8dSgoDgzl50u0TEj8pITQ3iBc=";
+      hash = "sha256-MjoY1tlVZgN6JqoTjhhg0zSdHzc8yplMr8824sfIKp8=";
    };
+    generate = true;
  };
  gleam = buildGrammar {
    language = "gleam";
@ -425,11 +422,10 @@
    source = fetchFromGitHub {
      owner = "PrestonKnopp";
      repo = "tree-sitter-godot-resource";
-      nativeBuildInputs = [ nodejs tree-sitter ];
-      postFetch = "pushd $out && tree-sitter generate && popd";
      rev = "b6ef0768711086a86b3297056f9ffb5cc1d77b4a";
-      hash = "sha256-u3YcGCtFV0Kz6+604XJQOXiqncgU8LBVKROOiVMZrC0=";
+      hash = "sha256-ws/8nL+HOoPb6Hcdh4pihjPoRw90R1fy7MB0V9Lb9ik=";
    };
+    generate = true;
  };
  gomod = buildGrammar {
    language = "gomod";
@ -831,11 +827,10 @@
    source = fetchFromGitHub {
      owner = "atom-ocaml";
      repo = "tree-sitter-ocamllex";
-      nativeBuildInputs = [ nodejs tree-sitter ];
-      postFetch = "pushd $out && tree-sitter generate && popd";
      rev = "ac1d5957e719d49bd6acd27439b79843e4daf8ed";
-      hash = "sha256-KxQiNJyS1Rbtc4Rl+ROktuVazdtjDduWdkrQ+NzT9NQ=";
+      hash = "sha256-XRxAnl+9F6AYPyd6BGNQOo+KjRs2el78ziyo7NeD1IE=";
    };
+    generate = true;
  };
  org = buildGrammar {
    language = "org";
@ -1163,11 +1158,10 @@
    source = fetchFromGitHub {
      owner = "alex-pinkus";
      repo = "tree-sitter-swift";
-      nativeBuildInputs = [ nodejs tree-sitter ];
-      postFetch = "pushd $out && tree-sitter generate && popd";
      rev = "25f8de356e3c33099ed691bd3b8b5c0fe3a11e15";
-      hash = "sha256-KCmEE5O7EAA0uUcYkM/FpeEIn9tOqrJosSpYsBvivOk=";
+      hash = "sha256-x9m5QFQY33NWdkq0lkWiskfKxqRPz5ePSbVUDY7IBLU=";
    };
+    generate = true;
  };
  sxhkdrc = buildGrammar {
    language = "sxhkdrc";
@ -1185,11 +1179,10 @@
    source = fetchFromGitHub {
      owner = "euclidianAce";
      repo = "tree-sitter-teal";
-      nativeBuildInputs = [ nodejs tree-sitter ];
-      postFetch = "pushd $out && tree-sitter generate && popd";
      rev = "1ae8c68e90523b26b93af56feb7868fe4214e2b2";
-      hash = "sha256-8FqXrsgOI/cVezgVsQqPLlTa4Qnzmbuelo0XsI48fV0=";
+      hash = "sha256-IGSZurROJLOp1pRPLowHGO1Pu/ehieLKWgI+RCE7wLc=";
    };
+    generate = true;
  };
  tiger = buildGrammar {
    language = "tiger";
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
@ -75,19 +75,6 @@ def generate_grammar(item):
            generated += f"""fetchgit {{
      url = "{url}";"""

-    if info.get("requires_generate_from_grammar"):
-        cmd += [
-            "--arg",
-            "nativeBuildInputs",
-            "[ nodejs tree-sitter ]",
-            "--postFetch",
-            "pushd $out && tree-sitter generate && popd",
-        ]
-
-        generated += """
-      nativeBuildInputs = [ nodejs tree-sitter ];
-      postFetch = "pushd $out && tree-sitter generate && popd";"""
-
    hash = subprocess.check_output(cmd, text=True).strip()

    generated += f"""
@ -100,6 +87,10 @@ def generate_grammar(item):
        generated += f"""
    location = "{location}";"""

+    if info.get("requires_generate_from_grammar"):
+        generated += """
+    generate = true;"""
+
    generated += """
  };
 """
@ -109,7 +100,7 @@ def generate_grammar(item):

 generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py

-{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchgit, nodejs, tree-sitter }:
+{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchgit }:

 {
 """
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -114,6 +114,16 @@

 self: super: {

+  barbecue-nvim = super.vimshell-vim.overrideAttrs (old: {
+    dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ];
+    meta = {
+      description = "A VS Code like winbar for Neovim";
+      homepage = "https://github.com/utilyre/barbecue.nvim";
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ lightquantum ];
+    };
+  });
+
  clang_complete = super.clang_complete.overrideAttrs (old: {
    # In addition to the arguments you pass to your compiler, you also need to
    # specify the path of the C++ std header (if you are using C++).
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -66,6 +66,7 @@ https://github.com/vim-scripts/autoload_cscope.vim/,,
 https://github.com/rafi/awesome-vim-colorschemes/,,
 https://github.com/ayu-theme/ayu-vim/,,
 https://github.com/romgrk/barbar.nvim/,,
+https://github.com/utilyre/barbecue.nvim/,,
 https://github.com/chriskempson/base16-vim/,,
 https://github.com/vim-scripts/bats.vim/,,
 https://github.com/rbgrouleff/bclose.vim/,,
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi
+{ lib, stdenv, fetchurl, substituteAll, pkg-config, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi
 , libtool, makeWrapper, autoreconfHook, fetchpatch
 }:

@ -17,6 +17,13 @@ stdenv.mkDerivation rec {
      url = "https://github.com/networkupstools/nut/commit/612c05efb3c3b243da603a3a050993281888b6e3.patch";
      sha256 = "0jdbii1z5sqyv24286j5px65j7b3gp8zk3ahbph83pig6g46m3hs";
    })
+    (substituteAll {
+      src = ./hardcode-paths.patch;
+      avahi = "${avahi}/lib";
+      freeipmi = "${freeipmi}/lib";
+      libusb = "${libusb-compat-0_1}/lib";
+      neon = "${neon}/lib";
+    })
  ];

  buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi ];
@ -38,11 +45,6 @@ stdenv.mkDerivation rec {

  NIX_CFLAGS_COMPILE = [ "-std=c++14" ];

-  postInstall = ''
-    wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
-      "$out/lib:${neon}/lib:${libusb-compat-0_1.out}/lib:${avahi}/lib:${freeipmi}/lib"
-  '';
-
  meta = with lib; {
    description = "Network UPS Tools";
    longDescription = ''
--- a/pkgs/applications/misc/nut/hardcode-paths.patch
+++ b/pkgs/applications/misc/nut/hardcode-paths.patch
@ -0,0 +1,13 @@
+--- a/tools/nut-scanner/nutscan-init.c
+++ b/tools/nut-scanner/nutscan-init.c
+@@ -44,6 +44,10 @@ int nutscan_load_upsclient_library(const char *libname_path);
+ 
+ /* FIXME: would be good to get more from /etc/ld.so.conf[.d] */
+ char * search_paths[] = {
+	"@avahi@",
+	"@freeipmi@",
+	"@libusb@",
+	"@neon@",
+ 	LIBDIR,
+ 	"/usr/lib64",
+ 	"/lib64",
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@ -16,15 +16,16 @@
 , wmctrl
 , xvfb-run
 , librsvg
+, libX11
 }:

 python3Packages.buildPythonApplication rec {
  pname = "ulauncher";
-  version = "5.12.1";
+  version = "5.15.0";

  src = fetchurl {
    url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
-    sha256 = "sha256-Fd3IOCEeXGV8zGd/8SzrWRsSsZRVePnsDaX8WrBrCOQ=";
+    sha256 = "sha256-1Qo6ffMtVRtZDPCHvHEl7T0dPdDUxP4TP2hkSVSdQpo";
  };

  nativeBuildInputs = with python3Packages; [
@ -36,7 +37,6 @@ python3Packages.buildPythonApplication rec {
  ];

  buildInputs = [
-    gdk-pixbuf
    glib
    gnome.adwaita-icon-theme
    gtk3
@ -71,7 +71,6 @@ python3Packages.buildPythonApplication rec {

  patches = [
    ./fix-path.patch
-    ./0001-Adjust-get_data_path-for-NixOS.patch
    ./fix-extensions.patch
  ];

@ -108,6 +107,8 @@ python3Packages.buildPythonApplication rec {
    makeWrapperArgs+=(
     "''${gappsWrapperArgs[@]}"
     --prefix PATH : "${lib.makeBinPath [ wmctrl ]}"
+     --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libX11 ]}"
+     --prefix WEBKIT_DISABLE_COMPOSITING_MODE : "1"
    )
  '';

--- a/pkgs/applications/misc/ulauncher/fix-path.patch
+++ b/pkgs/applications/misc/ulauncher/fix-path.patch
@ -2,12 +2,11 @@ diff --git a/setup.py b/setup.py
 index 3616104..e9bbfda 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -112,7 +112,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
-         DistUtilsExtra.auto.install_auto.run(self)
- 
-         target_data = '/' + os.path.relpath(self.install_data, self.root) + '/'
+@@ -94,7 +94,7 @@
+         # Root is undefined if not installing into an alternate root
+         root = self.root or "/"
+         target_data = '/' + os.path.relpath(self.install_data, root) + '/'
 -        target_pkgdata = target_data + 'share/ulauncher/'
 +        target_pkgdata = '@out@/share/ulauncher/'
         target_scripts = '/' + os.path.relpath(self.install_scripts,
-                                                self.root) + '/'
- 
+                                                root) + '/'
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -48,13 +48,13 @@
    "version": "3.0.0"
  },
  "alicloud": {
-    "hash": "sha256-2ClWPe4sTt6rW9AamDH8td/W5/yDdD1qR4V1pzJm/0I=",
+    "hash": "sha256-rscu2gCvf/8MJBx1coUmne+8DO8b6RFyfMAwhTUPU+w=",
    "owner": "aliyun",
    "provider-source-address": "registry.terraform.io/aliyun/alicloud",
    "repo": "terraform-provider-alicloud",
-    "rev": "v1.191.0",
+    "rev": "v1.192.0",
    "vendorHash": null,
-    "version": "1.191.0"
+    "version": "1.192.0"
  },
  "ansible": {
    "hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=",
@ -148,13 +148,14 @@
    "version": "1.0.0"
  },
  "baiducloud": {
-    "hash": "sha256-O2DU47kabPleWr+HodOx+Canp1bFypAZ3UMJnC2mzqQ=",
+    "deleteVendor": true,
+    "hash": "sha256-0L/T12jeSkdZDJknVu5JffyaniZ1RVWgMpPu3qKNmWU=",
    "owner": "baidubce",
    "provider-source-address": "registry.terraform.io/baidubce/baiducloud",
    "repo": "terraform-provider-baiducloud",
-    "rev": "v1.18.0",
-    "vendorHash": null,
-    "version": "1.18.0"
+    "rev": "v1.18.2",
+    "vendorHash": "sha256-ya2FpsLQMIu8zWYObpyPgBHVkHoNKzHgdMxukbtsje4=",
+    "version": "1.18.2"
  },
  "bigip": {
    "hash": "sha256-erJeg7KF3QUi85ueOQTrab2woIC1nkMXRIj/pFm0DGY=",
@ -221,13 +222,13 @@
    "version": "1.20.0"
  },
  "cloudflare": {
-    "hash": "sha256-DqGHPD1CnkIkABB0sB90zE/mVxo0aXQwu4Et7apuM1A=",
+    "hash": "sha256-a0zJ1n4nKHEyjqJeey5MxPhqJU8Bq9a+hqLOCEdTfEE=",
    "owner": "cloudflare",
    "provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
    "repo": "terraform-provider-cloudflare",
-    "rev": "v3.27.0",
-    "vendorHash": "sha256-tpOyqFpO1jMEfXkXgodGEnFVGMqeAqsU5oou60lqcUE=",
-    "version": "3.27.0"
+    "rev": "v3.28.0",
+    "vendorHash": "sha256-Jvaud6rkaNMZZ/L/pb8JKGaAYw1MieGq7aU4Abe2VJA=",
+    "version": "3.28.0"
  },
  "cloudfoundry": {
    "hash": "sha256-VfGB0NkT36oYT5F1fh1N/2rlZdfhk+K76AXNh0NkO50=",
@ -777,13 +778,13 @@
    "version": "0.6.12"
  },
  "newrelic": {
-    "hash": "sha256-TZM7MRdc3Fok2e8FR04ccC19rd1OXvrRnm6yQRRhXJU=",
+    "hash": "sha256-d5JRqxMmG7fku8+C8e700nfghz2wbL0n1TrOZb1hkpY=",
    "owner": "newrelic",
    "provider-source-address": "registry.terraform.io/newrelic/newrelic",
    "repo": "terraform-provider-newrelic",
-    "rev": "v3.7.0",
+    "rev": "v3.7.1",
    "vendorHash": "sha256-gKPopfkEx1YRxcsO8W2+2EqKJfYbJ/pJgpydc1YScDA=",
-    "version": "3.7.0"
+    "version": "3.7.1"
  },
  "nomad": {
    "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=",
@ -1111,13 +1112,13 @@
    "version": "0.13.5"
  },
  "tencentcloud": {
-    "hash": "sha256-ZoNmoeeRnZ/CDAfXRyKxgXcXpjzquncbaS5dpjq16Lw=",
+    "hash": "sha256-eTHI5T2RZawwb7PsrnTm5Bglhc28A7pKcX2Lq8flAcY=",
    "owner": "tencentcloudstack",
    "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
    "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.78.10",
+    "rev": "v1.78.11",
    "vendorHash": null,
-    "version": "1.78.10"
+    "version": "1.78.11"
  },
  "tfe": {
    "hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=",
--- a/pkgs/data/fonts/linja-pi-pu-lukin/default.nix
+++ b/pkgs/data/fonts/linja-pi-pu-lukin/default.nix
@ -0,0 +1,23 @@
+{ lib, fetchurl }:
+
+fetchurl {
+  pname = "linja-pi-pu-lukin";
+  version = "unstable-2021-10-29";
+
+  url = "https://web.archive.org/web/20211029000000/https://jansa-tp.github.io/linja-pi-pu-lukin/PuLukin.otf";
+  hash = "sha256-VPdrMHWpiokFYON4S8zT+pSs4TsB17S8TZRtkjqIqU8=";
+
+  downloadToTemp = true;
+  recursiveHash = true;
+  postFetch = ''
+    install -D $downloadedFile $out/share/fonts/opentype/linja-pi-pu-lukin.otf
+  '';
+
+  meta = with lib; {
+    description = "A sitelen pona font resembling the style found in Toki Pona: The Language of Good (lipu pu), by jan Sa.";
+    homepage = "https://jansa-tp.github.io/linja-pi-pu-lukin/";
+    license = licenses.unfree; # license is unspecified in repository
+    platforms = platforms.all;
+    maintainers = with maintainers; [ somasis ];
+  };
+}
--- a/pkgs/data/fonts/sitelen-seli-kiwen/default.nix
+++ b/pkgs/data/fonts/sitelen-seli-kiwen/default.nix
@ -0,0 +1,27 @@
+{ lib, fetchzip }:
+
+let
+  rev = "69132c99873894746c9710707aaeb2cea2609709";
+in
+fetchzip {
+  pname = "sitelen-seli-kiwen";
+  version = "unstable-2022-06-28";
+
+  url = "https://raw.githubusercontent.com/kreativekorp/sitelen-seli-kiwen/${rev}/sitelenselikiwen.zip";
+  hash = "sha256-63sl/Ha2QAe8pVKCpLNs//DB0kjLdW01u6tVMrGquIU=";
+  stripRoot = false;
+
+  postFetch = ''
+    mkdir -p $out/share/fonts/{opentype,truetype}
+    mv $out/*.eot $out/share/fonts/opentype/
+    mv $out/*.ttf $out/share/fonts/truetype/
+  '';
+
+  meta = with lib; {
+    description = "A handwritten sitelen pona font supporting UCSUR";
+    homepage = "https://www.kreativekorp.com/software/fonts/sitelenselikiwen/";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ somasis ];
+  };
+}
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@ -1,23 +1,37 @@
 { lib
-, stdenv
+, stdenvNoCC
 , fetchFromGitHub
 , gdk-pixbuf
 , gtk-engine-murrine
+, jdupes
 , librsvg
 , gitUpdater
+, colorVariants ? [] # default: all
+, themeVariants ? [] # default: blue
 }:

-stdenv.mkDerivation rec {
+let
  pname = "matcha-gtk-theme";
-  version = "2022-06-07";
+
+in
+lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants
+lib.checkListOfEnum "${pname}: theme variants" [ "aliz" "azul" "sea" "pueril" "all" ] themeVariants
+
+stdenvNoCC.mkDerivation rec {
+  inherit pname;
+  version = "2022-11-15";

  src = fetchFromGitHub {
    owner = "vinceliuice";
    repo = pname;
    rev = version;
-    sha256 = "26xa9EGo2hci08Zw+X/A0Pn0VHxU8yfvRMiRusml+tc=";
+    sha256 = "Rx22O8C7kbYADxqJF8u6kdcQnXNA5aS+NWOnx/X4urY=";
  };

+  nativeBuildInputs = [
+    jdupes
+  ];
+
  buildInputs = [
    gdk-pixbuf
    librsvg
@ -33,11 +47,19 @@ stdenv.mkDerivation rec {

  installPhase = ''
    runHook preInstall
+
    mkdir -p $out/share/themes
-    name= ./install.sh --dest $out/share/themes
-    install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml
+
+    name= ./install.sh \
+      ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \
+      ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \
+      --dest $out/share/themes
+
    mkdir -p $out/share/doc/${pname}
    cp -a src/extra/firefox $out/share/doc/${pname}
+
+    jdupes --quiet --link-soft --recurse $out/share
+
    runHook postInstall
  '';

--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@ -24,13 +24,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-calendar";
-  version = "6.1.1";
+  version = "6.1.2";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "calendar";
    rev = version;
-    sha256 = "sha256-c2c8QNifBDzb0CelB72AIL4G694l6KCSXBjWIHrzZJo=";
+    sha256 = "sha256-psUVgl/7pmmf+8dP8ghBx5C1u4UT9ncXuVYvDJOYeOI=";
  };

  patches = [
@ -40,13 +40,6 @@ stdenv.mkDerivation rec {
      url = "https://github.com/elementary/calendar/commit/62c20e5786accd68b96c423b04e32c043e726cac.patch";
      sha256 = "sha256-xatxoSwAIHiUA03vvBdM8HSW27vhPLvAxEuGK0gLiio=";
    })
-
-    # GridDay: Fix day in month in grid with GLib 2.73.1+
-    # https://github.com/elementary/calendar/pull/763
-    (fetchpatch {
-      url = "https://github.com/elementary/calendar/commit/20b0983c85935bedef065b786ec8bbca55ba7d9e.patch";
-      sha256 = "sha256-Tw9uNqqRAC+vOp7EWzZVeDmZxt3hTGl9UIP21FcunqA=";
-    })
  ];

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@ -28,7 +28,7 @@

 stdenv.mkDerivation rec {
  pname = "elementary-files";
-  version = "6.2.0";
+  version = "6.2.1";

  outputs = [ "out" "dev" ];

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
    owner = "elementary";
    repo = "files";
    rev = version;
-    sha256 = "sha256-V1otkc1Og7J/A68j+4MrJzOtAH6PHSfj5fSpjKhhwo4=";
+    sha256 = "sha256-pJFeMG2aGaMkS00fSoRlMR2YSg5YzwqwaQT8G7Gk5S4=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@ -31,13 +31,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-photos";
-  version = "2.7.5";
+  version = "2.8.0";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "photos";
    rev = version;
-    sha256 = "sha256-zM32+bva+QD1Z/0vUD7K0/tnSzo+7GGLjJ1ytr64c0I=";
+    sha256 = "sha256-VhJggQMy1vk21zNA5pR4uAPGCwnIxLUHVO58AZs+h6s=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@ -30,13 +30,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-greeter";
-  version = "6.1.0";
+  version = "6.1.1";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "greeter";
    rev = version;
-    sha256 = "sha256-CY+dPSyQ/ovSdI80uEipDdnWy1KjbZnwpn9sd8HrbPQ=";
+    sha256 = "sha256-6rjZOX9JOTjZwqWVWTtKjGNy8KgWllE9VQZzwhuBAwE=";
  };

  patches = [
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@ -26,13 +26,13 @@

 stdenv.mkDerivation rec {
  pname = "wingpanel-applications-menu";
-  version = "2.10.2";
+  version = "2.11.0";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "applications-menu";
    rev = version;
-    sha256 = "sha256-xBuMJzIFOueSvNwvXc85AI9NHuMW3bOblNsyuDkIzyk=";
+    sha256 = "sha256-pEBvFN+zYsF8CbB29rTNclwAYhw/Hb0HhLzXtijfI4M=";
  };

  patches = [
@ -80,6 +80,8 @@ stdenv.mkDerivation rec {
    patchShebangs meson/post_install.py
  '';

+  doCheck = true;
+
  passthru = {
    updateScript = nix-update-script {
      attrPath = "pantheon.${pname}";
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch
@ -1,8 +1,21 @@
-diff --git a/src/synapse-plugins/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin.vala
-index 886a44cd..a4601da6 100644
--- a/src/synapse-plugins/calculator-plugin.vala
-+++ b/src/synapse-plugins/calculator-plugin.vala
-@@ -50,9 +50,7 @@ namespace Synapse {
+diff --git a/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala b/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
+index 542e7aa..228c6d7 100644
+--- a/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
+++ b/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
+@@ -83,7 +83,7 @@ namespace Synapse {
+                 Pid pid;
+                 int read_fd, write_fd;
+                 /* Must include math library to get non-integer results and to access standard math functions */
+-                string[] argv = {"bc", "-l"};
+                string[] argv = {"@bc@", "-l"};
+ 
+                 Process.spawn_async_with_pipes (
+                     null, argv, null,
+diff --git a/src/synapse-plugins/calculator-plugin/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
+index d14f1de..35c8621 100644
+--- a/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
+++ b/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
+@@ -49,9 +49,7 @@ namespace Synapse {
                 _("Calculator"),
                 _("Calculate basic expressions."),
                 "accessories-calculator",
@ -13,12 +26,17 @@ index 886a44cd..a4601da6 100644
             );
         }
 
-@@ -94,7 +92,7 @@ namespace Synapse {
-                 Pid pid;
-                 int read_fd, write_fd;
-                 /* Must include math library to get non-integer results and to access standard math functions */
-                string[] argv = {"bc", "-l"};
-+                string[] argv = {"@bc@", "-l"};
-                 string? solution = null;
- 
-                 try {
+diff --git a/src/synapse-plugins/converter-plugin/converter-plugin.vala b/src/synapse-plugins/converter-plugin/converter-plugin.vala
+index 8d230cc..ed31927 100644
+--- a/src/synapse-plugins/converter-plugin/converter-plugin.vala
+++ b/src/synapse-plugins/converter-plugin/converter-plugin.vala
+@@ -46,9 +46,7 @@ namespace Synapse {
+                 _("Converter"),
+                 _("Convert between units."),
+                 "accessories-converter",
+-                register_plugin,
+-                Environment.find_program_in_path ("bc") != null,
+-                _("bc is not installed")
+                register_plugin
+             );
+         }
--- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
@ -5,9 +5,9 @@
 mkXfceDerivation {
  category = "xfce";
  pname = "xfce4-settings";
-  version = "4.16.4";
+  version = "4.16.5";

-  sha256 = "sha256-w/wnLa3NuOV/2LlDPMCEG3z+k3pW+MPHtqx5L5NdOJs=";
+  sha256 = "sha256-ZVQw/oqN+jCOWj8O+1ldVCvbzY+QcebaQI5oFOdMOew=";

  postPatch = ''
    for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do
--- a/pkgs/development/ocaml-modules/qcheck/core.nix
+++ b/pkgs/development/ocaml-modules/qcheck/core.nix
@ -2,7 +2,7 @@

 buildDunePackage rec {
  pname = "qcheck-core";
-  version = "0.19.1";
+  version = "0.20";

  minimalOCamlVersion = "4.08";

@ -10,7 +10,7 @@ buildDunePackage rec {
    owner = "c-cube";
    repo = "qcheck";
    rev = "v${version}";
-    sha256 = "sha256-AZ1Ww6CWt3X1bXXcofMe14rTlMTC9hmohcKdZLUKEvE=";
+    sha256 = "sha256-d3gleiaPEDJTbHtieL4oAq1NlA/0NtzdW9SA1sItFeQ=";
  };

  meta = {
--- a/pkgs/development/python-modules/dill/default.nix
+++ b/pkgs/development/python-modules/dill/default.nix
@ -3,6 +3,10 @@
 , fetchFromGitHub
 , python
 , setuptools
+
+# passthru tests
+, apache-beam
+, datasets
 }:

 buildPythonPackage rec {
@ -27,6 +31,10 @@ buildPythonPackage rec {
    runHook postCheck
  '';

+  passthru.tests = {
+    inherit apache-beam datasets;
+  };
+
  pythonImportsCheck = [ "dill" ];

  meta = with lib; {
--- a/pkgs/development/python-modules/gpiozero/default.nix
+++ b/pkgs/development/python-modules/gpiozero/default.nix
@ -49,6 +49,7 @@ buildPythonPackage rec {
    description = "A simple interface to GPIO devices with Raspberry Pi";
    homepage = "https://github.com/gpiozero/gpiozero";
    license = licenses.bsd3;
+    platforms = platforms.linux;
    maintainers = with maintainers; [ hexa ];
  };
 }
--- a/pkgs/development/python-modules/miniaudio/default.nix
+++ b/pkgs/development/python-modules/miniaudio/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "miniaudio";
-  version = "1.54";
+  version = "1.55";

  disabled = pythonOlder "3.6";

@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "irmen";
    repo = "pyminiaudio";
    rev = "refs/tags/v${version}";
-    hash = "sha256-Xy1O9/oeEM0fjuipCFxL2nknH6/bEVGIraByOlQ/CHs=";
+    hash = "sha256-na8pnYIoawICbsVquzlmfYZtIagsVBudFOKJ62jSTGM=";
  };

  buildInputs = lib.optionals stdenv.isDarwin [
--- a/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/pkgs/development/python-modules/ytmusicapi/default.nix
@ -3,20 +3,27 @@
 , fetchPypi
 , pythonOlder
 , requests
+, setuptools
+, setuptools-scm
 }:

 buildPythonPackage rec {
  pname = "ytmusicapi";
-  version = "0.22.0";
-  format = "setuptools";
+  version = "0.24.0";
+  format = "pyproject";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-CZ4uoW4UHn5C+MckQXysTdydaApn99b0UCnF5RPb7DI=";
+    hash = "sha256-vbSWgBze3tFLEpHdh3JXij3m5R6iAhTSjrCMaSLZalY=";
  };

+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
  propagatedBuildInputs = [
    requests
  ];
--- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix
@ -1,4 +1,5 @@
 { stdenv
+, nodejs
 , tree-sitter
 , lib
 }:
@ -13,35 +14,38 @@
  # source for the language grammar
 , source
 , location ? null
+, generate ? false,
 }:

 stdenv.mkDerivation rec {
-
  pname = "${language}-grammar";
  inherit version;

-  src = if location == null then source else "${source}/${location}";
+  src = source;

-  buildInputs = [ tree-sitter ];
+  nativeBuildInputs = lib.optionals generate [ nodejs tree-sitter ];

-  dontUnpack = true;
-  dontConfigure = true;
-
-  CFLAGS = [ "-I${src}/src" "-O2" ];
-  CXXFLAGS = [ "-I${src}/src" "-O2" ];
+  CFLAGS = [ "-Isrc" "-O2" ];
+  CXXFLAGS = [ "-Isrc" "-O2" ];

  stripDebugList = [ "parser" ];

+  configurePhase = lib.optionalString generate ''
+    tree-sitter generate
+  '' + lib.optionalString (location != null) ''
+    cd ${location}
+  '';
+
  # When both scanner.{c,cc} exist, we should not link both since they may be the same but in
  # different languages. Just randomly prefer C++ if that happens.
  buildPhase = ''
    runHook preBuild
-    if [[ -e "$src/src/scanner.cc" ]]; then
-      $CXX -fPIC -c "$src/src/scanner.cc" -o scanner.o $CXXFLAGS
-    elif [[ -e "$src/src/scanner.c" ]]; then
-      $CC -fPIC -c "$src/src/scanner.c" -o scanner.o $CFLAGS
+    if [[ -e src/scanner.cc ]]; then
+      $CXX -fPIC -c src/scanner.cc -o scanner.o $CXXFLAGS
+    elif [[ -e src/scanner.c ]]; then
+      $CC -fPIC -c src/scanner.c -o scanner.o $CFLAGS
    fi
-    $CC -fPIC -c "$src/src/parser.c" -o parser.o $CFLAGS
+    $CC -fPIC -c src/parser.c -o parser.o $CFLAGS
    $CXX -shared -o parser *.o
    runHook postBuild
  '';
@ -50,8 +54,8 @@ stdenv.mkDerivation rec {
    runHook preInstall
    mkdir $out
    mv parser $out/
-    if [[ -d "$src/queries" ]]; then
-      cp -r $src/queries $out/
+    if [[ -d queries ]]; then
+      cp -r queries $out
    fi
    runHook postInstall
  '';
--- a/pkgs/development/tools/ruff/default.nix
+++ b/pkgs/development/tools/ruff/default.nix
@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "ruff";
-  version = "0.0.120";
+  version = "0.0.121";

  src = fetchFromGitHub {
    owner = "charliermarsh";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-7rh0xYwoWRY6D2Us6EB+AI5/PAqWqbWmTYnLk1UjYp8=";
+    sha256 = "sha256-vplpsobc3LFkgJsyXGT0jel8nT6begotEvYGQESiMFI=";
  };

-  cargoSha256 = "sha256-6P1c4U70V/dP8U2K0FBf7P4BkQXf9U5AQ0IT+XEWTkw=";
+  cargoSha256 = "sha256-gtITHmB9Qd417yWqKcfidjUjAuVz1GNmbX0aL0Bl7jQ=";

  buildInputs = lib.optionals stdenv.isDarwin [
    CoreServices
--- a/pkgs/os-specific/linux/rtl8723ds/default.nix
+++ b/pkgs/os-specific/linux/rtl8723ds/default.nix
@ -0,0 +1,46 @@
+{ lib, stdenv, fetchFromGitHub, kernel, bc }:
+
+stdenv.mkDerivation {
+  pname = "rtl8723ds";
+  version = "${kernel.version}-unstable-2022-10-20";
+
+  src = fetchFromGitHub {
+    owner = "lwfinger";
+    repo = "rtl8723ds";
+    rev = "912fdb30531bc8c071267a047e7df16feae7a865";
+    sha256 = "sha256-HhoCKrrRg1Q995sekQvzhaiqANeTP8pANItj2vLV+Cw=";
+  };
+
+  hardeningDisable = [ "pic" ];
+
+  nativeBuildInputs = [ bc ];
+  buildInputs = kernel.moduleBuildDependencies;
+
+  makeFlags = [
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
+
+  postPatch = ''
+    substituteInPlace ./Makefile \
+      --replace /lib/modules/ "${kernel.dev}/lib/modules/" \
+      --replace '$(shell uname -r)' "${kernel.modDirVersion}" \
+      --replace "/sbin/depmod" "#" \
+      --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+  '';
+
+  preInstall = ''
+    mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Linux driver for RTL8723DS.";
+    homepage = "https://github.com/lwfinger/rtl8723ds";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ chuangzhu ];
+  };
+}
--- a/pkgs/servers/matrix-appservice-discord/default.nix
+++ b/pkgs/servers/matrix-appservice-discord/default.nix
@ -1,36 +1,54 @@
-{ lib, mkYarnPackage, fetchFromGitHub, runCommand, makeWrapper, python3, nodejs, removeReferencesTo }:
-
-assert lib.versionAtLeast nodejs.version "12.0.0";
+{ lib
+, mkYarnPackage
+, fetchYarnDeps
+, fetchFromGitHub
+, srcOnly
+, makeWrapper
+, removeReferencesTo
+, python3
+, nodejs
+, matrix-sdk-crypto-nodejs
+}:

 let
-  nodeSources = runCommand "node-sources" {} ''
-    tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
-    mv node-* $out
-  '';
+  pin = lib.importJSON ./pin.json;
+  nodeSources = srcOnly nodejs;

 in mkYarnPackage rec {
  pname = "matrix-appservice-discord";
-
-  # when updating, run `./generate.sh <git release tag>`
-  version = "1.0.0";
+  inherit (pin) version;

  src = fetchFromGitHub {
-    owner = "Half-Shot";
+    owner = "matrix-org";
    repo = "matrix-appservice-discord";
    rev = "v${version}";
-    sha256 = "0pca4jxxl4b8irvb1bacsrzjg8m7frq9dnx1knnd2n6ia3f3x545";
+    sha256 = pin.srcSha256;
  };

  packageJSON = ./package.json;
-  yarnNix = ./yarn-dependencies.nix;
+  offlineCache = fetchYarnDeps {
+    yarnLock = "${src}/yarn.lock";
+    sha256 = pin.yarnSha256;
+  };

  pkgConfig = {
+    "@matrix-org/matrix-sdk-crypto-nodejs" = {
+      postInstall = ''
+        # replace with the built package
+        cd ..
+        rm -r matrix-sdk-crypto-nodejs
+        ln -s ${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/* ./
+      '';
+    };
+
    better-sqlite3 = {
-      buildInputs = [ python3 ];
+      nativeBuildInputs = [ python3 ];
      postInstall = ''
        # build native sqlite bindings
        npm run build-release --offline --nodedir="${nodeSources}"
-        find build -type f -exec ${removeReferencesTo}/bin/remove-references-to -t "${nodeSources}" {} \;
+        find build -type f -exec \
+          ${removeReferencesTo}/bin/remove-references-to \
+          -t "${nodeSources}" {} \;
     '';
    };
  };
@ -38,14 +56,22 @@ in mkYarnPackage rec {
  nativeBuildInputs = [ makeWrapper ];

  buildPhase = ''
+    runHook preBuild
+
    # compile TypeScript sources
    yarn --offline build
+
+    runHook postBuild
  '';

  doCheck = true;
  checkPhase = ''
+    runHook preCheck
+
    # the default 2000ms timeout is sometimes too short on our busy builders
    yarn --offline test --timeout 10000
+
+    runHook postCheck
  '';

  postInstall = ''
@ -57,7 +83,8 @@ in mkYarnPackage rec {

    # admin tools wrappers
    for toolPath in $OUT_JS_DIR/tools/*; do
-      makeWrapper '${nodejs}/bin/node' "$out/bin/${pname}-$(basename $toolPath .js)" \
+      makeWrapper '${nodejs}/bin/node' \
+        "$out/bin/${pname}-$(basename $toolPath .js)" \
        --add-flags "$toolPath"
    done
  '';
@ -67,6 +94,7 @@ in mkYarnPackage rec {

  passthru = {
    nodeAppDir = "libexec/${pname}/deps/${pname}";
+    updateScript = ./update.sh;
  };

  meta = {
--- a/pkgs/servers/matrix-appservice-discord/generate.sh
+++ b/pkgs/servers/matrix-appservice-discord/generate.sh
@ -1,17 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=../../../ -i bash -p wget yarn2nix
-
-set -euo pipefail
-
-if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
-  echo "Regenerates the Yarn dependency lock files for the matrix-appservice-discord package."
-  echo "Usage: $0 <git release tag>"
-  exit 1
-fi
-
-SRC_REPO="https://raw.githubusercontent.com/Half-Shot/matrix-appservice-discord/$1"
-
-wget "$SRC_REPO/package.json" -O package.json
-wget "$SRC_REPO/yarn.lock" -O yarn.lock
-yarn2nix --lockfile=yarn.lock > yarn-dependencies.nix
-rm yarn.lock
--- a/pkgs/servers/matrix-appservice-discord/package.json
+++ b/pkgs/servers/matrix-appservice-discord/package.json
@ -1,16 +1,20 @@
 {
  "name": "matrix-appservice-discord",
-  "version": "1.0.0",
+  "version": "3.1.0",
  "description": "A bridge between Matrix and Discord",
  "main": "discordas.js",
+  "engines": {
+    "npm": "please-use-yarn",
+    "node": ">=16 <=18"
+  },
  "scripts": {
    "test": "mocha -r ts-node/register test/config.ts test/test_*.ts test/**/test_*.ts",
-    "lint": "tslint --project ./tsconfig.json -t stylish",
-    "coverage": "nyc mocha -r ts-node/register test/config.ts test/test_*.ts test/**/test_*.ts",
+    "lint": "eslint -c .eslintrc --max-warnings 200 src/**/*.ts test/**/*.ts",
+    "coverage": "tsc && nyc mocha build/test/config.js build/test",
    "build": "tsc",
-    "postinstall": "npm run build",
-    "start": "npm run-script build && node ./build/src/discordas.js -c config.yaml",
-    "debug": "npm run-script build && node --inspect ./build/src/discordas.js -c config.yaml",
+    "postinstall": "yarn build",
+    "start": "yarn build && node ./build/src/discordas.js -c config.yaml",
+    "debug": "yarn build && node --inspect ./build/src/discordas.js -c config.yaml",
    "addbot": "node ./build/tools/addbot.js",
    "adminme": "node ./build/tools/adminme.js",
    "usertool": "node ./build/tools/userClientTools.js",
@ -36,7 +40,8 @@
  },
  "homepage": "https://github.com/Half-Shot/matrix-appservice-discord#readme",
  "dependencies": {
-    "better-discord.js": "git://github.com/Sorunome/better-discord.js.git#b5a28499899fe2d9e6aa1aa3b3c5d693ae672117",
+    "@mx-puppet/matrix-discord-parser": "0.1.10",
+    "better-discord.js": "github:matrix-org/better-discord.js#5024781db755259e88abe915630b7d5b3ba5f48f",
    "better-sqlite3": "^7.1.0",
    "command-line-args": "^5.1.1",
    "command-line-usage": "^6.1.0",
@ -44,34 +49,36 @@
    "escape-string-regexp": "^4.0.0",
    "js-yaml": "^3.14.0",
    "marked": "^1.2.2",
-    "matrix-bot-sdk": "0.5.4",
-    "matrix-discord-parser": "0.1.5",
+    "matrix-appservice-bridge": "^5.0.0",
    "mime": "^2.4.6",
-    "node-html-parser": "^1.2.19",
    "p-queue": "^6.4.0",
    "pg-promise": "^10.5.6",
    "prom-client": "^12.0.0",
+    "uuid": "^8.3.1",
    "winston": "^3.2.1",
    "winston-daily-rotate-file": "^4.5.0"
  },
  "devDependencies": {
    "@istanbuljs/nyc-config-typescript": "^1.0.1",
+    "@types/better-sqlite3": "^5.4.1",
    "@types/chai": "^4.2.11",
    "@types/command-line-args": "^5.0.0",
+    "@types/express": "^4.17.9",
    "@types/js-yaml": "^3.12.4",
    "@types/marked": "^1.1.0",
    "@types/mime": "^2.0.2",
    "@types/mocha": "^7.0.2",
-    "@types/node": "^12",
-    "@types/better-sqlite3": "^5.4.1",
+    "@types/node": "^14",
+    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@typescript-eslint/parser": "^5.4.0",
    "chai": "^4.2.0",
+    "eslint": "^7.4.0",
    "mocha": "^8.0.1",
    "nyc": "^15.1.0",
    "proxyquire": "^1.7.11",
    "source-map-support": "^0.5.19",
    "ts-node": "^8.10.2",
-    "tslint": "^5.20.1",
-    "typescript": "^3.9.5",
+    "typescript": "^4.2.3",
    "why-is-node-running": "^2.2.0"
  }
 }
--- a/pkgs/servers/matrix-appservice-discord/pin.json
+++ b/pkgs/servers/matrix-appservice-discord/pin.json
@ -0,0 +1,5 @@
+{
+  "version": "3.1.0",
+  "srcSha256": "gJ093wPP0ZniOP73ZrfZzqWXNowjo/Ire8DwlgHnM1A=",
+  "yarnSha256": "0cm9yprj0ajmrdpap3p2lx3xrrkar6gghlxnj9127ks6p5c1ji3r"
+}
--- a/pkgs/servers/matrix-appservice-discord/update.sh
+++ b/pkgs/servers/matrix-appservice-discord/update.sh
@ -0,0 +1,42 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=../../../ -i bash -p nix curl jq prefetch-yarn-deps nix-prefetch-github
+
+ORG="matrix-org"
+PROJ="matrix-appservice-discord"
+
+if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
+  echo "Regenerates packaging data for $PROJ."
+  echo "Usage: $0 [git release tag]"
+  exit 1
+fi
+
+tag="$1"
+
+set -euo pipefail
+
+if [ -z "$tag" ]; then
+  tag="$(
+    curl "https://api.github.com/repos/$ORG/$PROJ/releases?per_page=1" |
+    jq -r '.[0].tag_name'
+  )"
+fi
+
+src="https://raw.githubusercontent.com/$ORG/$PROJ/$tag"
+src_sha256=$(nix-prefetch-github $ORG $PROJ --rev ${tag} | jq -r .sha256)
+
+tmpdir=$(mktemp -d)
+trap 'rm -rf "$tmpdir"' EXIT
+
+pushd $tmpdir
+curl -O "$src/yarn.lock"
+yarn_sha256=$(prefetch-yarn-deps yarn.lock)
+popd
+
+curl -O "$src/package.json"
+cat > pin.json << EOF
+{
+  "version": "$(echo $tag | grep -P '(\d|\.)+' -o)",
+  "srcSha256": "$src_sha256",
+  "yarnSha256": "$yarn_sha256"
+}
+EOF
--- a/pkgs/servers/matrix-appservice-discord/yarn-dependencies.nix
+++ b/pkgs/servers/matrix-appservice-discord/yarn-dependencies.nix
--- a/pkgs/servers/mautrix-facebook/default.nix
+++ b/pkgs/servers/mautrix-facebook/default.nix
@ -8,13 +8,13 @@

 python3.pkgs.buildPythonPackage rec {
  pname = "mautrix-facebook";
-  version = "unstable-2022-05-06";
+  version = "0.4.1";

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "facebook";
-    rev = "5e2c4e7f5a38e3c5d984d690c0ebee9b6bb4768c";
-    hash = "sha256-ukFtVRrmaJVVwgp5siwEwbfq6Yq5rmu3XJA5H2n/eJU=";
+    rev = "v${version}";
+    hash = "sha256-MlT8jNUpJMgaUO9ZIYjpv8l3evdFjfEOSvdAdSlOUvg=";
  };

  propagatedBuildInputs = with python3.pkgs; [
@ -55,6 +55,7 @@ python3.pkgs.buildPythonPackage rec {

  meta = with lib; {
    homepage = "https://github.com/mautrix/facebook";
+    changelog = "https://github.com/mautrix/facebook/releases/tag/v${version}";
    description = "A Matrix-Facebook Messenger puppeting bridge";
    license = licenses.agpl3Plus;
    platforms = platforms.linux;
--- a/pkgs/servers/monitoring/unifi-poller/default.nix
+++ b/pkgs/servers/monitoring/unifi-poller/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "unifi-poller";
-  version = "2.1.7";
+  version = "2.1.3";

  src = fetchFromGitHub {
    owner = "unifi-poller";
    repo = "unifi-poller";
    rev = "v${version}";
-    sha256 = "sha256-79aBqYS8B+gIqmhu/UIA7g+FvTS/68qsK7qi5MGH10k=";
+    sha256 = "sha256-xh9s1xAhIeEmeDprl7iPdE6pxmxZjzgMvilobiIoJp0=";
  };

-  vendorSha256 = "sha256-WVYQ3cZOO+EyJRTFcMjziDHwqqinm1IvxvSLuHTaqT8=";
+  vendorSha256 = "sha256-HoYgBKTl9HIMVzzzNYtRrfmqb7HCpPHVPeR4gUXneWk=";

  ldflags = [
    "-w" "-s"
--- a/pkgs/tools/inputmethods/touchegg/default.nix
+++ b/pkgs/tools/inputmethods/touchegg/default.nix
@ -18,16 +18,23 @@

 stdenv.mkDerivation rec {
  pname = "touchegg";
-  version = "2.0.14";
+  version = "2.0.15";

  src = fetchFromGitHub {
    owner = "JoseExposito";
    repo = pname;
    rev = version;
-    sha256 = "sha256-2ZuFZ2PHhbxNTmGdlZONgPfEJC7lI5Rc6dgiBj7VG2o=";
+    sha256 = "sha256-oz3+hNNjQ/5vXWPMuhA2N2KK8W8S42WeSeDbhV4oJ9M=";
  };

  patches = lib.optionals withPantheon [
+    # Required for the next patch to apply
+    # Reverts https://github.com/JoseExposito/touchegg/pull/603
+    (fetchpatch {
+      url = "https://github.com/JoseExposito/touchegg/commit/34e947181d84620021601e7f28deb1983a154da8.patch";
+      sha256 = "sha256-qbWwmEzVXvDAhhrGvMkKN4YNtnFfRW+Yra+i6VEQX4g=";
+      revert = true;
+    })
    # Disable per-application gesture by default to make sure the default
    # config does not conflict with Pantheon switchboard settings.
    (fetchpatch {
--- a/pkgs/tools/misc/addlicense/default.nix
+++ b/pkgs/tools/misc/addlicense/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "addlicense";
-  version = "unstable-2021-04-22";
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "google";
    repo = "addlicense";
-    rev = "13e73a7f8fcb5696256b6a7b7addabf1070ad4b9";
-    sha256 = "sha256-UiJaTWCBup/Ub9NZIvkb67TvcUllV/AmYAKVO4egRqc=";
+    rev = "v${version}";
+    sha256 = "sha256-Vi+U0b9tTJitStZr1wSotr82Y2gA4IjvHLAa+rwGH/g=";
  };

  vendorSha256 = "sha256-2mncc21ecpv17Xp8PA9GIodoaCxNBacbbya/shU8T9Y=";
--- a/pkgs/tools/networking/doggo/default.nix
+++ b/pkgs/tools/networking/doggo/default.nix
@ -38,7 +38,7 @@ buildGoModule rec {
      It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well
    '';
    license = licenses.gpl3Only;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ georgesalkhouri ];
  };
 }
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1008,6 +1008,8 @@ with pkgs;

  sirula = callPackage ../tools/wayland/sirula { };

+  sitelen-seli-kiwen = callPackage ../data/fonts/sitelen-seli-kiwen {};
+
  srcOnly = callPackage ../build-support/src-only { };

  subnetcalc = callPackage ../tools/networking/subnetcalc { };
@ -26534,6 +26536,8 @@ with pkgs;

  line-awesome = callPackage ../data/fonts/line-awesome { };

+  linja-pi-pu-lukin = callPackage ../data/fonts/linja-pi-pu-lukin {};
+
  linux-manual = callPackage ../data/documentation/linux-manual { };

  lklug-sinhala = callPackage ../data/fonts/lklug-sinhala {};
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@ -374,6 +374,8 @@ in {

    rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { };

+    rtl8723ds = callPackage ../os-specific/linux/rtl8723ds { };
+
    rtl8812au = callPackage ../os-specific/linux/rtl8812au { };

    rtl8814au = callPackage ../os-specific/linux/rtl8814au { };