Merge master into haskell-updates

2022-02-26 00:09:51 +00:00 · 2022-02-26 00:09:51 +00:00 · 3a93e7e23e
commit 3a93e7e23e
parent aa849fe602 d9b6b8a849
590 changed files with 3324 additions and 3526 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -226,7 +226,7 @@
 /pkgs/applications/editors/neovim      @jonringer @teto

 # VimPlugins
-/pkgs/misc/vim-plugins         @jonringer @softinio
+/pkgs/applications/editors/vim/plugins         @jonringer

 # VsCode Extensions
 /pkgs/applications/editors/vscode/extensions   @jonringer
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@ -142,7 +142,7 @@
 "6.topic: vim":
  - doc/languages-frameworks/vim.section.md
  - pkgs/applications/editors/vim/**/*
-  - pkgs/misc/vim-plugins/**/*
+  - pkgs/applications/editors/vim/plugins/**/*
  - nixos/modules/programs/neovim.nix
  - pkgs/applications/editors/neovim/**/*

--- a/doc/contributing/submitting-changes.chapter.md
+++ b/doc/contributing/submitting-changes.chapter.md
@ -98,7 +98,7 @@ We use jbidwatcher as an example for a discontinued project here.
 1. Create a new branch for your change, e.g. `git checkout -b jbidwatcher`
 1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher`
 1. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`).
-1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.)
+1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/applications/editors/vim/plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.)

    For example in this case:

--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@ -979,6 +979,31 @@ with import <nixpkgs> {};
 in python.withPackages(ps: [ps.blaze])).env
 ```

+#### Optional extra dependencies
+
+Some packages define optional dependencies for additional features. With
+`setuptools` this is called `extras_require` and `flit` calls it `extras-require`. A
+method for supporting this is by declaring the extras of a package in its
+`passthru`, e.g. in case of the package `dask`
+
+```nix
+passthru.extras-require = {
+  complete = [ distributed ];
+};
+```
+
+and letting the package requiring the extra add the list to its dependencies
+
+```nix
+propagatedBuildInputs = [
+  ...
+] ++ dask.extras-require.complete;
+```
+
+Note this method is preferred over adding parameters to builders, as that can
+result in packages depending on different variants and thereby causing
+collisions.
+
 #### `buildPythonApplication` function {#buildpythonapplication-function}

 The `buildPythonApplication` function is practically the same as
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@ -309,9 +309,9 @@ Sample output2:

 ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs}

-Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.
+Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.

-Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:
+Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:

 ```nix
 deoplete-fish = super.deoplete-fish.overrideAttrs(old: {
@ -330,13 +330,13 @@ Finally, there are some plugins that are also packaged in nodePackages because t
 Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token).

 ```sh
-GITHUB_API_TOKEN=my_token ./pkgs/misc/vim-plugins/update.py
+GITHUB_API_TOKEN=my_token ./pkgs/applications/editors/vim/plugins/update.py
 ```

 Alternatively, set the number of processes to a lower count to avoid rate-limiting.

 ```sh
-./pkgs/misc/vim-plugins/update.py --proc 1
+./pkgs/applications/editors/vim/plugins/update.py --proc 1
 ```

 ## Important repositories {#important-repositories}
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -2993,6 +2993,12 @@
    githubId = 8404455;
    name = "Diego Lelis";
  };
+  DieracDelta = {
+    email = "justin@restivo.me";
+    github = "DieracDelta";
+    githubId = 13730968;
+    name = "Justin Restivo";
+  };
  diffumist = {
    email = "git@diffumist.me";
    github = "diffumist";
--- a/maintainers/scripts/pluginupdate.py
+++ b/maintainers/scripts/pluginupdate.py
@ -1,4 +1,4 @@
-# Used by pkgs/misc/vim-plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py
+# Used by pkgs/applications/editors/vim/plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py

 # format:
 # $ nix run nixpkgs.python3Packages.black -c black update.py
@ -454,8 +454,8 @@ def prefetch_plugin(
    )


-def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin:
-    plugin, _ = prefetch_plugin(parse_plugin_line(plugin_line))
+def fetch_plugin_from_pluginline(config: FetchConfig, plugin_line: str) -> Plugin:
+    plugin, _ = prefetch_plugin(parse_plugin_line(config, plugin_line))
    return plugin


@ -586,6 +586,7 @@ def prefetch(


 def rewrite_input(
+    config: FetchConfig,
    input_file: Path,
    deprecated: Path,
    redirects: Dict[str, str] = None,
@ -603,8 +604,8 @@ def rewrite_input(
        with open(deprecated, "r") as f:
            deprecations = json.load(f)
        for old, new in redirects.items():
-            old_plugin = fetch_plugin_from_pluginline(old)
-            new_plugin = fetch_plugin_from_pluginline(new)
+            old_plugin = fetch_plugin_from_pluginline(config, old)
+            new_plugin = fetch_plugin_from_pluginline(config, new)
            if old_plugin.normalized_name != new_plugin.normalized_name:
                deprecations[old_plugin.normalized_name] = {
                    "new": new_plugin.normalized_name,
@ -640,7 +641,7 @@ def update_plugins(editor: Editor, args):
    update = editor.get_update(args.input_file, args.outfile, fetch_config)

    redirects = update()
-    editor.rewrite_input(args.input_file, editor.deprecated, redirects)
+    editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, redirects)

    autocommit = not args.no_commit

@ -659,9 +660,9 @@ def update_plugins(editor: Editor, args):
            )

    for plugin_line in args.add_plugins:
-        editor.rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",))
+        editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=(plugin_line + "\n",))
        update()
-        plugin = fetch_plugin_from_pluginline(plugin_line)
+        plugin = fetch_plugin_from_pluginline(fetch_config, plugin_line)
        if autocommit:
            commit(
                nixpkgs_repo,
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@ -546,6 +546,14 @@
          <literal>tilp2</literal> was removed together with its module
        </para>
      </listitem>
+      <listitem>
+        <para>
+          <literal>bird1</literal> and its modules
+          <literal>services.bird</literal> as well as
+          <literal>services.bird6</literal> have been removed. Upgrade
+          to <literal>services.bird2</literal>.
+        </para>
+      </listitem>
      <listitem>
        <para>
          The options
@ -738,6 +746,70 @@
          <literal>false</literal>.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          <literal>pkgs.makeDesktopItem</literal> has been refactored to
+          provide a more idiomatic API. Specifically:
+        </para>
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>
+              All valid options as of FDO Desktop Entry specification
+              version 1.4 can now be passed in as explicit arguments
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <literal>exec</literal> can now be null, for entries that
+              are not of type Application
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <literal>mimeType</literal> argument is renamed to
+              <literal>mimeTypes</literal> for consistency
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <literal>mimeTypes</literal>,
+              <literal>categories</literal>,
+              <literal>implements</literal>,
+              <literal>keywords</literal>, <literal>onlyShowIn</literal>
+              and <literal>notShowIn</literal> take lists of strings
+              instead of one string with semicolon separators
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <literal>extraDesktopEntries</literal> renamed to
+              <literal>extraConfig</literal> for consistency
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Actions should now be provided as an attrset
+              <literal>actions</literal>, the <literal>Actions</literal>
+              line will be autogenerated.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <literal>extraEntries</literal> is removed.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Additional validation is added both at eval time and at
+              build time.
+            </para>
+          </listitem>
+        </itemizedlist>
+        <para>
+          See the <literal>vscode</literal> package for a more detailed
+          example.
+        </para>
+      </listitem>
    </itemizedlist>
  </section>
  <section xml:id="sec-release-22.05-notable-changes">
@ -939,6 +1011,16 @@
          <literal>true</literal>.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The <literal>element-desktop</literal> package now has an
+          <literal>useKeytar</literal> option (defaults to
+          <literal>true</literal>), which allows disabling
+          <literal>keytar</literal> and in turn
+          <literal>libsecret</literal> usage (which binds to native
+          credential managers / keychain libraries).
+        </para>
+      </listitem>
      <listitem>
        <para>
          The option <literal>services.thelounge.plugins</literal> has
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@ -178,6 +178,8 @@ In addition to numerous new and upgraded packages, this release has the followin

 - `tilp2` was removed together with its module

+- `bird1` and its modules `services.bird` as well as `services.bird6` have been removed. Upgrade to `services.bird2`.
+
 - The options `networking.interfaces.<name>.ipv4.routes` and `networking.interfaces.<name>.ipv6.routes` are no longer ignored when using networkd instead of the default scripted network backend by setting `networking.useNetworkd` to `true`.

 - MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`.
@ -229,6 +231,18 @@ In addition to numerous new and upgraded packages, this release has the followin
  pipewire-media-session is deprecated by upstream and not recommended, but can still be manually enabled by setting
  `services.pipewire.media-session.enable` to `true` and `services.pipewire.wireplumber.enable` to `false`.

+- `pkgs.makeDesktopItem` has been refactored to provide a more idiomatic API. Specifically:
+  - All valid options as of FDO Desktop Entry specification version 1.4 can now be passed in as explicit arguments
+  - `exec` can now be null, for entries that are not of type Application
+  - `mimeType` argument is renamed to `mimeTypes` for consistency
+  - `mimeTypes`, `categories`, `implements`, `keywords`, `onlyShowIn` and `notShowIn` take lists of strings instead of one string with semicolon separators
+  - `extraDesktopEntries` renamed to `extraConfig` for consistency
+  - Actions should now be provided as an attrset `actions`, the `Actions` line will be autogenerated.
+  - `extraEntries` is removed.
+  - Additional validation is added both at eval time and at build time.
+
+  See the `vscode` package for a more detailed example.
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

 ## Other Notable Changes {#sec-release-22.05-notable-changes}
@ -313,6 +327,10 @@ In addition to numerous new and upgraded packages, this release has the followin
  using `fetchgit` or `fetchhg` if the argument `fetchSubmodules`
  is set to `true`.

+- The `element-desktop` package now has an `useKeytar` option (defaults to `true`),
+  which allows disabling `keytar` and in turn `libsecret` usage
+  (which binds to native credential managers / keychain libraries).
+
 - The option `services.thelounge.plugins` has been added to allow installing plugins for The Lounge. Plugins can be found in `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`.

 - The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`.
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@ -129,7 +129,7 @@ let
      genericName = "View NixOS documentation in a web browser";
      icon = "nix-snowflake";
      exec = "nixos-help";
-      categories = "System";
+      categories = ["System"];
    };

    in pkgs.symlinkJoin {
--- a/nixos/modules/programs/phosh.nix
+++ b/nixos/modules/programs/phosh.nix
@ -8,18 +8,17 @@ let
  # Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop
  oskItem = pkgs.makeDesktopItem {
    name = "sm.puri.OSK0";
-    type = "Application";
    desktopName = "On-screen keyboard";
    exec = "${pkgs.squeekboard}/bin/squeekboard";
-    categories = "GNOME;Core;";
-    extraEntries = ''
-      OnlyShowIn=GNOME;
-      NoDisplay=true
-      X-GNOME-Autostart-Phase=Panel
-      X-GNOME-Provides=inputmethod
-      X-GNOME-Autostart-Notify=true
-      X-GNOME-AutoRestart=true
-    '';
+    categories = [ "GNOME" "Core" ];
+    onlyShowIn = [ "GNOME" ];
+    noDisplay = true;
+    extraConfig = {
+      X-GNOME-Autostart-Phase = "Panel";
+      X-GNOME-Provides = "inputmethod";
+      X-GNOME-Autostart-Notify = "true";
+      X-GNOME-AutoRestart = "true";
+    };
  };

  phocConfigType = types.submodule {
--- a/nixos/modules/services/audio/snapserver.nix
+++ b/nixos/modules/services/audio/snapserver.nix
@ -44,24 +44,24 @@ let

  optionString = concatStringsSep " " (mapAttrsToList streamToOption cfg.streams
    # global options
-    ++ [ "--stream.bind_to_address ${cfg.listenAddress}" ]
-    ++ [ "--stream.port ${toString cfg.port}" ]
-    ++ optionalNull cfg.sampleFormat "--stream.sampleformat ${cfg.sampleFormat}"
-    ++ optionalNull cfg.codec "--stream.codec ${cfg.codec}"
-    ++ optionalNull cfg.streamBuffer "--stream.stream_buffer ${toString cfg.streamBuffer}"
-    ++ optionalNull cfg.buffer "--stream.buffer ${toString cfg.buffer}"
+    ++ [ "--stream.bind_to_address=${cfg.listenAddress}" ]
+    ++ [ "--stream.port=${toString cfg.port}" ]
+    ++ optionalNull cfg.sampleFormat "--stream.sampleformat=${cfg.sampleFormat}"
+    ++ optionalNull cfg.codec "--stream.codec=${cfg.codec}"
+    ++ optionalNull cfg.streamBuffer "--stream.stream_buffer=${toString cfg.streamBuffer}"
+    ++ optionalNull cfg.buffer "--stream.buffer=${toString cfg.buffer}"
    ++ optional cfg.sendToMuted "--stream.send_to_muted"
    # tcp json rpc
-    ++ [ "--tcp.enabled ${toString cfg.tcp.enable}" ]
+    ++ [ "--tcp.enabled=${toString cfg.tcp.enable}" ]
    ++ optionals cfg.tcp.enable [
-      "--tcp.bind_to_address ${cfg.tcp.listenAddress}"
-      "--tcp.port ${toString cfg.tcp.port}" ]
+      "--tcp.bind_to_address=${cfg.tcp.listenAddress}"
+      "--tcp.port=${toString cfg.tcp.port}" ]
     # http json rpc
-    ++ [ "--http.enabled ${toString cfg.http.enable}" ]
+    ++ [ "--http.enabled=${toString cfg.http.enable}" ]
    ++ optionals cfg.http.enable [
-      "--http.bind_to_address ${cfg.http.listenAddress}"
-      "--http.port ${toString cfg.http.port}"
-    ] ++ optional (cfg.http.docRoot != null) "--http.doc_root \"${toString cfg.http.docRoot}\"");
+      "--http.bind_to_address=${cfg.http.listenAddress}"
+      "--http.port=${toString cfg.http.port}"
+    ] ++ optional (cfg.http.docRoot != null) "--http.doc_root=\"${toString cfg.http.docRoot}\"");

 in {
  imports = [
--- a/nixos/modules/services/cluster/kubernetes/pki.nix
+++ b/nixos/modules/services/cluster/kubernetes/pki.nix
@ -266,7 +266,7 @@ in
          in
          ''
            export KUBECONFIG=${clusterAdminKubeconfig}
-            ${kubectl}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files}
+            ${kubernetes}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files}
          '';
        })]);

--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@ -259,7 +259,7 @@ in
        ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir}
        ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir}
      '' + optionalString cfg.autoMigrate ''
-        ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -y
+        ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y
      '' + ''
        ipfs --offline config show \
          | ${pkgs.jq}/bin/jq '. * $extraConfig' --argjson extraConfig ${
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixos/modules/services/networking/bird.nix
@ -3,103 +3,107 @@
 let
  inherit (lib) mkEnableOption mkIf mkOption optionalString types;

-  generic = variant:
-    let
-      cfg = config.services.${variant};
-      pkg = pkgs.${variant};
-      birdBin = if variant == "bird6" then "bird6" else "bird";
-      birdc = if variant == "bird6" then "birdc6" else "birdc";
-      descr =
-        { bird = "1.6.x with IPv4 support";
-          bird6 = "1.6.x with IPv6 support";
-          bird2 = "2.x";
-        }.${variant};
-    in {
-      ###### interface
-      options = {
-        services.${variant} = {
-          enable = mkEnableOption "BIRD Internet Routing Daemon (${descr})";
-          config = mkOption {
-            type = types.lines;
-            description = ''
-              BIRD Internet Routing Daemon configuration file.
-              <link xlink:href='http://bird.network.cz/'/>
-            '';
-          };
-          checkConfig = mkOption {
-            type = types.bool;
-            default = true;
-            description = ''
-              Whether the config should be checked at build time.
-              When the config can't be checked during build time, for example when it includes
-              other files, either disable this option or use <code>preCheckConfig</code> to create
-              the included files before checking.
-            '';
-          };
-          preCheckConfig = mkOption {
-            type = types.lines;
-            default = "";
-            example = ''
-              echo "cost 100;" > include.conf
-            '';
-            description = ''
-              Commands to execute before the config file check. The file to be checked will be
-              available as <code>${variant}.conf</code> in the current directory.
-
-              Files created with this option will not be available at service runtime, only during
-              build time checking.
-            '';
-          };
-        };
+  cfg = config.services.bird2;
+in
+{
+  ###### interface
+  options = {
+    services.bird2 = {
+      enable = mkEnableOption "BIRD Internet Routing Daemon";
+      config = mkOption {
+        type = types.lines;
+        description = ''
+          BIRD Internet Routing Daemon configuration file.
+          <link xlink:href='http://bird.network.cz/'/>
+        '';
      };
+      checkConfig = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether the config should be checked at build time.
+          When the config can't be checked during build time, for example when it includes
+          other files, either disable this option or use <code>preCheckConfig</code> to create
+          the included files before checking.
+        '';
+      };
+      preCheckConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''
+          echo "cost 100;" > include.conf
+        '';
+        description = ''
+          Commands to execute before the config file check. The file to be checked will be
+          available as <code>bird2.conf</code> in the current directory.

-      ###### implementation
-      config = mkIf cfg.enable {
-        environment.systemPackages = [ pkg ];
-
-        environment.etc."bird/${variant}.conf".source = pkgs.writeTextFile {
-          name = "${variant}.conf";
-          text = cfg.config;
-          checkPhase = optionalString cfg.checkConfig ''
-            ln -s $out ${variant}.conf
-            ${cfg.preCheckConfig}
-            ${pkg}/bin/${birdBin} -d -p -c ${variant}.conf
-          '';
-        };
-
-        systemd.services.${variant} = {
-          description = "BIRD Internet Routing Daemon (${descr})";
-          wantedBy = [ "multi-user.target" ];
-          reloadIfChanged = true;
-          restartTriggers = [ config.environment.etc."bird/${variant}.conf".source ];
-          serviceConfig = {
-            Type = "forking";
-            Restart = "on-failure";
-            ExecStart = "${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -u ${variant} -g ${variant}";
-            ExecReload = "/bin/sh -c '${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -p && ${pkg}/bin/${birdc} configure'";
-            ExecStop = "${pkg}/bin/${birdc} down";
-            CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID"
-                                      # see bird/sysdep/linux/syspriv.h
-                                      "CAP_NET_BIND_SERVICE" "CAP_NET_BROADCAST" "CAP_NET_ADMIN" "CAP_NET_RAW" ];
-            ProtectSystem = "full";
-            ProtectHome = "yes";
-            SystemCallFilter="~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io";
-            MemoryDenyWriteExecute = "yes";
-          };
-        };
-        users = {
-          users.${variant} = {
-            description = "BIRD Internet Routing Daemon user";
-            group = variant;
-            isSystemUser = true;
-          };
-          groups.${variant} = {};
-        };
+          Files created with this option will not be available at service runtime, only during
+          build time checking.
+        '';
      };
    };
+  };

-in

-{
-  imports = map generic [ "bird" "bird6" "bird2" ];
+  imports = [
+    (lib.mkRemovedOptionModule [ "services" "bird" ] "Use services.bird2 instead")
+    (lib.mkRemovedOptionModule [ "services" "bird6" ] "Use services.bird2 instead")
+  ];
+
+  ###### implementation
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.bird ];
+
+    environment.etc."bird/bird2.conf".source = pkgs.writeTextFile {
+      name = "bird2";
+      text = cfg.config;
+      checkPhase = optionalString cfg.checkConfig ''
+        ln -s $out bird2.conf
+        ${cfg.preCheckConfig}
+        ${pkgs.bird}/bin/bird -d -p -c bird2.conf
+      '';
+    };
+
+    systemd.services.bird2 = {
+      description = "BIRD Internet Routing Daemon";
+      wantedBy = [ "multi-user.target" ];
+      reloadIfChanged = true;
+      restartTriggers = [ config.environment.etc."bird/bird2.conf".source ];
+      serviceConfig = {
+        Type = "forking";
+        Restart = "on-failure";
+        # We need to start as root so bird can open netlink sockets i.e. for ospf
+        ExecStart = "${pkgs.bird}/bin/bird -c /etc/bird/bird2.conf -u bird2 -g bird2";
+        ExecReload = "/bin/sh -c '${pkgs.bird}/bin/bird -c /etc/bird/bird2.conf -p && ${pkgs.bird}/bin/birdc configure'";
+        ExecStop = "${pkgs.bird}/bin/birdc down";
+        RuntimeDirectory = "bird";
+        CapabilityBoundingSet = [
+          "CAP_CHOWN"
+          "CAP_FOWNER"
+          "CAP_SETUID"
+          "CAP_SETGID"
+          "CAP_NET_ADMIN"
+          "CAP_NET_BROADCAST"
+          "CAP_NET_BIND_SERVICE"
+          "CAP_NET_RAW"
+        ];
+        ProtectSystem = "full";
+        ProtectHome = "yes";
+        ProtectKernelTunables = true;
+        ProtectControlGroups = true;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        SystemCallFilter = "~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io";
+        MemoryDenyWriteExecute = "yes";
+      };
+    };
+    users = {
+      users.bird2 = {
+        description = "BIRD Internet Routing Daemon user";
+        group = "bird2";
+        isSystemUser = true;
+      };
+      groups.bird2 = { };
+    };
+  };
 }
--- a/nixos/modules/services/web-apps/peertube.nix
+++ b/nixos/modules/services/web-apps/peertube.nix
@ -320,6 +320,7 @@ in {
        };
        storage = {
          tmp = lib.mkDefault "/var/lib/peertube/storage/tmp/";
+          bin = lib.mkDefault "/var/lib/peertube/storage/bin/";
          avatars = lib.mkDefault "/var/lib/peertube/storage/avatars/";
          videos = lib.mkDefault "/var/lib/peertube/storage/videos/";
          streaming_playlists = lib.mkDefault "/var/lib/peertube/storage/streaming-playlists/";
@ -333,6 +334,15 @@ in {
          plugins = lib.mkDefault "/var/lib/peertube/storage/plugins/";
          client_overrides = lib.mkDefault "/var/lib/peertube/storage/client-overrides/";
        };
+        import = {
+          videos = {
+            http = {
+              youtube_dl_release = {
+                python_path = "${pkgs.python3}/bin/python";
+              };
+            };
+          };
+        };
      }
      (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis/redis.sock"; }; })
    ];
@ -380,7 +390,7 @@ in {

      environment = env;

-      path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn youtube-dl ];
+      path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn python3 ];

      script = ''
        #!/bin/sh
--- a/nixos/modules/virtualisation/proxmox-lxc.nix
+++ b/nixos/modules/virtualisation/proxmox-lxc.nix
@ -0,0 +1,64 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+  options.proxmoxLXC = {
+    privileged = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable privileged mounts
+      '';
+    };
+    manageNetwork = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to manage network interfaces through nix options
+        When false, systemd-networkd is enabled to accept network
+        configuration from proxmox.
+      '';
+    };
+  };
+
+  config =
+    let
+      cfg = config.proxmoxLXC;
+    in
+    {
+      system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix {
+        storeContents = [{
+          object = config.system.build.toplevel;
+          symlink = "none";
+        }];
+
+        contents = [{
+          source = config.system.build.toplevel + "/init";
+          target = "/sbin/init";
+        }];
+
+        extraCommands = "mkdir -p root etc/systemd/network";
+      };
+
+      boot = {
+        isContainer = true;
+        loader.initScript.enable = true;
+      };
+
+      networking = mkIf (!cfg.manageNetwork) {
+        useDHCP = false;
+        useHostResolvConf = false;
+        useNetworkd = true;
+      };
+
+      services.openssh = {
+        enable = mkDefault true;
+        startWhenNeeded = mkDefault true;
+      };
+
+      systemd.mounts = mkIf (!cfg.privileged)
+        [{ where = "/sys/kernel/debug"; enable = false; }];
+
+    };
+}
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -322,7 +322,6 @@ in
  mysql-replication = handleTest ./mysql/mysql-replication.nix {};
  n8n = handleTest ./n8n.nix {};
  nagios = handleTest ./nagios.nix {};
-  nano = handleTest ./nano.nix {};
  nar-serve = handleTest ./nar-serve.nix {};
  nat.firewall = handleTest ./nat.nix { withFirewall = true; };
  nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; };
--- a/nixos/tests/bird.nix
+++ b/nixos/tests/bird.nix
@ -9,7 +9,7 @@ let
  inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
  inherit (pkgs.lib) optionalString;

-  hostShared = hostId: { pkgs, ... }: {
+  makeBird2Host = hostId: { pkgs, ... }: {
    virtualisation.vlans = [ 1 ];

    environment.systemPackages = with pkgs; [ jq ];
@ -24,105 +24,6 @@ let
      name = "eth1";
      networkConfig.Address = "10.0.0.${hostId}/24";
    };
-  };
-
-  birdTest = v4:
-    let variant = "bird${optionalString (!v4) "6"}"; in
-    makeTest {
-      name = variant;
-
-      nodes.host1 = makeBirdHost variant "1";
-      nodes.host2 = makeBirdHost variant "2";
-
-      testScript = makeTestScript variant v4 (!v4);
-    };
-
-  bird2Test = makeTest {
-    name = "bird2";
-
-    nodes.host1 = makeBird2Host "1";
-    nodes.host2 = makeBird2Host "2";
-
-    testScript = makeTestScript "bird2" true true;
-  };
-
-  makeTestScript = variant: v4: v6: ''
-    start_all()
-
-    host1.wait_for_unit("${variant}.service")
-    host2.wait_for_unit("${variant}.service")
-
-    ${optionalString v4 ''
-    with subtest("Waiting for advertised IPv4 routes"):
-      host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'")
-      host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'")
-    ''}
-    ${optionalString v6 ''
-    with subtest("Waiting for advertised IPv6 routes"):
-      host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'")
-      host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'")
-    ''}
-
-    with subtest("Check fake routes in preCheckConfig do not exists"):
-      ${optionalString v4 ''host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")''}
-      ${optionalString v4 ''host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")''}
-
-      ${optionalString v6 ''host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")''}
-      ${optionalString v6 ''host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")''}
-  '';
-
-  makeBirdHost = variant: hostId: { pkgs, ... }: {
-    imports = [ (hostShared hostId) ];
-
-    services.${variant} = {
-      enable = true;
-
-      config = ''
-        log syslog all;
-
-        debug protocols all;
-
-        router id 10.0.0.${hostId};
-
-        protocol device {
-        }
-
-        protocol kernel {
-          import none;
-          export all;
-        }
-
-        protocol static {
-          include "static.conf";
-        }
-
-        protocol ospf {
-          export all;
-          area 0 {
-            interface "eth1" {
-              hello 5;
-              wait 5;
-            };
-          };
-        }
-      '';
-
-      preCheckConfig =
-        let
-          route = { bird = "1.2.3.4/32"; bird6 = "fd00::/128"; }.${variant};
-        in
-        ''echo "route ${route} blackhole;" > static.conf'';
-    };
-
-    systemd.tmpfiles.rules =
-      let
-        route = { bird = "10.10.0.${hostId}/32"; bird6 = "fdff::${hostId}/128"; }.${variant};
-      in
-      [ "f /etc/bird/static.conf - - - - route ${route} blackhole;" ];
-  };
-
-  makeBird2Host = hostId: { pkgs, ... }: {
-    imports = [ (hostShared hostId) ];

    services.bird2 = {
      enable = true;
@ -198,8 +99,30 @@ let
    ];
  };
 in
-{
-  bird = birdTest true;
-  bird6 = birdTest false;
-  bird2 = bird2Test;
+makeTest {
+  name = "bird2";
+
+  nodes.host1 = makeBird2Host "1";
+  nodes.host2 = makeBird2Host "2";
+
+  testScript = ''
+    start_all()
+
+    host1.wait_for_unit("bird2.service")
+    host2.wait_for_unit("bird2.service")
+
+    with subtest("Waiting for advertised IPv4 routes"):
+      host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'")
+      host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'")
+    with subtest("Waiting for advertised IPv6 routes"):
+      host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'")
+      host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'")
+
+    with subtest("Check fake routes in preCheckConfig do not exists"):
+      host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")
+      host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")
+
+      host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")
+      host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")
+  '';
 }
--- a/nixos/tests/kubernetes/base.nix
+++ b/nixos/tests/kubernetes/base.nix
@ -18,7 +18,7 @@ let
        ${master.ip}  api.${domain}
        ${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip}  ${machineName}.${domain}") (attrNames machines)}
      '';
-      kubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } ''
+      wrapKubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } ''
        mkdir -p $out/bin
        makeWrapper ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl --set KUBECONFIG "/etc/kubernetes/cluster-admin.kubeconfig"
      '';
@ -48,7 +48,7 @@ let
                };
              };
              programs.bash.enableCompletion = true;
-              environment.systemPackages = [ kubectl ];
+              environment.systemPackages = [ wrapKubectl ];
              services.flannel.iface = "eth1";
              services.kubernetes = {
                proxy.hostname = "${masterName}.${domain}";
--- a/nixos/tests/kubernetes/rbac.nix
+++ b/nixos/tests/kubernetes/rbac.nix
@ -76,7 +76,7 @@ let
    }];
  });

-  kubectl = pkgs.runCommand "copy-kubectl" { buildInputs = [ pkgs.kubernetes ]; } ''
+  copyKubectl = pkgs.runCommand "copy-kubectl" { } ''
    mkdir -p $out/bin
    cp ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl
  '';
@ -84,7 +84,7 @@ let
  kubectlImage = pkgs.dockerTools.buildImage {
    name = "kubectl";
    tag = "latest";
-    contents = [ kubectl pkgs.busybox kubectlPod2 ];
+    contents = [ copyKubectl pkgs.busybox kubectlPod2 ];
    config.Entrypoint = ["/bin/sh"];
  };

--- a/nixos/tests/nano.nix
+++ b/nixos/tests/nano.nix
@ -1,44 +0,0 @@
-import ./make-test-python.nix ({ pkgs, ...} : {
-  name = "nano";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  machine = { lib, ... }: {
-    environment.systemPackages = [ pkgs.nano ];
-  };
-
-  testScript = { ... }: ''
-    start_all()
-
-    with subtest("Create user and log in"):
-        machine.wait_for_unit("multi-user.target")
-        machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
-        machine.succeed("useradd -m alice")
-        machine.succeed("(echo foobar; echo foobar) | passwd alice")
-        machine.wait_until_tty_matches(1, "login: ")
-        machine.send_chars("alice\n")
-        machine.wait_until_tty_matches(1, "login: alice")
-        machine.wait_until_succeeds("pgrep login")
-        machine.wait_until_tty_matches(1, "Password: ")
-        machine.send_chars("foobar\n")
-        machine.wait_until_succeeds("pgrep -u alice bash")
-        machine.screenshot("prompt")
-
-    with subtest("Use nano"):
-        machine.send_chars("nano /tmp/foo")
-        machine.send_key("ret")
-        machine.sleep(2)
-        machine.send_chars("42")
-        machine.sleep(1)
-        machine.send_key("ctrl-x")
-        machine.sleep(1)
-        machine.send_key("y")
-        machine.sleep(1)
-        machine.screenshot("nano")
-        machine.sleep(1)
-        machine.send_key("ret")
-        machine.wait_for_file("/tmp/foo")
-        assert "42" in machine.succeed("cat /tmp/foo")
-  '';
-})
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@ -868,7 +868,7 @@ let
        print(client.succeed("ip l add name foo type dummy"))
        print(client.succeed("stat /etc/systemd/network/50-foo.link"))
        client.succeed("udevadm settle")
-        assert "mtu 1442" in client.succeed("ip l show dummy0")
+        assert "mtu 1442" in client.succeed("ip l show dev foo")
      '';
    };
    wlanInterface = let
--- a/nixos/tests/podman/default.nix
+++ b/nixos/tests/podman/default.nix
@ -126,7 +126,7 @@ import ../make-test-python.nix (
          podman.succeed("docker network create default")
          podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
          podman.succeed(
-            "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
+            "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10"
          )
          podman.succeed("docker ps | grep sleeping")
          podman.succeed("podman ps | grep sleeping")
--- a/nixos/tests/podman/tls-ghostunnel.nix
+++ b/nixos/tests/podman/tls-ghostunnel.nix
@ -129,7 +129,7 @@ import ../make-test-python.nix (
          podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")

          client.succeed(
-            "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
+            "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10"
          )
          client.succeed("docker ps | grep sleeping")
          podman.succeed("docker ps | grep sleeping")
--- a/pkgs/applications/audio/goattracker/default.nix
+++ b/pkgs/applications/audio/goattracker/default.nix
@ -12,7 +12,6 @@ with lib;
 let
  pname = "goattracker" + optionalString isStereo "-stereo";
  desktopItem = makeDesktopItem {
-    type = "Application";
    name = pname;
    desktopName = "GoatTracker 2" + optionalString isStereo " Stereo";
    genericName = "Music Tracker";
@ -20,8 +19,8 @@ let
      then "gt2stereo"
      else "goattrk2";
    icon = "goattracker";
-    categories = "AudioVideo;AudioVideoEditing;";
-    extraEntries = "Keywords=tracker;music;";
+    categories = [ "AudioVideo" "AudioVideoEditing" ];
+    keywords = [ "tracker" "music" ];
  };

 in stdenv.mkDerivation rec {
--- a/pkgs/applications/audio/jamesdsp/default.nix
+++ b/pkgs/applications/audio/jamesdsp/default.nix
@ -38,19 +38,15 @@ mkDerivation rec{

  desktopItems = [
    (makeDesktopItem {
-      name = "jamesdsp.desktop";
+      name = "jamesdsp";
      desktopName = "JamesDSP";
      genericName = "Audio effects processor";
      exec = "jamesdsp";
      icon = "jamesdsp";
      comment = "JamesDSP for Linux";
-      categories = "AudioVideo;Audio";
+      categories = [ "AudioVideo" "Audio" ];
      startupNotify = false;
-      terminal = false;
-      type = "Application";
-      extraDesktopEntries = {
-        Keywords = "equalizer;audio;effect";
-      };
+      keywords = [ "equalizer" "audio" "effect" ];
    })
  ];

--- a/pkgs/applications/audio/lyrebird/default.nix
+++ b/pkgs/applications/audio/lyrebird/default.nix
@ -15,7 +15,7 @@ let
    icon = "${placeholder "out"}/share/lyrebird/icon.png";
    desktopName = "Lyrebird";
    genericName = "Voice Changer";
-    categories = "AudioVideo;Audio;";
+    categories = [ "AudioVideo" "Audio" ];
  };
 in
 python3Packages.buildPythonApplication rec {
--- a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix
+++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix
@ -11,7 +11,6 @@
 , wrapGAppsHook
 , fetchurl
 , fetchFromGitHub
-, makeDesktopItem
 }:
 rustPlatform.buildRustPackage rec {
  pname = "netease-cloud-music-gtk";
--- a/pkgs/applications/audio/roomeqwizard/default.nix
+++ b/pkgs/applications/audio/roomeqwizard/default.nix
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    icon = pname;
    desktopName = "REW";
    genericName = "Software for audio measurements";
-    categories = "AudioVideo;";
+    categories = [ "AudioVideo" ];
  };

  responseFile = writeTextFile {
--- a/pkgs/applications/audio/sony-headphones-client/default.nix
+++ b/pkgs/applications/audio/sony-headphones-client/default.nix
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
    icon = "SonyHeadphonesClient";
    desktopName = "Sony Headphones Client";
    comment     = "A client recreating the functionality of the Sony Headphones app";
-    categories  = "Audio;Mixer;";
+    categories  = [ "Audio" "Mixer" ];
  }) ];

  meta = with lib; {
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@ -36,13 +36,13 @@

 mkDerivation rec {
  pname = "strawberry";
-  version = "1.0.1";
+  version = "1.0.2";

  src = fetchFromGitHub {
    owner = "jonaski";
    repo = pname;
    rev = version;
-    sha256 = "sha256-MlS1ShRXfsTMs97MeExW6sfpv40OcQLDIzIzOYGk7Rw=";
+    sha256 = "sha256-/pwHWmQTV1QBK+5SS0/NC6wMm2QQm+iCZArxiHjn4M4=";
  };

  buildInputs = [
--- a/pkgs/applications/audio/tauon/default.nix
+++ b/pkgs/applications/audio/tauon/default.nix
@ -21,13 +21,13 @@

 stdenv.mkDerivation rec {
  pname = "tauon";
-  version = "7.1.1";
+  version = "7.1.2";

  src = fetchFromGitHub {
    owner = "Taiko2k";
    repo = "TauonMusicBox";
    rev = "v${version}";
-    sha256 = "sha256-eVliTSFTBG56mU1Crt3syoYxKclz/6W15y/30C+Tf1g=";
+    sha256 = "sha256-0/xWSae5TD5qI+HgoJ2DAHxqv/Z0E4DGiQhfTA03xkM=";
  };

  postPatch = ''
--- a/pkgs/applications/audio/vgmstream/default.nix
+++ b/pkgs/applications/audio/vgmstream/default.nix
@ -1,26 +1,35 @@
 { stdenv, lib, fetchFromGitHub, cmake, pkg-config
-, mpg123, ffmpeg, libvorbis, libao, jansson
+, mpg123, ffmpeg, libvorbis, libao, jansson, speex
 }:
+let
+  vgmstreamVersion = "r1702-5596-00bdb165b";
+in
 stdenv.mkDerivation rec {
-  pname   = "vgmstream";
-  version = "r1050-3448-g77cc431b";
+  pname = "vgmstream";
+  version = "unstable-2022-02-21";

  src = fetchFromGitHub {
-    owner  = "vgmstream";
-    repo   = "vgmstream";
-    rev    = version;
-    sha256 = "030q02c9li14by7vm00gn6v3m4dxxmfwiy9iyz3xsgzq1i7pqc1d";
+    owner = "vgmstream";
+    repo = "vgmstream";
+    rev = "00bdb165ba6b55420bbd5b21f54c4f7a825d15a0";
+    sha256 = "18g1yqlnf48hi2xn2z2wajnjljpdbfdqmcmi7y8hi1r964ypmfcr";
  };

+  passthru.updateScript = ./update.sh;
+
  nativeBuildInputs = [ cmake pkg-config ];

-  buildInputs = [ mpg123 ffmpeg libvorbis libao jansson ];
+  buildInputs = [ mpg123 ffmpeg libvorbis libao jansson speex ];

-  # There's no nice way to build the audacious plugin without a circular dependency
-  cmakeFlags = [ "-DBUILD_AUDACIOUS=OFF" ];
+  cmakeFlags = [
+    # There's no nice way to build the audacious plugin without a circular dependency
+    "-DBUILD_AUDACIOUS=OFF"
+    # It always tries to download it, no option to use the system one
+    "-DUSE_CELT=OFF"
+  ];

-  preConfigure = ''
-    echo "#define VERSION \"${version}\"" > cli/version.h
+  postConfigure = ''
+    echo "#define VGMSTREAM_VERSION \"${vgmstreamVersion}\"" > ../version.h
  '';

  meta = with lib; {
--- a/pkgs/applications/audio/vgmstream/update.sh
+++ b/pkgs/applications/audio/vgmstream/update.sh
@ -0,0 +1,77 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p gnused jq nix-prefetch-git curl cacert
+
+set -euo pipefail
+
+ROOT="$(dirname "$(readlink -f "$0")")"
+if [[ ! "$(basename $ROOT)" == "vgmstream" || ! -f "$ROOT/default.nix" ]]; then
+    echo "ERROR: Not in the vgmstream folder"
+    exit 1
+fi
+
+if [[ ! -v GITHUB_TOKEN ]]; then
+    echo "ERROR: \$GITHUB_TOKEN not set"
+    exit 1
+fi
+
+
+payload=$(jq -cn --rawfile query /dev/stdin '{"query": $query}' <<EOF | curl -s -H "Authorization: bearer $GITHUB_TOKEN" -d '@-' https://api.github.com/graphql
+{
+  repository(owner: "vgmstream", name: "vgmstream") {
+    branch: ref(qualifiedName: "refs/heads/master") {
+      target {
+        oid
+        ... on Commit {
+          committedDate
+          history {
+            totalCount
+          }
+        }
+      }
+    }
+
+    tag: refs(refPrefix: "refs/tags/", first: 1, orderBy: {field: TAG_COMMIT_DATE, direction: DESC}) {
+      nodes {
+        name
+      }
+    }
+  }
+}
+EOF
+)
+
+committed_full_date=$(jq -r .data.repository.branch.target.committedDate <<< "$payload")
+committed_date=$(sed -nE 's/^([0-9]{4}-[0-9]{2}-[0-9]{2}).+$/\1/p' <<< $committed_full_date)
+commit_unix=$(date --utc --date="$committed_date" +%s)
+last_updated_unix=$(date --utc --date=$(sed -nE 's/^\s*version\s*=\s*\"unstable-([0-9]{4}-[0-9]{2}-[0-9]{2})\";$/\1/p' default.nix) +%s)
+
+commit_sha=$(jq -r .data.repository.branch.target.oid <<< "$payload")
+major_ver=$(jq -r .data.repository.tag.nodes[0].name <<< "$payload" | sed 's/^v//g')
+commit_count=$(jq -r .data.repository.branch.target.history.totalCount <<< "$payload")
+final_ver="$major_ver-$commit_count-${commit_sha::9}"
+
+
+echo "INFO: Latest commit is $commit_sha"
+echo "INFO: Latest commit date is $committed_full_date"
+echo "INFO: Latest version is $final_ver"
+
+##
+# VGMStream has no stable releases, so only update if there's been at
+# least a week between commits to reduce maintainer pressure.
+##
+time_diff=$(( $commit_unix - $last_updated_unix ))
+if [[ $time_diff -lt 604800 ]]; then
+  echo "INFO: Not updating, less than a week between commits."
+  echo "INFO: $time_diff < 604800"
+  exit 0
+fi
+
+nix_sha256=$(nix-prefetch-git --quiet https://github.com/vgmstream/vgmstream.git "$commit_sha" | jq -r .sha256)
+echo "INFO: SHA256 is $nix_sha256"
+
+sed -i -E \
+    -e "s/vgmstreamVersion\s*=\s*\"[a-z0-9-]+\";$/vgmstreamVersion = \"${final_ver}\";/g" \
+    -e "s/version\s*=\s*\"[a-z0-9-]+\";$/version = \"unstable-${committed_date}\";/g" \
+    -e "s/rev\s*=\s*\"[a-z0-9]+\";$/rev = \"${commit_sha}\";/g" \
+    -e "s/sha256\s*=\s*\"[a-z0-9]+\";$/sha256 = \"${nix_sha256}\";/g" \
+    "$ROOT/default.nix"
--- a/pkgs/applications/blockchains/bisq-desktop/default.nix
+++ b/pkgs/applications/blockchains/bisq-desktop/default.nix
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
      icon = "bisq";
      desktopName = "Bisq ${version}";
      genericName = "Decentralized bitcoin exchange";
-      categories = "Network;P2P;";
+      categories = [ "Network" "P2P" ];
    })
  ];

--- a/pkgs/applications/blockchains/crypto-org-wallet/default.nix
+++ b/pkgs/applications/blockchains/crypto-org-wallet/default.nix
@ -1,4 +1,4 @@
-{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }:
+{ lib, fetchurl, appimageTools, imagemagick }:

 let
  pname = "chain-desktop-wallet";
--- a/pkgs/applications/blockchains/exodus/default.nix
+++ b/pkgs/applications/blockchains/exodus/default.nix
@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }:

 stdenv.mkDerivation rec {
  pname = "exodus";
-  version = "21.12.3";
+  version = "22.2.11";

  src = fetchurl {
    url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
-    sha256 = "sha256-8Jgg9OxptkhD1SBjVBoklHQVCUOO+EePWnyEajqlivE=";
+    sha256 = "sha256-/K5dB5Qfaiv68YWTQ4j5QnqSo+TXPkWcQ+PlJpzDoe8=";
  };

  sourceRoot = ".";
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
    icon = "monero";
    desktopName = "Monero";
    genericName = "Wallet";
-    categories  = "Network;Utility;";
+    categories  = [ "Network" "Utility" ];
  };

  postInstall = ''
--- a/pkgs/applications/blockchains/mycrypto/default.nix
+++ b/pkgs/applications/blockchains/mycrypto/default.nix
@ -23,7 +23,7 @@ let
    comment = "MyCrypto is a free, open-source interface for interacting with the blockchain";
    exec = pname;
    icon = "mycrypto";
-    categories = "Finance;";
+    categories = [ "Finance" ];
  };

 in appimageTools.wrapType2 rec {
--- a/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/pkgs/applications/blockchains/wasabiwallet/default.nix
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
    desktopName = "Wasabi";
    genericName = "Bitcoin wallet";
    comment = meta.description;
-    categories = "Network;Utility;";
+    categories = [ "Network" "Utility" ];
  };

  installPhase = ''
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@ -164,9 +164,9 @@ let
    icon = drvName;
    desktopName = "Android Studio (${channel} channel)";
    comment = "The official Android IDE";
-    categories = "Development;IDE;";
-    startupNotify = "true";
-    extraEntries="StartupWMClass=jetbrains-studio";
+    categories = [ "Development" "IDE" ];
+    startupNotify = true;
+    startupWMClass = "jetbrains-studio";
  };

  # Android Studio downloads prebuilt binaries as part of the SDK. These tools
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
    comment = "Integrated Development Environment";
    desktopName = "Eclipse IDE";
    genericName = "Integrated Development Environment";
-    categories = "Development;";
+    categories = [ "Development" ];
  };

  buildInputs = [
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@ -2043,10 +2043,10 @@
      elpaBuild {
        pname = "isearch-mb";
        ename = "isearch-mb";
-        version = "0.3";
+        version = "0.4";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/isearch-mb-0.3.tar";
-          sha256 = "01yq1skc6rm9yp80vz2fhh9lbkdb9nhf57h424mrkycdky2w50mx";
+          url = "https://elpa.gnu.org/packages/isearch-mb-0.4.tar";
+          sha256 = "11q9sdi6l795hspi7hr621bbra66pxsgrkry95k7wxjkmibcbsxr";
        };
        packageRequires = [ emacs ];
        meta = {
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@ -3231,8 +3231,8 @@
    20200914,
    644
   ],
-   "commit": "56de2d51cfbdee8d67091a4f168022028c0b3f1f",
-   "sha256": "0n3nf45p30347sj4hhcgqf75pcpfgccjhqwrvz0dhhzmgg614bkv"
+   "commit": "90c30a8e8d37b606decfabf7b52d37022ea5b3a6",
+   "sha256": "1vxx4h33dx14hrpgch7xk7y83cdxj6vamma2hanzjgwjq7wvdck3"
  },
  "stable": {
   "version": [
@ -7577,26 +7577,26 @@
  "repo": "Artawower/blamer.el",
  "unstable": {
   "version": [
-    20220219,
-    1634
+    20220224,
+    1940
   ],
   "deps": [
    "a"
   ],
-   "commit": "34082bcf54f5a920ac710394b1fdea2f653b9662",
-   "sha256": "0mph3k0zpi06w3ars7vvh434vz0mpk0nridpc4mvjnii1bslgpkc"
+   "commit": "45d04ac3935ade2b1e856115c69a32f11e3e7585",
+   "sha256": "0f2b3i22xl0j8j6b3i5vbfqfn1irylslwk4xvm3w0sk2pghi93y2"
  },
  "stable": {
   "version": [
    0,
    4,
-    1
+    2
   ],
   "deps": [
    "a"
   ],
-   "commit": "f28be75c0d141aa82e3a51818a5ca8543c6bc542",
-   "sha256": "17rz7wcvv0nrvqqj0f27q391pi5dmqly8srh6bcb921w8jzp69hc"
+   "commit": "45d04ac3935ade2b1e856115c69a32f11e3e7585",
+   "sha256": "0f2b3i22xl0j8j6b3i5vbfqfn1irylslwk4xvm3w0sk2pghi93y2"
  }
 },
 {
@ -9875,11 +9875,11 @@
  "repo": "minad/cape",
  "unstable": {
   "version": [
-    20220214,
-    1115
+    20220225,
+    1627
   ],
-   "commit": "e5e11f30f0b6ed0a2b283d5d3dec84bcd36557fc",
-   "sha256": "0qxypl6ghr31idgn2mvwgjkp1fhjlhwjldnqim4l658yxivh2jyz"
+   "commit": "2ad8edf9d992034b6e1e46315d72801b9e3aa1e5",
+   "sha256": "01kshih48hvwdn5gyif5z2vqyhx8h12zs6ygkmqyif5lzm4sqmdc"
  },
  "stable": {
   "version": [
@ -10590,8 +10590,8 @@
    20171115,
    2108
   ],
-   "commit": "0c12039822e47505cb16325367ae80ab4740c15f",
-   "sha256": "1m9cs36va0i4s9m428s5721ndrjpsqjyhg9wfigmv4414mhzhjxb"
+   "commit": "64122d4a77d76689558412b55962cab60524c67c",
+   "sha256": "1a80pfhys8ja1nh32d3xqab0f7f1k3k5mzsvscnivk90cmsrakhb"
  },
  "stable": {
   "version": [
@ -11253,8 +11253,8 @@
    "seq",
    "ts"
   ],
-   "commit": "9ef3337c5a68caf73866a6949bb5783d7e246979",
-   "sha256": "0jd9bcf1qjz9hd9qpajx7xls5h8czadwvcahfdwiy8hqhl09vgii"
+   "commit": "7cf2c86afd8f6fb6235320ac9f7ebd76153d8bc6",
+   "sha256": "1gw69ps98bc28kwfqi6m9v4im71jla410ici5cyhfyk67m3dvgbb"
  },
  "stable": {
   "version": [
@ -11298,14 +11298,14 @@
  "url": "https://tildegit.org/contrapunctus/chronometrist.git",
  "unstable": {
   "version": [
-    20220224,
-    1017
+    20220225,
+    950
   ],
   "deps": [
    "chronometrist"
   ],
-   "commit": "9ef3337c5a68caf73866a6949bb5783d7e246979",
-   "sha256": "0jd9bcf1qjz9hd9qpajx7xls5h8czadwvcahfdwiy8hqhl09vgii"
+   "commit": "7cf2c86afd8f6fb6235320ac9f7ebd76153d8bc6",
+   "sha256": "1gw69ps98bc28kwfqi6m9v4im71jla410ici5cyhfyk67m3dvgbb"
  },
  "stable": {
   "version": [
@ -11335,8 +11335,8 @@
    "chronometrist",
    "spark"
   ],
-   "commit": "9ef3337c5a68caf73866a6949bb5783d7e246979",
-   "sha256": "0jd9bcf1qjz9hd9qpajx7xls5h8czadwvcahfdwiy8hqhl09vgii"
+   "commit": "7cf2c86afd8f6fb6235320ac9f7ebd76153d8bc6",
+   "sha256": "1gw69ps98bc28kwfqi6m9v4im71jla410ici5cyhfyk67m3dvgbb"
  },
  "stable": {
   "version": [
@ -12798,8 +12798,8 @@
    20210104,
    1831
   ],
-   "commit": "dd9edd99a462ba0cb45e923e683a828fc440fe96",
-   "sha256": "1l4vx7slcdy5ymsah403hd3rl78ilyaqdgwrxfd0iay17qq0xn3b"
+   "commit": "0883ab385a8d15075cab99a265a20131a37b506d",
+   "sha256": "08rhvnhs8ijcsnlvbh40s64zxksjmwjlskv0rxpv1n70jky46fxi"
  },
  "stable": {
   "version": [
@ -16236,15 +16236,15 @@
  "repo": "OlMon/consult-projectile",
  "unstable": {
   "version": [
-    20211018,
-    1718
+    20220225,
+    1544
   ],
   "deps": [
    "consult",
    "projectile"
   ],
-   "commit": "29a7e54dbeb8e5d5e07c0546e60f6a7a6b79bbb8",
-   "sha256": "1n4hv4yb0pysbcv4rb3xw3550jzz6msi91ghxmvl7nf7shvd9gg7"
+   "commit": "758cfc259ae83421d008731642ff1ada41b7b514",
+   "sha256": "0fsqz88xplbkr6hl8zwmg65s3d8jjfnvf2bdfv795i0n8lsprl3c"
  }
 },
 {
@ -18584,8 +18584,8 @@
    20211111,
    1407
   ],
-   "commit": "76e888e267f177126799c3b1981d62bc73204415",
-   "sha256": "06jv78f360j7krgh4s2dbvbs46m1g19szmf43yaqq7q7shwl45l6"
+   "commit": "b7ff8224f56af256245d691af589ab10126126d3",
+   "sha256": "1irhh1320zr19z8i6vphhmga3zymqi6xmnzl4a8ciqwyw2p3hc57"
  },
  "stable": {
   "version": [
@ -22498,8 +22498,8 @@
  "repo": "Silex/docker.el",
  "unstable": {
   "version": [
-    20220222,
-    1711
+    20220225,
+    1528
   ],
   "deps": [
    "aio",
@ -22510,8 +22510,8 @@
    "tablist",
    "transient"
   ],
-   "commit": "78881bea51c74ef171788fa989908cd51f5b3f8d",
-   "sha256": "0wgdabjkcwi9a3615imny8xysbrydnlcz9rmkavp22kypk6ydcjw"
+   "commit": "498ffb2ba51fce12cb543caca0ecbc62782620d3",
+   "sha256": "1ixzi9lsjra01srvkd30jvryhbgxl9s49mspy2f6975zna390m60"
  },
  "stable": {
   "version": [
@ -23613,8 +23613,8 @@
    20210909,
    1010
   ],
-   "commit": "11b6c5f25ef440628334d1e0fce4a7b6d6baa105",
-   "sha256": "16bjlxfw0pbms7cpg9gln0cnm9jm2mybcwm18dqvl6lyj896pa12"
+   "commit": "c967d8a4880732f2f7cba39d4f283154c5ef914e",
+   "sha256": "079xxy2569zrfy2r621bb25gw99dlmwmys60qyrxvn01mb9ah9ql"
  },
  "stable": {
   "version": [
@ -29541,8 +29541,8 @@
    20200914,
    644
   ],
-   "commit": "56de2d51cfbdee8d67091a4f168022028c0b3f1f",
-   "sha256": "0n3nf45p30347sj4hhcgqf75pcpfgccjhqwrvz0dhhzmgg614bkv"
+   "commit": "90c30a8e8d37b606decfabf7b52d37022ea5b3a6",
+   "sha256": "1vxx4h33dx14hrpgch7xk7y83cdxj6vamma2hanzjgwjq7wvdck3"
  },
  "stable": {
   "version": [
@ -29566,8 +29566,8 @@
    20220215,
    1844
   ],
-   "commit": "c4f24d6718ac56c431f0fccf240c5b15482792ed",
-   "sha256": "1b6vv11im8zv1sddp2a2qa2z00lkv6pzd3b6kmxlvcrlkfhc28md"
+   "commit": "b5f0062fc16549b5836f58105e88c7a458e78470",
+   "sha256": "1r7sb4m2whfs7fnfihf7i10484vzd26ljvfx2j6wll0zmd842avs"
  },
  "stable": {
   "version": [
@ -30291,8 +30291,8 @@
    20211005,
    221
   ],
-   "commit": "636bf8d8797bdd58f1b543c9d3f4910e3ce879ab",
-   "sha256": "02hjm685fl4f33s5fi8nc088wwfzhyy6abx5g4i93b2dx3hr2lyi"
+   "commit": "0435d8e2864bb4f1be59ae548d0068c69fa31c7a",
+   "sha256": "1ggp122b0a93ji2khxg8kvklwvjxx4a45hayln725d5nsmf82wy6"
  },
  "stable": {
   "version": [
@ -30477,11 +30477,11 @@
  "repo": "emacs-ess/ESS",
  "unstable": {
   "version": [
-    20220213,
-    1912
+    20220225,
+    1523
   ],
-   "commit": "399f952c4bc1cbe17ce46b6800fc469ed0c6a25e",
-   "sha256": "01qwcjj90zdgz061nsqxralv9z6l20k0sahznhling9xnalymfjr"
+   "commit": "39eba283000a7b0220303d7c5a4f3ee05efc1e9c",
+   "sha256": "1avzxbdj2ghzv94mjmikqdb6za4dxkby2pnyrz0519fs4sc17a06"
  },
  "stable": {
   "version": [
@ -40258,8 +40258,8 @@
  "repo": "magit/forge",
  "unstable": {
   "version": [
-    20220219,
-    1546
+    20220225,
+    1417
   ],
   "deps": [
    "closql",
@ -40272,8 +40272,8 @@
    "transient",
    "yaml"
   ],
-   "commit": "e3357860886ea9c930f552afb1ec3cd60467aeb9",
-   "sha256": "1ndk9szl49szbaafvn1khb5s4s8i9qprcqkl77qqp3rsns5nxn2r"
+   "commit": "0f436173d1660321edac761e3e82c40e97709f63",
+   "sha256": "03iwng2l5gj3mhk8jw72wzz5iji4c0m5p59f2igbiqm79xrxghys"
  },
  "stable": {
   "version": [
@ -40479,8 +40479,8 @@
   "deps": [
    "seq"
   ],
-   "commit": "63f29cbd66b9a3d2ff11ff99b36d4d095638d084",
-   "sha256": "16pawv0i8pgy3cjrgi6a7fv8jm272l1c9cl0zsx95bhlblwdfy6v"
+   "commit": "96dd298a2ee2f62739e4a11281daadd90352df70",
+   "sha256": "0amxqi4jvc0sr5i6pk72ricjwdc0v0lr0q34vccsab2l8iiwid89"
  },
  "stable": {
   "version": [
@ -42862,8 +42862,8 @@
    "transient",
    "with-editor"
   ],
-   "commit": "52131989f356ecd397d64634266bae7cb3db18b9",
-   "sha256": "06963skbn719vah43v114r0v23m0zwrw155d02014cnhib27pf9q"
+   "commit": "44c58868c997f0b86d66faeed2f0b29064f8d0b9",
+   "sha256": "0yd5h61ykl1kmcla1z71kwi0yikax817da77fxz29l6mv85dlsfm"
  },
  "stable": {
   "version": [
@ -47793,15 +47793,15 @@
  "repo": "emacs-helm/helm",
  "unstable": {
   "version": [
-    20220224,
-    1254
+    20220225,
+    727
   ],
   "deps": [
    "helm-core",
    "popup"
   ],
-   "commit": "57a54ad97e46b0eee8a7aac96cb27b30b84f400c",
-   "sha256": "0kqjxc4cml4w87ndkj2hl9fcwfd178g4qsl769dzkbz795yf619l"
+   "commit": "fbe5eb03255c18466162253c60db7b6ca50f32b4",
+   "sha256": "11n5rwcw4ky96na3gbfxcdwcp0x4dnrqadpgzkcz2pv8s5ih8g1y"
  },
  "stable": {
   "version": [
@ -48706,8 +48706,8 @@
   "deps": [
    "async"
   ],
-   "commit": "57a54ad97e46b0eee8a7aac96cb27b30b84f400c",
-   "sha256": "0kqjxc4cml4w87ndkj2hl9fcwfd178g4qsl769dzkbz795yf619l"
+   "commit": "fbe5eb03255c18466162253c60db7b6ca50f32b4",
+   "sha256": "11n5rwcw4ky96na3gbfxcdwcp0x4dnrqadpgzkcz2pv8s5ih8g1y"
  },
  "stable": {
   "version": [
@ -53948,8 +53948,8 @@
   "deps": [
    "dash"
   ],
-   "commit": "2b826735bb8d3bcfced489a1e0fa21b10fbc967e",
-   "sha256": "1ihpwl8rlpxmalpccnkd3xk6ngd4gxz29gjyyhka7p825as5nywm"
+   "commit": "4ca0638a14a8b304ac2b46e7b342b8d8732ad199",
+   "sha256": "1d0wi5dm3qri9b502nrbcra3b3gmikbqdbyzk87fccb4gf9k500v"
  },
  "stable": {
   "version": [
@ -60280,14 +60280,14 @@
  "repo": "tpapp/julia-repl",
  "unstable": {
   "version": [
-    20211230,
-    814
+    20220225,
+    810
   ],
   "deps": [
    "s"
   ],
-   "commit": "e90b1ed2cc806262b0ee772dcc88f8da693d9210",
-   "sha256": "0jhfb2shz71kwfzmvlpzhldm2rms3wgwikrym2a2fr9hw91i2zy7"
+   "commit": "6c1d63511fb2b3b3f2e342eff6a375d78be6c12c",
+   "sha256": "07fl2bcl1drscp94gpy0v3n31rml8fffc7iv5v80qh8zwvn57d6h"
  },
  "stable": {
   "version": [
@ -61765,8 +61765,8 @@
    20210318,
    2106
   ],
-   "commit": "1c83cdf2c76d420317d2dfaec82130dae380b4de",
-   "sha256": "11mrpvrlv849nc7nmacs0041rxzzscrbcf1zgbk32rhl0yk1zgb2"
+   "commit": "2effe2ed03cebfd11746b1131eef3dd59205cfaf",
+   "sha256": "1m2bmblvwmlsprhwi92r9ihaddrbwas7fkhxi1cy87w9x4dvwjmq"
  },
  "stable": {
   "version": [
@ -63846,7 +63846,7 @@
    20220209,
    755
   ],
-   "commit": "9ae8990220f26d341d8e92c47bab014119ef2b9c",
+   "commit": "bc2ec448077a1aadf11ad5ca3b29aa86e1b29527",
   "sha256": "0si95v1rswilp0myarvkfd8d47864jplqfrzmy64zbicichkl81j"
  },
  "stable": {
@ -66765,8 +66765,8 @@
  "repo": "magit/magit",
  "unstable": {
   "version": [
-    20220224,
-    1244
+    20220225,
+    943
   ],
   "deps": [
    "dash",
@ -66775,8 +66775,8 @@
    "transient",
    "with-editor"
   ],
-   "commit": "52131989f356ecd397d64634266bae7cb3db18b9",
-   "sha256": "06963skbn719vah43v114r0v23m0zwrw155d02014cnhib27pf9q"
+   "commit": "44c58868c997f0b86d66faeed2f0b29064f8d0b9",
+   "sha256": "0yd5h61ykl1kmcla1z71kwi0yikax817da77fxz29l6mv85dlsfm"
  },
  "stable": {
   "version": [
@ -67141,8 +67141,8 @@
    "libgit",
    "magit"
   ],
-   "commit": "52131989f356ecd397d64634266bae7cb3db18b9",
-   "sha256": "06963skbn719vah43v114r0v23m0zwrw155d02014cnhib27pf9q"
+   "commit": "44c58868c997f0b86d66faeed2f0b29064f8d0b9",
+   "sha256": "0yd5h61ykl1kmcla1z71kwi0yikax817da77fxz29l6mv85dlsfm"
  },
  "stable": {
   "version": [
@ -67296,8 +67296,8 @@
   "deps": [
    "dash"
   ],
-   "commit": "52131989f356ecd397d64634266bae7cb3db18b9",
-   "sha256": "06963skbn719vah43v114r0v23m0zwrw155d02014cnhib27pf9q"
+   "commit": "44c58868c997f0b86d66faeed2f0b29064f8d0b9",
+   "sha256": "0yd5h61ykl1kmcla1z71kwi0yikax817da77fxz29l6mv85dlsfm"
  },
  "stable": {
   "version": [
@ -69109,8 +69109,8 @@
    20220218,
    2024
   ],
-   "commit": "2a822b78e0483f2f32995c72870a16e43d3f0c92",
-   "sha256": "1cljyk7b56idr0qh23sy6spfqws33mq3m4hwnsk8rj5qi0pr6pbn"
+   "commit": "7d3139c9f55ba85c00e5f5b1a396be98fea1762a",
+   "sha256": "1brw32ghmk0l98wk0n34v8as0g816n87f8drq794y8hkx8iiw6lz"
  },
  "stable": {
   "version": [
@ -70678,11 +70678,11 @@
  "repo": "protesilaos/modus-themes",
  "unstable": {
   "version": [
-    20220223,
-    1656
+    20220225,
+    1429
   ],
-   "commit": "7773a4ec72d346d6cf4123b574c74507a3dab97f",
-   "sha256": "14sik5hf3k2p4p6h2qrr5cknfzmksxyhng4xb2fg2cxdvxw7s1aa"
+   "commit": "b8b26b1e3c63e9cccd3b5fa68e5895ed2662f042",
+   "sha256": "0dppwx7rn4c7b30j34763qsx8wwgfcig6j1l6vq5m3ms239qlv9q"
  },
  "stable": {
   "version": [
@ -71313,8 +71313,8 @@
    20210306,
    1053
   ],
-   "commit": "0dcb977536385e18f88e29b3ae42b07fd5f5f433",
-   "sha256": "0h669a5n1jv3i2hiadv06ymsxqv72vfj4g6qm2z3lh1c3yzv7pkl"
+   "commit": "063c41f1d7c1a877f44c1f8caad6be1897350336",
+   "sha256": "0wqkprcg7p5c92lm614sb4l3viy9m526fxr28mshvws2wyn6072l"
  },
  "stable": {
   "version": [
@ -71830,14 +71830,14 @@
  "url": "https://repo.or.cz/mu4e-marker-icons.git",
  "unstable": {
   "version": [
-    20220210,
-    1405
+    20220225,
+    1137
   ],
   "deps": [
    "all-the-icons"
   ],
-   "commit": "35ca0c9bd0d1512eed943f704ffc73ed97cca454",
-   "sha256": "1x7vkc7bagnk8xan0ylckj8wfxpqk2r4ij64vy9p0z0rgyrvj56v"
+   "commit": "66674ee00dbf953e7d8c1696fb12e9b5b4b272bd",
+   "sha256": "0pswfq8apihjglysphq3g4la39hyhrms0g010rp691m2mgg1lp39"
  }
 },
 {
@ -74422,11 +74422,11 @@
  "url": "https://git.notmuchmail.org/git/notmuch",
  "unstable": {
   "version": [
-    20220216,
-    1156
+    20220225,
+    1239
   ],
-   "commit": "08da7f25e5ebf6536002c9a544d687a1d28aea3e",
-   "sha256": "1vhvhffbghdmgd9w6bcrpxjblpwjgnyg1vd5j62hff03qmjxqdlj"
+   "commit": "d298af9e9d75f076d767044738b4811a82f9b2ca",
+   "sha256": "1yximnzcv4j4fxjiw4mk7qpqmn8ix49kfyh2jfx858c1nbvbhkrl"
  },
  "stable": {
   "version": [
@ -75760,8 +75760,8 @@
    20200320,
    1504
   ],
-   "commit": "cca09b64eff689d8bb15a77de9d4c7fe9845a1f9",
-   "sha256": "1wwmf14df2rnxlfs8bwb9p4q1a1plschbq2g9vqflphj6kv213m4"
+   "commit": "b4ce25699e3ebff054f523375d1cf5a17bd0dbaf",
+   "sha256": "0fhj3241gpj6qj2sawr8pgyn5b7320vjfb7idsy23kh4jvmj2wb8"
  }
 },
 {
@ -76394,8 +76394,8 @@
    20210923,
    1348
   ],
-   "commit": "144f0a634c198c945d562162f77a8a5a1dd9588d",
-   "sha256": "1yss153hfcn3rrpn46rayrhi6gy3f0c9bm3im7hxg1fly1qxylwz"
+   "commit": "1ce35b98ff6d76947c648b96ff41ff3b8a9f1234",
+   "sha256": "19xjj762l6yirqxvjn4gcvxrarbrjrdp88r6x576qzsqppsm5dsk"
  },
  "stable": {
   "version": [
@ -78870,16 +78870,16 @@
  "repo": "ahungry/org-jira",
  "unstable": {
   "version": [
-    20220129,
-    2049
+    20220225,
+    158
   ],
   "deps": [
    "cl-lib",
    "dash",
    "request"
   ],
-   "commit": "f424364605b21e5f1686f8ce2645afe543538684",
-   "sha256": "1646hr3mmg0ppa4xx9gjc1zkdryfs2m0j39cjhrfxcn05gsykklh"
+   "commit": "96e92585ed6f510f87363be3cb10d804f67e1b52",
+   "sha256": "1n1h3xby4998hdv6j4gllznzbhh4gl2wr9bm4235n859zypq9b4l"
  },
  "stable": {
   "version": [
@ -80346,8 +80346,8 @@
  "repo": "org-roam/org-roam",
  "unstable": {
   "version": [
-    20220221,
-    51
+    20220224,
+    1711
   ],
   "deps": [
    "dash",
@ -80356,8 +80356,8 @@
    "magit-section",
    "org"
   ],
-   "commit": "cebe77135a327cacf7fa60265b553c984664e32a",
-   "sha256": "1z7yyjggdjvs5nc3988pflmis9v51rsba32crms2rfh07vwpn349"
+   "commit": "c8a360afdd96a99c14de1bd22f5f9cd16f2580a6",
+   "sha256": "1cj3xwny146f3likhcpxwkvyxflyq6z750m6ig5jjrgyq89gqrfy"
  },
  "stable": {
   "version": [
@ -81707,8 +81707,8 @@
    "dash",
    "s"
   ],
-   "commit": "a228ebcf408de7096e5cd3a62b14087432e0afb1",
-   "sha256": "146xp2jsk7a973g0dn8in1sad6lp1ks7s5ma6jld4h26anprvj1g"
+   "commit": "32f6cfc7265cf24ebb5361264e8c1b61a07e74df",
+   "sha256": "0dja2mwzzrn64c2qxvf325x88bwch7s29qhpv6jb4rn1143d4qyf"
  },
  "stable": {
   "version": [
@ -82967,14 +82967,14 @@
  "repo": "kaushalmodi/ox-hugo",
  "unstable": {
   "version": [
-    20220223,
-    2135
+    20220225,
+    358
   ],
   "deps": [
    "org"
   ],
-   "commit": "616c31aba3122801f36e180f2908be4f9f01b1af",
-   "sha256": "1qxrw66kgjhpyycbvv04jphddmjirpg1gsdlc14djw75ycvn1m1x"
+   "commit": "8503350603c10d1e264f5599ae288fd71725919f",
+   "sha256": "1a5idw9p83m3jnf8s3f0lg28pw5059n05q1m4j5d92wajxlxf2wv"
  },
  "stable": {
   "version": [
@ -86937,15 +86937,15 @@
  "repo": "arifer612/pippel",
  "unstable": {
   "version": [
-    20211205,
-    1711
+    20220225,
+    1128
   ],
   "deps": [
    "dash",
    "s"
   ],
-   "commit": "1e96053ffdcbf64e4c8a0a622feddc3cb0a82ded",
-   "sha256": "00rnzy7r397k6dwsflnv5lc7x5hcnkr4g784zj3bs8rq64h7dcz0"
+   "commit": "682a40af266f395cf39862ad0bfb30152ddee204",
+   "sha256": "1gb7nf047gm57jdggj49ri46hgz8gphqy58abniqlqxjcx9zp4z7"
  }
 },
 {
@ -88145,11 +88145,11 @@
  "repo": "polymode/polymode",
  "unstable": {
   "version": [
-    20220125,
-    1433
+    20220225,
+    1521
   ],
-   "commit": "f2a2b9772722aaadf13bd4d35652637b495952d4",
-   "sha256": "1n6jj3lz72kh2kqp53fx7h2ggbh6c4s96v6cyhwjs4sls40xrbjl"
+   "commit": "8ba56f841cbbee102e4fd00dff0f88646907bd09",
+   "sha256": "0vz52wagbpjg3c2br3cl9zhciq74c1is81crkrxbcdwsms1bwhiw"
  },
  "stable": {
   "version": [
@ -90131,8 +90131,8 @@
    20211013,
    1726
   ],
-   "commit": "a112c4ab9642b13b648b19d3a416cfcf9994f3fd",
-   "sha256": "0id5xkma582k4ralcqfmfvpbij6l98s0dq4xnm9cl2vvwfp39i8v"
+   "commit": "6a77c9bab4bd3c8e10096694469b203bc211246f",
+   "sha256": "1zi75h0a22yzjb8d408lgika9s9h10z899nxc45dr77xqpfcfww1"
  },
  "stable": {
   "version": [
@ -91222,8 +91222,8 @@
    20210411,
    1931
   ],
-   "commit": "6622d101ab09a23a8529ce01aea285d636235a76",
-   "sha256": "1c6zw8rsh2v785ycr671nl2q93j920q5il0mfaclgzjppwyv5h4q"
+   "commit": "b4264112ec10186d5465f7d6af9b2ab91a236216",
+   "sha256": "0pgzcx8bp6yilsh16zzz51fdykxh1197vcjb9d0sz2bd6267r7qy"
  },
  "stable": {
   "version": [
@ -96527,8 +96527,8 @@
    20200830,
    301
   ],
-   "commit": "3c87699570bd3377414830f5a9aba6e92d583335",
-   "sha256": "0kl4ib4hi55r82bh0dfqh67h51x31z3lql0pqyck7h9ghrrrn41w"
+   "commit": "fb10c5dbf43e51e03c7dfb582522640e0e3bff5a",
+   "sha256": "1absjrxh6zlsr9dzf6k18byal9vlf088df6kl1h5839p6w8640by"
  }
 },
 {
@ -99564,15 +99564,15 @@
  "repo": "slime/slime",
  "unstable": {
   "version": [
-    20220217,
-    1145
+    20220224,
+    2352
   ],
   "deps": [
    "cl-lib",
    "macrostep"
   ],
-   "commit": "33d9f46a48809fab77fc0aef209196d99be4df0c",
-   "sha256": "0mxznpp521nlc2n49f05gwxcjcgq3ssmvsvsrzsr8abipdi5zkni"
+   "commit": "180dea856b1026fff1546eedf992a0ec0f103613",
+   "sha256": "1ngmnx2hms9d5mjcv9rha9y48h0dayj7j9x38wqv4njcj4vmc7b4"
  },
  "stable": {
   "version": [
@ -101730,11 +101730,11 @@
  "repo": "condy0919/spdx.el",
  "unstable": {
   "version": [
-    20220207,
-    54
+    20220225,
+    102
   ],
-   "commit": "cc331a92f5e81613796110a529b3f9fb511dda87",
-   "sha256": "1z4nyax8glnvax7fj05p2mgwy9g1gbs4n0lqghc4a6ih0cm314nk"
+   "commit": "fba53cc8d05d768dc7835b06d0fb857d7f13d5ea",
+   "sha256": "1lmf3zmwain0y6psmdazbbh240p64a4p6cwlj55sngbnzqidf7h1"
  }
 },
 {
@ -103497,8 +103497,8 @@
  "repo": "Wilfred/suggest.el",
  "unstable": {
   "version": [
-    20180916,
-    1859
+    20190807,
+    851
   ],
   "deps": [
    "dash",
@ -103507,8 +103507,8 @@
    "s",
    "spinner"
   ],
-   "commit": "83a2679baf661ee834e9e75921fd546243a6d919",
-   "sha256": "11jqglwqi5q14rk44z02dffk6cqmhjgdda0y63095g8n1ll71jsb"
+   "commit": "7b1c7fd38cd9389e58f672bfe58d9e88aeb898c7",
+   "sha256": "04cabm1wn1cy78a47rhn1kh8vd6dclsr2js8plvldbgq2qfq7l4q"
  },
  "stable": {
   "version": [
@ -106406,8 +106406,8 @@
    20200212,
    1903
   ],
-   "commit": "7990e9639873363921cecf21b1966689da7d4bfc",
-   "sha256": "1nf8g1si37dpi9smxwnl3fg6bhw01qjp0hb94ymn2pn5wnq92az5"
+   "commit": "d0234924365d8edafc7a4f4d3c1ef2c88e1da375",
+   "sha256": "01xbpxlqws56mhcd1gaxq5w36kavjpwxradjd6vj4ay1cfi6c500"
  },
  "stable": {
   "version": [
@ -107192,8 +107192,8 @@
    20220223,
    557
   ],
-   "commit": "7303661244f3e63d763821281290751c3dc05b9c",
-   "sha256": "11bpvzyxvmkq2r71vlwli8kn3la1khlz0ifiq88ihx8azrgfmyzh"
+   "commit": "effbc9191a4cf562dbc71fe4460d093753be5c5d",
+   "sha256": "0idjhsagvsx5v590m78929jbi3bn9z2qiwcj0gjz3sg2rsxypwk7"
  },
  "stable": {
   "version": [
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@ -27,11 +27,9 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
    comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
    desktopName = product;
    genericName = meta.description;
-    categories = "Development;";
+    categories = [ "Development" ];
    icon = mainProgram;
-    extraEntries = ''
-      StartupWMClass=${wmClass}
-    '';
+    startupWMClass = wmClass;
  };

  vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts);
--- a/pkgs/applications/editors/kdevelop5/kdev-php.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix
@ -1,14 +1,12 @@
-{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }:
+{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }:

 stdenv.mkDerivation rec {
  pname = "kdev-php";
  version = "5.6.2";

-  src = fetchFromGitHub {
-    owner = "KDE";
-    repo = "kdev-php";
-    rev = "v${version}";
-    sha256 = "sha256-hEumH7M6yAuH+jPShOmbKjHmuPRg2djaVy9Xt28eK38=";
+  src = fetchurl {
+    url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz";
+    hash = "sha256-8Qg9rsK4x1LeGgRB0Pn3InSx4tKccjAF7Xjc+Lpxfgw=";
  };

  nativeBuildInputs = [ cmake extra-cmake-modules ];
--- a/pkgs/applications/editors/kdevelop5/kdev-python.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix
@ -1,14 +1,12 @@
-{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }:
+{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }:

 stdenv.mkDerivation rec {
  pname = "kdev-python";
  version = "5.6.2";

-  src = fetchFromGitHub {
-    owner = "KDE";
-    repo = "kdev-python";
-    rev = "v${version}";
-    sha256 = "sha256-xYElqpJjRtBRIyZGf6JaCvurQ+QrGrdLHxtuANYfCds=";
+  src = fetchurl {
+    url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz";
+    hash = "sha256-IPm3cblhJi3tmGpPMrjSWa2fe8SLsp6sCl1YU74dkX8=";
  };

  cmakeFlags = [
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ b/pkgs/applications/editors/kodestudio/default.nix
@ -39,7 +39,7 @@ in
      comment = "Kode Studio is an IDE for Kha based on Visual Studio Code";
      desktopName = "Kode Studio";
      genericName = "Text Editor";
-      categories = "GNOME;GTK;Utility;TextEditor;Development;";
+      categories = [ "GNOME" "GTK" "Utility" "TextEditor" "Development" ];
    };

    sourceRoot = ".";
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@ -24,11 +24,9 @@ mkDerivation rec {
    comment = meta.description;
    desktopName = "Leo";
    genericName = "Text Editor";
-    categories = lib.concatStringsSep ";" [
-      "Application" "Development" "IDE"
-    ];
-    startupNotify = "false";
-    mimeType = lib.concatStringsSep ";" [
+    categories = [ "Application" "Development" "IDE" ];
+    startupNotify = false;
+    mimeTypes = [
      "text/plain" "text/asp" "text/x-c" "text/x-script.elisp" "text/x-fortran"
      "text/html" "application/inf" "text/x-java-source" "application/x-javascript"
      "application/javascript" "text/ecmascript" "application/x-ksh" "text/x-script.ksh"
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript
-, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, nixosTests
+, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, callPackage
 , gettext ? null, enableNls ? true, enableTiny ? false }:

 assert enableNls -> (gettext != null);
@ -41,7 +41,9 @@ in stdenv.mkDerivation rec {
  enableParallelBuilding = true;

  passthru = {
-    tests = { inherit (nixosTests) nano; };
+    tests = {
+      expect = callPackage ./test-with-expect.nix {};
+    };

    updateScript = writeScript "update.sh" ''
      #!${stdenv.shell}
--- a/pkgs/applications/editors/nano/test-with-expect.nix
+++ b/pkgs/applications/editors/nano/test-with-expect.nix
@ -0,0 +1,35 @@
+{ nano, expect, runCommand, writeScriptBin, runtimeShell }:
+
+let expect-script = writeScriptBin "expect-script" ''
+  #!${expect}/bin/expect -f
+
+  # Load nano
+  spawn nano file.txt
+  expect "GNU nano ${nano.version}"
+
+  # Add some text to the buffer
+  send "Hello world!"
+  expect "Hello world!"
+
+  # Send ctrl-x (exit)
+  send "\030"
+  expect "Save modified buffer?"
+
+  # Answer "yes"
+  send "y"
+  expect "File Name to Write"
+
+  # Send "return" to accept the file path.
+  send "\r"
+  sleep 1
+  exit
+''; in
+runCommand "nano-test-expect"
+{
+  nativeBuildInputs = [ nano expect ];
+  passthru = { inherit expect-script; };
+} ''
+  expect -f ${expect-script}/bin/expect-script
+  grep "Hello world!" file.txt
+  touch $out
+''
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/applications/editors/netbeans/default.nix
@ -10,7 +10,7 @@ let
    comment = "Integrated Development Environment";
    desktopName = "Apache NetBeans IDE";
    genericName = "Integrated Development Environment";
-    categories = "Development;";
+    categories = [ "Development" ];
    icon = "netbeans";
  };
 in
--- a/pkgs/applications/editors/quartus-prime/default.nix
+++ b/pkgs/applications/editors/quartus-prime/default.nix
@ -10,7 +10,7 @@ let
    icon = "quartus";
    desktopName = "Quartus";
    genericName = "Quartus Prime";
-    categories = "Development;";
+    categories = [ "Development" ];
  };
 # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf`
 in buildFHSUserEnv rec {
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@ -227,8 +227,13 @@ in
        desktopName = "RStudio";
        genericName = "IDE";
        comment = description;
-        categories = "Development;";
-        mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;";
+        categories = [ "Development" ];
+        mimeTypes = [
+          "text/x-r-source" "text/x-r" "text/x-R" "text/x-r-doc" "text/x-r-sweave" "text/x-r-markdown"
+          "text/x-r-html" "text/x-r-presentation" "application/x-r-data" "application/x-r-project"
+          "text/x-r-history" "text/x-r-profile" "text/x-tex" "text/x-markdown" "text/html"
+          "text/css" "text/javascript" "text/x-chdr" "text/x-csrc" "text/x-c++hdr" "text/x-c++src"
+        ];
      })
    ];
  })
--- a/pkgs/applications/editors/sublime/2/default.nix
+++ b/pkgs/applications/editors/sublime/2/default.nix
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
    comment = meta.description;
    desktopName = "Sublime Text";
    genericName = "Text Editor";
-    categories = "TextEditor;Development;";
+    categories = [ "TextEditor" "Development" ];
    icon = "sublime_text";
  };

--- a/pkgs/applications/editors/thonny/default.nix
+++ b/pkgs/applications/editors/thonny/default.nix
@ -21,7 +21,7 @@ buildPythonApplication rec {
    icon = "thonny";
    desktopName = "Thonny";
    comment     = "Python IDE for beginners";
-    categories  = "Development;IDE";
+    categories  = [ "Development" "IDE" ];
  }) ];

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
--- a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix
+++ b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix
--- a/pkgs/applications/editors/vim/plugins/default.nix
+++ b/pkgs/applications/editors/vim/plugins/default.nix
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -1,4 +1,4 @@
-# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!
+# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!
 { lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }:

 final: prev:
@ -41,12 +41,12 @@ final: prev:

  aerial-nvim = buildVimPluginFrom2Nix {
    pname = "aerial.nvim";
-    version = "2022-02-21";
+    version = "2022-02-25";
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "aerial.nvim";
-      rev = "f4dab432cb3afe0b737f85d823fcd74655727aae";
-      sha256 = "0i1qmfnlcwa3d75s4b07yn62737fz87w3jgsjpf5ijmkyxf29d1k";
+      rev = "0a229de4633a51548cb7257a116ea48dd4dd38c2";
+      sha256 = "19w0lkdak24m94hn4sp37h4q30i4893b7dwdvr7kz29na6x254rr";
    };
    meta.homepage = "https://github.com/stevearc/aerial.nvim/";
  };
@ -461,12 +461,12 @@ final: prev:

  bufferline-nvim = buildVimPluginFrom2Nix {
    pname = "bufferline.nvim";
-    version = "2022-02-15";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "akinsho";
      repo = "bufferline.nvim";
-      rev = "e97a404bd7449ecebab243c796c1016c98397fc0";
-      sha256 = "1cfqcbxvig271zppq0mydj616dgbdy5ryvycc64q5gyq1lfmhnsl";
+      rev = "871495d9e2dbe3314a421fd2d5e46f47de7ee537";
+      sha256 = "1xw13g6l16i6k32f3mdzmihz0m0n9y586ykiynjwkil69wxpjd1l";
    };
    meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
  };
@ -533,12 +533,12 @@ final: prev:

  chadtree = buildVimPluginFrom2Nix {
    pname = "chadtree";
-    version = "2022-02-22";
+    version = "2022-02-25";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "45177b39245b6aa4efda9f5051aadaad6f953fd5";
-      sha256 = "0hgmkfrwwplzw6bsvvd9549rr3326k4bviix8w4ir133qw8av5j5";
+      rev = "f932760f16368c5feeb079a878ed0ff8588aed29";
+      sha256 = "18bpfbb8aj2pmh84mq6w3435nyha0xiqpralx8daxb89vl0drvn4";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
@ -641,12 +641,12 @@ final: prev:

  cmd-parser-nvim = buildVimPluginFrom2Nix {
    pname = "cmd-parser.nvim";
-    version = "2021-05-30";
+    version = "2022-02-23";
    src = fetchFromGitHub {
      owner = "winston0410";
      repo = "cmd-parser.nvim";
-      rev = "70813af493398217cb1df10950ae8b99c58422db";
-      sha256 = "0rfa8cpykarcal8qcfp1dax1kgcbq7bv1ld6r1ia08n9vnqi5vm6";
+      rev = "6363b8bddef968c3ec51a38172af44f675f01ef3";
+      sha256 = "11vi9fwgbcvrb8jnicsnwmggayn0586glfdknlkg43smz2cay3f1";
    };
    meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/";
  };
@ -965,12 +965,12 @@ final: prev:

  coc-nvim = buildVimPluginFrom2Nix {
    pname = "coc.nvim";
-    version = "2022-02-19";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "neoclide";
      repo = "coc.nvim";
-      rev = "33ddba0d8db509378b59d05939da20d8a8d23df7";
-      sha256 = "0vqdv9yscjp7m9p61qwb0jgrdxkj9c5fbw3ccy5z158lnfa4j5hk";
+      rev = "1bdaaefc15baea37f4de1f8bedb5b3dd7c0efd32";
+      sha256 = "1vjwgbw9r4jd41nkxmkn3yxdmds1alf9gf96kv0jdxjdxryy23dc";
    };
    meta.homepage = "https://github.com/neoclide/coc.nvim/";
  };
@ -989,12 +989,12 @@ final: prev:

  colorbuddy-nvim = buildVimPluginFrom2Nix {
    pname = "colorbuddy.nvim";
-    version = "2021-12-01";
+    version = "2022-02-22";
    src = fetchFromGitHub {
      owner = "tjdevries";
      repo = "colorbuddy.nvim";
-      rev = "c678edd8113274574f9d9ef440773d1123e1431d";
-      sha256 = "095347cz5idcb09l4sl236agzi89lyr9r40nix2c8vk5pbskvp8f";
+      rev = "e0f5fafb4ee06cb29a915f8128282fc1f99b128f";
+      sha256 = "1lfb6ynhjyxzsm6id720f07cc1f52g38mzfc1i0hi4mysjnrkfh3";
    };
    meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/";
  };
@ -1230,24 +1230,24 @@ final: prev:

  coq_nvim = buildVimPluginFrom2Nix {
    pname = "coq_nvim";
-    version = "2022-02-22";
+    version = "2022-02-25";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq_nvim";
-      rev = "baad617cc9d9598c563d0571d44ef226d4888ee7";
-      sha256 = "0a7yfmqrsbq4x5k0vvjlvw89n3k3hwsbz72cgcazid7a1ngxwh37";
+      rev = "1792fee68dfba89632022e9524c2dcef10d399cd";
+      sha256 = "1y0ycmv1394mnxqzmrxx7ac846sy24cw7hgdxvp2w08cicysb38a";
    };
    meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
  };

  Coqtail = buildVimPluginFrom2Nix {
    pname = "Coqtail";
-    version = "2022-02-21";
+    version = "2022-02-22";
    src = fetchFromGitHub {
      owner = "whonore";
      repo = "Coqtail";
-      rev = "877cd4b9b023d728d196d7841ceec47d2060c467";
-      sha256 = "0qr8zvscwms6w0w4pfzdx319nykiacgj7qvgzk9ip5jfwnnlrxwr";
+      rev = "3526cb195cb381cef5d4fc25c532f00942562874";
+      sha256 = "0jxbdcjkmfwi05g1xdibr0i24hq23ihslmhpbj4yy0hj1x7afdk2";
    };
    meta.homepage = "https://github.com/whonore/Coqtail/";
  };
@ -1832,12 +1832,12 @@ final: prev:

  edge = buildVimPluginFrom2Nix {
    pname = "edge";
-    version = "2022-02-20";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "sainnhe";
      repo = "edge";
-      rev = "205cbbdd1181c3d164a84568449904fd1fe270a5";
-      sha256 = "1rjwdl4wiv49cr0wrm9ivy21r5cwif5p6ci2yhbsa048bg1gimpc";
+      rev = "032c406c7f63874c459234beedf8452d2fa38ee4";
+      sha256 = "1qjv2zs07svnw5whs2lsznxpbffr03i95n8q6xipqndzya7g23ym";
    };
    meta.homepage = "https://github.com/sainnhe/edge/";
  };
@ -2267,12 +2267,12 @@ final: prev:

  gentoo-syntax = buildVimPluginFrom2Nix {
    pname = "gentoo-syntax";
-    version = "2022-02-21";
+    version = "2022-02-23";
    src = fetchFromGitHub {
      owner = "gentoo";
      repo = "gentoo-syntax";
-      rev = "e5a55b7fa046e3b23b7f7e5e2224fa9dc74c1052";
-      sha256 = "1l83d2yj8qd1vgc5iqswqim43akf31pm6apgi4y9fsg22lb742ip";
+      rev = "cf5f268f8b19262515105739bdcc112cd2a6cdbc";
+      sha256 = "1pbvr1yirn17fxw8zlzp8j5brj0n2sdm3ampjryirdxknli93685";
    };
    meta.homepage = "https://github.com/gentoo/gentoo-syntax/";
  };
@ -3214,6 +3214,18 @@ final: prev:
    meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/";
  };

+  lightline-lsp = buildVimPluginFrom2Nix {
+    pname = "lightline-lsp";
+    version = "2022-01-09";
+    src = fetchFromGitHub {
+      owner = "spywhere";
+      repo = "lightline-lsp";
+      rev = "78a8f6880c1d979b7c682e1b37299d970506f480";
+      sha256 = "00zkpri1pi6r0m0v91361zixqsfrf05hyml61k4s0i3yabfv84w8";
+    };
+    meta.homepage = "https://github.com/spywhere/lightline-lsp/";
+  };
+
  lightline-vim = buildVimPluginFrom2Nix {
    pname = "lightline.vim";
    version = "2021-11-21";
@ -3228,12 +3240,12 @@ final: prev:

  lightspeed-nvim = buildVimPluginFrom2Nix {
    pname = "lightspeed.nvim";
-    version = "2022-02-18";
+    version = "2022-02-25";
    src = fetchFromGitHub {
      owner = "ggandor";
      repo = "lightspeed.nvim";
-      rev = "4d8359a30b26ee5316d0e7c79af08b10cb17a57b";
-      sha256 = "0j5qn12qmahdbyavp85yd633pap0rds4xnn37v2jhkipm0ag81wg";
+      rev = "e53a14b2b279e92fbca9646ec14188ab76dd009a";
+      sha256 = "13lr7kz2jny0slwshk85hv4ccnh3ywwmxy1wwq3a552cbk1p69j2";
    };
    meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
  };
@ -3300,12 +3312,12 @@ final: prev:

  litee-filetree-nvim = buildVimPluginFrom2Nix {
    pname = "litee-filetree.nvim";
-    version = "2022-02-16";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "ldelossa";
      repo = "litee-filetree.nvim";
-      rev = "a736dd5a177cc36d31b702a6b6d2ffb767e84c80";
-      sha256 = "0vhq6an7p6abhm6w9px627ymyq3r3ybsnik14k5x7pfwd5bg4c69";
+      rev = "f044fa4b465a102375d8d977e10e6427ec81ff63";
+      sha256 = "0blsnmdcyfm5phcwb6lh0ngynlj3i35nvlyvspr63v1vfxjms4x9";
    };
    meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/";
  };
@ -3324,12 +3336,12 @@ final: prev:

  litee-nvim = buildVimPluginFrom2Nix {
    pname = "litee.nvim";
-    version = "2022-02-17";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "ldelossa";
      repo = "litee.nvim";
-      rev = "dd231b288ae0bac7fe140aa78b474a094cc69e57";
-      sha256 = "1l5hq8jj5jdyd6jbxzmdj8wqgnx4y9mrv4zbjwhs7y67rmp7alqr";
+      rev = "7745d713e067b5faa44cffba85278ac820c3fe2c";
+      sha256 = "1y8lxrzvcs55chggrbg3h0vpg2ll5fschcp78ivb3cdq9cbs8jfh";
    };
    meta.homepage = "https://github.com/ldelossa/litee.nvim/";
  };
@ -3467,12 +3479,12 @@ final: prev:

  luasnip = buildVimPluginFrom2Nix {
    pname = "luasnip";
-    version = "2022-02-19";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "l3mon4d3";
      repo = "luasnip";
-      rev = "8f2480d7a8c23c164429f2e4b487f28fc9a72d4b";
-      sha256 = "0z0ksqc3rkb2vypdm6mkb6iq5g56fw4mxwfz5v4gqzlmfjc790vc";
+      rev = "5addafcc2460c7b805f14f8a257b804527bb85d7";
+      sha256 = "0whp6gcg059wygpww8mw1gapjd8qgx20xzy5r3g173x0c05kx3a1";
    };
    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
  };
@ -3647,12 +3659,12 @@ final: prev:

  mkdx = buildVimPluginFrom2Nix {
    pname = "mkdx";
-    version = "2022-02-21";
+    version = "2022-02-23";
    src = fetchFromGitHub {
      owner = "SidOfc";
      repo = "mkdx";
-      rev = "973ab6ea0bf79021e2992cdf91627f18c4b74b5d";
-      sha256 = "0dkfyiv2932r8lqsipq4r9yfq3yi8s42q03iw14njnr68cvnqfn3";
+      rev = "ca5b89e28cecc7993f769fc35b0ae794fd73af06";
+      sha256 = "0b9j55gjk641rnkbl8b4vmfb8pkz7jml15yf3y65lzb09fchx2dv";
    };
    meta.homepage = "https://github.com/SidOfc/mkdx/";
  };
@ -3983,12 +3995,12 @@ final: prev:

  neogit = buildVimPluginFrom2Nix {
    pname = "neogit";
-    version = "2022-02-18";
+    version = "2022-02-25";
    src = fetchFromGitHub {
      owner = "TimUntersberger";
      repo = "neogit";
-      rev = "e3339888ab2875f7535762a70c916b4986405b58";
-      sha256 = "084lhaq3pi157dikhpys0ppg68fhdjkm8pbap55ajmkxh5vh7xlf";
+      rev = "3bba2b63417cb679313e0ed0b7d9b7539c7f02b0";
+      sha256 = "1pr9hxy36xm8gbl4kkq0sa7qn6ki8k5mkdlz07vizk44yzq1pk95";
    };
    meta.homepage = "https://github.com/TimUntersberger/neogit/";
  };
@ -4043,12 +4055,12 @@ final: prev:

  neorg = buildVimPluginFrom2Nix {
    pname = "neorg";
-    version = "2022-02-13";
+    version = "2022-02-22";
    src = fetchFromGitHub {
      owner = "nvim-neorg";
      repo = "neorg";
-      rev = "d6d64466f060ff9db87976ca4dfc92dda473a81c";
-      sha256 = "0si8pq0scmpvarlssdpllfnbv3r1121dj5c6n88cy2g52f42zldi";
+      rev = "25dcc8d87cea1fc18280f4f1149c7dfc5b4a10bf";
+      sha256 = "0x5lhr18fw1zqf68r1hmnk0zh2wivdcqk7rpr5x41vq02hqy0ia2";
    };
    meta.homepage = "https://github.com/nvim-neorg/neorg/";
  };
@ -4163,12 +4175,12 @@ final: prev:

  nerdcommenter = buildVimPluginFrom2Nix {
    pname = "nerdcommenter";
-    version = "2022-02-12";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "preservim";
      repo = "nerdcommenter";
-      rev = "ec002e8f5de441d07cf5cd3ac44f41edc5f939d9";
-      sha256 = "1z7xdgqbcpld1742rw52sc0d128b5wsx2607hwm0y0nrzajd57xb";
+      rev = "f8671f783baeb0739f556d9b6c440ae1767340d6";
+      sha256 = "1j0fxxprxw12b70isnfqixnvz2xd657rr1jphjz8277yfqpdnh2i";
    };
    meta.homepage = "https://github.com/preservim/nerdcommenter/";
  };
@ -4235,12 +4247,12 @@ final: prev:

  nightfox-nvim = buildVimPluginFrom2Nix {
    pname = "nightfox.nvim";
-    version = "2022-02-18";
+    version = "2022-02-22";
    src = fetchFromGitHub {
      owner = "EdenEast";
      repo = "nightfox.nvim";
-      rev = "57ef9b52e015530090d9b9c49558197ae413cc19";
-      sha256 = "16inv9r7vxwhw9blhd9sy2grf8ghpcpbw2lwd5wq39ij7vwwy2n3";
+      rev = "6b6cf94c588c9aba2f0bf65c175f54ddceb3aa85";
+      sha256 = "09maybpfclp3kj9diq98y8izwvgwn7h7phmj439c1ppjn8phgy04";
    };
    meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
  };
@ -4355,12 +4367,12 @@ final: prev:

  null-ls-nvim = buildVimPluginFrom2Nix {
    pname = "null-ls.nvim";
-    version = "2022-02-21";
+    version = "2022-02-25";
    src = fetchFromGitHub {
      owner = "jose-elias-alvarez";
      repo = "null-ls.nvim";
-      rev = "ae1edec262c11964d45188b56af19135c5e38c89";
-      sha256 = "1bnw1hhm8xbs55dk99nl1sc86zvagfn5kb05vlczhngv7xrx2jpv";
+      rev = "4dd4df18d415d59310ce8e7a42f707edf6e6d270";
+      sha256 = "08m6mxanf31269ray76fzfb4il9cixnf78qq9p19i330k2hydqap";
    };
    meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
  };
@ -4559,12 +4571,12 @@ final: prev:

  nvim-dap-ui = buildVimPluginFrom2Nix {
    pname = "nvim-dap-ui";
-    version = "2022-02-22";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "rcarriga";
      repo = "nvim-dap-ui";
-      rev = "5dfbd6ebfbbfd4866f7eafe723f2fdfa0440733f";
-      sha256 = "02ss2mxi5dqa44r06iv69r5c5dp9g0cxg1dk3an1nnsh78wpibjs";
+      rev = "22e94f2303c8d8d72b541799d7733c5ded0733c5";
+      sha256 = "1761vih6pi2gs3z7bh5515nmr4hkbif82q33gghsvgzjri6a0c3q";
    };
    meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
  };
@ -4655,12 +4667,12 @@ final: prev:

  nvim-hlslens = buildVimPluginFrom2Nix {
    pname = "nvim-hlslens";
-    version = "2022-02-15";
+    version = "2022-02-23";
    src = fetchFromGitHub {
      owner = "kevinhwang91";
      repo = "nvim-hlslens";
-      rev = "805b61cc7841a9ef700430095ed56cda34fb8619";
-      sha256 = "0i8nvdvf5l2966ihprwvh4py37ljlqrrclhwflzhdr7pmyy79k98";
+      rev = "2a883d68b93570a66baca5984e416d4c4d079c3f";
+      sha256 = "19i442k58jl0rrnxbbmxg0w0nghi1x3vpxy0id7bb10bg5aafwjm";
    };
    meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
  };
@ -4703,48 +4715,60 @@ final: prev:

  nvim-lightbulb = buildVimPluginFrom2Nix {
    pname = "nvim-lightbulb";
-    version = "2021-11-13";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "kosayoda";
      repo = "nvim-lightbulb";
-      rev = "cd5267d2d708e908dbd668c7de74e1325eb1e1da";
-      sha256 = "1ans2kzg750d4a83hk5p9x5h51m9ywxgk6bxrcj1pwnpkhl5h75z";
+      rev = "29ca81408119ba809d1f922edc941868af97ee86";
+      sha256 = "04c5wqh42648wzrnwcgwdmwwwqvwk5qn3ncrfjl0827xnpc8049g";
    };
    meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
  };

+  nvim-lightline-lsp = buildVimPluginFrom2Nix {
+    pname = "nvim-lightline-lsp";
+    version = "2022-01-06";
+    src = fetchFromGitHub {
+      owner = "josa42";
+      repo = "nvim-lightline-lsp";
+      rev = "d9e61801f54c8824b59e93068865e3bc4f1ca0b8";
+      sha256 = "0sd38c4cp7i6prgr86b5nq9fhpi2h1yrn3ggs3d7my65ayz759m6";
+    };
+    meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/";
+  };
+
  nvim-lint = buildVimPluginFrom2Nix {
    pname = "nvim-lint";
-    version = "2022-02-14";
+    version = "2022-02-23";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-lint";
-      rev = "da931f58a59ff0a441b9e8c0679f91790fe61870";
-      sha256 = "13rbvf91xqhjwp4f4gp7gjgqsrbhdasb4k4swhf2f9zcqd51knz5";
+      rev = "f3215fa06782829a9705031fab2ec1f6ad514fd8";
+      sha256 = "05vsi9vgd2y6y8yv5mjc2lv4z1bdh7h4lq1cx4l2hy9p9z59kdzj";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
  };

  nvim-lsp-ts-utils = buildVimPluginFrom2Nix {
    pname = "nvim-lsp-ts-utils";
-    version = "2022-02-11";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "jose-elias-alvarez";
      repo = "nvim-lsp-ts-utils";
-      rev = "85e62e572ee63a2877267d023795488c33c0fd6f";
-      sha256 = "1c017n0di9zb1lcqqr9pjc4z8n3d2s55qlqzn8m9rrww9mjqqhnl";
+      rev = "f769dc92a364f428f9a48726e4c7a0ebfdbf6f66";
+      sha256 = "0nl81px6lj0sz0vrpvc4hhd6ccn4am9hd8kxcqzhdz0m37zzp8cr";
    };
    meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/";
  };

  nvim-lspconfig = buildVimPluginFrom2Nix {
    pname = "nvim-lspconfig";
-    version = "2022-02-21";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "ec7119b166b16e681f663fcbf16b7139b38172ae";
-      sha256 = "115d4n8i9cjafsl0nkrljcswn5qd0ny1cw7w1mw67sjddp79cqq7";
+      rev = "470569379d708e6c8f33f082497e0374067c6fee";
+      sha256 = "1rp9ymbss8jjm1k20q9vp3ayd7lv2cbdiz5ylhx9p1v1glqimigw";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -4775,12 +4799,12 @@ final: prev:

  nvim-neoclip-lua = buildVimPluginFrom2Nix {
    pname = "nvim-neoclip.lua";
-    version = "2022-02-20";
+    version = "2022-02-22";
    src = fetchFromGitHub {
      owner = "AckslD";
      repo = "nvim-neoclip.lua";
-      rev = "8213c2c59c99fdaccb3ea5fe9fed2a532fd3fdf8";
-      sha256 = "1hi1yjdaxjsawgci230cnxa5anniq2s6ijxy7z2ibsyfn1jcpb0b";
+      rev = "d859891e4bff9729ad6e63bd4aebc51946de8786";
+      sha256 = "17dbvr1y7hzrv04c89b4nmgmgg0qccrkz6qsh7vsava0lvjs4zm5";
    };
    meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";
  };
@ -4875,20 +4899,20 @@ final: prev:
    src = fetchFromGitHub {
      owner = "kyazdani42";
      repo = "nvim-tree.lua";
-      rev = "3486c48225265792842545e90dc041e5a214686d";
-      sha256 = "0bhp85j5446riacblingmd6z316hdh92lpp0p2kd4sckfw6ih8ja";
+      rev = "48e76bc0317de95ac154ae3a26193bf8881340a1";
+      sha256 = "06z7c5kcyxdcx7wi5yaw1d1mv3wah5y0kkjn7z5py9x82snk4rwm";
    };
    meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
  };

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2022-02-22";
+    version = "2022-02-25";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "3533721282669e945b62b3ae9c53d4c5ffe16c76";
-      sha256 = "0mlckwhammzh93kililzipynqzw4r09r2xk77yygka54y8vv9kjm";
+      rev = "18c558fd92b5ec800f976c447452ede4e96e9de9";
+      sha256 = "1f61237najb65r48j1hsrs6l5yvz9101s0fzi0jpzy40xs0gqb7n";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -4931,24 +4955,24 @@ final: prev:

  nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter-textobjects";
-    version = "2022-02-07";
+    version = "2022-02-23";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter-textobjects";
-      rev = "fea609aa58b3390a09e8df0e96902fd4b094d8b7";
-      sha256 = "0221ax71334ghsr8xznp9jk2iv9r0bin47ch8r7hsfh4r0wgc5w7";
+      rev = "e23fc8ac796b722dd30f40467d59581d4854c692";
+      sha256 = "15fa27dbyrmbsiysmy3rm3ih9jnxrlvvzlf966jcm29ph225zxmn";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
  };

  nvim-ts-autotag = buildVimPluginFrom2Nix {
    pname = "nvim-ts-autotag";
-    version = "2022-02-09";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "windwp";
      repo = "nvim-ts-autotag";
-      rev = "5149f0c6557fa4a492d82895a564f4cd4a9c7715";
-      sha256 = "0zyx4qkm6gq2lw75f2b1k974dv3bz12gd4f6j76dr805b8kq6l5m";
+      rev = "178e40a213eeea4810cad440b6be56ceeb6af434";
+      sha256 = "00zlgc7bnryw3ys1ihsf2pyf7f9wzlgmqrkp8bs99nv5qji6bym4";
    };
    meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
  };
@ -4967,12 +4991,12 @@ final: prev:

  nvim-ts-rainbow = buildVimPluginFrom2Nix {
    pname = "nvim-ts-rainbow";
-    version = "2022-02-09";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "p00f";
      repo = "nvim-ts-rainbow";
-      rev = "c6c26c4def0e9cd82f371ba677d6fc9baa0038af";
-      sha256 = "0q0awc93l6cafbvb3wghrmvsn0qqg8hgkhfy5r86bvr0prwbvxga";
+      rev = "35bef9212441ef3f4b69c8ead0fbde123357bb4d";
+      sha256 = "0dnr3dilcsyfrgwv497aypvn6jk5rzwdqjs09gn5fwfg354nhsbk";
    };
    meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
  };
@ -5027,12 +5051,12 @@ final: prev:

  nvimdev-nvim = buildVimPluginFrom2Nix {
    pname = "nvimdev.nvim";
-    version = "2022-02-19";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvimdev.nvim";
-      rev = "db19db97a5039b8485a9768873e4afd3cd731625";
-      sha256 = "0bkxjq3mm6v8h7zsv4mw92nnbj16cxmswdapn7zd2nld23ysyv0l";
+      rev = "9b819574b63bbf8883e32602915da22ead08bf9a";
+      sha256 = "084wnwmf67bs9ky1sj23fd6sqp27svfxg8gcf1fng8xjf5yk6pdw";
    };
    meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
  };
@ -5111,12 +5135,12 @@ final: prev:

  onedarkpro-nvim = buildVimPluginFrom2Nix {
    pname = "onedarkpro.nvim";
-    version = "2022-02-16";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "onedarkpro.nvim";
-      rev = "7bfdf32cae7bf83f2209f25a180d9f0bc5330919";
-      sha256 = "1877bv4cy1gignpdvhp8xfqgmh4yg04ak7amf9h1q4wg29hna15a";
+      rev = "fda3b36be8613f6ba303082fed7a7e20fdf52205";
+      sha256 = "14i3lqz1l9k8ai9lskrgz511srvf2wwfjd8zlbkmx55ws085ifca";
    };
    meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
  };
@ -5605,12 +5629,12 @@ final: prev:

  refactoring-nvim = buildVimPluginFrom2Nix {
    pname = "refactoring.nvim";
-    version = "2022-02-18";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "theprimeagen";
      repo = "refactoring.nvim";
-      rev = "7ebc76da62638a852a5a287a00ff94af32fe28da";
-      sha256 = "0gs5qb5s2ilqs2nskd9llgjd5zqcyx3yacyh56xwxr65yjvnpjg8";
+      rev = "85e3474449967d2ee4377fbb9633f21093a80187";
+      sha256 = "05scspf4jxhgbrfnnm363mb8g633rn83zmlxmwsqs1zzvpzgjxvp";
    };
    meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
  };
@ -5797,12 +5821,12 @@ final: prev:

  SchemaStore-nvim = buildVimPluginFrom2Nix {
    pname = "SchemaStore.nvim";
-    version = "2022-02-18";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "b0o";
      repo = "SchemaStore.nvim";
-      rev = "45761cc7f76abc543e614e2fafa1ea146f4313bb";
-      sha256 = "14d7pfrr57i1b8kjg6bn3v6z7pa7vqrpa0gi4y0wqjmwiyl22zvm";
+      rev = "7cb75a0e0262244728079a5482f2208b742245f9";
+      sha256 = "1ik61x58raln6wailp07w4c34bdzjchsrs4vwdi3pa6xlflw4sih";
    };
    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
  };
@ -6036,6 +6060,18 @@ final: prev:
    meta.homepage = "https://github.com/chikatoike/sourcemap.vim/";
  };

+  space-vim = buildVimPluginFrom2Nix {
+    pname = "space-vim";
+    version = "2022-02-15";
+    src = fetchFromGitHub {
+      owner = "liuchengxu";
+      repo = "space-vim";
+      rev = "637390b17a8cd7d154a0d90a5c07612f1538a28e";
+      sha256 = "0f43mspfnch1ifqa9rgvc64dmk0hz3cirz8iicpszmdr0fphq3xs";
+    };
+    meta.homepage = "https://github.com/liuchengxu/space-vim/";
+  };
+
  SpaceCamp = buildVimPluginFrom2Nix {
    pname = "SpaceCamp";
    version = "2021-04-07";
@ -6072,6 +6108,18 @@ final: prev:
    meta.homepage = "https://github.com/ctjhoa/spacevim/";
  };

+  SpaceVim = buildVimPluginFrom2Nix {
+    pname = "SpaceVim";
+    version = "2022-02-20";
+    src = fetchFromGitHub {
+      owner = "SpaceVim";
+      repo = "SpaceVim";
+      rev = "6975374b3be303b820c61c2fa33a43fe157265ec";
+      sha256 = "1lqsk7cpf9nb7h3wnmv4df6047iyck0p662m3gqy57xrhl33j33n";
+    };
+    meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
+  };
+
  sparkup = buildVimPluginFrom2Nix {
    pname = "sparkup";
    version = "2012-06-11";
@ -6243,12 +6291,12 @@ final: prev:

  surround-nvim = buildVimPluginFrom2Nix {
    pname = "surround.nvim";
-    version = "2022-02-15";
+    version = "2022-02-22";
    src = fetchFromGitHub {
      owner = "ur4ltz";
      repo = "surround.nvim";
-      rev = "01756d3f31aeb2307cca5b73f9fa74a0802e5bc3";
-      sha256 = "0adxynnlbybj04vxflvrqhcc7z8y3m7myimdm9xyz8vi18qkfk5p";
+      rev = "633068182cf894480341b992445f0f0d2883721d";
+      sha256 = "0mqg4vki23rs0rj6zyfkd1ki9wndjifp0lmnnw99x3i1qc0ba47i";
    };
    meta.homepage = "https://github.com/ur4ltz/surround.nvim/";
  };
@ -6654,12 +6702,12 @@ final: prev:

  telescope-nvim = buildVimPluginFrom2Nix {
    pname = "telescope.nvim";
-    version = "2022-02-15";
+    version = "2022-02-23";
    src = fetchFromGitHub {
      owner = "nvim-telescope";
      repo = "telescope.nvim";
-      rev = "df0b35c8bc0944164828ccba8ea17941423c6725";
-      sha256 = "0ryx507ynil4y8y989df06d2j6dci5ywdjr4nb7kgwrfj2hn4cv9";
+      rev = "567ec85b157f1606b500a0f755181f284810a28e";
+      sha256 = "1pzdn12zg9g3y03grw2xha2h5qia6bbi8058n3z5g2ail58hnw2n";
    };
    meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
  };
@ -6810,14 +6858,14 @@ final: prev:

  todo-nvim = buildVimPluginFrom2Nix {
    pname = "todo.nvim";
-    version = "2022-02-19";
+    version = "2022-02-23";
    src = fetchFromGitHub {
      owner = "AmeerTaweel";
      repo = "todo.nvim";
-      rev = "b252b4116812352161acfa73cdce6a15ffbde2eb";
-      sha256 = "+m3jy0ue0rAzRQ4hJDFPVVjNaOGNImkZjhIqI/AGTeY=";
+      rev = "6bd31dfd64b2730b33aad89423a1055c22fe276a";
+      sha256 = "1887d1bjzixrdinr857cqq4x84760scik04r9mz9zmwdf8nfgh6b";
    };
-    meta.homepage = "https://github.com/AmeerTaweel/todo.nvim";
+    meta.homepage = "https://github.com/AmeerTaweel/todo.nvim/";
  };

  todo-txt-vim = buildVimPluginFrom2Nix {
@ -7711,12 +7759,12 @@ final: prev:

  vim-clap = buildVimPluginFrom2Nix {
    pname = "vim-clap";
-    version = "2022-02-22";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "liuchengxu";
      repo = "vim-clap";
-      rev = "c22b4eaf296f8779ca8e6ccfa0a1497c4b5831ff";
-      sha256 = "13x7ykvh9qfdcik2x3yjz49xwww48b3cm1qq1qripnf2b19an3z6";
+      rev = "73fe68b6bfbd9201fb0facf2a13cb819f79b3d82";
+      sha256 = "0zs9rg21p0aws6shzvqi5khc3kipqh4yvcx5jpf8f3xcdlv13mrk";
    };
    meta.homepage = "https://github.com/liuchengxu/vim-clap/";
  };
@ -8611,12 +8659,12 @@ final: prev:

  vim-gitgutter = buildVimPluginFrom2Nix {
    pname = "vim-gitgutter";
-    version = "2022-02-19";
+    version = "2022-02-23";
    src = fetchFromGitHub {
      owner = "airblade";
      repo = "vim-gitgutter";
-      rev = "e433d5ddc1e37cb07d646d58b832a88ee848988d";
-      sha256 = "1li873x55q0ia2098ciwn5ayq23si9zqqildz8qxa5xdwv318j8z";
+      rev = "18d12985ea6cb7ede59755ff4fd0a9fa1e6bf835";
+      sha256 = "1gs7vaf9pyd8ji0vc9iafd46g4iqy8rpa2jif0k56wxzcrjw4r22";
    };
    meta.homepage = "https://github.com/airblade/vim-gitgutter/";
  };
@ -11087,12 +11135,12 @@ final: prev:

  vim-toml = buildVimPluginFrom2Nix {
    pname = "vim-toml";
-    version = "2021-12-06";
+    version = "2022-02-23";
    src = fetchFromGitHub {
      owner = "cespare";
      repo = "vim-toml";
-      rev = "2c8983cc391287e5e26e015c3ab9c38de9f9b759";
-      sha256 = "1mxn2z3p3lnk3ibwxhqb3dih25qalpqfwy0rx7i393vpjbkn79py";
+      rev = "89bcca8a3aeab360f6dfe5ce70999fc928669411";
+      sha256 = "0lw45cchgmank2w0y864qwhzw5cjbggk1p46vgjgs7cn1jsdhvr0";
    };
    meta.homepage = "https://github.com/cespare/vim-toml/";
  };
@ -11603,12 +11651,12 @@ final: prev:

  vimspector = buildVimPluginFrom2Nix {
    pname = "vimspector";
-    version = "2022-02-19";
+    version = "2022-02-24";
    src = fetchFromGitHub {
      owner = "puremourning";
      repo = "vimspector";
-      rev = "d6641959336d0f0303c94cbea131b160f9dcabe3";
-      sha256 = "0r2sr4kissqvi5d63girgxp6swbkj0czfaf5nbq2c4gjnpkr6clx";
+      rev = "d044dea0c2669c740052a47900e6e16f64444b63";
+      sha256 = "1sv1r4pcz1fx99qi566nncs116vw3wsny344lcnsh0r6b2sc0bz0";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/puremourning/vimspector/";
--- a/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch
+++ b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch
--- a/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json
+++ b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -414,7 +414,7 @@ self: super: {

  markdown-preview-nvim = super.markdown-preview-nvim.overrideAttrs (old: let
    # We only need its dependencies `node-modules`.
-    nodeDep = nodePackages."markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim".overrideAttrs (old: {
+    nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs (old: {
      dontNpmInstall = true;
    });
  in {
--- a/pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patch
+++ b/pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patch
--- a/pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch
+++ b/pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch
--- a/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch
+++ b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch
--- a/pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patch
+++ b/pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patch
--- a/pkgs/applications/editors/vim/plugins/readme.md
+++ b/pkgs/applications/editors/vim/plugins/readme.md
--- a/pkgs/applications/editors/vim/plugins/update-shell.nix
+++ b/pkgs/applications/editors/vim/plugins/update-shell.nix
@ -1,5 +1,6 @@
-{ pkgs ? import ../../.. { } }:
+{ pkgs ? import ../../../../.. { } }:

+# Ideally, pkgs points to default.nix file of Nixpkgs official tree
 with pkgs;
 let
  pyEnv = python3.withPackages (ps: [ ps.GitPython ]);
--- a/pkgs/applications/editors/vim/plugins/update.py
+++ b/pkgs/applications/editors/vim/plugins/update.py
@ -13,6 +13,9 @@
 # refer to:
 #
 # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/vim.section.md#updating-plugins-in-nixpkgs-updating-plugins-in-nixpkgs
+#
+# (or the equivalent file /doc/languages-frameworks/vim.section.md from Nixpkgs master tree).
+#

 import inspect
 import os
@ -27,7 +30,8 @@ log.addHandler(logging.StreamHandler())

 # Import plugin update library from maintainers/scripts/pluginupdate.py
 ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-sys.path.insert(0, os.path.join(ROOT.parent.parent.parent, "maintainers", "scripts"))
+# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree
+sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts"))
 import pluginupdate

 GET_PLUGINS = f"""(with import <localpkgs> {{}};
@ -47,7 +51,7 @@ let
 in lib.filterAttrs (n: v: v != null) checksums)"""

 HEADER = (
-    "# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!"
+    "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!"
 )


--- a/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh
+++ b/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -314,6 +314,7 @@ joonty/vim-xdebug
 joosepalviste/nvim-ts-context-commentstring
 jordwalke/vim-reasonml
 josa42/coc-lua
+josa42/nvim-lightline-lsp
 josa42/vim-lightline-coc
 jose-elias-alvarez/minsnip.nvim
 jose-elias-alvarez/null-ls.nvim
@ -420,6 +421,7 @@ lighttiger2505/deoplete-vim-lsp
 lilydjwg/colorizer
 lilydjwg/fcitx.vim@fcitx5
 liuchengxu/graphviz.vim
+liuchengxu/space-vim
 liuchengxu/vim-clap
 liuchengxu/vim-which-key
 liuchengxu/vista.vim
@ -772,6 +774,8 @@ sodapopcan/vim-twiggy
 solarnz/arcanist.vim
 sonph/onehalf
 sotte/presenting.vim
+SpaceVim/SpaceVim
+spywhere/lightline-lsp
 srcery-colors/srcery-vim
 steelsojka/completion-buffers
 steelsojka/pears.nvim
--- a/pkgs/applications/editors/vim/plugins/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix
@ -82,7 +82,8 @@ See vimHelpTags sample code below.

 CONTRIBUTING AND CUSTOMIZING
 ============================
-The example file pkgs/misc/vim-plugins/default.nix provides both:
+The example file pkgs/applications/editors/vim/plugins/default.nix provides
+both:
 * manually mantained plugins
 * plugins created by VAM's nix#ExportPluginsForNix implementation

--- a/pkgs/applications/editors/vim/plugins/vim2nix/README.txt
+++ b/pkgs/applications/editors/vim/plugins/vim2nix/README.txt
--- a/pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json
+++ b/pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json
--- a/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim
+++ b/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@ -50,14 +50,10 @@ stdenv.mkDerivation rec {
    comment = meta.description;
    desktopName = "vis";
    genericName = "Text editor";
-    categories = lib.concatStringsSep ";" [
-      "Application" "Development" "IDE"
-    ];
-    mimeType = lib.concatStringsSep ";" [
-      "text/plain" "application/octet-stream"
-    ];
-    startupNotify = "false";
-    terminal = "true";
+    categories = [ "Application" "Development" "IDE" ];
+    mimeTypes = [ "text/plain" "application/octet-stream" ];
+    startupNotify = false;
+    terminal = true;
  };

  meta = with lib; {
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@ -37,19 +37,16 @@ let
      genericName = "Text Editor";
      exec = "${executableName} %F";
      icon = "code";
-      startupNotify = "true";
-      categories = "Utility;TextEditor;Development;IDE;";
-      mimeType = "text/plain;inode/directory;";
-      extraEntries = ''
-        StartupWMClass=${shortName}
-        Actions=new-empty-window;
-        Keywords=vscode;
-
-        [Desktop Action new-empty-window]
-        Name=New Empty Window
-        Exec=${executableName} --new-window %F
-        Icon=code
-      '';
+      startupNotify = true;
+      startupWMClass = shortName;
+      categories = [ "Utility" "TextEditor" "Development" "IDE" ];
+      mimeTypes = [ "text/plain" "inode/directory" ];
+      keywords = [ "vscode" ];
+      actions.new-empty-window = {
+        name = "New Empty Window";
+        exec = "${executableName} --new-window %F";
+        icon = "code";
+      };
    };

    urlHandlerDesktopItem = makeDesktopItem {
@ -59,13 +56,11 @@ let
      genericName = "Text Editor";
      exec = executableName + " --open-url %U";
      icon = "code";
-      startupNotify = "true";
-      categories = "Utility;TextEditor;Development;IDE;";
-      mimeType = "x-scheme-handler/vscode;";
-      extraEntries = ''
-        NoDisplay=true
-        Keywords=vscode;
-      '';
+      startupNotify = true;
+      categories = [ "Utility" "TextEditor" "Development" "IDE" ];
+      mimeTypes = [ "x-scheme-handler/vscode" ];
+      keywords = [ "vscode" ];
+      noDisplay = true;
    };

    buildInputs = [ libsecret libXScrnSaver libxshmfence ]
--- a/pkgs/applications/editors/xxe-pe/default.nix
+++ b/pkgs/applications/editors/xxe-pe/default.nix
@ -19,7 +19,7 @@ let
    icon = "xxe";
    desktopName = "xxe";
    genericName = "XML Editor";
-    categories = "Development;IDE;TextEditor;Java";
+    categories = [ "Development" "IDE" "TextEditor" "Java" ];
  };
 in
 stdenv.mkDerivation rec {
--- a/pkgs/applications/emulators/ccemux/default.nix
+++ b/pkgs/applications/emulators/ccemux/default.nix
@ -29,7 +29,7 @@ let
    comment = "A modular ComputerCraft emulator";
    desktopName = "CCEmuX";
    genericName = "ComputerCraft Emulator";
-    categories = "Emulator;";
+    categories = [ "Emulator" ];
  };
 in

--- a/pkgs/applications/emulators/dosbox-staging/default.nix
+++ b/pkgs/applications/emulators/dosbox-staging/default.nix
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
      comment = "x86 dos emulator enhanced";
      desktopName = "DosBox-Staging";
      genericName = "DOS emulator";
-      categories = "Emulator;Game;";
+      categories = [ "Emulator" "Game" ];
    })
  ];

--- a/pkgs/applications/emulators/dosbox/default.nix
+++ b/pkgs/applications/emulators/dosbox/default.nix
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
      comment = "x86 dos emulator";
      desktopName = "DOSBox";
      genericName = "DOS emulator";
-      categories = "Emulator;Game;";
+      categories = [ "Emulator" "Game" ];
    })
  ];

--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@ -26,7 +26,7 @@ let
    exec = "mame${lib.optionalString stdenv.is64bit "64"}";
    desktopName = "MAME";
    genericName = "MAME is a multi-purpose emulation framework";
-    categories = "System;Emulator;";
+    categories = [ "System" "Emulator" ];
  };

  dest = "$out/opt/mame";
--- a/pkgs/applications/emulators/mgba/default.nix
+++ b/pkgs/applications/emulators/mgba/default.nix
@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
      comment = "A Game Boy Advance Emulator";
      desktopName = "mgba";
      genericName = "Game Boy Advance Emulator";
-      categories = "Game;Emulator;";
-      startupNotify = "false";
+      categories = [ "Game" "Emulator" ];
+      startupNotify = false;
    })
  ];

--- a/pkgs/applications/emulators/ryujinx/default.nix
+++ b/pkgs/applications/emulators/ryujinx/default.nix
@ -74,7 +74,7 @@ buildDotnetModule rec {
    icon = "ryujinx";
    comment = meta.description;
    type = "Application";
-    categories = "Game;";
+    categories = [ "Game" ];
  })];

  meta = with lib; {
--- a/pkgs/applications/emulators/vice/default.nix
+++ b/pkgs/applications/emulators/vice/default.nix
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
    comment = "Commodore 64 emulator";
    desktopName = "VICE";
    genericName = "Commodore 64 emulator";
-    categories = "Emulator;";
+    categories = [ "Emulator" ];
  };

  preBuild = ''
--- a/pkgs/applications/emulators/zsnes/default.nix
+++ b/pkgs/applications/emulators/zsnes/default.nix
@ -9,7 +9,7 @@ let
    comment = "A SNES emulator";
    desktopName = "zsnes";
    genericName = "zsnes";
-    categories = "Game;";
+    categories = [ "Game" ];
  };

 in stdenv.mkDerivation {
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@ -48,13 +48,9 @@ in
        genericName = "CAD Application";
        exec = "antimony %f";
        icon = "antimony";
-        terminal = "false";
-        categories = "Graphics;Science;Engineering";
-        mimeType = "application/x-extension-sb;application/x-antimony;";
-        extraEntries = ''
-          StartupWMClass=antimony
-          Version=1.0
-        '';
+        categories = [ "Graphics" "Science" "Engineering" ];
+        mimeTypes = [ "application/x-extension-sb" "application/x-antimony" ];
+        startupWMClass = "antimony";
      })
    ];

--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
    icon = "avocode";
    desktopName = "Avocode";
    genericName = "Design Inspector";
-    categories = "Development;";
+    categories = [ "Development" ];
    comment = "The bridge between designers and developers";
  };

--- a/pkgs/applications/graphics/evilpixie/default.nix
+++ b/pkgs/applications/graphics/evilpixie/default.nix
@ -16,8 +16,8 @@ let
    exec = "evilpixie %F";
    icon = "evilpixie";
    genericName = "Image Editor";
-    categories = "Graphics;2DGraphics;RasterGraphics;";
-    mimeType = "image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/x-pcx;image/x-targa;image/x-tga;";
+    categories = [ "Graphics" "2DGraphics" "RasterGraphics" ];
+    mimeTypes = [ "image/bmp" "image/gif" "image/jpeg" "image/jpg" "image/png" "image/x-pcx" "image/x-targa" "image/x-tga" ];
  };

 in mkDerivation rec {
--- a/pkgs/applications/graphics/fiji/default.nix
+++ b/pkgs/applications/graphics/fiji/default.nix
@ -26,20 +26,15 @@ stdenv.mkDerivation rec {
    (makeDesktopItem {
      name = "fiji";
      exec = "fiji %F";
+      tryExec = "fiji";
      icon = "fiji";
-      mimeType = "image/*;";
+      mimeTypes = [ "image/*" ];
      comment = "Scientific Image Analysis";
      desktopName = "Fiji Is Just ImageJ";
      genericName = "Fiji Is Just ImageJ";
-      categories = "Education;Science;ImageProcessing;";
-      terminal = false;
+      categories = [ "Education" "Science" "ImageProcessing" ];
      startupNotify = true;
-      extraEntries = ''
-        Version=1.0
-        TryExec=fiji
-        X-GNOME-FullName=Fiji Is Just ImageJ
-        StartupWMClass=fiji-Main
-      '';
+      startupWMClass = "fiji-Main";
    })
  ];

--- a/pkgs/applications/graphics/imagej/default.nix
+++ b/pkgs/applications/graphics/imagej/default.nix
@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
      name = "ImageJ";
      desktopName = "ImageJ";
      icon = "imagej";
-      categories = "Science;Utility;Graphics;";
+      categories = [ "Science" "Utility" "Graphics" ];
      exec = "imagej";
    })
  ];
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@ -60,12 +60,10 @@ mkDerivation rec {
      comment = "A drawing editor for creating figures in PDF format";
      exec = "ipe";
      icon = "ipe";
-      mimeType = "text/xml;application/pdf";
-      categories = "Graphics;Qt;";
-      extraDesktopEntries = {
-        StartupWMClass = "ipe";
-        StartupNotify = "true";
-      };
+      mimeTypes = [ "text/xml" "application/pdf" ];
+      categories = [ "Graphics" "Qt" ];
+      startupNotify = true;
+      startupWMClass = "ipe";
    })
  ];

--- a/pkgs/applications/graphics/nsxiv/default.nix
+++ b/pkgs/applications/graphics/nsxiv/default.nix
@ -0,0 +1,61 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, giflib
+, imlib2
+, libXft
+, libexif
+, libwebp
+, conf ? null
+}:
+
+stdenv.mkDerivation rec {
+  pname = "nsxiv";
+  version = "28";
+
+  src = fetchFromGitHub {
+    owner = "nsxiv";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-12RmEAzZdeanrRtnan96loXT7qSjIMjcWf296XmNE+A=";
+  };
+
+  buildInputs = [
+    giflib
+    imlib2
+    libXft
+    libexif
+    libwebp
+  ];
+
+  preBuild = lib.optionalString (conf!=null) ''
+    cp ${(builtins.toFile "config.def.h" conf)} config.def.h
+  '';
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ];
+
+  meta = with lib; {
+    homepage = "https://nsxiv.github.io/nsxiv/";
+    description = "New Suckless X Image Viewer";
+    longDescription = ''
+      nsxiv is a fork of now unmaintained sxiv with the purpose of being a
+      drop-in replacement of sxiv, maintaining it and adding simple, sensible
+      features, like:
+
+      - Basic image operations, e.g. zooming, panning, rotating
+      - Customizable key and mouse button mappings (in config.h)
+      - Script-ability via key-handler
+      - Thumbnail mode: grid of selectable previews of all images
+      - Ability to cache thumbnails for fast re-loading
+      - Basic support for animated/multi-frame images (GIF/WebP)
+      - Display image information in status bar
+      - Display image name/path in X title
+    '';
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+    broken = stdenv.isDarwin;
+  };
+}
--- a/pkgs/applications/graphics/openboard/default.nix
+++ b/pkgs/applications/graphics/openboard/default.nix
@ -79,8 +79,8 @@ in mkDerivation rec {
      icon = "OpenBoard";
      comment = "OpenBoard, an interactive white board application";
      desktopName = "OpenBoard";
-      mimeType = "application/ubz";
-      categories = "Education;";
+      mimeTypes = [ "application/ubz" ];
+      categories = [ "Education" ];
      startupNotify = true;
    })
  ];
--- a/pkgs/applications/graphics/swingsane/default.nix
+++ b/pkgs/applications/graphics/swingsane/default.nix
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
      desktopName = "SwingSane";
      genericName = "Scan from local or remote SANE servers";
      comment = meta.description;
-      categories = "Office;";
+      categories = [ "Office" ];
    };

  in ''
--- a/pkgs/applications/graphics/write_stylus/default.nix
+++ b/pkgs/applications/graphics/write_stylus/default.nix
@ -7,7 +7,7 @@ let
    icon = "write_stylus";
    desktopName = "Write";
    genericName = "Write";
-    categories = "Office;Graphics";
+    categories = [ "Office" "Graphics" ];
  };
 in
 mkDerivation rec {
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
    icon = "xournal";
    desktopName = "Xournal";
    comment = meta.description;
-    categories = "Office;Graphics;";
-    mimeType = "application/pdf;application/x-xoj";
+    categories = [ "Office" "Graphics" ];
+    mimeTypes = [ "application/pdf" "application/x-xoj" ];
    genericName = "PDF Editor";
  };

--- a/Show more
+++ b/Show more