21215 files changed, 29195 insertions, 1724 deletions

diff --git a/.gitignore b/.gitignore
index b3ae9e6ea86..b2be92b7db0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1 @@
-*~
-,*
-.*.swp
-.*.swo
 result
-result-*
-/doc/NEWS.html
-/doc/NEWS.txt
-/doc/manual.html
-/doc/manual.pdf
-.version-suffix
-
-.DS_Store
-
-/pkgs/development/libraries/qt-5/*/tmp/
-/pkgs/desktops/kde-5/*/tmp/
-/pkgs/development/mobile/androidenv/xml/*
diff --git a/README b/README
new file mode 100644
index 00000000000..c2fc7233dd3
--- /dev/null
+++ b/README
@@ -0,0 +1,64 @@
+                +---------------------------+
+                |                           |
+                |         LIBKOOKIE         |
+                |                           |
+                +---------------------------+
+
+This is my personal collection of nix expressions.
+
+
+Structure
+---------
+
+This repository contains a subtree of nixpkgs, a set of custum
+modules, a set of overlays for both custom and patched packages, as
+well as root configurations for each of my computers.
+
+libkookie replaces my old kookiepkgs, and nixcfg repos, which are no
+longer maintained or used.
+
+- overlays/patches: patches to upstream packages
+- overlays/kookie: custom out-of-nixpkgs packages
+- ovrelays/staging: packages that aren't part of upstream yet
+- nixpkgs: subtree of nixpkgs (follows unstable)
+- modules: system configuration modules
+- roots: available entry-points (machines)
+- ext: possible private extensions
+
+
+How to use
+----------
+
+You can customise a root configuration to fit your use-case more
+closely and then use the "build" scrip to build a complete system, and
+also switch to a new configuration with -s, which requires root
+privilenges.
+
+The custom modules are organised into use-cases, and computer types.
+Some things will be in the root of that directory because they are
+relevant on both my workstation computers, and servers.  Inside a
+primary module there are often sub-modules for individual components
+or even classes of components (such as graphics, or hardware).
+
+
+Contribute
+----------
+
+While this repository is also sometimes mirrored on github, the main
+tree lives on sourcehut [1].  You can send patches to me either
+directly [2], or to my public-inbox [3], which is a public mailing
+list where I post conversations on various subjects, as well as accept
+patches on.
+
+[1]: https://git.sr.ht/~spacekookie/libkookie
+[2]: kookie@spacekookie.de
+[3]: https://lists.sr.ht/~spacekookie/public-inbox
+
+
+License
+-------
+
+The nixpkgs subtree, as well as the package overlays are licensed
+under the MIT public license for the best compatibility with upstream
+NixOS.  My custom modules and root configurations are licensed under
+the GNU Public License 3.0 (or later).
diff --git a/build b/build
new file mode 100755
index 00000000000..c302bacdb6a
--- /dev/null
+++ b/build
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+set -eo pipefail
+
+HOST=$(hostname)
+DIR=$(realpath $(dirname $0))
+OUT=$(mktemp -du)
+ROOT="$DIR/roots/$HOST.nix"
+
+echo Active tree: $DIR
+
+## Build the libkookie tree
+function build {  
+    NIXPKGS_ALLOW_UNFREE=1 \
+            nix build -f '<nixpkgs/nixos>' system \
+            -I nixos-config="$ROOT" \
+            -I "nixpkgs=$DIR/nixpkgs" \
+            -I "nixpkgs-overlays=$DIR/overlays" \
+            -I "home-manager=$DIR/home-manager" \
+            --out-link "$OUT" $ARGV
+}
+
+## Build and output build path for debugging
+function debug {
+    build $ROOT
+    echo "Build path: $D-18"
+    exit 0
+}
+
+## Build and switch to the new configuration (requires root)
+function switch {
+    build $ROOT
+    nix-env -p /nix/var/nix/profiles/system --set "$OUT"
+    $OUT/bin/switch-to-configuration switch
+}
+
+case "$1" in
+    -s* | --switch*) shift; switch ;;
+    -d* | --debug*)  shift; debug ;;
+    *)               build ;;
+esac
+
+rm -rf $OUT*
diff --git a/build-on-hyperion b/build-on-hyperion
new file mode 100755
index 00000000000..8dafb6d9497
--- /dev/null
+++ b/build-on-hyperion
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+HOST=$(hostname)
+DIR=$(realpath $(dirname $0))
+OUT=$(mktemp -du)
+ROOT="$DIR/roots/$HOST.nix"
+
+drvs="$(nix-instantiate -A system '<nixpkgs/nixos>' \
+                        -I nixos-config=$ROOT \
+                        -I nixpkgs=$DIR/nixpkgs \
+                        -I nixpkgs-overlays=$DIR/overlays \
+                        -I home-manager=$DIR/home-manager)"
+nix-copy-closure -s --to hyperion $drvs
+nix-copy-closure --from hyperion $(ssh hyperion nix-build $drvs)
diff --git a/default.nix b/default.nix
index a74a01719c7..19dcfb60097 100644
--- a/default.nix
+++ b/default.nix
@@ -1,28 +1,6 @@
-let requiredVersion = import ./lib/minver.nix; in
+{ overlays ? [] } @ args:
 
-if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then
+import ./nixpkgs (args // {
+  overlays = [ (import ./overlays) ] ++ overlays;
+})
 
-  abort ''
-
-    This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade:
-
-    - If you are running NixOS, `nixos-rebuild' can be used to upgrade your system.
-
-    - Alternatively, with Nix > 2.0 `nix upgrade-nix' can be used to imperatively
-      upgrade Nix. You may use `nix-env --version' to check which version you have.
-
-    - If you installed Nix using the install script (https://nixos.org/nix/install),
-      it is safe to upgrade by running it again:
-
-          curl https://nixos.org/nix/install | sh
-
-    For more information, please see the NixOS release notes at
-    https://nixos.org/nixos/manual or locally at
-    ${toString ./nixos/doc/manual/release-notes}.
-
-    If you need further help, see https://nixos.org/nixos/support.html
-  ''
-
-else
-
-  import ./pkgs/top-level/impure.nix
diff --git a/pkgs/development/ruby-modules/bundler-env/test/Gemfile b/ext/.gitkeep
index e69de29bb2d..e69de29bb2d 100644
--- a/pkgs/development/ruby-modules/bundler-env/test/Gemfile
+++ b/ext/.gitkeep
diff --git a/home-manager/.gitignore b/home-manager/.gitignore
new file mode 100644
index 00000000000..d6944e3ddc1
--- /dev/null
+++ b/home-manager/.gitignore
@@ -0,0 +1 @@
+/result*
diff --git a/home-manager/.gitlab-ci.yml b/home-manager/.gitlab-ci.yml
new file mode 100644
index 00000000000..73c00f30510
--- /dev/null
+++ b/home-manager/.gitlab-ci.yml
@@ -0,0 +1,37 @@
+image: nixos/nix:latest
+
+stages:
+  - test
+  - deploy
+
+Run tests:
+  stage: test
+  script:
+    - nix-shell tests -A run.files-text
+  only:
+    - master
+
+pages:
+  stage: deploy
+  script:
+    - mkdir -p ~/.config/nixpkgs
+    - echo '{ manual.html.enable = true; }' > ~/.config/nixpkgs/home.nix
+    - nix-shell . -A install
+    - mkdir public
+    - cp -r ~/.nix-profile/share/doc/home-manager/* public/
+  artifacts:
+    paths:
+      - public
+  only:
+    - master
+
+Deploy NUR:
+  stage: deploy
+  variables:
+    HM_BRANCH: $CI_COMMIT_REF_NAME
+    HM_COMMIT_SHA: $CI_COMMIT_SHA
+  trigger:
+    project: rycee/nur-expressions
+    branch: master
+  only:
+    - master
diff --git a/home-manager/.travis.yml b/home-manager/.travis.yml
new file mode 100644
index 00000000000..df9c468be64
--- /dev/null
+++ b/home-manager/.travis.yml
@@ -0,0 +1,12 @@
+language: nix
+
+os:
+  - linux
+  - osx
+
+before_script:
+  - mkdir -m 0755 -p /nix/var/nix/{profiles,gcroots}/per-user/$USER
+
+script:
+  - nix-shell . -A install
+  - nix-shell tests -A run.all
diff --git a/home-manager/CONTRIBUTING.md b/home-manager/CONTRIBUTING.md
new file mode 100644
index 00000000000..156d0c9daf6
--- /dev/null
+++ b/home-manager/CONTRIBUTING.md
@@ -0,0 +1,158 @@
+Contributing
+============
+
+Thanks for wanting to contribute to Home Manager! These are some
+guidelines to make the process as smooth as possible for both you and
+the Home Manager developers.
+
+If you are only looking to report a problem then it is sufficient to
+read through the following section on reporting issues. If you instead
+want to directly contribute improvements and additions then please
+have a look at everything here.
+
+Reporting an issue
+------------------
+
+If you notice a problem with Home Manager and want to report it then
+have a look among the already [open issues][], if you find one
+matching yours then feel free to comment on it to add any additional
+information you may have.
+
+If no matching issue exists then go to the [new issue][] page and
+write a description of your problem. Include as much information as
+you can, ideally also include relevant excerpts from your Home Manager
+configuration.
+
+Contributing code
+-----------------
+
+If you want to contribute code to improve Home Manager then please
+follow these guidelines.
+
+### Fork and create a pull request ###
+
+If you have not previously forked Home Manager then you need to do
+that first. Have a look at GitHub's "[Fork A Repo][]" for instructions
+on how to do this.
+
+Once you have a fork of Home Manager you should create a branch
+starting at the most recent `master`. Give your branch a reasonably
+descriptive name. Perform your changes on this branch and when you are
+happy with the result push the branch to GitHub and
+[create a pull request][].
+
+Assuming your clone is at `$HOME/devel/home-manager` then you can make
+the `home-manager` command use it by either
+
+1.  overriding the default path by using the `-I` command line option:
+
+        home-manager -I home-manager=$HOME/devel/home-manager
+
+    or
+
+2.  changing the default path by ensuring your configuration includes
+
+        programs.home-manager.enable = true;
+        programs.home-manager.path = "$HOME/devel/home-manager";
+
+    and running `home-manager switch` to activate the change.
+    Afterwards, `home-manager build` and `home-manager switch` will
+    use your cloned repository.
+
+The first option is good if you only temporarily want to use your
+clone.
+
+### Commits ###
+
+The commits in your pull request should be reasonably self-contained,
+that is, each commit should make sense in isolation. In particular,
+you will be asked to amend any commit that introduces syntax errors or
+similar problems even if they are fixed in a later commit.
+
+The commit messages should follow the format
+
+    {component}: {description}
+
+    {long description}
+
+where `{component}` refers to the code component (or module) your
+change affects, `{description}` is a brief description of your change,
+and `{long description}` is an optional clarifying description. Note,
+`{description}` should start with a lower case letter. As a rare
+exception, if there is no clear component, or your change affects many
+components, then the `{component}` part is optional.
+
+When adding a new module, say `foo.nix`, we use the fixed commit
+format `foo: add module`. You can, of course, still include a long
+description if you wish.
+
+In addition to the above commit message guidelines, try to follow the
+[seven rules][] as much as possible.
+
+### Style guidelines ###
+
+The code in Home Manager should follow the [Nixpkgs syntax
+guidelines][]. Note, we prefer `lowerCamelCase` for variable and
+attribute names with the accepted exception of variables directly
+referencing packages in Nixpkgs which use a hyphenated style. For
+example, the Home Manager option `services.gpg-agent.enableSshSupport`
+references the `gpg-agent` package in Nixpkgs.
+
+### News ###
+
+Home Manager includes a system for presenting news to the user. When
+making a change you, therefore, have the option to also include an
+associated news entry. In general, a news entry should only be added
+for truly noteworthy news. For example, a bug fix or new option does
+generally not need a news entry.
+
+If you do have a change worthy of a news entry then please add one in
+[`news.nix`][] but you should follow some basic guidelines:
+
+- The entry timestamp should be in ISO-8601 format having "+00:00" as
+  time zone. For example, "2017-09-13T17:10:14+00:00". A suitable
+  timestamp can be produced by the command
+
+      date --iso-8601=second --universal
+
+- The entry condition should be as specific as possible. For example,
+  if you are changing or deprecating a specific option then you could
+  restrict the news to those users who actually use this option.
+
+- Wrap the news message so that it will fit in the typical terminal,
+  that is, at most 80 characters wide. Ideally a bit less.
+
+- Unlike commit messages, news will be read without any connection to
+  the Home Manager source code. It is therefore important to make the
+  message understandable in isolation and to those who do not have
+  knowledge of the Home Manager internals. To this end it should be
+  written in more descriptive, prose like way.
+
+- If you refer to an option then write its full attribute path. That
+  is, instead of writing
+
+  > The option 'foo' has been deprecated, please use 'bar' instead.
+
+  it should read
+
+  > The option 'services.myservice.foo' has been deprecated, please
+  > use 'services.myservice.bar' instead.
+
+- A new module, say `foo.nix`, should always include a news entry
+  (without any condition) that has a message along the lines of
+
+  > A new service is available: 'services.foo'.
+
+  or
+
+  > A new program configuration is available: 'program.foo'.
+
+  depending on the type of module.
+
+[open issues]: https://github.com/rycee/home-manager/issues
+[new issue]: https://github.com/rycee/home-manager/issues/new
+[Fork A Repo]: https://help.github.com/articles/fork-a-repo/
+[create a pull request]: https://help.github.com/articles/creating-a-pull-request/
+[seven rules]: https://chris.beams.io/posts/git-commit/#seven-rules
+[`news.nix`]: https://github.com/rycee/home-manager/blob/master/modules/misc/news.nix
+[Nixpkgs syntax guidelines]: https://nixos.org/nixpkgs/manual/#sec-syntax
diff --git a/home-manager/FAQ.md b/home-manager/FAQ.md
new file mode 100644
index 00000000000..141ecc6ea6b
--- /dev/null
+++ b/home-manager/FAQ.md
@@ -0,0 +1,121 @@
+Frequently Asked Questions (FAQ)
+================================
+
+Why is there a collision error when switching generation?
+---------------------------------------------------------
+
+Home Manager currently installs packages into the user environment,
+precisely as if the packages were installed through
+`nix-env --install`. This means that you will get a collision error if
+your Home Manager configuration attempts to install a package that you
+already have installed manually, that is, packages that shows up when
+you run `nix-env --query`.
+
+For example, imagine you have the `hello` package installed in your
+environment
+
+```console
+$ nix-env --query
+hello-2.10
+```
+
+and your Home Manager configuration contains
+
+    home.packages = [ pkgs.hello ];
+
+Then attempting to switch to this configuration will result in an
+error similar to
+
+```console
+$ home-manager switch
+these derivations will be built:
+  /nix/store/xg69wsnd1rp8xgs9qfsjal017nf0ldhm-home-manager-path.drv
+[…]
+Activating installPackages
+replacing old ‘home-manager-path’
+installing ‘home-manager-path’
+building path(s) ‘/nix/store/b5c0asjz9f06l52l9812w6k39ifr49jj-user-environment’
+Wide character in die at /nix/store/64jc9gd2rkbgdb4yjx3nrgc91bpjj5ky-buildenv.pl line 79.
+collision between ‘/nix/store/fmwa4axzghz11cnln5absh31nbhs9lq1-home-manager-path/bin/hello’ and ‘/nix/store/c2wyl8b9p4afivpcz8jplc9kis8rj36d-hello-2.10/bin/hello’; use ‘nix-env --set-flag priority NUMBER PKGNAME’ to change the priority of one of the conflicting packages
+builder for ‘/nix/store/b37x3s7pzxbasfqhaca5dqbf3pjjw0ip-user-environment.drv’ failed with exit code 2
+error: build of ‘/nix/store/b37x3s7pzxbasfqhaca5dqbf3pjjw0ip-user-environment.drv’ failed
+```
+
+The solution is typically to uninstall the package from the
+environment using `nix-env --uninstall` and reattempt the Home Manager
+generation switch.
+
+Why are the session variables not set?
+--------------------------------------
+
+Home Manager is only able to set session variables automatically if it
+manages your Bash or Z shell configuration. If you don't want to let
+Home Manager manage your shell then you will have to manually source
+the
+
+    ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+
+file in an appropriate way. In Bash and Z shell this can be done by
+adding
+
+```sh
+. "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
+```
+
+to your `.profile` and `.zshrc` files, respectively. The
+`hm-session-vars.sh` file should work in most Bourne-like shells.
+
+How do set up a configuration for multiple users/machines?
+----------------------------------------------------------
+
+A typical way to prepare a repository of configurations for multiple
+logins and machines is to prepare one "top-level" file for each unique
+combination.
+
+For example, if you have two machines, called "kronos" and "rhea" on
+which you want to configure your user "jane" then you could create the
+files
+
+- `kronos-jane.nix`,
+- `rhea-jane.nix`, and
+- `common.nix`
+
+in your repository. On the kronos and rhea machines you can then make
+`~jane/.config/nixpkgs/home.nix` be a symbolic link to the
+corresponding file in your configuration repository.
+
+The `kronos-jane.nix` and `rhea-jane.nix` files follow the format
+
+```nix
+{ ... }:
+
+{
+  imports = [ ./common.nix ];
+
+  # Various options that are specific for this machine/user.
+}
+```
+
+while the `common.nix` file contains configuration shared across the
+two logins. Of course, instead of just a single `common.nix` file you
+can have multiple ones, even one per program or service.
+
+You can get some inspiration from the [Post your home-manager home.nix
+file!][1] Reddit thread.
+
+[1]: https://www.reddit.com/r/NixOS/comments/9bb9h9/post_your_homemanager_homenix_file/
+
+Why do I get an error message about `ca.desrt.dconf`?
+-----------------------------------------------------
+
+You are most likely trying to configure the GTK or Gnome Terminal but
+the DBus session is not aware of the dconf service. The full error you
+might get is
+
+    error: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name ca.desrt.dconf was not provided by any .service files
+
+The solution on NixOS is to add
+
+    services.dbus.packages = with pkgs; [ gnome3.dconf ];
+
+to your system configuration.
diff --git a/home-manager/LICENSE b/home-manager/LICENSE
new file mode 100644
index 00000000000..a7566dbf194
--- /dev/null
+++ b/home-manager/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017-2019 Robert Helgesson and Home Manager contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/home-manager/README.md b/home-manager/README.md
new file mode 100644
index 00000000000..58593f7b374
--- /dev/null
+++ b/home-manager/README.md
@@ -0,0 +1,314 @@
+Home Manager using Nix
+======================
+
+This project provides a basic system for managing a user environment
+using the [Nix][] package manager together with the Nix libraries
+found in [Nixpkgs][]. Before attempting to use Home Manager please
+read the warning below.
+
+Words of warning
+----------------
+
+This project is under development. I personally use it to manage
+several user configurations but it may fail catastrophically for you.
+So beware!
+
+In some cases Home Manager cannot detect whether it will overwrite a
+previous manual configuration. For example, the Gnome Terminal module
+will write to your dconf store and cannot tell whether a configuration
+that it is about to be overwrite was from a previous Home Manager
+generation or from manual configuration.
+
+Home Manager targets [NixOS][] unstable and NixOS version 19.03 (the
+current stable version), it may or may not work on other Linux
+distributions and NixOS versions.
+
+Also, the `home-manager` tool does not explicitly support rollbacks at
+the moment so if your home directory gets messed up you'll have to fix
+it yourself. See the [rollbacks](#rollbacks) section for instructions
+on how to manually perform a rollback.
+
+Now when your expectations have been built up and you are eager to try
+all this out you can go ahead and read the rest of this text.
+
+Contact
+-------
+
+You can chat with us on IRC in the channel [#home-manager][] on
+[freenode][]. The [channel logs][] are hosted courtesy of
+[samueldr][].
+
+Installation
+------------
+
+Currently the easiest way to install Home Manager is as follows:
+
+1.  Make sure you have a working Nix installation. If you are not
+    using NixOS then you may here have to run
+
+    ```console
+    $ mkdir -m 0755 -p /nix/var/nix/{profiles,gcroots}/per-user/$USER
+    ```
+
+    since Home Manager uses these directories to manage your profile
+    generations. On NixOS these should already be available.
+
+    Also make sure that your user is able to build and install Nix
+    packages. For example, you should be able to successfully run a
+    command like `nix-instantiate '<nixpkgs>' -A hello` without having
+    to switch to the root user. For a multi-user install of Nix this
+    means that your user must be covered by the
+    [`allowed-users`][nixAllowedUsers] Nix option. On NixOS you can
+    control this option using the
+    [`nix.allowedUsers`][nixosAllowedUsers] system option.
+
+2.  Add the appropriate Home Manager channel. Typically this is
+
+    ```console
+    $ nix-channel --add https://github.com/rycee/home-manager/archive/master.tar.gz home-manager
+    $ nix-channel --update
+    ```
+
+    if you are following Nixpkgs master or an unstable channel and
+
+    ```console
+    $ nix-channel --add https://github.com/rycee/home-manager/archive/release-19.03.tar.gz home-manager
+    $ nix-channel --update
+    ```
+
+    if you follow a Nixpkgs version 19.03 channel.
+
+    On NixOS you may need to log out and back in for the channel to
+    become available. On non-NixOS you may have to add
+
+    ```shell
+    export NIX_PATH=$HOME/.nix-defexpr/channels${NIX_PATH:+:}$NIX_PATH
+    ```
+
+    to your shell (see [nix#2033](https://github.com/NixOS/nix/issues/2033)).
+
+3.  Install Home Manager and create the first Home Manager generation:
+
+    ```console
+    $ nix-shell '<home-manager>' -A install
+    ```
+
+    Once finished, Home Manager should be active and available in your
+    user environment.
+
+3.  If you do not plan on having Home Manager manage your shell
+    configuration then you must source the
+
+    ```
+    $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
+    ```
+
+    file in your shell configuration. Unfortunately, in this specific
+    case we currently only support POSIX.2-like shells such as
+    [Bash][] or [Z shell][].
+
+    For example, if you use Bash then add
+
+    ```bash
+    . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
+    ```
+
+    to your `~/.profile` file.
+
+If instead of using channels you want to run Home Manager from a Git
+checkout of the repository then you can use the
+`programs.home-manager.path` option to specify the absolute path to
+the repository.
+
+Usage
+-----
+
+Home Manager is typically managed through the `home-manager` tool.
+This tool can, for example, apply configurations to your home
+directory, list user packages installed by the tool, and list the
+configuration generations.
+
+As an example, let us expand the initial configuration file from the
+installation above to install the htop and fortune packages, install
+Emacs with a few extra packages enabled, install Firefox with the
+IcedTea plugin enabled, and enable the user gpg-agent service.
+
+To satisfy the above setup we should elaborate the
+`~/.config/nixpkgs/home.nix` file as follows:
+
+```nix
+{ pkgs, ... }:
+
+{
+  home.packages = [
+    pkgs.htop
+    pkgs.fortune
+  ];
+
+  programs.emacs = {
+    enable = true;
+    extraPackages = epkgs: [
+      epkgs.nix-mode
+      epkgs.magit
+    ];
+  };
+
+  programs.firefox = {
+    enable = true;
+    enableIcedTea = true;
+  };
+
+  services.gpg-agent = {
+    enable = true;
+    defaultCacheTtl = 1800;
+    enableSshSupport = true;
+  };
+
+  programs.home-manager = {
+    enable = true;
+    path = "…";
+  };
+}
+```
+
+To activate this configuration you can then run
+
+```console
+$ home-manager switch
+```
+
+or if you are not feeling so lucky,
+
+```console
+$ home-manager build
+```
+
+which will create a `result` link to a directory containing an
+activation script and the generated home directory files.
+
+Documentation of available configuration options, including
+descriptions and usage examples, is available in the [Home Manager
+manual][configuration options] or offline by running
+
+```console
+$ man home-configuration.nix
+```
+
+Rollbacks
+---------
+
+While the `home-manager` tool does not explicitly support rollbacks at
+the moment it is relatively easy to perform one manually. The steps to
+do so are
+
+1.  Run `home-manager generations` to determine which generation you
+    wish to rollback to:
+
+    ```console
+    $ home-manager generations
+    2018-01-04 11:56 : id 765 -> /nix/store/kahm1rxk77mnvd2l8pfvd4jkkffk5ijk-home-manager-generation
+    2018-01-03 10:29 : id 764 -> /nix/store/2wsmsliqr5yynqkdyjzb1y57pr5q2lsj-home-manager-generation
+    2018-01-01 12:21 : id 763 -> /nix/store/mv960kl9chn2lal5q8lnqdp1ygxngcd1-home-manager-generation
+    2017-12-29 21:03 : id 762 -> /nix/store/6c0k1r03fxckql4vgqcn9ccb616ynb94-home-manager-generation
+    2017-12-25 18:51 : id 761 -> /nix/store/czc5y6vi1rvnkfv83cs3rn84jarcgsgh-home-manager-generation
+    …
+    ```
+
+2.  Copy the Nix store path of the generation you chose, e.g.,
+
+        /nix/store/mv960kl9chn2lal5q8lnqdp1ygxngcd1-home-manager-generation
+
+    for generation 763.
+
+3.  Run the `activate` script inside the copied store path:
+
+    ```console
+    $ /nix/store/mv960kl9chn2lal5q8lnqdp1ygxngcd1-home-manager-generation/activate
+    Starting home manager activation
+    …
+    ```
+
+Keeping your ~ safe from harm
+-----------------------------
+
+To configure programs and services Home Manager must write various
+things to your home directory. To prevent overwriting any existing
+files when switching to a new generation, Home Manager will attempt to
+detect collisions between existing files and generated files. If any
+such collision is detected the activation will terminate before
+changing anything on your computer.
+
+For example, suppose you have a wonderful, painstakingly created
+`~/.config/git/config` and add
+
+```nix
+{
+  # …
+
+  programs.git = {
+    enable = true;
+    userName = "Jane Doe";
+    userEmail = "jane.doe@example.org";
+  };
+
+  # …
+}
+```
+
+to your configuration. Attempting to switch to the generation will
+then result in
+
+```console
+$ home-manager switch
+…
+Activating checkLinkTargets
+Existing file '/home/jdoe/.gitconfig' is in the way
+Please move the above files and try again
+```
+
+Graphical services
+------------------
+
+Home Manager includes a number of services intended to run in a
+graphical session, for example `xscreensaver` and `dunst`.
+Unfortunately, such services will not be started automatically unless
+you let Home Manager start your X session. That is, you have something
+like
+
+```nix
+{
+  # …
+
+  services.xserver.enable = true;
+
+  # …
+}
+```
+
+in your system configuration and
+
+```nix
+{
+  # …
+
+  xsession.enable = true;
+  xsession.windowManager.command = "…";
+
+  # …
+}
+```
+
+in your Home Manager configuration.
+
+[Bash]: https://www.gnu.org/software/bash/
+[Nix]: https://nixos.org/nix/
+[NixOS]: https://nixos.org/
+[Nixpkgs]: https://nixos.org/nixpkgs/
+[nixAllowedUsers]: https://nixos.org/nix/manual/#conf-allowed-users
+[nixosAllowedUsers]: https://nixos.org/nixos/manual/options.html#opt-nix.allowedUsers
+[Z shell]: http://zsh.sourceforge.net/
+[configuration options]: https://rycee.gitlab.io/home-manager/options.html
+[#home-manager]: https://webchat.freenode.net/?url=irc%3A%2F%2Firc.freenode.net%2Fhome-manager
+[freenode]: https://freenode.net/
+[channel logs]: https://logs.nix.samueldr.com/home-manager/
+[samueldr]: https://github.com/samueldr/
diff --git a/home-manager/default.nix b/home-manager/default.nix
new file mode 100644
index 00000000000..1e3ff09e0bc
--- /dev/null
+++ b/home-manager/default.nix
@@ -0,0 +1,13 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+rec {
+  home-manager = pkgs.callPackage ./home-manager {
+    path = toString ./.;
+  };
+
+  install = pkgs.callPackage ./home-manager/install.nix {
+    inherit home-manager;
+  };
+
+  nixos = import ./nixos;
+}
diff --git a/home-manager/doc/default.nix b/home-manager/doc/default.nix
new file mode 100644
index 00000000000..acfa1f1e49c
--- /dev/null
+++ b/home-manager/doc/default.nix
@@ -0,0 +1,72 @@
+{ pkgs }:
+
+let
+
+  lib = pkgs.lib;
+
+  nmdSrc = pkgs.fetchFromGitLab {
+    name = "nmd";
+    owner = "rycee";
+    repo = "nmd";
+    rev = "9751ca5ef6eb2ef27470010208d4c0a20e89443d";
+    sha256 = "0rbx10n8kk0bvp1nl5c8q79lz1w0p1b8103asbvwps3gmqd070hi";
+  };
+
+  nmd = import nmdSrc { inherit pkgs; };
+
+  # Make sure the used package is scrubbed to avoid actually
+  # instantiating derivations.
+  scrubbedPkgsModule = {
+    imports = [
+      {
+        _module.args = {
+          pkgs = lib.mkForce (nmd.scrubDerivations "pkgs" pkgs);
+          pkgs_i686 = lib.mkForce { };
+        };
+      }
+    ];
+  };
+
+  hmModulesDocs = nmd.buildModulesDocs {
+    modules =
+      import ../modules/modules.nix { inherit lib pkgs; }
+      ++ [ scrubbedPkgsModule ];
+    moduleRootPaths = [ ./.. ];
+    mkModuleUrl = path:
+      "https://github.com/rycee/home-manager/blob/master/${path}#blob-path";
+    channelName = "home-manager";
+    docBook.id = "home-manager-options";
+  };
+
+  docs = nmd.buildDocBookDocs {
+    pathName = "home-manager";
+    modulesDocs = [ hmModulesDocs ];
+    documentsDirectory = ./.;
+    chunkToc = ''
+      <toc>
+        <d:tocentry xmlns:d="http://docbook.org/ns/docbook" linkend="book-home-manager-manual"><?dbhtml filename="index.html"?>
+          <d:tocentry linkend="ch-options"><?dbhtml filename="options.html"?></d:tocentry>
+          <d:tocentry linkend="ch-tools"><?dbhtml filename="tools.html"?></d:tocentry>
+          <d:tocentry linkend="ch-release-notes"><?dbhtml filename="release-notes.html"?></d:tocentry>
+        </d:tocentry>
+      </toc>
+    '';
+  };
+
+in
+
+{
+  inherit nmdSrc;
+
+  options = {
+    json = hmModulesDocs.json.override {
+      path = "share/doc/home-manager/options.json";
+    };
+  };
+
+  manPages = docs.manPages;
+
+  manual = {
+    inherit (docs) html htmlOpenTool;
+  };
+}
diff --git a/home-manager/doc/installation.xml b/home-manager/doc/installation.xml
new file mode 100644
index 00000000000..0e4c904e570
--- /dev/null
+++ b/home-manager/doc/installation.xml
@@ -0,0 +1,310 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      version="5.0"
+      xml:id="ch-installation">
+ <title>Installing Home Manager</title>
+ <para>
+  Home Manager can be used in three primary ways:
+  <orderedlist>
+   <listitem>
+    <para>
+     Using the standalone <command>home-manager</command> tool. For platforms
+     other than NixOS and Darwin, this is the only available choice. It is also
+     recommended for people on NixOS or Darwin that want to manage their home
+     directory independent of the system as a whole. See
+     <xref linkend="sec-install-standalone"/> for instructions on how to
+     perform this installation.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     As a module within a NixOS system configuration. This allows the user
+     profiles to be built together with the system when running
+     <command>nixos-rebuild</command>. See
+     <xref linkend="sec-install-nixos-module"/> for a description of this
+     setup.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     As a module within a
+     <link xlink:href="https://github.com/LnL7/nix-darwin/">nix-darwin</link>
+     system configuration. This allows the user profiles to be built together
+     with the system when running <command>darwin-rebuild</command>. See
+     <xref linkend="sec-install-nix-darwin-module"/> for a description of this
+     setup.
+    </para>
+   </listitem>
+  </orderedlist>
+ </para>
+ <section xml:id="sec-install-standalone">
+  <title>Standalone installation</title>
+
+  <orderedlist>
+   <listitem>
+    <para>
+     Make sure you have a working Nix installation. If you are not using NixOS
+     then it may be necessary to run
+    </para>
+<screen>
+<prompt>$</prompt> <userinput>mkdir -m 0755 -p /nix/var/nix/{profiles,gcroots}/per-user/$USER</userinput>
+</screen>
+    <para>
+     since Home Manager uses these directories to manage your profile
+     generations. On NixOS these should already be available.
+    </para>
+    <para>
+     Also make sure that your user is able to build and install Nix packages.
+     For example, you should be able to successfully run a command like
+     <literal>nix-instantiate '&lt;nixpkgs&gt;' -A hello</literal> without
+     having to switch to the root user. For a multi-user install of Nix this
+     means that your user must be covered by the
+     <link xlink:href="https://nixos.org/nix/manual/#conf-allowed-users"><literal>allowed-users</literal></link>
+     Nix option. On NixOS you can control this option using the
+     <link xlink:href="https://nixos.org/nixos/manual/options.html#opt-nix.allowedUsers"><literal>nix.allowedUsers</literal></link>
+     system option.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Add the Home Manager channel that you wish to follow. This is done by
+     running
+    </para>
+<screen>
+<prompt>$</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/master.tar.gz home-manager</userinput>
+<prompt>$</prompt> <userinput>nix-channel --update</userinput>
+</screen>
+    <para>
+     if you are following Nixpkgs master or an unstable channel and
+    </para>
+<screen>
+<prompt>$</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/release-19.03.tar.gz home-manager</userinput>
+<prompt>$</prompt> <userinput>nix-channel --update</userinput>
+</screen>
+    <para>
+     if you follow a Nixpkgs version 19.03 channel.
+    </para>
+    <para>
+     On NixOS you may need to log out and back in for the channel to become
+     available. On non-NixOS you may have to add
+<programlisting language="bash">
+export NIX_PATH=$HOME/.nix-defexpr/channels${NIX_PATH:+:}$NIX_PATH
+</programlisting>
+     to your shell (see
+     <link xlink:href="https://github.com/NixOS/nix/issues/2033">nix#2033</link>).
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Run the Home Manager installation command and create the first Home
+     Manager generation:
+    </para>
+<screen>
+<prompt>$</prompt> <userinput>nix-shell '&lt;home-manager&gt;' -A install</userinput>
+</screen>
+    <para>
+     Once finished, Home Manager should be active and available in your user
+     environment.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     If you do not plan on having Home Manager manage your shell configuration
+     then you must source the
+    </para>
+<programlisting language="bash">
+$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
+</programlisting>
+    <para>
+     file in your shell configuration. Unfortunately, we currently only support
+     POSIX.2-like shells such as
+     <link xlink:href="https://www.gnu.org/software/bash/">Bash</link> or
+     <link xlink:href="http://zsh.sourceforge.net/">Z shell</link>.
+    </para>
+    <para>
+     For example, if you use Bash then add
+    </para>
+<programlisting language="bash">
+. &quot;$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh&quot;
+</programlisting>
+    <para>
+     to your <literal>~/.profile</literal> file.
+    </para>
+   </listitem>
+  </orderedlist>
+
+  <para>
+   If instead of using channels you want to run Home Manager from a Git
+   checkout of the repository then you can use the
+   <literal>programs.home-manager.path</literal> option to specify the absolute
+   path to the repository.
+  </para>
+ </section>
+ <section xml:id="sec-install-nixos-module">
+  <title>NixOS module</title>
+
+  <para>
+   Home Manager provides a NixOS module that allows you to prepare user
+   environments directly from the system configuration file, which often is
+   more convenient than using the <command>home-manager</command> tool. It also
+   opens up additional possibilities, for example, to automatically configure
+   user environments in NixOS declarative containers or on systems deployed
+   through NixOps.
+  </para>
+
+  <para>
+   To make the NixOS module available for use you must <option>import</option>
+   it into your system configuration. This is most conveniently done by adding
+   a Home Manager channel, for example
+  </para>
+
+<screen>
+<prompt>#</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/master.tar.gz home-manager</userinput>
+<prompt>#</prompt> <userinput>nix-channel --update</userinput>
+</screen>
+
+  <para>
+   if you are following Nixpkgs master or an unstable channel and
+  </para>
+
+<screen>
+<prompt>#</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/release-19.03.tar.gz home-manager</userinput>
+<prompt>#</prompt> <userinput>nix-channel --update</userinput>
+</screen>
+
+  <para>
+   if you follow a Nixpkgs version 19.03 channel.
+  </para>
+
+  <para>
+   It is then possible to add
+  </para>
+
+<programlisting language="nix">
+imports = [ &lt;home-manager/nixos&gt; ];
+</programlisting>
+
+  <para>
+   to your system <filename>configuration.nix</filename> file, which will
+   introduce a new NixOS option called <option>home-manager.users</option>
+   whose type is an attribute set that maps user names to Home Manager
+   configurations.
+  </para>
+
+  <para>
+   For example, a NixOS configuration may include the lines
+  </para>
+
+<programlisting language="nix">
+users.users.eve.isNormalUser = true;
+home-manager.users.eve = { pkgs, ... }: {
+  home.packages = [ pkgs.atool pkgs.httpie ];
+  programs.bash.enable = true;
+};
+</programlisting>
+
+  <para>
+   and after a <command>nixos-rebuild switch</command> the user eve's
+   environment should include a basic Bash configuration and the packages atool
+   and httpie.
+  </para>
+
+  <note>
+   <para>
+    By default packages will be installed to
+    <filename>$HOME/.nix-profile</filename> but they can be installed to
+    <filename>/etc/profiles</filename> if
+   </para>
+<programlisting language="nix">
+home-manager.useUserPackages = true;
+</programlisting>
+   <para>
+    is added to the system configuration. This is necessary if, for example,
+    you wish to use <command>nixos-rebuild build-vm</command>. This option may
+    become the default value in the future.
+   </para>
+  </note>
+ </section>
+ <section xml:id="sec-install-nix-darwin-module">
+  <title>nix-darwin module</title>
+
+  <para>
+   Home Manager provides a module that allows you to prepare user
+   environments directly from the nix-darwin configuration file, which often is
+   more convenient than using the <command>home-manager</command> tool.
+  </para>
+
+  <para>
+   To make the NixOS module available for use you must <option>import</option>
+   it into your system configuration. This is most conveniently done by adding
+   a Home Manager channel, for example
+  </para>
+
+<screen>
+<prompt>#</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/master.tar.gz home-manager</userinput>
+<prompt>#</prompt> <userinput>nix-channel --update</userinput>
+</screen>
+
+  <para>
+   if you are following Nixpkgs master or an unstable channel and
+  </para>
+
+<screen>
+<prompt>#</prompt> <userinput>nix-channel --add https://github.com/rycee/home-manager/archive/release-19.03.tar.gz home-manager</userinput>
+<prompt>#</prompt> <userinput>nix-channel --update</userinput>
+</screen>
+
+  <para>
+   if you follow a Nixpkgs version 19.03 channel.
+  </para>
+
+  <para>
+   It is then possible to add
+  </para>
+
+<programlisting language="nix">
+imports = [ &lt;home-manager/nix-darwin&gt; ];
+</programlisting>
+
+  <para>
+   to your nix-darwin <filename>configuration.nix</filename> file, which will
+   introduce a new NixOS option called <option>home-manager</option> whose type
+   is an attribute set that maps user names to Home Manager configurations.
+  </para>
+
+  <para>
+   For example, a nix-darwin configuration may include the lines
+  </para>
+
+<programlisting language="nix">
+home-manager.users.eve = { pkgs, ... }: {
+  home.packages = [ pkgs.atool pkgs.httpie ];
+  programs.bash.enable = true;
+};
+</programlisting>
+
+  <para>
+   and after a <command>darwin-rebuild --switch</command> the user eve's
+   environment should include a basic Bash configuration and the packages atool
+   and httpie.
+  </para>
+
+  <note>
+   <para>
+    By default user packages will not be ignored in favor of
+    <option>environment.systemPackages</option>, but they will be intalled to
+    <option>/etc/profiles/per-user/$USERNAME</option> if
+   </para>
+
+<programlisting language="nix">
+home-manager.useUserPackages = true;
+</programlisting>
+
+   <para>
+    is added to the nix-darwin configuration. This option may become the default
+    value in the future.
+   </para>
+  </note>
+ </section>
+</chapter>
diff --git a/home-manager/doc/man-configuration.xml b/home-manager/doc/man-configuration.xml
new file mode 100644
index 00000000000..42962a75f3c
--- /dev/null
+++ b/home-manager/doc/man-configuration.xml
@@ -0,0 +1,40 @@
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+ <refmeta>
+  <refentrytitle><filename>home-configuration.nix</filename></refentrytitle>
+  <manvolnum>5</manvolnum>
+  <refmiscinfo class="source">Home Manager</refmiscinfo>
+<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+ </refmeta>
+ <refnamediv>
+  <refname><filename>home-configuration.nix</filename></refname>
+  <refpurpose>Home Manager configuration specification</refpurpose>
+ </refnamediv>
+ <refsection>
+  <title>Description</title>
+  <para>
+   The file <filename>~/.config/nixpkgs/home.nix</filename> contains the
+   declarative specification of your Home Manager configuration. The command
+   <command>home-manager</command> takes this file and realises the user
+   environment configuration specified therein.
+  </para>
+ </refsection>
+ <refsection>
+  <title>Options</title>
+  <para>
+   You can use the following options in
+   <filename>home-configuration.nix</filename>:
+  </para>
+  <xi:include href="./nmd-result/home-manager-options.xml" />
+ </refsection>
+ <refsection>
+   <title>See also</title>
+   <para>
+     <citerefentry>
+       <refentrytitle>home-manager</refentrytitle>
+       <manvolnum>1</manvolnum>
+     </citerefentry>
+   </para>
+ </refsection>
+</refentry>
diff --git a/home-manager/doc/man-home-manager.xml b/home-manager/doc/man-home-manager.xml
new file mode 100644
index 00000000000..a0f55d1106a
--- /dev/null
+++ b/home-manager/doc/man-home-manager.xml
@@ -0,0 +1,497 @@
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+ <refmeta>
+  <refentrytitle><command>home-manager</command>
+  </refentrytitle><manvolnum>1</manvolnum>
+  <refmiscinfo class="source">Home Manager</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+  <refname><command>home-manager</command>
+  </refname><refpurpose>reconfigure a user environment</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+  <cmdsynopsis>
+   <command>home-manager</command> <group choice="req"> 
+   <arg choice="plain">
+    build
+   </arg>
+    
+   <arg choice="plain">
+    edit
+   </arg>
+    
+   <arg choice="plain">
+    expire-generations <replaceable>timestamp</replaceable>
+   </arg>
+    
+   <arg choice="plain">
+    generations
+   </arg>
+    
+   <arg choice="plain">
+    help
+   </arg>
+    
+   <arg choice="plain">
+    news
+   </arg>
+    
+   <arg choice="plain">
+    packages
+   </arg>
+    
+   <arg choice="plain">
+    remove-generations <replaceable>ID …</replaceable>
+   </arg>
+    
+   <arg choice="plain">
+    switch
+   </arg>
+    
+   <arg choice="plain">
+    uninstall
+   </arg>
+    </group>
+   <sbr />
+   <arg>
+    -A <replaceable>attrPath</replaceable>
+   </arg>
+    
+   <arg>
+    -I <replaceable>path</replaceable>
+   </arg>
+    
+   <arg>
+    -b <replaceable>ext</replaceable>
+   </arg>
+    
+   <arg>
+    <group choice="req"> 
+    <arg choice="plain">
+     -f
+    </arg>
+     
+    <arg choice="plain">
+     --file
+    </arg>
+     </group> <replaceable>path</replaceable>
+   </arg>
+    
+   <arg>
+    <group choice="req"> 
+    <arg choice="plain">
+     -h
+    </arg>
+     
+    <arg choice="plain">
+     --help
+    </arg>
+     </group>
+   </arg>
+    
+   <arg>
+    <group choice="req"> 
+    <arg choice="plain">
+     -n
+    </arg>
+     
+    <arg choice="plain">
+     --dry-run
+    </arg>
+     </group>
+   </arg>
+    
+   <arg>
+    --option <replaceable>name</replaceable> <replaceable>value</replaceable>
+   </arg>
+    
+   <arg>
+    --cores <replaceable>number</replaceable>
+   </arg>
+    
+   <arg>
+    --max-jobs <replaceable>number</replaceable>
+   </arg>
+    
+   <arg>
+    --keep-failed
+   </arg>
+    
+   <arg>
+    --keep-going
+   </arg>
+    
+   <arg>
+    --show-trace
+   </arg>
+    
+   <arg>
+    <group choice="req"> 
+    <arg choice="plain">
+     -v
+    </arg>
+     
+    <arg choice="plain">
+     --verbose
+    </arg>
+     </group>
+   </arg>
+  </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsection>
+  <title>Description</title>
+  <para>
+   This command updates the user environment so that it corresponds to the
+   configuration specified in <filename>~/.config/nixpkgs/home.nix</filename>.
+  </para>
+  <para>
+   All operations using this tool expects a sub-command that indicates the
+   operation to perform. It must be one of
+   <variablelist>
+    <varlistentry>
+     <term>
+      <option>build</option>
+     </term>
+     <listitem>
+      <para>
+       Build configuration into a <filename>result</filename> directory.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <option>edit</option>
+     </term>
+     <listitem>
+      <para>
+       Open the home configuration using the editor indicated by
+       <envar>EDITOR</envar>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <option>expire-generations <replaceable>timestamp</replaceable></option>
+     </term>
+     <listitem>
+      <para>
+       Remove generations older than <replaceable>timestamp</replaceable> where
+       <replaceable>timestamp</replaceable> is interpreted as in the
+       <option>-d</option> argument of the <citerefentry>
+       <refentrytitle>date</refentrytitle>
+       <manvolnum>1</manvolnum> </citerefentry> tool. For example <literal>-30
+       days</literal> or <literal>2018-01-01</literal>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <option>generations</option>
+     </term>
+     <listitem>
+      <para>
+       List all home environment generations.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <option>help</option>
+     </term>
+     <listitem>
+      <para>
+       Print tool help.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <option>news</option>
+     </term>
+     <listitem>
+      <para>
+       Show news entries in a pager.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <option>packages</option>
+     </term>
+     <listitem>
+      <para>
+       List all packages installed in <varname>home-manager-path</varname>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <option>remove-generations <replaceable>ID …</replaceable></option>
+     </term>
+     <listitem>
+      <para>
+       Remove indicated generations. Use the <option>generations</option>
+       sub-command to find suitable generation numbers.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <option>switch</option>
+     </term>
+     <listitem>
+      <para>
+       Build and activate the configuration.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <option>uninstall</option>
+     </term>
+     <listitem>
+      <para>
+       Remove Home Manager from the user environment. This will
+       <itemizedlist>
+        <listitem>
+         <para>
+          remove all managed files from the home directory,
+         </para>
+        </listitem>
+        <listitem>
+         <para>
+          remove packages installed through Home Manager from the user profile,
+          and
+         </para>
+        </listitem>
+        <listitem>
+         <para>
+          optionally remove all Home Manager generations and make them
+          available for immediate garbage collection.
+         </para>
+        </listitem>
+       </itemizedlist>
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsection>
+ <refsection>
+  <title>Options</title>
+  <para>
+   The tool accepts the options
+  </para>
+  <variablelist>
+   <varlistentry>
+    <term>
+     <option>-A <replaceable>attrPath</replaceable></option>
+    </term>
+    <listitem>
+     <para>
+      Optional attribute that selects a configuration expression in the
+      configuration file. That is, if <filename>home.nix</filename> contains
+<programlisting language="nix">
+{
+  joe-at-work = {pkgs, ...}: { home.packages = [ pkgs.fortune ]; };
+  joe-at-home = {pkgs, ...}: { home.packages = [ pkgs.cowsay ]; };
+}
+</programlisting>
+      then the command <command>home-manager switch -A joe-at-work</command>
+      will activate the profile containing the fortune program.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <option>-I <replaceable>path</replaceable></option>
+    </term>
+    <listitem>
+     <para>
+      Add a path to the Nix expression search path. For example, to build a
+      Home Manager profile using a specific Nixpkgs run <command>home-manager
+      -I nixpkgs=/absolute/path/to/nixpkgs build</command>. By default
+      <literal>&lt;nixpkgs&gt;</literal> is used.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <option>-b <replaceable>extension</replaceable></option>
+    </term>
+    <listitem>
+     <para>
+      Enable automatic resolution of collisions between unmanaged and managed
+      files. The name of the original file will be suffixed by the given
+      extension. For example,
+<screen>
+<prompt>$</prompt> <userinput>home-manager -b bck switch</userinput>
+</screen>
+      will cause a colliding file <filename>~/.config/foo.conf</filename> to be
+      moved to <filename>~/.config/foo.conf.bck</filename>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <option>-f <replaceable>path</replaceable></option>
+    </term>
+    <term>
+     <option>--file <replaceable>path</replaceable></option>
+    </term>
+    <listitem>
+     <para>
+      Indicates the path to the Home Manager configuration file. If not given,
+      <filename>~/.config/nixpkgs/home.nix</filename> is used.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <option>-h</option>
+    </term>
+    <term>
+     <option>--help</option>
+    </term>
+    <listitem>
+     <para>
+      Prints usage information for the <command>home-manager</command> tool.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <option>-n</option>
+    </term>
+    <term>
+     <option>--dry-run</option>
+    </term>
+    <listitem>
+     <para>
+      Perform a dry-run of the given operation, only prints what actions would
+      be taken.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <option>--option <replaceable>name</replaceable> <replaceable>value</replaceable></option>
+    </term>
+    <listitem>
+     <para>
+      Passed on to <citerefentry>
+      <refentrytitle>nix-build</refentrytitle>
+      <manvolnum>1</manvolnum> </citerefentry>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <option>--cores <replaceable>number</replaceable></option>
+    </term>
+    <listitem>
+     <para>
+      Passed on to <citerefentry>
+      <refentrytitle>nix-build</refentrytitle>
+      <manvolnum>1</manvolnum> </citerefentry>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <option>--max-jobs <replaceable>number</replaceable></option>
+    </term>
+    <listitem>
+     <para>
+      Passed on to <citerefentry>
+      <refentrytitle>nix-build</refentrytitle>
+      <manvolnum>1</manvolnum> </citerefentry>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <option>--keep-failed</option>
+    </term>
+    <listitem>
+     <para>
+      Passed on to <citerefentry>
+      <refentrytitle>nix-build</refentrytitle>
+      <manvolnum>1</manvolnum> </citerefentry>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <option>--keep-going</option>
+    </term>
+    <listitem>
+     <para>
+      Passed on to <citerefentry>
+      <refentrytitle>nix-build</refentrytitle>
+      <manvolnum>1</manvolnum> </citerefentry>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <option>--show-trace</option>
+    </term>
+    <listitem>
+     <para>
+      Passed on to <citerefentry>
+      <refentrytitle>nix-build</refentrytitle>
+      <manvolnum>1</manvolnum> </citerefentry>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <option>-v</option>
+    </term>
+    <term>
+     <option>--verbose</option>
+    </term>
+    <listitem>
+     <para>
+      Activates verbose output.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsection>
+ <refsection>
+  <title>Files</title>
+  <variablelist>
+   <varlistentry>
+    <term>
+     <filename>~/.local/share/home-manager/news-read-ids</filename>
+    </term>
+    <listitem>
+     <para>
+      Identifiers of news items that have been shown. Can be deleted to reset
+      the read news indicator.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsection>
+ <refsection>
+  <title>Bugs</title>
+  <para>
+   Please report any bugs on the
+   <link
+   xlink:href="https://github.com/rycee/home-manager/issues">project
+   issue tracker</link>.
+  </para>
+ </refsection>
+ <refsection>
+  <title>See also</title>
+  <para>
+   <citerefentry>
+   <refentrytitle>home-configuration.nix</refentrytitle>
+   <manvolnum>5</manvolnum> </citerefentry>
+  </para>
+ </refsection>
+</refentry>
diff --git a/home-manager/doc/man-pages.xml b/home-manager/doc/man-pages.xml
new file mode 100644
index 00000000000..616c2ef291b
--- /dev/null
+++ b/home-manager/doc/man-pages.xml
@@ -0,0 +1,12 @@
+<reference xmlns="http://docbook.org/ns/docbook"
+           xmlns:xlink="http://www.w3.org/1999/xlink"
+           xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>Home Manager Reference Pages</title>
+ <info>
+  <author><personname>Home Manager contributors</personname></author>
+  <copyright><year>2017–2019</year><holder>Home Manager contributors</holder>
+  </copyright>
+ </info>
+ <xi:include href="man-configuration.xml" />
+ <xi:include href="man-home-manager.xml" />
+</reference>
diff --git a/home-manager/doc/manual.xml b/home-manager/doc/manual.xml
new file mode 100644
index 00000000000..8ff81308b2c
--- /dev/null
+++ b/home-manager/doc/manual.xml
@@ -0,0 +1,38 @@
+<book xmlns="http://docbook.org/ns/docbook"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      version="5.0"
+      xml:id="book-home-manager-manual">
+ <info>
+  <title>Home Manager Manual</title>
+ </info>
+ <preface>
+  <title>Preface</title>
+  <para>
+   This manual will eventually describes how to install, use, and extend Home
+   Manager.
+  </para>
+  <para>
+   If you encounter problems or bugs then please report them on the
+   <link xlink:href="https://github.com/rycee/home-manager/issues">Home Manager
+   issue tracker</link>.
+  </para>
+  <note>
+   <para>
+    Commands prefixed with <literal>#</literal> have to be run as root, either
+    requiring to login as root user or temporarily switching to it using
+    <literal>sudo</literal> for example.
+   </para>
+  </note>
+ </preface>
+ <xi:include href="installation.xml" />
+ <appendix xml:id="ch-options">
+  <title>Configuration Options</title>
+  <xi:include href="./nmd-result/home-manager-options.xml" />
+ </appendix>
+ <appendix xml:id="ch-tools">
+  <title>Tools</title>
+  <xi:include href="./man-home-manager.xml" />
+ </appendix>
+ <xi:include href="./release-notes/release-notes.xml" />
+</book>
diff --git a/home-manager/doc/release-notes/release-notes.xml b/home-manager/doc/release-notes/release-notes.xml
new file mode 100644
index 00000000000..2c1f5fcde3b
--- /dev/null
+++ b/home-manager/doc/release-notes/release-notes.xml
@@ -0,0 +1,15 @@
+<appendix xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude"
+          version="5.0"
+          xml:id="ch-release-notes">
+ <title>Release Notes</title>
+ <para>
+  This section lists the release notes for stable versions of Home Manager and
+  the current unstable version.
+ </para>
+ <xi:include href="rl-2003.xml" />
+ <xi:include href="rl-1909.xml" />
+ <xi:include href="rl-1903.xml" />
+ <xi:include href="rl-1809.xml" />
+</appendix>
diff --git a/home-manager/doc/release-notes/rl-1809.adoc b/home-manager/doc/release-notes/rl-1809.adoc
new file mode 100644
index 00000000000..b363704e241
--- /dev/null
+++ b/home-manager/doc/release-notes/rl-1809.adoc
@@ -0,0 +1,4 @@
+[[sec-release-18.09]]
+== Release 18.09
+
+The 18.09 release branch became the stable branch in September, 2018.
diff --git a/home-manager/doc/release-notes/rl-1903.adoc b/home-manager/doc/release-notes/rl-1903.adoc
new file mode 100644
index 00000000000..6dfdc67f5bf
--- /dev/null
+++ b/home-manager/doc/release-notes/rl-1903.adoc
@@ -0,0 +1,59 @@
+[[sec-release-19.03]]
+== Release 19.03
+
+The 19.03 release branch became the stable branch in April, 2019.
+
+[[sec-release-19.03-highlights]]
+=== Highlights
+:opt-home-file-source: opt-home.file._name__.source
+
+This release has the following notable changes:
+
+* The <<{opt-home-file-source}>> option now allows source files to be
+hidden, that is, having a name starting with the `.` character. It
+also allows the source file name to contain characters not typically
+allowed for Nix store paths. For example, your configuration can now
+contain things such as
++
+[source,nix]
+----
+home.file."my file".source = ./. + "/file with spaces!";
+----
+
+* The type used for the systemd unit options under
+<<opt-systemd.user.services>>, <<opt-systemd.user.sockets>>, etc. has
+been changed to offer more robust merging of configurations. If you
+don't override values within systemd units then you are not affected
+by this change. Unfortunately, if you do override unit values you may
+encounter errors.
++
+In particular, if you get an error saying that a ``unique option'' is
+``defined multiple times'' then you need to use the
+https://nixos.org/nixos/manual/#sec-option-definitions-setting-priorities[`mkForce`]
+function. For example,
++
+[source,nix]
+----
+systemd.user.services.foo.Service.ExecStart = "/foo/bar";
+----
++
+becomes
++
+[source,nix]
+----
+systemd.user.services.foo.Service.ExecStart = lib.mkForce "/foo/bar";
+----
++
+We had to make this change because the old merging was causing too
+many confusing situations for people.
+
+[[sec-release-19.03-state-version-changes]]
+=== State Version Changes
+
+The state version in this release includes the changes below. These
+changes are only active if the <<opt-home.stateVersion>> option is set
+to ``19.03'' or later.
+
+* There is now an option <<opt-programs.beets.enable>> that defaults
+to `false`. Before the module would be active if the
+<<opt-programs.beets.settings>> option was non-empty.
diff --git a/home-manager/doc/release-notes/rl-1909.adoc b/home-manager/doc/release-notes/rl-1909.adoc
new file mode 100644
index 00000000000..2cc90c164de
--- /dev/null
+++ b/home-manager/doc/release-notes/rl-1909.adoc
@@ -0,0 +1,31 @@
+[[sec-release-19.09]]
+== Release 19.09
+
+The 19.09 release branch became the stable branch in October, 2019.
+
+[[sec-release-19.09-highlights]]
+=== Highlights
+
+This release has the following notable changes:
+
+* The <<opt-programs.firefox.enableGoogleTalk>> and
+  <<opt-programs.firefox.enableIcedTea>> options are now deprecated
+  and will only work if Firefox ESR 52.x is used.
+
+* The `home-manager` tool now provides an `uninstall` sub-command that
+  can be used to uninstall Home Manager, if used in the standalone
+  mode. That is, not as a NixOS module.
+
+[[sec-release-19.09-state-version-changes]]
+=== State Version Changes
+
+The state version in this release includes the changes below. These
+changes are only active if the `home.stateVersion` option is set to
+"19.09" or later.
+
+* The <<opt-programs.firefox.package>> option now expects a wrapped
+  Firefox package and defaults to `pkgs.firefox`.
+
+* The options <<opt-home.keyboard.layout>> and
+  <<opt-home.keyboard.variant>> now default to `null`, which indicates
+  that the system value should be used.
diff --git a/home-manager/doc/release-notes/rl-2003.adoc b/home-manager/doc/release-notes/rl-2003.adoc
new file mode 100644
index 00000000000..ff6d9325bd7
--- /dev/null
+++ b/home-manager/doc/release-notes/rl-2003.adoc
@@ -0,0 +1,21 @@
+[[sec-release-20.03]]
+== Release 20.03 (unreleased)
+
+This is the current unstable branch and the information in this
+section is therefore not final.
+
+[[sec-release-20.03-highlights]]
+=== Highlights
+
+This release has the following notable changes:
+
+* Nothing has happened.
+
+[[sec-release-20.03-state-version-changes]]
+=== State Version Changes
+
+The state version in this release includes the changes below. These
+changes are only active if the `home.stateVersion` option is set to
+"20.03" or later.
+
+* Nothing has happened.
diff --git a/home-manager/home-manager/completion.bash b/home-manager/home-manager/completion.bash
new file mode 100644
index 00000000000..501b87279fa
--- /dev/null
+++ b/home-manager/home-manager/completion.bash
@@ -0,0 +1,356 @@
+#!/bin/env bash
+
+##################################################
+
+# « home-manager » command-line completion
+#
+# © 2019 "Sam Boosalis" <samboosalis@gmail.com>
+#
+# MIT License
+#
+
+##################################################
+# Contributing:
+
+# Compatibility — Bash 3.
+#
+# OSX won't update Bash 3 (last updated circa 2009) to Bash 4,
+# and we'd like this completion script to work on both Linux and Mac.
+#
+# For example, OSX Yosemite (released circa 2014) ships with Bash 3:
+#
+#  $ echo $BASH_VERSION
+#  3.2
+#
+# While Ubuntu LTS 14.04 (a.k.a. Trusty, also released circa 2016)
+# ships with the latest version, Bash 4 (updated circa 2016):
+#
+#  $ echo $BASH_VERSION
+#  4.3
+#
+
+# Testing
+#
+# (1) Invoke « shellcheck »
+#
+#     * source: « https://github.com/koalaman/shellcheck »
+#     * run:    « shellcheck ./share/bash-completion/completions/home-manager »
+#
+# (2) Interpret via Bash 3
+#
+#     * run:    « bash --noprofile --norc ./share/bash-completion/completions/home-manager »
+#
+
+##################################################
+# Examples:
+
+# $ home-manager <TAB>
+#
+# -A
+# -I
+# -f
+# --file
+# -h
+# --help
+# -n
+# --dry-run
+# -v
+# --verbose
+# build
+# edit
+# expire-generations
+# generations
+# help
+# news
+# packages
+# remove-generations
+# switch
+# uninstall
+
+# $ home-manager e<TAB>
+#
+# edit
+# expire-generations
+
+# $ home-manager remove-generations 20<TAB>
+#
+# 200
+# 201
+# 202
+# 203
+
+##################################################
+# Notes:
+
+# « home-manager » Subcommands:
+#
+#   help
+#   edit
+#   build
+#   switch
+#   generations
+#   remove-generations
+#   expire-generations
+#   packages
+#   news
+#   uninstall
+
+# « home-manager » Options:
+#
+#   -b EXT
+#   -f FILE
+#   --file FILE
+#   -A ATTRIBUTE
+#   -I PATH
+#   -v
+#   --verbose
+#   -n
+#   --dry-run
+#   -h
+#   --help
+
+# $ home-manager
+#
+# Usage: /home/sboo/.nix-profile/bin/home-manager [OPTION] COMMAND
+#
+# Options
+#
+#   -f FILE      The home configuration file.
+#                Default is '~/.config/nixpkgs/home.nix'.
+#   -A ATTRIBUTE Optional attribute that selects a configuration
+#                expression in the configuration file.
+#   -I PATH      Add a path to the Nix expression search path.
+#   -b EXT       Move existing files to new path rather than fail.
+#   -v           Verbose output
+#   -n           Do a dry run, only prints what actions would be taken
+#   -h           Print this help
+#
+# Commands
+#
+#   help         Print this help
+#
+#   edit         Open the home configuration in $EDITOR
+#
+#   build        Build configuration into result directory
+#
+#   switch       Build and activate configuration
+#
+#   generations  List all home environment generations
+#
+#   remove-generations ID...
+#       Remove indicated generations. Use 'generations' command to
+#       find suitable generation numbers.
+#
+#   expire-generations TIMESTAMP
+#       Remove generations older than TIMESTAMP where TIMESTAMP is
+#       interpreted as in the -d argument of the date tool. For
+#       example "-30 days" or "2018-01-01".
+#
+#   packages     List all packages installed in home-manager-path
+#
+#   news         Show news entries in a pager
+#
+#   uninstall    Remove Home Manager
+#
+##################################################
+# Dependencies:
+
+command -v home-manager >/dev/null
+command -v grep         >/dev/null
+command -v sed          >/dev/null
+
+##################################################
+# Code:
+
+_home-manager_list-generation-identifiers ()
+
+{
+
+    home-manager generations  |  sed -n -e 's/^................ : id \([[:alnum:]]\+\) -> .*/\1/p'
+
+}
+
+# NOTES
+#
+# (1) the « sed -n -e 's/.../.../p' » invocation:
+#
+#    * the « -e '...' » option takes a Sed Script.
+#    * the « -n » option only prints when « .../p » would print.
+#    * the « s/xxx/yyy/ » Sed Script substitutes « yyy » whenever « xxx » is matched.
+#
+# (2) the « '^................ : id \([[:alnum:]]\+\) -> .*' » regular expression:
+#
+#    * matches « 199 », for example, in the line « 2019-03-13 15:26 : id 199 -> /nix/store/mv619y9pzgsx3kndq0q7fjfvbqqdy5k8-home-manager-generation »
+#
+#
+
+#------------------------------------------------#
+
+# shellcheck disable=SC2120
+_home-manager_list-nix-attributes ()
+
+{
+    local HomeFile
+    local HomeAttrsString
+    # local HomeAttrsArray
+    # local HomeAttr
+
+    if   [ -z "$1" ]
+    then
+        HomeFile=$(readlink -f "$(_home-manager_get-default-home-file)")
+    else
+        HomeFile="$1"
+    fi
+
+    HomeAttrsString=$(nix-instantiate --eval -E "let home = import ${HomeFile}; in (builtins.trace (builtins.toString (builtins.attrNames home)) null)" |& grep '^trace: ')
+    HomeAttrsString="${HomeAttrsString#trace: }"
+
+    echo "${HomeAttrsString}"
+
+    # IFS=" " read -ar HomeAttrsArray <<< "${HomeAttrsString}"
+    #
+    # local HomeAttr
+    # for HomeAttr in "${HomeAttrsArray[@]}"
+    # do
+    #     echo "${HomeAttr}"
+    # done
+
+}
+
+# e.g.:
+#
+#   $ nix-instantiate --eval -E 'let home = import /home/sboo/configuration/configs/nixpkgs/home-attrs.nix; in (builtins.trace (builtins.toString (builtins.attrNames home)) null)' 1>/dev/null
+#   trace: darwin linux
+#
+#   $ _home-manager_list-nix-attributes
+#   linux darwin
+#
+
+#------------------------------------------------#
+
+_home-manager_get-default-home-file ()
+
+{
+    local HomeFileDefault
+
+    HomeFileDefault="$(_home-manager_xdg-get-config-home)/nixpkgs/home.nix"
+
+    echo "${HomeFileDefault}"
+}
+
+# e.g.:
+#
+#   $ _home-manager_get-default-home-file
+#   ~/.config/nixpkgs/home.nix
+#
+
+##################################################
+# XDG-BaseDirs:
+
+_home-manager_xdg-get-config-home () {
+
+    echo "${XDG_CONFIG_HOME:-$HOME/.config}"
+
+}
+
+#------------------------------------------------#
+
+_home-manager_xdg-get-data-home () {
+
+    echo "${XDG_DATA_HOME:-$HOME/.local/share}"
+
+}
+
+
+#------------------------------------------------#
+_home-manager_xdg-get-cache-home () {
+
+    echo "${XDG_CACHE_HOME:-$HOME/.cache}"
+
+}
+
+##################################################
+
+# shellcheck disable=SC2207
+_home-manager_completions ()
+{
+
+    #--------------------------#
+
+    local Subcommands
+    Subcommands=( "help" "edit" "build" "switch" "generations" "remove-generations" "expire-generations" "packages" "news" "uninstall" )
+
+    # ^ « home-manager »'s subcommands.
+
+    #--------------------------#
+
+    local Options
+    Options=( "-f" "--file" "-b" "-A" "-I" "-h" "--help" "-n" "--dry-run" "-v" "--verbose" "--show-trace" )
+
+    # ^ « home-manager »'s options.
+
+    #--------------------------#
+
+    local CurrentWord
+    CurrentWord="${COMP_WORDS[$COMP_CWORD]}"
+
+    # ^ the word currently being completed
+
+    local PreviousWord
+    if [ "$COMP_CWORD" -ge 1 ]
+    then
+        PreviousWord="${COMP_WORDS[COMP_CWORD-1]}"
+    else
+        PreviousWord=""
+    fi
+
+    # ^ the word to the left of the current word.
+    #
+    #   e.g. in « home-manager -v -f ./<TAB> »:
+    #
+    #       PreviousWord="-f"
+    #       CurrentWord="./"
+
+    #--------------------------#
+
+    COMPREPLY=()
+
+    case "$PreviousWord" in
+
+        "-f"|"--file")
+
+            COMPREPLY+=( $( compgen -A file -- "$CurrentWord") )
+            ;;
+
+        "-I")
+
+            COMPREPLY+=( $( compgen -A directory -- "$CurrentWord") )
+            ;;
+
+        "-A")
+
+            # shellcheck disable=SC2119
+            COMPREPLY+=( $( compgen -W "$(_home-manager_list-nix-attributes)" -- "$CurrentWord") )
+            ;;
+
+        "remove-generations")
+
+            COMPREPLY+=( $( compgen -W "$(_home-manager_list-generation-identifiers)" -- "$CurrentWord" ) )
+            ;;
+
+        *)
+
+            COMPREPLY+=( $( compgen -W "${Subcommands[*]}" -- "$CurrentWord" ) )
+            COMPREPLY+=( $( compgen -W "${Options[*]}" -- "$CurrentWord" ) )
+            ;;
+
+    esac
+
+    #--------------------------#
+}
+
+##################################################
+
+complete -F _home-manager_completions -o default home-manager
+
+#complete -W "help edit build switch generations remove-generations expire-generations packages news" home-manager
diff --git a/home-manager/home-manager/default.nix b/home-manager/home-manager/default.nix
new file mode 100644
index 00000000000..8b5ae75e0fd
--- /dev/null
+++ b/home-manager/home-manager/default.nix
@@ -0,0 +1,40 @@
+{ runCommand, lib, bash, coreutils, findutils, gnused, less
+
+  # Extra path to Home Manager. If set then this path will be tried
+  # before `$HOME/.config/nixpkgs/home-manager` and
+  # `$HOME/.nixpkgs/home-manager`.
+, path ? null
+}:
+
+let
+
+  pathStr = if path == null then "" else path;
+
+in
+
+runCommand
+  "home-manager"
+  {
+    preferLocalBuild = true;
+    allowSubstitutes = false;
+    meta = with lib; {
+      description = "A user environment configurator";
+      maintainers = [ maintainers.rycee ];
+      platforms = platforms.unix;
+      license = licenses.mit;
+    };
+  }
+  ''
+    install -v -D -m755  ${./home-manager} $out/bin/home-manager
+
+    substituteInPlace $out/bin/home-manager \
+      --subst-var-by bash "${bash}" \
+      --subst-var-by coreutils "${coreutils}" \
+      --subst-var-by findutils "${findutils}" \
+      --subst-var-by gnused "${gnused}" \
+      --subst-var-by less "${less}" \
+      --subst-var-by HOME_MANAGER_PATH '${pathStr}'
+
+    install -D -m755 ${./completion.bash} \
+      $out/share/bash-completion/completions/home-manager
+  ''
diff --git a/home-manager/home-manager/home-manager b/home-manager/home-manager/home-manager
new file mode 100644
index 00000000000..6fe4f13c7f0
--- /dev/null
+++ b/home-manager/home-manager/home-manager
@@ -0,0 +1,577 @@
+#!@bash@/bin/bash
+
+# Prepare to use tools from Nixpkgs.
+PATH=@coreutils@/bin:@findutils@/bin:@gnused@/bin:@less@/bin${PATH:+:}$PATH
+
+set -euo pipefail
+
+function errorEcho() {
+    # shellcheck disable=2048,2086
+    echo $* >&2
+}
+
+function setVerboseAndDryRun() {
+    if [[ -v VERBOSE ]]; then
+        export VERBOSE_ARG="--verbose"
+    else
+        export VERBOSE_ARG=""
+    fi
+
+    if [[ -v DRY_RUN ]] ; then
+        export DRY_RUN_CMD=echo
+    else
+        export DRY_RUN_CMD=""
+    fi
+}
+
+function setWorkDir() {
+    if [[ ! -v WORK_DIR ]]; then
+        WORK_DIR="$(mktemp --tmpdir -d home-manager-build.XXXXXXXXXX)"
+        # shellcheck disable=2064
+        trap "rm -r '$WORK_DIR'" EXIT
+    fi
+}
+
+# Attempts to set the HOME_MANAGER_CONFIG global variable.
+#
+# If no configuration file can be found then this function will print
+# an error message and exit with an error code.
+function setConfigFile() {
+    if [[ -v HOME_MANAGER_CONFIG ]] ; then
+        if [[ ! -e "$HOME_MANAGER_CONFIG" ]] ; then
+            errorEcho "No configuration file found at $HOME_MANAGER_CONFIG"
+            exit 1
+        fi
+
+        HOME_MANAGER_CONFIG="$(realpath "$HOME_MANAGER_CONFIG")"
+        return
+    fi
+
+    local defaultConfFile="${XDG_CONFIG_HOME:-$HOME/.config}/nixpkgs/home.nix"
+    local confFile
+    for confFile in "$defaultConfFile" \
+                    "$HOME/.nixpkgs/home.nix" ; do
+        if [[ -e "$confFile" ]] ; then
+            HOME_MANAGER_CONFIG="$(realpath "$confFile")"
+            return
+        fi
+    done
+
+    errorEcho "No configuration file found." \
+         "Please create one at $defaultConfFile"
+    exit 1
+}
+
+function setHomeManagerNixPath() {
+    local path
+    for path in "@HOME_MANAGER_PATH@" \
+                "${XDG_CONFIG_HOME:-$HOME/.config}/nixpkgs/home-manager" \
+                "$HOME/.nixpkgs/home-manager" ; do
+        if [[ -e "$path" || "$path" =~ ^https?:// ]] ; then
+            export NIX_PATH="home-manager=$path${NIX_PATH:+:}$NIX_PATH"
+            return
+        fi
+    done
+}
+
+function doBuildAttr() {
+    setConfigFile
+    setHomeManagerNixPath
+
+    local extraArgs="$*"
+
+    for p in "${EXTRA_NIX_PATH[@]}"; do
+        extraArgs="$extraArgs -I $p"
+    done
+
+    if [[ -v VERBOSE ]]; then
+        extraArgs="$extraArgs --show-trace"
+    fi
+
+    # shellcheck disable=2086
+    if [[ -v USE_NIX2_COMMAND ]]; then
+        nix build \
+            -f "<home-manager/home-manager/home-manager.nix>" \
+            $extraArgs \
+            ${PASSTHROUGH_OPTS[*]} \
+            --argstr confPath "$HOME_MANAGER_CONFIG" \
+            --argstr confAttr "$HOME_MANAGER_CONFIG_ATTRIBUTE"
+    else
+        nix-build \
+            "<home-manager/home-manager/home-manager.nix>" \
+            $extraArgs \
+            ${PASSTHROUGH_OPTS[*]} \
+            --argstr confPath "$HOME_MANAGER_CONFIG" \
+            --argstr confAttr "$HOME_MANAGER_CONFIG_ATTRIBUTE"
+    fi
+}
+
+# Presents news to the user. Takes as argument the path to a "news
+# info" file as generated by `buildNews`.
+function presentNews() {
+    local infoFile="$1"
+
+    # shellcheck source=/dev/null
+    . "$infoFile"
+
+    # shellcheck disable=2154
+    if [[ $newsNumUnread -eq 0 ]]; then
+        return
+    elif [[ "$newsDisplay" == "silent" ]]; then
+        return
+    elif [[ "$newsDisplay" == "notify" ]]; then
+        local msg
+        if [[ $newsNumUnread -eq 1 ]]; then
+            msg="There is an unread and relevant news item.\n"
+            msg+="Read it by running the command '$(basename "$0") news'."
+        else
+            msg="There are $newsNumUnread unread and relevant news items.\n"
+            msg+="Read them by running the command '$(basename "$0") news'."
+        fi
+
+        # Not actually an error but here stdout is reserved for
+        # nix-build output.
+        errorEcho
+        errorEcho -e "$msg"
+        errorEcho
+
+        if [[ -v DISPLAY ]] && type -P notify-send > /dev/null; then
+            notify-send "Home Manager" "$msg"
+        fi
+    elif [[ "$newsDisplay" == "show" ]]; then
+        doShowNews --unread
+    else
+        errorEcho "Unknown 'news.display' setting '$newsDisplay'."
+    fi
+}
+
+function doEdit() {
+    if [[ ! -v EDITOR || -z $EDITOR ]]; then
+        errorEcho "Please set the \$EDITOR environment variable"
+        return 1
+    fi
+
+    setConfigFile
+
+    exec "$EDITOR" "$HOME_MANAGER_CONFIG"
+}
+
+function doBuild() {
+    if [[ ! -w . ]]; then
+        errorEcho "Cannot run build in read-only directory";
+        return 1
+    fi
+
+    setWorkDir
+
+    local newsInfo
+    newsInfo=$(buildNews)
+
+    local exitCode
+
+    if [[ -v USE_NIX2_COMMAND ]]; then
+        doBuildAttr activationPackage \
+            && exitCode=0 || exitCode=1
+    else
+        doBuildAttr --attr activationPackage \
+            && exitCode=0 || exitCode=1
+    fi
+
+    presentNews "$newsInfo"
+
+    return $exitCode
+}
+
+function doSwitch() {
+    setWorkDir
+
+    local newsInfo
+    newsInfo=$(buildNews)
+
+    local generation
+    local exitCode=0
+
+    # Build the generation and run the activate script. Note, we
+    # specify an output link so that it is treated as a GC root. This
+    # prevents an unfortunately timed GC from removing the generation
+    # before activation completes.
+    generation="$WORK_DIR/generation"
+
+    if [[ -v USE_NIX2_COMMAND ]]; then
+        doBuildAttr \
+                    --out-link "$generation" \
+                    activationPackage \
+            && "$generation/activate" || exitCode=1
+    else
+        doBuildAttr \
+                    --out-link "$generation" \
+                    --attr activationPackage \
+            && "$generation/activate" || exitCode=1
+    fi
+
+    presentNews "$newsInfo"
+
+    return $exitCode
+}
+
+function doListGens() {
+    # Whether to colorize the generations output.
+    local color="never"
+    if [[ -t 1 ]]; then
+        color="always"
+    fi
+
+    pushd "/nix/var/nix/profiles/per-user/$USER" > /dev/null
+    # shellcheck disable=2012
+    ls --color=$color -gG --time-style=long-iso --sort time home-manager-*-link \
+        | cut -d' ' -f 4- \
+        | sed -E 's/home-manager-([[:digit:]]*)-link/: id \1/'
+    popd > /dev/null
+}
+
+# Removes linked generations. Takes as arguments identifiers of
+# generations to remove.
+function doRmGenerations() {
+    setVerboseAndDryRun
+
+    pushd "/nix/var/nix/profiles/per-user/$USER" > /dev/null
+
+    for generationId in "$@"; do
+        local linkName="home-manager-$generationId-link"
+
+        if [[ ! -e $linkName ]]; then
+            errorEcho "No generation with ID $generationId"
+        elif [[ $linkName == $(readlink home-manager) ]]; then
+            errorEcho "Cannot remove the current generation $generationId"
+        else
+            echo Removing generation $generationId
+            $DRY_RUN_CMD rm $VERBOSE_ARG $linkName
+        fi
+    done
+
+    popd > /dev/null
+}
+
+function doRmAllGenerations() {
+    $DRY_RUN_CMD rm $VERBOSE_ARG \
+        "/nix/var/nix/profiles/per-user/$USER/home-manager"*
+}
+
+function doExpireGenerations() {
+    local profileDir="/nix/var/nix/profiles/per-user/$USER"
+
+    local generations
+    generations="$( \
+        find "$profileDir" -name 'home-manager-*-link' -not -newermt "$1" \
+        | sed 's/^.*-\([0-9]*\)-link$/\1/' \
+    )"
+
+    if [[ -n $generations ]]; then
+        # shellcheck disable=2086
+        doRmGenerations $generations
+    elif [[ -v VERBOSE ]]; then
+        echo "No generations to expire"
+    fi
+}
+
+function doListPackages() {
+    local outPath
+    outPath="$(nix-env -q --out-path | grep -o '/.*home-manager-path$')"
+    if [[ -n "$outPath" ]] ; then
+        nix-store -q --references "$outPath" | sed 's/[^-]*-//'
+    else
+        errorEcho "No home-manager packages seem to be installed."
+    fi
+}
+
+function newsReadIdsFile() {
+    local dataDir="${XDG_DATA_HOME:-$HOME/.local/share}/home-manager"
+    local path="$dataDir/news-read-ids"
+
+    # If the path doesn't exist then we should create it, otherwise
+    # Nix will error out when we attempt to use builtins.readFile.
+    if [[ ! -f "$path" ]]; then
+        mkdir -p "$dataDir"
+        touch "$path"
+    fi
+
+    echo "$path"
+}
+
+# Builds news meta information to be sourced into this script.
+#
+# Note, we suppress build output to remove unnecessary verbosity. We
+# put the output in the work directory to avoid the risk of an
+# unfortunately timed GC removing it.
+function buildNews() {
+    local output
+    output="$WORK_DIR/news-info.sh"
+
+    if [[ -v USE_NIX2_COMMAND ]]; then
+        doBuildAttr \
+                    --out-link "$output" \
+                    --quiet \
+                    --arg check false \
+                    --argstr newsReadIdsFile "$(newsReadIdsFile)" \
+                    newsInfo
+    else
+        doBuildAttr \
+                    --out-link "$output" \
+                    --no-build-output \
+                    --quiet \
+                    --arg check false \
+                    --argstr newsReadIdsFile "$(newsReadIdsFile)" \
+                    --attr newsInfo \
+                    > /dev/null
+    fi
+
+    echo "$output"
+}
+
+function doShowNews() {
+    setWorkDir
+
+    local infoFile
+    infoFile=$(buildNews) || return 1
+
+    # shellcheck source=/dev/null
+    . "$infoFile"
+
+    # shellcheck disable=2154
+    case $1 in
+        --all)
+            ${PAGER:-less} "$newsFileAll"
+            ;;
+        --unread)
+            ${PAGER:-less} "$newsFileUnread"
+            ;;
+        *)
+            errorEcho "Unknown argument $1"
+            return 1
+    esac
+
+    # shellcheck disable=2154
+    if [[ -s "$newsUnreadIdsFile" ]]; then
+        local newsReadIdsFile
+        newsReadIdsFile="$(newsReadIdsFile)"
+        cat "$newsUnreadIdsFile" >> "$newsReadIdsFile"
+    fi
+}
+
+function doUninstall() {
+    setVerboseAndDryRun
+
+    echo "This will remove Home Manager from your system."
+
+    if [[ -v DRY_RUN ]]; then
+        echo "This is a dry run, nothing will actually be uninstalled."
+    fi
+
+    local confirmation
+    read -r -n 1 -p "Really uninstall Home Manager? [y/n] " confirmation
+    echo
+
+    case $confirmation in
+        y|Y)
+            echo "Switching to empty Home Manager configuration..."
+            HOME_MANAGER_CONFIG="$(mktemp --tmpdir home-manager.XXXXXXXXXX)"
+            echo "{}" > "$HOME_MANAGER_CONFIG"
+            doSwitch
+            rm "$HOME_MANAGER_CONFIG"
+            $DRY_RUN_CMD rm $VERBOSE_ARG -r \
+                "${XDG_DATA_HOME:-$HOME/.local/share}/home-manager"
+            $DRY_RUN_CMD rm $VERBOSE_ARG \
+                "/nix/var/nix/gcroots/per-user/$USER/current-home"
+            ;;
+        *)
+            echo "Yay!"
+            exit 0
+            ;;
+    esac
+
+    local deleteProfiles
+    read -r -n 1 \
+         -p 'Remove all Home Manager generations? [y/n] ' \
+         deleteProfiles
+    echo
+
+    case $deleteProfiles in
+        y|Y)
+            doRmAllGenerations
+            echo "All generations are now eligible for garbage collection."
+            ;;
+        *)
+            echo "Leaving generations but they may still be garbage collected."
+            ;;
+    esac
+
+    echo "Home Manager is uninstalled but your home.nix is left untouched."
+}
+
+function doHelp() {
+    echo "Usage: $0 [OPTION] COMMAND"
+    echo
+    echo "Options"
+    echo
+    echo "  -f FILE      The home configuration file."
+    echo "               Default is '~/.config/nixpkgs/home.nix'."
+    echo "  -A ATTRIBUTE Optional attribute that selects a configuration"
+    echo "               expression in the configuration file."
+    echo "  -I PATH      Add a path to the Nix expression search path."
+    echo "  -b EXT       Move existing files to new path rather than fail."
+    echo "  -v           Verbose output"
+    echo "  -n           Do a dry run, only prints what actions would be taken"
+    echo "  -h           Print this help"
+    echo
+    echo "Options passed on to nix-build(1)"
+    echo
+    echo "  --cores NUM"
+    echo "  --keep-failed"
+    echo "  --keep-going"
+    echo "  --max-jobs NUM"
+    echo "  --option NAME VALUE"
+    echo "  --show-trace"
+    echo
+    echo "Commands"
+    echo
+    echo "  help         Print this help"
+    echo
+    echo "  edit         Open the home configuration in \$EDITOR"
+    echo
+    echo "  build        Build configuration into result directory"
+    echo
+    echo "  switch       Build and activate configuration"
+    echo
+    echo "  generations  List all home environment generations"
+    echo
+    echo "  remove-generations ID..."
+    echo "      Remove indicated generations. Use 'generations' command to"
+    echo "      find suitable generation numbers."
+    echo
+    echo "  expire-generations TIMESTAMP"
+    echo "      Remove generations older than TIMESTAMP where TIMESTAMP is"
+    echo "      interpreted as in the -d argument of the date tool. For"
+    echo "      example \"-30 days\" or \"2018-01-01\"."
+    echo
+    echo "  packages     List all packages installed in home-manager-path"
+    echo
+    echo "  news         Show news entries in a pager"
+    echo
+    echo "  uninstall    Remove Home Manager"
+}
+
+EXTRA_NIX_PATH=()
+HOME_MANAGER_CONFIG_ATTRIBUTE=""
+PASSTHROUGH_OPTS=()
+COMMAND=""
+COMMAND_ARGS=()
+
+while [[ $# -gt 0 ]]; do
+    opt="$1"
+    shift
+    case $opt in
+        build|edit|expire-generations|generations|help|news|packages|remove-generations|switch|uninstall)
+            COMMAND="$opt"
+            ;;
+        -2)
+            USE_NIX2_COMMAND=1
+            ;;
+        -A)
+            HOME_MANAGER_CONFIG_ATTRIBUTE="$1"
+            shift
+            ;;
+        -I)
+            EXTRA_NIX_PATH+=("$1")
+            shift
+            ;;
+        -b)
+            export HOME_MANAGER_BACKUP_EXT="$1"
+            shift
+            ;;
+        -f|--file)
+            HOME_MANAGER_CONFIG="$1"
+            shift
+            ;;
+        -h|--help)
+            doHelp
+            exit 0
+            ;;
+        -n|--dry-run)
+            export DRY_RUN=1
+            ;;
+        --option)
+            PASSTHROUGH_OPTS+=("$opt" "$1" "$2")
+            shift 2
+            ;;
+        --max-jobs|--cores)
+            PASSTHROUGH_OPTS+=("$opt" "$1")
+            shift
+            ;;
+        --keep-failed|--keep-going|--show-trace)
+            PASSTHROUGH_OPTS+=("$opt")
+            ;;
+        -v|--verbose)
+            export VERBOSE=1
+            ;;
+        *)
+            case $COMMAND in
+                expire-generations|remove-generations)
+                    COMMAND_ARGS+=("$opt")
+                    ;;
+                *)
+                    errorEcho "$0: unknown option '$opt'"
+                    errorEcho "Run '$0 --help' for usage help"
+                    exit 1
+                    ;;
+            esac
+            ;;
+    esac
+done
+
+if [[ -z $COMMAND ]]; then
+    doHelp >&2
+    exit 1
+fi
+
+case $COMMAND in
+    edit)
+        doEdit
+        ;;
+    build)
+        doBuild
+        ;;
+    switch)
+        doSwitch
+        ;;
+    generations)
+        doListGens
+        ;;
+    remove-generations)
+        doRmGenerations "${COMMAND_ARGS[@]}"
+        ;;
+    expire-generations)
+        if [[ ${#COMMAND_ARGS[@]} != 1 ]]; then
+            errorEcho "expire-generations expects one argument, got ${#COMMAND_ARGS[@]}."
+            exit 1
+        else
+            doExpireGenerations "${COMMAND_ARGS[@]}"
+        fi
+        ;;
+    packages)
+        doListPackages
+        ;;
+    news)
+        doShowNews --all
+        ;;
+    uninstall)
+        doUninstall
+        ;;
+    help)
+        doHelp
+        ;;
+    *)
+        errorEcho "Unknown command: $COMMAND"
+        doHelp >&2
+        exit 1
+        ;;
+esac
diff --git a/home-manager/home-manager/home-manager.nix b/home-manager/home-manager/home-manager.nix
new file mode 100644
index 00000000000..7a6748942c8
--- /dev/null
+++ b/home-manager/home-manager/home-manager.nix
@@ -0,0 +1,88 @@
+{ pkgs ? import <nixpkgs> {}
+, confPath
+, confAttr
+, check ? true
+, newsReadIdsFile ? null
+}:
+
+with pkgs.lib;
+
+let
+
+  env = import ../modules {
+    configuration =
+      if confAttr == ""
+      then confPath
+      else (import confPath).${confAttr};
+    pkgs = pkgs;
+    check = check;
+  };
+
+  newsReadIds =
+    if newsReadIdsFile == null
+    then {}
+    else
+      let
+        ids = splitString "\n" (fileContents newsReadIdsFile);
+      in
+        builtins.listToAttrs (map (id: { name = id; value = null; }) ids);
+
+  newsIsRead = entry: builtins.hasAttr entry.id newsReadIds;
+
+  newsFiltered =
+    let
+      pred = entry: entry.condition && ! newsIsRead entry;
+    in
+      filter pred env.newsEntries;
+
+  newsNumUnread = length newsFiltered;
+
+  newsFileUnread = pkgs.writeText "news-unread.txt" (
+    concatMapStringsSep "\n\n" (entry:
+      let
+        time = replaceStrings ["T"] [" "] (removeSuffix "+00:00" entry.time);
+      in
+        ''
+          * ${time}
+
+            ${replaceStrings ["\n"] ["\n  "] entry.message}
+        ''
+    ) newsFiltered
+  );
+
+  newsFileAll = pkgs.writeText "news-all.txt" (
+    concatMapStringsSep "\n\n" (entry:
+      let
+        flag = if newsIsRead entry then "read" else "unread";
+        time = replaceStrings ["T"] [" "] (removeSuffix "+00:00" entry.time);
+      in
+        ''
+          * ${time} [${flag}]
+
+            ${replaceStrings ["\n"] ["\n  "] entry.message}
+        ''
+    ) env.newsEntries
+  );
+
+  # File where each line corresponds to an unread news entry
+  # identifier. If non-empty then the file ends in "\n".
+  newsUnreadIdsFile = pkgs.writeText "news-unread-ids" (
+    let
+      text = concatMapStringsSep "\n" (entry: entry.id) newsFiltered;
+    in
+      text + optionalString (text != "") "\n"
+  );
+
+  newsInfo = pkgs.writeText "news-info.sh" ''
+    local newsNumUnread=${toString newsNumUnread}
+    local newsDisplay="${env.newsDisplay}"
+    local newsFileAll="${newsFileAll}"
+    local newsFileUnread="${newsFileUnread}"
+    local newsUnreadIdsFile="${newsUnreadIdsFile}"
+  '';
+
+in
+  {
+    inherit (env) activationPackage;
+    inherit newsInfo;
+  }
diff --git a/home-manager/home-manager/install.nix b/home-manager/home-manager/install.nix
new file mode 100644
index 00000000000..c58c0ba7478
--- /dev/null
+++ b/home-manager/home-manager/install.nix
@@ -0,0 +1,60 @@
+{ home-manager, runCommand }:
+
+runCommand
+  "home-manager-install"
+  {
+    propagatedBuildInputs = [ home-manager ];
+    preferLocalBuild = true;
+    allowSubstitutes = false;
+    shellHookOnly = true;
+    shellHook = ''
+      confFile="''${XDG_CONFIG_HOME:-$HOME/.config}/nixpkgs/home.nix"
+
+      if [[ ! -e $confFile ]]; then
+        echo
+        echo "Creating initial Home Manager configuration..."
+
+        mkdir -p "$(dirname "$confFile")"
+        cat > $confFile <<EOF
+      { config, pkgs, ... }:
+
+      {
+        # Let Home Manager install and manage itself.
+        programs.home-manager.enable = true;
+      }
+      EOF
+      fi
+
+      echo
+      echo "Creating initial Home Manager generation..."
+      echo
+
+      if home-manager switch; then
+        cat <<EOF
+
+      All done! The home-manager tool should now be installed and you
+      can edit
+
+          $confFile
+
+      to configure Home Manager. Run 'man home-configuration.nix' to
+      see all available options.
+      EOF
+        exit 0
+      else
+        cat <<EOF
+
+      Uh oh, the installation failed! Please create an issue at
+
+          https://github.com/rycee/home-manager/issues
+
+      if the error seems to be the fault of Home Manager.
+      EOF
+        exit 1
+      fi
+    '';
+  }
+  ''
+    echo This derivation is not buildable, instead run it using nix-shell.
+    exit 1
+  ''
diff --git a/home-manager/modules/accounts/email.nix b/home-manager/modules/accounts/email.nix
new file mode 100644
index 00000000000..cc9d0dc2813
--- /dev/null
+++ b/home-manager/modules/accounts/email.nix
@@ -0,0 +1,422 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.accounts.email;
+
+  gpgModule = types.submodule {
+    options = {
+      key = mkOption {
+        type = types.str;
+        description = ''
+          The key to use as listed in <command>gpg --list-keys</command>.
+        '';
+      };
+
+      signByDefault = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Sign messages by default.";
+      };
+
+      encryptByDefault = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Encrypt outgoing messages by default.";
+      };
+    };
+  };
+
+  signatureModule = types.submodule {
+    options = {
+      text = mkOption {
+        type = types.str;
+        default = "";
+        example = ''
+          --
+          Luke Skywalker
+          May the force be with you.
+        '';
+        description = ''
+          Signature content.
+        '';
+      };
+
+      showSignature = mkOption {
+        type = types.enum [ "append" "attach" "none" ];
+        default = "none";
+        description = "Method to communicate the signature.";
+      };
+    };
+  };
+
+  tlsModule = types.submodule {
+    options = {
+      enable = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to enable TLS/SSL.
+        '';
+      };
+
+      useStartTls = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to use STARTTLS.
+        '';
+      };
+
+      certificatesFile = mkOption {
+        type = types.path;
+        default = config.accounts.email.certificatesFile;
+        defaultText = "config.accounts.email.certificatesFile";
+        description = ''
+          Path to file containing certificate authorities that should
+          be used to validate the connection authenticity. If
+          <literal>null</literal> then the system default is used.
+          Note, if set then the system default may still be accepted.
+        '';
+      };
+    };
+  };
+
+  imapModule = types.submodule {
+    options = {
+      host = mkOption {
+        type = types.str;
+        example = "imap.example.org";
+        description = ''
+          Hostname of IMAP server.
+        '';
+      };
+
+      port = mkOption {
+        type = types.nullOr types.port;
+        default = null;
+        example = 993;
+        description = ''
+          The port on which the IMAP server listens. If
+          <literal>null</literal> then the default port is used.
+        '';
+      };
+
+      tls = mkOption {
+        type = tlsModule;
+        default = {};
+        description = ''
+          Configuration for secure connections.
+        '';
+      };
+    };
+  };
+
+  smtpModule = types.submodule {
+    options = {
+      host = mkOption {
+        type = types.str;
+        example = "smtp.example.org";
+        description = ''
+          Hostname of SMTP server.
+        '';
+      };
+
+      port = mkOption {
+        type = types.nullOr types.port;
+        default = null;
+        example = 465;
+        description = ''
+          The port on which the SMTP server listens. If
+          <literal>null</literal> then the default port is used.
+        '';
+      };
+
+      tls = mkOption {
+        type = tlsModule;
+        default = {};
+        description = ''
+          Configuration for secure connections.
+        '';
+      };
+    };
+  };
+
+  maildirModule = types.submodule ({ config, ... }: {
+    options = {
+      path = mkOption {
+        type = types.str;
+        description = ''
+          Path to maildir directory where mail for this account is
+          stored. This is relative to the base maildir path.
+        '';
+      };
+
+      absPath = mkOption {
+        type = types.path;
+        readOnly = true;
+        internal = true;
+        default = "${cfg.maildirBasePath}/${config.path}";
+        description = ''
+          A convenience option whose value is the absolute path of
+          this maildir.
+        '';
+      };
+    };
+  });
+
+  mailAccountOpts = { name, config, ... }: {
+    options = {
+      name = mkOption {
+        type = types.str;
+        readOnly = true;
+        description = ''
+          Unique identifier of the account. This is set to the
+          attribute name of the account configuration.
+        '';
+      };
+
+      primary = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether this is the primary account. Only one account may be
+          set as primary.
+        '';
+      };
+
+      flavor = mkOption {
+        type = types.enum [ "plain" "gmail.com" "runbox.com" ];
+        default = "plain";
+        description = ''
+          Some email providers have peculiar behavior that require
+          special treatment. This option is therefore intended to
+          indicate the nature of the provider.
+          </para><para>
+          When this indicates a specific provider then, for example,
+          the IMAP and SMTP server configuration may be set
+          automatically.
+        '';
+      };
+
+      address = mkOption {
+        type = types.strMatching ".*@.*";
+        example = "jane.doe@example.org";
+        description = "The email address of this account.";
+      };
+
+      aliases = mkOption {
+        type = types.listOf (types.strMatching ".*@.*");
+        default = [];
+        example = [ "webmaster@example.org" "admin@example.org" ];
+        description = "Alternative email addresses of this account.";
+      };
+
+      realName = mkOption {
+        type = types.str;
+        example = "Jane Doe";
+        description = "Name displayed when sending mails.";
+      };
+
+      userName = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          The server username of this account. This will be used as
+          the SMTP and IMAP user name.
+        '';
+      };
+
+      passwordCommand = mkOption {
+        type = types.nullOr (types.either types.str (types.listOf types.str));
+        default = null;
+        apply = p: if isString p then splitString " " p else p;
+        example = "secret-tool lookup email me@example.org";
+        description = ''
+          A command, which when run writes the account password on
+          standard output.
+        '';
+      };
+
+      folders = mkOption {
+        type = types.submodule {
+          options = {
+            inbox = mkOption {
+              type = types.str;
+              default = "Inbox";
+              description = ''
+                Relative path of the inbox mail.
+              '';
+            };
+
+            sent = mkOption {
+              type = types.nullOr types.str;
+              default = "Sent";
+              description = ''
+                Relative path of the sent mail folder.
+              '';
+            };
+
+            drafts = mkOption {
+              type = types.str;
+              default = "Drafts";
+              description = ''
+                Relative path of the drafts mail folder.
+              '';
+            };
+
+            trash = mkOption {
+              type = types.str;
+              default = "Trash";
+              description = ''
+                Relative path of the deleted mail folder.
+              '';
+            };
+          };
+        };
+        default = {};
+        description = ''
+          Standard email folders.
+        '';
+      };
+
+      imap = mkOption {
+        type = types.nullOr imapModule;
+        default = null;
+        description = ''
+          The IMAP configuration to use for this account.
+        '';
+      };
+
+      signature = mkOption {
+        type = signatureModule;
+        default = {};
+        description = ''
+          Signature configuration.
+        '';
+      };
+
+      gpg = mkOption {
+        type = types.nullOr gpgModule;
+        default = null;
+        description = ''
+          GPG configuration.
+        '';
+      };
+
+      smtp = mkOption {
+        type = types.nullOr smtpModule;
+        default = null;
+        description = ''
+          The SMTP configuration to use for this account.
+        '';
+      };
+
+      maildir = mkOption {
+        type = types.nullOr maildirModule;
+        defaultText = { path = "\${name}"; };
+        description = ''
+          Maildir configuration for this account.
+        '';
+      };
+    };
+
+    config = mkMerge [
+      {
+        name = name;
+        maildir = mkOptionDefault { path = "${name}"; };
+      }
+
+      (mkIf (config.flavor == "gmail.com") {
+        userName = mkDefault config.address;
+
+        imap = {
+          host = "imap.gmail.com";
+        };
+
+        smtp = {
+          host = "smtp.gmail.com";
+          port = if config.smtp.tls.useStartTls then 587 else 465;
+        };
+      })
+
+      (mkIf (config.flavor == "runbox.com") {
+        imap = {
+          host = "mail.runbox.com";
+        };
+
+        smtp = {
+          host = "mail.runbox.com";
+        };
+      })
+    ];
+  };
+
+in
+
+{
+  options.accounts.email = {
+    certificatesFile = mkOption {
+      type = types.path;
+      default = "/etc/ssl/certs/ca-certificates.crt";
+      description = ''
+        Path to default file containing certificate authorities that
+        should be used to validate the connection authenticity. This
+        path may be overridden on a per-account basis.
+      '';
+    };
+
+    maildirBasePath = mkOption {
+      type = types.str;
+      default = "${config.home.homeDirectory}/Maildir";
+      defaultText = "$HOME/Maildir";
+      apply = p:
+        if hasPrefix "/" p
+        then p
+        else "${config.home.homeDirectory}/${p}";
+      description = ''
+        The base directory for account maildir directories. May be a
+        relative path, in which case it is relative the home
+        directory.
+      '';
+    };
+
+    accounts = mkOption {
+      type = types.attrsOf (types.submodule [
+        mailAccountOpts
+        (import ../programs/alot-accounts.nix pkgs)
+        (import ../programs/astroid-accounts.nix)
+        (import ../programs/getmail-accounts.nix)
+        (import ../programs/mbsync-accounts.nix)
+        (import ../programs/msmtp-accounts.nix)
+        (import ../programs/notmuch-accounts.nix)
+        (import ../programs/offlineimap-accounts.nix)
+      ]);
+      default = {};
+      description = "List of email accounts.";
+    };
+  };
+
+  config = mkIf (cfg.accounts != {}) {
+    assertions = [
+      (
+        let
+          primaries =
+            catAttrs "name"
+            (filter (a: a.primary)
+            (attrValues cfg.accounts));
+        in
+          {
+            assertion = length primaries == 1;
+            message =
+              "Must have exactly one primary mail account but found "
+              + toString (length primaries)
+              + optionalString (length primaries > 1)
+                  (", namely " + concatStringsSep ", " primaries);
+          }
+      )
+    ];
+  };
+}
diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix
new file mode 100644
index 00000000000..9f6404ff9cc
--- /dev/null
+++ b/home-manager/modules/default.nix
@@ -0,0 +1,56 @@
+{ configuration
+, pkgs
+, lib ? pkgs.stdenv.lib
+
+  # Whether to check that each option has a matching declaration.
+, check ? true
+}:
+
+with lib;
+
+let
+
+  collectFailed = cfg:
+    map (x: x.message) (filter (x: !x.assertion) cfg.assertions);
+
+  showWarnings = res:
+    let
+      f = w: x: builtins.trace "warning: ${w}" x;
+    in
+      fold f res res.config.warnings;
+
+  rawModule = lib.evalModules {
+    modules =
+      [ configuration ]
+      ++ (import ./modules.nix { inherit check lib pkgs; });
+    specialArgs = {
+      modulesPath = builtins.toString ./.;
+    };
+  };
+
+  module = showWarnings (
+    let
+      failed = collectFailed rawModule.config;
+      failedStr = concatStringsSep "\n" (map (x: "- ${x}") failed);
+    in
+      if failed == []
+      then rawModule
+      else throw "\nFailed assertions:\n${failedStr}"
+  );
+
+in
+
+{
+  inherit (module) options config;
+
+  activationPackage = module.config.home.activationPackage;
+
+  # For backwards compatibility. Please use activationPackage instead.
+  activation-script = module.config.home.activationPackage;
+
+  newsDisplay = rawModule.config.news.display;
+  newsEntries =
+    sort (a: b: a.time > b.time) (
+      filter (a: a.condition) rawModule.config.news.entries
+    );
+}
diff --git a/home-manager/modules/files.nix b/home-manager/modules/files.nix
new file mode 100644
index 00000000000..ac946976faf
--- /dev/null
+++ b/home-manager/modules/files.nix
@@ -0,0 +1,297 @@
+{ pkgs, config, lib, ... }:
+
+with lib;
+
+let
+
+  cfg = config.home.file;
+
+  dag = config.lib.dag;
+
+  homeDirectory = config.home.homeDirectory;
+
+  fileType = (import lib/file-type.nix {
+    inherit homeDirectory lib pkgs;
+  }).fileType;
+
+  sourceStorePath = file:
+    let
+      sourcePath = toString file.source;
+      sourceName = config.lib.strings.storeFileName (baseNameOf sourcePath);
+    in
+      if builtins.hasContext sourcePath
+      then file.source
+      else builtins.path { path = file.source; name = sourceName; };
+
+  # A symbolic link whose target path matches this pattern will be
+  # considered part of a Home Manager generation.
+  homeFilePattern = "${builtins.storeDir}/*-home-manager-files/*";
+
+in
+
+{
+  options = {
+    home.file = mkOption {
+      description = "Attribute set of files to link into the user home.";
+      default = {};
+      type = fileType "<envar>HOME</envar>" homeDirectory;
+    };
+
+    home-files = mkOption {
+      type = types.package;
+      internal = true;
+      description = "Package to contain all home files";
+    };
+  };
+
+  config = {
+    # This verifies that the links we are about to create will not
+    # overwrite an existing file.
+    home.activation.checkLinkTargets = dag.entryBefore ["writeBoundary"] (
+      let
+        check = pkgs.writeText "check" ''
+          . ${./lib-bash/color-echo.sh}
+
+          newGenFiles="$1"
+          shift
+          for sourcePath in "$@" ; do
+            relativePath="''${sourcePath#$newGenFiles/}"
+            targetPath="$HOME/$relativePath"
+            if [[ -e "$targetPath" \
+                && ! "$(readlink "$targetPath")" == ${homeFilePattern} ]] ; then
+              if [[ ! -L "$targetPath" && -n "$HOME_MANAGER_BACKUP_EXT" ]] ; then
+                backup="$targetPath.$HOME_MANAGER_BACKUP_EXT"
+                if [[ -e "$backup" ]]; then
+                  errorEcho "Existing file '$backup' would be clobbered by backing up '$targetPath'"
+                  collision=1
+                else
+                  warnEcho "Existing file '$targetPath' is in the way, will be moved to '$backup'"
+                fi
+              else
+                errorEcho "Existing file '$targetPath' is in the way"
+                collision=1
+              fi
+            fi
+          done
+
+          if [[ -v collision ]] ; then
+            errorEcho "Please move the above files and try again or use -b <ext> to move automatically."
+            exit 1
+          fi
+        '';
+      in
+      ''
+        function checkNewGenCollision() {
+          local newGenFiles
+          newGenFiles="$(readlink -e "$newGenPath/home-files")"
+          find "$newGenFiles" \( -type f -or -type l \) \
+              -exec bash ${check} "$newGenFiles" {} +
+        }
+
+        checkNewGenCollision || exit 1
+      ''
+    );
+
+    # This activation script will
+    #
+    # 1. Remove files from the old generation that are not in the new
+    #    generation.
+    #
+    # 2. Switch over the Home Manager gcroot and current profile
+    #    links.
+    #
+    # 3. Symlink files from the new generation into $HOME.
+    #
+    # This order is needed to ensure that we always know which links
+    # belong to which generation. Specifically, if we're moving from
+    # generation A to generation B having sets of home file links FA
+    # and FB, respectively then cleaning before linking produces state
+    # transitions similar to
+    #
+    #      FA   →   FA ∩ FB   →   (FA ∩ FB) ∪ FB = FB
+    #
+    # and a failure during the intermediate state FA ∩ FB will not
+    # result in lost links because this set of links are in both the
+    # source and target generation.
+    home.activation.linkGeneration = dag.entryAfter ["writeBoundary"] (
+      let
+        link = pkgs.writeText "link" ''
+          newGenFiles="$1"
+          shift
+          for sourcePath in "$@" ; do
+            relativePath="''${sourcePath#$newGenFiles/}"
+            targetPath="$HOME/$relativePath"
+            if [[ -e "$targetPath" && ! -L "$targetPath" && -n "$HOME_MANAGER_BACKUP_EXT" ]] ; then
+              backup="$targetPath.$HOME_MANAGER_BACKUP_EXT"
+              $DRY_RUN_CMD mv $VERBOSE_ARG "$targetPath" "$backup" || errorEcho "Moving '$targetPath' failed!"
+            fi
+            $DRY_RUN_CMD mkdir -p $VERBOSE_ARG "$(dirname "$targetPath")"
+            $DRY_RUN_CMD ln -nsf $VERBOSE_ARG "$sourcePath" "$targetPath"
+          done
+        '';
+
+        cleanup = pkgs.writeText "cleanup" ''
+          . ${./lib-bash/color-echo.sh}
+
+          newGenFiles="$1"
+          shift 1
+          for relativePath in "$@" ; do
+            targetPath="$HOME/$relativePath"
+            if [[ -e "$newGenFiles/$relativePath" ]] ; then
+              $VERBOSE_ECHO "Checking $targetPath: exists"
+            elif [[ ! "$(readlink "$targetPath")" == ${homeFilePattern} ]] ; then
+              warnEcho "Path '$targetPath' not link into Home Manager generation. Skipping delete."
+            else
+              $VERBOSE_ECHO "Checking $targetPath: gone (deleting)"
+              $DRY_RUN_CMD rm $VERBOSE_ARG "$targetPath"
+
+              # Recursively delete empty parent directories.
+              targetDir="$(dirname "$relativePath")"
+              if [[ "$targetDir" != "." ]] ; then
+                pushd "$HOME" > /dev/null
+
+                # Call rmdir with a relative path excluding $HOME.
+                # Otherwise, it might try to delete $HOME and exit
+                # with a permission error.
+                $DRY_RUN_CMD rmdir $VERBOSE_ARG \
+                    -p --ignore-fail-on-non-empty \
+                    "$targetDir"
+
+                popd > /dev/null
+              fi
+            fi
+          done
+        '';
+      in
+        ''
+          function linkNewGen() {
+            echo "Creating home file links in $HOME"
+
+            local newGenFiles
+            newGenFiles="$(readlink -e "$newGenPath/home-files")"
+            find "$newGenFiles" \( -type f -or -type l \) \
+              -exec bash ${link} "$newGenFiles" {} +
+          }
+
+          function cleanOldGen() {
+            if [[ ! -v oldGenPath ]] ; then
+              return
+            fi
+
+            echo "Cleaning up orphan links from $HOME"
+
+            local newGenFiles oldGenFiles
+            newGenFiles="$(readlink -e "$newGenPath/home-files")"
+            oldGenFiles="$(readlink -e "$oldGenPath/home-files")"
+
+            # Apply the cleanup script on each leaf in the old
+            # generation. The find command below will print the
+            # relative path of the entry.
+            find "$oldGenFiles" '(' -type f -or -type l ')' -printf '%P\0' \
+              | xargs -0 bash ${cleanup} "$newGenFiles"
+          }
+
+          cleanOldGen
+
+          if [[ ! -v oldGenPath || "$oldGenPath" != "$newGenPath" ]] ; then
+            echo "Creating profile generation $newGenNum"
+            $DRY_RUN_CMD ln -Tsf $VERBOSE_ARG "$newGenPath" "$newGenProfilePath"
+            $DRY_RUN_CMD ln -Tsf $VERBOSE_ARG $(basename "$newGenProfilePath") "$genProfilePath"
+            $DRY_RUN_CMD ln -Tsf $VERBOSE_ARG "$newGenPath" "$newGenGcPath"
+          else
+            echo "No change so reusing latest profile generation $oldGenNum"
+          fi
+
+          linkNewGen
+        ''
+    );
+
+    home.activation.checkFilesChanged = dag.entryBefore ["linkGeneration"] (
+      ''
+        declare -A changedFiles
+      '' + concatMapStrings (v: ''
+        cmp --quiet "${sourceStorePath v}" "${homeDirectory}/${v.target}" \
+          && changedFiles["${v.target}"]=0 \
+          || changedFiles["${v.target}"]=1
+      '') (filter (v: v.onChange != "") (attrValues cfg))
+    );
+
+    home.activation.onFilesChange = dag.entryAfter ["linkGeneration"] (
+      concatMapStrings (v: ''
+        if [[ ${"$\{changedFiles"}["${v.target}"]} -eq 1 ]]; then
+          ${v.onChange}
+        fi
+      '') (filter (v: v.onChange != "") (attrValues cfg))
+    );
+
+    # Symlink directories and files that have the right execute bit.
+    # Copy files that need their execute bit changed.
+    home-files = pkgs.runCommand
+      "home-manager-files"
+      {
+        nativeBuildInputs = [ pkgs.xlibs.lndir ];
+        preferLocalBuild = true;
+        allowSubstitutes = false;
+      }
+      (''
+        mkdir -p $out
+
+        function insertFile() {
+          local source="$1"
+          local relTarget="$2"
+          local executable="$3"
+          local recursive="$4"
+
+          # Figure out the real absolute path to the target.
+          local target
+          target="$(realpath -m "$out/$relTarget")"
+
+          # Target path must be within $HOME.
+          if [[ ! $target == $out* ]] ; then
+            echo "Error installing file '$relTarget' outside \$HOME" >&2
+            exit 1
+          fi
+
+          mkdir -p "$(dirname "$target")"
+          if [[ -d $source ]]; then
+            if [[ $recursive ]]; then
+              mkdir -p "$target"
+              lndir -silent "$source" "$target"
+            else
+              ln -s "$source" "$target"
+            fi
+          else
+            [[ -x $source ]] && isExecutable=1 || isExecutable=""
+
+            # Link the file into the home file directory if possible,
+            # i.e., if the executable bit of the source is the same we
+            # expect for the target. Otherwise, we copy the file and
+            # set the executable bit to the expected value.
+            if [[ $executable == inherit || $isExecutable == $executable ]]; then
+              ln -s "$source" "$target"
+            else
+              cp "$source" "$target"
+
+              if [[ $executable == inherit ]]; then
+                # Don't change file mode if it should match the source.
+                :
+              elif [[ $executable ]]; then
+                chmod +x "$target"
+              else
+                chmod -x "$target"
+              fi
+            fi
+          fi
+        }
+      '' + concatStrings (
+        mapAttrsToList (n: v: ''
+          insertFile "${sourceStorePath v}" \
+                     "${v.target}" \
+                     "${if v.executable == null
+                        then "inherit"
+                        else builtins.toString v.executable}" \
+                     "${builtins.toString v.recursive}"
+        '') cfg
+      ));
+  };
+}
diff --git a/home-manager/modules/home-environment.nix b/home-manager/modules/home-environment.nix
new file mode 100644
index 00000000000..f12e86d4104
--- /dev/null
+++ b/home-manager/modules/home-environment.nix
@@ -0,0 +1,438 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.home;
+
+  dag = config.lib.dag;
+
+  languageSubModule = types.submodule {
+    options = {
+      base = mkOption {
+        default = null;
+        type = types.nullOr types.str;
+        description = ''
+          The language to use unless overridden by a more specific option.
+        '';
+      };
+
+      address = mkOption {
+        default = null;
+        type = types.nullOr types.str;
+        description = ''
+          The language to use for addresses.
+        '';
+      };
+
+      monetary = mkOption {
+        default = null;
+        type = types.nullOr types.str;
+        description = ''
+          The language to use for formatting currencies and money amounts.
+        '';
+      };
+
+      paper = mkOption {
+        default = null;
+        type = types.nullOr types.str;
+        description = ''
+          The language to use for paper sizes.
+        '';
+      };
+
+      time = mkOption {
+        default = null;
+        type = types.nullOr types.str;
+        description = ''
+          The language to use for formatting times.
+        '';
+      };
+    };
+  };
+
+  keyboardSubModule = types.submodule {
+    options = {
+      layout = mkOption {
+        type = with types; nullOr str;
+        default =
+          if versionAtLeast config.home.stateVersion "19.09"
+          then null
+          else "us";
+        defaultText = literalExample "null";
+        description = ''
+          Keyboard layout. If <literal>null</literal>, then the system
+          configuration will be used.
+          </para><para>
+          This defaults to <literal>null</literal> for state
+          version ≥ 19.09 and <literal>"us"</literal> otherwise.
+        '';
+      };
+
+      model = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "presario";
+        description = ''
+          Keyboard model.
+        '';
+      };
+
+      options = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = ["grp:caps_toggle" "grp_led:scroll"];
+        description = ''
+          X keyboard options; layout switching goes here.
+        '';
+      };
+
+      variant = mkOption {
+        type = with types; nullOr str;
+        default =
+          if versionAtLeast config.home.stateVersion "19.09"
+          then null
+          else "";
+        defaultText = literalExample "null";
+        example = "colemak";
+        description = ''
+          X keyboard variant. If <literal>null</literal>, then the
+          system configuration will be used.
+          </para><para>
+          This defaults to <literal>null</literal> for state
+          version ≥ 19.09 and <literal>""</literal> otherwise.
+        '';
+      };
+    };
+  };
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  imports = [
+    (mkRemovedOptionModule [ "home" "sessionVariableSetter" ] ''
+      Session variables are now always set through the shell. This is
+      done automatically if the shell configuration is managed by Home
+      Manager. If not, then you must source the
+
+        ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+
+      file yourself.
+    '')
+  ];
+
+  options = {
+    home.username = mkOption {
+      type = types.str;
+      defaultText = "$USER";
+      description = "The user's username.";
+    };
+
+    home.homeDirectory = mkOption {
+      type = types.path;
+      defaultText = "$HOME";
+      description = "The user's home directory.";
+    };
+
+    home.profileDirectory = mkOption {
+      type = types.path;
+      defaultText = "~/.nix-profile";
+      internal = true;
+      readOnly = true;
+      description = ''
+        The profile directory where Home Manager generations are
+        installed.
+      '';
+    };
+
+    home.language = mkOption {
+      type = languageSubModule;
+      default = {};
+      description = "Language configuration.";
+    };
+
+    home.keyboard = mkOption {
+      type = types.nullOr keyboardSubModule;
+      default = {};
+      description = ''
+        Keyboard configuration. Set to <literal>null</literal> to
+        disable Home Manager keyboard management.
+      '';
+    };
+
+    home.sessionVariables = mkOption {
+      default = {};
+      type = types.attrs;
+      example = { EDITOR = "emacs"; GS_OPTIONS = "-sPAPERSIZE=a4"; };
+      description = ''
+        Environment variables to always set at login.
+        </para><para>
+        The values may refer to other environment variables using
+        POSIX.2 style variable references. For example, a variable
+        <varname>parameter</varname> may be referenced as
+        <code>$parameter</code> or <code>''${parameter}</code>. A
+        default value <literal>foo</literal> may be given as per
+        <code>''${parameter:-foo}</code> and, similarly, an alternate
+        value <literal>bar</literal> can be given as per
+        <code>''${parameter:+bar}</code>.
+        </para><para>
+        Note, these variables may be set in any order so no session
+        variable may have a runtime dependency on another session
+        variable. In particular code like
+        <programlisting language="nix">
+        home.sessionVariables = {
+          FOO = "Hello";
+          BAR = "$FOO World!";
+        };
+        </programlisting>
+        may not work as expected. If you need to reference another
+        session variable, then do so inside Nix instead. The above
+        example then becomes
+        <programlisting language="nix">
+        home.sessionVariables = {
+          FOO = "Hello";
+          BAR = "''${config.home.sessionVariables.FOO} World!";
+        };
+        </programlisting>
+      '';
+    };
+
+    home.packages = mkOption {
+      type = types.listOf types.package;
+      default = [];
+      description = "The set of packages to appear in the user environment.";
+    };
+
+    home.extraOutputsToInstall = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "doc" "info" "devdoc" ];
+      description = ''
+        List of additional package outputs of the packages
+        <varname>home.packages</varname> that should be installed into
+        the user environment.
+      '';
+    };
+
+    home.path = mkOption {
+      internal = true;
+      description = "The derivation installing the user packages.";
+    };
+
+    home.emptyActivationPath = mkOption {
+      internal = true;
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether the activation script should start with an empty
+        <envvar>PATH</envvar> variable. When <literal>false</literal>
+        then the user's <envvar>PATH</envvar> will be used.
+      '';
+    };
+
+    home.activation = mkOption {
+      internal = true;
+      default = {};
+      type = types.attrs;
+      description = ''
+        Activation scripts for the home environment.
+        </para><para>
+        Any script should respect the <varname>DRY_RUN</varname>
+        variable, if it is set then no actual action should be taken.
+        The variable <varname>DRY_RUN_CMD</varname> is set to
+        <code>echo</code> if dry run is enabled. Thus, many cases you
+        can use the idiom <code>$DRY_RUN_CMD rm -rf /</code>.
+      '';
+    };
+
+    home.activationPackage = mkOption {
+      internal = true;
+      type = types.package;
+      description = "The package containing the complete activation script.";
+    };
+
+    home.extraBuilderCommands = mkOption {
+      type = types.lines;
+      default = "";
+      internal = true;
+      description = ''
+        Extra commands to run in the Home Manager generation builder.
+      '';
+    };
+
+    home.extraProfileCommands = mkOption {
+      type = types.lines;
+      default = "";
+      internal = true;
+      description = ''
+        Extra commands to run in the Home Manager profile builder.
+      '';
+    };
+  };
+
+  config = {
+    assertions = [
+      {
+        assertion = config.home.username != "";
+        message = "Username could not be determined";
+      }
+      {
+        assertion = config.home.homeDirectory != "";
+        message = "Home directory could not be determined";
+      }
+    ];
+
+    home.username = mkDefault (builtins.getEnv "USER");
+    home.homeDirectory = mkDefault (builtins.getEnv "HOME");
+
+    home.profileDirectory =
+      if config.submoduleSupport.enable
+        && config.submoduleSupport.externalPackageInstall
+      then config.home.path
+      else cfg.homeDirectory + "/.nix-profile";
+
+    home.sessionVariables =
+      let
+        maybeSet = n: v: optionalAttrs (v != null) { ${n} = v; };
+      in
+        (maybeSet "LANG" cfg.language.base)
+        //
+        (maybeSet "LC_ADDRESS" cfg.language.address)
+        //
+        (maybeSet "LC_MONETARY" cfg.language.monetary)
+        //
+        (maybeSet "LC_PAPER" cfg.language.paper)
+        //
+        (maybeSet "LC_TIME" cfg.language.time);
+
+    home.packages = [
+      # Provide a file holding all session variables.
+      (
+        pkgs.writeTextFile {
+          name = "hm-session-vars.sh";
+          destination = "/etc/profile.d/hm-session-vars.sh";
+          text = ''
+            # Only source this once.
+            if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi
+            export __HM_SESS_VARS_SOURCED=1
+
+            ${config.lib.shell.exportAll cfg.sessionVariables}
+          '';
+        }
+      )
+    ];
+
+    # A dummy entry acting as a boundary between the activation
+    # script's "check" and the "write" phases.
+    home.activation.writeBoundary = dag.entryAnywhere "";
+
+    # Install packages to the user environment.
+    #
+    # Note, sometimes our target may not allow modification of the Nix
+    # store and then we cannot rely on `nix-env -i`. This is the case,
+    # for example, if we are running as a NixOS module and building a
+    # virtual machine. Then we must instead rely on an external
+    # mechanism for installing packages, which in NixOS is provided by
+    # the `users.users.<name?>.packages` option. The activation
+    # command is still needed since some modules need to run their
+    # activation commands after the packages are guaranteed to be
+    # installed.
+    #
+    # In case the user has moved from a user-install of Home Manager
+    # to a submodule managed one we attempt to uninstall the
+    # `home-manager-path` package if it is installed.
+    home.activation.installPackages = dag.entryAfter ["writeBoundary"] (
+      if config.submoduleSupport.externalPackageInstall
+      then
+        ''
+          if nix-env -q | grep '^home-manager-path$'; then
+            $DRY_RUN_CMD nix-env -e home-manager-path
+          fi
+        ''
+      else
+        ''
+          $DRY_RUN_CMD nix-env -i ${cfg.path}
+        ''
+    );
+
+    home.activationPackage =
+      let
+        mkCmd = res: ''
+            noteEcho Activating ${res.name}
+            ${res.data}
+          '';
+        sortedCommands = dag.topoSort cfg.activation;
+        activationCmds =
+          if sortedCommands ? result then
+            concatStringsSep "\n" (map mkCmd sortedCommands.result)
+          else
+            abort ("Dependency cycle in activation script: "
+              + builtins.toJSON sortedCommands);
+
+        # Programs that always should be available on the activation
+        # script's PATH.
+        activationBinPaths = lib.makeBinPath [
+          pkgs.bash
+          pkgs.coreutils
+          pkgs.diffutils        # For `cmp` and `diff`.
+          pkgs.findutils
+          pkgs.gnugrep
+          pkgs.gnused
+          pkgs.ncurses          # For `tput`.
+        ]
+        + optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH";
+
+        activationScript = pkgs.writeScript "activation-script" ''
+          #!${pkgs.runtimeShell}
+
+          set -eu
+          set -o pipefail
+
+          cd $HOME
+
+          export PATH="${activationBinPaths}"
+
+          . ${./lib-bash/color-echo.sh}
+
+          ${builtins.readFile ./lib-bash/activation-init.sh}
+
+          ${activationCmds}
+        '';
+      in
+        pkgs.runCommand
+          "home-manager-generation"
+          {
+            preferLocalBuild = true;
+            allowSubstitutes = false;
+          }
+          ''
+            mkdir -p $out
+
+            cp ${activationScript} $out/activate
+
+            substituteInPlace $out/activate \
+              --subst-var-by GENERATION_DIR $out
+
+            ln -s ${config.home-files} $out/home-files
+            ln -s ${cfg.path} $out/home-path
+
+            ${cfg.extraBuilderCommands}
+          '';
+
+    home.path = pkgs.buildEnv {
+      name = "home-manager-path";
+
+      paths = cfg.packages;
+      inherit (cfg) extraOutputsToInstall;
+
+      postBuild = cfg.extraProfileCommands;
+
+      meta = {
+        description = "Environment of packages installed through home-manager";
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/lib-bash/activation-init.sh b/home-manager/modules/lib-bash/activation-init.sh
new file mode 100755
index 00000000000..5cdb66e5920
--- /dev/null
+++ b/home-manager/modules/lib-bash/activation-init.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+function setupVars() {
+    local profilesPath="/nix/var/nix/profiles/per-user/$USER"
+    local gcPath="/nix/var/nix/gcroots/per-user/$USER"
+    local greatestGenNum
+
+    greatestGenNum=$( \
+        find "$profilesPath" -name 'home-manager-*-link' \
+            | sed 's/^.*-\([0-9]*\)-link$/\1/' \
+            | sort -rn \
+            | head -1)
+
+    if [[ -n $greatestGenNum ]] ; then
+        oldGenNum=$greatestGenNum
+        newGenNum=$((oldGenNum + 1))
+    else
+        newGenNum=1
+    fi
+
+    if [[ -e $gcPath/current-home ]] ; then
+        oldGenPath="$(readlink -e "$gcPath/current-home")"
+    fi
+
+    $VERBOSE_ECHO "Sanity checking oldGenNum and oldGenPath"
+    if [[ -v oldGenNum && ! -v oldGenPath
+            || ! -v oldGenNum && -v oldGenPath ]]; then
+        errorEcho "Invalid profile number and GC root values! These must be"
+        errorEcho "either both empty or both set but are now set to"
+        errorEcho "    '${oldGenNum:-}' and '${oldGenPath:-}'"
+        errorEcho "If you don't mind losing previous profile generations then"
+        errorEcho "the easiest solution is probably to run"
+        errorEcho "   rm $profilesPath/home-manager*"
+        errorEcho "   rm $gcPath/current-home"
+        errorEcho "and trying home-manager switch again. Good luck!"
+        exit 1
+    fi
+
+
+    genProfilePath="$profilesPath/home-manager"
+    newGenPath="@GENERATION_DIR@";
+    newGenProfilePath="$profilesPath/home-manager-$newGenNum-link"
+    newGenGcPath="$gcPath/current-home"
+}
+
+if [[ -v VERBOSE ]]; then
+    export VERBOSE_ECHO=echo
+    export VERBOSE_ARG="--verbose"
+else
+    export VERBOSE_ECHO=true
+    export VERBOSE_ARG=""
+fi
+
+echo "Starting home manager activation"
+
+setupVars
+
+if [[ -v DRY_RUN ]] ; then
+    echo "This is a dry run"
+    export DRY_RUN_CMD=echo
+else
+    $VERBOSE_ECHO "This is a live run"
+    export DRY_RUN_CMD=""
+fi
+
+if [[ -v VERBOSE ]]; then
+    echo -n "Using Nix version: "
+    nix-env --version
+fi
+
+$VERBOSE_ECHO "Activation variables:"
+if [[ -v oldGenNum ]] ; then
+    $VERBOSE_ECHO "  oldGenNum=$oldGenNum"
+    $VERBOSE_ECHO "  oldGenPath=$oldGenPath"
+else
+    $VERBOSE_ECHO "  oldGenNum undefined (first run?)"
+    $VERBOSE_ECHO "  oldGenPath undefined (first run?)"
+fi
+$VERBOSE_ECHO "  newGenPath=$newGenPath"
+$VERBOSE_ECHO "  newGenNum=$newGenNum"
+$VERBOSE_ECHO "  newGenProfilePath=$newGenProfilePath"
+$VERBOSE_ECHO "  newGenGcPath=$newGenGcPath"
+$VERBOSE_ECHO "  genProfilePath=$genProfilePath"
diff --git a/home-manager/modules/lib-bash/color-echo.sh b/home-manager/modules/lib-bash/color-echo.sh
new file mode 100644
index 00000000000..ef708b29c4d
--- /dev/null
+++ b/home-manager/modules/lib-bash/color-echo.sh
@@ -0,0 +1,37 @@
+# The check for terminal output and color support is heavily inspired
+# by https://unix.stackexchange.com/a/10065.
+
+function setupColors() {
+    normalColor=""
+    errorColor=""
+    warnColor=""
+    noteColor=""
+
+    # Check if stdout is a terminal.
+    if [[ -t 1 ]]; then
+        # See if it supports colors.
+        local ncolors
+        ncolors=$(tput colors)
+
+        if [[ -n "$ncolors" && "$ncolors" -ge 8 ]]; then
+            normalColor="$(tput sgr0)"
+            errorColor="$(tput bold)$(tput setaf 1)"
+            warnColor="$(tput setaf 3)"
+            noteColor="$(tput bold)$(tput setaf 6)"
+        fi
+    fi
+}
+
+setupColors
+
+function errorEcho() {
+    echo "${errorColor}$*${normalColor}"
+}
+
+function warnEcho() {
+    echo "${warnColor}$*${normalColor}"
+}
+
+function noteEcho() {
+    echo "${noteColor}$*${normalColor}"
+}
diff --git a/home-manager/modules/lib/dag.nix b/home-manager/modules/lib/dag.nix
new file mode 100644
index 00000000000..535dec35ad4
--- /dev/null
+++ b/home-manager/modules/lib/dag.nix
@@ -0,0 +1,124 @@
+# A generalization of Nixpkgs's `strings-with-deps.nix`.
+#
+# The main differences from the Nixpkgs version are
+#
+#  - not specific to strings, i.e., any payload is OK,
+#
+#  - the addition of the function `dagEntryBefore` indicating a
+#    "wanted by" relationship.
+
+{ lib }:
+
+with lib;
+
+rec {
+
+  emptyDag = {};
+
+  isDag = dag:
+    let
+      isEntry = e: (e ? data) && (e ? after) && (e ? before);
+    in
+      builtins.isAttrs dag && all (x: x) (mapAttrsToList (n: isEntry) dag);
+
+  # Takes an attribute set containing entries built by
+  # dagEntryAnywhere, dagEntryAfter, and dagEntryBefore to a
+  # topologically sorted list of entries.
+  #
+  # Internally this function uses the `toposort` function in
+  # `<nixpkgs/lib/lists.nix>` and its value is accordingly.
+  #
+  # Specifically, the result on success is
+  #
+  #    { result = [{name = ?; data = ?;} …] }
+  #
+  # For example
+  #
+  #    nix-repl> dagTopoSort {
+  #                a = dagEntryAnywhere "1";
+  #                b = dagEntryAfter ["a" "c"] "2";
+  #                c = dagEntryBefore ["d"] "3";
+  #                d = dagEntryBefore ["e"] "4";
+  #                e = dagEntryAnywhere "5";
+  #              } == {
+  #                result = [
+  #                  { data = "1"; name = "a"; }
+  #                  { data = "3"; name = "c"; }
+  #                  { data = "2"; name = "b"; }
+  #                  { data = "4"; name = "d"; }
+  #                  { data = "5"; name = "e"; }
+  #                ];
+  #              }
+  #    true
+  #
+  # And the result on error is
+  #
+  #    {
+  #      cycle = [ {after = ?; name = ?; data = ?} … ];
+  #      loops = [ {after = ?; name = ?; data = ?} … ];
+  #    }
+  #
+  # For example
+  #
+  #    nix-repl> dagTopoSort {
+  #                a = dagEntryAnywhere "1";
+  #                b = dagEntryAfter ["a" "c"] "2";
+  #                c = dagEntryAfter ["d"] "3";
+  #                d = dagEntryAfter ["b"] "4";
+  #                e = dagEntryAnywhere "5";
+  #              } == {
+  #                cycle = [
+  #                  { after = ["a" "c"]; data = "2"; name = "b"; }
+  #                  { after = ["d"]; data = "3"; name = "c"; }
+  #                  { after = ["b"]; data = "4"; name = "d"; }
+  #                ];
+  #                loops = [
+  #                  { after = ["a" "c"]; data = "2"; name = "b"; }
+  #                ];
+  #              } == {}
+  #    true
+  dagTopoSort = dag:
+    let
+      dagBefore = dag: name:
+        mapAttrsToList (n: v: n) (
+          filterAttrs (n: v: any (a: a == name) v.before) dag
+        );
+      normalizedDag =
+        mapAttrs (n: v: {
+          name = n;
+          data = v.data;
+          after = v.after ++ dagBefore dag n;
+        }) dag;
+      before = a: b: any (c: a.name == c) b.after;
+      sorted = toposort before (mapAttrsToList (n: v: v) normalizedDag);
+    in
+      if sorted ? result then
+        { result = map (v: { inherit (v) name data; }) sorted.result; }
+      else
+        sorted;
+
+  # Applies a function to each element of the given DAG.
+  dagMap = f: dag: mapAttrs (n: v: v // { data = f n v.data; }) dag;
+
+  # Create a DAG entry with no particular dependency information.
+  dagEntryAnywhere = data: {
+    inherit data;
+    before = [];
+    after = [];
+  };
+
+  dagEntryBetween = before: after: data: {
+    inherit data before after;
+  };
+
+  dagEntryAfter = after: data: {
+    inherit data after;
+    before = [];
+  };
+
+  dagEntryBefore = before: data: {
+    inherit data before;
+    after = [];
+  };
+
+}
diff --git a/home-manager/modules/lib/default.nix b/home-manager/modules/lib/default.nix
new file mode 100644
index 00000000000..754713cab5d
--- /dev/null
+++ b/home-manager/modules/lib/default.nix
@@ -0,0 +1,23 @@
+{ lib }:
+
+{
+  dag =
+    let
+      d = import ./dag.nix { inherit lib; };
+    in
+      {
+        empty = d.emptyDag;
+        isDag = d.isDag;
+        topoSort = d.dagTopoSort;
+        map = d.dagMap;
+        entryAnywhere = d.dagEntryAnywhere;
+        entryBetween = d.dagEntryBetween;
+        entryAfter = d.dagEntryAfter;
+        entryBefore = d.dagEntryBefore;
+      };
+
+  strings = import ./strings.nix { inherit lib; };
+
+  shell = import ./shell.nix { inherit lib; };
+  zsh = import ./zsh.nix { inherit lib; };
+}
diff --git a/home-manager/modules/lib/file-type.nix b/home-manager/modules/lib/file-type.nix
new file mode 100644
index 00000000000..efbb33b231d
--- /dev/null
+++ b/home-manager/modules/lib/file-type.nix
@@ -0,0 +1,102 @@
+{ homeDirectory, lib, pkgs }:
+
+with lib;
+
+let
+
+  stringsExtra = import ./strings.nix { inherit lib; };
+
+in
+
+{
+  # Constructs a type suitable for a `home.file` like option. The
+  # target path may be either absolute or relative, in which case it
+  # is relative the `basePath` argument (which itself must be an
+  # absolute path).
+  #
+  # Arguments:
+  #   - basePathDesc   docbook compatible description of the base path
+  #   - basePath       the file base path
+  fileType = basePathDesc: basePath: types.loaOf (types.submodule (
+    { name, config, ... }: {
+      options = {
+        target = mkOption {
+          type = types.str;
+          apply = p:
+            let
+              absPath = if hasPrefix "/" p then p else "${basePath}/${p}";
+            in
+              removePrefix (homeDirectory + "/") absPath;
+          description = ''
+            Path to target file relative to ${basePathDesc}.
+          '';
+        };
+
+        text = mkOption {
+          default = null;
+          type = types.nullOr types.lines;
+          description = "Text of the file.";
+        };
+
+        source = mkOption {
+          type = types.path;
+          description = ''
+            Path of the source file. The file name must not start
+            with a period since Nix will not allow such names in
+            the Nix store.
+            </para><para>
+            This may refer to a directory.
+          '';
+        };
+
+        executable = mkOption {
+          type = types.nullOr types.bool;
+          default = null;
+          description = ''
+            Set the execute bit. If <literal>null</literal>, defaults to the mode
+            of the <varname>source</varname> file or to <literal>false</literal>
+            for files created through the <varname>text</varname> option.
+          '';
+        };
+
+        recursive = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            If the file source is a directory, then this option
+            determines whether the directory should be recursively
+            linked to the target location. This option has no effect
+            if the source is a file.
+            </para><para>
+            If <literal>false</literal> (the default) then the target
+            will be a symbolic link to the source directory. If
+            <literal>true</literal> then the target will be a
+            directory structure matching the source's but whose leafs
+            are symbolic links to the files of the source directory.
+          '';
+        };
+
+        onChange = mkOption {
+          type = types.lines;
+          default = "";
+          description = ''
+            Shell commands to run when file has changed between
+            generations. The script will be run
+            <emphasis>after</emphasis> the new files have been linked
+            into place.
+          '';
+        };
+      };
+
+      config = {
+        target = mkDefault name;
+        source = mkIf (config.text != null) (
+          mkDefault (pkgs.writeTextFile {
+            inherit (config) executable text;
+            name = stringsExtra.storeFileName name;
+          })
+        );
+      };
+    }
+  ));
+}
diff --git a/home-manager/modules/lib/shell.nix b/home-manager/modules/lib/shell.nix
new file mode 100644
index 00000000000..f1443c5466a
--- /dev/null
+++ b/home-manager/modules/lib/shell.nix
@@ -0,0 +1,11 @@
+{ lib }:
+
+rec {
+  # Produces a Bourne shell like variable export statement.
+  export = n: v: "export ${n}=\"${toString v}\"";
+
+  # Given an attribute set containing shell variable names and their
+  # assignment, this function produces a string containing an export
+  # statement for each set entry.
+  exportAll = vars: lib.concatStringsSep "\n" (lib.mapAttrsToList export vars);
+}
diff --git a/home-manager/modules/lib/strings.nix b/home-manager/modules/lib/strings.nix
new file mode 100644
index 00000000000..13d6bb03be6
--- /dev/null
+++ b/home-manager/modules/lib/strings.nix
@@ -0,0 +1,27 @@
+{ lib }:
+
+with lib;
+
+{
+  # Figures out a valid Nix store name for the given path.
+  storeFileName = path:
+    let
+      # All characters that are considered safe. Note "-" is not
+      # included to avoid "-" followed by digit being interpreted as a
+      # version.
+      safeChars =
+        [ "+" "." "_" "?" "=" ]
+        ++ lowerChars
+        ++ upperChars
+        ++ stringToCharacters "0123456789";
+
+      empties = l: genList (x: "") (length l);
+
+      unsafeInName = stringToCharacters (
+        replaceStrings safeChars (empties safeChars) path
+      );
+
+      safeName = replaceStrings unsafeInName (empties unsafeInName) path;
+    in
+      "hm_" + safeName;
+}
diff --git a/home-manager/modules/lib/types.nix b/home-manager/modules/lib/types.nix
new file mode 100644
index 00000000000..1b514d20a82
--- /dev/null
+++ b/home-manager/modules/lib/types.nix
@@ -0,0 +1,28 @@
+{ lib }:
+
+with lib;
+
+{
+
+  selectorFunction = mkOptionType {
+    name = "selectorFunction";
+    description =
+      "Function that takes an attribute set and returns a list"
+      + " containing a selection of the values of the input set";
+    check = isFunction;
+    merge = _loc: defs:
+      as: concatMap (select: select as) (getValues defs);
+  };
+
+  overlayFunction = mkOptionType {
+    name = "overlayFunction";
+    description =
+      "An overlay function, takes self and super and returns"
+      + " an attribute set overriding the desired attributes.";
+    check = isFunction;
+    merge = _loc: defs:
+      self: super:
+        foldl' (res: def: mergeAttrs res (def.value self super)) {} defs;
+  };
+
+}
diff --git a/home-manager/modules/lib/zsh.nix b/home-manager/modules/lib/zsh.nix
new file mode 100644
index 00000000000..1d3e96b54bb
--- /dev/null
+++ b/home-manager/modules/lib/zsh.nix
@@ -0,0 +1,28 @@
+{ lib }:
+
+rec {
+  # Produces a Zsh shell like value
+  toZshValue = v: if builtins.isBool v then
+                    if v then "true" else "false"
+                  else if builtins.isString v then
+                    "\"${v}\""
+                  else if builtins.isList v then
+                    "(${lib.concatStringsSep " " (map toZshValue v)})"
+                  else "\"${toString v}\"";
+
+  # Produces a Zsh shell like definition statement
+  define = n: v: "${n}=${toZshValue v}";
+
+  # Given an attribute set containing shell variable names and their
+  # assignments, this function produces a string containing a definition
+  # statement for each set entry.
+  defineAll = vars: lib.concatStringsSep "\n" (lib.mapAttrsToList define vars);
+
+  # Produces a Zsh shell like export statement
+  export = n: v: "export ${define n v}";
+
+  # Given an attribute set containing shell variable names and their
+  # assignments, this function produces a string containing an export
+  # statement for each set entry.
+  exportAll = vars: lib.concatStringsSep "\n" (lib.mapAttrsToList export vars);
+}
diff --git a/home-manager/modules/manual.nix b/home-manager/modules/manual.nix
new file mode 100644
index 00000000000..e4c127c0d47
--- /dev/null
+++ b/home-manager/modules/manual.nix
@@ -0,0 +1,68 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.manual;
+
+  docs = import ../doc { inherit pkgs; };
+
+in
+
+{
+  options = {
+    manual.html.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to install the HTML manual. This also installs the
+        <command>home-manager-help</command> tool, which opens a local
+        copy of the Home Manager manual in the system web browser.
+      '';
+    };
+
+    manual.manpages.enable = mkOption {
+      type = types.bool;
+      default = true;
+      example = false;
+      description = ''
+        Whether to install the configuration manual page. The manual can
+        be reached by <command>man home-configuration.nix</command>.
+        </para><para>
+        When looking at the manual page pretend that all references to
+        NixOS stuff are actually references to Home Manager stuff.
+        Thanks!
+      '';
+    };
+
+    manual.json.enable = mkOption {
+      type = types.bool;
+      default = false;
+      example = true;
+      description = ''
+        Whether to install a JSON formatted list of all Home Manager
+        options. This can be located at
+        <filename>&lt;profile directory&gt;/share/doc/home-manager/options.json</filename>,
+        and may be used for navigating definitions, auto-completing,
+        and other miscellaneous tasks.
+      '';
+    };
+  };
+
+  config = {
+    home.packages = mkMerge [
+      (mkIf cfg.html.enable [ docs.manual.html docs.manual.htmlOpenTool ])
+      (mkIf cfg.manpages.enable [ docs.manPages ])
+      (mkIf cfg.json.enable [ docs.options.json ])
+    ];
+
+    # Whether a dependency on nmd should be introduced.
+    home.extraBuilderCommands =
+      mkIf (cfg.html.enable || cfg.manpages.enable || cfg.json.enable) ''
+        mkdir $out/lib
+        ln -s ${docs.nmdSrc} $out/lib/nmd
+      '';
+  };
+
+}
diff --git a/home-manager/modules/misc/dconf.nix b/home-manager/modules/misc/dconf.nix
new file mode 100644
index 00000000000..ef87f8972ff
--- /dev/null
+++ b/home-manager/modules/misc/dconf.nix
@@ -0,0 +1,89 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.dconf;
+  dag = config.lib.dag;
+
+  toDconfIni = generators.toINI { mkKeyValue = mkIniKeyValue; };
+
+  mkIniKeyValue = key: value:
+    let
+      tweakVal = v:
+        if isString v then "'${v}'"
+        else if isList v then tweakList v
+        else if isBool v then (if v then "true" else "false")
+        else toString v;
+
+      # Assume empty list is a list of strings, see #769
+      tweakList = v:
+        if v == [] then "@as []"
+        else "[" + concatMapStringsSep "," tweakVal v + "]";
+
+    in
+      "${key}=${tweakVal value}";
+
+  primitive = with types; either bool (either int (either float str));
+
+in
+
+{
+  meta.maintainers = [ maintainers.gnidorah maintainers.rycee ];
+
+  options = {
+    dconf = {
+      enable = mkOption {
+        type = types.bool;
+        default = true;
+        visible = false;
+        description = ''
+          Whether to enable dconf settings.
+        '';
+      };
+
+      settings = mkOption {
+        type = with types;
+          attrsOf (attrsOf (either primitive (listOf primitive)));
+        default = {};
+        example = literalExample ''
+          {
+            "org/gnome/calculator" = {
+              button-mode = "programming";
+              show-thousands = true;
+              base = 10;
+              word-size = 64;
+            };
+          }
+        '';
+        description = ''
+          Settings to write to the dconf configuration system.
+        '';
+      };
+    };
+  };
+
+  config = mkIf (cfg.enable && cfg.settings != {}) {
+    home.activation.dconfSettings = dag.entryAfter ["installPackages"] (
+      let
+        iniFile = pkgs.writeText "hm-dconf.ini" (toDconfIni cfg.settings);
+      in
+        ''
+          if [[ -v DBUS_SESSION_BUS_ADDRESS ]]; then
+            DCONF_DBUS_RUN_SESSION=""
+          else
+            DCONF_DBUS_RUN_SESSION="${pkgs.dbus}/bin/dbus-run-session"
+          fi
+
+          if [[ -v DRY_RUN ]]; then
+            echo $DCONF_DBUS_RUN_SESSION ${pkgs.gnome3.dconf}/bin/dconf load / "<" ${iniFile}
+          else
+            $DCONF_DBUS_RUN_SESSION ${pkgs.gnome3.dconf}/bin/dconf load / < ${iniFile}
+          fi
+
+          unset DCONF_DBUS_RUN_SESSION
+        ''
+    );
+  };
+}
diff --git a/home-manager/modules/misc/fontconfig.nix b/home-manager/modules/misc/fontconfig.nix
new file mode 100644
index 00000000000..8dbcce53c22
--- /dev/null
+++ b/home-manager/modules/misc/fontconfig.nix
@@ -0,0 +1,105 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.fonts.fontconfig;
+
+  profileDirectory = config.home.profileDirectory;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  imports = [
+    (mkRenamedOptionModule
+      [ "fonts" "fontconfig" "enableProfileFonts" ]
+      [ "fonts" "fontconfig" "enable" ])
+  ];
+
+  options = {
+    fonts.fontconfig = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable fontconfig configuration. This will, for
+          example, allow fontconfig to discover fonts and
+          configurations installed through
+          <varname>home.packages</varname> and
+          <command>nix-env</command>.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # Create two dummy files in /lib/fontconfig to make sure that
+    # buildEnv creates a real directory path. These files are removed
+    # in home.extraProfileCommands below so the packages will not
+    # become "runtime" dependencies.
+    home.packages = [
+      (pkgs.writeTextFile {
+        name = "hm-dummy1";
+        destination = "/lib/fontconfig/hm-dummy1";
+        text = "dummy";
+      })
+
+      (pkgs.writeTextFile {
+        name = "hm-dummy2";
+        destination = "/lib/fontconfig/hm-dummy2";
+        text = "dummy";
+      })
+    ];
+
+    home.extraProfileCommands = ''
+      if [[ -d $out/lib/X11/fonts || -d $out/share/fonts ]]; then
+        export FONTCONFIG_FILE="$(pwd)/fonts.conf"
+
+        cat > $FONTCONFIG_FILE << EOF
+      <?xml version='1.0'?>
+      <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+      <fontconfig>
+        <dir>$out/lib/X11/fonts</dir>
+        <dir>$out/share/fonts</dir>
+        <cachedir>$out/lib/fontconfig/cache</cachedir>
+      </fontconfig>
+      EOF
+
+        ${getBin pkgs.fontconfig}/bin/fc-cache -f
+        rm -f $out/lib/fontconfig/cache/CACHEDIR.TAG
+        rmdir --ignore-fail-on-non-empty -p $out/lib/fontconfig/cache
+
+        rm "$FONTCONFIG_FILE"
+        unset FONTCONFIG_FILE
+      fi
+
+      # Remove hacky dummy files.
+      rm $out/lib/fontconfig/hm-dummy?
+      rmdir --ignore-fail-on-non-empty -p $out/lib/fontconfig
+    '';
+
+    xdg.configFile = {
+      "fontconfig/conf.d/10-hm-fonts.conf".text = ''
+        <?xml version='1.0'?>
+
+        <!-- Generated by Home Manager. -->
+
+        <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+        <fontconfig>
+          <include ignore_missing="yes">${config.home.path}/etc/fonts/conf.d</include>
+          <include ignore_missing="yes">${config.home.path}/etc/fonts/fonts.conf</include>
+
+          <dir>${config.home.path}/lib/X11/fonts</dir>
+          <dir>${config.home.path}/share/fonts</dir>
+          <dir>${profileDirectory}/lib/X11/fonts</dir>
+          <dir>${profileDirectory}/share/fonts</dir>
+
+          <cachedir>${config.home.path}/lib/fontconfig/cache</cachedir>
+        </fontconfig>
+      '';
+    };
+  };
+}
diff --git a/home-manager/modules/misc/gtk.nix b/home-manager/modules/misc/gtk.nix
new file mode 100644
index 00000000000..1222db4ecab
--- /dev/null
+++ b/home-manager/modules/misc/gtk.nix
@@ -0,0 +1,188 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.gtk;
+  cfg2 = config.gtk.gtk2;
+  cfg3 = config.gtk.gtk3;
+
+  toGtk3Ini = generators.toINI {
+    mkKeyValue = key: value:
+      let
+        value' =
+          if isBool value then (if value then "true" else "false")
+          else toString value;
+      in
+        "${key}=${value'}";
+  };
+
+  formatGtk2Option = n: v:
+    let
+      v' =
+        if isBool v then (if v then "true" else "false")
+        else if isString v then "\"${v}\""
+        else toString v;
+    in
+      "${n} = ${v'}";
+
+  fontType = types.submodule {
+    options = {
+      package = mkOption {
+        type = types.nullOr types.package;
+        default = null;
+        example = literalExample "pkgs.dejavu_fonts";
+        description = ''
+          Package providing the font. This package will be installed
+          to your profile. If <literal>null</literal> then the font
+          is assumed to already be available in your profile.
+        '';
+      };
+
+      name = mkOption {
+        type = types.str;
+        example = "DejaVu Sans 8";
+        description = ''
+          The family name and size of the font within the package.
+        '';
+      };
+    };
+  };
+
+  themeType = types.submodule {
+    options = {
+      package = mkOption {
+        type = types.nullOr types.package;
+        default = null;
+        example = literalExample "pkgs.gnome3.gnome_themes_standard";
+        description = ''
+          Package providing the theme. This package will be installed
+          to your profile. If <literal>null</literal> then the theme
+          is assumed to already be available in your profile.
+        '';
+      };
+
+      name = mkOption {
+        type = types.str;
+        example = "Adwaita";
+        description = "The name of the theme within the package.";
+      };
+    };
+  };
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  imports = [
+    (mkRemovedOptionModule ["gtk" "gtk3" "waylandSupport"] ''
+      This options is not longer needed and can be removed.
+    '')
+  ];
+
+  options = {
+    gtk = {
+      enable = mkEnableOption "GTK 2/3 configuration";
+
+      font = mkOption {
+        type = types.nullOr fontType;
+        default = null;
+        description = ''
+          The font to use in GTK+ 2/3 applications.
+        '';
+      };
+
+      iconTheme = mkOption {
+        type = types.nullOr themeType;
+        default = null;
+        description = "The icon theme to use.";
+      };
+
+      theme = mkOption {
+        type = types.nullOr themeType;
+        default = null;
+        description = "The GTK+2/3 theme to use.";
+      };
+
+      gtk2 = {
+        extraConfig = mkOption {
+          type = types.lines;
+          default = "";
+          example = "gtk-can-change-accels = 1";
+          description = ''
+            Extra configuration lines to add verbatim to
+            <filename>~/.gtkrc-2.0</filename>.
+          '';
+        };
+      };
+
+      gtk3 = {
+        extraConfig = mkOption {
+          type = with types; attrsOf (either bool (either int str));
+          default = {};
+          example = { gtk-cursor-blink = false; gtk-recent-files-limit = 20; };
+          description = ''
+            Extra configuration options to add to
+            <filename>~/.config/gtk-3.0/settings.ini</filename>.
+          '';
+        };
+
+        extraCss = mkOption {
+          type = types.lines;
+          default = "";
+          description = ''
+            Extra configuration lines to add verbatim to
+            <filename>~/.config/gtk-3.0/gtk.css</filename>.
+          '';
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (
+    let
+      ini =
+        optionalAttrs (cfg.font != null)
+          { gtk-font-name = cfg.font.name; }
+        //
+        optionalAttrs (cfg.theme != null)
+          { gtk-theme-name = cfg.theme.name; }
+        //
+        optionalAttrs (cfg.iconTheme != null)
+          { gtk-icon-theme-name = cfg.iconTheme.name; };
+
+      dconfIni =
+        optionalAttrs (cfg.font != null)
+          { font-name = cfg.font.name; }
+        //
+        optionalAttrs (cfg.theme != null)
+          { gtk-theme = cfg.theme.name; }
+        //
+        optionalAttrs (cfg.iconTheme != null)
+          { icon-theme = cfg.iconTheme.name; };
+
+      optionalPackage = opt:
+        optional (opt != null && opt.package != null) opt.package;
+    in
+      {
+        home.packages =
+          optionalPackage cfg.font
+          ++ optionalPackage cfg.theme
+          ++ optionalPackage cfg.iconTheme;
+
+        home.file.".gtkrc-2.0".text =
+          concatStringsSep "\n" (
+            mapAttrsToList formatGtk2Option ini
+          ) + "\n" + cfg2.extraConfig;
+
+        xdg.configFile."gtk-3.0/settings.ini".text =
+          toGtk3Ini { Settings = ini // cfg3.extraConfig; };
+
+        xdg.configFile."gtk-3.0/gtk.css".text = cfg3.extraCss;
+
+        dconf.settings."org/gnome/desktop/interface" = dconfIni;
+      }
+    );
+}
diff --git a/home-manager/modules/misc/lib.nix b/home-manager/modules/misc/lib.nix
new file mode 100644
index 00000000000..a0907545314
--- /dev/null
+++ b/home-manager/modules/misc/lib.nix
@@ -0,0 +1,14 @@
+{ lib, ... }:
+
+{
+  options = {
+    lib = lib.mkOption {
+      type = lib.types.attrsOf lib.types.attrs;
+      default = {};
+      description = ''
+        This option allows modules to define helper functions,
+        constants, etc.
+      '';
+    };
+  };
+}
diff --git a/home-manager/modules/misc/news.nix b/home-manager/modules/misc/news.nix
new file mode 100644
index 00000000000..4949b757fff
--- /dev/null
+++ b/home-manager/modules/misc/news.nix
@@ -0,0 +1,1212 @@
+{ config, lib, options, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.news;
+
+  hostPlatform = pkgs.stdenv.hostPlatform;
+
+  entryModule = types.submodule ({ config, ... }: {
+    options = {
+      id = mkOption {
+        internal = true;
+        type = types.str;
+        description = ''
+          A unique entry identifier. By default it is a base16
+          formatted hash of the entry message.
+        '';
+      };
+
+      time = mkOption {
+        internal = true;
+        type = types.str;
+        example = "2017-07-10T21:55:04+00:00";
+        description = ''
+          News entry time stamp in ISO-8601 format. Must be in UTC
+          (ending in '+00:00').
+        '';
+      };
+
+      condition = mkOption {
+        internal = true;
+        default = true;
+        description = "Whether the news entry should be active.";
+      };
+
+      message = mkOption {
+        internal = true;
+        type = types.str;
+        description = "The news entry content.";
+      };
+    };
+
+    config = {
+      id = mkDefault (builtins.hashString "sha256" config.message);
+    };
+  });
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    news = {
+      display = mkOption {
+        type = types.enum [ "silent" "notify" "show" ];
+        default = "notify";
+        description = ''
+          How unread and relevant news should be presented when
+          running <command>home-manager build</command> and
+          <command>home-manager switch</command>.
+
+          </para><para>
+
+          The options are
+
+          <variablelist>
+          <varlistentry>
+            <term><literal>silent</literal></term>
+            <listitem>
+              <para>
+                Do not print anything during build or switch. The
+                <command>home-manager news</command> command still
+                works for viewing the entries.
+              </para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>notify</literal></term>
+            <listitem>
+              <para>
+                The number of unread and relevant news entries will be
+                printed to standard output. The <command>home-manager
+                news</command> command can later be used to view the
+                entries.
+              </para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>show</literal></term>
+            <listitem>
+              <para>
+                A pager showing unread news entries is opened.
+              </para>
+            </listitem>
+          </varlistentry>
+          </variablelist>
+        '';
+      };
+
+      entries = mkOption {
+        internal = true;
+        type = types.listOf entryModule;
+        default = [];
+        description = "News entries.";
+      };
+    };
+  };
+
+  config = {
+    # Add news entries in chronological order (i.e., latest time
+    # should be at the bottom of the list). The time should be
+    # formatted as given in the output of
+    #
+    #     date --iso-8601=second --universal
+    #
+    news.entries = [
+      {
+        time = "2017-09-01T10:56:28+00:00";
+        message = ''
+          Hello! This is a news entry and it represents an
+          experimental new feature of Home Manager. The idea is to
+          inform you when something of importance happens in Home
+          Manager or its modules.
+
+          We will try to not disturb you about the same news more than
+          once so the next time you run
+
+              home-manager switch
+
+          or
+
+              home-manager build
+
+          it should not notify you about this text again.
+
+          News items may be conditional and will then only show if the
+          condition holds, for example if they are relevant to your
+          configuration.
+
+          If you want to see all relevant news then please use the
+
+              home-manager news
+
+          command.
+
+          Since this is an experimental feature any positive or
+          negative feedback would be greatly appreciated. For example,
+          by commenting in https://git.io/v5BJL.
+        '';
+      }
+
+      {
+        time = "2017-09-10T22:15:19+00:00";
+        condition = config.programs.zsh.enable;
+        message = ''
+          Home Manager now offers its own minimal zsh plugin manager
+          under the 'programs.zsh.plugins' option path. By statically
+          sourcing your plugins it achieves no startup overhead.
+        '';
+      }
+
+      {
+        time = "2017-09-12T13:11:48+00:00";
+        condition = (
+          config.programs.zsh.enable &&
+          config.programs.zsh.shellAliases != {}
+        );
+        message = ''
+          Aliases defined in 'programs.zsh.shellAliases'
+          are now have the highest priority. Such aliases will
+          not be redefined by the code in 'programs.zsh.initExtra'
+          or any external plugins.
+        '';
+      }
+
+      {
+        time = "2017-09-12T14:22:18+00:00";
+        message = ''
+          A new service is available: 'services.blueman-applet'.
+        '';
+      }
+
+      {
+        time = "2017-09-13T11:30:22+00:00";
+        message = ''
+          A new service is available: 'services.compton'.
+        '';
+      }
+
+      {
+        time = "2017-09-20T14:47:14+00:00";
+        message = ''
+          A new service is available: 'services.screen-locker'.
+        '';
+      }
+
+      {
+        time = "2017-09-22T12:09:01+00:00";
+        condition = isString config.programs.git.extraConfig;
+        message = ''
+          The 'programs.git.extraConfig' parameter now accepts
+          attributes instead of strings which allows more flexible
+          configuration.
+
+          The string parameter type will be deprecated in the future,
+          please change your configuration file accordingly.
+
+          For example, if your configuration includes
+
+              programs.git.extraConfig = '''
+                [core]
+                editor = vim
+              ''';
+
+          then you can now change it to
+
+              programs.git.extraConfig = {
+                core = {
+                  editor = "vim";
+                };
+              };
+        '';
+      }
+
+      {
+        time = "2017-09-27T07:28:54+00:00";
+        message = ''
+          A new program module is available: 'programs.command-not-found'.
+
+          Note, this differs from the NixOS system command-not-found
+          tool in that NIX_AUTO_INSTALL is not supported.
+        '';
+      }
+
+      {
+        time = "2017-09-28T12:39:36+00:00";
+        message = ''
+          A new program module is available: 'programs.rofi';
+        '';
+      }
+
+      {
+        time = "2017-10-02T11:15:03+00:00";
+        condition = config.services.udiskie.enable;
+        message = ''
+          The udiskie service now defaults to automatically mounting
+          new devices. Previous behavior was to not automatically
+          mount. To restore this previous behavior add
+
+              services.udiskie.automount = false;
+
+          to your Home Manager configuration.
+        '';
+      }
+
+      {
+        time = "2017-10-04T18:36:07+00:00";
+        message = ''
+          A new module is available: 'xsession.windowManager.xmonad'.
+        '';
+      }
+
+      {
+        time = "2017-10-06T08:21:43+00:00";
+        message = ''
+          A new service is available: 'services.polybar'.
+        '';
+      }
+
+      {
+        time = "2017-10-09T16:38:34+00:00";
+        message = ''
+          A new module is available: 'fonts.fontconfig'.
+
+          In particular, the Boolean option
+
+              fonts.fontconfig.enableProfileFonts
+
+          was added for those who do not use NixOS and want to install
+          font packages using 'nix-env' or 'home.packages'. If you are
+          using NixOS then you do not need to enable this option.
+        '';
+      }
+
+      {
+        time = "2017-10-12T11:21:45+00:00";
+        condition = config.programs.zsh.enable;
+        message = ''
+          A new option in zsh module is available: 'programs.zsh.sessionVariables'.
+
+          This option can be used to set zsh specific session variables which
+          will be set only on zsh launch.
+        '';
+      }
+
+      {
+        time = "2017-10-15T13:59:47+00:00";
+        message = ''
+          A new module is available: 'programs.man'.
+
+          This module is enabled by default and makes sure that manual
+          pages are installed for packages in 'home.packages'.
+        '';
+      }
+
+      {
+        time = "2017-10-20T12:15:27+00:00";
+        condition = with config.systemd.user;
+          services != {} || sockets != {} || targets != {} || timers != {};
+        message = ''
+          Home Manager's interaction with systemd is now done using
+          'systemctl' from Nixpkgs, not the 'systemctl' in '$PATH'.
+
+          If you are using a distribution whose systemd is
+          incompatible with the version in Nixpkgs then you can
+          override this behavior by adding
+
+              systemd.user.systemctlPath = "/usr/bin/systemctl"
+
+          to your configuration. Home Manager will then use your
+          chosen version.
+        '';
+      }
+
+      {
+        time = "2017-10-23T23:10:29+00:00";
+        condition = !config.programs.home-manager.enable;
+        message = ''
+          Unfortunately, due to some internal restructuring it is no
+          longer possible to install the home-manager command when
+          having
+
+              home-manager = import ./home-manager { inherit pkgs; };
+
+          in the '~/.config/nixpkgs/config.nix' package override
+          section. Attempting to use the above override will now
+          result in the error "cannot coerce a set to a string".
+
+          To resolve this please delete the override from the
+          'config.nix' file and either link the Home Manager overlay
+
+              $ ln -s ~/.config/nixpkgs/home-manager/overlay.nix \
+                      ~/.config/nixpkgs/overlays/home-manager.nix
+
+          or add
+
+              programs.home-manager.enable = true;
+
+          to your Home Manager configuration. The latter is
+          recommended as the home-manager tool then is updated
+          automatically whenever you do a switch.
+        '';
+      }
+
+      {
+        time = "2017-10-23T23:26:17+00:00";
+        message = ''
+          A new module is available: 'nixpkgs'.
+
+          Like the identically named NixOS module, this allows you to
+          set Nixpkgs options and define Nixpkgs overlays. Note, the
+          changes you make here will not automatically apply to Nix
+          commands run outside Home Manager.
+        '';
+      }
+
+      {
+        time = "2017-10-28T23:39:55+00:00";
+        message = ''
+          A new module is available: 'xdg'.
+
+          If enabled, this module allows configuration of the XDG base
+          directory paths.
+
+          Whether the module is enabled or not, it also offers the
+          option 'xdg.configFile', which acts much like 'home.file'
+          except the target path is relative to the XDG configuration
+          directory. That is, unless `XDG_CONFIG_HOME` is configured
+          otherwise, the assignment
+
+              xdg.configFile.hello.text = "hello world";
+
+          will result in a file '$HOME/.config/hello'.
+
+          Most modules in Home Manager that previously were hard coded
+          to write configuration to '$HOME/.config' now use this
+          option and will therefore honor the XDG configuration
+          directory.
+        '';
+      }
+
+      {
+        time = "2017-10-31T11:46:07+00:00";
+        message = ''
+          A new window manager module is available: 'xsession.windowManager.i3'.
+        '';
+      }
+
+      {
+        time = "2017-11-12T00:18:59+00:00";
+        message = ''
+          A new program module is available: 'programs.neovim'.
+        '';
+      }
+
+      {
+        time = "2017-11-14T19:56:49+00:00";
+        condition = with config.xsession.windowManager; (
+          i3.enable && i3.config != null && i3.config.startup != []
+        );
+        message = ''
+          A new 'notification' option was added to
+          xsession.windowManager.i3.startup submodule.
+
+          Startup commands are now executed with the startup-notification
+          support enabled by default. Please, set 'notification' to false
+          where --no-startup-id option is necessary.
+        '';
+      }
+
+      {
+        time = "2017-11-17T10:36:10+00:00";
+        condition = config.xsession.windowManager.i3.enable;
+        message = ''
+          The i3 window manager module has been extended with the following options:
+
+            i3.config.keycodebindings
+            i3.config.window.commands
+            i3.config.window.hideEdgeBorders
+            i3.config.focus.mouseWarping
+        '';
+      }
+
+      {
+        time = "2017-11-26T21:57:23+00:00";
+        message = ''
+          Two new modules are available:
+
+              'services.kbfs' and 'services.keybase'
+        '';
+      }
+
+      {
+        time = "2017-12-07T22:23:11+00:00";
+        message = ''
+          A new module is available: 'services.parcellite'
+        '';
+      }
+
+      {
+        time = "2017-12-11T17:23:12+00:00";
+        condition = config.home.activation ? reloadSystemD;
+        message = ''
+          The Boolean option 'systemd.user.startServices' is now
+          available. When enabled the current naive systemd unit
+          reload logic is replaced by a more sophisticated one that
+          attempts to automatically start, stop, and restart units as
+          necessary.
+        '';
+      }
+
+      {
+        time = "2018-02-02T11:15:00+00:00";
+        message = ''
+          A new program configuration is available: 'programs.mercurial'
+        '';
+      }
+
+      {
+        time = "2018-02-03T10:00:00+00:00";
+        message = ''
+          A new module is available: 'services.stalonetray'
+        '';
+      }
+
+      {
+        time = "2018-02-04T22:58:49+00:00";
+        condition = config.xsession.enable;
+        message = ''
+          A new option 'xsession.pointerCursor' is now available. It
+          allows specifying the pointer cursor theme and size. The
+          settings will be applied in the xsession, Xresources, and
+          GTK configurations.
+        '';
+      }
+
+      {
+        time = "2018-02-06T20:23:34+00:00";
+        message = ''
+          It is now possible to use Home Manager as a NixOS module.
+          This allows you to prepare user environments from the system
+          configuration file, which often is more convenient than
+          using the 'home-manager' tool. It also opens up additional
+          possibilities, for example, to automatically configure user
+          environments in NixOS declarative containers or on systems
+          deployed through NixOps.
+
+          This feature should be considered experimental for now and
+          some critial limitations apply. For example, it is currently
+          not possible to use 'nixos-rebuild build-vm' when using the
+          Home Manager NixOS module. That said, it should be
+          reasonably robust and stable for simpler use cases.
+
+          To make Home Manager available in your NixOS system
+          configuration you can add
+
+              imports = [
+                "''${builtins.fetchTarball https://github.com/rycee/home-manager/archive/master.tar.gz}/nixos"
+              ];
+
+          to your 'configuration.nix' file. This will introduce a new
+          NixOS option called 'home-manager.users' whose type is an
+          attribute set mapping user names to Home Manager
+          configurations.
+
+          For example, a NixOS configuration may include the lines
+
+              users.users.eve.isNormalUser = true;
+              home-manager.users.eve = {
+                home.packages = [ pkgs.atool pkgs.httpie ];
+                programs.bash.enable = true;
+              };
+
+          and after a 'nixos-rebuild switch' the user eve's
+          environment should include a basic Bash configuration and
+          the packages atool and httpie.
+
+          More detailed documentation on the intricacies of this new
+          feature is slowly forthcoming.
+        '';
+      }
+
+      {
+        time = "2018-02-09T21:14:42+00:00";
+        condition = with config.programs.rofi; enable && colors != null;
+        message = ''
+          The new and preferred way to configure the rofi theme is
+          using rasi themes through the 'programs.rofi.theme' option.
+          This option can take as value either the name of a
+          pre-installed theme or the path to a theme file.
+
+          A rasi theme can be generated from an Xresources config
+          using 'rofi -dump-theme'.
+
+          The option 'programs.rofi.colors' is still supported but may
+          become deprecated and removed in the future.
+        '';
+      }
+
+      {
+        time = "2018-02-19T21:45:26+00:00";
+        message = ''
+          A new module is available: 'programs.pidgin'
+        '';
+      }
+
+      {
+        time = "2018-03-04T06:54:26+00:00";
+        message = ''
+          A new module is available: 'services.unclutter'
+        '';
+      }
+
+      {
+        time = "2018-03-07T21:38:27+00:00";
+        message = ''
+          A new module is available: 'programs.fzf'.
+        '';
+      }
+
+      {
+        time = "2018-03-25T06:49:57+00:00";
+        condition = with config.programs.ssh; enable && matchBlocks != {};
+        message = ''
+          Options set through the 'programs.ssh' module are now placed
+          at the end of the SSH configuration file. This was done to
+          make it possible to override global options such as
+          'ForwardAgent' or 'Compression' inside a host match block.
+
+          If you truly need to override an SSH option across all match
+          blocks then the new option
+
+              programs.ssh.extraOptionOverrides
+
+          can be used.
+        '';
+      }
+
+      {
+        time = "2018-04-19T07:42:01+00:00";
+        message = ''
+          A new module is available: 'programs.autorandr'.
+        '';
+      }
+
+      {
+        time = "2018-04-19T15:44:55+00:00";
+        condition = config.programs.git.enable;
+        message = ''
+          A new option 'programs.git.includes' is available. Additional
+          Git configuration files may be included via
+
+              programs.git.includes = [
+                { path = "~/path/to/config.inc"; }
+              ];
+
+          or conditionally via
+
+              programs.git.includes = [
+                { path = "~/path/to/config.inc"; condition = "gitdir:~/src/"; }
+              ];
+
+          and the corresponding '[include]' or '[includeIf]' sections will be
+          appended to the main Git configuration file.
+        '';
+      }
+
+      {
+        time = "2018-05-01T20:49:31+00:00";
+        message = ''
+          A new module is available: 'services.mbsync'.
+        '';
+      }
+      {
+        time = "2018-05-03T12:34:47+00:00";
+        message = ''
+          A new module is available: 'services.flameshot'.
+        '';
+      }
+
+      {
+        time = "2018-05-18T18:34:15+00:00";
+        message = ''
+          A new module is available: 'qt'
+
+          At the moment this module allows you to set up Qt to use the
+          GTK+ theme, and not much else.
+        '';
+      }
+
+      {
+        time = "2018-06-05T01:36:45+00:00";
+        message = ''
+          A new module is available: 'services.kdeconnect'.
+        '';
+      }
+
+      {
+        time = "2018-06-09T09:11:59+00:00";
+        message = ''
+          A new module is available: `programs.newsboat`.
+        '';
+      }
+
+      {
+        time = "2018-07-01T14:33:15+00:00";
+        message = ''
+          A new module is available: 'accounts.email'.
+
+          As the name suggests, this new module offers a number of
+          options for configuring email accounts. This, for example,
+          includes the email address and owner's real name but also
+          server settings for IMAP and SMTP.
+
+          The intent is to have a central location for account
+          specific configuration that other modules can use.
+
+          Note, this module is still somewhat experimental and its
+          structure should not be seen as final. Feedback is greatly
+          appreciated, both positive and negative.
+        '';
+      }
+
+      {
+        time = "2018-07-01T16:07:04+00:00";
+        message = ''
+          A new module is available: 'programs.mbsync'.
+        '';
+      }
+
+      {
+        time = "2018-07-01T16:12:20+00:00";
+        message = ''
+          A new module is available: 'programs.notmuch'.
+        '';
+      }
+
+      {
+        time = "2018-07-07T15:48:56+00:00";
+        message = ''
+          A new module is available: 'xsession.windowManager.awesome'.
+        '';
+      }
+
+      {
+        time = "2018-07-18T20:14:11+00:00";
+        message = ''
+          A new module is available: 'services.mpd'.
+        '';
+      }
+
+      {
+        time = "2018-07-31T13:33:39+00:00";
+        message = ''
+          A new module is available: 'services.status-notifier-watcher'.
+        '';
+      }
+
+      {
+        time = "2018-07-31T13:47:06+00:00";
+        message = ''
+          A new module is available: 'programs.direnv'.
+        '';
+      }
+
+      {
+        time = "2018-08-17T20:30:14+00:00";
+        message = ''
+          A new module is available: 'programs.fish'.
+        '';
+      }
+
+      {
+        time = "2018-08-18T19:03:42+00:00";
+        condition = config.services.gpg-agent.enable;
+        message = ''
+          A new option is available: 'services.gpg-agent.extraConfig'.
+
+          Extra lines may be appended to $HOME/.gnupg/gpg-agent.conf
+          using this option.
+        '';
+      }
+
+      {
+        time = "2018-08-19T20:46:09+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new modules is available: 'programs.chromium'.
+        '';
+      }
+
+      {
+        time = "2018-08-20T20:27:26+00:00";
+        message = ''
+          A new module is available: 'programs.msmtp'.
+        '';
+      }
+
+      {
+        time = "2018-08-21T20:13:50+00:00";
+        message = ''
+          A new module is available: 'services.pasystray'.
+        '';
+      }
+
+      {
+        time = "2018-08-29T20:27:04+00:00";
+        message = ''
+          A new module is available: 'programs.offlineimap'.
+        '';
+      }
+
+      {
+        time = "2018-09-18T21:25:14+00:00";
+        message = ''
+          A new module is available: 'programs.taskwarrior'.
+        '';
+      }
+
+      {
+        time = "2018-09-18T21:43:54+00:00";
+        message = ''
+          A new module is available: 'programs.zathura'.
+        '';
+      }
+
+      {
+        time = "2018-09-20T19:26:40+00:00";
+        message = ''
+          A new module is available: 'programs.noti'.
+        '';
+      }
+
+      {
+        time = "2018-09-20T22:10:45+00:00";
+        message = ''
+          A new module is available: 'programs.go'.
+        '';
+      }
+
+      {
+        time = "2018-09-27T17:48:08+00:00";
+        message = ''
+          A new module is available: 'programs.obs-studio'.
+        '';
+      }
+
+      {
+        time = "2018-09-28T21:38:48+00:00";
+        message = ''
+          A new module is available: 'programs.alot'.
+        '';
+      }
+
+      {
+        time = "2018-10-20T09:30:57+00:00";
+        message = ''
+          A new module is available: 'programs.urxvt'.
+        '';
+      }
+
+      {
+        time = "2018-11-13T23:08:03+00:00";
+        message = ''
+          A new module is available: 'programs.tmux'.
+        '';
+      }
+
+      {
+        time = "2018-11-18T18:55:15+00:00";
+        message = ''
+          A new module is available: 'programs.astroid'.
+        '';
+      }
+
+      {
+        time = "2018-11-18T21:41:51+00:00";
+        message = ''
+          A new module is available: 'programs.afew'.
+        '';
+      }
+
+      {
+        time = "2018-11-19T00:40:34+00:00";
+        message = ''
+          A new nix-darwin module is available. Use it the same way the NixOS
+          module is used. A major limitation is that Home Manager services don't
+          work, as they depend explicitly on Linux and systemd user services.
+          However, 'home.file' and 'home.packages' do work. Everything else is
+          untested at this time.
+        '';
+      }
+
+      {
+        time = "2018-11-24T16:22:19+00:00";
+        message = ''
+          A new option 'home.stateVersion' is available. Its function
+          is much like the 'system.stateVersion' option in NixOS.
+
+          Briefly, the state version indicates a stable set of option
+          defaults. In the future, whenever Home Manager changes an
+          option default in a way that may cause program breakage it
+          will do so only for the unstable state version, currently
+          19.03. Once 19.03 becomes the stable version only backwards
+          compatible changes will be made and 19.09 becomes the
+          unstable state version.
+
+          The default value for this option is 18.09 but it may still
+          be a good idea to explicitly add
+
+              home.stateVersion = "18.09";
+
+          to your Home Manager configuration.
+        '';
+      }
+
+      {
+        time = "2018-11-25T22:10:15+00:00";
+        message = ''
+          A new module is available: 'services.nextcloud-client'.
+        '';
+      }
+
+      {
+        time = "2018-11-25T22:55:12+00:00";
+        message = ''
+          A new module is available: 'programs.vscode'.
+        '';
+      }
+
+      {
+        time = "2018-12-04T21:54:38+00:00";
+        condition = config.programs.beets.settings != {};
+        message = ''
+          A new option 'programs.beets.enable' has been added.
+          Starting with state version 19.03 this option defaults to
+          false. For earlier versions it defaults to true if
+          'programs.beets.settings' is non-empty.
+
+          It is recommended to explicitly add
+
+              programs.beets.enable = true;
+
+          to your configuration.
+        '';
+      }
+
+      {
+        time = "2018-12-12T21:02:05+00:00";
+        message = ''
+          A new module is available: 'programs.jq'.
+        '';
+      }
+
+      {
+        time = "2018-12-24T16:26:16+00:00";
+        message = ''
+          A new module is available: 'dconf'.
+
+          Note, on NixOS you may need to add
+
+              services.dbus.packages = with pkgs; [ gnome3.dconf ];
+
+          to the system configuration for this module to work as
+          expected. In particular if you get the error message
+
+              The name ca.desrt.dconf was not provided by any .service files
+
+          when activating your Home Manager configuration.
+        '';
+      }
+
+      {
+        time = "2018-12-28T12:32:30+00:00";
+        message = ''
+          A new module is available: 'programs.opam'.
+        '';
+      }
+
+      {
+        time = "2019-01-18T00:21:56+00:00";
+        message = ''
+          A new module is available: 'programs.matplotlib'.
+        '';
+      }
+
+      {
+        time = "2019-01-26T13:20:37+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.xembed-sni-proxy'.
+        '';
+      }
+
+      {
+        time = "2019-01-28T23:36:10+00:00";
+        message = ''
+          A new module is available: 'programs.irssi'.
+        '';
+      }
+
+      {
+        time = "2019-02-09T14:09:58+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.emacs'.
+
+          This module provides a user service that runs the Emacs
+          configured in
+
+              programs.emacs
+
+          as an Emacs daemon.
+        '';
+      }
+
+      {
+        time = "2019-02-16T20:33:56+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          When using Home Manager as a NixOS submodule it is now
+          possible to install packages using the NixOS
+
+              users.users.<name?>.packages
+
+          option. This is enabled by adding
+
+              home-manager.useUserPackages = true;
+
+          to your NixOS system configuration. This mode of operation
+          is necessary if you want to use 'nixos-rebuild build-vm'.
+        '';
+      }
+
+      {
+        time = "2019-02-17T21:11:24+00:00";
+        message = ''
+          A new module is available: 'programs.keychain'.
+        '';
+      }
+
+      {
+        time = "2019-02-24T00:32:23+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new service is available: 'services.mpdris2'.
+        '';
+      }
+
+      {
+        time = "2019-03-19T22:56:20+00:00";
+        message = ''
+          A new module is available: 'programs.bat'.
+        '';
+      }
+
+      {
+        time = "2019-03-19T23:07:34+00:00";
+        message = ''
+          A new module is available: 'programs.lsd'.
+        '';
+      }
+
+      {
+        time = "2019-04-09T20:10:22+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.xcape'.
+        '';
+      }
+
+      {
+        time = "2019-04-11T22:50:10+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          The type used for the systemd unit options under
+
+              systemd.user.services, systemd.user.sockets, etc.
+
+          has been changed to offer more robust merging of configurations.
+
+          If you don't override values within systemd units then you are not
+          affected by this change. Unfortunately, if you do override unit values
+          you may encounter errors due to this change.
+
+          In particular, if you get an error saying that a "unique option" is
+          "defined multiple times" then you need to use 'lib.mkForce'. For
+          example,
+
+              systemd.user.services.foo.Service.ExecStart = "/foo/bar";
+
+          becomes
+
+              systemd.user.services.foo.Service.ExecStart = lib.mkForce "/foo/bar";
+
+          We had to make this change because the old merging was causing too
+          many confusing situations for people. Apologies for potentially
+          breaking your configuration!
+        '';
+      }
+
+      {
+        time = "2019-04-14T15:35:16+00:00";
+        message = ''
+          A new module is available: 'programs.skim'.
+        '';
+      }
+
+      {
+        time = "2019-04-22T12:43:20+00:00";
+        message = ''
+          A new module is available: 'programs.alacritty'.
+        '';
+      }
+
+      {
+        time = "2019-04-26T22:53:48+00:00";
+        condition = config.programs.vscode.enable;
+        message = ''
+          A new module is available: 'programs.vscode.haskell'.
+
+          Enable to add Haskell IDE Engine and syntax highlighting
+          support to your VSCode.
+        '';
+      }
+
+      {
+        time = "2019-05-04T23:56:39+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.rsibreak'.
+        '';
+      }
+
+      {
+        time = "2019-05-07T20:49:29+00:00";
+        message = ''
+          A new module is available: 'programs.mpv'.
+        '';
+      }
+
+      {
+        time = "2019-05-30T17:49:29+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.xsuspender'.
+        '';
+      }
+
+      {
+        time = "2019-06-03T21:47:10+00:00";
+        message = ''
+          A new module is available: 'programs.gpg'.
+        '';
+      }
+
+      {
+        time = "2019-06-09T12:19:18+00:00";
+        message = ''
+          Collisions between unmanaged and managed files can now be
+          automatically resolved by moving the target file to a new
+          path instead of failing the switch operation. To enable
+          this, use the new '-b' command line argument. For example,
+
+              home-manager -b bck switch
+
+          where 'bck' is the suffix to give the moved file. In this
+          case a colliding file 'foo.conf' will be moved to
+          'foo.conf.bck'.
+        '';
+      }
+
+      {
+        time = "2019-06-19T17:49:29+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: `services.getmail`.
+        '';
+      }
+
+      {
+        time = "2019-07-02T09:27:56+00:00";
+        message = ''
+          A new module is available: 'programs.broot'.
+        '';
+      }
+
+      {
+        time = "2019-07-17T19:30:29+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.taskwarrior-sync'.
+        '';
+      }
+
+      {
+        time = "2019-07-17T20:05:29+00:00";
+        message = ''
+          A new module is available: 'programs.kakoune'.
+        '';
+      }
+
+      {
+        time = "2019-08-08T11:49:35+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.hound'.
+        '';
+      }
+
+      {
+        time = "2019-08-17T12:24:58+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.muchsync'.
+        '';
+      }
+
+      {
+        time = "2019-08-18T14:22:41+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.dwm-status'.
+        '';
+      }
+
+      {
+        time = "2019-08-28T10:18:07+00:00";
+        condition = config.programs.vim.enable;
+        message = ''
+          The 'programs.vim.plugins' option now accepts packages.
+          Specifying them as strings is deprecated.
+        '';
+      }
+
+      {
+        time = "2019-09-17T19:33:49+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.sxhkd'.
+        '';
+      }
+
+      {
+        time = "2019-09-26T21:05:24+00:00";
+        message = ''
+          A new module is available: 'programs.starship'.
+        '';
+      }
+
+      {
+        time = "2019-09-26T21:47:13+00:00";
+        message = ''
+          A new module is available: 'programs.rtorrent'.
+        '';
+      }
+    ];
+  };
+}
diff --git a/home-manager/modules/misc/nixpkgs.nix b/home-manager/modules/misc/nixpkgs.nix
new file mode 100644
index 00000000000..e7c0d8f25ea
--- /dev/null
+++ b/home-manager/modules/misc/nixpkgs.nix
@@ -0,0 +1,152 @@
+# Adapted from Nixpkgs.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  isConfig = x:
+    builtins.isAttrs x || builtins.isFunction x;
+
+  optCall = f: x:
+    if builtins.isFunction f
+    then f x
+    else f;
+
+  mergeConfig = lhs_: rhs_:
+    let
+      lhs = optCall lhs_ { inherit pkgs; };
+      rhs = optCall rhs_ { inherit pkgs; };
+    in
+    lhs // rhs //
+    optionalAttrs (lhs ? packageOverrides) {
+      packageOverrides = pkgs:
+        optCall lhs.packageOverrides pkgs //
+        optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
+    } //
+    optionalAttrs (lhs ? perlPackageOverrides) {
+      perlPackageOverrides = pkgs:
+        optCall lhs.perlPackageOverrides pkgs //
+        optCall (attrByPath ["perlPackageOverrides"] ({}) rhs) pkgs;
+    };
+
+  configType = mkOptionType {
+    name = "nixpkgs-config";
+    description = "nixpkgs config";
+    check = x:
+      let traceXIfNot = c:
+            if c x then true
+            else lib.traceSeqN 1 x false;
+      in traceXIfNot isConfig;
+    merge = args: fold (def: mergeConfig def.value) {};
+  };
+
+  overlayType = mkOptionType {
+    name = "nixpkgs-overlay";
+    description = "nixpkgs overlay";
+    check = builtins.isFunction;
+    merge = lib.mergeOneOption;
+  };
+
+  _pkgs = import <nixpkgs> (
+    filterAttrs (n: v: v != null) config.nixpkgs
+  );
+
+in
+
+{
+  options.nixpkgs = {
+    config = mkOption {
+      default = null;
+      example = { allowBroken = true; };
+      type = types.nullOr configType;
+      description = ''
+        The configuration of the Nix Packages collection. (For
+        details, see the Nixpkgs documentation.) It allows you to set
+        package configuration options.
+
+        </para><para>
+
+        If <literal>null</literal>, then configuration is taken from
+        the fallback location, for example,
+        <filename>~/.config/nixpkgs/config.nix</filename>.
+
+        </para><para>
+
+        Note, this option will not apply outside your Home Manager
+        configuration like when installing manually through
+        <command>nix-env</command>. If you want to apply it both
+        inside and outside Home Manager you can put it in a separate
+        file and include something like
+
+        <programlisting language="nix">
+          nixpkgs.config = import ./nixpkgs-config.nix;
+          xdg.configFile."nixpkgs/config.nix".source = ./nixpkgs-config.nix;
+        </programlisting>
+
+        in your Home Manager configuration.
+      '';
+    };
+
+    overlays = mkOption {
+      default = null;
+      example = literalExample
+        ''
+          [ (self: super: {
+              openssh = super.openssh.override {
+                hpnSupport = true;
+                withKerberos = true;
+                kerberos = self.libkrb5;
+              };
+            };
+          ) ]
+        '';
+      type = types.nullOr (types.listOf overlayType);
+      description = ''
+        List of overlays to use with the Nix Packages collection. (For
+        details, see the Nixpkgs documentation.) It allows you to
+        override packages globally. This is a function that takes as
+        an argument the <emphasis>original</emphasis> Nixpkgs. The
+        first argument should be used for finding dependencies, and
+        the second should be used for overriding recipes.
+
+        </para><para>
+
+        If <literal>null</literal>, then the overlays are taken from
+        the fallback location, for example,
+        <filename>~/.config/nixpkgs/overlays</filename>.
+
+        </para><para>
+
+        Like <varname>nixpkgs.config</varname> this option only
+        applies within the Home Manager configuration. See
+        <varname>nixpkgs.config</varname> for a suggested setup that
+        works both internally and externally.
+      '';
+    };
+
+    system = mkOption {
+      type = types.str;
+      example = "i686-linux";
+      internal = true;
+      description = ''
+        Specifies the Nix platform type for which the user environment
+        should be built. If unset, it defaults to the platform type of
+        your host system. Specifying this option is useful when doing
+        distributed multi-platform deployment, or when building
+        virtual machines.
+      '';
+    };
+  };
+
+  config = {
+    _module.args = {
+      pkgs = _pkgs;
+      pkgs_i686 =
+        if _pkgs.stdenv.isLinux && _pkgs.stdenv.hostPlatform.isx86
+        then _pkgs.pkgsi686Linux
+        else { };
+    };
+  };
+}
diff --git a/home-manager/modules/misc/numlock.nix b/home-manager/modules/misc/numlock.nix
new file mode 100644
index 00000000000..77149d123ec
--- /dev/null
+++ b/home-manager/modules/misc/numlock.nix
@@ -0,0 +1,35 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.xsession.numlock;
+
+in
+
+{
+  options = {
+    xsession.numlock.enable = mkEnableOption "Num Lock";
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.numlockx = {
+      Unit = {
+        Description = "NumLockX";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${pkgs.numlockx}/bin/numlockx";
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/misc/pam.nix b/home-manager/modules/misc/pam.nix
new file mode 100644
index 00000000000..6ace2bfdaac
--- /dev/null
+++ b/home-manager/modules/misc/pam.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  vars = config.pam.sessionVariables;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    pam.sessionVariables = mkOption {
+      default = {};
+      type = types.attrs;
+      example = { EDITOR = "vim"; };
+      description = ''
+        Environment variables that will be set for the PAM session.
+        The variable values must be as described in
+        <citerefentry>
+          <refentrytitle>pam_env.conf</refentrytitle>
+          <manvolnum>5</manvolnum>
+        </citerefentry>.
+      '';
+    };
+  };
+
+  config = mkIf (vars != {}) {
+    home.file.".pam_environment".text =
+      concatStringsSep "\n" (
+        mapAttrsToList (n: v: "${n} OVERRIDE=\"${toString v}\"") vars
+      ) + "\n";
+  };
+}
diff --git a/home-manager/modules/misc/qt.nix b/home-manager/modules/misc/qt.nix
new file mode 100644
index 00000000000..60de8774231
--- /dev/null
+++ b/home-manager/modules/misc/qt.nix
@@ -0,0 +1,77 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.qt;
+  dag = config.lib.dag;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  imports = [
+    (mkChangedOptionModule
+      [ "qt" "useGtkTheme" ]
+      [ "qt" "platformTheme" ]
+      (config:
+        if getAttrFromPath [ "qt" "useGtkTheme" ] config
+        then "gtk"
+        else null))
+  ];
+
+  options = {
+    qt = {
+      enable = mkEnableOption "Qt 4 and 5 configuration";
+
+      platformTheme = mkOption {
+        type = types.nullOr (types.enum [ "gtk" "gnome" ]);
+        default = null;
+        example = "gnome";
+        relatedPackages = [
+          "qgnomeplatform"
+          ["libsForQt5" "qtstyleplugins"]
+        ];
+        description = ''
+          Selects the platform theme to use for Qt applications.</para>
+          <para>The options are
+          <variablelist>
+            <varlistentry>
+              <term><literal>gtk</literal></term>
+              <listitem><para>Use GTK theme with
+                <link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link>
+              </para></listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><literal>gnome</literal></term>
+              <listitem><para>Use GNOME theme with
+                <link xlink:href="https://github.com/FedoraQt/QGnomePlatform">qgnomeplatform</link>
+              </para></listitem>
+            </varlistentry>
+          </variablelist>
+        '';
+      };
+    };
+  };
+
+  config = mkIf (cfg.enable && cfg.platformTheme != null) {
+    home.sessionVariables.QT_QPA_PLATFORMTHEME =
+      if cfg.platformTheme == "gnome" then "gnome" else "gtk2";
+
+    home.packages =
+      if cfg.platformTheme == "gnome"
+      then [ pkgs.qgnomeplatform ]
+      else [ pkgs.libsForQt5.qtstyleplugins ];
+
+    xsession.importedVariables = [ "QT_QPA_PLATFORMTHEME" ];
+
+    # Enable GTK+ style for Qt4 in either case.
+    # It doesn’t support the platform theme packages.
+    home.activation.useGtkThemeInQt4 = dag.entryAfter ["writeBoundary"] ''
+      $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG \
+        --set "${config.xdg.configHome}/Trolltech.conf" Qt style GTK+
+    '';
+  };
+}
diff --git a/home-manager/modules/misc/submodule-support.nix b/home-manager/modules/misc/submodule-support.nix
new file mode 100644
index 00000000000..ff80291cadf
--- /dev/null
+++ b/home-manager/modules/misc/submodule-support.nix
@@ -0,0 +1,32 @@
+{ lib, ... }:
+
+with lib;
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options.submoduleSupport = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      internal = true;
+      description = ''
+        Whether the Home Manager module system is used as a submodule
+        in, for example, NixOS or nix-darwin.
+      '';
+    };
+
+    externalPackageInstall = mkOption {
+      type = types.bool;
+      default = false;
+      internal = true;
+      description = ''
+        Whether the packages of <option>home.packages</option> are
+        installed separately from the Home Manager activation script.
+        In NixOS, for example, this may be accomplished by installing
+        the packages through
+        <option>users.users.‹name?›.packages</option>.
+      '';
+    };
+  };
+}
diff --git a/home-manager/modules/misc/version.nix b/home-manager/modules/misc/version.nix
new file mode 100644
index 00000000000..18bb28f7603
--- /dev/null
+++ b/home-manager/modules/misc/version.nix
@@ -0,0 +1,24 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  options = {
+    home.stateVersion = mkOption {
+      type = types.enum [ "18.09" "19.03" "19.09" ];
+      default = "18.09";
+      description = ''
+        It is occasionally necessary for Home Manager to change
+        configuration defaults in a way that is incompatible with
+        stateful data. This could, for example, include switching the
+        default data format or location of a file.
+        </para><para>
+        The <emphasis>state version</emphasis> indicates which default
+        settings are in effect and will therefore help avoid breaking
+        program configurations. Switching to a higher state version
+        typically requires performing some manual steps, such as data
+        conversion or moving files.
+      '';
+    };
+  };
+}
diff --git a/home-manager/modules/misc/xdg-mime-apps.nix b/home-manager/modules/misc/xdg-mime-apps.nix
new file mode 100644
index 00000000000..979c7ea48be
--- /dev/null
+++ b/home-manager/modules/misc/xdg-mime-apps.nix
@@ -0,0 +1,92 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.xdg.mimeApps;
+
+  strListOrSingleton = with types;
+    coercedTo (either (listOf str) str) toList (listOf str);
+
+in
+
+{
+  meta.maintainers = with maintainers; [ pacien ];
+
+  options.xdg.mimeApps = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to manage <filename>$XDG_CONFIG_HOME/mimeapps.list</filename>.
+        </para>
+        <para>
+        The generated file is read-only.
+      '';
+    };
+
+    # descriptions from
+    # https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-1.0.1.html
+
+    associations.added = mkOption {
+      type = types.attrsOf strListOrSingleton;
+      default = { };
+      example = literalExample ''
+        {
+          "mimetype1" = [ "foo1.desktop" "foo2.desktop" "foo3.desktop" ];
+          "mimetype2" = "foo4.desktop";
+        }
+      '';
+      description = ''
+        Defines additional associations of applications with
+        mimetypes, as if the .desktop file was listing this mimetype
+        in the first place.
+      '';
+    };
+
+    associations.removed = mkOption {
+      type = types.attrsOf strListOrSingleton;
+      default = { };
+      example = { "mimetype1" = "foo5.desktop"; };
+      description = ''
+        Removes associations of applications with mimetypes, as if the
+        .desktop file was <emphasis>not</emphasis> listing this
+        mimetype in the first place.
+      '';
+    };
+
+    defaultApplications = mkOption {
+      type = types.attrsOf strListOrSingleton;
+      default = { };
+      example = literalExample ''
+        {
+          "mimetype1" = [ "default1.desktop" "default2.desktop" ];
+        }
+      '';
+      description = ''
+        The default application to be used for a given mimetype. This
+        is, for instance, the one that will be started when
+        double-clicking on a file in a file manager. If the
+        application is no longer installed, the next application in
+        the list is attempted, and so on.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # Deprecated but still used by some applications.
+    home.file.".local/share/applications/mimeapps.list".source =
+      config.xdg.configFile."mimeapps.list".source;
+
+    xdg.configFile."mimeapps.list".text =
+      let
+        joinValues = mapAttrs (n: concatStringsSep ";");
+      in
+        generators.toINI {} {
+          "Added Associations" = joinValues cfg.associations.added;
+          "Removed Associations" = joinValues cfg.associations.removed;
+          "Default Applications" = joinValues cfg.defaultApplications;
+        };
+  };
+}
diff --git a/home-manager/modules/misc/xdg-user-dirs.nix b/home-manager/modules/misc/xdg-user-dirs.nix
new file mode 100644
index 00000000000..4d034d7fe43
--- /dev/null
+++ b/home-manager/modules/misc/xdg-user-dirs.nix
@@ -0,0 +1,100 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.xdg.userDirs;
+
+in
+
+{
+  meta.maintainers = with maintainers; [ pacien ];
+
+  options.xdg.userDirs = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to manage <filename>$XDG_CONFIG_HOME/user-dirs.dirs</filename>.
+        </para>
+        <para>
+        The generated file is read-only.
+      '';
+    };
+
+    # Well-known directory list from
+    # https://gitlab.freedesktop.org/xdg/xdg-user-dirs/blob/master/man/user-dirs.dirs.xml
+
+    desktop = mkOption {
+      type = types.str;
+      default = "$HOME/Desktop";
+      description = "The Desktop directory.";
+    };
+
+    documents = mkOption {
+      type = types.str;
+      default = "$HOME/Documents";
+      description = "The Documents directory.";
+    };
+
+    download = mkOption {
+      type = types.str;
+      default = "$HOME/Downloads";
+      description = "The Downloads directory.";
+    };
+
+    music = mkOption {
+      type = types.str;
+      default = "$HOME/Music";
+      description = "The Music directory.";
+    };
+
+    pictures = mkOption {
+      type = types.str;
+      default = "$HOME/Pictures";
+      description = "The Pictures directory.";
+    };
+
+    publishShare = mkOption {
+      type = types.str;
+      default = "$HOME/Public";
+      description = "The Public share directory.";
+    };
+
+    templates = mkOption {
+      type = types.str;
+      default = "$HOME/Templates";
+      description = "The Templates directory.";
+    };
+
+    videos = mkOption {
+      type = types.str;
+      default = "$HOME/Videos";
+      description = "The Videos directory.";
+    };
+
+    extraConfig = mkOption {
+      type = with types; attrsOf str;
+      default = { };
+      example = { XDG_MISC_DIR = "$HOME/Misc"; };
+      description = "Other user directories.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    xdg.configFile."user-dirs.dirs".text = generators.toKeyValue {} (
+      {
+        XDG_DESKTOP_DIR = cfg.desktop;
+        XDG_DOCUMENTS_DIR = cfg.documents;
+        XDG_DOWNLOAD_DIR = cfg.download;
+        XDG_MUSIC_DIR = cfg.music;
+        XDG_PICTURES_DIR = cfg.pictures;
+        XDG_PUBLICSHARE_DIR = cfg.publishShare;
+        XDG_TEMPLATES_DIR = cfg.templates;
+        XDG_VIDEOS_DIR = cfg.videos;
+      }
+      // cfg.extraConfig
+    );
+  };
+}
diff --git a/home-manager/modules/misc/xdg.nix b/home-manager/modules/misc/xdg.nix
new file mode 100644
index 00000000000..84ab4ada59a
--- /dev/null
+++ b/home-manager/modules/misc/xdg.nix
@@ -0,0 +1,104 @@
+{ options, config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.xdg;
+
+  dag = config.lib.dag;
+
+  fileType = (import ../lib/file-type.nix {
+    inherit (config.home) homeDirectory;
+    inherit lib pkgs;
+  }).fileType;
+
+  defaultCacheHome = "${config.home.homeDirectory}/.cache";
+  defaultConfigHome = "${config.home.homeDirectory}/.config";
+  defaultDataHome = "${config.home.homeDirectory}/.local/share";
+
+  getXdgDir = name: fallback:
+    let
+      value = builtins.getEnv name;
+    in
+      if value != "" then value else fallback;
+
+in
+
+{
+  options.xdg = {
+    enable = mkEnableOption "management of XDG base directories";
+
+    cacheHome = mkOption {
+      type = types.path;
+      defaultText = "~/.cache";
+      description = ''
+        Absolute path to directory holding application caches.
+      '';
+    };
+
+    configFile = mkOption {
+      type = fileType "<varname>xdg.configHome</varname>" cfg.configHome;
+      default = {};
+      description = ''
+        Attribute set of files to link into the user's XDG
+        configuration home.
+      '';
+    };
+
+    configHome = mkOption {
+      type = types.path;
+      defaultText = "~/.config";
+      description = ''
+        Absolute path to directory holding application configurations.
+      '';
+    };
+
+    dataFile = mkOption {
+      type = fileType "<varname>xdg.dataHome</varname>" cfg.dataHome;
+      default = {};
+      description = ''
+        Attribute set of files to link into the user's XDG
+        data home.
+      '';
+    };
+
+    dataHome = mkOption {
+      type = types.path;
+      defaultText = "~/.local/share";
+      description = ''
+        Absolute path to directory holding application data.
+      '';
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      xdg.cacheHome = mkDefault defaultCacheHome;
+      xdg.configHome = mkDefault defaultConfigHome;
+      xdg.dataHome = mkDefault defaultDataHome;
+
+      home.sessionVariables = {
+        XDG_CACHE_HOME = cfg.cacheHome;
+        XDG_CONFIG_HOME = cfg.configHome;
+        XDG_DATA_HOME = cfg.dataHome;
+      };
+    })
+
+    (mkIf (!cfg.enable) {
+      xdg.cacheHome = getXdgDir "XDG_CACHE_HOME" defaultCacheHome;
+      xdg.configHome = getXdgDir "XDG_CONFIG_HOME" defaultConfigHome;
+      xdg.dataHome = getXdgDir "XDG_DATA_HOME" defaultDataHome;
+    })
+
+    {
+      home.file = mkMerge [
+        cfg.configFile
+        cfg.dataFile
+        {
+          "${config.xdg.cacheHome}/.keep".text = "";
+        }
+      ];
+    }
+  ];
+}
diff --git a/home-manager/modules/modules.nix b/home-manager/modules/modules.nix
new file mode 100644
index 00000000000..2dc89ebc012
--- /dev/null
+++ b/home-manager/modules/modules.nix
@@ -0,0 +1,167 @@
+{ pkgs
+, lib
+
+  # Whether to enable module type checking.
+, check ? true
+}:
+
+with lib;
+
+let
+
+  hostPlatform = pkgs.stdenv.hostPlatform;
+
+  checkPlatform = any (meta.platformMatch pkgs.stdenv.hostPlatform);
+
+  loadModule = file: { condition ? true }: {
+    inherit file condition;
+  };
+
+  allModules = [
+    (loadModule ./accounts/email.nix { })
+    (loadModule ./files.nix { })
+    (loadModule ./home-environment.nix { })
+    (loadModule ./manual.nix { })
+    (loadModule ./misc/dconf.nix { })
+    (loadModule ./misc/fontconfig.nix { })
+    (loadModule ./misc/gtk.nix { })
+    (loadModule ./misc/lib.nix { })
+    (loadModule ./misc/news.nix { })
+    (loadModule ./misc/nixpkgs.nix { })
+    (loadModule ./misc/numlock.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./misc/pam.nix { })
+    (loadModule ./misc/qt.nix { })
+    (loadModule ./misc/submodule-support.nix { })
+    (loadModule ./misc/version.nix { })
+    (loadModule ./misc/xdg-mime-apps.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./misc/xdg-user-dirs.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./misc/xdg.nix { })
+    (loadModule ./programs/afew.nix { })
+    (loadModule ./programs/alacritty.nix { })
+    (loadModule ./programs/alot.nix { })
+    (loadModule ./programs/astroid.nix { })
+    (loadModule ./programs/autorandr.nix { })
+    (loadModule ./programs/bash.nix { })
+    (loadModule ./programs/bat.nix { })
+    (loadModule ./programs/beets.nix { })
+    (loadModule ./programs/broot.nix { })
+    (loadModule ./programs/browserpass.nix { })
+    (loadModule ./programs/chromium.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./programs/command-not-found/command-not-found.nix { })
+    (loadModule ./programs/direnv.nix { })
+    (loadModule ./programs/eclipse.nix { })
+    (loadModule ./programs/emacs.nix { })
+    (loadModule ./programs/feh.nix { })
+    (loadModule ./programs/firefox.nix { })
+    (loadModule ./programs/fish.nix { })
+    (loadModule ./programs/fzf.nix { })
+    (loadModule ./programs/getmail.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./programs/git.nix { })
+    (loadModule ./programs/gnome-terminal.nix { })
+    (loadModule ./programs/go.nix { })
+    (loadModule ./programs/gpg.nix { })
+    (loadModule ./programs/home-manager.nix { })
+    (loadModule ./programs/htop.nix { })
+    (loadModule ./programs/info.nix { })
+    (loadModule ./programs/irssi.nix { })
+    (loadModule ./programs/jq.nix { })
+    (loadModule ./programs/kakoune.nix { })
+    (loadModule ./programs/keychain.nix { })
+    (loadModule ./programs/lesspipe.nix { })
+    (loadModule ./programs/lsd.nix { })
+    (loadModule ./programs/man.nix { })
+    (loadModule ./programs/matplotlib.nix { })
+    (loadModule ./programs/mbsync.nix { })
+    (loadModule ./programs/mercurial.nix { })
+    (loadModule ./programs/mpv.nix { })
+    (loadModule ./programs/msmtp.nix { })
+    (loadModule ./programs/neovim.nix { })
+    (loadModule ./programs/newsboat.nix { })
+    (loadModule ./programs/noti.nix { })
+    (loadModule ./programs/notmuch.nix { })
+    (loadModule ./programs/obs-studio.nix { })
+    (loadModule ./programs/offlineimap.nix { })
+    (loadModule ./programs/opam.nix { })
+    (loadModule ./programs/pidgin.nix { })
+    (loadModule ./programs/rofi.nix { })
+    (loadModule ./programs/rtorrent.nix { })
+    (loadModule ./programs/skim.nix { })
+    (loadModule ./programs/starship.nix { })
+    (loadModule ./programs/ssh.nix { })
+    (loadModule ./programs/taskwarrior.nix { })
+    (loadModule ./programs/termite.nix { })
+    (loadModule ./programs/texlive.nix { })
+    (loadModule ./programs/tmux.nix { })
+    (loadModule ./programs/urxvt.nix { })
+    (loadModule ./programs/vim.nix { })
+    (loadModule ./programs/vscode.nix { })
+    (loadModule ./programs/vscode/haskell.nix { })
+    (loadModule ./programs/z-lua.nix { })
+    (loadModule ./programs/zathura.nix { })
+    (loadModule ./programs/zsh.nix { })
+    (loadModule ./services/blueman-applet.nix { })
+    (loadModule ./services/compton.nix { })
+    (loadModule ./services/dunst.nix { })
+    (loadModule ./services/dwm-status.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/emacs.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/flameshot.nix { })
+    (loadModule ./services/getmail.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/gnome-keyring.nix { })
+    (loadModule ./services/gpg-agent.nix { })
+    (loadModule ./services/hound.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/imapnotify.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/kbfs.nix { })
+    (loadModule ./services/kdeconnect.nix { })
+    (loadModule ./services/keepassx.nix { })
+    (loadModule ./services/keybase.nix { })
+    (loadModule ./services/mbsync.nix { })
+    (loadModule ./services/mpd.nix { })
+    (loadModule ./services/mpdris2.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/muchsync.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/network-manager-applet.nix { })
+    (loadModule ./services/nextcloud-client.nix { })
+    (loadModule ./services/owncloud-client.nix { })
+    (loadModule ./services/parcellite.nix { })
+    (loadModule ./services/pasystray.nix { })
+    (loadModule ./services/polybar.nix { })
+    (loadModule ./services/random-background.nix { })
+    (loadModule ./services/redshift.nix { })
+    (loadModule ./services/rsibreak.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/screen-locker.nix { })
+    (loadModule ./services/stalonetray.nix { })
+    (loadModule ./services/status-notifier-watcher.nix { })
+    (loadModule ./services/sxhkd.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/syncthing.nix { })
+    (loadModule ./services/taffybar.nix { })
+    (loadModule ./services/tahoe-lafs.nix { })
+    (loadModule ./services/taskwarrior-sync.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/udiskie.nix { })
+    (loadModule ./services/unclutter.nix { })
+    (loadModule ./services/window-managers/awesome.nix { })
+    (loadModule ./services/window-managers/i3.nix { })
+    (loadModule ./services/window-managers/xmonad.nix { })
+    (loadModule ./services/xcape.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/xembed-sni-proxy.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./services/xscreensaver.nix { })
+    (loadModule ./services/xsuspender.nix { condition = hostPlatform.isLinux; })
+    (loadModule ./systemd.nix { })
+    (loadModule ./xcursor.nix { })
+    (loadModule ./xresources.nix { })
+    (loadModule ./xsession.nix { })
+    (loadModule <nixpkgs/nixos/modules/misc/assertions.nix> { })
+    (loadModule <nixpkgs/nixos/modules/misc/meta.nix> { })
+  ];
+
+  modules = map (getAttr "file") (filter (getAttr "condition") allModules);
+
+  pkgsModule = {
+    config._module.args.baseModules = modules;
+    config._module.args.pkgs = lib.mkDefault pkgs;
+    config._module.check = check;
+    config.lib = import ./lib { inherit lib; };
+    config.nixpkgs.system = mkDefault pkgs.system;
+  };
+
+in
+
+  modules ++ [ pkgsModule ]
diff --git a/home-manager/modules/programs/afew.nix b/home-manager/modules/programs/afew.nix
new file mode 100644
index 00000000000..99bae88c0ee
--- /dev/null
+++ b/home-manager/modules/programs/afew.nix
@@ -0,0 +1,52 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.afew;
+
+in
+
+{
+  options.programs.afew = {
+    enable = mkEnableOption "the afew initial tagging script for Notmuch";
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = ''
+        [SpamFilter]
+        [KillThreadsFilter]
+        [ListMailsFilter]
+        [ArchiveSentMailsFilter]
+        [InboxFilter]
+      '';
+      example = ''
+        [SpamFilter]
+
+        [Filter.0]
+        query = from:pointyheaded@boss.com
+        tags = -new;+boss
+        message = Message from above
+
+        [InboxFilter]
+      '';
+      description = ''
+        Extra lines added to afew configuration file. Available
+        configuration options are described in the afew manual:
+        <link xlink:href="https://afew.readthedocs.io/en/latest/configuration.html" />.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.afew ];
+
+    xdg.configFile."afew/config".text = ''
+      # Generated by Home Manager.
+      # See https://afew.readthedocs.io/
+
+      ${cfg.extraConfig}
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/alacritty.nix b/home-manager/modules/programs/alacritty.nix
new file mode 100644
index 00000000000..84675cb1c8a
--- /dev/null
+++ b/home-manager/modules/programs/alacritty.nix
@@ -0,0 +1,53 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.alacritty;
+
+in
+
+{
+  options = {
+    programs.alacritty = {
+      enable = mkEnableOption "Alacritty";
+
+      settings = mkOption {
+        type = types.attrs;
+        default = {};
+        example = literalExample ''
+          {
+            window.dimensions = {
+              lines = 3;
+              columns = 200;
+            };
+            key_bindings = [
+              {
+                key = "K";
+                mods = "Control";
+                chars = "\\x0c";
+              }
+            ];
+          }
+        '';
+        description = ''
+          Configuration written to
+          <filename>~/.config/alacritty/alacritty.yml</filename>. See
+          <link xlink:href="https://github.com/jwilm/alacritty/blob/master/alacritty.yml"/>
+          for the default configuration.
+        '';
+      };
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      home.packages = [ pkgs.alacritty ];
+
+      xdg.configFile."alacritty/alacritty.yml" = mkIf (cfg.settings != {}) {
+        text = replaceStrings ["\\\\"] ["\\"] (builtins.toJSON cfg.settings);
+      };
+    })
+  ];
+}
diff --git a/home-manager/modules/programs/alot-accounts.nix b/home-manager/modules/programs/alot-accounts.nix
new file mode 100644
index 00000000000..8f3ffdfb31e
--- /dev/null
+++ b/home-manager/modules/programs/alot-accounts.nix
@@ -0,0 +1,61 @@
+pkgs:
+{ config, lib, ... }:
+
+with lib;
+
+{
+  options.alot = {
+    sendMailCommand = mkOption {
+      type = types.nullOr types.str;
+      description = ''
+        Command to send a mail. If msmtp is enabled for the account,
+        then this is set to
+        <command>msmtpq --read-envelope-from --read-recipients</command>.
+      '';
+    };
+
+    contactCompletion = mkOption {
+      type = types.attrsOf types.str;
+      default = {
+        type = "shellcommand";
+        command = "'${pkgs.notmuch}/bin/notmuch address --format=json --output=recipients  date:6M..'";
+        regexp =
+          "'\\[?{"
+          + ''"name": "(?P<name>.*)", ''
+          + ''"address": "(?P<email>.+)", ''
+          + ''"name-addr": ".*"''
+          + "}[,\\]]?'";
+        shellcommand_external_filtering = "False";
+      };
+      example = literalExample ''
+        {
+          type = "shellcommand";
+          command = "abook --mutt-query";
+          regexp = "'^(?P<email>[^@]+@[^\t]+)\t+(?P<name>[^\t]+)'";
+          ignorecase = "True";
+        }
+      '';
+      description = ''
+       Contact completion configuration as expected per alot.
+       See <link xlink:href="http://alot.readthedocs.io/en/latest/configuration/contacts_completion.html">alot's wiki</link> for
+       explanation about possible values.
+      '';
+    };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Extra settings to add to this Alot account configuration.
+      '';
+    };
+  };
+
+  config = mkIf config.notmuch.enable {
+    alot.sendMailCommand = mkOptionDefault (
+      if config.msmtp.enable
+      then "msmtpq --read-envelope-from --read-recipients"
+      else null
+    );
+  };
+}
diff --git a/home-manager/modules/programs/alot.nix b/home-manager/modules/programs/alot.nix
new file mode 100644
index 00000000000..2b28f34caa3
--- /dev/null
+++ b/home-manager/modules/programs/alot.nix
@@ -0,0 +1,173 @@
+# alot config loader is sensitive to leading space !
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.alot;
+
+  alotAccounts = filter (a: a.notmuch.enable)
+    (attrValues config.accounts.email.accounts);
+
+  boolStr = v: if v then "True" else "False";
+
+  accountStr = account: with account;
+    concatStringsSep "\n" (
+      [ "[[${name}]]" ]
+      ++ mapAttrsToList (n: v: n + "=" + v) (
+        {
+          address = address;
+          realname = realName;
+          sendmail_command =
+            optionalString (alot.sendMailCommand != null) alot.sendMailCommand;
+          sent_box = "maildir" + "://" + maildir.absPath + "/" + folders.sent;
+          draft_box = "maildir" + "://"+ maildir.absPath + "/" + folders.drafts;
+        }
+        // optionalAttrs (aliases != []) {
+          aliases = concatStringsSep "," aliases;
+        }
+        // optionalAttrs (gpg != null) {
+          gpg_key = gpg.key;
+          encrypt_by_default = if gpg.encryptByDefault then "all" else "none";
+          sign_by_default = boolStr gpg.signByDefault;
+        }
+        // optionalAttrs (signature.showSignature != "none") {
+          signature = pkgs.writeText "signature.txt" signature.text;
+          signature_as_attachment =
+            boolStr (signature.showSignature == "attach");
+        }
+      )
+      ++ [ alot.extraConfig ]
+      ++ [ "[[[abook]]]" ]
+      ++ mapAttrsToList (n: v: n + "=" + v) alot.contactCompletion
+    );
+
+  configFile =
+    let
+      bindingsToStr = attrSet:
+        concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${v}") attrSet);
+    in
+      ''
+        # Generated by Home Manager.
+        # See http://alot.readthedocs.io/en/latest/configuration/config_options.html
+
+        ${cfg.extraConfig}
+
+        [bindings]
+        ${bindingsToStr cfg.bindings.global}
+
+        [[bufferlist]]
+        ${bindingsToStr cfg.bindings.bufferlist}
+        [[search]]
+        ${bindingsToStr cfg.bindings.search}
+        [[envelope]]
+        ${bindingsToStr cfg.bindings.envelope}
+        [[taglist]]
+        ${bindingsToStr cfg.bindings.taglist}
+        [[thread]]
+        ${bindingsToStr cfg.bindings.thread}
+
+        [accounts]
+
+        ${concatStringsSep "\n\n" (map accountStr alotAccounts)}
+      '';
+
+in
+
+{
+  options.programs.alot = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      example = true;
+      description = ''
+        Whether to enable the Alot mail user agent. Alot uses the
+        Notmuch email system and will therefore be automatically
+        enabled for each email account that is managed by Notmuch.
+      '';
+    };
+
+    hooks = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Content of the hooks file.
+      '';
+    };
+
+    bindings = mkOption {
+      type = types.submodule {
+        options = {
+          global = mkOption {
+            type = types.attrsOf types.str;
+            default = {};
+            description = "Global keybindings.";
+          };
+
+          bufferlist = mkOption {
+            type = types.attrsOf types.str;
+            default = {};
+            description = "Bufferlist mode keybindings.";
+          };
+
+          search = mkOption {
+            type = types.attrsOf types.str;
+            default = {};
+            description = "Search mode keybindings.";
+          };
+
+          envelope = mkOption {
+            type = types.attrsOf types.str;
+            default = {};
+            description = "Envelope mode keybindings.";
+          };
+
+          taglist = mkOption {
+            type = types.attrsOf types.str;
+            default = {};
+            description = "Taglist mode keybindings.";
+          };
+
+          thread = mkOption {
+            type = types.attrsOf types.str;
+            default = {};
+            description = "Thread mode keybindings.";
+          };
+        };
+      };
+      default = {};
+      description = ''
+        Keybindings.
+      '';
+    };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = ''
+        auto_remove_unread = True
+        ask_subject = False
+        handle_mouse = True
+        initial_command = "search tag:inbox AND NOT tag:killed"
+        input_timeout = 0.3
+        prefer_plaintext = True
+        thread_indent_replies = 4
+      '';
+      description = ''
+        Extra lines added to alot configuration file.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages =  [ pkgs.alot ];
+
+    xdg.configFile."alot/config".text = configFile;
+
+    xdg.configFile."alot/hooks.py".text =
+      ''
+        # Generated by Home Manager.
+      ''
+      + cfg.hooks;
+  };
+}
diff --git a/home-manager/modules/programs/astroid-accounts.nix b/home-manager/modules/programs/astroid-accounts.nix
new file mode 100644
index 00000000000..bc94a301db0
--- /dev/null
+++ b/home-manager/modules/programs/astroid-accounts.nix
@@ -0,0 +1,33 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  options.astroid = {
+    enable = mkEnableOption "Astroid";
+
+    sendMailCommand = mkOption {
+      type = types.str;
+      description = ''
+        Command to send a mail. If msmtp is enabled for the account,
+        then this is set to
+        <command>msmtpq --read-envelope-from --read-recipients</command>.
+      '';
+    };
+
+    extraConfig = mkOption {
+      type = types.attrs;
+      default = {};
+      example = { select_query = ""; };
+      description = ''
+        Extra settings to add to this astroid account configuration.
+      '';
+    };
+  };
+
+  config = mkIf config.notmuch.enable {
+    astroid.sendMailCommand = mkIf config.msmtp.enable (
+      mkOptionDefault "msmtpq --read-envelope-from --read-recipients"
+    );
+  };
+}
diff --git a/home-manager/modules/programs/astroid-config-template.json b/home-manager/modules/programs/astroid-config-template.json
new file mode 100644
index 00000000000..87e3f764f9c
--- /dev/null
+++ b/home-manager/modules/programs/astroid-config-template.json
@@ -0,0 +1,113 @@
+{
+    "astroid": {
+        "config": {
+            "version": "11"
+        },
+        "debug": {
+            "dryrun_sending": "false"
+        },
+        "hints": {
+            "level": "0"
+        },
+        "log": {
+            "syslog": "false",
+            "stdout": "true",
+            "level": "info"
+        }
+    },
+    "startup": {
+        "queries": {
+            "inbox": "tag:inbox"
+        }
+    },
+    "terminal": {
+        "height": "10",
+        "font_description": "default"
+    },
+    "thread_index": {
+        "page_jump_rows": "6",
+        "sort_order": "newest",
+        "cell": {
+            "font_description": "default",
+            "line_spacing": "2",
+            "date_length": "10",
+            "message_count_length": "4",
+            "authors_length": "20",
+            "subject_color": "#807d74",
+            "subject_color_selected": "#000000",
+            "background_color_selected": "",
+            "background_color_marked": "#fff584",
+            "background_color_marked_selected": "#bcb559",
+            "tags_length": "80",
+            "tags_upper_color": "#e5e5e5",
+            "tags_lower_color": "#333333",
+            "tags_alpha": "0.5",
+            "hidden_tags": "attachment,flagged,unread"
+        }
+    },
+    "general": {
+        "time": {
+            "clock_format": "local",
+            "same_year": "%b %-e",
+            "diff_year": "%x"
+        }
+    },
+    "editor": {
+        "charset": "utf-8",
+        "save_draft_on_force_quit": "true",
+        "attachment_words": "attach",
+        "attachment_directory": "~",
+        "markdown_processor": "marked"
+    },
+    "mail": {
+        "reply": {
+            "quote_line": "Excerpts from %1's message of %2:",
+            "mailinglist_reply_to_sender": "true"
+        },
+        "forward": {
+            "quote_line": "Forwarding %1's message of %2:",
+            "disposition": "inline"
+        },
+        "sent_tags": "sent",
+        "message_id_fqdn": "",
+        "message_id_user": "",
+        "user_agent": "default",
+        "send_delay": "2",
+        "close_on_success": "false",
+        "format_flowed": "false"
+    },
+    "poll": {
+        "interval": "60",
+        "always_full_refresh": "false"
+    },
+    "attachment": {
+        "external_open_cmd": "xdg-open"
+    },
+    "thread_view": {
+        "open_html_part_external": "false",
+        "preferred_type": "plain",
+        "preferred_html_only": "false",
+        "allow_remote_when_encrypted": "false",
+        "open_external_link": "xdg-open",
+        "default_save_directory": "~",
+        "indent_messages": "false",
+        "gravatar": {
+            "enable": "true"
+        },
+        "mark_unread_delay": "0.5",
+        "expand_flagged": "true"
+    },
+    "crypto": {
+        "gpg": {
+            "path": "gpg2",
+            "always_trust": "true",
+            "enabled": "true"
+        }
+    },
+    "saved_searches": {
+        "show_on_startup": "false",
+        "save_history": "true",
+        "history_lines_to_show": "15",
+        "history_lines": "1000"
+    }
+}
diff --git a/home-manager/modules/programs/astroid.nix b/home-manager/modules/programs/astroid.nix
new file mode 100644
index 00000000000..0463cd15528
--- /dev/null
+++ b/home-manager/modules/programs/astroid.nix
@@ -0,0 +1,139 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+with builtins;
+
+let
+
+  cfg = config.programs.astroid;
+
+  astroidAccounts =
+    filterAttrs
+      (n: v: v.astroid.enable)
+      config.accounts.email.accounts;
+
+  boolOpt = b: if b then "true" else "false";
+
+  accountAttr = account: with account; {
+    email = address;
+    name = realName;
+    sendmail = astroid.sendMailCommand;
+    additional_sent_tags = "";
+    default = boolOpt primary;
+    save_drafts_to = folders.drafts;
+    save_sent = "true";
+    save_sent_to = folders.sent;
+    select_query = "";
+  }
+  // optionalAttrs (signature.showSignature != "none") {
+    signature_attach = boolOpt (signature.showSignature == "attach");
+    signature_default_on = boolOpt (signature.showSignature != "none");
+    signature_file = pkgs.writeText "signature.txt" signature.text;
+    signature_file_markdown = "false";
+    signature_separate = "true";  # prepends '--\n' to the signature
+  }
+  // optionalAttrs (gpg != null) {
+    always_gpg_sign = boolOpt gpg.signByDefault;
+    gpgkey = gpg.key;
+  }
+  // astroid.extraConfig;
+
+  # See https://github.com/astroidmail/astroid/wiki/Configuration-Reference
+  configFile = mailAccounts:
+    let
+      template = fromJSON (readFile ./astroid-config-template.json);
+      astroidConfig = foldl' recursiveUpdate template [
+        {
+          astroid.notmuch_config = "${config.xdg.configHome}/notmuch/notmuchrc";
+          accounts = mapAttrs (n: accountAttr) astroidAccounts;
+          crypto.gpg.path = "${pkgs.gnupg}/bin/gpg";
+        }
+        cfg.extraConfig
+        cfg.externalEditor
+      ];
+    in
+      builtins.toJSON astroidConfig;
+
+in
+
+{
+  options = {
+    programs.astroid = {
+      enable = mkEnableOption "Astroid";
+
+      pollScript = mkOption {
+        type = types.str;
+        default = "";
+        example = "mbsync gmail";
+        description = ''
+          Script to run to fetch/update mails.
+        '';
+      };
+
+      externalEditor = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        # Converts it into JSON that can be merged into the configuration.
+        apply = cmd:
+          optionalAttrs (cmd != null) {
+            editor = {
+              "external_editor" = "true";
+              "cmd" = cmd;
+            };
+          };
+        example = "nvim-qt -- -c 'set ft=mail' '+set fileencoding=utf-8' '+set ff=unix' '+set enc=utf-8' '+set fo+=w' %1";
+        description = ''
+          You can use <code>%1</code>, <code>%2</code>, and
+          <code>%3</code> to refer respectively to:
+          <orderedlist numeration="arabic">
+            <listitem><para>file name</para></listitem>
+            <listitem><para>server name</para></listitem>
+            <listitem><para>socket ID</para></listitem>
+          </orderedlist>
+          See <link xlink:href='https://github.com/astroidmail/astroid/wiki/Customizing-editor' />.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.attrs;
+        default = {};
+        example = { poll.interval = 0; };
+        description = ''
+          JSON config that will override the default Astroid configuration.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = config.programs.notmuch.maildir.synchronizeFlags;
+        message = "The astroid module requires"
+          + " 'programs.notmuch.maildir.synchronizeFlags = true'.";
+      }
+    ];
+
+    home.packages =  [ pkgs.astroid ];
+
+    xdg.configFile."astroid/config".source =
+      pkgs.runCommand "out.json"
+        {
+          json = configFile astroidAccounts;
+          preferLocalBuild = true;
+          allowSubstitutes = false;
+        }
+        ''
+          echo -n "$json" | ${pkgs.jq}/bin/jq . > $out
+        '';
+
+    xdg.configFile."astroid/poll.sh" = {
+      executable = true;
+      text = ''
+        # Generated by Home Manager
+
+        ${cfg.pollScript}
+      '';
+    };
+  };
+}
diff --git a/home-manager/modules/programs/autorandr.nix b/home-manager/modules/programs/autorandr.nix
new file mode 100644
index 00000000000..4514a5b5d58
--- /dev/null
+++ b/home-manager/modules/programs/autorandr.nix
@@ -0,0 +1,349 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.autorandr;
+
+  matrixOf = n: m: elemType: mkOptionType rec {
+    name = "matrixOf";
+    description = "${toString n}×${toString m} matrix of ${elemType.description}s";
+    check = xss:
+      let
+        listOfSize = l: xs: isList xs && length xs == l;
+      in
+        listOfSize n xss && all (xs: listOfSize m xs && all elemType.check xs) xss;
+    merge = mergeOneOption;
+    getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*" "*"]);
+    getSubModules = elemType.getSubModules;
+    substSubModules = mod: matrixOf n m (elemType.substSubModules mod);
+    functor = (defaultFunctor name) // { wrapped = elemType; };
+  };
+
+  profileModule = types.submodule {
+    options = {
+      fingerprint = mkOption {
+        type = types.attrsOf types.str;
+        description = ''
+          Output name to EDID mapping.
+          Use <code>autorandr --fingerprint</code> to get current setup values.
+        '';
+        default = {};
+      };
+
+      config = mkOption {
+        type = types.attrsOf configModule;
+        description = "Per output profile configuration.";
+        default = {};
+      };
+
+      hooks = mkOption {
+        type = profileHooksModule;
+        description = "Profile hook scripts.";
+        default = {};
+      };
+    };
+  };
+
+  configModule = types.submodule {
+    options = {
+      enable = mkOption {
+        type = types.bool;
+        description = "Whether to enable the output.";
+        default = true;
+      };
+
+      primary = mkOption {
+        type = types.bool;
+        description = "Whether output should be marked as primary";
+        default = false;
+      };
+
+      position = mkOption {
+        type = types.str;
+        description = "Output position";
+        default = "";
+        example = "5760x0";
+      };
+
+      mode = mkOption {
+        type = types.str;
+        description = "Output resolution.";
+        default = "";
+        example = "3840x2160";
+      };
+
+      rate = mkOption {
+        type = types.str;
+        description = "Output framerate.";
+        default = "";
+        example = "60.00";
+      };
+
+      gamma = mkOption {
+        type = types.str;
+        description = "Output gamma configuration.";
+        default = "";
+        example = "1.0:0.909:0.833";
+      };
+
+      rotate = mkOption {
+        type = types.nullOr (types.enum ["normal" "left" "right" "inverted"]);
+        description = "Output rotate configuration.";
+        default = null;
+        example = "left";
+      };
+
+      transform = mkOption {
+        type = types.nullOr (matrixOf 3 3 types.float);
+        default = null;
+        example = literalExample ''
+          [
+            [ 0.6 0.0 0.0 ]
+            [ 0.0 0.6 0.0 ]
+            [ 0.0 0.0 1.0 ]
+          ]
+        '';
+        description = ''
+          Refer to
+          <citerefentry>
+            <refentrytitle>xrandr</refentrytitle>
+            <manvolnum>1</manvolnum>
+          </citerefentry>
+          for the documentation of the transform matrix.
+        '';
+      };
+
+      dpi = mkOption {
+        type = types.nullOr types.ints.positive;
+        description = "Output DPI configuration.";
+        default = null;
+        example = 96;
+      };
+
+      scale = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            method = mkOption {
+              type = types.enum ["factor" "pixel" ];
+              description = "Output scaling method.";
+              default = "factor";
+              example = "pixel";
+            };
+
+            x = mkOption {
+              type = types.either types.float types.ints.positive;
+              description = "Horizontal scaling factor/pixels.";
+            };
+
+            y = mkOption {
+              type = types.either types.float types.ints.positive;
+              description = "Vertical scaling factor/pixels.";
+            };
+          };
+        });
+        description = ''
+          Output scale configuration.
+          </para><para>
+          Either configure by pixels or a scaling factor. When using pixel method the
+          <citerefentry>
+            <refentrytitle>xrandr</refentrytitle>
+            <manvolnum>1</manvolnum>
+          </citerefentry>
+          option
+          <parameter class="command">--scale-from</parameter>
+          will be used; when using factor method the option
+          <parameter class="command">--scale</parameter>
+          will be used.
+          </para><para>
+          This option is a shortcut version of the transform option and they are mutually
+          exclusive.
+        '';
+        default = null;
+        example = literalExample ''
+          {
+            x = 1.25;
+            y = 1.25;
+          }
+        '';
+      };
+    };
+  };
+
+  hookType = types.lines;
+
+  globalHooksModule = types.submodule {
+    options = {
+      postswitch = mkOption {
+        type = types.attrsOf hookType;
+        description = "Postswitch hook executed after mode switch.";
+        default = {};
+      };
+
+      preswitch = mkOption {
+        type = types.attrsOf hookType;
+        description = "Preswitch hook executed before mode switch.";
+        default = {};
+      };
+
+      predetect = mkOption {
+        type = types.attrsOf hookType;
+        description = "Predetect hook executed before autorandr attempts to run xrandr.";
+        default = {};
+      };
+    };
+  };
+
+  profileHooksModule = types.submodule {
+    options = {
+      postswitch = mkOption {
+        type = hookType;
+        description = "Postswitch hook executed after mode switch.";
+        default = "";
+      };
+
+      preswitch = mkOption {
+        type = hookType;
+        description = "Preswitch hook executed before mode switch.";
+        default = "";
+      };
+
+      predetect = mkOption {
+        type = hookType;
+        description = "Predetect hook executed before autorandr attempts to run xrandr.";
+        default = "";
+      };
+    };
+  };
+
+  hookToFile = folder: name: hook:
+    nameValuePair
+      "autorandr/${folder}/${name}"
+      { source = "${pkgs.writeShellScriptBin "hook" hook}/bin/hook"; };
+  profileToFiles = name: profile: with profile; mkMerge ([
+    {
+      "autorandr/${name}/setup".text = concatStringsSep "\n" (mapAttrsToList fingerprintToString fingerprint);
+      "autorandr/${name}/config".text = concatStringsSep "\n" (mapAttrsToList configToString profile.config);
+    }
+    (mkIf (hooks.postswitch != "") (listToAttrs [ (hookToFile name "postswitch" hooks.postswitch) ]))
+    (mkIf (hooks.preswitch != "") (listToAttrs [ (hookToFile name "preswitch" hooks.preswitch) ]))
+    (mkIf (hooks.predetect != "") (listToAttrs [ (hookToFile name "predetect" hooks.predetect) ]))
+  ]);
+  fingerprintToString = name: edid: "${name} ${edid}";
+  configToString = name: config: if config.enable then ''
+    output ${name}
+    ${optionalString (config.position != "") "pos ${config.position}"}
+    ${optionalString config.primary "primary"}
+    ${optionalString (config.dpi != null) "dpi ${toString config.dpi}"}
+    ${optionalString (config.gamma != "") "gamma ${config.gamma}"}
+    ${optionalString (config.mode != "") "mode ${config.mode}"}
+    ${optionalString (config.rate != "") "rate ${config.rate}"}
+    ${optionalString (config.rotate != null) "rotate ${config.rotate}"}
+    ${optionalString (config.scale != null) (
+      (if config.scale.method == "factor" then "scale" else "scale-from")
+      + " ${toString config.scale.x}x${toString config.scale.y}"
+    )}
+    ${optionalString (config.transform != null) (
+      "transform " + concatMapStringsSep "," toString (flatten config.transform)
+    )}
+  '' else ''
+    output ${name}
+    off
+  '';
+
+in
+
+{
+  options = {
+    programs.autorandr = {
+      enable = mkEnableOption "Autorandr";
+
+      hooks = mkOption {
+        type = globalHooksModule;
+        description = "Global hook scripts";
+        default = {};
+        example = literalExample ''
+        {
+          postswitch = {
+            "notify-i3" = "''${pkgs.i3}/bin/i3-msg restart";
+            "change-background" = readFile ./change-background.sh;
+            "change-dpi" = '''
+              case "$AUTORANDR_CURRENT_PROFILE" in
+                default)
+                  DPI=120
+                  ;;
+                home)
+                  DPI=192
+                  ;;
+                work)
+                  DPI=144
+                  ;;
+                *)
+                  echo "Unknown profle: $AUTORANDR_CURRENT_PROFILE"
+                  exit 1
+              esac
+
+              echo "Xft.dpi: $DPI" | ''${pkgs.xorg.xrdb}/bin/xrdb -merge
+            '''
+          };
+        }
+        '';
+      };
+
+      profiles = mkOption {
+        type = types.attrsOf profileModule;
+        description = "Autorandr profiles specification.";
+        default = {};
+        example = literalExample ''
+          {
+            "work" = {
+              fingerprint = {
+                eDP1 = "<EDID>";
+                DP1 = "<EDID>";
+              };
+              config = {
+                eDP1.enable = false;
+                DP1 = {
+                  enable = true;
+                  primary = true;
+                  position = "0x0";
+                  mode = "3840x2160";
+                  gamma = "1.0:0.909:0.833";
+                  rate = "60.00";
+                  rotate = "left";
+                };
+              };
+              hooks.postswitch = readFile ./work-postswitch.sh;
+            };
+          }
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = flatten (mapAttrsToList (
+      profile: { config, ... }: mapAttrsToList (
+        output: opts: {
+          assertion = opts.scale == null || opts.transform == null;
+          message = ''
+            Cannot use the profile output options 'scale' and 'transform' simultaneously.
+            Check configuration for: programs.autorandr.profiles.${profile}.config.${output}
+          '';
+        })
+        config
+    )
+    cfg.profiles);
+
+    home.packages = [ pkgs.autorandr ];
+    xdg.configFile = mkMerge ([
+      (mapAttrs' (hookToFile "postswitch.d") cfg.hooks.postswitch)
+      (mapAttrs' (hookToFile "preswitch.d")  cfg.hooks.preswitch)
+      (mapAttrs' (hookToFile "predetect.d")  cfg.hooks.predetect)
+      (mkMerge (mapAttrsToList profileToFiles cfg.profiles))
+    ]);
+  };
+
+  meta.maintainers = [ maintainers.uvnikita ];
+}
diff --git a/home-manager/modules/programs/bash.nix b/home-manager/modules/programs/bash.nix
new file mode 100644
index 00000000000..82a9fbe8f8b
--- /dev/null
+++ b/home-manager/modules/programs/bash.nix
@@ -0,0 +1,219 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.bash;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    programs.bash = {
+      enable = mkEnableOption "GNU Bourne-Again SHell";
+
+      historySize = mkOption {
+        type = types.int;
+        default = 10000;
+        description = "Number of history lines to keep in memory.";
+      };
+
+      historyFile = mkOption {
+        type = types.str;
+        default = "$HOME/.bash_history";
+        description = "Location of the bash history file.";
+      };
+
+      historyFileSize = mkOption {
+        type = types.int;
+        default = 100000;
+        description = "Number of history lines to keep on file.";
+      };
+
+      historyControl = mkOption {
+        type = types.listOf (types.enum [
+          "erasedups"
+          "ignoredups"
+          "ignorespace"
+        ]);
+        default = [];
+        description = "Controlling how commands are saved on the history list.";
+      };
+
+      historyIgnore = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "ls" "cd" "exit" ];
+        description = "List of commands that should not be saved to the history list.";
+      };
+
+      shellOptions = mkOption {
+        type = types.listOf types.str;
+        default = [
+          # Append to history file rather than replacing it.
+          "histappend"
+
+          # check the window size after each command and, if
+          # necessary, update the values of LINES and COLUMNS.
+          "checkwinsize"
+
+          # Extended globbing.
+          "extglob"
+          "globstar"
+
+          # Warn if closing shell with running jobs.
+          "checkjobs"
+        ];
+        description = "Shell options to set.";
+      };
+
+      sessionVariables = mkOption {
+        default = {};
+        type = types.attrs;
+        example = { MAILCHECK = 30; };
+        description = ''
+          Environment variables that will be set for the Bash session.
+        '';
+      };
+
+      shellAliases = mkOption {
+        default = {};
+        type = types.attrsOf types.str;
+        example = { ll = "ls -l"; ".." = "cd .."; };
+        description = ''
+          An attribute set that maps aliases (the top level attribute names in
+          this option) to command strings or directly to build outputs.
+        '';
+      };
+
+      enableAutojump = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Enable the autojump navigation tool.";
+      };
+
+      profileExtra = mkOption {
+        default = "";
+        type = types.lines;
+        description = ''
+          Extra commands that should be run when initializing a login
+          shell.
+        '';
+      };
+
+      bashrcExtra = mkOption {
+        # Hide for now, may want to rename in the future.
+        visible = false;
+        default = "";
+        type = types.lines;
+        description = ''
+          Extra commands that should be added to
+          <filename>~/.bashrc</filename>.
+        '';
+      };
+
+      initExtra = mkOption {
+        default = "";
+        type = types.lines;
+        description = ''
+          Extra commands that should be run when initializing an
+          interactive shell.
+        '';
+      };
+
+      logoutExtra = mkOption {
+        default = "";
+        type = types.lines;
+        description = ''
+          Extra commands that should be run when logging out of an
+          interactive shell.
+        '';
+      };
+    };
+  };
+
+  config = (
+    let
+      aliasesStr = concatStringsSep "\n" (
+        mapAttrsToList (k: v: "alias ${k}=${escapeShellArg v}") cfg.shellAliases
+      );
+
+      shoptsStr = concatStringsSep "\n" (
+        map (v: "shopt -s ${v}") cfg.shellOptions
+      );
+
+      sessionVarsStr = config.lib.shell.exportAll cfg.sessionVariables;
+
+      historyControlStr =
+        concatStringsSep "\n" (mapAttrsToList (n: v: "${n}=${v}") (
+          {
+            HISTFILE = "\"${cfg.historyFile}\"";
+            HISTFILESIZE = toString cfg.historyFileSize;
+            HISTSIZE = toString cfg.historySize;
+          }
+          // optionalAttrs (cfg.historyControl != []) {
+            HISTCONTROL = concatStringsSep ":" cfg.historyControl;
+          }
+          // optionalAttrs (cfg.historyIgnore != []) {
+            HISTIGNORE = concatStringsSep ":" cfg.historyIgnore;
+          }
+        ));
+    in mkIf cfg.enable {
+      programs.bash.bashrcExtra = ''
+        # Commands that should be applied only for interactive shells.
+        if [[ $- == *i* ]]; then
+          ${historyControlStr}
+
+          ${shoptsStr}
+
+          ${aliasesStr}
+
+          ${cfg.initExtra}
+
+          ${optionalString cfg.enableAutojump
+            ". ${pkgs.autojump}/share/autojump/autojump.bash"}
+        fi
+      '';
+
+      home.file.".bash_profile".text = ''
+        # -*- mode: sh -*-
+
+        # include .profile if it exists
+        [[ -f ~/.profile ]] && . ~/.profile
+
+        # include .bashrc if it exists
+        [[ -f ~/.bashrc ]] && . ~/.bashrc
+      '';
+
+      home.file.".profile".text = ''
+        # -*- mode: sh -*-
+
+        . "${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh"
+
+        ${sessionVarsStr}
+
+        ${cfg.profileExtra}
+      '';
+
+      home.file.".bashrc".text = ''
+        # -*- mode: sh -*-
+
+        ${cfg.bashrcExtra}
+      '';
+
+      home.file.".bash_logout" = mkIf (cfg.logoutExtra != "") {
+        text = ''
+          # -*- mode: sh -*-
+
+          ${cfg.logoutExtra}
+        '';
+      };
+
+      home.packages =
+        optional (cfg.enableAutojump) pkgs.autojump;
+    }
+  );
+}
diff --git a/home-manager/modules/programs/bat.nix b/home-manager/modules/programs/bat.nix
new file mode 100644
index 00000000000..860c5e82f54
--- /dev/null
+++ b/home-manager/modules/programs/bat.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.bat;
+
+in
+
+{
+  meta.maintainers = [ maintainers.marsam ];
+
+  options.programs.bat = {
+    enable = mkEnableOption "bat, a cat clone with wings";
+
+    config = mkOption {
+      type = types.attrsOf types.str;
+      default = {};
+      example = {
+        theme = "TwoDark";
+        pager = "less -FR";
+      };
+      description = ''
+        Bat configuration.
+      '';
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.bat ];
+
+    xdg.configFile."bat/config" = mkIf (cfg.config != {}) {
+      text = concatStringsSep "\n" (
+        mapAttrsToList (n: v: ''--${n}="${v}"'') cfg.config
+      );
+    };
+  };
+}
diff --git a/home-manager/modules/programs/beets.nix b/home-manager/modules/programs/beets.nix
new file mode 100644
index 00000000000..152bfd304a4
--- /dev/null
+++ b/home-manager/modules/programs/beets.nix
@@ -0,0 +1,48 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.beets;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    programs.beets = {
+      enable = mkOption {
+        type = types.bool;
+        default =
+          if versionAtLeast config.home.stateVersion "19.03"
+          then false
+          else cfg.settings != {};
+        defaultText = "false";
+        description = ''
+          Whether to enable the beets music library manager. This
+          defaults to <literal>false</literal> for state
+          version ≥ 19.03. For earlier versions beets is enabled if
+          <option>programs.beets.settings</option> is non-empty.
+        '';
+      };
+
+      settings = mkOption {
+        type = types.attrs;
+        default = {};
+        description = ''
+          Configuration written to
+          <filename>~/.config/beets/config.yaml</filename>
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.beets ];
+
+    xdg.configFile."beets/config.yaml".text =
+        builtins.toJSON config.programs.beets.settings;
+  };
+}
diff --git a/home-manager/modules/programs/broot.nix b/home-manager/modules/programs/broot.nix
new file mode 100644
index 00000000000..f6d3cd7f920
--- /dev/null
+++ b/home-manager/modules/programs/broot.nix
@@ -0,0 +1,261 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.broot;
+
+  configFile = config:
+    pkgs.runCommand "conf.toml"
+      {
+         buildInputs = [ pkgs.remarshal ];
+         preferLocalBuild = true;
+         allowSubstitutes = false;
+      }
+      ''
+        remarshal -if json -of toml \
+          < ${pkgs.writeText "verbs.json" (builtins.toJSON config)} \
+          > $out
+      '';
+
+  brootConf = {
+    verbs =
+      mapAttrsToList
+        (name: value: value // { invocation = name; })
+        cfg.verbs;
+    skin = cfg.skin;
+  };
+
+in
+
+{
+  meta.maintainers = [ maintainers.aheaume ];
+
+  options.programs.broot = {
+    enable = mkEnableOption "Broot, a better way to navigate directories";
+
+    enableBashIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Bash integration.
+      '';
+    };
+
+    enableZshIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Zsh integration.
+      '';
+    };
+
+    enableFishIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Fish integration.
+      '';
+    };
+
+    verbs = mkOption {
+      type = with types; attrsOf (attrsOf (either bool str));
+      default = {
+        "p" = { execution = ":parent"; };
+        "edit" = { shortcut = "e"; execution = "$EDITOR {file}" ; };
+        "create {subpath}" = { execution = "$EDITOR {directory}/{subpath}"; };
+        "view" = { execution = "less {file}"; };
+      };
+      example = literalExample ''
+        {
+          "p" = { execution = ":parent"; };
+          "edit" = { shortcut = "e"; execution = "$EDITOR {file}" ; };
+          "create {subpath}" = { execution = "$EDITOR {directory}/{subpath}"; };
+          "view" = { execution = "less {file}"; };
+          "blop {name}\\.{type}" = {
+            execution = "/bin/mkdir {parent}/{type} && /usr/bin/nvim {parent}/{type}/{name}.{type}";
+            from_shell = true;
+          };
+        }
+      '';
+      description = ''
+        Define new verbs. The attribute name indicates how the verb is
+        called by the user, with placeholders for arguments.
+        </para><para>
+        The possible attributes are:
+        </para>
+
+        <para>
+        <variablelist>
+          <varlistentry>
+            <term><literal>execution</literal> (mandatory)</term>
+            <listitem><para>how the verb is executed</para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>shortcut</literal> (optional)</term>
+            <listitem><para>an alternate way to call the verb (without
+            the arguments part)</para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>leave_broot</literal> (optional)</term>
+            <listitem><para>whether to quit broot on execution
+            (default: <literal>true</literal>)</para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>from_shell</literal> (optional)</term>
+            <listitem><para>whether the verb must be executed from the
+            parent shell (default:
+            <literal>false</literal>)</para></listitem>
+          </varlistentry>
+        </variablelist>
+      '';
+    };
+
+    skin = mkOption {
+      type = types.attrsOf types.str;
+      default = {};
+      example = literalExample ''
+        {
+          status_normal_fg = "grayscale(18)";
+          status_normal_bg = "grayscale(3)";
+          status_error_fg = "red";
+          status_error_bg = "yellow";
+          tree_fg = "red";
+          selected_line_bg = "grayscale(7)";
+          permissions_fg = "grayscale(12)";
+          size_bar_full_bg = "red";
+          size_bar_void_bg = "black";
+          directory_fg = "lightyellow";
+          input_fg = "cyan";
+          flag_value_fg = "lightyellow";
+          table_border_fg = "red";
+          code_fg = "lightyellow";
+        }
+      '';
+      description = ''
+        Color configuration.
+        </para><para>
+        Complete list of keys (expected to change before the v1 of broot):
+
+        <itemizedlist>
+          <listitem><para><literal>char_match</literal></para></listitem>
+          <listitem><para><literal>code</literal></para></listitem>
+          <listitem><para><literal>directory</literal></para></listitem>
+          <listitem><para><literal>exe</literal></para></listitem>
+          <listitem><para><literal>file</literal></para></listitem>
+          <listitem><para><literal>file_error</literal></para></listitem>
+          <listitem><para><literal>flag_label</literal></para></listitem>
+          <listitem><para><literal>flag_value</literal></para></listitem>
+          <listitem><para><literal>input</literal></para></listitem>
+          <listitem><para><literal>link</literal></para></listitem>
+          <listitem><para><literal>permissions</literal></para></listitem>
+          <listitem><para><literal>selected_line</literal></para></listitem>
+          <listitem><para><literal>size_bar_full</literal></para></listitem>
+          <listitem><para><literal>size_bar_void</literal></para></listitem>
+          <listitem><para><literal>size_text</literal></para></listitem>
+          <listitem><para><literal>spinner</literal></para></listitem>
+          <listitem><para><literal>status_error</literal></para></listitem>
+          <listitem><para><literal>status_normal</literal></para></listitem>
+          <listitem><para><literal>table_border</literal></para></listitem>
+          <listitem><para><literal>tree</literal></para></listitem>
+          <listitem><para><literal>unlisted</literal></para></listitem>
+        </itemizedlist></para>
+
+        <para>
+        Add <literal>_fg</literal> for a foreground color and
+        <literal>_bg</literal> for a background colors.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.broot ];
+
+    xdg.configFile."broot/conf.toml".source = configFile brootConf;
+
+    # Dummy file to prevent broot from trying to reinstall itself
+    xdg.configFile."broot/launcher/installed".text = "";
+
+    programs.bash.initExtra =
+      mkIf cfg.enableBashIntegration (
+        # Using mkAfter to make it more likely to appear after other
+        # manipulations of the prompt.
+        mkAfter ''
+          # This script was automatically generated by the broot function
+          # More information can be found in https://github.com/Canop/broot
+          # This function starts broot and executes the command
+          # it produces, if any.
+          # It's needed because some shell commands, like `cd`,
+          # have no useful effect if executed in a subshell.
+          function br {
+              f=$(mktemp)
+              (
+                  set +e
+                  broot --outcmd "$f" "$@"
+                  code=$?
+                  if [ "$code" != 0 ]; then
+                      rm -f "$f"
+                      exit "$code"
+                  fi
+              )
+              code=$?
+              if [ "$code" != 0 ]; then
+                  return "$code"
+              fi
+              d=$(cat "$f")
+              rm -f "$f"
+              eval "$d"
+          }
+        ''
+      );
+
+    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+      # This script was automatically generated by the broot function
+      # More information can be found in https://github.com/Canop/broot
+      # This function starts broot and executes the command
+      # it produces, if any.
+      # It's needed because some shell commands, like `cd`,
+      # have no useful effect if executed in a subshell.
+      function br {
+          f=$(mktemp)
+          (
+              set +e
+              broot --outcmd "$f" "$@"
+              code=$?
+              if [ "$code" != 0 ]; then
+                  rm -f "$f"
+                  exit "$code"
+              fi
+          )
+          code=$?
+          if [ "$code" != 0 ]; then
+              return "$code"
+          fi
+          d=$(cat "$f")
+          rm -f "$f"
+          eval "$d"
+      }
+    '';
+
+    programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
+      # This script was automatically generated by the broot function
+      # More information can be found in https://github.com/Canop/broot
+      # This function starts broot and executes the command
+      # it produces, if any.
+      # It's needed because some shell commands, like `cd`,
+      # have no useful effect if executed in a subshell.
+      function br
+          set f (mktemp)
+          broot --outcmd $f $argv
+          if test $status -ne 0
+              rm -f "$f"
+              return "$code"
+          end
+          set d (cat "$f")
+          rm -f "$f"
+          eval "$d"
+      end
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/browserpass.nix b/home-manager/modules/programs/browserpass.nix
new file mode 100644
index 00000000000..7af5e8f8756
--- /dev/null
+++ b/home-manager/modules/programs/browserpass.nix
@@ -0,0 +1,80 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  browsers = [
+    "chrome"
+    "chromium"
+    "firefox"
+    "vivaldi"
+  ];
+in {
+  options = {
+    programs.browserpass = {
+      enable = mkEnableOption "the browserpass extension host application";
+
+      browsers = mkOption {
+        type = types.listOf (types.enum browsers);
+        default = browsers;
+        example = [ "firefox" ];
+        description = "Which browsers to install browserpass for";
+      };
+    };
+  };
+
+  config = mkIf config.programs.browserpass.enable {
+    home.file = builtins.concatLists (with pkgs.stdenv; map (x:
+      if x == "chrome" then
+        let dir = if isDarwin
+          then "Library/Application Support/Google/Chrome/NativeMessagingHosts"
+          else ".config/google-chrome/NativeMessagingHosts";
+        in [
+          {
+            target = "${dir}/com.github.browserpass.native.json";
+            source = "${pkgs.browserpass}/lib/browserpass/hosts/chromium/com.github.browserpass.native.json";
+          }
+          {
+            target = "${dir}/../policies/managed/com.github.browserpass.native.json";
+            source = "${pkgs.browserpass}/lib/browserpass/policies/chromium/com.github.browserpass.native.json";
+          }
+        ]
+      else if x == "chromium" then
+        let dir = if isDarwin
+          then "Library/Application Support/Chromium/NativeMessagingHosts"
+          else ".config/chromium/NativeMessagingHosts";
+        in [
+          {
+            target = "${dir}/com.github.browserpass.native.json";
+            source = "${pkgs.browserpass}/lib/browserpass/hosts/chromium/com.github.browserpass.native.json";
+          }
+          {
+            target = "${dir}/../policies/managed/com.github.browserpass.native.json";
+            source = "${pkgs.browserpass}/lib/browserpass/policies/chromium/com.github.browserpass.native.json";
+          }
+        ]
+      else if x == "firefox" then
+        [ {
+          target = (if isDarwin
+            then "Library/Application Support/Mozilla/NativeMessagingHosts"
+            else ".mozilla/native-messaging-hosts")
+            + "/com.github.browserpass.native.json";
+          source = "${pkgs.browserpass}/lib/browserpass/hosts/firefox/com.github.browserpass.native.json";
+        } ]
+      else if x == "vivaldi" then
+        let dir = if isDarwin
+          then "Library/Application Support/Vivaldi/NativeMessagingHosts"
+          else ".config/vivaldi/NativeMessagingHosts";
+        in [
+          {
+            target = "${dir}/com.github.browserpass.native.json";
+            source = "${pkgs.browserpass}/lib/browserpass/hosts/chromium/com.github.browserpass.native.json";
+          }
+          {
+            target = "${dir}/../policies/managed/com.github.browserpass.native.json";
+            source = "${pkgs.browserpass}/lib/browserpass/policies/chromium/com.github.browserpass.native.json";
+          }
+        ]
+      else throw "unknown browser ${x}") config.programs.browserpass.browsers);
+  };
+}
diff --git a/home-manager/modules/programs/chromium.nix b/home-manager/modules/programs/chromium.nix
new file mode 100644
index 00000000000..83a827a0ed0
--- /dev/null
+++ b/home-manager/modules/programs/chromium.nix
@@ -0,0 +1,93 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  browserModule = defaultPkg: name: visible:
+    let
+      browser = (builtins.parseDrvName defaultPkg.name).name;
+    in
+      {
+        enable = mkOption {
+          inherit visible;
+          default = false;
+          example = true;
+          description = "Whether to enable ${name}.";
+          type = lib.types.bool;
+        };
+
+        package = mkOption {
+          inherit visible;
+          type = types.package;
+          default = defaultPkg;
+          defaultText = literalExample "pkgs.${browser}";
+          description = "The ${name} package to use.";
+        };
+
+        extensions = mkOption {
+          inherit visible;
+          type = types.listOf types.str;
+          default = [];
+          example = literalExample ''
+            [
+              "chlffgpmiacpedhhbkiomidkjlcfhogd" # pushbullet
+              "mbniclmhobmnbdlbpiphghaielnnpgdp" # lightshot
+              "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere
+              "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
+            ]
+          '';
+          description = ''
+            List of ${name} extensions to install.
+            To find the extension ID, check its URL on the
+            <link xlink:href="https://chrome.google.com/webstore/category/extensions">Chrome Web Store</link>.
+          '';
+        };
+      };
+
+  browserConfig = cfg:
+    let
+
+      browser = (builtins.parseDrvName cfg.package.name).name;
+
+      darwinDirs = {
+        chromium = "Chromium";
+        google-chrome = "Google/Chrome";
+        google-chrome-beta = "Google/Chrome Beta";
+        google-chrome-dev = "Google/Chrome Dev";
+      };
+
+      configDir = if pkgs.stdenv.isDarwin
+        then "Library/Application Support/${getAttr browser darwinDirs}"
+        else "${config.xdg.configHome}/${browser}";
+
+      extensionJson = ext: {
+        target = "${configDir}/External Extensions/${ext}.json";
+        text = builtins.toJSON {
+          external_update_url = "https://clients2.google.com/service/update2/crx";
+        };
+      };
+
+    in
+      mkIf cfg.enable {
+        home.packages = [ cfg.package ];
+        home.file = map extensionJson cfg.extensions;
+      };
+
+in
+
+{
+  options.programs = {
+    chromium = browserModule pkgs.chromium "Chromium" true;
+    google-chrome = browserModule pkgs.google-chrome "Google Chrome" false;
+    google-chrome-beta = browserModule pkgs.google-chrome-beta "Google Chrome Beta" false;
+    google-chrome-dev = browserModule pkgs.google-chrome-dev "Google Chrome Dev" false;
+  };
+
+  config = mkMerge [
+    (browserConfig config.programs.chromium)
+    (browserConfig config.programs.google-chrome)
+    (browserConfig config.programs.google-chrome-beta)
+    (browserConfig config.programs.google-chrome-dev)
+  ];
+}
diff --git a/home-manager/modules/programs/command-not-found/command-not-found.nix b/home-manager/modules/programs/command-not-found/command-not-found.nix
new file mode 100644
index 00000000000..0053fe36ad7
--- /dev/null
+++ b/home-manager/modules/programs/command-not-found/command-not-found.nix
@@ -0,0 +1,57 @@
+# Adapted from Nixpkgs.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.command-not-found;
+  commandNotFound = pkgs.substituteAll {
+    name = "command-not-found";
+    dir = "bin";
+    src = ./command-not-found.pl;
+    isExecutable = true;
+    inherit (pkgs) perl;
+    inherit (cfg) dbPath;
+    perlFlags = concatStrings (map (path: "-I ${path}/lib/perl5/site_perl ")
+      [ pkgs.perlPackages.DBI pkgs.perlPackages.DBDSQLite pkgs.perlPackages.StringShellQuote ]);
+  };
+
+  shInit = commandNotFoundHandlerName: ''
+    # This function is called whenever a command is not found.
+    ${commandNotFoundHandlerName}() {
+      local p=${commandNotFound}/bin/command-not-found
+      if [ -x $p -a -f ${cfg.dbPath} ]; then
+        # Run the helper program.
+        $p "$@"
+      else
+        echo "$1: command not found" >&2
+        return 127
+      fi
+    }
+  '';
+
+in
+
+{
+  options.programs.command-not-found = {
+    enable = mkEnableOption "command-not-found hook for interactive shell";
+
+    dbPath = mkOption {
+      default = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite" ;
+      description = ''
+        Absolute path to <filename>programs.sqlite</filename>. By
+        default this file will be provided by your channel
+        (nixexprs.tar.xz).
+      '';
+      type = types.path;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.bash.initExtra = shInit "command_not_found_handle";
+    programs.zsh.initExtra = shInit "command_not_found_handler";
+
+    home.packages = [ commandNotFound ];
+  };
+}
diff --git a/home-manager/modules/programs/command-not-found/command-not-found.pl b/home-manager/modules/programs/command-not-found/command-not-found.pl
new file mode 100644
index 00000000000..997dfec649b
--- /dev/null
+++ b/home-manager/modules/programs/command-not-found/command-not-found.pl
@@ -0,0 +1,44 @@
+#! @perl@/bin/perl -w @perlFlags@
+
+use strict;
+use DBI;
+use DBD::SQLite;
+use String::ShellQuote;
+use Config;
+
+my $program = $ARGV[0];
+
+my $dbPath = "@dbPath@";
+
+my $dbh = DBI->connect("dbi:SQLite:dbname=$dbPath", "", "")
+    or die "cannot open database `$dbPath'";
+$dbh->{RaiseError} = 0;
+$dbh->{PrintError} = 0;
+
+my $system = $ENV{"NIX_SYSTEM"} // $Config{myarchname};
+
+my $res = $dbh->selectall_arrayref(
+    "select package from Programs where system = ? and name = ?",
+    { Slice => {} }, $system, $program);
+
+if (!defined $res || scalar @$res == 0) {
+    print STDERR "$program: command not found\n";
+} elsif (scalar @$res == 1) {
+    my $package = @$res[0]->{package};
+    if ($ENV{"NIX_AUTO_RUN"} // "") {
+        exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV));
+    } else {
+        print STDERR <<EOF;
+The program ‘$program’ is currently not installed. You can install it by typing:
+  nix-env -iA nixos.$package
+EOF
+    }
+} else {
+    print STDERR <<EOF;
+The program ‘$program’ is currently not installed. It is provided by
+several packages. You can install it by typing one of the following:
+EOF
+    print STDERR "  nix-env -iA nixos.$_->{package}\n" foreach @$res;
+}
+
+exit 127;
diff --git a/home-manager/modules/programs/direnv.nix b/home-manager/modules/programs/direnv.nix
new file mode 100644
index 00000000000..e4c17239c58
--- /dev/null
+++ b/home-manager/modules/programs/direnv.nix
@@ -0,0 +1,107 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.direnv;
+  configFile = config:
+    pkgs.runCommand "config.toml"
+      {
+         buildInputs = [ pkgs.remarshal ];
+         preferLocalBuild = true;
+         allowSubstitutes = false;
+      }
+      ''
+        remarshal -if json -of toml \
+          < ${pkgs.writeText "config.json" (builtins.toJSON config)} \
+          > $out
+      '';
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options.programs.direnv = {
+    enable = mkEnableOption "direnv, the environment switcher";
+
+    config = mkOption {
+      type = types.attrs;
+      default = {};
+      description = ''
+        Configuration written to
+        <filename>~/.config/direnv/config.toml</filename>.
+        </para><para>
+        See
+        <citerefentry>
+          <refentrytitle>direnv.toml</refentrytitle>
+          <manvolnum>1</manvolnum>
+        </citerefentry>.
+        for the full list of options.
+      '';
+    };
+
+    stdlib = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Custom stdlib written to
+        <filename>~/.config/direnv/direnvrc</filename>.
+      '';
+    };
+
+    enableBashIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Bash integration.
+      '';
+    };
+
+    enableZshIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Zsh integration.
+      '';
+    };
+
+    enableFishIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Fish integration.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.direnv ];
+
+    xdg.configFile."direnv/config.toml" = mkIf (cfg.config != {}) {
+      source = configFile cfg.config;
+    };
+
+    xdg.configFile."direnv/direnvrc" = mkIf (cfg.stdlib != "") {
+      text = cfg.stdlib;
+    };
+
+    programs.bash.initExtra =
+      mkIf cfg.enableBashIntegration (
+        # Using mkAfter to make it more likely to appear after other
+        # manipulations of the prompt.
+        mkAfter ''
+          eval "$(${pkgs.direnv}/bin/direnv hook bash)"
+        ''
+      );
+
+    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+      eval "$(${pkgs.direnv}/bin/direnv hook zsh)"
+    '';
+
+    programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
+      eval (${pkgs.direnv}/bin/direnv hook fish)
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/eclipse.nix b/home-manager/modules/programs/eclipse.nix
new file mode 100644
index 00000000000..4a432c9fe1a
--- /dev/null
+++ b/home-manager/modules/programs/eclipse.nix
@@ -0,0 +1,54 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.eclipse;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    programs.eclipse = {
+      enable = mkEnableOption "Eclipse";
+
+      enableLombok = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = ''
+          Whether to enable the Lombok Java Agent in Eclipse. This is
+          necessary to use the Lombok class annotations.
+        '';
+      };
+
+      jvmArgs = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = "JVM arguments to use for the Eclipse process.";
+      };
+
+      plugins = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        description = "Plugins that should be added to Eclipse.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [
+      (pkgs.eclipses.eclipseWithPlugins {
+        eclipse = pkgs.eclipses.eclipse-platform;
+        jvmArgs =
+          cfg.jvmArgs
+          ++ optional cfg.enableLombok
+              "-javaagent:${pkgs.lombok}/share/java/lombok.jar";
+        plugins = cfg.plugins;
+      })
+    ];
+  };
+}
diff --git a/home-manager/modules/programs/emacs.nix b/home-manager/modules/programs/emacs.nix
new file mode 100644
index 00000000000..78c136c9868
--- /dev/null
+++ b/home-manager/modules/programs/emacs.nix
@@ -0,0 +1,79 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  hmTypes = import ../lib/types.nix { inherit lib; };
+
+  cfg = config.programs.emacs;
+
+  # Copied from all-packages.nix, with modifications to support
+  # overrides.
+  emacsPackages =
+    let
+      epkgs = pkgs.emacsPackagesNgGen cfg.package;
+    in
+      epkgs.overrideScope' cfg.overrides;
+  emacsWithPackages = emacsPackages.emacsWithPackages;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    programs.emacs = {
+      enable = mkEnableOption "Emacs";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.emacs;
+        defaultText = literalExample "pkgs.emacs";
+        example = literalExample "pkgs.emacs25-nox";
+        description = "The Emacs package to use.";
+      };
+
+      extraPackages = mkOption {
+        default = self: [];
+        type = hmTypes.selectorFunction;
+        defaultText = "epkgs: []";
+        example = literalExample "epkgs: [ epkgs.emms epkgs.magit ]";
+        description = ''
+          Extra packages available to Emacs. To get a list of
+          available packages run:
+          <command>nix-env -f '&lt;nixpkgs&gt;' -qaP -A emacsPackagesNg</command>.
+        '';
+      };
+
+      overrides = mkOption {
+        default = self: super: {};
+        type = hmTypes.overlayFunction;
+        defaultText = "self: super: {}";
+        example = literalExample ''
+          self: super: rec {
+            haskell-mode = self.melpaPackages.haskell-mode;
+            # ...
+          };
+        '';
+        description = ''
+          Allows overriding packages within the Emacs package set.
+        '';
+      };
+
+      finalPackage = mkOption {
+        type = types.package;
+        visible = false;
+        readOnly = true;
+        description = ''
+          The Emacs package including any overrides and extra packages.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.finalPackage ];
+    programs.emacs.finalPackage = emacsWithPackages cfg.extraPackages;
+  };
+}
diff --git a/home-manager/modules/programs/feh.nix b/home-manager/modules/programs/feh.nix
new file mode 100644
index 00000000000..4342181fa4a
--- /dev/null
+++ b/home-manager/modules/programs/feh.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.feh;
+
+  disableBinding = func: key: func;
+  enableBinding = func: key: "${func} ${key}";
+
+in
+
+{
+  options.programs.feh = {
+    enable = mkEnableOption "feh - a fast and light image viewer";
+
+    keybindings = mkOption {
+      default = {};
+      type = types.attrsOf types.str;
+      example = { zoom_in = "plus"; zoom_out = "minus"; };
+      description = ''
+        Set keybindings.
+        See <link xlink:href="https://man.finalrewind.org/1/feh/#x4b455953"/> for
+        default bindings and available commands.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.feh ];
+
+    xdg.configFile."feh/keys".text = ''
+      # Disable default keybindings
+      ${concatStringsSep "\n" (mapAttrsToList disableBinding cfg.keybindings)}
+
+      # Enable new keybindings
+      ${concatStringsSep "\n" (mapAttrsToList enableBinding cfg.keybindings)}
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/firefox.nix b/home-manager/modules/programs/firefox.nix
new file mode 100644
index 00000000000..708b05417d6
--- /dev/null
+++ b/home-manager/modules/programs/firefox.nix
@@ -0,0 +1,282 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.firefox;
+
+  extensionPath = "extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";
+
+  profiles =
+    flip mapAttrs' cfg.profiles (_: profile:
+      nameValuePair "Profile${toString profile.id}" {
+        Name = profile.name;
+        Path = profile.path;
+        IsRelative = 1;
+        Default = if profile.isDefault then 1 else 0;
+      }
+    ) // {
+      General = {
+        StartWithLastProfile = 1;
+      };
+    };
+
+  profilesIni = generators.toINI {} profiles;
+
+  mkUserJs = prefs: extraPrefs: ''
+    // Generated by Home Manager.
+
+    ${concatStrings (mapAttrsToList (name: value: ''
+      user_pref("${name}", ${builtins.toJSON value});
+    '') prefs)}
+
+    ${extraPrefs}
+  '';
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    programs.firefox = {
+      enable = mkEnableOption "Firefox";
+
+      package = mkOption {
+        type = types.package;
+        default =
+          if versionAtLeast config.home.stateVersion "19.09"
+          then pkgs.firefox
+          else pkgs.firefox-unwrapped;
+        defaultText = literalExample "pkgs.firefox";
+        description = ''
+          The Firefox package to use. If state version ≥ 19.09 then
+          this should be a wrapped Firefox package. For earlier state
+          versions it should be an unwrapped Firefox package.
+        '';
+      };
+
+      extensions = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        example = literalExample ''
+          with pkgs.nur.repos.rycee.firefox-addons; [
+            https-everywhere
+            privacy-badger
+          ]
+        '';
+        description = ''
+          List of Firefox add-on packages to install. Note, it is
+          necessary to manually enable these extensions inside Firefox
+          after the first installation.
+        '';
+      };
+
+      profiles = mkOption {
+        type = types.attrsOf (types.submodule ({config, name, ...}: {
+          options = {
+            name = mkOption {
+              type = types.str;
+              default = name;
+              description = "Profile name.";
+            };
+
+            id = mkOption {
+              type = types.ints.unsigned;
+              default = 0;
+              description = ''
+                Profile ID. This should be set to a unique number per profile.
+              '';
+            };
+
+            settings = mkOption {
+              type = with types; attrsOf (either bool (either int str));
+              default = {};
+              example = literalExample ''
+                {
+                  "browser.startup.homepage" = "https://nixos.org";
+                  "browser.search.region" = "GB";
+                  "browser.search.isUS" = false;
+                  "distribution.searchplugins.defaultLocale" = "en-GB";
+                  "general.useragent.locale" = "en-GB";
+                  "browser.bookmarks.showMobileBookmarks" = true;
+                }
+              '';
+              description = "Attribute set of Firefox preferences.";
+            };
+
+            extraConfig = mkOption {
+              type = types.lines;
+              default = "";
+              description = ''
+                Extra preferences to add to <filename>user.js</filename>.
+              '';
+            };
+
+            userChrome = mkOption {
+              type = types.lines;
+              default = "";
+              description = "Custom Firefox CSS.";
+              example = ''
+                /* Hide tab bar in FF Quantum */
+                @-moz-document url("chrome://browser/content/browser.xul") {
+                  #TabsToolbar {
+                    visibility: collapse !important;
+                    margin-bottom: 21px !important;
+                  }
+
+                  #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header {
+                    visibility: collapse !important;
+                  }
+                }
+              '';
+            };
+
+            path = mkOption {
+              type = types.str;
+              default = name;
+              description = "Profile path.";
+            };
+
+            isDefault = mkOption {
+              type = types.bool;
+              default = config.id == 0;
+              defaultText = "true if profile ID is 0";
+              description = "Whether this is a default profile.";
+            };
+          };
+        }));
+        default = {};
+        description = "Attribute set of Firefox profiles.";
+      };
+
+      enableAdobeFlash = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the unfree Adobe Flash plugin.";
+      };
+
+      enableGoogleTalk = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable the unfree Google Talk plugin. This option
+          is <emphasis>deprecated</emphasis> and will only work if
+
+          <programlisting language="nix">
+          programs.firefox.package = pkgs.firefox-esr-52-unwrapped;
+          </programlisting>
+
+          and the <option>plugin.load_flash_only</option> Firefox
+          option has been disabled.
+        '';
+      };
+
+      enableIcedTea = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable the Java applet plugin. This option is
+          <emphasis>deprecated</emphasis> and will only work if
+
+          <programlisting language="nix">
+          programs.firefox.package = pkgs.firefox-esr-52-unwrapped;
+          </programlisting>
+
+          and the <option>plugin.load_flash_only</option> Firefox
+          option has been disabled.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      (
+        let
+          defaults =
+            catAttrs "name" (filter (a: a.isDefault) (attrValues cfg.profiles));
+        in {
+          assertion = cfg.profiles == {} || length defaults == 1;
+          message =
+            "Must have exactly one default Firefox profile but found "
+            + toString (length defaults)
+            + optionalString (length defaults > 1)
+                (", namely " + concatStringsSep ", " defaults);
+        }
+      )
+
+      (
+        let
+          duplicates =
+            filterAttrs (_: v: length v != 1)
+            (zipAttrs
+            (mapAttrsToList (n: v: { "${toString v.id}" = n; })
+            (cfg.profiles)));
+
+          mkMsg = n: v: "  - ID ${n} is used by ${concatStringsSep ", " v}";
+        in {
+          assertion = duplicates == {};
+          message =
+            "Must not have Firefox profiles with duplicate IDs but\n"
+            + concatStringsSep "\n" (mapAttrsToList mkMsg duplicates);
+        }
+      )
+    ];
+
+    home.packages =
+      let
+        # The configuration expected by the Firefox wrapper.
+        fcfg = {
+          enableAdobeFlash = cfg.enableAdobeFlash;
+          enableGoogleTalkPlugin = cfg.enableGoogleTalk;
+          icedtea = cfg.enableIcedTea;
+        };
+
+        # A bit of hackery to force a config into the wrapper.
+        browserName = cfg.package.browserName
+          or (builtins.parseDrvName cfg.package.name).name;
+
+        # The configuration expected by the Firefox wrapper builder.
+        bcfg = setAttrByPath [browserName] fcfg;
+
+        package =
+          if versionAtLeast config.home.stateVersion "19.09"
+          then cfg.package.override { cfg = fcfg; }
+          else (pkgs.wrapFirefox.override { config = bcfg; }) cfg.package { };
+      in
+        [ package ];
+
+    home.file = mkMerge (
+      [{
+        ".mozilla/${extensionPath}" = mkIf (cfg.extensions != []) (
+          let
+            extensionsEnv = pkgs.buildEnv {
+              name = "hm-firefox-extensions";
+              paths = cfg.extensions;
+            };
+          in {
+            source = "${extensionsEnv}/share/mozilla/${extensionPath}";
+            recursive = true;
+          }
+        );
+
+        ".mozilla/firefox/profiles.ini" = mkIf (cfg.profiles != {}) {
+          text = profilesIni;
+        };
+      }]
+      ++ flip mapAttrsToList cfg.profiles (_: profile: {
+        ".mozilla/firefox/${profile.path}/chrome/userChrome.css" =
+          mkIf (profile.userChrome != "") {
+            text = profile.userChrome;
+          };
+
+        ".mozilla/firefox/${profile.path}/user.js" =
+          mkIf (profile.settings != {} || profile.extraConfig != "") {
+            text = mkUserJs profile.settings profile.extraConfig;
+          };
+      })
+    );
+  };
+}
diff --git a/home-manager/modules/programs/fish.nix b/home-manager/modules/programs/fish.nix
new file mode 100644
index 00000000000..87a17b85507
--- /dev/null
+++ b/home-manager/modules/programs/fish.nix
@@ -0,0 +1,191 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.fish;
+
+  abbrsStr = concatStringsSep "\n" (
+    mapAttrsToList (k: v: "abbr --add --global ${k} '${v}'") cfg.shellAbbrs
+  );
+
+  aliasesStr = concatStringsSep "\n" (
+    mapAttrsToList (k: v: "alias ${k}='${v}'") cfg.shellAliases
+  );
+
+in
+
+{
+  options = {
+    programs.fish = {
+      enable = mkEnableOption "fish friendly interactive shell";
+
+      package = mkOption {
+        default = pkgs.fish;
+        defaultText = literalExample "pkgs.fish";
+        description = ''
+          The fish package to install. May be used to change the version.
+        '';
+        type = types.package;
+      };
+
+      shellAliases = mkOption {
+        default = {};
+        description = ''
+          Set of aliases for fish shell. See
+          <option>environment.shellAliases</option> for an option
+          format description.
+        '';
+        type = types.attrs;
+      };
+
+      shellAbbrs = mkOption {
+        default = {};
+        description = ''
+          Set of abbreviations for fish shell.
+        '';
+        type = types.attrs;
+      };
+
+      shellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during fish shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      loginShellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during fish login shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      interactiveShellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during interactive fish shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      promptInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code used to initialise fish prompt.
+        '';
+        type = types.lines;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    xdg.dataFile."fish/home-manager_generated_completions".source =
+      let
+        # paths later in the list will overwrite those already linked
+        destructiveSymlinkJoin =
+          args_@{ name
+              , paths
+              , preferLocalBuild ? true
+              , allowSubstitutes ? false
+              , postBuild ? ""
+              , ...
+              }:
+          let
+            args = removeAttrs args_ [ "name" "postBuild" ]
+              // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults
+          in pkgs.runCommand name args
+            ''
+              mkdir -p $out
+              for i in $paths; do
+                if [ -z "$(find $i -prune -empty)" ]; then
+                  cp -srf $i/* $out
+                fi
+              done
+              ${postBuild}
+            '';
+        generateCompletions = package: pkgs.runCommand
+          "${package.name}-fish-completions"
+          {
+            src = package;
+            nativeBuildInputs = [ pkgs.python2 ];
+            buildInputs = [ cfg.package ];
+            preferLocalBuild = true;
+            allowSubstitutes = false;
+          }
+          ''
+            mkdir -p $out
+            if [ -d $src/share/man ]; then
+              find $src/share/man -type f \
+                | xargs python ${cfg.package}/share/fish/tools/create_manpage_completions.py --directory $out \
+                > /dev/null
+            fi
+          '';
+      in
+        destructiveSymlinkJoin {
+          name = "${config.home.username}-fish-completions";
+          paths =
+            let
+              cmp = (a: b: (a.meta.priority or 0) > (b.meta.priority or 0));
+            in
+              map generateCompletions (sort cmp config.home.packages);
+        };
+
+    programs.fish.interactiveShellInit = ''
+      # add completions generated by Home Manager to $fish_complete_path
+      begin
+        set -l joined (string join " " $fish_complete_path)
+        set -l prev_joined (string replace --regex "[^\s]*generated_completions.*" "" $joined)
+        set -l post_joined (string replace $prev_joined "" $joined)
+        set -l prev (string split " " (string trim $prev_joined))
+        set -l post (string split " " (string trim $post_joined))
+        set fish_complete_path $prev "${config.xdg.dataHome}/fish/home-manager_generated_completions" $post
+      end
+    '';
+
+    xdg.configFile."fish/config.fish".text = ''
+      # ~/.config/fish/config.fish: DO NOT EDIT -- this file has been generated automatically.
+      # if we haven't sourced the general config, do it
+      if not set -q __fish_general_config_sourced
+        set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
+        fenv source ${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh > /dev/null
+        set -e fish_function_path[1]
+
+        ${cfg.shellInit}
+        # and leave a note so we don't source this config section again from
+        # this very shell (children will source the general config anew)
+        set -g __fish_general_config_sourced 1
+      end
+      # if we haven't sourced the login config, do it
+      status --is-login; and not set -q __fish_login_config_sourced
+      and begin
+
+        ${cfg.loginShellInit}
+        # and leave a note so we don't source this config section again from
+        # this very shell (children will source the general config anew)
+        set -g __fish_login_config_sourced 1
+      end
+      # if we haven't sourced the interactive config, do it
+      status --is-interactive; and not set -q __fish_interactive_config_sourced
+      and begin
+        # Abbrs
+        ${abbrsStr}
+
+        # Aliases
+        ${aliasesStr}
+
+        ${cfg.promptInit}
+        ${cfg.interactiveShellInit}
+        # and leave a note so we don't source this config section again from
+        # this very shell (children will source the general config anew,
+        # allowing configuration changes in, e.g, aliases, to propagate)
+        set -g __fish_interactive_config_sourced 1
+      end
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/fzf.nix b/home-manager/modules/programs/fzf.nix
new file mode 100644
index 00000000000..832c0bfa3e4
--- /dev/null
+++ b/home-manager/modules/programs/fzf.nix
@@ -0,0 +1,138 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.fzf;
+
+in
+
+{
+  options.programs.fzf = {
+    enable = mkEnableOption "fzf - a command-line fuzzy finder";
+
+    defaultCommand = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "fd --type f";
+      description = ''
+        The command that gets executed as the default source for fzf
+        when running.
+      '';
+    };
+
+    defaultOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "--height 40%" "--border" ];
+      description = ''
+        Extra command line options given to fzf by default.
+      '';
+    };
+
+    fileWidgetCommand = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "fd --type f";
+      description = ''
+        The command that gets executed as the source for fzf for the
+        CTRL-T keybinding.
+      '';
+    };
+
+    fileWidgetOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "--preview 'head {}'" ];
+      description = ''
+        Command line options for the CTRL-T keybinding.
+      '';
+    };
+
+    changeDirWidgetCommand = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "fd --type d" ;
+      description = ''
+        The command that gets executed as the source for fzf for the
+        ALT-C keybinding.
+      '';
+    };
+
+    changeDirWidgetOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "--preview 'tree -C {} | head -200'" ];
+      description = ''
+        Command line options for the ALT-C keybinding.
+      '';
+    };
+
+    historyWidgetCommand = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        The command that gets executed as the source for fzf for the
+        CTRL-R keybinding.
+      '';
+    };
+
+    historyWidgetOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "--sort" "--exact" ];
+      description = ''
+        Command line options for the CTRL-R keybinding.
+      '';
+    };
+
+    enableBashIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Bash integration.
+      '';
+    };
+
+    enableZshIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Zsh integration.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.fzf ];
+
+    home.sessionVariables =
+      mapAttrs (n: v: toString v) (
+        filterAttrs (n: v: v != [] && v != null) {
+          FZF_ALT_C_COMMAND = cfg.changeDirWidgetCommand;
+          FZF_ALT_C_OPTS = cfg.changeDirWidgetOptions;
+          FZF_CTRL_R_COMMAND = cfg.historyWidgetCommand;
+          FZF_CTRL_R_OPTS = cfg.historyWidgetOptions;
+          FZF_CTRL_T_COMMAND = cfg.fileWidgetCommand;
+          FZF_CTRL_T_OPTS = cfg.fileWidgetOptions;
+          FZF_DEFAULT_COMMAND = cfg.defaultCommand;
+          FZF_DEFAULT_OPTS = cfg.defaultOptions;
+        }
+      );
+
+    programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
+      if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
+        . ${pkgs.fzf}/share/fzf/completion.bash
+        . ${pkgs.fzf}/share/fzf/key-bindings.bash
+      fi
+    '';
+
+    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+      if [[ $options[zle] = on ]]; then
+        . ${pkgs.fzf}/share/fzf/completion.zsh
+        . ${pkgs.fzf}/share/fzf/key-bindings.zsh
+      fi
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/getmail-accounts.nix b/home-manager/modules/programs/getmail-accounts.nix
new file mode 100644
index 00000000000..32e1312dc8f
--- /dev/null
+++ b/home-manager/modules/programs/getmail-accounts.nix
@@ -0,0 +1,49 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  options.getmail = {
+    enable = mkEnableOption "the getmail mail retriever for this account";
+
+    destinationCommand = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "\${pkgs.maildrop}/bin/maildrop";
+      description = ''
+        Specify a command delivering the incoming mail to your maildir.
+      '';
+    };
+
+    mailboxes = mkOption {
+      type = types.nonEmptyListOf types.str;
+      default = [];
+      example = ["INBOX" "INBOX.spam"];
+      description = ''
+        A non-empty list of mailboxes. To download all mail you can
+        use the <literal>ALL</literal> mailbox.
+      '';
+    };
+
+    delete = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enable if you want to delete read messages from the server. Most
+        users should either enable <literal>delete</literal> or disable
+        <literal>readAll</literal>.
+      '';
+    };
+
+    readAll = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Enable if you want to fetch all, even the read messages from the
+        server. Most users should either enable <literal>delete</literal> or
+        disable <literal>readAll</literal>.
+      '';
+    };
+
+  };
+}
diff --git a/home-manager/modules/programs/getmail.nix b/home-manager/modules/programs/getmail.nix
new file mode 100644
index 00000000000..04a958d6cda
--- /dev/null
+++ b/home-manager/modules/programs/getmail.nix
@@ -0,0 +1,60 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  accounts = filter (a: a.getmail.enable)
+    (attrValues config.accounts.email.accounts);
+
+  renderAccountConfig = account: with account;
+    let
+      passCmd = concatMapStringsSep ", " (x: "'${x}'") passwordCommand;
+      renderedMailboxes = concatMapStringsSep ", " (x: "'${x}'") getmail.mailboxes;
+      retrieverType = if imap.tls.enable
+        then "SimpleIMAPSSLRetriever"
+        else "SimpleIMAPRetriever";
+      destination = if getmail.destinationCommand != null
+        then
+        {
+          destinationType = "MDA_external";
+          destinationPath = getmail.destinationCommand;
+        }
+        else
+        {
+          destinationType = "Maildir";
+          destinationPath = "${maildir.absPath}/";
+        };
+      renderGetmailBoolean = v: if v then "true" else "false";
+    in ''
+      # Generated by Home-Manager.
+      [retriever]
+      type = ${retrieverType}
+      server = ${imap.host}
+      ${optionalString (imap.port != null) "port = ${imap.port}"}
+      username = ${userName}
+      password_command = (${passCmd})
+      mailboxes = ( ${renderedMailboxes} )
+
+      [destination]
+      type = ${destination.destinationType}
+      path = ${destination.destinationPath}
+
+      [options]
+      delete = ${renderGetmailBoolean getmail.delete}
+      read_all = ${renderGetmailBoolean getmail.readAll}
+    '';
+  getmailEnabled = length (filter (a: a.getmail.enable) accounts) > 0;
+  # Watch out! This is used by the getmail.service too!
+  renderConfigFilepath = a: ".getmail/getmail${if a.primary then "rc" else a.name}";
+in
+
+  {
+    config = mkIf getmailEnabled {
+      home.file = map (a:
+        { target = renderConfigFilepath a;
+          text = renderAccountConfig a;
+        }) accounts;
+
+    };
+  }
diff --git a/home-manager/modules/programs/git.nix b/home-manager/modules/programs/git.nix
new file mode 100644
index 00000000000..913f86f71ce
--- /dev/null
+++ b/home-manager/modules/programs/git.nix
@@ -0,0 +1,325 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.git;
+
+  # create [section "subsection"] keys from "section.subsection" attrset names
+  mkSectionName = name:
+    let
+      containsQuote = strings.hasInfix ''"'' name;
+      sections = splitString "." name;
+      section = head sections;
+      subsections = tail sections;
+      subsection = concatStringsSep "." subsections;
+    in
+      if containsQuote || subsections == []
+      then name
+      else "${section} \"${subsection}\"";
+
+  # generation for multiple ini values
+  mkKeyValue = k: v:
+    let
+      mkKeyValue = generators.mkKeyValueDefault {} "=" k;
+    in
+      concatStringsSep "\n" (map mkKeyValue (toList v));
+
+  # converts { a.b.c = 5; } to { "a.b".c = 5; } for toINI
+  gitFlattenAttrs =
+    let
+      recurse = path: value:
+        if isAttrs value then
+          mapAttrsToList (name: value: recurse ([name] ++ path) value) value
+        else if length path > 1 then
+          { ${concatStringsSep "." (reverseList (tail path))}.${head path} = value; }
+        else
+          { ${head path} = value; };
+    in
+      attrs: foldl recursiveUpdate {} (flatten (recurse [] attrs));
+
+  gitToIni = attrs:
+    let
+      toIni = generators.toINI { inherit mkKeyValue mkSectionName; };
+    in
+      toIni (gitFlattenAttrs attrs);
+
+  gitIniType = with types;
+    let
+      primitiveType = either str (either bool int);
+      multipleType = either primitiveType (listOf primitiveType);
+      sectionType = attrsOf multipleType;
+      supersectionType = attrsOf (either multipleType sectionType);
+    in
+      attrsOf supersectionType;
+
+  signModule = types.submodule {
+    options = {
+      key = mkOption {
+        type = types.str;
+        description = "The default GPG signing key fingerprint.";
+      };
+
+      signByDefault = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether commits should be signed by default.";
+      };
+
+      gpgPath = mkOption {
+        type = types.str;
+        default = "${pkgs.gnupg}/bin/gpg2";
+        defaultText = "\${pkgs.gnupg}/bin/gpg2";
+        description = "Path to GnuPG binary to use.";
+      };
+    };
+  };
+
+  includeModule = types.submodule ({ config, ... }: {
+    options = {
+      condition = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Include this configuration only when <varname>condition</varname>
+          matches. Allowed conditions are described in
+          <citerefentry>
+            <refentrytitle>git-config</refentrytitle>
+            <manvolnum>1</manvolnum>
+          </citerefentry>.
+        '';
+      };
+
+      path = mkOption {
+        type = with types; either str path;
+        description = "Path of the configuration file to include.";
+      };
+
+      contents = mkOption {
+        type = types.attrs;
+        default = {};
+        description = ''
+          Configuration to include. If empty then a path must be given.
+        '';
+      };
+    };
+
+    config.path = mkIf (config.contents != {}) (
+      mkDefault (pkgs.writeText "contents" (gitToIni config.contents))
+    );
+  });
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    programs.git = {
+      enable = mkEnableOption "Git";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.git;
+        defaultText = literalExample "pkgs.git";
+        description = ''
+          Git package to install. Use <varname>pkgs.gitAndTools.gitFull</varname>
+          to gain access to <command>git send-email</command> for instance.
+        '';
+      };
+
+      userName = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "Default user name to use.";
+      };
+
+      userEmail = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "Default user email to use.";
+      };
+
+      aliases = mkOption {
+        type = types.attrsOf types.str;
+        default = {};
+        example = { co = "checkout"; };
+        description = "Git aliases to define.";
+      };
+
+      signing = mkOption {
+        type = types.nullOr signModule;
+        default = null;
+        description = "Options related to signing commits using GnuPG.";
+      };
+
+      extraConfig = mkOption {
+        type = types.either types.lines gitIniType;
+        default = {};
+        example = {
+          core = { whitespace = "trailing-space,space-before-tab"; };
+          url."ssh://git@host".insteadOf = "otherhost";
+        };
+        description = ''
+          Additional configuration to add. The use of string values is
+          deprecated and will be removed in the future.
+        '';
+      };
+
+      iniContent = mkOption {
+        type = gitIniType;
+        internal = true;
+      };
+
+      ignores = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "*~" "*.swp" ];
+        description = "List of paths that should be globally ignored.";
+      };
+
+      attributes = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "*.pdf diff=pdf" ];
+        description = "List of defining attributes set globally.";
+      };
+
+      includes = mkOption {
+        type = types.listOf includeModule;
+        default = [];
+        example = literalExample ''
+          [
+            { path = "~/path/to/config.inc"; }
+            {
+              path = "~/path/to/conditional.inc";
+              condition = "gitdir:~/src/dir";
+            }
+          ]
+        '';
+        description = "List of configuration files to include.";
+      };
+
+      lfs = {
+        enable = mkEnableOption "Git Large File Storage";
+
+        skipSmudge = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Skip automatic downloading of objects on clone or pull.
+            This requires a manual <command>git lfs pull</command>
+            every time a new commit is checked out on your repository.
+          '';
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (
+    mkMerge [
+      {
+        home.packages = [ cfg.package ];
+
+        programs.git.iniContent.user = {
+          name = mkIf (cfg.userName != null) cfg.userName;
+          email = mkIf (cfg.userEmail != null) cfg.userEmail;
+        };
+
+        xdg.configFile = {
+          "git/config".text = gitToIni cfg.iniContent;
+
+          "git/ignore" = mkIf (cfg.ignores != []) {
+            text = concatStringsSep "\n" cfg.ignores + "\n";
+          };
+
+          "git/attributes" = mkIf (cfg.attributes != []) {
+            text = concatStringsSep "\n" cfg.attributes + "\n";
+          };
+        };
+      }
+
+      {
+        programs.git.iniContent =
+          let
+            hasSmtp = name: account: account.smtp != null;
+
+            genIdentity = name: account: with account;
+              nameValuePair "sendemail.${name}" ({
+                smtpEncryption = if smtp.tls.enable then "tls" else "";
+                smtpServer = smtp.host;
+                smtpUser = userName;
+                from = address;
+              }
+              // optionalAttrs (smtp.port != null) {
+                smtpServerPort = smtp.port;
+              });
+          in
+            mapAttrs' genIdentity
+              (filterAttrs hasSmtp config.accounts.email.accounts);
+      }
+
+      (mkIf (cfg.signing != null) {
+        programs.git.iniContent = {
+          user.signingKey = cfg.signing.key;
+          commit.gpgSign = cfg.signing.signByDefault;
+          gpg.program = cfg.signing.gpgPath;
+        };
+      })
+
+      (mkIf (cfg.aliases != {}) {
+        programs.git.iniContent.alias = cfg.aliases;
+      })
+
+      (mkIf (lib.isAttrs cfg.extraConfig) {
+        programs.git.iniContent = cfg.extraConfig;
+      })
+
+      (mkIf (lib.isString cfg.extraConfig) {
+        warnings = [
+          ''
+            Using programs.git.extraConfig as a string option is
+            deprecated and will be removed in the future. Please
+            change to using it as an attribute set instead.
+          ''
+        ];
+
+        xdg.configFile."git/config".text = cfg.extraConfig;
+      })
+
+      (mkIf (cfg.includes != []) {
+        xdg.configFile."git/config".text =
+          let
+            include = i: with i;
+              if condition != null
+              then { includeIf.${condition}.path = "${path}"; }
+              else { include.path = "${path}"; };
+          in
+            mkAfter
+            (concatStringsSep "\n"
+            (map gitToIni
+            (map include cfg.includes)));
+      })
+
+      (mkIf cfg.lfs.enable {
+        home.packages = [ pkgs.git-lfs ];
+
+        programs.git.iniContent.filter.lfs =
+          let
+            skipArg = optional cfg.lfs.skipSmudge "--skip";
+          in
+            {
+              clean = "git-lfs clean -- %f";
+              process = concatStringsSep " " (
+                [ "git-lfs" "filter-process" ] ++ skipArg
+              );
+              required = true;
+              smudge = concatStringsSep " " (
+                [ "git-lfs" "smudge" ] ++ skipArg ++ [ "--" "%f" ]
+              );
+            };
+      })
+    ]
+  );
+}
diff --git a/home-manager/modules/programs/gnome-terminal.nix b/home-manager/modules/programs/gnome-terminal.nix
new file mode 100644
index 00000000000..9a44364491d
--- /dev/null
+++ b/home-manager/modules/programs/gnome-terminal.nix
@@ -0,0 +1,242 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.gnome-terminal;
+
+  vteInitStr = ''
+    # gnome-terminal: Show current directory in the terminal window title.
+    . ${pkgs.gnome3.vte}/etc/profile.d/vte.sh
+  '';
+
+  backForeSubModule = types.submodule (
+    { ... }: {
+      options = {
+        foreground = mkOption {
+          type = types.str;
+          description = "The foreground color.";
+        };
+
+        background = mkOption {
+          type = types.str;
+          description = "The background color.";
+        };
+      };
+    }
+  );
+
+  profileColorsSubModule = types.submodule (
+    { ... }: {
+      options = {
+        foregroundColor = mkOption {
+          type = types.str;
+          description = "The foreground color.";
+        };
+
+        backgroundColor = mkOption {
+          type = types.str;
+          description = "The background color.";
+        };
+
+        boldColor = mkOption {
+          default = null;
+          type = types.nullOr types.str;
+          description = "The bold color, null to use same as foreground.";
+        };
+
+        palette = mkOption {
+          type = types.listOf types.str;
+          description = "The terminal palette.";
+        };
+
+        cursor = mkOption {
+          default = null;
+          type = types.nullOr backForeSubModule;
+          description = "The color for the terminal cursor.";
+        };
+
+        highlight = mkOption {
+          default = null;
+          type = types.nullOr backForeSubModule;
+          description = "The colors for the terminal’s highlighted area.";
+        };
+      };
+    }
+  );
+
+  profileSubModule = types.submodule (
+    { name, config, ... }: {
+      options = {
+        default = mkOption {
+          default = false;
+          type = types.bool;
+          description = "Whether this should be the default profile.";
+        };
+
+        visibleName = mkOption {
+          type = types.str;
+          description = "The profile name.";
+        };
+
+        colors = mkOption {
+          default = null;
+          type = types.nullOr profileColorsSubModule;
+          description = "The terminal colors, null to use system default.";
+        };
+
+        cursorShape = mkOption {
+          default = "block";
+          type = types.enum [ "block" "ibeam" "underline" ];
+          description = "The cursor shape.";
+        };
+
+        font = mkOption {
+          default = null;
+          type = types.nullOr types.str;
+          description = "The font name, null to use system default.";
+        };
+
+        allowBold = mkOption {
+          default = null;
+          type = types.nullOr types.bool;
+          description = ''
+            If <literal>true</literal>, allow applications in the
+            terminal to make text boldface.
+          '';
+        };
+
+        scrollOnOutput = mkOption {
+          default = true;
+          type = types.bool;
+          description = "Whether to scroll when output is written.";
+        };
+
+        showScrollbar = mkOption {
+          default = true;
+          type = types.bool;
+          description = "Whether the scroll bar should be visible.";
+        };
+
+        scrollbackLines = mkOption {
+          default = 10000;
+          type = types.nullOr types.int;
+          description =
+            ''
+              The number of scrollback lines to keep, null for infinite.
+            '';
+        };
+      };
+    }
+  );
+
+  buildProfileSet = pcfg:
+    {
+      visible-name = pcfg.visibleName;
+      scrollbar-policy = if pcfg.showScrollbar then "always" else "never";
+      scrollback-lines = pcfg.scrollbackLines;
+      cursor-shape = pcfg.cursorShape;
+    }
+    // (
+      if (pcfg.font == null)
+      then { use-system-font = true; }
+      else { use-system-font = false; font = pcfg.font; }
+    ) // (
+      if (pcfg.colors == null)
+      then { use-theme-colors = true; }
+      else (
+        {
+          use-theme-colors = false;
+          foreground-color = pcfg.colors.foregroundColor;
+          background-color = pcfg.colors.backgroundColor;
+          palette = pcfg.colors.palette;
+        }
+        // optionalAttrs (pcfg.allowBold != null) {
+          allow-bold = pcfg.allowBold;
+        }
+        // (
+          if (pcfg.colors.boldColor == null)
+          then { bold-color-same-as-fg = true; }
+          else {
+            bold-color-same-as-fg = false;
+            bold-color = pcfg.colors.boldColor;
+          }
+        )
+        // (
+          if (pcfg.colors.cursor != null)
+          then {
+            cursor-colors-set = true;
+            cursor-foreground-color = pcfg.colors.cursor.foreground;
+            cursor-background-color = pcfg.colors.cursor.background;
+          }
+          else { cursor-colors-set = false; }
+        )
+        // (
+          if (pcfg.colors.highlight != null)
+          then {
+            highlight-colors-set = true;
+            highlight-foreground-color = pcfg.colors.highlight.foreground;
+            highlight-background-color = pcfg.colors.highlight.background;
+          }
+          else { highlight-colors-set = false; }
+        )
+      )
+    );
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    programs.gnome-terminal = {
+      enable = mkEnableOption "Gnome Terminal";
+
+      showMenubar = mkOption {
+        default = true;
+        type = types.bool;
+        description = "Whether to show the menubar by default";
+      };
+
+      themeVariant = mkOption {
+        default = "default";
+        type = types.enum [ "default" "light" "dark" ];
+        description = "The theme variation to request";
+      };
+
+      profile = mkOption {
+        default = {};
+        type = types.attrsOf profileSubModule;
+        description = "A set of Gnome Terminal profiles.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.gnome3.gnome_terminal ];
+
+    dconf.settings =
+      let
+        dconfPath = "org/gnome/terminal/legacy";
+      in
+        {
+          "${dconfPath}" = {
+            default-show-menubar = cfg.showMenubar;
+            theme-variant = cfg.themeVariant;
+            schema-version = 3;
+          };
+
+          "${dconfPath}/profiles:" = {
+            default = head (attrNames (filterAttrs (n: v: v.default) cfg.profile));
+            list = attrNames cfg.profile;
+          };
+        }
+        // mapAttrs' (n: v:
+          nameValuePair ("${dconfPath}/profiles:/:${n}") (buildProfileSet v)
+        ) cfg.profile;
+
+    programs.bash.initExtra = mkBefore vteInitStr;
+    programs.zsh.initExtra = vteInitStr;
+  };
+}
diff --git a/home-manager/modules/programs/go.nix b/home-manager/modules/programs/go.nix
new file mode 100644
index 00000000000..06c25c9b82a
--- /dev/null
+++ b/home-manager/modules/programs/go.nix
@@ -0,0 +1,75 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.go;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rvolosatovs ];
+
+  options = {
+    programs.go = {
+      enable = mkEnableOption "Go";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.go;
+        defaultText = literalExample "pkgs.go";
+        description = "The Go package to use.";
+      };
+
+      packages = mkOption {
+        type = with types; attrsOf path;
+        default = {};
+        example = literalExample ''
+          {
+            "golang.org/x/text" = builtins.fetchGit "https://go.googlesource.com/text";
+            "golang.org/x/time" = builtins.fetchGit "https://go.googlesource.com/time";
+          }
+        '';
+        description = "Packages to add to GOPATH.";
+      };
+
+      goPath = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "go";
+        description = "GOPATH relative to HOME";
+      };
+
+      goBin = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = ".local/bin.go";
+        description = "GOBIN relative to HOME";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    {
+      home.packages = [ cfg.package ];
+
+      home.file =
+        let
+          goPath = if cfg.goPath != null then cfg.goPath else "go";
+
+          mkSrc = n: v: {
+            target = "${goPath}/src/${n}";
+            source = v;
+          };
+        in
+        mapAttrsToList mkSrc cfg.packages;
+    }
+    (mkIf (cfg.goPath != null) {
+      home.sessionVariables.GOPATH = builtins.toPath "${config.home.homeDirectory}/${cfg.goPath}";
+    })
+    (mkIf (cfg.goBin != null) {
+      home.sessionVariables.GOBIN = builtins.toPath "${config.home.homeDirectory}/${cfg.goBin}";
+    })
+  ]);
+}
diff --git a/home-manager/modules/programs/gpg.nix b/home-manager/modules/programs/gpg.nix
new file mode 100644
index 00000000000..4588c59c882
--- /dev/null
+++ b/home-manager/modules/programs/gpg.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.gpg;
+
+  cfgText =
+    concatStringsSep "\n"
+    (attrValues
+    (mapAttrs (key: value:
+      if isString value
+      then "${key} ${value}"
+      else optionalString value key)
+    cfg.settings));
+
+in {
+  options.programs.gpg = {
+    enable = mkEnableOption "GnuPG";
+
+    settings = mkOption {
+      type = types.attrsOf (types.either types.str types.bool);
+      example = {
+        no-comments = false;
+        s2k-cipher-algo = "AES128";
+      };
+      description = ''
+        GnuPG configuration options. Available options are described
+        in the gpg manpage:
+        <link xlink:href="https://gnupg.org/documentation/manpage.html"/>.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.gpg.settings = {
+      personal-cipher-preferences = mkDefault "AES256 AES192 AES";
+      personal-digest-preferences = mkDefault "SHA512 SHA384 SHA256";
+      personal-compress-preferences = mkDefault "ZLIB BZIP2 ZIP Uncompressed";
+      default-preference-list = mkDefault "SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed";
+      cert-digest-algo = mkDefault "SHA512";
+      s2k-digest-algo = mkDefault "SHA512";
+      s2k-cipher-algo = mkDefault "AES256";
+      charset = mkDefault "utf-8";
+      fixed-list-mode = mkDefault true;
+      no-comments = mkDefault true;
+      no-emit-version = mkDefault true;
+      keyid-format = mkDefault "0xlong";
+      list-options = mkDefault "show-uid-validity";
+      verify-options = mkDefault "show-uid-validity";
+      with-fingerprint = mkDefault true;
+      require-cross-certification = mkDefault true;
+      no-symkey-cache = mkDefault true;
+      use-agent = mkDefault true;
+    };
+
+    home.packages = [ pkgs.gnupg ];
+
+    home.file.".gnupg/gpg.conf".text = cfgText;
+  };
+}
diff --git a/home-manager/modules/programs/home-manager.nix b/home-manager/modules/programs/home-manager.nix
new file mode 100644
index 00000000000..42e3c8a384f
--- /dev/null
+++ b/home-manager/modules/programs/home-manager.nix
@@ -0,0 +1,42 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.home-manager;
+
+  dag = config.lib.dag;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    programs.home-manager = {
+      enable = mkEnableOption "Home Manager";
+
+      path = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "$HOME/devel/home-manager";
+        description = ''
+          The default path to use for Home Manager. If this path does
+          not exist then
+          <filename>$HOME/.config/nixpkgs/home-manager</filename> and
+          <filename>$HOME/.nixpkgs/home-manager</filename> will be
+          attempted.
+        '';
+      };
+    };
+  };
+
+  config = mkIf (cfg.enable && !config.submoduleSupport.enable) {
+    home.packages = [
+      (pkgs.callPackage ../../home-manager {
+        inherit (cfg) path;
+      })
+    ];
+  };
+}
diff --git a/home-manager/modules/programs/htop.nix b/home-manager/modules/programs/htop.nix
new file mode 100644
index 00000000000..d700c4855fe
--- /dev/null
+++ b/home-manager/modules/programs/htop.nix
@@ -0,0 +1,327 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.htop;
+
+  list = xs: concatMapStrings (x: "${toString x} ") xs;
+
+  bool = b: if b then "1" else "0";
+
+  fields = {
+    PID = 0;
+    COMM = 1;
+    STATE = 2;
+    PPID = 3;
+    PGRP = 4;
+    SESSION = 5;
+    TTY_NR = 6;
+    TPGID = 7;
+    MINFLT = 9;
+    MAJFLT = 11;
+    PRIORITY = 17;
+    NICE = 18;
+    STARTTIME = 20;
+    PROCESSOR = 37;
+    M_SIZE = 38;
+    M_RESIDENT = 39;
+    ST_UID = 45;
+    PERCENT_CPU = 46;
+    PERCENT_MEM = 47;
+    USER = 48;
+    TIME = 49;
+    NLWP = 50;
+    TGID = 51;
+    CMINFLT = 10;
+    CMAJFLT = 12;
+    UTIME = 13;
+    STIME = 14;
+    CUTIME = 15;
+    CSTIME = 16;
+    M_SHARE = 40;
+    M_TRS = 41;
+    M_DRS = 42;
+    M_LRS = 43;
+    M_DT = 44;
+    CTID = 99;
+    VPID = 100;
+    VXID = 102;
+    RCHAR = 102;
+    WCHAR = 103;
+    SYSCR = 104;
+    SYSCW = 105;
+    RBYTES = 106;
+    WBYTES = 107;
+    CNCLWB = 108;
+    IO_READ_RATE = 109;
+    IO_WRITE_RATE = 110;
+    IO_RATE = 111;
+    CGROUP = 112;
+    OOM = 113;
+    IO_PRIORITY = 114;
+  };
+
+  # Mapping from names to defaults
+  meters = {
+    Clock = 2;
+    LoadAverage = 2;
+    Load = 2;
+    Memory = 1;
+    Swap = 1;
+    Tasks = 2;
+    Uptime = 2;
+    Battery = 2;
+    Hostname = 2;
+    AllCPUs = 1;
+    AllCPUs2 = 1;
+    LeftCPUs = 1;
+    RightCPUs = 1;
+    LeftCPUs2 = 1;
+    RightCPUs2 = 1;
+    Blank = 2;
+    CPU = 1;
+    "CPU(1)"= 1;
+    "CPU(2)" = 1;
+    "CPU(3)" = 1;
+    "CPU(4)" = 1;
+  };
+
+  singleMeterType = types.coercedTo
+    (types.enum (attrNames meters))
+    (m: { kind = m; mode = meters.${m}; })
+    (types.submodule {
+      options = {
+        kind = mkOption {
+          type = types.enum (attrNames meters);
+          example = "AllCPUs";
+          description = "What kind of meter.";
+        };
+
+        mode = mkOption {
+          type = types.enum [ 1 2 3 4 ];
+          example = 2;
+          description = "Which mode the meter should use, one of 1(Bar) 2(Text) 3(Graph) 4(LED).";
+        };
+      };
+    });
+
+  meterType = types.submodule {
+    options = {
+      left = mkOption {
+        description = "Meters shown in the left header.";
+        default = [ "AllCPUs" "Memory" "Swap" ];
+        example = [
+          "Memory"
+          "LeftCPUs2"
+          "RightCPUs2"
+          { kind = "CPU"; mode = 3; }
+        ];
+        type = types.listOf singleMeterType;
+      };
+      right = mkOption {
+        description = "Meters shown in the right header.";
+        default = [ "Tasks" "LoadAverage" "Uptime" ];
+        example = [
+          { kind = "Clock"; mode = 4; }
+          "Uptime"
+          "Tasks"
+        ];
+        type = types.listOf singleMeterType;
+      };
+    };
+  };
+in
+{
+  options.programs.htop = {
+    enable = mkEnableOption "htop";
+
+    fields = mkOption {
+      type = types.listOf (types.enum (attrNames fields));
+      default = [ "PID" "USER" "PRIORITY" "NICE" "M_SIZE" "M_RESIDENT" "M_SHARE" "STATE" "PERCENT_CPU" "PERCENT_MEM" "TIME" "COMM" ];
+      example = [ "PID" "USER" "PRIORITY" "PERCENT_CPU" "M_RESIDENT" "PERCENT_MEM" "TIME" "COMM" ];
+      description = "Active fields shown in the table.";
+    };
+
+    sortKey = mkOption {
+      type = types.enum (attrNames fields);
+      default = "PERCENT_CPU";
+      example = "TIME";
+      description = "Which field to use for sorting.";
+    };
+
+    sortDescending = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Whether to sort descending or not.";
+    };
+
+    hideThreads = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Hide threads.";
+    };
+
+    hideKernelThreads = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Hide kernel threads.";
+    };
+
+    hideUserlandThreads = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Hide userland process threads.";
+    };
+
+    shadowOtherUsers = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Shadow other users' processes.";
+    };
+
+    showThreadNames = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Show custom thread names.";
+    };
+
+    showProgramPath = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Show program path.";
+    };
+
+    highlightBaseName = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Highlight program <quote>basename</quote>.";
+    };
+
+    highlightMegabytes = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Highlight large numbers in memory counters.";
+    };
+
+    highlightThreads = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Display threads in a different color.";
+    };
+    
+    treeView = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Tree view.";
+    };
+
+    headerMargin = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Leave a margin around header.";
+    };
+
+    detailedCpuTime = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Detailed CPU time (System/IO-Wait/Hard-IRQ/Soft-IRQ/Steal/Guest).";
+    };
+
+    cpuCountFromZero = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Count CPUs from 0 instead of 1.";
+    };
+
+    updateProcessNames = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Update process names on every refresh.";
+    };
+
+    accountGuestInCpuMeter = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Add guest time in CPU meter percentage.";
+    };
+
+    colorScheme = mkOption {
+      type = types.enum [ 0 1 2 3 4 5 6 ];
+      default = 0;
+      example = 6;
+      description = "Which color scheme to use.";
+    };
+
+    delay = mkOption {
+      type = types.int;
+      default = 15;
+      example = 2;
+      description = "Set the delay between updates, in tenths of seconds.";
+    };
+
+    meters = mkOption {
+      description = "Meters shown in the header.";
+      default = {
+        left = [ "AllCPUs" "Memory" "Swap" ];
+        right = [ "Tasks" "LoadAverage" "Uptime" ];
+      };
+      example = {
+        left = [
+          "Memory"
+          "CPU"
+          "LeftCPUs2"
+          "RightCPUs2"
+          { kind = "CPU"; mode = 3; }
+        ];
+        right = [
+          { kind = "Clock"; mode = 4; }
+          "Uptime"
+          "Tasks"
+          "LoadAverage"
+          { kind = "Battery"; mode = 1; }
+        ];
+      };
+      type = meterType;
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.htop ];
+
+    xdg.configFile."htop/htoprc".text = let
+      leftMeters = map (m: m.kind) cfg.meters.left;
+      leftModes = map (m: m.mode) cfg.meters.left;
+      rightMeters = map (m: m.kind) cfg.meters.right;
+      rightModes = map (m: m.mode) cfg.meters.right;
+    in ''
+      # This file is regenerated by home-manager
+      # when options are changed in the config
+      fields=${list (map (n: fields.${n}) cfg.fields)}
+      sort_key=${toString (fields.${cfg.sortKey})}
+      sort_direction=${bool cfg.sortDescending}
+      hide_threads=${bool cfg.hideThreads}
+      hide_kernel_threads=${bool cfg.hideKernelThreads}
+      hide_userland_threads=${bool cfg.hideUserlandThreads}
+      shadow_other_users=${bool cfg.shadowOtherUsers}
+      show_thread_names=${bool cfg.showThreadNames}
+      show_program_path=${bool cfg.showProgramPath}
+      highlight_base_name=${bool cfg.highlightBaseName}
+      highlight_megabytes=${bool cfg.highlightMegabytes}
+      highlight_threads=${bool cfg.highlightThreads}
+      tree_view=${bool cfg.treeView}
+      header_margin=${bool cfg.headerMargin}
+      detailed_cpu_time=${bool cfg.detailedCpuTime}
+      cpu_count_from_zero=${bool cfg.cpuCountFromZero}
+      update_process_names=${bool cfg.updateProcessNames}
+      account_guest_in_cpu_meter=${bool cfg.accountGuestInCpuMeter}
+      color_scheme=${toString cfg.colorScheme}
+      delay=${toString cfg.delay}
+      left_meters=${list leftMeters}
+      left_meter_modes=${list leftModes}
+      right_meters=${list rightMeters}
+      right_meter_modes=${list rightModes}
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/info.nix b/home-manager/modules/programs/info.nix
new file mode 100644
index 00000000000..93dcaf474af
--- /dev/null
+++ b/home-manager/modules/programs/info.nix
@@ -0,0 +1,78 @@
+# info.nix -- install texinfo, set INFOPATH, create `dir` file
+
+# This is a helper for the GNU info documentation system. By default,
+# the `info` command (and the Info subsystem within Emacs) gives easy
+# access to the info files stored system-wide, but not info files in
+# your ~/.nix-profile.
+
+# We set $INFOPATH to include `/run/current-system/sw/share/info` and
+# `~/.nix-profile/share/info` but it's not enough. Although info can
+# then find files when you explicitly ask for them, it doesn't show
+# them to you in the table of contents on startup. To do that requires
+# a `dir` file. NixOS keeps the system-wide `dir` file up to date, but
+# ignores home-installed packages.
+
+# So this module contains an activation script that generates the
+# `dir` for your home profile. Then when you start info (and both
+# `dir` files are in your $INFOPATH), it will *merge* the contents of
+# the two files, showing you a unified table of contents for all
+# packages. This is really nice.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.info;
+
+  dag = config.lib.dag;
+
+  # Indexes info files found in this location
+  homeInfoPath = "${config.home.profileDirectory}/share/info";
+
+  # Installs this package -- the interactive just means that it
+  # includes the curses `info` program. We also use `install-info`
+  # from this package in the activation script.
+  infoPkg = pkgs.texinfoInteractive;
+
+in
+
+{
+  options = {
+    programs.info = {
+      enable = mkEnableOption "GNU Info";
+
+      homeInfoDirLocation = mkOption {
+        default = "\${XDG_CACHE_HOME:-$HOME/.cache}/info";
+        description = ''
+          Directory in which to store the info <filename>dir</filename>
+          file within your home.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.sessionVariables.INFOPATH =
+      "${cfg.homeInfoDirLocation}\${INFOPATH:+:}\${INFOPATH}";
+
+    home.activation.createHomeInfoDir = dag.entryAfter ["installPackages"] ''
+      oPATH=$PATH
+      export PATH="${lib.makeBinPath [ pkgs.gzip ]}''${PATH:+:}$PATH"
+      $DRY_RUN_CMD mkdir -p "${cfg.homeInfoDirLocation}"
+      $DRY_RUN_CMD rm -f "${cfg.homeInfoDirLocation}/dir"
+      if [[ -d "${homeInfoPath}" ]]; then
+        find -L "${homeInfoPath}" \( -name '*.info' -o -name '*.info.gz' \) \
+          -exec $DRY_RUN_CMD ${infoPkg}/bin/install-info '{}' \
+          "${cfg.homeInfoDirLocation}/dir" \;
+      fi
+      export PATH="$oPATH"
+      unset oPATH
+    '';
+
+    home.packages = [ infoPkg ];
+
+    home.extraOutputsToInstall = [ "info" ];
+  };
+}
diff --git a/home-manager/modules/programs/irssi.nix b/home-manager/modules/programs/irssi.nix
new file mode 100644
index 00000000000..fc8fa8e6132
--- /dev/null
+++ b/home-manager/modules/programs/irssi.nix
@@ -0,0 +1,211 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.irssi;
+
+  boolStr = b: if b then "yes" else "no";
+  quoteStr = s: escape ["\""] s;
+
+  assignFormat = set:
+    concatStringsSep "\n"
+      (mapAttrsToList (k: v: "  ${k} = \"${quoteStr v}\";") set);
+
+  chatnetString =
+    concatStringsSep "\n"
+      (flip mapAttrsToList cfg.networks
+      (k: v: ''
+        ${k} = {
+          type = "${v.type}";
+          nick = "${quoteStr v.nick}";
+          autosendcmd = "${concatMapStringsSep ";" quoteStr v.autoCommands}";
+        };
+      ''));
+
+  serversString =
+    concatStringsSep ",\n"
+      (flip mapAttrsToList cfg.networks
+      (k: v: ''
+        {
+          chatnet = "${k}";
+          address = "${v.server.address}";
+          port = "${toString v.server.port}";
+          use_ssl = "${boolStr v.server.ssl.enable}";
+          ssl_verify = "${boolStr v.server.ssl.verify}";
+          autoconnect = "${boolStr v.server.autoConnect}";
+        }
+      ''));
+
+  channelString =
+    concatStringsSep ",\n"
+      (flip mapAttrsToList cfg.networks
+      (k: v:
+        concatStringsSep ",\n"
+          (flip mapAttrsToList v.channels
+          (c: cv: ''
+            {
+              chatnet = "${k}";
+              name = "${c}";
+              autojoin = "${boolStr cv.autoJoin}";
+            }
+          ''))));
+
+  channelType = types.submodule {
+    options = {
+      name = mkOption {
+        type = types.nullOr types.str;
+        visible = false;
+        default = null;
+        description = "Name of the channel.";
+      };
+
+      autoJoin = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to join this channel on connect.";
+      };
+    };
+  };
+
+  networkType = types.submodule ({ name, ...}: {
+    options = {
+      name = mkOption {
+        visible = false;
+        default = name;
+        type = types.str;
+      };
+
+      nick = mkOption {
+        type = types.str;
+        description = "Nickname in that network.";
+      };
+
+      type = mkOption {
+        type = types.str;
+        description = "Type of the network.";
+        default = "IRC";
+      };
+
+      autoCommands = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = "List of commands to execute on connect.";
+      };
+
+      server = {
+        address = mkOption {
+          type = types.str;
+          description = "Address of the chat server.";
+        };
+
+        port = mkOption {
+          type = types.port;
+          default = 6667;
+          description = "Port of the chat server.";
+        };
+
+        ssl = {
+          enable = mkOption {
+            type = types.bool;
+            default = true;
+            description = "Whether SSL should be used.";
+          };
+
+          verify = mkOption {
+            type = types.bool;
+            default = true;
+            description = "Whether the SSL certificate should be verified.";
+          };
+        };
+
+        autoConnect = mkOption {
+          type = types.bool;
+          default = false;
+          description = "Whether Irssi connects to the server on launch.";
+        };
+      };
+
+      channels = mkOption {
+        description = "Channels for the given network.";
+        type = types.attrsOf channelType;
+        default = {};
+      };
+    };
+  });
+
+in
+
+{
+
+  options = {
+    programs.irssi = {
+      enable = mkEnableOption "the Irssi chat client";
+
+      extraConfig = mkOption {
+        default = "";
+        description = "These lines are appended to the Irssi configuration.";
+        type = types.str;
+      };
+
+      aliases = mkOption {
+        default = {};
+        example = { J = "join"; BYE = "quit";};
+        description = "An attribute set that maps aliases to commands.";
+        type = types.attrsOf types.str;
+      };
+
+      networks = mkOption {
+        default = {};
+        example = literalExample ''
+          {
+            freenode = {
+              nick = "hmuser";
+              server = {
+                address = "chat.freenode.net";
+                port = 6697;
+                autoConnect = true;
+              };
+              channels = {
+                nixos.autoJoin = true;
+              };
+            };
+          }
+        '';
+        description = "An attribute set of chat networks.";
+        type = types.attrsOf networkType;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.irssi ];
+
+    home.file.".irssi/config".text = ''
+      settings = {
+        core = {
+          settings_autosave = "no";
+        };
+      };
+
+      aliases = {
+      ${assignFormat cfg.aliases}
+      };
+
+      chatnets = {
+      ${chatnetString}
+      };
+
+      servers = (
+      ${serversString}
+      );
+
+      channels = (
+      ${channelString}
+      );
+
+      ${cfg.extraConfig}
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/jq.nix b/home-manager/modules/programs/jq.nix
new file mode 100644
index 00000000000..56c3adf0654
--- /dev/null
+++ b/home-manager/modules/programs/jq.nix
@@ -0,0 +1,76 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.jq;
+
+  colorType = mkOption {
+    type = types.str;
+    description = "ANSI color definition";
+    example = "1;31";
+    visible = false;
+  };
+
+  colorsType = types.submodule {
+    options = {
+      null    = colorType;
+      false   = colorType;
+      true    = colorType;
+      numbers = colorType;
+      strings = colorType;
+      arrays  = colorType;
+      objects = colorType;
+    };
+  };
+
+in
+
+{
+  options = {
+    programs.jq = {
+      enable = mkEnableOption "the jq command-line JSON processor";
+
+      colors = mkOption {
+        description = ''
+          The colors used in colored JSON output.</para>
+
+          <para>See <link xlink:href="https://stedolan.github.io/jq/manual/#Colors"/>.
+        '';
+
+        example = literalExample ''
+          {
+            null    = "1;30";
+            false   = "0;31";
+            true    = "0;32";
+            numbers = "0;36";
+            strings = "0;33";
+            arrays  = "1;35";
+            objects = "1;37";
+          }
+        '';
+
+        default = {
+          null    = "1;30";
+          false   = "0;39";
+          true    = "0;39";
+          numbers = "0;39";
+          strings = "0;32";
+          arrays  = "1;39";
+          objects = "1;39";
+        };
+
+        type = colorsType;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.jq ];
+
+    home.sessionVariables = let c = cfg.colors; in {
+      JQ_COLORS = "${c.null}:${c.false}:${c.true}:${c.numbers}:${c.strings}:${c.arrays}:${c.objects}";
+    };
+  };
+}
diff --git a/home-manager/modules/programs/kakoune.nix b/home-manager/modules/programs/kakoune.nix
new file mode 100644
index 00000000000..dbaa764a212
--- /dev/null
+++ b/home-manager/modules/programs/kakoune.nix
@@ -0,0 +1,575 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.kakoune;
+
+  hook = types.submodule {
+    options = {
+      name = mkOption {
+        type = types.enum [
+          "NormalBegin" "NormalIdle" "NormalEnd" "NormalKey"
+          "InsertBegin" "InsertIdle" "InsertEnd" "InsertKey"
+          "InsertChar" "InsertDelete" "InsertMove" "WinCreate"
+          "WinClose" "WinResize" "WinDisplay" "WinSetOption"
+          "BufSetOption" "BufNewFile" "BufOpenFile" "BufCreate"
+          "BufWritePre" "BufWritePost" "BufReload" "BufClose"
+          "BufOpenFifo" "BufReadFifo" "BufCloseFifo" "RuntimeError"
+          "ModeChange" "PromptIdle" "GlobalSetOption" "KakBegin"
+          "KakEnd" "FocusIn" "FocusOut" "RawKey"
+          "InsertCompletionShow" "InsertCompletionHide"
+          "InsertCompletionSelect"
+        ];
+        example = "SetOption";
+        description = ''
+          The name of the hook. For a description, see
+          <link xlink:href="https://github.com/mawww/kakoune/blob/master/doc/pages/hooks.asciidoc#default-hooks"/>.
+        '';
+      };
+
+      once = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Remove the hook after running it once.
+        '';
+      };
+
+      group = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Add the hook to the named group.
+        '';
+      };
+
+      option = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "filetype=latex";
+        description = ''
+          Additional option to pass to the hook.
+        '';
+      };
+
+      commands = mkOption {
+        type = types.lines;
+        default = "";
+        example = "set-option window indentwidth 2";
+        description = ''
+          Commands to run when the hook is activated.
+        '';
+      };
+    };
+  };
+
+  keyMapping = types.submodule {
+    options = {
+      mode = mkOption {
+        type = types.enum [
+          "insert"
+          "normal"
+          "prompt"
+          "menu"
+          "user"
+          "goto"
+          "view"
+          "object"
+        ];
+        example = "user";
+        description = ''
+          The mode in which the mapping takes effect.
+        '';
+      };
+
+      docstring = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Optional documentation text to display in info boxes.
+        '';
+      };
+
+      key = mkOption {
+        type = types.str;
+        example = "<a-x>";
+        description = ''
+          The key to be mapped. See
+          <link xlink:href="https://github.com/mawww/kakoune/blob/master/doc/pages/mapping.asciidoc#mappable-keys"/>
+          for possible values.
+        '';
+      };
+
+      effect = mkOption {
+        type = types.str;
+        example = ":wq<ret>";
+        description = ''
+          The sequence of keys to be mapped.
+        '';
+      };
+    };
+  };
+
+  configModule = types.submodule {
+    options = {
+      colorScheme = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Set the color scheme. To see available schemes, enter
+          <command>colorscheme</command> at the kakoune prompt.
+        '';
+      };
+
+      tabStop = mkOption {
+        type = types.nullOr types.ints.unsigned;
+        default = null;
+        description = ''
+          The width of a tab in spaces. The kakoune default is
+          <literal>6</literal>.
+        '';
+      };
+
+      indentWidth = mkOption {
+        type = types.nullOr types.ints.unsigned;
+        default = null;
+        description = ''
+          The width of an indentation in spaces.
+          The kakoune default is <literal>4</literal>.
+          If <literal>0</literal>, a tab will be used instead.
+        '';
+      };
+
+      incrementalSearch = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Execute a search as it is being typed.
+        '';
+      };
+
+      alignWithTabs = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Use tabs for the align command.
+        '';
+      };
+
+      autoInfo = mkOption {
+        type = types.nullOr (types.listOf (types.enum [ "command" "onkey" "normal" ]));
+        default = null;
+        example = [ "command" "normal" ];
+        description = ''
+          Contexts in which to display automatic information box.
+          The kakoune default is <literal>[ "command" "onkey" ]</literal>.
+        '';
+      };
+
+      autoComplete = mkOption {
+        type = types.nullOr(types.listOf (types.enum [ "insert" "prompt" ]));
+        default = null;
+        description = ''
+          Modes in which to display possible completions.
+          The kakoune default is <literal>[ "insert" "prompt" ]</literal>.
+        '';
+      };
+
+      autoReload = mkOption {
+        type = types.nullOr (types.enum [ "yes" "no" "ask" ]);
+        default = null;
+        description = ''
+          Reload buffers when an external modification is detected.
+          The kakoune default is <literal>"ask"</literal>.
+        '';
+      };
+
+      scrollOff = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            lines = mkOption {
+              type = types.ints.unsigned;
+              default = 0;
+              description = ''
+                The number of lines to keep visible around the cursor.
+              '';
+            };
+
+            columns = mkOption {
+              type = types.ints.unsigned;
+              default = 0;
+              description = ''
+                The number of columns to keep visible around the cursor.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = ''
+          How many lines and columns to keep visible around the cursor.
+        '';
+      };
+
+      ui = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            setTitle = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Change the title of the terminal emulator.
+              '';
+            };
+
+            statusLine = mkOption {
+              type = types.enum [ "top" "bottom" ];
+              default = "bottom";
+              description = ''
+                Where to display the status line.
+              '';
+            };
+
+            assistant = mkOption {
+              type = types.enum [ "clippy" "cat" "dilbert" "none" ];
+              default = "clippy";
+              description = ''
+                The assistant displayed in info boxes.
+              '';
+            };
+
+            enableMouse = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Whether to enable mouse support.
+              '';
+            };
+
+            changeColors = mkOption {
+              type = types.bool;
+              default = true;
+              description = ''
+                Change color palette.
+              '';
+            };
+
+            wheelDownButton = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                Button to send for wheel down events.
+              '';
+            };
+
+            wheelUpButton = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                Button to send for wheel up events.
+              '';
+            };
+
+            shiftFunctionKeys = mkOption {
+              type = types.nullOr types.ints.unsigned;
+              default = null;
+              description = ''
+                Amount by which shifted function keys are offset. That
+                is, if the terminal sends F13 for Shift-F1, this
+                should be <literal>12</literal>.
+              '';
+            };
+
+            useBuiltinKeyParser = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Bypass ncurses key parser and use an internal one.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = ''
+          Settings for the ncurses interface.
+        '';
+      };
+
+      showMatching = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Highlight the matching char of the character under the
+          selections' cursor using the <literal>MatchingChar</literal>
+          face.
+        '';
+      };
+
+      wrapLines = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            enable = mkEnableOption "the wrap lines highlighter";
+
+            word = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Wrap at word boundaries instead of codepoint boundaries.
+              '';
+            };
+
+            indent = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Preserve line indentation when wrapping.
+              '';
+            };
+
+            maxWidth = mkOption {
+              type = types.nullOr types.ints.unsigned;
+              default = null;
+              description = ''
+                Wrap text at maxWidth, even if the window is wider.
+              '';
+            };
+
+            marker = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              example = "⏎";
+              description = ''
+                Prefix wrapped lines with marker text.
+                If not <literal>null</literal>,
+                the marker text will be displayed in the indentation if possible.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = ''
+          Settings for the wrap lines highlighter.
+        '';
+      };
+
+      numberLines = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            enable = mkEnableOption "the number lines highlighter";
+
+            relative = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Show line numbers relative to the main cursor line.
+              '';
+            };
+
+            highlightCursor = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Highlight the cursor line with a separate face.
+              '';
+            };
+
+            separator = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                String that separates the line number column from the
+                buffer contents. The kakoune default is
+                <literal>"|"</literal>.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = ''
+          Settings for the number lines highlighter.
+        '';
+      };
+
+      showWhitespace = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            enable = mkEnableOption "the show whitespace highlighter";
+
+            lineFeed = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                The character to display for line feeds.
+                The kakoune default is <literal>"¬"</literal>.
+              '';
+            };
+
+            space = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                The character to display for spaces.
+                The kakoune default is <literal>"·"</literal>.
+              '';
+            };
+
+            nonBreakingSpace = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                The character to display for non-breaking spaces.
+                The kakoune default is <literal>"⍽"</literal>.
+              '';
+            };
+
+            tab = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                The character to display for tabs.
+                The kakoune default is <literal>"→"</literal>.
+              '';
+            };
+
+            tabStop = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                The character to append to tabs to reach the width of a tabstop.
+                The kakoune default is <literal>" "</literal>.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = ''
+          Settings for the show whitespaces highlighter.
+        '';
+      };
+
+      keyMappings = mkOption {
+        type = types.listOf keyMapping;
+        default = [];
+        description = ''
+          User-defined key mappings. For documentation, see
+          <link xlink:href="https://github.com/mawww/kakoune/blob/master/doc/pages/mapping.asciidoc"/>.
+        '';
+      };
+
+      hooks = mkOption {
+        type = types.listOf hook;
+        default = [];
+        description = ''
+          Global hooks. For documentation, see
+          <link xlink:href="https://github.com/mawww/kakoune/blob/master/doc/pages/hooks.asciidoc"/>.
+        '';
+      };
+    };
+  };
+
+  configFile =
+    let
+      wrapOptions = with cfg.config.wrapLines; concatStrings [
+        "${optionalString word " -word"}"
+        "${optionalString indent " -indent"}"
+        "${optionalString (marker != null) " -marker ${marker}"}"
+        "${optionalString (maxWidth != null) " -width ${toString maxWidth}"}"
+      ];
+
+      numberLinesOptions = with cfg.config.numberLines; concatStrings [
+        "${optionalString relative " -relative "}"
+        "${optionalString highlightCursor " -hlcursor"}"
+        "${optionalString (separator != null) " -separator ${separator}"}"
+      ];
+
+      uiOptions = with cfg.config.ui; concatStringsSep " " [
+        "ncurses_set_title=${if setTitle then "true" else "false"}"
+        "ncurses_status_on_top=${if (statusLine == "top") then "true" else "false"}"
+        "ncurses_assistant=${assistant}"
+        "ncurses_enable_mouse=${if enableMouse then "true" else "false"}"
+        "ncurses_change_colors=${if changeColors then "true" else "false"}"
+        "${optionalString (wheelDownButton != null)
+          "ncurses_wheel_down_button=${wheelDownButton}"}"
+        "${optionalString (wheelUpButton != null)
+          "ncurses_wheel_up_button=${wheelUpButton}"}"
+        "${optionalString (shiftFunctionKeys != null)
+          "ncurses_shift_function_key=${toString shiftFunctionKeys}"}"
+        "ncurses_builtin_key_parser=${if useBuiltinKeyParser then "true" else "false"}"
+      ];
+
+      keyMappingString = km: concatStringsSep " " [
+        "map global"
+        "${km.mode} ${km.key} '${km.effect}'"
+        "${optionalString (km.docstring != null) "-docstring '${km.docstring}'"}"
+      ];
+
+      hookString = h: concatStringsSep " " [
+        "hook" "${optionalString (h.group != null) "-group ${group}"}"
+        "${optionalString (h.once) "-once"}" "global"
+        "${h.name}" "${optionalString (h.option != null) h.option}"
+        "%{ ${h.commands} }"
+      ];
+
+      cfgStr = with cfg.config; concatStringsSep "\n" (
+        [ "# Generated by home-manager" ]
+        ++ optional (colorScheme != null) "colorscheme ${colorScheme}"
+        ++ optional (tabStop != null) "set-option global tabstop ${toString tabStop}"
+        ++ optional (indentWidth != null) "set-option global indentwidth ${toString indentWidth}"
+        ++ optional (!incrementalSearch) "set-option global incsearch false"
+        ++ optional (alignWithTabs) "set-option global aligntab true"
+        ++ optional (autoInfo != null) "set-option global autoinfo ${concatStringsSep "|" autoInfo}"
+        ++ optional (autoComplete != null) "set-option global autocomplete ${concatStringsSep "|" autoComplete}"
+        ++ optional (autoReload != null) "set-option global/ autoreload ${autoReload}"
+        ++ optional (wrapLines != null && wrapLines.enable) "add-highlighter global/ wrap${wrapOptions}"
+        ++ optional (numberLines != null && numberLines.enable)
+          "add-highlighter global/ number-lines${numberLinesOptions}"
+        ++ optional showMatching "add-highlighter global/ show-matching"
+        ++ optional (scrollOff != null)
+          "set-option global scrolloff ${toString scrollOff.lines},${toString scrollOff.columns}"
+
+        ++ [ "# UI options" ]
+        ++ optional (ui != null) "set-option global ui_options ${uiOptions}"
+
+        ++ [ "# Key mappings" ]
+        ++ map keyMappingString keyMappings
+
+        ++ [ "# Hooks" ]
+        ++ map hookString hooks
+      );
+    in
+      pkgs.writeText "kakrc" (
+        optionalString (cfg.config != null) cfgStr
+        + "\n"
+        + cfg.extraConfig
+      );
+
+in
+
+{
+  options = {
+    programs.kakoune = {
+      enable = mkEnableOption "the kakoune text editor";
+
+      config = mkOption {
+        type = types.nullOr configModule;
+        default = {};
+        description = "kakoune configuration options.";
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra configuration lines to add to
+          <filename>~/.config/kak/kakrc</filename>.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.kakoune ];
+    xdg.configFile."kak/kakrc".source = configFile;
+  };
+}
diff --git a/home-manager/modules/programs/keychain.nix b/home-manager/modules/programs/keychain.nix
new file mode 100644
index 00000000000..6dbf83a872e
--- /dev/null
+++ b/home-manager/modules/programs/keychain.nix
@@ -0,0 +1,88 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.keychain;
+
+  flags = cfg.extraFlags
+    ++ optional (cfg.agents != []) "--agents ${concatStringsSep "," cfg.agents}"
+    ++ optional (cfg.inheritType != null) "--inherit ${cfg.inheritType}";
+
+  shellCommand = ''
+    eval "$(${cfg.package}/bin/keychain --eval ${concatStringsSep " " flags} ${concatStringsSep " " cfg.keys})"
+  '';
+
+in
+
+{
+  meta.maintainers = [ maintainers.marsam ];
+
+  options.programs.keychain = {
+    enable = mkEnableOption "keychain";
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.keychain;
+      defaultText = literalExample "pkgs.keychain";
+      description = ''
+        Keychain package to install.
+      '';
+    };
+
+    keys = mkOption {
+      type = types.listOf types.str;
+      default = [ "id_rsa" ];
+      description = ''
+        Keys to add to keychain.
+      '';
+    };
+
+    agents = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Agents to add.
+      '';
+    };
+
+    inheritType = mkOption {
+      type = types.nullOr (types.enum ["local" "any" "local-once" "any-once"]);
+      default = null;
+      description = ''
+        Inherit type to attempt from agent variables from the environment.
+      '';
+    };
+
+    extraFlags = mkOption {
+      type = types.listOf types.str;
+      default = [ "--quiet" ];
+      description = ''
+        Extra flags to pass to keychain.
+      '';
+    };
+
+    enableBashIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Bash integration.
+      '';
+    };
+
+    enableZshIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Zsh integration.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+    programs.bash.initExtra = mkIf cfg.enableBashIntegration shellCommand;
+    programs.zsh.initExtra = mkIf cfg.enableZshIntegration shellCommand;
+  };
+}
diff --git a/home-manager/modules/programs/lesspipe.nix b/home-manager/modules/programs/lesspipe.nix
new file mode 100644
index 00000000000..a7a51ffe2a2
--- /dev/null
+++ b/home-manager/modules/programs/lesspipe.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    programs.lesspipe = {
+      enable = mkEnableOption "lesspipe preprocessor for less";
+    };
+  };
+
+  config = mkIf config.programs.lesspipe.enable {
+    home.sessionVariables = {
+      LESSOPEN = "|${pkgs.lesspipe}/bin/lesspipe.sh %s";
+    };
+  };
+}
diff --git a/home-manager/modules/programs/lsd.nix b/home-manager/modules/programs/lsd.nix
new file mode 100644
index 00000000000..5e145e8c69b
--- /dev/null
+++ b/home-manager/modules/programs/lsd.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.lsd;
+
+  aliases = {
+    ls = "${pkgs.lsd}/bin/lsd";
+    ll = "ls -l";
+    la = "ls -a";
+    lt = "ls --tree";
+    lla ="ls -la";
+  };
+
+in
+
+{
+  meta.maintainers = [ maintainers.marsam ];
+
+  options.programs.lsd = {
+    enable = mkEnableOption "lsd";
+
+    enableAliases = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to enable recommended lsd aliases.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.lsd ];
+
+    programs.bash.shellAliases = mkIf cfg.enableAliases aliases;
+
+    programs.zsh.shellAliases = mkIf cfg.enableAliases aliases;
+  };
+}
diff --git a/home-manager/modules/programs/man.nix b/home-manager/modules/programs/man.nix
new file mode 100644
index 00000000000..0ed376780d4
--- /dev/null
+++ b/home-manager/modules/programs/man.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  options = {
+    programs.man.enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to enable manual pages and the <command>man</command>
+        command. This also includes "man" outputs of all
+        <literal>home.packages</literal>.
+      '';
+    };
+  };
+
+  config = mkIf config.programs.man.enable {
+    home.packages = [ pkgs.man ];
+    home.extraOutputsToInstall = [ "man" ];
+  };
+}
diff --git a/home-manager/modules/programs/matplotlib.nix b/home-manager/modules/programs/matplotlib.nix
new file mode 100644
index 00000000000..48ff6e60d68
--- /dev/null
+++ b/home-manager/modules/programs/matplotlib.nix
@@ -0,0 +1,64 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.matplotlib;
+
+  formatLine = o: n: v:
+    let
+      formatValue = v:
+        if isBool v then (if v then "True" else "False")
+        else toString v;
+    in
+      if isAttrs v
+      then concatStringsSep "\n" (mapAttrsToList (formatLine "${o}${n}.") v)
+      else (if v == "" then "" else "${o}${n}: ${formatValue v}");
+
+in
+
+{
+  meta.maintainers = [ maintainers.rprospero ];
+
+  options.programs.matplotlib = {
+    enable = mkEnableOption "matplotlib, a plotting library for python";
+
+    config = mkOption {
+      default = { };
+      type = types.attrs;
+      description = ''
+        Add terms to the <filename>matplotlibrc</filename> file to
+        control the default matplotlib behavior.
+      '';
+      example = literalExample  ''
+        {
+          backend = "Qt5Agg";
+          axes = {
+            grid = true;
+            facecolor = "black";
+            edgecolor = "FF9900";
+          };
+          grid.color = "FF9900";
+        }
+      '';
+    };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Additional commands for matplotlib that will be added to the
+        <filename>matplotlibrc</filename> file.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    xdg.configFile."matplotlib/matplotlibrc".text =
+      concatStringsSep "\n" ([]
+        ++ mapAttrsToList (formatLine "") cfg.config
+        ++ optional (cfg.extraConfig != "") cfg.extraConfig
+      ) + "\n";
+  };
+}
diff --git a/home-manager/modules/programs/mbsync-accounts.nix b/home-manager/modules/programs/mbsync-accounts.nix
new file mode 100644
index 00000000000..c586481df4d
--- /dev/null
+++ b/home-manager/modules/programs/mbsync-accounts.nix
@@ -0,0 +1,107 @@
+{ lib, ... }:
+
+with lib;
+
+let
+
+  extraConfigType = with lib.types; attrsOf (either (either str int) bool);
+
+in
+
+{
+  options.mbsync = {
+    enable = mkEnableOption "synchronization using mbsync";
+
+    flatten = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = ".";
+      description = ''
+        If set, flattens the hierarchy within the maildir by
+        substituting the canonical hierarchy delimiter
+        <literal>/</literal> with this value.
+      '';
+    };
+
+    create = mkOption {
+      type = types.enum [ "none" "maildir" "imap" "both" ];
+      default = "none";
+      example = "maildir";
+      description = ''
+        Automatically create missing mailboxes within the
+        given mail store.
+      '';
+    };
+
+    remove = mkOption {
+      type = types.enum [ "none" "maildir" "imap" "both" ];
+      default = "none";
+      example = "imap";
+      description = ''
+        Propagate mailbox deletions to the given mail store.
+      '';
+    };
+
+    expunge = mkOption {
+      type = types.enum [ "none" "maildir" "imap" "both" ];
+      default = "none";
+      example = "both";
+      description = ''
+        Permanently remove messages marked for deletion from
+        the given mail store.
+      '';
+    };
+
+    patterns = mkOption {
+      type = types.listOf types.str;
+      default = [ "*" ];
+      description = ''
+        Pattern of mailboxes to synchronize.
+      '';
+    };
+
+    extraConfig.channel = mkOption {
+      type = extraConfigType;
+      default = {};
+      example = literalExample ''
+        {
+          MaxMessages = 10000;
+          MaxSize = "1m";
+        };
+      '';
+      description = ''
+        Per channel extra configuration.
+      '';
+    };
+
+    extraConfig.local = mkOption {
+      type = extraConfigType;
+      default = {};
+      description = ''
+        Local store extra configuration.
+      '';
+    };
+
+    extraConfig.remote = mkOption {
+      type = extraConfigType;
+      default = {};
+      description = ''
+        Remote store extra configuration.
+      '';
+    };
+
+    extraConfig.account = mkOption {
+      type = extraConfigType;
+      default = {};
+      example = literalExample ''
+        {
+          PipelineDepth = 10;
+          Timeout = 60;
+        };
+      '';
+      description = ''
+        Account section extra configuration.
+      '';
+    };
+  };
+}
diff --git a/home-manager/modules/programs/mbsync.nix b/home-manager/modules/programs/mbsync.nix
new file mode 100644
index 00000000000..908a1add715
--- /dev/null
+++ b/home-manager/modules/programs/mbsync.nix
@@ -0,0 +1,188 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  dag = config.lib.dag;
+
+  cfg = config.programs.mbsync;
+
+  # Accounts for which mbsync is enabled.
+  mbsyncAccounts =
+    filter (a: a.mbsync.enable) (attrValues config.accounts.email.accounts);
+
+  genTlsConfig = tls: {
+      SSLType =
+        if !tls.enable          then "None"
+        else if tls.useStartTls then "STARTTLS"
+        else                         "IMAPS";
+    }
+    //
+    optionalAttrs (tls.enable && tls.certificatesFile != null) {
+      CertificateFile = toString tls.certificatesFile;
+    };
+
+  masterSlaveMapping = {
+    none = "None";
+    imap = "Master";
+    maildir = "Slave";
+    both = "Both";
+  };
+
+  genSection = header: entries:
+    let
+      escapeValue = escape [ "\"" ];
+      hasSpace = v: builtins.match ".* .*" v != null;
+      genValue = n: v:
+        if isList v
+        then concatMapStringsSep " " (genValue n) v
+        else if isBool v then (if v then "yes" else "no")
+        else if isInt v then toString v
+        else if isString v && hasSpace v then "\"${escapeValue v}\""
+        else if isString v then v
+        else
+          let prettyV = lib.generators.toPretty {} v;
+          in  throw "mbsync: unexpected value for option ${n}: '${prettyV}'";
+    in
+      ''
+        ${header}
+        ${concatStringsSep "\n"
+          (mapAttrsToList (n: v: "${n} ${genValue n v}") entries)}
+      '';
+
+  genAccountConfig = account: with account;
+      genSection "IMAPAccount ${name}" (
+        {
+          Host = imap.host;
+          User = userName;
+          PassCmd = toString passwordCommand;
+        }
+        // genTlsConfig imap.tls
+        // optionalAttrs (imap.port != null) { Port = toString imap.port; }
+        // mbsync.extraConfig.account
+      )
+      + "\n"
+      + genSection "IMAPStore ${name}-remote" (
+        {
+          Account = name;
+        }
+        // mbsync.extraConfig.remote
+      )
+      + "\n"
+      + genSection "MaildirStore ${name}-local" (
+        {
+          Path = "${maildir.absPath}/";
+          Inbox = "${maildir.absPath}/${folders.inbox}";
+          SubFolders = "Verbatim";
+        }
+        // optionalAttrs (mbsync.flatten != null) { Flatten = mbsync.flatten; }
+        // mbsync.extraConfig.local
+      )
+      + "\n"
+      + genSection "Channel ${name}" (
+        {
+          Master = ":${name}-remote:";
+          Slave = ":${name}-local:";
+          Patterns = mbsync.patterns;
+          Create = masterSlaveMapping.${mbsync.create};
+          Remove = masterSlaveMapping.${mbsync.remove};
+          Expunge = masterSlaveMapping.${mbsync.expunge};
+          SyncState = "*";
+        }
+        // mbsync.extraConfig.channel
+      )
+      + "\n";
+
+  genGroupConfig = name: channels:
+    let
+      genGroupChannel = n: boxes: "Channel ${n}:${concatStringsSep "," boxes}";
+    in
+      concatStringsSep "\n" (
+        [ "Group ${name}" ] ++ mapAttrsToList genGroupChannel channels
+      );
+
+in
+
+{
+  options = {
+    programs.mbsync = {
+      enable = mkEnableOption "mbsync IMAP4 and Maildir mailbox synchronizer";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.isync;
+        defaultText = literalExample "pkgs.isync";
+        example = literalExample "pkgs.isync";
+        description = "The package to use for the mbsync binary.";
+      };
+
+      groups = mkOption {
+        type = types.attrsOf (types.attrsOf (types.listOf types.str));
+        default = {};
+        example = literalExample ''
+          {
+            inboxes = {
+              account1 = [ "Inbox" ];
+              account2 = [ "Inbox" ];
+            };
+          }
+        '';
+        description = ''
+          Definition of groups.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra configuration lines to add to the mbsync configuration.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions =
+      let
+        checkAccounts = pred: msg:
+          let
+            badAccounts = filter pred mbsyncAccounts;
+          in {
+            assertion = badAccounts == [];
+            message = "mbsync: ${msg} for accounts: "
+              + concatMapStringsSep ", " (a: a.name) badAccounts;
+          };
+      in
+        [
+          (checkAccounts (a: a.maildir == null) "Missing maildir configuration")
+          (checkAccounts (a: a.imap == null) "Missing IMAP configuration")
+          (checkAccounts (a: a.passwordCommand == null) "Missing passwordCommand")
+          (checkAccounts (a: a.userName == null) "Missing username")
+        ];
+
+    home.packages = [ cfg.package ];
+
+    programs.notmuch.new.ignore = [ ".uidvalidity" ".mbsyncstate" ];
+
+    home.file.".mbsyncrc".text =
+      let
+        accountsConfig = map genAccountConfig mbsyncAccounts;
+        groupsConfig = mapAttrsToList genGroupConfig cfg.groups;
+      in
+        concatStringsSep "\n" (
+          [ "# Generated by Home Manager.\n" ]
+          ++ optional (cfg.extraConfig != "") cfg.extraConfig
+          ++ accountsConfig
+          ++ groupsConfig
+        ) + "\n";
+
+    home.activation.createMaildir =
+      dag.entryBetween [ "linkGeneration" ] [ "writeBoundary" ] ''
+        $DRY_RUN_CMD mkdir -m700 -p $VERBOSE_ARG ${
+          concatMapStringsSep " " (a: a.maildir.absPath) mbsyncAccounts
+        }
+      '';
+  };
+}
diff --git a/home-manager/modules/programs/mercurial.nix b/home-manager/modules/programs/mercurial.nix
new file mode 100644
index 00000000000..fa6e7b3e5ba
--- /dev/null
+++ b/home-manager/modules/programs/mercurial.nix
@@ -0,0 +1,102 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.mercurial;
+
+in
+
+{
+
+  options = {
+    programs.mercurial = {
+      enable = mkEnableOption "Mercurial";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.mercurial;
+        defaultText = literalExample "pkgs.mercurial";
+        description = "Mercurial package to install.";
+      };
+
+      userName = mkOption {
+        type = types.str;
+        description = "Default user name to use.";
+      };
+
+      userEmail = mkOption {
+        type = types.str;
+        description = "Default user email to use.";
+      };
+
+      aliases = mkOption {
+        type = types.attrs;
+        default = {};
+        description = "Mercurial aliases to define.";
+      };
+
+      extraConfig = mkOption {
+        type = types.either types.attrs types.lines;
+        default = {};
+        description = "Additional configuration to add.";
+      };
+
+      iniContent = mkOption {
+        type = types.attrsOf types.attrs;
+        internal = true;
+      };
+
+      ignores = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "*~" "*.swp" ];
+        description = "List of globs for files to be globally ignored.";
+      };
+
+      ignoresRegexp = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "^.*~$" "^.*\\.swp$" ];
+        description =
+            "List of regular expressions for files to be globally ignored.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (
+    mkMerge [
+      {
+        home.packages = [ cfg.package ];
+
+        programs.mercurial.iniContent.ui = {
+          username = cfg.userName + " <" + cfg.userEmail + ">";
+        };
+
+        xdg.configFile."hg/hgrc".text = generators.toINI {} cfg.iniContent;
+      }
+
+      (mkIf (cfg.ignores != [] || cfg.ignoresRegexp != []) {
+        programs.mercurial.iniContent.ui.ignore =
+            "${config.xdg.configHome}/hg/hgignore_global";
+
+        xdg.configFile."hg/hgignore_global".text =
+            "syntax: glob\n"   + concatStringsSep "\n" cfg.ignores + "\n" +
+            "syntax: regexp\n" + concatStringsSep "\n" cfg.ignoresRegexp + "\n";
+      })
+
+      (mkIf (cfg.aliases != {}) {
+        programs.mercurial.iniContent.alias = cfg.aliases;
+      })
+
+      (mkIf (lib.isAttrs cfg.extraConfig) {
+        programs.mercurial.iniContent = cfg.extraConfig;
+      })
+
+      (mkIf (lib.isString cfg.extraConfig) {
+        xdg.configFile."hg/hgrc".text = cfg.extraConfig;
+      })
+    ]
+  );
+}
diff --git a/home-manager/modules/programs/mpv.nix b/home-manager/modules/programs/mpv.nix
new file mode 100644
index 00000000000..1051f71ccd6
--- /dev/null
+++ b/home-manager/modules/programs/mpv.nix
@@ -0,0 +1,152 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  inherit (builtins) typeOf stringLength;
+
+  cfg = config.programs.mpv;
+
+  mpvOption = with types; either str (either int (either bool float));
+  mpvOptions = with types; attrsOf mpvOption;
+  mpvProfiles = with types; attrsOf mpvOptions;
+  mpvBindings = with types; attrsOf str;
+
+  renderOption = option:
+    rec {
+      int = toString option;
+      float = int;
+
+      bool = if option then "yes" else "no";
+
+      string = option;
+    }.${typeOf option};
+
+  renderOptions = options:
+    concatStringsSep "\n"
+      (mapAttrsToList
+        (name: value:
+          let
+            rendered = renderOption value;
+            length = toString (stringLength rendered);
+          in
+          "${name}=%${length}%${rendered}")
+          options);
+
+  renderProfiles = profiles:
+    concatStringsSep "\n"
+      (mapAttrsToList
+        (name: value: ''
+          [${name}]
+          ${renderOptions value}
+        '')
+        profiles);
+
+  renderBindings = bindings:
+    concatStringsSep "\n"
+      (mapAttrsToList
+        (name: value:
+          "${name} ${value}")
+        bindings);
+
+in {
+  options = {
+    programs.mpv = {
+      enable = mkEnableOption "mpv";
+
+      scripts = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        example = literalExample "[ pkgs.mpvScripts.mpris ]";
+        description = ''
+          List of scripts to use with mpv.
+        '';
+      };
+
+      config = mkOption {
+        description = ''
+          Configuration written to
+          <filename>~/.config/mpv/mpv.conf</filename>. See
+          <citerefentry>
+            <refentrytitle>mpv</refentrytitle>
+            <manvolnum>1</manvolnum>
+          </citerefentry>
+          for the full list of options.
+        '';
+        type = mpvOptions;
+        default = {};
+        example = literalExample ''
+          {
+            profile = "gpu-hq";
+            force-window = "yes";
+            ytdl-format = "bestvideo+bestaudio";
+            cache-default = 4000000;
+          }
+        '';
+      };
+
+      profiles = mkOption {
+        description = ''
+          Sub-configuration options for specific profiles written to
+          <filename>~/.config/mpv/mpv.conf</filename>. See
+          <option>programs.mpv.config</option> for more information.
+        '';
+        type = mpvProfiles;
+        default = {};
+        example = literalExample ''
+          {
+            fast = {
+              vo = "vdpau";
+            };
+            "protocol.dvd" = {
+              profile-desc = "profile for dvd:// streams";
+              alang = "en";
+            };
+          }
+        '';
+      };
+
+      bindings = mkOption {
+        description = ''
+          Input configuration written to
+          <filename>~/.config/mpv/input.conf</filename>. See
+          <citerefentry>
+            <refentrytitle>mpv</refentrytitle>
+            <manvolnum>1</manvolnum>
+          </citerefentry>
+          for the full list of options.
+        '';
+        type = mpvBindings;
+        default = {};
+        example = literalExample ''
+          {
+            WHEEL_UP = "seek 10";
+            WHEEL_DOWN = "seek -10";
+            "Alt+0" = "set window-scale 0.5";
+          }
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    {
+      home.packages = [(
+        if cfg.scripts == []
+        then pkgs.mpv
+        else pkgs.mpv-with-scripts.override { scripts = cfg.scripts; }
+      )];
+    }
+    (mkIf (cfg.config != {} || cfg.profiles != {}) {
+      xdg.configFile."mpv/mpv.conf".text = ''
+        ${optionalString (cfg.config != {}) (renderOptions cfg.config)}
+        ${optionalString (cfg.profiles != {}) (renderProfiles cfg.profiles)}
+      '';
+    })
+    (mkIf (cfg.bindings != {}) {
+      xdg.configFile."mpv/input.conf".text = renderBindings cfg.bindings;
+    })
+  ]);
+
+  meta.maintainers = with maintainers; [ tadeokondrak ];
+}
diff --git a/home-manager/modules/programs/msmtp-accounts.nix b/home-manager/modules/programs/msmtp-accounts.nix
new file mode 100644
index 00000000000..277710f4cba
--- /dev/null
+++ b/home-manager/modules/programs/msmtp-accounts.nix
@@ -0,0 +1,47 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  options.msmtp = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable msmtp.
+        </para><para>
+        If enabled then it is possible to use the
+        <parameter class="command">--account</parameter> command line
+        option to send a message for a given account using the
+        <command>msmtp</command> or <command>msmtpq</command> tool.
+        For example, <command>msmtp --account=private</command> would
+        send using the account defined in
+        <option>accounts.email.accounts.private</option>. If the
+        <parameter class="command">--account</parameter> option is not
+        given then the primary account will be used.
+      '';
+    };
+
+    tls.fingerprint = mkOption {
+      type = types.nullOr (types.strMatching "([[:alnum:]]{2}\:)+[[:alnum:]]{2}");
+      default = null;
+      example = "my:SH:a2:56:ha:sh";
+      description = ''
+        Fingerprint of a trusted TLS certificate.
+        The fingerprint can be obtained by executing
+        <command>msmtp --serverinfo --tls --tls-certcheck=off</command>.
+      '';
+    };
+
+    extraConfig = mkOption {
+      type = types.attrsOf types.str;
+      default = { };
+      example = { auth = "login"; };
+      description = ''
+        Extra configuration options to add to <filename>~/.msmtprc</filename>.
+        See <link xlink:href="https://marlam.de/msmtp/msmtprc.txt"/> for
+        examples.
+      '';
+    };
+  };
+}
diff --git a/home-manager/modules/programs/msmtp.nix b/home-manager/modules/programs/msmtp.nix
new file mode 100644
index 00000000000..1ff3139ef36
--- /dev/null
+++ b/home-manager/modules/programs/msmtp.nix
@@ -0,0 +1,79 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.msmtp;
+
+  msmtpAccounts = filter (a: a.msmtp.enable)
+    (attrValues config.accounts.email.accounts);
+
+  onOff = p: if p then "on" else "off";
+
+  accountStr = account: with account;
+    concatStringsSep "\n" (
+      [ "account ${name}" ]
+      ++ mapAttrsToList (n: v: n + " " + v) (
+        {
+          host = smtp.host;
+          from = address;
+          auth = "on";
+          user = userName;
+          tls = onOff smtp.tls.enable;
+          tls_starttls = onOff smtp.tls.useStartTls;
+          tls_trust_file = smtp.tls.certificatesFile;
+        }
+        // optionalAttrs (msmtp.tls.fingerprint != null) {
+          tls_fingerprint = msmtp.tls.fingerprint;
+        }
+        // optionalAttrs (smtp.port != null) {
+          port = toString smtp.port;
+        }
+        // optionalAttrs (passwordCommand != null) {
+          # msmtp requires the password to finish with a newline.
+          passwordeval = ''${pkgs.bash}/bin/bash -c "${toString passwordCommand}; echo"'';
+        }
+        // msmtp.extraConfig
+      )
+      ++ optional primary "\naccount default : ${name}"
+    );
+
+  configFile = mailAccounts: ''
+    # Generated by Home Manager.
+
+    ${cfg.extraConfig}
+
+    ${concatStringsSep "\n\n" (map accountStr mailAccounts)}
+  '';
+
+in
+
+{
+
+  options = {
+    programs.msmtp = {
+      enable = mkEnableOption "msmtp";
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra configuration lines to add to <filename>~/.msmtprc</filename>.
+          See <link xlink:href="https://marlam.de/msmtp/msmtprc.txt"/> for examples.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.msmtp ];
+
+    xdg.configFile."msmtp/config".text = configFile msmtpAccounts;
+
+    home.sessionVariables =  {
+      MSMTP_QUEUE = "${config.xdg.dataHome}/msmtp/queue";
+      MSMTP_LOG = "${config.xdg.dataHome}/msmtp/queue.log";
+    };
+  };
+}
diff --git a/home-manager/modules/programs/neovim.nix b/home-manager/modules/programs/neovim.nix
new file mode 100644
index 00000000000..dadda2c7118
--- /dev/null
+++ b/home-manager/modules/programs/neovim.nix
@@ -0,0 +1,212 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.neovim;
+
+  extraPythonPackageType = mkOptionType {
+    name = "extra-python-packages";
+    description = "python packages in python.withPackages format";
+    check = with types; (x: if isFunction x
+      then isList (x pkgs.pythonPackages)
+      else false);
+    merge = mergeOneOption;
+  };
+
+  extraPython3PackageType = mkOptionType {
+    name = "extra-python3-packages";
+    description = "python3 packages in python.withPackages format";
+    check = with types; (x: if isFunction x
+      then isList (x pkgs.python3Packages)
+      else false);
+    merge = mergeOneOption;
+  };
+
+  moduleConfigure =
+    optionalAttrs (cfg.extraConfig != "") {
+      customRC = cfg.extraConfig;
+    }
+    // optionalAttrs (cfg.plugins != []) {
+      packages.home-manager.start = cfg.plugins;
+    };
+
+in
+
+{
+  options = {
+    programs.neovim = {
+      enable = mkEnableOption "Neovim";
+
+      viAlias = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Symlink `vi` to `nvim` binary.
+        '';
+      };
+
+      vimAlias = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Symlink `vim` to `nvim` binary.
+        '';
+      };
+
+      withNodeJs = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable node provider. Set to <literal>true</literal> to
+          use Node plugins.
+        '';
+      };
+
+      withPython = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Enable Python 2 provider. Set to <literal>true</literal> to
+          use Python 2 plugins.
+        '';
+      };
+
+      extraPythonPackages = mkOption {
+        type = with types; either extraPythonPackageType (listOf package);
+        default = (_: []);
+        defaultText = "ps: []";
+        example = literalExample "(ps: with ps; [ pandas jedi ])";
+        description = ''
+          A function in python.withPackages format, which returns a
+          list of Python 2 packages required for your plugins to work.
+        '';
+      };
+
+      withRuby = mkOption {
+        type = types.nullOr types.bool;
+        default = true;
+        description = ''
+          Enable ruby provider.
+        '';
+      };
+
+      withPython3 = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Enable Python 3 provider. Set to <literal>true</literal> to
+          use Python 3 plugins.
+        '';
+      };
+
+      extraPython3Packages = mkOption {
+        type = with types; either extraPython3PackageType (listOf package);
+        default = (_: []);
+        defaultText = "ps: []";
+        example = literalExample "(ps: with ps; [ python-language-server ])";
+        description = ''
+          A function in python.withPackages format, which returns a
+          list of Python 3 packages required for your plugins to work.
+        '';
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.neovim-unwrapped;
+        defaultText = literalExample "pkgs.neovim-unwrapped";
+        description = "The package to use for the neovim binary.";
+      };
+
+      finalPackage = mkOption {
+        type = types.package;
+        visible = false;
+        readOnly = true;
+        description = "Resulting customized neovim package.";
+      };
+
+      configure = mkOption {
+        type = types.attrs;
+        default = {};
+        example = literalExample ''
+          configure = {
+              customRC = $''''
+              " here your custom configuration goes!
+              $'''';
+              packages.myVimPackage = with pkgs.vimPlugins; {
+                # loaded on launch
+                start = [ fugitive ];
+                # manually loadable by calling `:packadd $plugin-name`
+                opt = [ ];
+              };
+            };
+        '';
+        description = ''
+          Generate your init file from your list of plugins and custom commands,
+          and loads it from the store via <command>nvim -u /nix/store/hash-vimrc</command>
+
+          </para><para>
+
+          This option is deprecated. Please use the options <varname>extraConfig</varname>
+          and <varname>plugins</varname> which are mutually exclusive with this option.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''
+          set nocompatible
+          set nobackup
+        '';
+        description = ''
+          Custom vimrc lines.
+
+          </para><para>
+
+          This option is mutually exclusive with <varname>configure</varname>.
+        '';
+      };
+
+      plugins = mkOption {
+        type = with types; listOf package;
+        default = [ ];
+        example = literalExample "[ pkgs.vimPlugins.yankring ]";
+        description = ''
+          List of vim plugins to install.
+
+          </para><para>
+
+          This option is mutually exclusive with <varname>configure</varname>.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.configure == { } || moduleConfigure == { };
+        message = "The programs.neovim option configure is mutually exclusive"
+          + " with extraConfig and plugins.";
+      }
+    ];
+
+    warnings = optional (cfg.configure != {}) ''
+      The programs.neovim.configure option is deprecated. Please use
+      extraConfig and package option.
+    '';
+
+    home.packages = [ cfg.finalPackage ];
+
+    programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package {
+      inherit (cfg)
+        extraPython3Packages withPython3
+        extraPythonPackages withPython
+        withNodeJs withRuby viAlias vimAlias;
+
+      configure = cfg.configure // moduleConfigure;
+    };
+  };
+}
diff --git a/home-manager/modules/programs/newsboat.nix b/home-manager/modules/programs/newsboat.nix
new file mode 100644
index 00000000000..19fec642d21
--- /dev/null
+++ b/home-manager/modules/programs/newsboat.nix
@@ -0,0 +1,119 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.newsboat;
+  wrapQuote = x: "\"${x}\"";
+
+in
+
+{
+  options = {
+    programs.newsboat = {
+      enable = mkEnableOption "the Newsboat feed reader";
+
+      urls = mkOption {
+        type = types.listOf (types.submodule {
+          options = {
+            url = mkOption {
+              type = types.str;
+              example = "http://example.com";
+              description = "Feed URL.";
+            };
+
+            tags = mkOption {
+              type = types.listOf types.str;
+              default = [];
+              example = ["foo" "bar"];
+              description = "Feed tags.";
+            };
+
+            title = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              example = "ORF News";
+              description = "Feed title.";
+            };
+          };
+        });
+        default = [];
+        example = [{url = "http://example.com"; tags = ["foo" "bar"];}];
+        description = "List of news feeds.";
+      };
+
+      maxItems = mkOption {
+        type = types.int;
+        default = 0;
+        description = "Maximum number of items per feed, 0 for infinite.";
+      };
+
+      reloadThreads = mkOption {
+        type = types.int;
+        default = 5;
+        description = "How many threads to use for updating the feeds.";
+      };
+
+      autoReload = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable automatic reloading while newsboat is running.";
+      };
+
+      reloadTime = mkOption {
+        type = types.nullOr types.int;
+        default = 60;
+        description = "Time in minutes between reloads.";
+      };
+
+      browser = mkOption {
+        type = types.str;
+        default = "${pkgs.xdg_utils}/bin/xdg-open";
+        description = "External browser to use.";
+      };
+
+      queries = mkOption {
+        type = types.attrsOf types.str;
+        default = {};
+        example = {
+          "foo" = "rssurl =~ \"example.com\"";
+        };
+        description = "A list of queries to use.";
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Extra configuration values that will be appended to the end.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.newsboat ];
+    home.file.".newsboat/urls".text =
+      let
+        mkUrlEntry = u: concatStringsSep " " (
+          [u.url]
+          ++ map wrapQuote u.tags
+          ++ optional (u.title != null) (wrapQuote "~${u.title}")
+        );
+        urls = map mkUrlEntry cfg.urls;
+
+        mkQueryEntry = n: v: "\"query:${n}:${escape ["\""] v}\"";
+        queries = mapAttrsToList mkQueryEntry cfg.queries;
+      in
+        concatStringsSep "\n" (urls ++ queries) + "\n";
+
+    home.file.".newsboat/config".text = ''
+      max-items ${toString cfg.maxItems}
+      browser ${cfg.browser}
+      reload-threads ${toString cfg.reloadThreads}
+      auto-reload ${if cfg.autoReload then "yes" else "no"}
+      ${optionalString (cfg.reloadTime != null) (toString "reload-time ${toString cfg.reloadTime}")}
+      prepopulate-query-feeds yes
+
+      ${cfg.extraConfig}
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/noti.nix b/home-manager/modules/programs/noti.nix
new file mode 100644
index 00000000000..476c2eb1978
--- /dev/null
+++ b/home-manager/modules/programs/noti.nix
@@ -0,0 +1,53 @@
+{ config, lib, pkgs, ...}:
+
+with lib;
+
+let
+
+  cfg = config.programs.noti;
+
+in
+
+{
+  meta.maintainers = [ maintainers.marsam ];
+
+  options.programs.noti = {
+    enable = mkEnableOption "Noti";
+
+    settings = mkOption {
+      type = types.attrsOf (types.attrsOf types.str);
+      default = {};
+      description = ''
+        Configuration written to
+        <filename>~/.config/noti/noti.yaml</filename>.
+        </para><para>
+        See
+        <citerefentry>
+          <refentrytitle>noti.yaml</refentrytitle>
+          <manvolnum>5</manvolnum>
+        </citerefentry>.
+        for the full list of options.
+      '';
+      example = literalExample ''
+        {
+          say = {
+            voice = "Alex";
+          };
+          slack = {
+            token = "1234567890abcdefg";
+            channel = "@jaime";
+          };
+        }
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.noti ];
+
+    xdg.configFile."noti/noti.yaml" = mkIf (cfg.settings != {}) {
+      text = generators.toYAML {} cfg.settings;
+    };
+  };
+
+}
diff --git a/home-manager/modules/programs/notmuch-accounts.nix b/home-manager/modules/programs/notmuch-accounts.nix
new file mode 100644
index 00000000000..7c9c93d3f95
--- /dev/null
+++ b/home-manager/modules/programs/notmuch-accounts.nix
@@ -0,0 +1,7 @@
+{ lib, ... }:
+
+{
+  options.notmuch = {
+    enable = lib.mkEnableOption "notmuch indexing";
+  };
+}
diff --git a/home-manager/modules/programs/notmuch.nix b/home-manager/modules/programs/notmuch.nix
new file mode 100644
index 00000000000..cd0b1384ad9
--- /dev/null
+++ b/home-manager/modules/programs/notmuch.nix
@@ -0,0 +1,211 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.notmuch;
+
+  mkIniKeyValue = key: value:
+    let
+      tweakVal = v:
+        if isString v then v
+        else if isList v then concatMapStringsSep ";" tweakVal v
+        else if isBool v then (if v then "true" else "false")
+        else toString v;
+    in
+      "${key}=${tweakVal value}";
+
+  notmuchIni =
+    recursiveUpdate
+      {
+        database = {
+          path = config.accounts.email.maildirBasePath;
+        };
+
+        maildir = {
+          synchronize_flags = cfg.maildir.synchronizeFlags;
+        };
+
+        new = {
+          ignore = cfg.new.ignore;
+          tags = cfg.new.tags;
+        };
+
+        user =
+          let
+            accounts =
+              filter (a: a.notmuch.enable)
+              (attrValues config.accounts.email.accounts);
+            primary = filter (a: a.primary) accounts;
+            secondaries = filter (a: !a.primary) accounts;
+          in {
+            name = catAttrs "realName" primary;
+            primary_email = catAttrs "address" primary;
+            other_email = catAttrs "aliases" primary
+              ++ catAttrs "address" secondaries
+              ++ catAttrs "aliases" secondaries;
+          };
+
+        search = {
+          exclude_tags = cfg.search.excludeTags;
+        };
+      }
+      cfg.extraConfig;
+
+in
+
+{
+  options = {
+    programs.notmuch = {
+      enable = mkEnableOption "Notmuch mail indexer";
+
+      new = mkOption {
+        type = types.submodule {
+          options = {
+            ignore = mkOption {
+              type = types.listOf types.str;
+              default = [];
+              description = ''
+                A list to specify files and directories that will not be
+                searched for messages by <command>notmuch new</command>.
+              '';
+            };
+
+            tags = mkOption {
+              type = types.listOf types.str;
+              default = [ "unread" "inbox" ];
+              example = [ "new" ];
+              description = ''
+                A list of tags that will be added to all messages
+                incorporated by <command>notmuch new</command>.
+              '';
+            };
+          };
+        };
+        default = {};
+        description = ''
+          Options related to email processing performed by
+          <command>notmuch new</command>.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.attrsOf (types.attrsOf types.str);
+        default = {};
+        description = ''
+          Options that should be appended to the notmuch configuration file.
+        '';
+      };
+
+      hooks = {
+        preNew = mkOption {
+          type = types.lines;
+          default = "";
+          example = "mbsync --all";
+          description = ''
+            Bash statements run before scanning or importing new
+            messages into the database.
+          '';
+        };
+
+        postNew = mkOption {
+          type = types.lines;
+          default = "";
+          example = ''
+            notmuch tag +nixos -- tag:new and from:nixos1@discoursemail.com
+          '';
+          description = ''
+            Bash statements run after new messages have been imported
+            into the database and initial tags have been applied.
+          '';
+        };
+
+        postInsert = mkOption {
+          type = types.lines;
+          default = "";
+          description = ''
+            Bash statements run after a message has been inserted
+            into the database and initial tags have been applied.
+          '';
+        };
+      };
+
+      maildir = {
+        synchronizeFlags = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Whether to synchronize Maildir flags.
+          '';
+        };
+      };
+
+      search = {
+        excludeTags = mkOption {
+          type = types.listOf types.str;
+          default = [ "deleted" "spam" ];
+          example = [ "trash" "spam" ];
+          description = ''
+            A  list  of  tags  that  will be excluded from search results by
+            default. Using an excluded tag in a  query  will  override  that
+            exclusion.
+          '';
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = notmuchIni.user.name != [];
+        message = "notmuch: Must have a user name set.";
+      }
+      {
+        assertion = notmuchIni.user.primary_email != [];
+        message = "notmuch: Must have a user primary email address set.";
+      }
+    ];
+
+    home.packages = [ pkgs.notmuch ];
+
+    home.sessionVariables = {
+      NOTMUCH_CONFIG = "${config.xdg.configHome}/notmuch/notmuchrc";
+      NMBGIT = "${config.xdg.dataHome}/notmuch/nmbug";
+    };
+
+    xdg.configFile."notmuch/notmuchrc".text =
+      let
+        toIni = generators.toINI { mkKeyValue = mkIniKeyValue; };
+      in
+        "# Generated by Home Manager.\n\n"
+        + toIni notmuchIni;
+
+    home.file =
+      let
+        hook = name: cmds:
+          {
+            target = "${notmuchIni.database.path}/.notmuch/hooks/${name}";
+            source = pkgs.writeScript name ''
+              #!${pkgs.runtimeShell}
+
+              export PATH="${pkgs.notmuch}/bin''${PATH:+:}$PATH"
+              export NOTMUCH_CONFIG="${config.xdg.configHome}/notmuch/notmuchrc"
+              export NMBGIT="${config.xdg.dataHome}/notmuch/nmbug"
+
+              ${cmds}
+            '';
+            executable = true;
+          };
+      in
+        optional (cfg.hooks.preNew != "")
+          (hook "pre-new" cfg.hooks.preNew)
+        ++
+        optional (cfg.hooks.postNew != "")
+          (hook "post-new" cfg.hooks.postNew)
+        ++
+        optional (cfg.hooks.postInsert != "")
+          (hook "post-insert" cfg.hooks.postInsert);
+  };
+}
diff --git a/home-manager/modules/programs/obs-studio.nix b/home-manager/modules/programs/obs-studio.nix
new file mode 100644
index 00000000000..f0dfecb63cc
--- /dev/null
+++ b/home-manager/modules/programs/obs-studio.nix
@@ -0,0 +1,53 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.obs-studio;
+  package = pkgs.obs-studio;
+
+  mkPluginEnv = packages:
+    let
+      pluginDirs = map (pkg: "${pkg}/share/obs/obs-plugins") packages;
+      plugins = concatMapStringsSep " " (p: "${p}/*") pluginDirs;
+    in
+      pkgs.runCommand "obs-studio-plugins"
+        {
+          preferLocalBuild = true;
+          allowSubstitutes = false;
+        }
+        ''
+          mkdir $out
+          [[ '${plugins}' ]] || exit 0
+          for plugin in ${plugins}; do
+            ln -s "$plugin" $out/
+          done
+        '';
+
+in
+
+{
+  meta.maintainers = [ maintainers.adisbladis ];
+
+  options = {
+    programs.obs-studio = {
+      enable = mkEnableOption "obs-studio";
+
+      plugins = mkOption {
+        default = [];
+        example = literalExample "[ pkgs.obs-linuxbrowser ]";
+        description = "Optional OBS plugins.";
+        type = types.listOf types.package;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ package ];
+
+    xdg.configFile."obs-studio/plugins" = mkIf (cfg.plugins != []) {
+      source = mkPluginEnv cfg.plugins;
+    };
+  };
+}
diff --git a/home-manager/modules/programs/offlineimap-accounts.nix b/home-manager/modules/programs/offlineimap-accounts.nix
new file mode 100644
index 00000000000..015a5974ab3
--- /dev/null
+++ b/home-manager/modules/programs/offlineimap-accounts.nix
@@ -0,0 +1,57 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+
+  extraConfigType = with types; attrsOf (either (either str int) bool);
+
+in
+
+{
+  options.offlineimap = {
+    enable = mkEnableOption "OfflineIMAP";
+
+    extraConfig.account = mkOption {
+      type = extraConfigType;
+      default = {};
+      example = {
+        autorefresh = 20;
+      };
+      description = ''
+        Extra configuration options to add to the account section.
+      '';
+    };
+
+    extraConfig.local = mkOption {
+      type = extraConfigType;
+      default = {};
+      example = {
+        sync_deletes = true;
+      };
+      description = ''
+        Extra configuration options to add to the local account
+        section.
+      '';
+    };
+
+    extraConfig.remote = mkOption {
+      type = extraConfigType;
+      default = {};
+      example = {
+        maxconnections = 2;
+        expunge = false;
+      };
+      description = ''
+        Extra configuration options to add to the remote account
+        section.
+      '';
+    };
+
+    postSyncHookCommand = mkOption {
+      type = types.lines;
+      default = "";
+      description = "Command to run after fetching new mails.";
+    };
+  };
+}
diff --git a/home-manager/modules/programs/offlineimap.nix b/home-manager/modules/programs/offlineimap.nix
new file mode 100644
index 00000000000..82143b630ad
--- /dev/null
+++ b/home-manager/modules/programs/offlineimap.nix
@@ -0,0 +1,207 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.offlineimap;
+
+  accounts = filter (a: a.offlineimap.enable)
+    (attrValues config.accounts.email.accounts);
+
+  toIni = generators.toINI {
+    mkKeyValue = key: value:
+      let
+        value' =
+          if isBool value then (if value then "yes" else "no")
+          else toString value;
+      in
+        "${key} = ${value'}";
+  };
+
+  # Generates a script to fetch only a specific account.
+  #
+  # Note, these scripts are not actually created and installed at the
+  # moment. It will need some thinking on whether this is a good idea
+  # and whether other modules should have some similar functionality.
+  #
+  # Perhaps have a single tool `email` that wraps the command?
+  # Something like
+  #
+  #     $ email <account name> <program name> <program args>
+  genOfflineImapScript = account: with account;
+    pkgs.writeShellScriptBin "offlineimap-${name}" ''
+      exec ${pkgs.offlineimap}/bin/offlineimap -a${account.name} "$@"
+    '';
+
+  accountStr = account: with account;
+    let
+      postSyncHook = optionalAttrs (offlineimap.postSyncHookCommand != "") {
+        postsynchook =
+          pkgs.writeShellScriptBin
+            "postsynchook"
+            offlineimap.postSyncHookCommand
+          + "/bin/postsynchook";
+      };
+
+      localType =
+        if account.flavor == "gmail.com"
+        then "GmailMaildir"
+        else "Maildir";
+
+      remoteType =
+        if account.flavor == "gmail.com"
+        then "Gmail"
+        else "IMAP";
+
+      remoteHost = optionalAttrs (imap.host != null) {
+        remotehost = imap.host;
+      };
+
+      remotePort = optionalAttrs ((imap.port or null) != null) {
+        remoteport = imap.port;
+      };
+
+      ssl =
+        if imap.tls.enable
+        then
+          {
+            ssl = true;
+            sslcacertfile = imap.tls.certificatesFile;
+            starttls = imap.tls.useStartTls;
+          }
+        else
+          {
+            ssl = false;
+          };
+
+      remotePassEval =
+        let
+          arglist = concatMapStringsSep "," (x: "'${x}'") passwordCommand;
+        in
+          optionalAttrs (passwordCommand != null) {
+            remotepasseval = ''get_pass("${name}", [${arglist}])'';
+          };
+    in
+      toIni {
+        "Account ${name}" = {
+          localrepository = "${name}-local";
+          remoterepository = "${name}-remote";
+        }
+        // postSyncHook
+        // offlineimap.extraConfig.account;
+
+        "Repository ${name}-local" = {
+          type = localType;
+          localfolders = maildir.absPath;
+        }
+        // offlineimap.extraConfig.local;
+
+        "Repository ${name}-remote" = {
+          type = remoteType;
+          remoteuser = userName;
+        }
+        // remoteHost
+        // remotePort
+        // remotePassEval
+        // ssl
+        // offlineimap.extraConfig.remote;
+      };
+
+  extraConfigType = with types; attrsOf (either (either str int) bool);
+
+in
+
+{
+  options = {
+    programs.offlineimap = {
+      enable = mkEnableOption "OfflineIMAP";
+
+      pythonFile = mkOption {
+        type = types.lines;
+        default = ''
+          import subprocess
+
+          def get_pass(service, cmd):
+              return subprocess.check_output(cmd, )
+        '';
+        description = ''
+          Python code that can then be used in other parts of the
+          configuration.
+        '';
+      };
+
+      extraConfig.general = mkOption {
+        type = extraConfigType;
+        default = {};
+        example = {
+          maxage = 30;
+          ui = "blinkenlights";
+        };
+        description = ''
+          Extra configuration options added to the
+          <option>general</option> section.
+        '';
+      };
+
+      extraConfig.default = mkOption {
+        type = extraConfigType;
+        default = {};
+        example = {
+          gmailtrashfolder = "[Gmail]/Papierkorb";
+        };
+        description = ''
+          Extra configuration options added to the
+          <option>DEFAULT</option> section.
+        '';
+      };
+
+      extraConfig.mbnames = mkOption {
+        type = extraConfigType;
+        default = {};
+        example = literalExample ''
+          {
+            filename = "~/.config/mutt/mailboxes";
+            header = "'mailboxes '";
+            peritem = "'+%(accountname)s/%(foldername)s'";
+            sep = "' '";
+            footer = "'\\n'";
+          }
+        '';
+        description = ''
+          Extra configuration options added to the
+          <code>mbnames</code> section.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.offlineimap ];
+
+    xdg.configFile."offlineimap/get_settings.py".text = cfg.pythonFile;
+
+    xdg.configFile."offlineimap/config".text =
+      ''
+        # Generated by Home Manager.
+        # See https://github.com/OfflineIMAP/offlineimap/blob/master/offlineimap.conf
+        # for an exhaustive list of options.
+      ''
+      + toIni ({
+        general = {
+          accounts = concatMapStringsSep "," (a: a.name) accounts;
+          pythonfile = "${config.xdg.configHome}/offlineimap/get_settings.py";
+          metadata = "${config.xdg.dataHome}/offlineimap";
+        }
+        // cfg.extraConfig.general;
+      }
+      // optionalAttrs (cfg.extraConfig.mbnames != {}) {
+        mbnames = { enabled = true; } // cfg.extraConfig.mbnames;
+      }
+      // optionalAttrs (cfg.extraConfig.default != {}) {
+        DEFAULT = cfg.extraConfig.default;
+      })
+      + "\n"
+      + concatStringsSep "\n" (map accountStr accounts);
+  };
+}
diff --git a/home-manager/modules/programs/opam.nix b/home-manager/modules/programs/opam.nix
new file mode 100644
index 00000000000..4de2e82da55
--- /dev/null
+++ b/home-manager/modules/programs/opam.nix
@@ -0,0 +1,52 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.opam;
+
+in
+
+{
+  meta.maintainers = [ maintainers.marsam ];
+
+  options.programs.opam = {
+    enable = mkEnableOption "Opam";
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.opam;
+      defaultText = literalExample "pkgs.opam";
+      description = "Opam package to install.";
+    };
+
+    enableBashIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Bash integration.
+      '';
+    };
+
+    enableZshIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Zsh integration.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
+      eval "$(${cfg.package}/bin/opam env --shell=bash)"
+    '';
+
+    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+      eval "$(${cfg.package}/bin/opam env --shell=zsh)"
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/pidgin.nix b/home-manager/modules/programs/pidgin.nix
new file mode 100644
index 00000000000..8dcb2122172
--- /dev/null
+++ b/home-manager/modules/programs/pidgin.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.pidgin;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    programs.pidgin = {
+      enable = mkEnableOption "Pidgin messaging client";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.pidgin;
+        defaultText = literalExample "pkgs.pidgin";
+        description = "The Pidgin package to use.";
+      };
+
+      plugins = mkOption {
+        default = [];
+        example = literalExample "[ pkgs.pidgin-otr pkgs.pidgin-osd ]";
+        description = "Plugins that should be available to Pidgin.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ (cfg.package.override { inherit (cfg) plugins; }) ];
+  };
+}
diff --git a/home-manager/modules/programs/rofi.nix b/home-manager/modules/programs/rofi.nix
new file mode 100644
index 00000000000..e64e5d4782e
--- /dev/null
+++ b/home-manager/modules/programs/rofi.nix
@@ -0,0 +1,339 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+with builtins;
+
+let
+
+  cfg = config.programs.rofi;
+
+  colorOption = description: mkOption {
+    type = types.str;
+    description = description;
+  };
+
+  rowColorSubmodule = types.submodule {
+    options = {
+      background = colorOption "Background color";
+      foreground = colorOption "Foreground color";
+      backgroundAlt = colorOption "Alternative background color";
+      highlight = mkOption {
+        type = types.submodule {
+          options = {
+            background = colorOption "Highlight background color";
+            foreground = colorOption "Highlight foreground color";
+          };
+        };
+        description = "Color settings for highlighted row.";
+      };
+    };
+  };
+
+  windowColorSubmodule = types.submodule {
+    options = {
+      background = colorOption "Window background color";
+      border = colorOption "Window border color";
+      separator = colorOption "Separator color";
+    };
+  };
+
+  colorsSubmodule = types.submodule {
+    options = {
+      window = mkOption {
+        default = null;
+        type = windowColorSubmodule;
+        description = "Window color settings.";
+      };
+      rows = mkOption {
+        default = null;
+        type = types.submodule {
+          options = {
+            normal = mkOption {
+              default = null;
+              type = types.nullOr rowColorSubmodule;
+              description = "Normal row color settings.";
+            };
+            active = mkOption {
+              default = null;
+              type = types.nullOr rowColorSubmodule;
+              description = "Active row color settings.";
+            };
+            urgent = mkOption {
+              default = null;
+              type = types.nullOr rowColorSubmodule;
+              description = "Urgent row color settings.";
+            };
+          };
+        };
+        description = "Rows color settings.";
+      };
+    };
+  };
+
+  valueToString = value:
+    if isBool value
+      then (if value then "true" else "else")
+      else toString value;
+
+  windowColorsToString = window: concatStringsSep ", " (with window; [
+    background
+    border
+    separator
+  ]);
+
+  rowsColorsToString = rows: ''
+    ${optionalString
+        (rows.normal != null)
+        (setOption "color-normal" (rowColorsToString rows.normal))}
+    ${optionalString
+        (rows.active != null)
+        (setOption "color-active" (rowColorsToString rows.active))}
+    ${optionalString
+        (rows.urgent != null)
+        (setOption "color-urgent" (rowColorsToString rows.urgent))}
+  '';
+
+  rowColorsToString = row: concatStringsSep ", " (with row; [
+    background
+    foreground
+    backgroundAlt
+    highlight.background
+    highlight.foreground
+  ]);
+
+  setOption = name: value:
+    optionalString (value != null) "rofi.${name}: ${valueToString value}";
+
+  setColorScheme = colors: optionalString (colors != null) ''
+    ${optionalString
+        (colors.window != null)
+        setOption "color-window" (windowColorsToString colors.window)}
+    ${optionalString
+        (colors.rows != null)
+        (rowsColorsToString colors.rows)}
+  '';
+
+  locationsMap = {
+    center       = 0;
+    top-left     = 1;
+    top          = 2;
+    top-right    = 3;
+    right        = 4;
+    bottom-right = 5;
+    bottom       = 6;
+    bottom-left  = 7;
+    left         = 8;
+  };
+
+  themeName =
+    if (cfg.theme == null) then null
+    else if (lib.isString cfg.theme) then cfg.theme
+    else lib.removeSuffix ".rasi" (baseNameOf cfg.theme);
+
+  themePath = if (lib.isString cfg.theme) then null else cfg.theme;
+
+in
+
+{
+  options.programs.rofi = {
+    enable = mkEnableOption "Rofi: A window switcher, application launcher and dmenu replacement";
+
+    width = mkOption {
+      default = null;
+      type = types.nullOr types.int;
+      description = "Window width";
+      example = 100;
+    };
+
+    lines = mkOption {
+      default = null;
+      type = types.nullOr types.int;
+      description = "Number of lines";
+      example = 10;
+    };
+
+    borderWidth = mkOption {
+      default = null;
+      type = types.nullOr types.int;
+      description = "Border width";
+      example = 1;
+    };
+
+    rowHeight = mkOption {
+      default = null;
+      type = types.nullOr types.int;
+      description = "Row height (in chars)";
+      example = 1;
+    };
+
+    padding = mkOption {
+      default = null;
+      type = types.nullOr types.int;
+      description = "Padding";
+      example = 400;
+    };
+
+    font = mkOption {
+      default = null;
+      type = types.nullOr types.str;
+      example = "Droid Sans Mono 14";
+      description = "Font to use.";
+    };
+
+    scrollbar = mkOption {
+      default = null;
+      type = types.nullOr types.bool;
+      description = "Whether to show a scrollbar.";
+    };
+
+    terminal = mkOption {
+      default = null;
+      type = types.nullOr types.str;
+      description = ''
+        Path to the terminal which will be used to run console applications
+      '';
+      example = "\${pkgs.gnome3.gnome_terminal}/bin/gnome-terminal";
+    };
+
+    separator = mkOption {
+      default = null;
+      type = types.nullOr (types.enum [ "none" "dash" "solid" ]);
+      description = "Separator style";
+      example = "solid";
+    };
+
+    cycle = mkOption {
+      default = null;
+      type = types.nullOr types.bool;
+      description = "Whether to cycle through the results list.";
+    };
+
+    fullscreen = mkOption {
+      default = null;
+      type = types.nullOr types.bool;
+      description = "Whether to run rofi fullscreen.";
+    };
+
+    location = mkOption {
+      default = "center";
+      type = types.enum (builtins.attrNames locationsMap);
+      description = "The location rofi appears on the screen.";
+    };
+
+    xoffset = mkOption {
+      default = 0;
+      type = types.int;
+      description = ''
+        Offset in the x-axis in pixels relative to the chosen location.
+      '';
+    };
+
+    yoffset = mkOption {
+      default = 0;
+      type = types.int;
+      description = ''
+        Offset in the y-axis in pixels relative to the chosen location.
+      '';
+    };
+
+    colors = mkOption {
+      default = null;
+      type = types.nullOr colorsSubmodule;
+      description = ''
+        Color scheme settings. Colors can be specified in CSS color
+        formats. This option may become deprecated in the future and
+        therefore the <varname>programs.rofi.theme</varname> option
+        should be used whenever possible.
+      '';
+      example = literalExample ''
+        colors = {
+          window = {
+            background = "argb:583a4c54";
+            border = "argb:582a373e";
+            separator = "#c3c6c8";
+          };
+
+          rows = {
+            normal = {
+              background = "argb:58455a64";
+              foreground = "#fafbfc";
+              backgroundAlt = "argb:58455a64";
+              highlight = {
+                background = "#00bcd4";
+                foreground = "#fafbfc";
+              };
+            };
+          };
+        };
+      '';
+    };
+
+    theme = mkOption {
+      default = null;
+      type = with types; nullOr (either str path);
+      example = "Arc";
+      description = ''
+        Name of theme or path to theme file in rasi format. Available
+        named themes can be viewed using the
+        <command>rofi-theme-selector</command> tool.
+      '';
+    };
+
+    configPath = mkOption {
+      default = "${config.xdg.configHome}/rofi/config";
+      defaultText = "$XDG_CONFIG_HOME/rofi/config";
+      type = types.str;
+      description = "Path where to put generated configuration file.";
+    };
+
+    extraConfig = mkOption {
+      default = "";
+      type = types.lines;
+      description = "Additional configuration to add.";
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.theme == null || cfg.colors == null;
+        message = ''
+          Cannot use the rofi options 'theme' and 'colors' simultaneously.
+        '';
+      }
+    ];
+
+    home.packages = [ pkgs.rofi ];
+
+    home.file."${cfg.configPath}".text = ''
+      ${setOption "width" cfg.width}
+      ${setOption "lines" cfg.lines}
+      ${setOption "font" cfg.font}
+      ${setOption "bw" cfg.borderWidth}
+      ${setOption "eh" cfg.rowHeight}
+      ${setOption "padding" cfg.padding}
+      ${setOption "separator-style" cfg.separator}
+      ${setOption "hide-scrollbar" (
+        if (cfg.scrollbar != null)
+        then (! cfg.scrollbar)
+        else cfg.scrollbar
+      )}
+      ${setOption "terminal" cfg.terminal}
+      ${setOption "cycle" cfg.cycle}
+      ${setOption "fullscreen" cfg.fullscreen}
+      ${setOption "location" (builtins.getAttr cfg.location locationsMap)}
+      ${setOption "xoffset" cfg.xoffset}
+      ${setOption "yoffset" cfg.yoffset}
+
+      ${setColorScheme cfg.colors}
+      ${setOption "theme" themeName}
+
+      ${cfg.extraConfig}
+    '';
+
+    xdg.dataFile = mkIf (themePath != null) {
+      "rofi/themes/${themeName}.rasi".source =  themePath;
+    };
+  };
+}
diff --git a/home-manager/modules/programs/rtorrent.nix b/home-manager/modules/programs/rtorrent.nix
new file mode 100644
index 00000000000..6300969a519
--- /dev/null
+++ b/home-manager/modules/programs/rtorrent.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.rtorrent;
+
+in
+
+{
+  meta.maintainers = [ maintainers.marsam ];
+
+  options.programs.rtorrent = {
+    enable = mkEnableOption "rTorrent";
+
+    settings = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Configuration written to
+        <filename>~/.config/rtorrent/rtorrent.rc</filename>. See
+        <link xlink:href="https://github.com/rakshasa/rtorrent/wiki/Config-Guide" />
+        for explanation about possible values.
+      '';
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.rtorrent ];
+
+    xdg.configFile."rtorrent/rtorrent.rc" = mkIf (cfg.settings != "") {
+      text = cfg.settings;
+    };
+  };
+}
diff --git a/home-manager/modules/programs/skim.nix b/home-manager/modules/programs/skim.nix
new file mode 100644
index 00000000000..de1bff30fce
--- /dev/null
+++ b/home-manager/modules/programs/skim.nix
@@ -0,0 +1,128 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.skim;
+
+in
+
+{
+  options.programs.skim = {
+    enable = mkEnableOption "skim - a command-line fuzzy finder";
+
+    defaultCommand = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "fd --type f";
+      description = ''
+        The command that gets executed as the default source for skim
+        when running.
+      '';
+    };
+
+    defaultOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "--height 40%" "--prompt ⟫" ];
+      description = ''
+        Extra command line options given to skim by default.
+      '';
+    };
+
+    fileWidgetCommand = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "fd --type f";
+      description = ''
+        The command that gets executed as the source for skim for the
+        CTRL-T keybinding.
+      '';
+    };
+
+    fileWidgetOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "--preview 'head {}'" ];
+      description = ''
+        Command line options for the CTRL-T keybinding.
+      '';
+    };
+
+    changeDirWidgetCommand = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "fd --type d" ;
+      description = ''
+        The command that gets executed as the source for skim for the
+        ALT-C keybinding.
+      '';
+    };
+
+    changeDirWidgetOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "--preview 'tree -C {} | head -200'" ];
+      description = ''
+        Command line options for the ALT-C keybinding.
+      '';
+    };
+
+    historyWidgetOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "--tac" "--exact" ];
+      description = ''
+        Command line options for the CTRL-R keybinding.
+      '';
+    };
+
+    enableBashIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Bash integration.
+      '';
+    };
+
+    enableZshIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Zsh integration.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.skim ];
+
+    home.sessionVariables =
+      mapAttrs (n: v: toString v) (
+        filterAttrs (n: v: v != [] && v != null) {
+          SKIM_ALT_C_COMMAND = cfg.changeDirWidgetCommand;
+          SKIM_ALT_C_OPTS = cfg.changeDirWidgetOptions;
+          SKIM_CTRL_R_OPTS = cfg.historyWidgetOptions;
+          SKIM_CTRL_T_COMMAND = cfg.fileWidgetCommand;
+          SKIM_CTRL_T_OPTS = cfg.fileWidgetOptions;
+          SKIM_DEFAULT_COMMAND = cfg.defaultCommand;
+          SKIM_DEFAULT_OPTIONS = cfg.defaultOptions;
+        }
+      );
+
+    programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
+      if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
+        . ${pkgs.skim}/share/skim/completion.bash
+        . ${pkgs.skim}/share/skim/key-bindings.bash
+      fi
+    '';
+
+    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+      if [[ $options[zle] = on ]]; then
+        . ${pkgs.skim}/share/skim/completion.zsh
+        . ${pkgs.skim}/share/skim/key-bindings.zsh
+      fi
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/ssh.nix b/home-manager/modules/programs/ssh.nix
new file mode 100644
index 00000000000..ab61c0dcbc4
--- /dev/null
+++ b/home-manager/modules/programs/ssh.nix
@@ -0,0 +1,457 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.ssh;
+
+  isPath = x: builtins.substring 0 1 (toString x) == "/";
+
+  addressPort = entry:
+    if isPath entry.address
+    then " ${entry.address}"
+    else " [${entry.address}]:${toString entry.port}";
+
+  yn = flag: if flag then "yes" else "no";
+
+  unwords = builtins.concatStringsSep " ";
+
+  bindOptions = {
+    address = mkOption {
+      type = types.str;
+      default = "localhost";
+      example = "example.org";
+      description = "The address where to bind the port.";
+    };
+
+    port = mkOption {
+      type = types.port;
+      example = 8080;
+      description = "Specifies port number to bind on bind address.";
+    };
+  };
+
+  dynamicForwardModule = types.submodule {
+    options = bindOptions;
+  };
+
+  forwardModule = types.submodule {
+    options = {
+      bind = bindOptions;
+
+      host = {
+        address = mkOption {
+          type = types.str;
+          example = "example.org";
+          description = "The address where to forward the traffic to.";
+        };
+
+        port = mkOption {
+          type = types.port;
+          example = 80;
+          description = "Specifies port number to forward the traffic to.";
+        };
+      };
+    };
+  };
+
+  matchBlockModule = types.submodule ({ name, ... }: {
+    options = {
+      host = mkOption {
+        type = types.str;
+        example = "*.example.org";
+        description = ''
+          The host pattern used by this conditional block.
+        '';
+      };
+
+      port = mkOption {
+        type = types.nullOr types.port;
+        default = null;
+        description = "Specifies port number to connect on remote host.";
+      };
+
+      forwardAgent = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = ''
+          Whether the connection to the authentication agent (if any)
+          will be forwarded to the remote machine.
+        '';
+      };
+
+      forwardX11 = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Specifies whether X11 connections will be automatically redirected
+          over the secure channel and <envar>DISPLAY</envar> set.
+        '';
+      };
+
+      forwardX11Trusted = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Specifies whether remote X11 clients will have full access to the
+          original X11 display.
+        '';
+      };
+
+      identitiesOnly = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Specifies that ssh should only use the authentication
+          identity explicitly configured in the
+          <filename>~/.ssh/config</filename> files or passed on the
+          ssh command-line, even if <command>ssh-agent</command>
+          offers more identities.
+        '';
+      };
+
+      identityFile = mkOption {
+        type = with types; either (listOf str) (nullOr str);
+        default = [];
+        apply = p:
+          if p == null then []
+          else if isString p then [p]
+          else p;
+        description = ''
+          Specifies files from which the user identity is read.
+          Identities will be tried in the given order.
+        '';
+      };
+
+      user = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "Specifies the user to log in as.";
+      };
+
+      hostname = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "Specifies the real host name to log into.";
+      };
+
+      serverAliveInterval = mkOption {
+        type = types.int;
+        default = 0;
+        description =
+          "Set timeout in seconds after which response will be requested.";
+      };
+
+      sendEnv = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Environment variables to send from the local host to the
+          server.
+        '';
+      };
+
+      compression = mkOption {
+        type = types.nullOr types.bool;
+        default = null;
+        description = ''
+          Specifies whether to use compression. Omitted from the host
+          block when <literal>null</literal>.
+        '';
+      };
+
+      checkHostIP = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Check the host IP address in the
+          <filename>known_hosts</filename> file.
+        '';
+      };
+
+      proxyCommand = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "The command to use to connect to the server.";
+      };
+
+      proxyJump = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "The proxy host to use to connect to the server.";
+      };
+
+      certificateFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = ''
+          Specifies a file from which the user certificate is read.
+        '';
+      };
+
+      addressFamily = mkOption {
+        default = null;
+        type = types.nullOr (types.enum ["any" "inet" "inet6"]);
+        description = ''
+          Specifies which address family to use when connecting.
+        '';
+      };
+
+      localForwards = mkOption {
+        type = types.listOf forwardModule;
+        default = [];
+        example = literalExample ''
+          [
+            {
+              bind.port = 8080;
+              host.address = "10.0.0.13";
+              host.port = 80;
+            }
+          ];
+        '';
+        description = ''
+          Specify local port forwardings. See
+          <citerefentry>
+            <refentrytitle>ssh_config</refentrytitle>
+            <manvolnum>5</manvolnum>
+          </citerefentry> for <literal>LocalForward</literal>.
+        '';
+      };
+
+      remoteForwards = mkOption {
+        type = types.listOf forwardModule;
+        default = [];
+        example = literalExample ''
+          [
+            {
+              bind.port = 8080;
+              host.address = "10.0.0.13";
+              host.port = 80;
+            }
+          ];
+        '';
+        description = ''
+          Specify remote port forwardings. See
+          <citerefentry>
+            <refentrytitle>ssh_config</refentrytitle>
+            <manvolnum>5</manvolnum>
+          </citerefentry> for <literal>RemoteForward</literal>.
+        '';
+      };
+
+      dynamicForwards = mkOption {
+        type = types.listOf dynamicForwardModule;
+        default = [];
+        example = literalExample ''
+          [ { port = 8080; } ];
+        '';
+        description = ''
+          Specify dynamic port forwardings. See
+          <citerefentry>
+            <refentrytitle>ssh_config</refentrytitle>
+            <manvolnum>5</manvolnum>
+          </citerefentry> for <literal>DynamicForward</literal>.
+        '';
+      };
+
+      extraOptions = mkOption {
+        type = types.attrsOf types.str;
+        default = {};
+        description = "Extra configuration options for the host.";
+      };
+    };
+
+    config.host = mkDefault name;
+  });
+
+  matchBlockStr = cf: concatStringsSep "\n" (
+    ["Host ${cf.host}"]
+    ++ optional (cf.port != null)            "  Port ${toString cf.port}"
+    ++ optional (cf.forwardAgent != null)    "  ForwardAgent ${yn cf.forwardAgent}"
+    ++ optional cf.forwardX11                "  ForwardX11 yes"
+    ++ optional cf.forwardX11Trusted         "  ForwardX11Trusted yes"
+    ++ optional cf.identitiesOnly            "  IdentitiesOnly yes"
+    ++ optional (cf.user != null)            "  User ${cf.user}"
+    ++ optional (cf.certificateFile != null) "  CertificateFile ${cf.certificateFile}"
+    ++ optional (cf.hostname != null)        "  HostName ${cf.hostname}"
+    ++ optional (cf.addressFamily != null)   "  AddressFamily ${cf.addressFamily}"
+    ++ optional (cf.sendEnv != [])           "  SendEnv ${unwords cf.sendEnv}"
+    ++ optional (cf.serverAliveInterval != 0)
+         "  ServerAliveInterval ${toString cf.serverAliveInterval}"
+    ++ optional (cf.compression != null)     "  Compression ${yn cf.compression}"
+    ++ optional (!cf.checkHostIP)            "  CheckHostIP no"
+    ++ optional (cf.proxyCommand != null)    "  ProxyCommand ${cf.proxyCommand}"
+    ++ optional (cf.proxyJump != null)       "  ProxyJump ${cf.proxyJump}"
+    ++ map (file: "  IdentityFile ${file}") cf.identityFile
+    ++ map (f: "  LocalForward" + addressPort f.bind + addressPort f.host) cf.localForwards
+    ++ map (f: "  RemoteForward" + addressPort f.bind + addressPort f.host) cf.remoteForwards
+    ++ map (f: "  DynamicForward" + addressPort f) cf.dynamicForwards
+    ++ mapAttrsToList (n: v: "  ${n} ${v}") cf.extraOptions
+  );
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options.programs.ssh = {
+    enable = mkEnableOption "SSH client configuration";
+
+    forwardAgent = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether the connection to the authentication agent (if any)
+        will be forwarded to the remote machine.
+      '';
+    };
+
+    compression = mkOption {
+      default = false;
+      type = types.bool;
+      description = "Specifies whether to use compression.";
+    };
+
+    serverAliveInterval = mkOption {
+      type = types.int;
+      default = 0;
+      description = ''
+        Set default timeout in seconds after which response will be requested.
+      '';
+    };
+
+    hashKnownHosts = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Indicates that
+        <citerefentry>
+          <refentrytitle>ssh</refentrytitle>
+          <manvolnum>1</manvolnum>
+        </citerefentry>
+        should hash host names and addresses when they are added to
+        the known hosts file.
+      '';
+    };
+
+    userKnownHostsFile = mkOption {
+      type = types.str;
+      default = "~/.ssh/known_hosts";
+      description = ''
+        Specifies one or more files to use for the user host key
+        database, separated by whitespace. The default is
+        <filename>~/.ssh/known_hosts</filename>.
+      '';
+    };
+
+    controlMaster = mkOption {
+      default = "no";
+      type = types.enum ["yes" "no" "ask" "auto" "autoask"];
+      description = ''
+        Configure sharing of multiple sessions over a single network connection.
+      '';
+    };
+
+    controlPath = mkOption {
+      type = types.str;
+      default = "~/.ssh/master-%r@%n:%p";
+      description = ''
+        Specify path to the control socket used for connection sharing.
+      '';
+    };
+
+    controlPersist = mkOption {
+      type = types.str;
+      default = "no";
+      example = "10m";
+      description = ''
+        Whether control socket should remain open in the background.
+      '';
+    };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Extra configuration.
+      '';
+    };
+
+    extraOptionOverrides = mkOption {
+      type = types.attrsOf types.str;
+      default = {};
+      description = ''
+        Extra SSH configuration options that take precedence over any
+        host specific configuration.
+      '';
+    };
+
+    matchBlocks = mkOption {
+      type = types.loaOf matchBlockModule;
+      default = {};
+      example = literalExample ''
+        {
+          "john.example.com" = {
+            hostname = "example.com";
+            user = "john";
+          };
+          foo = {
+            hostname = "example.com";
+            identityFile = "/home/john/.ssh/foo_rsa";
+          };
+        };
+      '';
+      description = ''
+        Specify per-host settings. Note, if the order of rules matter
+        then this must be a list. See
+        <citerefentry>
+          <refentrytitle>ssh_config</refentrytitle>
+          <manvolnum>5</manvolnum>
+        </citerefentry>.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion =
+          let
+            # `builtins.any`/`lib.lists.any` does not return `true` if there are no elements.
+            any' = pred: items: if items == [] then true else any pred items;
+            # Check that if `entry.address` is defined, and is a path, that `entry.port` has not
+            # been defined.
+            noPathWithPort =  entry: entry ? address && isPath entry.address -> !(entry ? port);
+            checkDynamic = block: any' noPathWithPort block.dynamicForwards;
+            checkBindAndHost = fwd: noPathWithPort fwd.bind && noPathWithPort fwd.host;
+            checkLocal = block: any' checkBindAndHost block.localForwards;
+            checkRemote = block: any' checkBindAndHost block.remoteForwards;
+            checkMatchBlock = block: all (fn: fn block) [ checkLocal checkRemote checkDynamic ];
+          in any' checkMatchBlock (builtins.attrValues cfg.matchBlocks);
+        message = "Forwarded paths cannot have ports.";
+      }
+    ];
+
+    home.file.".ssh/config".text = ''
+      ${concatStringsSep "\n" (
+        mapAttrsToList (n: v: "${n} ${v}") cfg.extraOptionOverrides)}
+
+      ${concatStringsSep "\n\n" (
+        map matchBlockStr (
+        builtins.attrValues cfg.matchBlocks))}
+
+      Host *
+        ForwardAgent ${yn cfg.forwardAgent}
+        Compression ${yn cfg.compression}
+        ServerAliveInterval ${toString cfg.serverAliveInterval}
+        HashKnownHosts ${yn cfg.hashKnownHosts}
+        UserKnownHostsFile ${cfg.userKnownHostsFile}
+        ControlMaster ${cfg.controlMaster}
+        ControlPath ${cfg.controlPath}
+        ControlPersist ${cfg.controlPersist}
+
+        ${replaceStrings ["\n"] ["\n  "] cfg.extraConfig}
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/starship.nix b/home-manager/modules/programs/starship.nix
new file mode 100644
index 00000000000..81793c7a6f6
--- /dev/null
+++ b/home-manager/modules/programs/starship.nix
@@ -0,0 +1,91 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.starship;
+
+  configFile = config:
+    pkgs.runCommand "config.toml"
+      {
+        buildInputs = [ pkgs.remarshal ];
+        preferLocalBuild = true;
+        allowSubstitutes = false;
+      }
+      ''
+        remarshal -if json -of toml \
+          < ${pkgs.writeText "config.json" (builtins.toJSON config)} \
+          > $out
+      '';
+in
+
+{
+  meta.maintainers = [ maintainers.marsam ];
+
+  options.programs.starship = {
+    enable = mkEnableOption "starship";
+
+    settings = mkOption {
+      type = types.attrs;
+      default = {};
+      description = ''
+        Configuration written to
+        <filename>~/.config/starship.toml</filename>.
+        </para><para>
+        See <link xlink:href="https://starship.rs/config/" /> for the full list
+        of options.
+      '';
+    };
+
+    enableBashIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Bash integration.
+      '';
+    };
+
+    enableZshIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Zsh integration.
+      '';
+    };
+
+    enableFishIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Fish integration.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.starship ];
+
+    xdg.configFile."starship.toml" = mkIf (cfg.settings != {}) {
+      source = configFile cfg.settings;
+    };
+
+    programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
+      if [[ -z $INSIDE_EMACS ]]; then
+        eval "$(${pkgs.starship}/bin/starship init bash)"
+      fi
+    '';
+
+    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+      if [ -z "$INSIDE_EMACS" ]; then
+        eval "$(${pkgs.starship}/bin/starship init zsh)"
+      fi
+    '';
+
+    programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
+      if test -z "$INSIDE_EMACS"
+        eval (${pkgs.starship}/bin/starship init fish)
+      end
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/taskwarrior.nix b/home-manager/modules/programs/taskwarrior.nix
new file mode 100644
index 00000000000..eeacc77da29
--- /dev/null
+++ b/home-manager/modules/programs/taskwarrior.nix
@@ -0,0 +1,112 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.taskwarrior;
+
+  themePath = theme: "${pkgs.taskwarrior}/share/doc/task/rc/${theme}.theme";
+
+  includeTheme = location:
+    if location == null then ""
+    else if isString location then "include ${themePath location}"
+    else "include ${location}";
+
+  formatValue = value:
+    if isBool value then if value then "true" else "false"
+    else if isList value then concatMapStringsSep "," formatValue value
+    else toString value;
+
+  formatLine = key: value:
+    "${key}=${formatValue value}";
+
+  formatSet = key: values:
+    (concatStringsSep "\n"
+      (mapAttrsToList
+        (subKey: subValue: formatPair "${key}.${subKey}" subValue)
+        values));
+
+  formatPair = key: value:
+    if isAttrs value then formatSet key value
+    else formatLine key value;
+
+in
+
+{
+  options = {
+    programs.taskwarrior = {
+      enable = mkEnableOption "Task Warrior";
+
+      config = mkOption {
+        type = types.attrs;
+        default = {};
+        example = literalExample ''
+          {
+            confirmation = false;
+            report.minimal.filter = "status:pending";
+            report.active.columns = [ "id" "start" "entry.age" "priority" "project" "due" "description" ];
+            report.active.labels  = [ "ID" "Started" "Age" "Priority" "Project" "Due" "Description" ];
+            taskd = {
+              certificate = "/path/to/cert";
+              key = "/path/to/key";
+              ca = "/path/to/ca";
+              server = "host.domain:53589";
+              credentials = "Org/First Last/cf31f287-ee9e-43a8-843e-e8bbd5de4294";
+            };
+          }
+        '';
+        description = ''
+          Key-value configuration written to
+          <filename>~/.taskrc</filename>.
+        '';
+      };
+
+      dataLocation = mkOption {
+        type = types.str;
+        default = "${config.xdg.dataHome}/task";
+        defaultText = "$XDG_DATA_HOME/task";
+        description = ''
+          Location where Task Warrior will store its data.
+          </para><para>
+          Home Manager will attempt to create this directory.
+        '';
+      };
+
+      colorTheme = mkOption {
+        type = with types; nullOr (either str path);
+        default = null;
+        example = "dark-blue-256";
+        description = ''
+          Either one of the default provided theme as string, or a
+          path to a theme configuration file.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Additional content written at the end of
+          <filename>~/.taskrc</filename>.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.taskwarrior ];
+
+    home.file."${cfg.dataLocation}/.keep".text = "";
+
+    home.file.".taskrc".text = ''
+      data.location=${cfg.dataLocation}
+      ${includeTheme cfg.colorTheme}
+
+      ${concatStringsSep "\n" (
+        mapAttrsToList formatPair cfg.config)}
+
+      ${cfg.extraConfig}
+    '';
+  };
+}
diff --git a/home-manager/modules/programs/termite.nix b/home-manager/modules/programs/termite.nix
new file mode 100644
index 00000000000..a5b1cebe775
--- /dev/null
+++ b/home-manager/modules/programs/termite.nix
@@ -0,0 +1,378 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.termite;
+
+  vteInitStr = ''
+    # See https://github.com/thestinger/termite#id1
+    if [[ $TERM == xterm-termite ]]; then
+      . ${pkgs.termite.vte-ng}/etc/profile.d/vte.sh
+    fi
+  '';
+
+in
+
+{
+  options = {
+    programs.termite = {
+      enable = mkEnableOption "Termite VTE-based terminal";
+
+      allowBold = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = ''
+          Allow the output of bold characters when the bold escape sequence appears.
+        '';
+      };
+
+      audibleBell = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = "Have the terminal beep on the terminal bell.";
+      };
+
+      clickableUrl = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = ''
+          Auto-detected URLs can be clicked on to open them in  your browser.
+          Only enabled if a browser is configured or detected.
+        '';
+      };
+
+      dynamicTitle = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = ''
+          Settings dynamic title allows the terminal and the shell to
+          update the terminal's title.
+        '';
+      };
+
+      fullscreen = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = "Enables entering fullscreen mode by pressing F11.";
+      };
+
+      mouseAutohide = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = "Automatically hide the mouse pointer when you start typing.";
+      };
+
+      scrollOnOutput = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = "Scroll to the bottom when the shell generates output.";
+      };
+
+      scrollOnKeystroke = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = "Scroll to the bottom automatically when a key is pressed.";
+      };
+
+      searchWrap = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = "Search from top again when you hit the bottom.";
+      };
+
+      urgentOnBell = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = "Sets the window as urgent on the terminal bell.";
+      };
+
+      font = mkOption {
+        default = null;
+        example = "Monospace 12";
+        type = types.nullOr types.str;
+        description = "The font description for the terminal's font.";
+      };
+
+      geometry = mkOption {
+        default = null;
+        example = "640x480";
+        type = types.nullOr types.str;
+        description = "The default window geometry for new terminal windows.";
+      };
+
+      iconName = mkOption {
+        default = null;
+        example = "terminal";
+        type = types.nullOr types.str;
+        description = "The name of the icon to be used for the terminal process.";
+      };
+
+      scrollbackLines = mkOption {
+        default = null;
+        example = 10000;
+        type = types.nullOr types.int;
+        description = "Set the number of lines to limit the terminal's scrollback.";
+      };
+
+      browser = mkOption {
+        default = null;
+        type = types.nullOr types.str;
+        example = "${pkgs.xdg_utils}/xdg-open";
+        description = ''
+          Set the default browser for opening links. If its not set, $BROWSER is read.
+          If that's not set, url hints will be disabled.
+        '';
+      };
+
+      cursorBlink = mkOption {
+        default = null;
+        example = "system";
+        type = types.nullOr (types.enum [ "system" "on" "off" ]);
+        description = ''
+          Specify the how the terminal's cursor should behave.
+          Accepts system to respect the gtk global configuration,
+          on and off to explicitly enable or disable them.
+        '';
+      };
+
+      cursorShape = mkOption {
+        default = null;
+        example = "block";
+        type = types.nullOr (types.enum [ "block" "underline" "ibeam" ]);
+        description = ''
+          Specify how the cursor should look. Accepts block, ibeam and underline.
+        '';
+      };
+
+      filterUnmatchedUrls = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = "Whether to hide url hints not matching input in url hints mode.";
+      };
+
+      modifyOtherKeys = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = ''
+          Emit escape sequences for extra keys,
+          like the modifyOtherKeys resource for
+          <citerefentry>
+            <refentrytitle>xterm</refentrytitle>
+            <manvolnum>1</manvolnum>
+          </citerefentry>.
+        '';
+      };
+
+      sizeHints = mkOption {
+        default = null;
+        type = types.nullOr types.bool;
+        description = ''
+          Enable size hints. Locks the terminal resizing
+          to increments of the terminal's cell size.
+          Requires a window manager that respects scroll hints.
+        '';
+      };
+
+      scrollbar = mkOption {
+        default = null;
+        type = types.nullOr (types.enum [ "off" "left" "right" ]);
+        description = "Scroll to the bottom when the shell generates output.";
+      };
+
+      backgroundColor = mkOption {
+        default = null;
+        example = "rgba(63, 63, 63, 0.8)";
+        type = types.nullOr types.str;
+        description = "Background color value.";
+      };
+
+      cursorColor = mkOption {
+        default = null;
+        example = "#dcdccc";
+        type = types.nullOr types.str;
+        description = "Cursor color value.";
+      };
+
+      cursorForegroundColor = mkOption {
+        default = null;
+        example = "#dcdccc";
+        type = types.nullOr types.str;
+        description = "Cursor foreground color value.";
+      };
+
+      foregroundColor = mkOption {
+        default = null;
+        example = "#dcdccc";
+        type = types.nullOr types.str;
+        description = "Foreground color value.";
+      };
+
+      foregroundBoldColor = mkOption {
+        default = null;
+        example = "#ffffff";
+        type = types.nullOr types.str;
+        description = "Foreground bold color value.";
+      };
+
+      highlightColor = mkOption {
+        default = null;
+        example = "#2f2f2f";
+        type = types.nullOr types.str;
+        description = "highlight color value.";
+      };
+
+      hintsActiveBackgroundColor = mkOption {
+        default = null;
+        example = "#3f3f3f";
+        type = types.nullOr types.str;
+        description = "Hints active background color value.";
+      };
+
+      hintsActiveForegroundColor = mkOption {
+        default = null;
+        example = "#e68080";
+        type = types.nullOr types.str;
+        description = "Hints active foreground color value.";
+      };
+
+      hintsBackgroundColor = mkOption {
+        default = null;
+        example = "#3f3f3f";
+        type = types.nullOr types.str;
+        description = "Hints background color value.";
+      };
+
+      hintsForegroundColor = mkOption {
+        default = null;
+        example = "#dcdccc";
+        type = types.nullOr types.str;
+        description = "Hints foreground color value.";
+      };
+
+      hintsBorderColor = mkOption {
+        default = null;
+        example = "#3f3f3f";
+        type = types.nullOr types.str;
+        description = "Hints border color value.";
+      };
+
+      hintsBorderWidth = mkOption {
+        default = null;
+        example = "0.5";
+        type = types.nullOr types.str;
+        description = "Hints border width.";
+      };
+
+      hintsFont = mkOption {
+        default = null;
+        example = "Monospace 12";
+        type = types.nullOr types.str;
+        description = "The font description for the hints font.";
+      };
+
+      hintsPadding = mkOption {
+        default = null;
+        example = 2;
+        type = types.nullOr types.int;
+        description = "Hints padding.";
+      };
+
+      hintsRoundness = mkOption {
+        default = null;
+        example = "0.2";
+        type = types.nullOr types.str;
+        description = "Hints roundness.";
+      };
+
+      optionsExtra = mkOption {
+        default = "";
+        example = "fullscreen = true";
+        type = types.lines;
+        description = "Extra options that should be added to [options] section.";
+      };
+
+      colorsExtra = mkOption {
+        default = "";
+        example = ''
+          color0 = #3f3f3f
+          color1 = #705050
+          color2 = #60b48a
+        '';
+        type = types.lines;
+        description = "Extra colors options that should be added to [colors] section.";
+      };
+
+      hintsExtra = mkOption {
+        default = "";
+        example = "border = #3f3f3f";
+        type = types.lines;
+        description = "Extra hints options that should be added to [hints] section.";
+      };
+    };
+  };
+
+  config = (
+    let
+      boolToString = v: if v then "true" else "false";
+      optionalBoolean = name: val: lib.optionalString (val != null) "${name} = ${boolToString val}";
+      optionalInteger = name: val: lib.optionalString (val != null) "${name} = ${toString val}";
+      optionalString = name: val: lib.optionalString (val != null) "${name} = ${val}";
+    in mkIf cfg.enable {
+      home.packages = [ pkgs.termite ];
+      xdg.configFile."termite/config".text = ''
+        [options]
+        ${optionalBoolean "allow_bold" cfg.allowBold}
+        ${optionalBoolean "audible_bell" cfg.audibleBell}
+        ${optionalString "browser" cfg.browser}
+        ${optionalBoolean "clickable_url" cfg.clickableUrl}
+        ${optionalString "cursor_blink" cfg.cursorBlink}
+        ${optionalString "cursor_shape" cfg.cursorShape}
+        ${optionalBoolean "dynamic_title" cfg.dynamicTitle}
+        ${optionalBoolean "filter_unmatched_urls" cfg.filterUnmatchedUrls}
+        ${optionalString "font" cfg.font}
+        ${optionalBoolean "fullscreen" cfg.fullscreen}
+        ${optionalString "geometry" cfg.geometry}
+        ${optionalString "icon_name" cfg.iconName}
+        ${optionalBoolean "modify_other_keys" cfg.modifyOtherKeys}
+        ${optionalBoolean "mouse_autohide" cfg.mouseAutohide}
+        ${optionalBoolean "scroll_on_keystroke" cfg.scrollOnKeystroke}
+        ${optionalBoolean "scroll_on_output" cfg.scrollOnOutput}
+        ${optionalInteger "scrollback_lines" cfg.scrollbackLines}
+        ${optionalString "scrollbar" cfg.scrollbar}
+        ${optionalBoolean "search_wrap" cfg.searchWrap}
+        ${optionalBoolean "size_hints" cfg.sizeHints}
+        ${optionalBoolean "urgent_on_bell" cfg.urgentOnBell}
+
+        ${cfg.optionsExtra}
+
+        [colors]
+        ${optionalString "background" cfg.backgroundColor}
+        ${optionalString "cursor" cfg.cursorColor}
+        ${optionalString "cursor_foreground" cfg.cursorForegroundColor}
+        ${optionalString "foreground" cfg.foregroundColor}
+        ${optionalString "foregroundBold" cfg.foregroundBoldColor}
+        ${optionalString "highlight" cfg.highlightColor}
+
+        ${cfg.colorsExtra}
+
+        [hints]
+        ${optionalString "active_background" cfg.hintsActiveBackgroundColor}
+        ${optionalString "active_foreground" cfg.hintsActiveForegroundColor}
+        ${optionalString "background" cfg.hintsBackgroundColor}
+        ${optionalString "border" cfg.hintsBorderColor}
+        ${optionalInteger "border_width" cfg.hintsBorderWidth}
+        ${optionalString "font" cfg.hintsFont}
+        ${optionalString "foreground" cfg.hintsForegroundColor}
+        ${optionalInteger "padding" cfg.hintsPadding}
+        ${optionalInteger "roundness" cfg.hintsRoundness}
+
+        ${cfg.hintsExtra}
+      '';
+
+      programs.bash.initExtra = vteInitStr;
+      programs.zsh.initExtra = vteInitStr;
+    }
+  );
+}
diff --git a/home-manager/modules/programs/texlive.nix b/home-manager/modules/programs/texlive.nix
new file mode 100644
index 00000000000..0f8953e9f91
--- /dev/null
+++ b/home-manager/modules/programs/texlive.nix
@@ -0,0 +1,50 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.texlive;
+
+  texlivePkgs = cfg.extraPackages pkgs.texlive;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    programs.texlive = {
+      enable = mkEnableOption "Texlive";
+
+      extraPackages = mkOption {
+        default = tpkgs: { inherit (tpkgs) collection-basic; };
+        defaultText = "tpkgs: { inherit (tpkgs) collection-basic; }";
+        example = literalExample ''
+          tpkgs: { inherit (tpkgs) collection-fontsrecommended algorithms; }
+        '';
+        description = "Extra packages available to Texlive.";
+      };
+
+      package = mkOption {
+        type = types.package;
+        description = "Resulting customized Texlive package.";
+        readOnly = true;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = texlivePkgs != {};
+        message = "Must provide at least one extra package in"
+          + " 'programs.texlive.extraPackages'.";
+      }
+    ];
+
+    home.packages = [ cfg.package ];
+
+    programs.texlive.package = pkgs.texlive.combine texlivePkgs;
+  };
+}
diff --git a/home-manager/modules/programs/tmux.nix b/home-manager/modules/programs/tmux.nix
new file mode 100644
index 00000000000..766bc6238ba
--- /dev/null
+++ b/home-manager/modules/programs/tmux.nix
@@ -0,0 +1,320 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.tmux;
+
+  pluginName = p: if types.package.check p then p.name else p.plugin.name;
+
+  pluginModule = types.submodule {
+    options = {
+      plugin = mkOption {
+        type = types.package;
+        description = "Path of the configuration file to include.";
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        description = "Additional configuration for the associated plugin.";
+        default = "";
+      };
+    };
+  };
+
+  defaultKeyMode  = "emacs";
+  defaultResize   = 5;
+  defaultShortcut = "b";
+  defaultTerminal = "screen";
+
+  boolToStr = value: if value then "on" else "off";
+
+  tmuxConf = ''
+    set  -g default-terminal "${cfg.terminal}"
+    set  -g base-index      ${toString cfg.baseIndex}
+    setw -g pane-base-index ${toString cfg.baseIndex}
+
+    ${optionalString cfg.newSession "new-session"}
+
+    ${optionalString cfg.reverseSplit ''
+      bind v split-window -h
+      bind s split-window -v
+    ''}
+
+    set -g status-keys ${cfg.keyMode}
+    set -g mode-keys   ${cfg.keyMode}
+
+    ${optionalString (cfg.keyMode == "vi" && cfg.customPaneNavigationAndResize) ''
+      bind h select-pane -L
+      bind j select-pane -D
+      bind k select-pane -U
+      bind l select-pane -R
+
+      bind -r H resize-pane -L ${toString cfg.resizeAmount}
+      bind -r J resize-pane -D ${toString cfg.resizeAmount}
+      bind -r K resize-pane -U ${toString cfg.resizeAmount}
+      bind -r L resize-pane -R ${toString cfg.resizeAmount}
+    ''}
+
+    ${optionalString (cfg.shortcut != defaultShortcut) ''
+      # rebind main key: C-${cfg.shortcut}
+      unbind C-${defaultShortcut}
+      set -g prefix C-${cfg.shortcut}
+      bind ${cfg.shortcut} send-prefix
+      bind C-${cfg.shortcut} last-window
+    ''}
+
+    ${optionalString cfg.disableConfirmationPrompt ''
+      bind-key & kill-window
+      bind-key x kill-pane
+    ''}
+
+    setw -g aggressive-resize ${boolToStr cfg.aggressiveResize}
+    setw -g clock-mode-style  ${if cfg.clock24 then "24" else "12"}
+    set  -s escape-time       ${toString cfg.escapeTime}
+    set  -g history-limit     ${toString cfg.historyLimit}
+
+    ${cfg.extraConfig}
+  '';
+
+in
+
+{
+  options = {
+    programs.tmux = {
+      aggressiveResize = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Resize the window to the size of the smallest session for
+          which it is the current window.
+        '';
+      };
+
+      baseIndex = mkOption {
+        default = 0;
+        example = 1;
+        type = types.ints.unsigned;
+        description = "Base index for windows and panes.";
+      };
+
+      clock24 = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Use 24 hour clock.";
+      };
+
+      customPaneNavigationAndResize = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Override the hjkl and HJKL bindings for pane navigation and
+          resizing in VI mode.
+        '';
+      };
+
+      disableConfirmationPrompt = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Disable confirmation prompt before killing a pane or window
+        '';
+      };
+
+      enable = mkEnableOption "tmux";
+
+      escapeTime = mkOption {
+        default = 500;
+        example = 0;
+        type = types.ints.unsigned;
+        description = ''
+          Time in milliseconds for which tmux waits after an escape is
+          input.
+       '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Additional configuration to add to
+          <filename>tmux.conf</filename>.
+        '';
+      };
+
+      historyLimit = mkOption {
+        default = 2000;
+        example = 5000;
+        type = types.ints.positive;
+        description = "Maximum number of lines held in window history.";
+      };
+
+      keyMode = mkOption {
+        default = defaultKeyMode;
+        example = "vi";
+        type = types.enum [ "emacs" "vi" ];
+        description = "VI or Emacs style shortcuts.";
+      };
+
+      newSession = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Automatically spawn a session if trying to attach and none
+          are running.
+        '';
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.tmux;
+        defaultText = literalExample "pkgs.tmux";
+        example = literalExample "pkgs.tmux";
+        description = "The tmux package to install";
+      };
+
+      reverseSplit = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Reverse the window split shortcuts.";
+      };
+
+      resizeAmount = mkOption {
+        default = defaultResize;
+        example = 10;
+        type = types.ints.positive;
+        description = "Number of lines/columns when resizing.";
+      };
+
+      sensibleOnTop = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Run the sensible plugin at the top of the configuration. It
+          is possible to override the sensible settings using the
+          <option>programs.tmux.extraConfig</option> option.
+        '';
+      };
+
+      shortcut = mkOption {
+        default = defaultShortcut;
+        example = "a";
+        type = types.str;
+        description = ''
+          CTRL following by this key is used as the main shortcut.
+        '';
+      };
+
+      terminal = mkOption {
+        default = defaultTerminal;
+        example = "screen-256color";
+        type = types.str;
+        description = "Set the $TERM variable.";
+      };
+
+      secureSocket = mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          Store tmux socket under <filename>/run</filename>, which is more
+          secure than <filename>/tmp</filename>, but as a downside it doesn't
+          survive user logout.
+        '';
+      };
+
+      tmuxp.enable = mkEnableOption "tmuxp";
+
+      tmuxinator.enable = mkEnableOption "tmuxinator";
+
+      plugins = mkOption {
+        type = with types;
+          listOf (either package pluginModule)
+          // { description = "list of plugin packages or submodules"; };
+        description = ''
+          List of tmux plugins to be included at the end of your tmux
+          configuration. The sensible plugin, however, is defaulted to
+          run at the top of your configuration.
+        '';
+        default = [ ];
+        example = literalExample ''
+          with pkgs; [
+            tmuxPlugins.cpu
+            {
+              plugin = tmuxPlugins.resurrect;
+              extraConfig = "set -g @resurrect-strategy-nvim 'session'";
+            }
+            {
+              plugin = tmuxPlugins.continuum;
+              extraConfig = '''
+                set -g @continuum-restore 'on'
+                set -g @continuum-save-interval '60' # minutes
+              ''';
+            }
+          ]
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (
+    mkMerge [
+      {
+        home.packages = [ cfg.package ]
+          ++ optional cfg.tmuxinator.enable pkgs.tmuxinator
+          ++ optional cfg.tmuxp.enable      pkgs.tmuxp;
+
+        home.file.".tmux.conf".text = tmuxConf;
+      }
+
+      (mkIf cfg.sensibleOnTop {
+        home.file.".tmux.conf".text = mkBefore ''
+          # ============================================= #
+          # Start with defaults from the Sensible plugin  #
+          # --------------------------------------------- #
+          run-shell ${pkgs.tmuxPlugins.sensible.rtp}
+          # ============================================= #
+        '';
+      })
+
+      (mkIf cfg.secureSocket {
+        home.sessionVariables = {
+          TMUX_TMPDIR = ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}'';
+        };
+      })
+
+      (mkIf (cfg.plugins != []) {
+        assertions = [(
+          let
+            hasBadPluginName = p: !(hasPrefix "tmuxplugin" (pluginName p));
+            badPlugins = filter hasBadPluginName cfg.plugins;
+          in
+            {
+              assertion = badPlugins == [];
+              message =
+                "Invalid tmux plugin (not prefixed with \"tmuxplugins\"): "
+                + concatMapStringsSep ", " pluginName badPlugins;
+            }
+        )];
+
+        home.file.".tmux.conf".text = mkAfter ''
+          # ============================================= #
+          # Load plugins with Home Manager                #
+          # --------------------------------------------- #
+
+          ${(concatMapStringsSep "\n\n" (p: ''
+              # ${pluginName p}
+              # ---------------------
+              ${p.extraConfig or ""}
+              run-shell ${
+                if types.package.check p
+                then p.rtp
+                else p.plugin.rtp
+              }
+          '') cfg.plugins)}
+          # ============================================= #
+        '';
+      })
+    ]
+  );
+}
diff --git a/home-manager/modules/programs/urxvt.nix b/home-manager/modules/programs/urxvt.nix
new file mode 100644
index 00000000000..6f4eb3ff7ba
--- /dev/null
+++ b/home-manager/modules/programs/urxvt.nix
@@ -0,0 +1,156 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.urxvt;
+
+in
+
+{
+  options.programs.urxvt = {
+    enable = mkEnableOption "rxvt-unicode terminal emulator";
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.rxvt_unicode;
+      defaultText = literalExample "pkgs.rxvt_unicode";
+      description = "rxvt-unicode package to install.";
+    };
+
+    fonts = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = "List of fonts to be used.";
+      example = [ "xft:Droid Sans Mono Nerd Font:size=9" ];
+    };
+
+    keybindings = mkOption {
+      type = types.attrsOf types.str;
+      default = {};
+      description = "Mapping of keybindings to actions";
+      example = literalExample ''
+        {
+          "Shift-Control-C" = "eval:selection_to_clipboard";
+          "Shift-Control-V" = "eval:paste_clipboard";
+        }
+      '';
+    };
+
+    iso14755 = mkOption {
+      type = types.bool;
+      default = true;
+      description = "ISO14755 support for viewing and entering unicode characters.";
+    };
+
+    scroll = {
+      bar = mkOption {
+        type = types.submodule {
+          options = {
+            enable = mkOption {
+              type = types.bool;
+              default = true;
+              description = "Whether to enable the scrollbar";
+            };
+
+            style = mkOption {
+              type = types.enum [ "rxvt" "plain" "next" "xterm" ];
+              default = "plain";
+              description = "Scrollbar style.";
+            };
+
+            align = mkOption {
+              type = types.enum [ "top" "bottom" "center" ];
+              default = "center";
+              description = "Scrollbar alignment.";
+            };
+
+            position = mkOption {
+              type = types.enum [ "left" "right" ];
+              default = "right";
+              description = "Scrollbar position.";
+            };
+
+            floating = mkOption {
+              type = types.bool;
+              default = true;
+              description = "Whether to display an rxvt scrollbar without a trough.";
+            };
+          };
+        };
+        default = {};
+        description = "Scrollbar settings.";
+      };
+
+      lines = mkOption {
+        type = types.ints.unsigned;
+        default = 10000;
+        description = "Number of lines to save in the scrollback buffer.";
+      };
+
+      keepPosition = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Whether to keep a scroll position when TTY receives new lines.";
+      };
+
+      scrollOnKeystroke = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Whether to scroll to bottom on keyboard input.";
+      };
+
+      scrollOnOutput = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to scroll to bottom on TTY output.";
+      };
+    };
+
+    transparent = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Whether to enable pseudo-transparency.";
+    };
+
+    shading = mkOption {
+      type = types.ints.between 0 200;
+      default = 100;
+      description = "Darken (0 .. 99) or lighten (101 .. 200) the transparent background.";
+    };
+
+    extraConfig = mkOption {
+      default = {};
+      type = types.attrs;
+      description = "Additional configuration to add.";
+      example = { "shading" = 15; };
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    xresources.properties = {
+      "URxvt.scrollBar" = cfg.scroll.bar.enable;
+      "URxvt.scrollstyle" = cfg.scroll.bar.style;
+      "URxvt.scrollBar_align" = cfg.scroll.bar.align;
+      "URxvt.scrollBar_right" = cfg.scroll.bar.position == "right";
+      "URxvt.scrollBar_floating" = cfg.scroll.bar.floating;
+      "URxvt.saveLines" = cfg.scroll.lines;
+      "URxvt.scrollWithBuffer" = cfg.scroll.keepPosition;
+      "URxvt.scrollTtyKeypress" = cfg.scroll.scrollOnKeystroke;
+      "URxvt.scrollTtyOutput" = cfg.scroll.scrollOnOutput;
+      "URxvt.transparent" = cfg.transparent;
+      "URxvt.shading" = cfg.shading;
+      "URxvt.iso14755" = cfg.iso14755;
+    } // flip mapAttrs' cfg.keybindings (kb: action:
+     nameValuePair "URxvt.keysym.${kb}" action
+    ) // optionalAttrs (cfg.fonts != []) {
+      "URxvt.font" = concatStringsSep "," cfg.fonts;
+    } // flip mapAttrs' cfg.extraConfig (k: v:
+      nameValuePair "URxvt.${k}" v
+    );
+  };
+}
diff --git a/home-manager/modules/programs/vim.nix b/home-manager/modules/programs/vim.nix
new file mode 100644
index 00000000000..a14a9562ac1
--- /dev/null
+++ b/home-manager/modules/programs/vim.nix
@@ -0,0 +1,191 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.vim;
+  defaultPlugins = [ pkgs.vimPlugins.sensible ];
+
+  knownSettings = {
+    background = types.enum [ "dark" "light" ];
+    backupdir = types.listOf types.str;
+    copyindent = types.bool;
+    directory = types.listOf types.str;
+    expandtab = types.bool;
+    hidden = types.bool;
+    history = types.int;
+    ignorecase = types.bool;
+    modeline = types.bool;
+    mouse = types.enum [ "n" "v" "i" "c" "h" "a" "r" ];
+    mousefocus = types.bool;
+    mousehide = types.bool;
+    mousemodel = types.enum [ "extend" "popup" "popup_setpos" ];
+    number = types.bool;
+    relativenumber = types.bool;
+    shiftwidth = types.int;
+    smartcase = types.bool;
+    tabstop = types.int;
+    undodir = types.listOf types.str;
+    undofile = types.bool;
+  };
+
+  vimSettingsType = types.submodule {
+    options =
+      let
+        opt = name: type: mkOption {
+          type = types.nullOr type;
+          default = null;
+          visible = false;
+        };
+      in
+        mapAttrs opt knownSettings;
+  };
+
+  setExpr = name: value:
+    let
+      v =
+        if isBool value then (if value then "" else "no") + name
+        else
+          "${name}=${
+            if isList value
+            then concatStringsSep "," value
+            else toString value
+          }";
+    in
+      optionalString (value != null) ("set " + v);
+
+  plugins =
+    let
+      vpkgs = pkgs.vimPlugins;
+      getPkg = p:
+        if isDerivation p
+        then [ p ]
+        else optional (isString p && hasAttr p vpkgs) vpkgs.${p};
+    in
+      concatMap getPkg cfg.plugins;
+
+in
+
+{
+  options = {
+    programs.vim = {
+      enable = mkEnableOption "Vim";
+
+      plugins = mkOption {
+        type = with types; listOf (either str package);
+        default = defaultPlugins;
+        example = literalExample ''[ pkgs.vimPlugins.YankRing ]'';
+        description = ''
+          List of vim plugins to install. To get a list of supported plugins run:
+          <command>nix-env -f '&lt;nixpkgs&gt;' -qaP -A vimPlugins</command>.
+
+          </para><para>
+
+          Note: String values are deprecated, please use actual packages.
+        '';
+      };
+
+      settings = mkOption {
+        type = vimSettingsType;
+        default = {};
+        example = literalExample ''
+          {
+            expandtab = true;
+            history = 1000;
+            background = "dark";
+          }
+        '';
+        description = ''
+          At attribute set of Vim settings. The attribute names and
+          corresponding values must be among the following supported
+          options.
+
+          <informaltable frame="none"><tgroup cols="1"><tbody>
+          ${concatStringsSep "\n" (
+            mapAttrsToList (n: v: ''
+              <row>
+                <entry><varname>${n}</varname></entry>
+                <entry>${v.description}</entry>
+              </row>
+            '') knownSettings
+          )}
+          </tbody></tgroup></informaltable>
+
+          See the Vim documentation for detailed descriptions of these
+          options. Note, use <varname>extraConfig</varname> to
+          manually set any options not listed above.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''
+          set nocompatible
+          set nobackup
+        '';
+        description = "Custom .vimrc lines";
+      };
+
+      package = mkOption {
+        type = types.package;
+        description = "Resulting customized vim package";
+        readOnly = true;
+      };
+    };
+  };
+
+  config = (
+    let
+      customRC = ''
+        ${concatStringsSep "\n" (
+          filter (v: v != "") (
+          mapAttrsToList setExpr (
+          builtins.intersectAttrs knownSettings cfg.settings)))}
+
+        ${cfg.extraConfig}
+      '';
+
+      vim = pkgs.vim_configurable.customize {
+        name = "vim";
+        vimrcConfig = {
+          inherit customRC;
+
+          packages.home-manager.start = plugins;
+        };
+      };
+    in
+      mkIf cfg.enable {
+        assertions =
+          let
+            packagesNotFound = filter (p: isString p && (!hasAttr p pkgs.vimPlugins)) cfg.plugins;
+          in
+            [
+              {
+                assertion = packagesNotFound == [];
+                message = "Following VIM plugin not found in pkgs.vimPlugins: ${
+                  concatMapStringsSep ", " (p: ''"${p}"'') packagesNotFound
+                }";
+              }
+            ];
+
+        warnings =
+          let
+            stringPlugins = filter isString cfg.plugins;
+          in
+            optional (stringPlugins != []) ''
+              Specifying VIM plugins using strings is deprecated, found ${
+                concatMapStringsSep ", " (p: ''"${p}"'') stringPlugins
+              } as strings.
+            '';
+
+        home.packages = [ cfg.package ];
+
+        programs.vim = {
+          package = vim;
+          plugins = defaultPlugins;
+        };
+      }
+  );
+}
diff --git a/home-manager/modules/programs/vscode.nix b/home-manager/modules/programs/vscode.nix
new file mode 100644
index 00000000000..fdaea0ba4fe
--- /dev/null
+++ b/home-manager/modules/programs/vscode.nix
@@ -0,0 +1,89 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.vscode;
+
+  vscodePname = cfg.package.pname;
+
+  configDir = {
+    "vscode" = "Code";
+    "vscode-insiders" = "Code - Insiders";
+    "vscodium" = "Codium";
+  }.${vscodePname};
+
+  configFilePath =
+    if pkgs.stdenv.hostPlatform.isDarwin then
+      "Library/Application Support/${configDir}/User/settings.json"
+    else
+      "${config.xdg.configHome}/${configDir}/User/settings.json";
+
+  # TODO: On Darwin where are the extensions?
+  extensionPath = ".${vscodePname}/extensions";
+in
+
+{
+  options = {
+    programs.vscode = {
+      enable = mkEnableOption "Visual Studio Code";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.vscode;
+        example = literalExample "pkgs.vscodium";
+        description = ''
+          Version of Visual Studio Code to install.
+        '';
+      };
+
+      userSettings = mkOption {
+        type = types.attrs;
+        default = {};
+        example = literalExample ''
+          {
+            "update.channel" = "none";
+            "[nix]"."editor.tabSize" = 2;
+          }
+        '';
+        description = ''
+          Configuration written to Visual Studio Code's
+          <filename>settings.json</filename>.
+        '';
+      };
+
+      extensions = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        example = literalExample "[ pkgs.vscode-extensions.bbenoist.Nix ]";
+        description = ''
+          The extensions Visual Studio Code should be started with.
+          These will override but not delete manually installed ones.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    # Adapted from https://discourse.nixos.org/t/vscode-extensions-setup/1801/2
+    home.file =
+      let
+        toPaths = p:
+          # Links every dir in p to the extension path.
+          mapAttrsToList (k: v:
+            {
+              "${extensionPath}/${k}".source = "${p}/${k}";
+            }) (builtins.readDir p);
+        toSymlink = concatMap toPaths cfg.extensions;
+      in
+        foldr
+          (a: b: a // b)
+          {
+            "${configFilePath}".text = builtins.toJSON cfg.userSettings;
+          }
+          toSymlink;
+  };
+}
diff --git a/home-manager/modules/programs/vscode/haskell.nix b/home-manager/modules/programs/vscode/haskell.nix
new file mode 100644
index 00000000000..c8ea10d473e
--- /dev/null
+++ b/home-manager/modules/programs/vscode/haskell.nix
@@ -0,0 +1,66 @@
+{ pkgs, config, lib, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.vscode.haskell;
+
+  defaultHieNixExe = hie-nix.hies + "/bin/hie-wrapper";
+  defaultHieNixExeText = literalExample
+    "\"\${pkgs.hie-nix.hies}/bin/hie-wrapper\"";
+
+  hie-nix = pkgs.hie-nix or (abort ''
+    vscode.haskell: pkgs.hie-nix missing. Please add an overlay such as:
+    ${exampleOverlay}
+  '');
+
+  exampleOverlay = ''
+    nixpkgs.overlays = [
+      (self: super: { hie-nix = import ~/src/hie-nix {}; })
+    ]
+  '';
+
+in
+
+{
+  options.programs.vscode.haskell = {
+    enable = mkEnableOption "Haskell integration for Visual Studio Code";
+
+    hie.enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Whether to enable Haskell IDE engine integration.";
+    };
+
+    hie.executablePath = mkOption {
+      type = types.path;
+      default = defaultHieNixExe;
+      defaultText = defaultHieNixExeText;
+      description = ''
+        The path to the Haskell IDE Engine executable.
+        </para><para>
+        Because hie-nix is not packaged in Nixpkgs, you need to add it as an
+        overlay or set this option. Example overlay configuration:
+        <programlisting language="nix">${exampleOverlay}</programlisting>
+      '';
+      example = literalExample ''
+        (import ~/src/haskell-ide-engine {}).hies + "/bin/hie-wrapper";
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.vscode.userSettings = mkIf cfg.hie.enable {
+      "languageServerHaskell.enableHIE" = true;
+      "languageServerHaskell.hieExecutablePath" = cfg.hie.executablePath;
+    };
+
+    programs.vscode.extensions =
+      [
+        pkgs.vscode-extensions.justusadam.language-haskell
+      ]
+      ++ lib.optional cfg.hie.enable
+        pkgs.vscode-extensions.alanz.vscode-hie-server;
+  };
+}
diff --git a/home-manager/modules/programs/z-lua.nix b/home-manager/modules/programs/z-lua.nix
new file mode 100644
index 00000000000..245eff6a51e
--- /dev/null
+++ b/home-manager/modules/programs/z-lua.nix
@@ -0,0 +1,86 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.z-lua;
+
+  aliases = {
+    zz = "z -c";         # restrict matches to subdirs of $PWD
+    zi = "z -i";         # cd with interactive selection
+    zf = "z -I";         # use fzf to select in multiple matches
+    zb = "z -b";         # quickly cd to the parent directory
+    zh = "z -I -t .";    # fzf
+  };
+
+in
+
+{
+  meta.maintainers = [ maintainers.marsam ];
+
+  options.programs.z-lua = {
+    enable = mkEnableOption "z.lua";
+
+    options = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "enhanced" "once" "fzf" ];
+      description = ''
+        List of options to pass to z.lua.
+      '';
+    };
+
+    enableBashIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Bash integration.
+      '';
+    };
+
+    enableZshIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Zsh integration.
+      '';
+    };
+
+    enableFishIntegration = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable Fish integration.
+      '';
+    };
+
+    enableAliases = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to enable recommended z.lua aliases.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.z-lua ];
+
+    programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
+      eval "$(${pkgs.z-lua}/bin/z --init bash ${concatStringsSep " " cfg.options})"
+    '';
+
+    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+      eval "$(${pkgs.z-lua}/bin/z --init zsh ${concatStringsSep " " cfg.options})"
+    '';
+
+    programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
+      source (${pkgs.z-lua}/bin/z --init fish ${concatStringsSep " " cfg.options} | psub)
+    '';
+
+    programs.bash.shellAliases = mkIf cfg.enableAliases aliases;
+
+    programs.zsh.shellAliases = mkIf cfg.enableAliases aliases;
+  };
+}
diff --git a/home-manager/modules/programs/zathura.nix b/home-manager/modules/programs/zathura.nix
new file mode 100644
index 00000000000..f01bd501c39
--- /dev/null
+++ b/home-manager/modules/programs/zathura.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ...}:
+
+with lib;
+
+let
+
+  cfg = config.programs.zathura;
+
+  formatLine = n: v:
+    let
+      formatValue = v:
+        if isBool v then (if v then "true" else "false")
+        else toString v;
+    in
+      "set ${n}\t\"${formatValue v}\"";
+
+in
+
+{
+  meta.maintainers = [ maintainers.rprospero ];
+
+  options.programs.zathura = {
+    enable = mkEnableOption ''
+      Zathura, a highly customizable and functional document viewer
+      focused on keyboard interaction'';
+
+    options = mkOption {
+      default = {};
+      type = with types; attrsOf (either str (either bool int));
+      description = ''
+        Add <option>:set</option> command options to zathura and make
+        them permanent. See
+        <citerefentry>
+          <refentrytitle>zathurarc</refentrytitle>
+          <manvolnum>5</manvolnum>
+        </citerefentry>
+        for the full list of options.
+      '';
+      example = { default-bg = "#000000"; default-fg = "#FFFFFF"; };
+    };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Additional commands for zathura that will be added to the
+        <filename>zathurarc</filename> file.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.zathura ];
+
+    xdg.configFile."zathura/zathurarc".text =
+      concatStringsSep "\n" ([]
+        ++ optional (cfg.extraConfig != "") cfg.extraConfig
+        ++ mapAttrsToList formatLine cfg.options
+      ) + "\n";
+  };
+}
diff --git a/home-manager/modules/programs/zsh.nix b/home-manager/modules/programs/zsh.nix
new file mode 100644
index 00000000000..ffe5f4960b6
--- /dev/null
+++ b/home-manager/modules/programs/zsh.nix
@@ -0,0 +1,439 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.zsh;
+
+  relToDotDir = file: (optionalString (cfg.dotDir != null) (cfg.dotDir + "/")) + file;
+
+  pluginsDir = if cfg.dotDir != null then
+    relToDotDir "plugins" else ".zsh/plugins";
+
+  envVarsStr = config.lib.zsh.exportAll cfg.sessionVariables;
+  localVarsStr = config.lib.zsh.defineAll cfg.localVariables;
+
+  aliasesStr = concatStringsSep "\n" (
+    mapAttrsToList (k: v: "alias ${k}=${lib.escapeShellArg v}") cfg.shellAliases
+  );
+
+  zdotdir = "$HOME/" + cfg.dotDir;
+
+  bindkeyCommands = {
+    emacs = "bindkey -e";
+    viins = "bindkey -v";
+    vicmd = "bindkey -a";
+  };
+
+  historyModule = types.submodule ({ config, ... }: {
+    options = {
+      size = mkOption {
+        type = types.int;
+        default = 10000;
+        description = "Number of history lines to keep.";
+      };
+
+      save = mkOption {
+        type = types.int;
+        defaultText = 10000;
+        default = config.size;
+        description = "Number of history lines to save.";
+      };
+
+      path = mkOption {
+        type = types.str;
+        default = relToDotDir ".zsh_history";
+        defaultText = ".zsh_history";
+        description = "History file location";
+      };
+
+      ignoreDups = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Do not enter command lines into the history list
+          if they are duplicates of the previous event.
+        '';
+      };
+
+      expireDuplicatesFirst = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Expire duplicates first.";
+      };
+
+      extended = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Save timestamp into the history file.";
+      };
+
+      share = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Share command history between zsh sessions.";
+      };
+    };
+  });
+
+  pluginModule = types.submodule ({ config, ... }: {
+    options = {
+      src = mkOption {
+        type = types.path;
+        description = ''
+          Path to the plugin folder.
+
+          Will be added to <envar>fpath</envar> and <envar>PATH</envar>.
+        '';
+      };
+
+      name = mkOption {
+        type = types.str;
+        description = ''
+          The name of the plugin.
+
+          Don't forget to add <option>file</option>
+          if the script name does not follow convention.
+        '';
+      };
+
+      file = mkOption {
+        type = types.str;
+        description = "The plugin script to source.";
+      };
+    };
+
+    config.file = mkDefault "${config.name}.plugin.zsh";
+  });
+
+  ohMyZshModule = types.submodule {
+    options = {
+      enable = mkEnableOption "oh-my-zsh";
+
+      plugins = mkOption {
+        default = [];
+        example = [ "git" "sudo" ];
+        type = types.listOf types.str;
+        description = ''
+          List of oh-my-zsh plugins
+        '';
+      };
+
+      custom = mkOption {
+        default = "";
+        type = types.str;
+        example = "$HOME/my_customizations";
+        description = ''
+          Path to a custom oh-my-zsh package to override config of
+          oh-my-zsh. See <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization"/>
+          for more information.
+        '';
+      };
+
+      theme = mkOption {
+        default = "";
+        example = "robbyrussell";
+        type = types.str;
+        description = ''
+          Name of the theme to be used by oh-my-zsh.
+        '';
+      };
+    };
+  };
+
+in
+
+{
+  options = {
+    programs.zsh = {
+      enable = mkEnableOption "Z shell (Zsh)";
+
+      autocd = mkOption {
+        default = null;
+        description = ''
+          Automatically enter into a directory if typed directly into shell.
+        '';
+        type = types.nullOr types.bool;
+      };
+
+      dotDir = mkOption {
+        default = null;
+        example = ".config/zsh";
+        description = ''
+          Directory where the zsh configuration and more should be located,
+          relative to the users home directory. The default is the home
+          directory.
+        '';
+        type = types.nullOr types.str;
+      };
+
+      shellAliases = mkOption {
+        default = {};
+        example = { ll = "ls -l"; ".." = "cd .."; };
+        description = ''
+          An attribute set that maps aliases (the top level attribute names in
+          this option) to command strings or directly to build outputs.
+        '';
+        type = types.attrsOf types.str;
+      };
+
+      enableCompletion = mkOption {
+        default = true;
+        description = ''
+          Enable zsh completion. Don't forget to add
+          <programlisting language="nix">
+            environment.pathsToLink = [ "/share/zsh" ];
+          </programlisting>
+          to your system configuration to get completion for system packages (e.g. systemd).
+        '';
+        type = types.bool;
+      };
+
+      enableAutosuggestions = mkOption {
+        default = false;
+        description = "Enable zsh autosuggestions";
+      };
+
+      history = mkOption {
+        type = historyModule;
+        default = {};
+        description = "Options related to commands history configuration.";
+      };
+
+      defaultKeymap = mkOption {
+        type = types.nullOr (types.enum (attrNames bindkeyCommands));
+        default = null;
+        example = "emacs";
+        description = "The default base keymap to use.";
+      };
+
+      sessionVariables = mkOption {
+        default = {};
+        type = types.attrs;
+        example = { MAILCHECK = 30; };
+        description = "Environment variables that will be set for zsh session.";
+      };
+
+      initExtraBeforeCompInit = mkOption {
+        default = "";
+        type = types.lines;
+        description = "Extra commands that should be added to <filename>.zshrc</filename> before compinit.";
+      };
+
+      initExtra = mkOption {
+        default = "";
+        type = types.lines;
+        description = "Extra commands that should be added to <filename>.zshrc</filename>.";
+      };
+
+      envExtra = mkOption {
+        default = "";
+        type = types.lines;
+        description = "Extra commands that should be added to <filename>.zshenv</filename>.";
+      };
+
+      profileExtra = mkOption {
+        default = "";
+        type = types.lines;
+        description = "Extra commands that should be added to <filename>.zprofile</filename>.";
+      };
+
+      loginExtra = mkOption {
+        default = "";
+        type = types.lines;
+        description = "Extra commands that should be added to <filename>.zlogin</filename>.";
+      };
+
+      logoutExtra = mkOption {
+        default = "";
+        type = types.lines;
+        description = "Extra commands that should be added to <filename>.zlogout</filename>.";
+      };
+
+      plugins = mkOption {
+        type = types.listOf pluginModule;
+        default = [];
+        example = literalExample ''
+          [
+            {
+              # will source zsh-autosuggestions.plugin.zsh
+              name = "zsh-autosuggestions";
+              src = pkgs.fetchFromGitHub {
+                owner = "zsh-users";
+                repo = "zsh-autosuggestions";
+                rev = "v0.4.0";
+                sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc";
+              };
+            }
+            {
+              name = "enhancd";
+              file = "init.sh";
+              src = pkgs.fetchFromGitHub {
+                owner = "b4b4r07";
+                repo = "enhancd";
+                rev = "v2.2.1";
+                sha256 = "0iqa9j09fwm6nj5rpip87x3hnvbbz9w9ajgm6wkrd5fls8fn8i5g";
+              };
+            }
+          ]
+        '';
+        description = "Plugins to source in <filename>.zshrc</filename>.";
+      };
+
+      oh-my-zsh = mkOption {
+        type = ohMyZshModule;
+        default = {};
+        description = "Options to configure oh-my-zsh.";
+      };
+
+      localVariables = mkOption {
+        type = types.attrs;
+        default = {};
+        example = { POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=["dir" "vcs"]; };
+        description = ''
+          Extra local variables defined at the top of <filename>.zshrc</filename>.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf (cfg.envExtra != "") {
+      home.file."${relToDotDir ".zshenv"}".text = cfg.envExtra;
+    })
+
+    (mkIf (cfg.profileExtra != "") {
+      home.file."${relToDotDir ".zprofile"}".text = cfg.profileExtra;
+    })
+
+    (mkIf (cfg.loginExtra != "") {
+      home.file."${relToDotDir ".zlogin"}".text = cfg.loginExtra;
+    })
+
+    (mkIf (cfg.logoutExtra != "") {
+      home.file."${relToDotDir ".zlogout"}".text = cfg.logoutExtra;
+    })
+
+    (mkIf cfg.oh-my-zsh.enable {
+      home.file."${relToDotDir ".zshenv"}".text = ''
+        ZSH="${pkgs.oh-my-zsh}/share/oh-my-zsh";
+        ZSH_CACHE_DIR="${config.xdg.cacheHome}/oh-my-zsh";
+      '';
+    })
+
+    (mkIf (cfg.dotDir != null) {
+      home.file."${relToDotDir ".zshenv"}".text = ''
+        ZDOTDIR=${zdotdir}
+      '';
+
+      # When dotDir is set, only use ~/.zshenv to source ZDOTDIR/.zshenv,
+      # This is so that if ZDOTDIR happens to be
+      # already set correctly (by e.g. spawning a zsh inside a zsh), all env
+      # vars still get exported
+      home.file.".zshenv".text = ''
+        source ${zdotdir}/.zshenv
+      '';
+    })
+
+    {
+      home.packages = with pkgs; [ zsh ]
+        ++ optional cfg.enableCompletion nix-zsh-completions
+        ++ optional cfg.oh-my-zsh.enable oh-my-zsh;
+
+      home.file."${relToDotDir ".zshrc"}".text = ''
+        typeset -U path cdpath fpath manpath
+
+        for profile in ''${(z)NIX_PROFILES}; do
+          fpath+=($profile/share/zsh/site-functions $profile/share/zsh/$ZSH_VERSION/functions $profile/share/zsh/vendor-completions)
+        done
+
+        HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
+
+        ${optionalString (cfg.defaultKeymap != null) ''
+          # Use ${cfg.defaultKeymap} keymap as the default.
+          ${getAttr cfg.defaultKeymap bindkeyCommands}
+        ''}
+
+        ${localVarsStr}
+
+        ${cfg.initExtraBeforeCompInit}
+
+        ${concatStrings (map (plugin: ''
+          path+="$HOME/${pluginsDir}/${plugin.name}"
+          fpath+="$HOME/${pluginsDir}/${plugin.name}"
+        '') cfg.plugins)}
+
+        # Oh-My-Zsh calls compinit during initialization,
+        # calling it twice causes sight start up slowdown
+        # as all $fpath entries will be traversed again.
+        ${optionalString (cfg.enableCompletion && !cfg.oh-my-zsh.enable)
+          "autoload -U compinit && compinit"
+        }
+
+        ${optionalString cfg.enableAutosuggestions
+          "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
+        }
+
+        # Environment variables
+        . "${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh"
+        ${envVarsStr}
+
+        ${optionalString cfg.oh-my-zsh.enable ''
+            # oh-my-zsh configuration generated by NixOS
+            ${optionalString (cfg.oh-my-zsh.plugins != [])
+              "plugins=(${concatStringsSep " " cfg.oh-my-zsh.plugins})"
+            }
+            ${optionalString (cfg.oh-my-zsh.custom != "")
+              "ZSH_CUSTOM=\"${cfg.oh-my-zsh.custom}\""
+            }
+            ${optionalString (cfg.oh-my-zsh.theme != "")
+              "ZSH_THEME=\"${cfg.oh-my-zsh.theme}\""
+            }
+            source $ZSH/oh-my-zsh.sh
+        ''}
+
+        ${concatStrings (map (plugin: ''
+          if [ -f "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" ]; then
+            source "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}"
+          fi
+        '') cfg.plugins)}
+
+        # History options should be set in .zshrc and after oh-my-zsh sourcing.
+        # See https://github.com/rycee/home-manager/issues/177.
+        HISTSIZE="${toString cfg.history.size}"
+        HISTFILE="$HOME/${cfg.history.path}"
+        SAVEHIST="${toString cfg.history.save}"
+
+        setopt HIST_FCNTL_LOCK
+        ${if cfg.history.ignoreDups then "setopt" else "unsetopt"} HIST_IGNORE_DUPS
+        ${if cfg.history.expireDuplicatesFirst then "setopt" else "unsetopt"} HIST_EXPIRE_DUPS_FIRST
+        ${if cfg.history.share then "setopt" else "unsetopt"} SHARE_HISTORY
+        ${if cfg.history.extended then "setopt" else "unsetopt"} EXTENDED_HISTORY
+        ${if cfg.autocd != null then "${if cfg.autocd then "setopt" else "unsetopt"} autocd" else ""}
+
+        ${cfg.initExtra}
+
+        # Aliases
+        ${aliasesStr}
+      '';
+    }
+
+    (mkIf cfg.oh-my-zsh.enable {
+      # Make sure we create a cache directory since some plugins expect it to exist
+      # See: https://github.com/rycee/home-manager/issues/761
+      home.file."${config.xdg.cacheHome}/oh-my-zsh/.keep".text = "";
+    })
+
+    (mkIf (cfg.plugins != []) {
+      # Many plugins require compinit to be called
+      # but allow the user to opt out.
+      programs.zsh.enableCompletion = mkDefault true;
+
+      home.file = map (plugin: {
+        target = "${pluginsDir}/${plugin.name}";
+        source = plugin.src;
+      }) cfg.plugins;
+    })
+  ]);
+}
diff --git a/home-manager/modules/services/blueman-applet.nix b/home-manager/modules/services/blueman-applet.nix
new file mode 100644
index 00000000000..186dc7454f9
--- /dev/null
+++ b/home-manager/modules/services/blueman-applet.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  options = {
+    services.blueman-applet = {
+      enable = mkEnableOption ''
+        Blueman applet.
+
+        Note, for the applet to work, 'blueman' package should also be installed system-wide
+        since it requires running 'blueman-mechanism' service activated via dbus.
+        You can add it to the dbus packages in system configuration:
+
+          services.dbus.packages = [ pkgs.blueman ];
+      '';
+    };
+  };
+
+  config = mkIf config.services.blueman-applet.enable {
+    systemd.user.services.blueman-applet = {
+        Unit = {
+          Description = "Blueman applet";
+          After = [ "graphical-session-pre.target" ];
+          PartOf = [ "graphical-session.target" ];
+        };
+
+        Install = {
+          WantedBy = [ "graphical-session.target" ];
+        };
+
+        Service = {
+          ExecStart = "${pkgs.blueman}/bin/blueman-applet";
+        };
+    };
+  };
+}
diff --git a/home-manager/modules/services/compton.nix b/home-manager/modules/services/compton.nix
new file mode 100644
index 00000000000..c227f0a8c07
--- /dev/null
+++ b/home-manager/modules/services/compton.nix
@@ -0,0 +1,311 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+with builtins;
+
+let
+
+  cfg = config.services.compton;
+
+  configFile = pkgs.writeText "compton.conf"
+    (optionalString cfg.fade ''
+      # fading
+      fading = true;
+      fade-delta    = ${toString cfg.fadeDelta};
+      fade-in-step  = ${elemAt cfg.fadeSteps 0};
+      fade-out-step = ${elemAt cfg.fadeSteps 1};
+      fade-exclude  = ${toJSON cfg.fadeExclude};
+    '' +
+    optionalString cfg.shadow ''
+
+      # shadows
+      shadow = true;
+      shadow-offset-x = ${toString (elemAt cfg.shadowOffsets 0)};
+      shadow-offset-y = ${toString (elemAt cfg.shadowOffsets 1)};
+      shadow-opacity  = ${cfg.shadowOpacity};
+      shadow-exclude  = ${toJSON cfg.shadowExclude};
+      no-dock-shadow  = ${toJSON cfg.noDockShadow};
+      no-dnd-shadow   = ${toJSON cfg.noDNDShadow};
+    '' + 
+    optionalString cfg.blur ''
+
+      # blur
+      blur-background         = true;
+      blur-background-exclude = ${toJSON cfg.blurExclude};
+    '' + ''
+
+      # opacity
+      active-opacity   = ${cfg.activeOpacity};
+      inactive-opacity = ${cfg.inactiveOpacity};
+      menu-opacity     = ${cfg.menuOpacity};
+      opacity-rule     = ${toJSON cfg.opacityRule};
+
+      # other options
+      backend = ${toJSON cfg.backend};
+      vsync = ${toJSON cfg.vSync};
+      refresh-rate = ${toString cfg.refreshRate};
+    '' + cfg.extraOptions);
+
+in {
+
+  options.services.compton = {
+    enable = mkEnableOption "Compton X11 compositor";
+
+    blur = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enable background blur on transparent windows.
+      '';
+    };
+
+    blurExclude = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [
+        "class_g = 'slop'"
+        "class_i = 'polybar'"
+      ];
+      description = ''
+        List of windows to exclude background blur.
+        See the
+        <citerefentry>
+          <refentrytitle>compton</refentrytitle>
+          <manvolnum>1</manvolnum>
+        </citerefentry>
+        man page for more examples.
+      '';
+    };
+
+    fade = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Fade windows in and out.
+      '';
+    };
+
+    fadeDelta = mkOption {
+      type = types.int;
+      default = 10;
+      example = 5;
+      description = ''
+        Time between fade animation step (in ms).
+      '';
+    };
+
+    fadeSteps = mkOption {
+      type = types.listOf types.str;
+      default = [ "0.028" "0.03" ];
+      example = [ "0.04" "0.04" ];
+      description = ''
+        Opacity change between fade steps (in and out).
+      '';
+    };
+
+    fadeExclude = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [
+        "window_type *= 'menu'"
+        "name ~= 'Firefox$'"
+        "focused = 1"
+      ];
+      description = ''
+        List of conditions of windows that should not be faded.
+        See the
+        <citerefentry>
+          <refentrytitle>compton</refentrytitle>
+          <manvolnum>1</manvolnum>
+        </citerefentry>
+        man page for more examples.
+      '';
+    };
+
+    shadow = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Draw window shadows.
+      '';
+    };
+
+    shadowOffsets = mkOption {
+      type = types.listOf types.int;
+      default = [ (-15) (-15) ];
+      example = [ (-10) (-15) ];
+      description = ''
+        Horizontal and vertical offsets for shadows (in pixels).
+      '';
+    };
+
+    shadowOpacity = mkOption {
+      type = types.str;
+      default = "0.75";
+      example = "0.8";
+      description = ''
+        Window shadows opacity (number in range 0 - 1).
+      '';
+    };
+
+    shadowExclude = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [
+        "window_type *= 'menu'"
+        "name ~= 'Firefox$'"
+        "focused = 1"
+      ];
+      description = ''
+        List of conditions of windows that should have no shadow.
+        See the
+        <citerefentry>
+          <refentrytitle>compton</refentrytitle>
+          <manvolnum>1</manvolnum>
+        </citerefentry>
+        man page for more examples.
+      '';
+    };
+
+    noDockShadow = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Avoid shadow on docks.
+      '';
+    };
+
+    noDNDShadow = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Avoid shadow on drag-and-drop windows.
+      '';
+    };
+
+    activeOpacity = mkOption {
+      type = types.str;
+      default = "1.0";
+      example = "0.8";
+      description = ''
+        Opacity of active windows.
+      '';
+    };
+
+    inactiveOpacity = mkOption {
+      type = types.str;
+      default = "1.0";
+      example = "0.8";
+      description = ''
+        Opacity of inactive windows.
+      '';
+    };
+
+    menuOpacity = mkOption {
+      type = types.str;
+      default = "1.0";
+      example = "0.8";
+      description = ''
+        Opacity of dropdown and popup menu.
+      '';
+    };
+
+    opacityRule = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [
+        "87:class_i ?= 'scratchpad'"
+        "91:class_i ?= 'xterm'"
+      ];
+      description = ''
+        List of opacity rules.
+        See the
+        <citerefentry>
+          <refentrytitle>compton</refentrytitle>
+          <manvolnum>1</manvolnum>
+        </citerefentry>
+        man page for more examples.
+      '';
+    };
+
+    backend = mkOption {
+      type = types.str;
+      default = "glx";
+      description = ''
+        Backend to use: <literal>glx</literal> or <literal>xrender</literal>.
+      '';
+    };
+
+    vSync = mkOption {
+      type = types.str;
+      default = "none";
+      example = "opengl-swc";
+      description = ''
+        Enable vertical synchronization using the specified method.
+        See the
+        <citerefentry>
+          <refentrytitle>compton</refentrytitle>
+          <manvolnum>1</manvolnum>
+        </citerefentry>
+        man page for available methods.
+      '';
+    };
+
+    refreshRate = mkOption {
+      type = types.int;
+      default = 0;
+      example = 60;
+      description = ''
+       Screen refresh rate (0 = automatically detect).
+      '';
+    };
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.compton;
+      defaultText = literalExample "pkgs.compton";
+      example = literalExample "pkgs.compton";
+      description = ''
+        Compton derivation to use.
+      '';
+    };
+
+    extraOptions = mkOption {
+      type = types.str;
+      default = "";
+      example = ''
+        unredir-if-possible = true;
+        dbe = true;
+      '';
+      description = ''
+        Additional Compton configuration.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    systemd.user.services.compton = {
+      Unit = {
+        Description = "Compton X11 compositor";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        ExecStart = "${cfg.package}/bin/compton --config ${configFile}";
+        Restart = "always";
+        RestartSec = 3;
+      }
+      // optionalAttrs (cfg.backend == "glx") {
+        # Temporarily fixes corrupt colours with Mesa 18.
+        Environment = [ "allow_rgb10_configs=false" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/dunst.nix b/home-manager/modules/services/dunst.nix
new file mode 100644
index 00000000000..96b1f71a2fa
--- /dev/null
+++ b/home-manager/modules/services/dunst.nix
@@ -0,0 +1,172 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.dunst;
+
+  eitherStrBoolIntList = with types; either str (either bool (either int (listOf str)));
+
+  toDunstIni = generators.toINI {
+    mkKeyValue = key: value:
+    let
+      value' =
+        if isBool value then (if value then "yes" else "no")
+        else if isString value then "\"${value}\""
+        else toString value;
+    in
+      "${key}=${value'}";
+  };
+
+  themeType = types.submodule {
+    options = {
+      package = mkOption {
+        type = types.package;
+        example = literalExample "pkgs.gnome3.adwaita-icon-theme";
+        description = "Package providing the theme.";
+      };
+
+      name = mkOption {
+        type = types.str;
+        example = "Adwaita";
+        description = "The name of the theme within the package.";
+      };
+
+      size = mkOption {
+        type = types.str;
+        default = "32x32";
+        example = "16x16";
+        description = "The desired icon size.";
+      };
+    };
+  };
+
+  hicolorTheme = {
+    package = pkgs.hicolor_icon_theme;
+    name = "hicolor";
+    size = "32x32";
+  };
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    services.dunst = {
+      enable = mkEnableOption "the dunst notification daemon";
+
+      iconTheme = mkOption {
+        type = themeType;
+        default = hicolorTheme;
+        description = "Set the icon theme.";
+      };
+
+      settings = mkOption {
+        type = with types; attrsOf (attrsOf eitherStrBoolIntList);
+        default = {};
+        description = "Configuration written to ~/.config/dunstrc";
+        example = literalExample ''
+          {
+            global = {
+              geometry = "300x5-30+50";
+              transparency = 10;
+              frame_color = "#eceff1";
+              font = "Droid Sans 9";
+            };
+
+            urgency_normal = {
+              background = "#37474f";
+              foreground = "#eceff1";
+              timeout = 10;
+            };
+          };
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (
+    mkMerge [
+      {
+        xdg.dataFile."dbus-1/services/org.knopwob.dunst.service".source =
+          "${pkgs.dunst}/share/dbus-1/services/org.knopwob.dunst.service";
+
+        services.dunst.settings.global.icon_path =
+          let
+            useCustomTheme =
+              cfg.iconTheme.package != hicolorTheme.package
+              || cfg.iconTheme.name != hicolorTheme.name
+              || cfg.iconTheme.size != hicolorTheme.size;
+
+            basePaths = [
+              "/run/current-system/sw"
+              config.home.profileDirectory
+              cfg.iconTheme.package
+            ] ++ optional useCustomTheme hicolorTheme.package;
+
+            themes =
+              [
+                cfg.iconTheme
+              ] ++ optional useCustomTheme (
+                hicolorTheme // { size = cfg.iconTheme.size; }
+              );
+
+            categories = [
+              "actions"
+              "animations"
+              "apps"
+              "categories"
+              "devices"
+              "emblems"
+              "emotes"
+              "filesystem"
+              "intl"
+              "mimetypes"
+              "places"
+              "status"
+              "stock"
+            ];
+          in
+            concatStringsSep ":" (
+              concatMap (theme:
+                concatMap (basePath:
+                  map (category:
+                    "${basePath}/share/icons/${theme.name}/${theme.size}/${category}"
+                  ) categories
+                ) basePaths
+              ) themes
+            );
+
+        systemd.user.services.dunst = {
+          Unit = {
+            Description = "Dunst notification daemon";
+            After = [ "graphical-session-pre.target" ];
+            PartOf = [ "graphical-session.target" ];
+          };
+
+          Service = {
+            Type = "dbus";
+            BusName = "org.freedesktop.Notifications";
+            ExecStart = "${pkgs.dunst}/bin/dunst";
+          };
+        };
+      }
+
+      (mkIf (cfg.settings != {}) {
+        xdg.configFile."dunst/dunstrc" = {
+          text = toDunstIni cfg.settings;
+          onChange = ''
+            pkillVerbose=""
+            if [[ -v VERBOSE ]]; then
+              pkillVerbose="-e"
+            fi
+            $DRY_RUN_CMD ${pkgs.procps}/bin/pkill -u $USER $pkillVerbose dunst || true
+            unset pkillVerbose
+          '';
+        };
+      })
+    ]
+  );
+}
diff --git a/home-manager/modules/services/dwm-status.nix b/home-manager/modules/services/dwm-status.nix
new file mode 100644
index 00000000000..2b010cec1e1
--- /dev/null
+++ b/home-manager/modules/services/dwm-status.nix
@@ -0,0 +1,70 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.dwm-status;
+
+  features = [ "audio" "backlight" "battery" "cpu_load" "network" "time" ];
+
+  configText = builtins.toJSON ({ inherit (cfg) order; } // cfg.extraConfig);
+
+  configFile = pkgs.writeText "dwm-status.json" configText;
+in
+
+{
+  options = {
+    services.dwm-status = {
+      enable = mkEnableOption "dwm-status user service";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.dwm-status;
+        defaultText = literalExample "pkgs.dwm-status";
+        example = "pkgs.dwm-status.override { enableAlsaUtils = false; }";
+        description = "Which dwm-status package to use.";
+      };
+
+      order = mkOption {
+        type = types.listOf (types.enum features);
+        description = "List of enabled features in order.";
+      };
+
+      extraConfig = mkOption {
+        type = types.attrs;
+        default = {};
+        example = literalExample ''
+          {
+            separator = "#";
+
+            battery = {
+              notifier_levels = [ 2 5 10 15 20 ];
+            };
+
+            time = {
+              format = "%H:%M";
+            };
+          }
+        '';
+        description = "Extra config of dwm-status.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.dwm-status = {
+      Unit = {
+        Description = "DWM status service";
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        ExecStart = "${cfg.package}/bin/dwm-status ${configFile}";
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/emacs.nix b/home-manager/modules/services/emacs.nix
new file mode 100644
index 00000000000..33d6871c61b
--- /dev/null
+++ b/home-manager/modules/services/emacs.nix
@@ -0,0 +1,48 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.emacs;
+  emacsCfg = config.programs.emacs;
+  emacsBinPath = "${emacsCfg.finalPackage}/bin";
+
+in
+
+{
+  options.services.emacs = {
+    enable = mkEnableOption "the Emacs daemon";
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = emacsCfg.enable;
+        message = "The Emacs service module requires"
+          + " 'programs.emacs.enable = true'.";
+      }
+    ];
+
+    systemd.user.services.emacs = {
+      Unit = {
+        Description = "Emacs: the extensible, self-documenting text editor";
+        Documentation = "info:emacs man:emacs(1) https://gnu.org/software/emacs/";
+
+        # Avoid killing the Emacs session, which may be full of
+        # unsaved buffers.
+        X-RestartIfChanged = false;
+      };
+
+      Service = {
+        ExecStart = "${pkgs.runtimeShell} -l -c 'exec ${emacsBinPath}/emacs --fg-daemon'";
+        ExecStop = "${emacsBinPath}/emacsclient --eval '(kill-emacs)'";
+        Restart = "on-failure";
+      };
+
+      Install = {
+        WantedBy = [ "default.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/flameshot.nix b/home-manager/modules/services/flameshot.nix
new file mode 100644
index 00000000000..87b494d0fcd
--- /dev/null
+++ b/home-manager/modules/services/flameshot.nix
@@ -0,0 +1,47 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.flameshot;
+  package = pkgs.flameshot;
+
+in
+
+{
+  meta.maintainers = [ maintainers.hamhut1066 ];
+
+  options = {
+    services.flameshot = {
+      enable = mkEnableOption "Flameshot";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ package ];
+
+    systemd.user.services.flameshot = {
+      Unit = {
+        Description = "Flameshot screenshot tool";
+        After = [
+          "graphical-session-pre.target"
+          "polybar.service"
+          "stalonetray.service"
+          "taffybar.service"
+        ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        Environment = "PATH=${config.home.profileDirectory}/bin";
+        ExecStart = "${package}/bin/flameshot";
+        Restart = "on-abort";
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/getmail.nix b/home-manager/modules/services/getmail.nix
new file mode 100644
index 00000000000..46d4c1752d4
--- /dev/null
+++ b/home-manager/modules/services/getmail.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.getmail;
+
+  accounts = filter (a: a.getmail.enable)
+    (attrValues config.accounts.email.accounts);
+
+  # Note: The getmail service does not expect a path, but just the filename!
+  renderConfigFilepath = a: if a.primary then "getmailrc" else "getmail${a.name}";
+  configFiles = concatMapStringsSep " " (a: " --rcfile ${renderConfigFilepath a}") accounts;
+in
+{
+  options = {
+    services.getmail = {
+      enable = mkEnableOption "the getmail systemd service to automatically retrieve mail";
+
+      frequency = mkOption {
+        type = types.str;
+        default = "*:0/5";
+        example = "hourly";
+        description = ''
+          The refresh frequency. Check <literal>man systemd.time</literal> for
+          more information on the syntax. If you use a gpg-agent in
+          combination with the passwordCommand, keep the poll
+          frequency below the cache-ttl value (as set by the
+          <literal>default</literal>) to avoid pinentry asking
+          permanently for a password.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.getmail = {
+      Unit = {
+        Description = "getmail email fetcher";
+      };
+      Service = {
+        ExecStart = "${pkgs.getmail}/bin/getmail ${configFiles}";
+      };
+    };
+
+    systemd.user.timers.getmail = {
+      Unit = {
+        Description = "getmail email fetcher";
+      };
+      Timer = {
+        OnCalendar = "${cfg.frequency}";
+        Unit = "getmail.service";
+      };
+      Install = {
+        WantedBy = [ "timers.target" ];
+      };
+    };
+
+  };
+}
diff --git a/home-manager/modules/services/gnome-keyring.nix b/home-manager/modules/services/gnome-keyring.nix
new file mode 100644
index 00000000000..4ca6c7cacf2
--- /dev/null
+++ b/home-manager/modules/services/gnome-keyring.nix
@@ -0,0 +1,55 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.gnome-keyring;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    services.gnome-keyring = {
+      enable = mkEnableOption "GNOME Keyring";
+
+      components = mkOption {
+        type = types.listOf (types.enum ["pkcs11" "secrets" "ssh"]);
+        default = [];
+        description = ''
+          The GNOME keyring components to start. If empty then the
+          default set of components will be started.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.gnome-keyring = {
+      Unit = {
+        Description = "GNOME Keyring";
+        PartOf = [ "graphical-session-pre.target" ];
+      };
+
+      Service = {
+        ExecStart =
+          let
+            args = concatStringsSep " " (
+              [ "--start" "--foreground" ]
+              ++ optional (cfg.components != []) (
+                "--components=" + concatStringsSep "," cfg.components
+              )
+            );
+          in
+            "${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon ${args}";
+        Restart = "on-abort";
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session-pre.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/gpg-agent.nix b/home-manager/modules/services/gpg-agent.nix
new file mode 100644
index 00000000000..5dc942fef63
--- /dev/null
+++ b/home-manager/modules/services/gpg-agent.nix
@@ -0,0 +1,258 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.gpg-agent;
+
+  gpgInitStr = ''
+    GPG_TTY="$(tty)"
+    export GPG_TTY
+  ''
+  + optionalString cfg.enableSshSupport
+      "${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null";
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    services.gpg-agent = {
+      enable = mkEnableOption "GnuPG private key agent";
+
+      defaultCacheTtl = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        description = ''
+          Set the time a cache entry is valid to the given number of
+          seconds.
+        '';
+      };
+
+      defaultCacheTtlSsh = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        description = ''
+          Set the time a cache entry used for SSH keys is valid to the
+          given number of seconds.
+        '';
+      };
+
+      maxCacheTtl = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        description = ''
+          Set the maximum time a cache entry is valid to n seconds. After this
+          time a cache entry will be expired even if it has been accessed
+          recently or has been set using gpg-preset-passphrase. The default is
+          2 hours (7200 seconds).
+        '';
+      };
+
+      maxCacheTtlSsh = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        description = ''
+          Set the maximum time a cache entry used for SSH keys is valid to n
+          seconds. After this time a cache entry will be expired even if it has
+          been accessed recently or has been set using gpg-preset-passphrase.
+          The default is 2 hours (7200 seconds).
+        '';
+      };
+
+      enableSshSupport = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to use the GnuPG key agent for SSH keys.
+        '';
+      };
+
+      sshKeys = mkOption {
+        type = types.nullOr (types.listOf types.str);
+        default = null;
+        description = ''
+          Which GPG keys (by keygrip) to expose as SSH keys.
+        '';
+      };
+
+      enableExtraSocket = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable extra socket of the GnuPG key agent (useful for GPG
+          Agent forwarding).
+        '';
+      };
+
+      verbose = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to produce verbose output.
+        '';
+      };
+
+      grabKeyboardAndMouse = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Tell the pinentry to grab the keyboard and mouse. This
+          option should in general be used to avoid X-sniffing
+          attacks. When disabled, this option passes
+          <option>no-grab</option> setting to gpg-agent.
+        '';
+      };
+
+      enableScDaemon = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Make use of the scdaemon tool. This option has the effect of
+          enabling the ability to do smartcard operations. When
+          disabled, this option passes
+          <option>disable-scdaemon</option> setting to gpg-agent.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''
+          allow-emacs-pinentry
+          allow-loopback-pinentry
+        '';
+        description = ''
+          Extra configuration lines to append to the gpg-agent
+          configuration file.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    {
+      home.file.".gnupg/gpg-agent.conf".text = concatStringsSep "\n" (
+        optional (cfg.enableSshSupport) "enable-ssh-support"
+        ++
+        optional (!cfg.grabKeyboardAndMouse) "no-grab"
+        ++
+        optional (!cfg.enableScDaemon) "disable-scdaemon"
+        ++
+        optional (cfg.defaultCacheTtl != null)
+          "default-cache-ttl ${toString cfg.defaultCacheTtl}"
+        ++
+        optional (cfg.defaultCacheTtlSsh != null)
+          "default-cache-ttl-ssh ${toString cfg.defaultCacheTtlSsh}"
+        ++
+        optional (cfg.maxCacheTtl != null)
+          "max-cache-ttl ${toString cfg.maxCacheTtl}"
+        ++
+        optional (cfg.maxCacheTtlSsh != null)
+          "max-cache-ttl-ssh ${toString cfg.maxCacheTtlSsh}"
+        ++
+        [ cfg.extraConfig ]
+      );
+
+      home.sessionVariables =
+        optionalAttrs cfg.enableSshSupport {
+          SSH_AUTH_SOCK = "$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)";
+        };
+
+      programs.bash.initExtra = gpgInitStr;
+      programs.zsh.initExtra = gpgInitStr;
+    }
+
+    (mkIf (cfg.sshKeys != null) {
+      # Trailing newlines are important
+      home.file.".gnupg/sshcontrol".text = concatMapStrings (s: "${s}\n") cfg.sshKeys;
+    })
+
+    # The systemd units below are direct translations of the
+    # descriptions in the
+    #
+    #   ${pkgs.gnupg}/share/doc/gnupg/examples/systemd-user
+    #
+    # directory.
+    {
+      systemd.user.services.gpg-agent = {
+        Unit = {
+          Description = "GnuPG cryptographic agent and passphrase cache";
+          Documentation = "man:gpg-agent(1)";
+          Requires = "gpg-agent.socket";
+          After = "gpg-agent.socket";
+          # This is a socket-activated service:
+          RefuseManualStart = true;
+        };
+
+        Service = {
+          ExecStart = "${pkgs.gnupg}/bin/gpg-agent --supervised"
+            + optionalString cfg.verbose " --verbose";
+          ExecReload = "${pkgs.gnupg}/bin/gpgconf --reload gpg-agent";
+        };
+      };
+
+      systemd.user.sockets.gpg-agent = {
+        Unit = {
+          Description = "GnuPG cryptographic agent and passphrase cache";
+          Documentation = "man:gpg-agent(1)";
+        };
+
+        Socket = {
+          ListenStream = "%t/gnupg/S.gpg-agent";
+          FileDescriptorName = "std";
+          SocketMode = "0600";
+          DirectoryMode = "0700";
+        };
+
+        Install = {
+          WantedBy = [ "sockets.target" ];
+        };
+      };
+    }
+
+    (mkIf cfg.enableSshSupport {
+      systemd.user.sockets.gpg-agent-ssh = {
+        Unit = {
+          Description = "GnuPG cryptographic agent (ssh-agent emulation)";
+          Documentation = "man:gpg-agent(1) man:ssh-add(1) man:ssh-agent(1) man:ssh(1)";
+        };
+
+        Socket = {
+          ListenStream = "%t/gnupg/S.gpg-agent.ssh";
+          FileDescriptorName = "ssh";
+          Service = "gpg-agent.service";
+          SocketMode = "0600";
+          DirectoryMode = "0700";
+        };
+
+        Install = {
+          WantedBy = [ "sockets.target" ];
+        };
+      };
+    })
+
+    (mkIf cfg.enableExtraSocket {
+      systemd.user.sockets.gpg-agent-extra = {
+        Unit = {
+          Description = "GnuPG cryptographic agent and passphrase cache (restricted)";
+          Documentation = "man:gpg-agent(1) man:ssh(1)";
+        };
+
+        Socket = {
+          ListenStream = "%t/gnupg/S.gpg-agent.extra";
+          FileDescriptorName = "extra";
+          Service = "gpg-agent.service";
+          SocketMode = "0600";
+          DirectoryMode = "0700";
+        };
+
+        Install = {
+          WantedBy = [ "sockets.target" ];
+        };
+      };
+    })
+  ]);
+}
diff --git a/home-manager/modules/services/hound.nix b/home-manager/modules/services/hound.nix
new file mode 100644
index 00000000000..a252a68d271
--- /dev/null
+++ b/home-manager/modules/services/hound.nix
@@ -0,0 +1,84 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.hound;
+
+  configFile = pkgs.writeText "hound-config.json" (
+    builtins.toJSON {
+      max-concurrent-indexers = cfg.maxConcurrentIndexers;
+      dbpath = cfg.databasePath;
+      repos = cfg.repositories;
+      health-check-url = "/healthz";
+    }
+  );
+
+  houndOptions = [
+    "--addr ${cfg.listenAddress}"
+    "--conf ${configFile}"
+  ];
+
+in
+
+{
+  meta.maintainers = [ maintainers.adisbladis ];
+
+  options.services.hound = {
+    enable = mkEnableOption "hound";
+
+    maxConcurrentIndexers = mkOption {
+      type = types.ints.positive;
+      default = 2;
+      description = "Limit the amount of concurrent indexers.";
+    };
+
+    databasePath = mkOption {
+      type = types.path;
+      default = "${config.xdg.dataHome}/hound";
+      defaultText = "\$XDG_DATA_HOME/hound";
+      description = "The Hound database path.";
+    };
+
+    listenAddress = mkOption {
+      type = types.str;
+      default = "localhost:6080";
+      description = "Listen address of the Hound daemon.";
+    };
+
+    repositories = mkOption {
+      type = types.attrsOf (types.uniq types.attrs);
+      default = {};
+      example = literalExample ''
+        {
+          SomeGitRepo = {
+            url = "https://www.github.com/YourOrganization/RepoOne.git";
+            ms-between-poll = 10000;
+            exclude-dot-files = true;
+          };
+        }
+      '';
+      description = "The repository configuration.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.hound ];
+
+    systemd.user.services.hound = {
+      Unit = {
+        Description = "Hound source code search engine";
+      };
+
+      Install = {
+        WantedBy = [ "default.target" ];
+      };
+
+      Service = {
+        Environment = "PATH=${makeBinPath [ pkgs.mercurial pkgs.git ]}";
+        ExecStart = "${pkgs.hound}/bin/houndd ${concatStringsSep " " houndOptions}";
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/imapnotify-accounts.nix b/home-manager/modules/services/imapnotify-accounts.nix
new file mode 100644
index 00000000000..1c780bf28c3
--- /dev/null
+++ b/home-manager/modules/services/imapnotify-accounts.nix
@@ -0,0 +1,30 @@
+{ lib, ... }:
+
+with lib;
+
+{
+  options.imapnotify = {
+    enable = mkEnableOption "imapnotify";
+
+    onNotify = mkOption {
+      type = with types; either str (attrsOf str);
+      default = "";
+      example = "\${pkgs.isync}/bin/mbsync test-%s";
+      description = "Shell commands to run on any event.";
+    };
+
+    onNotifyPost = mkOption {
+      type = with types; either str (attrsOf str);
+      default = "";
+      example = { mail = "\${pkgs.notmuch}/bin/notmuch new && \${pkgs.libnotify}/bin/notify-send 'New mail arrived'"; };
+      description = "Shell commands to run after onNotify event.";
+    };
+
+    boxes = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "Inbox" "[Gmail]/MyLabel" ];
+      description = "IMAP folders to watch.";
+    };
+  };
+}
diff --git a/home-manager/modules/services/imapnotify.nix b/home-manager/modules/services/imapnotify.nix
new file mode 100644
index 00000000000..fbb0713e978
--- /dev/null
+++ b/home-manager/modules/services/imapnotify.nix
@@ -0,0 +1,107 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.imapnotify;
+
+  safeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""];
+
+  imapnotifyAccounts =
+    filter (a: a.imapnotify.enable)
+    (attrValues config.accounts.email.accounts);
+
+  genAccountUnit = account:
+    let
+      name = safeName account.name;
+    in
+      {
+        name = "imapnotify-${name}";
+        value = {
+          Unit = {
+            Description = "imapnotify for ${name}";
+          };
+
+          Service = {
+            ExecStart = "${pkgs.imapnotify}/bin/imapnotify -c ${genAccountConfig account}";
+          } // optionalAttrs account.notmuch.enable {
+            Environment = "NOTMUCH_CONFIG=${config.xdg.configHome}/notmuch/notmuchrc";
+          };
+
+          Install = {
+            WantedBy = [ "default.target" ];
+          };
+        };
+      };
+
+  genAccountConfig = account:
+    pkgs.writeText "imapnotify-${safeName account.name}-config.js" (
+      let
+        port =
+          if account.imap.port != null then account.imap.port
+          else if account.imap.tls.enable then 993
+          else 143;
+
+        toJSON = builtins.toJSON;
+      in
+        ''
+          var child_process = require('child_process');
+
+          function getStdout(cmd) {
+              var stdout = child_process.execSync(cmd);
+              return stdout.toString().trim();
+          }
+
+          exports.host = ${toJSON account.imap.host}
+          exports.port = ${toJSON port};
+          exports.tls = ${toJSON account.imap.tls.enable};
+          exports.username = ${toJSON account.userName};
+          exports.password = getStdout("${toString account.passwordCommand}");
+          exports.onNotify = ${toJSON account.imapnotify.onNotify};
+          exports.onNotifyPost = ${toJSON account.imapnotify.onNotifyPost};
+          exports.boxes = ${toJSON account.imapnotify.boxes};
+        ''
+    );
+
+in
+
+{
+  meta.maintainers = [ maintainers.nickhu ];
+
+  options = {
+    services.imapnotify = {
+      enable = mkEnableOption "imapnotify";
+    };
+
+    accounts.email.accounts = mkOption {
+      type = with types; attrsOf (submodule (
+        import ./imapnotify-accounts.nix
+      ));
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions =
+      let
+        checkAccounts = pred: msg:
+          let
+            badAccounts = filter pred imapnotifyAccounts;
+          in
+            {
+              assertion = badAccounts == [];
+              message = "imapnotify: Missing ${msg} for accounts: "
+                + concatMapStringsSep ", " (a: a.name) badAccounts;
+            };
+      in
+        [
+          (checkAccounts (a: a.maildir == null) "maildir configuration")
+          (checkAccounts (a: a.imap == null) "IMAP configuration")
+          (checkAccounts (a: a.passwordCommand == null) "password command")
+          (checkAccounts (a: a.userName == null) "username")
+        ];
+
+    systemd.user.services =
+      listToAttrs (map genAccountUnit imapnotifyAccounts);
+  };
+}
diff --git a/home-manager/modules/services/kbfs.nix b/home-manager/modules/services/kbfs.nix
new file mode 100644
index 00000000000..863f4feea3b
--- /dev/null
+++ b/home-manager/modules/services/kbfs.nix
@@ -0,0 +1,67 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.kbfs;
+
+in
+
+{
+  options = {
+    services.kbfs = {
+      enable = mkEnableOption "Keybase File System";
+
+      mountPoint = mkOption {
+        type = types.str;
+        default = "keybase";
+        description = ''
+          Mount point for the Keybase filesystem, relative to
+          <envar>HOME</envar>.
+        '';
+      };
+
+      extraFlags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [
+          "-label kbfs"
+          "-mount-type normal"
+        ];
+        description = ''
+          Additional flags to pass to the Keybase filesystem on launch.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.kbfs = {
+      Unit = {
+        Description = "Keybase File System";
+        Requires = [ "keybase.service" ];
+        After = [ "keybase.service" ];
+      };
+
+      Service =
+        let
+          mountPoint = "\"%h/${cfg.mountPoint}\"";
+        in {
+          Environment = "PATH=/run/wrappers/bin KEYBASE_SYSTEMD=1";
+          ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p ${mountPoint}";
+          ExecStart ="${pkgs.kbfs}/bin/kbfsfuse ${toString cfg.extraFlags} ${mountPoint}";
+          ExecStopPost = "/run/wrappers/bin/fusermount -u ${mountPoint}";
+          Restart = "on-failure";
+          PrivateTmp = true;
+        };
+
+      Install = {
+        WantedBy = [ "default.target" ];
+      };
+    };
+
+    home.packages = [ pkgs.kbfs ];
+    services.keybase.enable = true;
+  };
+}
diff --git a/home-manager/modules/services/kdeconnect.nix b/home-manager/modules/services/kdeconnect.nix
new file mode 100644
index 00000000000..bd698fcf836
--- /dev/null
+++ b/home-manager/modules/services/kdeconnect.nix
@@ -0,0 +1,75 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.kdeconnect;
+  package = pkgs.kdeconnect;
+
+in
+
+{
+  meta.maintainers = [ maintainers.adisbladis ];
+
+  options = {
+    services.kdeconnect = {
+      enable = mkEnableOption "KDE connect";
+
+      indicator = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable kdeconnect-indicator service.";
+      };
+
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      home.packages = [ package ];
+
+      systemd.user.services.kdeconnect = {
+        Unit = {
+          Description = "Adds communication between your desktop and your smartphone";
+          After = [ "graphical-session-pre.target" ];
+          PartOf = [ "graphical-session.target" ];
+        };
+
+        Install = {
+          WantedBy = [ "graphical-session.target" ];
+        };
+
+        Service = {
+          Environment = "PATH=${config.home.profileDirectory}/bin";
+          ExecStart = "${package}/libexec/kdeconnectd";
+          Restart = "on-abort";
+        };
+      };
+    })
+
+    (mkIf cfg.indicator {
+      systemd.user.services.kdeconnect-indicator = {
+        Unit = {
+          Description = "kdeconnect-indicator";
+          After = [ "graphical-session-pre.target"
+                    "polybar.service"
+                    "taffybar.service"
+                    "stalonetray.service" ];
+          PartOf = [ "graphical-session.target" ];
+        };
+
+        Install = {
+          WantedBy = [ "graphical-session.target" ];
+        };
+
+        Service = {
+          Environment = "PATH=${config.home.profileDirectory}/bin";
+          ExecStart = "${package}/bin/kdeconnect-indicator";
+          Restart = "on-abort";
+        };
+      };
+    })
+
+  ];
+}
diff --git a/home-manager/modules/services/keepassx.nix b/home-manager/modules/services/keepassx.nix
new file mode 100644
index 00000000000..ad791786f05
--- /dev/null
+++ b/home-manager/modules/services/keepassx.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    services.keepassx = {
+      enable = mkEnableOption "the KeePassX password manager";
+    };
+  };
+
+  config = mkIf config.services.keepassx.enable {
+    systemd.user.services.keepassx = {
+        Unit = {
+          Description = "KeePassX password manager";
+          After = [ "graphical-session-pre.target" ];
+          PartOf = [ "graphical-session.target" ];
+        };
+
+        Install = {
+          WantedBy = [ "graphical-session.target" ];
+        };
+
+        Service = {
+          ExecStart = "${pkgs.keepassx}/bin/keepassx -min -lock";
+        };
+    };
+  };
+}
diff --git a/home-manager/modules/services/keybase.nix b/home-manager/modules/services/keybase.nix
new file mode 100644
index 00000000000..2d0a06b06a7
--- /dev/null
+++ b/home-manager/modules/services/keybase.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.keybase;
+
+in
+
+{
+  options = {
+    services.keybase = {
+      enable = mkEnableOption "Keybase";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.keybase ];
+
+    systemd.user.services.keybase = {
+      Unit = {
+        Description = "Keybase service";
+      };
+
+      Service = {
+        ExecStart = "${pkgs.keybase}/bin/keybase service --auto-forked";
+        Restart = "on-failure";
+        PrivateTmp = true;
+      };
+
+      Install = {
+        WantedBy = [ "default.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/mbsync.nix b/home-manager/modules/services/mbsync.nix
new file mode 100644
index 00000000000..73c3b326695
--- /dev/null
+++ b/home-manager/modules/services/mbsync.nix
@@ -0,0 +1,110 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.mbsync;
+
+  mbsyncOptions =
+    [ "--all"
+    ] ++ optional (cfg.verbose) "--verbose"
+      ++ optional (cfg.configFile != null) "--config ${cfg.configFile}";
+
+in
+
+{
+  meta.maintainers = [ maintainers.pjones ];
+
+  options.services.mbsync = {
+    enable = mkEnableOption "mbsync";
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.isync;
+      defaultText = literalExample "pkgs.isync";
+      example = literalExample "pkgs.isync";
+      description = "The package to use for the mbsync binary.";
+    };
+
+    frequency = mkOption {
+      type = types.str;
+      default = "*:0/5";
+      description = ''
+        How often to run mbsync.  This value is passed to the systemd
+        timer configuration as the onCalendar option.  See
+        <citerefentry>
+          <refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>7</manvolnum>
+        </citerefentry>
+        for more information about the format.
+      '';
+    };
+
+    verbose = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether mbsync should produce verbose output.
+      '';
+    };
+
+    configFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        Optional configuration file to link to use instead of
+        the default file (<filename>~/.mbsyncrc</filename>).
+      '';
+    };
+
+    preExec = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "mkdir -p %h/mail";
+      description = ''
+        An optional command to run before mbsync executes.  This is
+        useful for creating the directories mbsync is going to use.
+      '';
+    };
+
+    postExec = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "\${pkgs.mu}/bin/mu index";
+      description = ''
+        An optional command to run after mbsync executes successfully.
+        This is useful for running mailbox indexing tools.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.mbsync = {
+      Unit = {
+        Description = "mbsync mailbox synchronization";
+      };
+
+      Service = {
+        Type = "oneshot";
+        ExecStart = "${cfg.package}/bin/mbsync ${concatStringsSep " " mbsyncOptions}";
+      } // (optionalAttrs (cfg.postExec != null) { ExecStartPost = cfg.postExec; })
+        // (optionalAttrs (cfg.preExec  != null) { ExecStartPre  = cfg.preExec;  });
+    };
+
+    systemd.user.timers.mbsync = {
+      Unit = {
+        Description = "mbsync mailbox synchronization";
+      };
+
+      Timer = {
+        OnCalendar = cfg.frequency;
+        Unit = "mbsync.service";
+      };
+
+      Install = {
+        WantedBy = [ "timers.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/mpd.nix b/home-manager/modules/services/mpd.nix
new file mode 100644
index 00000000000..2aa1cd3a9fe
--- /dev/null
+++ b/home-manager/modules/services/mpd.nix
@@ -0,0 +1,150 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  name = "mpd";
+
+  cfg = config.services.mpd;
+
+  mpdConf = pkgs.writeText "mpd.conf" ''
+    music_directory     "${cfg.musicDirectory}"
+    playlist_directory  "${cfg.playlistDirectory}"
+    ${lib.optionalString (cfg.dbFile != null) ''
+      db_file             "${cfg.dbFile}"
+    ''}
+    state_file          "${cfg.dataDir}/state"
+    sticker_file        "${cfg.dataDir}/sticker.sql"
+
+    ${optionalString (cfg.network.listenAddress != "any")
+      ''bind_to_address "${cfg.network.listenAddress}"''}
+    ${optionalString (cfg.network.port != 6600)
+      ''port "${toString cfg.network.port}"''}
+
+    ${cfg.extraConfig}
+  '';
+
+in {
+
+  ###### interface
+
+  options = {
+
+    services.mpd = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable MPD, the music player daemon.
+        '';
+      };
+
+     musicDirectory = mkOption {
+        type = types.path;
+        default = "${config.home.homeDirectory}/music";
+        defaultText = "$HOME/music";
+        apply = toString;       # Prevent copies to Nix store.
+        description = ''
+          The directory where mpd reads music from.
+        '';
+      };
+
+      playlistDirectory = mkOption {
+        type = types.path;
+        default = "${cfg.dataDir}/playlists";
+        defaultText = ''''${dataDir}/playlists'';
+        apply = toString;       # Prevent copies to Nix store.
+        description = ''
+          The directory where mpd stores playlists.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra directives added to to the end of MPD's configuration
+          file, <filename>mpd.conf</filename>. Basic configuration
+          like file location and uid/gid is added automatically to the
+          beginning of the file. For available options see
+          <citerefentry>
+            <refentrytitle>mpd.conf</refentrytitle>
+            <manvolnum>5</manvolnum>
+          </citerefentry>.
+        '';
+      };
+
+      dataDir = mkOption {
+        type = types.path;
+        default = "${config.xdg.dataHome}/${name}";
+        defaultText = "$XDG_DATA_HOME/mpd";
+        apply = toString;       # Prevent copies to Nix store.
+        description = ''
+          The directory where MPD stores its state, tag cache,
+          playlists etc.
+        '';
+      };
+
+     network = {
+
+        listenAddress = mkOption {
+          type = types.str;
+          default = "127.0.0.1";
+          example = "any";
+          description = ''
+            The address for the daemon to listen on.
+            Use <literal>any</literal> to listen on all addresses.
+          '';
+        };
+
+        port = mkOption {
+          type = types.port;
+          default = 6600;
+          description = ''
+            The TCP port on which the the daemon will listen.
+          '';
+        };
+
+      };
+
+      dbFile = mkOption {
+        type = types.nullOr types.str;
+        default = "${cfg.dataDir}/tag_cache";
+        defaultText = ''''${dataDir}/tag_cache'';
+        description = ''
+          The path to MPD's database. If set to
+          <literal>null</literal> the parameter is omitted from the
+          configuration.
+        '';
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.user.services.mpd = {
+      Unit = {
+        After = [ "network.target" "sound.target" ];
+        Description = "Music Player Daemon";
+      };
+
+      Install = {
+        WantedBy = [ "default.target" ];
+      };
+
+      Service = {
+        Environment = "PATH=${config.home.profileDirectory}/bin";
+        ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon ${mpdConf}";
+        Type = "notify";
+        ExecStartPre = ''${pkgs.bash}/bin/bash -c "${pkgs.coreutils}/bin/mkdir -p '${cfg.dataDir}' '${cfg.playlistDirectory}'"'';
+      };
+    };
+  };
+
+}
diff --git a/home-manager/modules/services/mpdris2.nix b/home-manager/modules/services/mpdris2.nix
new file mode 100644
index 00000000000..450f84c5912
--- /dev/null
+++ b/home-manager/modules/services/mpdris2.nix
@@ -0,0 +1,101 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.mpdris2;
+
+  toIni = generators.toINI {
+    mkKeyValue = key: value:
+      let
+        value' =
+          if isBool value then (if value then "True" else "False")
+          else toString value;
+      in
+        "${key} = ${value'}";
+  };
+
+  mpdris2Conf = {
+    Connection = {
+      host = cfg.mpd.host;
+      port = cfg.mpd.port;
+      music_dir = cfg.mpd.musicDirectory;
+    };
+
+    Bling = {
+      notify = cfg.notifications;
+      mmkeys = cfg.multimediaKeys;
+    };
+  };
+
+in
+
+{
+  meta.maintainers = [ maintainers.pjones ];
+
+  options.services.mpdris2 = {
+    enable = mkEnableOption "mpDris2 the MPD to MPRIS2 bridge";
+    notifications = mkEnableOption "song change notifications";
+    multimediaKeys = mkEnableOption "multimedia key support";
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.mpdris2;
+      defaultText = literalExample "pkgs.mpdris2";
+      description = "The mpDris2 package to use.";
+    };
+
+    mpd = {
+      host = mkOption {
+        type = types.str;
+        default = config.services.mpd.network.listenAddress;
+        defaultText = "config.services.mpd.network.listenAddress";
+        example = "192.168.1.1";
+        description = "The address where MPD is listening for connections.";
+      };
+
+      port = mkOption {
+        type = types.port;
+        default = config.services.mpd.network.port;
+        defaultText = "config.services.mpd.network.port";
+        description = ''
+          The port number where MPD is listening for connections.
+        '';
+      };
+
+      musicDirectory = mkOption {
+        type = types.nullOr types.path;
+        default = config.services.mpd.musicDirectory;
+        defaultText = "config.services.mpd.musicDirectory";
+        description = ''
+          If set, mpDris2 will use this directory to access music artwork.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = config.services.mpd.enable;
+        message = "The mpdris2 module requires 'services.mpd.enable = true'.";
+      }
+    ];
+
+    xdg.configFile."mpDris2/mpDris2.conf".text = toIni mpdris2Conf;
+
+    systemd.user.services.mpdris2 = {
+      Unit = {
+        Description = "MPRIS 2 support for MPD";
+        After = [ "graphical-session-pre.target" "mpd.service" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        Type = "simple";
+        ExecStart = "${cfg.package}/bin/mpDris2";
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/muchsync.nix b/home-manager/modules/services/muchsync.nix
new file mode 100644
index 00000000000..72bf737c27d
--- /dev/null
+++ b/home-manager/modules/services/muchsync.nix
@@ -0,0 +1,211 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+# Documentation was partially copied from the muchsync manual.
+# See http://www.muchsync.org/muchsync.html
+
+let
+  cfg = config.services.muchsync;
+  syncOptions = {
+    options = {
+      frequency = mkOption {
+        type = types.str;
+        default = "*:0/5";
+        description = ''
+          How often to run <command>muchsync</command>. This
+          value is passed to the systemd timer configuration as the
+          <literal>OnCalendar</literal> option. See
+          <citerefentry>
+            <refentrytitle>systemd.time</refentrytitle>
+            <manvolnum>7</manvolnum>
+          </citerefentry>
+          for more information about the format.
+        '';
+      };
+
+      sshCommand = mkOption {
+        type = types.str;
+        default = "${pkgs.openssh}/bin/ssh -CTaxq";
+        defaultText = "ssh -CTaxq";
+        description = ''
+          Specifies a command line to pass to <command>/bin/sh</command>
+          to execute a command on another machine.
+          </para><para>
+          Note that because this string is passed to the shell,
+          special characters including spaces may need to be escaped.
+        '';
+      };
+
+      upload = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to propagate local changes to the remote.
+        '';
+      };
+
+      local = {
+        checkForModifiedFiles = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Check for locally modified files.
+            Without this option, muchsync assumes that files in a maildir are
+            never edited.
+            </para><para>
+            <option>checkForModifiedFiles</option> disables certain
+            optimizations so as to make muchsync at least check the timestamp on
+            every file, which will detect modified files at the cost of a longer
+            startup time.
+            </para><para>
+            This option is useful if your software regularly modifies the
+            contents of mail files (e.g., because you are running offlineimap
+            with "synclabels = yes").
+          '';
+        };
+
+        importNew = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Whether to begin the synchronisation by running
+            <command>notmuch new</command> locally.
+          '';
+        };
+      };
+
+      remote = {
+        host = mkOption {
+          type = types.str;
+          description = ''
+            Remote SSH host to synchronize with.
+          '';
+        };
+
+        muchsyncPath = mkOption {
+          type = types.str;
+          default = "";
+          defaultText = "$PATH/muchsync";
+          description = ''
+            Specifies the path to muchsync on the server.
+            Ordinarily, muchsync should be in the default PATH on the server
+            so this option is not required.
+            However, this option is useful if you have to install muchsync in
+            a non-standard place or wish to test development versions of the
+            code.
+          '';
+        };
+
+        checkForModifiedFiles = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Check for modified files on the remote side.
+            Without this option, muchsync assumes that files in a maildir are
+            never edited.
+            </para><para>
+            <option>checkForModifiedFiles</option> disables certain
+            optimizations so as to make muchsync at least check the timestamp on
+            every file, which will detect modified files at the cost of a longer
+            startup time.
+            </para><para>
+            This option is useful if your software regularly modifies the
+            contents of mail files (e.g., because you are running offlineimap
+            with "synclabels = yes").
+          '';
+        };
+
+        importNew = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Whether to begin the synchronisation by running
+            <command>notmuch new</command> on the remote side.
+          '';
+        };
+      };
+    };
+  };
+
+in {
+  meta.maintainers = with maintainers; [ pacien ];
+
+  options.services.muchsync = {
+    remotes = mkOption {
+      type = with types; attrsOf (submodule syncOptions);
+      default = { };
+      example = literalExample ''
+        {
+          server = {
+            frequency = "*:0/10";
+            remote.host = "server.tld";
+          };
+        }
+      '';
+      description = ''
+        Muchsync remotes to synchronise with.
+      '';
+    };
+  };
+
+  config = let
+    mapRemotes = gen: with attrsets; mapAttrs'
+      (name: remoteCfg: nameValuePair "muchsync-${name}" (gen name remoteCfg))
+      cfg.remotes;
+  in mkIf (cfg.remotes != { }) {
+    assertions = [
+      {
+        assertion = config.programs.notmuch.enable;
+        message = ''
+          The muchsync module requires 'programs.notmuch.enable = true'.
+        '';
+      }
+    ];
+
+    systemd.user.services = mapRemotes (name: remoteCfg: {
+      Unit = {
+        Description = "muchsync sync service (${name})";
+      };
+      Service = {
+        CPUSchedulingPolicy = "idle";
+        IOSchedulingClass = "idle";
+        Environment = [
+          ''"PATH=${pkgs.notmuch}/bin"''
+          ''"NOTMUCH_CONFIG=${config.home.sessionVariables.NOTMUCH_CONFIG}"''
+          ''"NMBGIT=${config.home.sessionVariables.NMBGIT}"''
+        ];
+        ExecStart = concatStringsSep " " (
+          [ "${pkgs.muchsync}/bin/muchsync" ]
+          ++ [ "-s ${escapeShellArg remoteCfg.sshCommand}" ]
+          ++ optional (!remoteCfg.upload) "--noup"
+
+          # local configuration
+          ++ optional remoteCfg.local.checkForModifiedFiles "-F"
+          ++ optional (!remoteCfg.local.importNew) "--nonew"
+
+          # remote configuration
+          ++ [ (escapeShellArg remoteCfg.remote.host) ]
+          ++ optional (remoteCfg.remote.muchsyncPath != "")
+            "-r ${escapeShellArg remoteCfg.remote.muchsyncPath}"
+          ++ optional remoteCfg.remote.checkForModifiedFiles "-F"
+          ++ optional (!remoteCfg.remote.importNew) "--nonew"
+        );
+      };
+    });
+
+    systemd.user.timers = mapRemotes (name: remoteCfg: {
+      Unit = {
+        Description = "muchsync periodic sync (${name})";
+      };
+      Timer = {
+        Unit = "muchsync-${name}.service";
+        OnCalendar = remoteCfg.frequency;
+        Persistent = true;
+      };
+      Install = {
+        WantedBy = [ "timers.target" ];
+      };
+    });
+  };
+}
diff --git a/home-manager/modules/services/network-manager-applet.nix b/home-manager/modules/services/network-manager-applet.nix
new file mode 100644
index 00000000000..72a4711e39a
--- /dev/null
+++ b/home-manager/modules/services/network-manager-applet.nix
@@ -0,0 +1,42 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.network-manager-applet;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    services.network-manager-applet = {
+      enable = mkEnableOption "the Network Manager applet";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.network-manager-applet = {
+      Unit = {
+        Description = "Network Manager applet";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        ExecStart = toString (
+          [
+            "${pkgs.networkmanagerapplet}/bin/nm-applet"
+            "--sm-disable"
+          ] ++ optional config.xsession.preferStatusNotifierItems "--indicator"
+        );
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/nextcloud-client.nix b/home-manager/modules/services/nextcloud-client.nix
new file mode 100644
index 00000000000..3d8dc0bc80b
--- /dev/null
+++ b/home-manager/modules/services/nextcloud-client.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  options = {
+    services.nextcloud-client = {
+      enable = mkEnableOption "Nextcloud Client";
+    };
+  };
+
+  config = mkIf config.services.nextcloud-client.enable {
+    systemd.user.services.nextcloud-client = {
+      Unit = {
+        Description = "Nextcloud Client";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        Environment = "PATH=${config.home.profileDirectory}/bin";
+        ExecStart = "${pkgs.nextcloud-client}/bin/nextcloud";
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/owncloud-client.nix b/home-manager/modules/services/owncloud-client.nix
new file mode 100644
index 00000000000..d98a508f088
--- /dev/null
+++ b/home-manager/modules/services/owncloud-client.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  options = {
+    services.owncloud-client = {
+      enable = mkEnableOption "Owncloud Client";
+    };
+  };
+
+  config = mkIf config.services.owncloud-client.enable {
+    systemd.user.services.owncloud-client = {
+      Unit = {
+        Description = "Owncloud Client";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        Environment = "PATH=${config.home.profileDirectory}/bin";
+        ExecStart = "${pkgs.owncloud-client}/bin/owncloud";
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/parcellite.nix b/home-manager/modules/services/parcellite.nix
new file mode 100644
index 00000000000..455989ffe07
--- /dev/null
+++ b/home-manager/modules/services/parcellite.nix
@@ -0,0 +1,47 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.parcellite;
+  package = pkgs.parcellite;
+
+in
+
+{
+  meta.maintainers = [ maintainers.gleber ];
+
+  options = {
+    services.parcellite = {
+      enable = mkEnableOption "Parcellite";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ package ];
+
+    systemd.user.services.parcellite = {
+      Unit = {
+        Description = "Lightweight GTK+ clipboard manager";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        # PATH have been added in nixpkgs.parcellite, keeping it here for
+        # backward compatibility. XDG_DATA_DIRS is necessary to make it pick up
+        # icons correctly.
+        Environment = ''
+          PATH=${package}/bin:${pkgs.which}/bin:${pkgs.xdotool}/bin XDG_DATA_DIRS=${pkgs.hicolor_icon_theme}/share
+        '';
+        ExecStart = "${package}/bin/parcellite";
+        Restart = "on-abort";
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/pasystray.nix b/home-manager/modules/services/pasystray.nix
new file mode 100644
index 00000000000..8f92f34c091
--- /dev/null
+++ b/home-manager/modules/services/pasystray.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  meta.maintainers = [ maintainers.pltanton ];
+
+  options = {
+    services.pasystray = {
+      enable = mkEnableOption "PulseAudio system tray";
+    };
+  };
+
+  config = mkIf config.services.pasystray.enable {
+    systemd.user.services.pasystray = {
+        Unit = {
+          Description = "PulseAudio system tray";
+          After = [ "graphical-session-pre.target" ];
+          PartOf = [ "graphical-session.target" ];
+        };
+
+        Install = {
+          WantedBy = [ "graphical-session.target" ];
+        };
+
+        Service = {
+          Environment =
+            let
+              toolPaths = makeBinPath [ pkgs.paprefs pkgs.pavucontrol ];
+            in
+              [ "PATH=${toolPaths}" ];
+          ExecStart = "${pkgs.pasystray}/bin/pasystray";
+        };
+    };
+  };
+}
diff --git a/home-manager/modules/services/polybar.nix b/home-manager/modules/services/polybar.nix
new file mode 100644
index 00000000000..4225ed9b38c
--- /dev/null
+++ b/home-manager/modules/services/polybar.nix
@@ -0,0 +1,143 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.polybar;
+
+  eitherStrBoolIntList = with types; either str (either bool (either int (listOf str)));
+
+  toPolybarIni = generators.toINI {
+    mkKeyValue = key: value:
+      let
+        quoted = v:
+          if hasPrefix " " v || hasSuffix " " v
+          then ''"${v}"''
+          else v;
+
+        value' =
+          if isBool value then (if value then "true" else "false")
+          else if (isString value && key != "include-file") then quoted value
+          else toString value;
+      in
+        "${key}=${value'}";
+  };
+
+  configFile = pkgs.writeText "polybar.conf"
+    (toPolybarIni cfg.config + "\n" + cfg.extraConfig);
+
+in
+
+{
+  options = {
+    services.polybar = {
+      enable = mkEnableOption "Polybar status bar";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.polybar;
+        defaultText = literalExample "pkgs.polybar";
+        description = "Polybar package to install.";
+        example =  literalExample ''
+          pkgs.polybar.override {
+            i3GapsSupport = true;
+            alsaSupport = true;
+            iwSupport = true;
+            githubSupport = true;
+          }
+        '';
+      };
+
+      config = mkOption {
+        type = types.coercedTo
+          types.path
+          (p: { "section/base" = { include-file = "${p}"; }; })
+          (types.attrsOf (types.attrsOf eitherStrBoolIntList));
+        description = ''
+          Polybar configuration. Can be either path to a file, or set of attributes
+          that will be used to create the final configuration.
+        '';
+        default = {};
+        example = literalExample ''
+          {
+            "bar/top" = {
+              monitor = "\''${env:MONITOR:eDP1}";
+              width = "100%";
+              height = "3%";
+              radius = 0;
+              modules-center = "date";
+            };
+
+            "module/date" = {
+              type = "internal/date";
+              internal = 5;
+              date = "%d.%m.%y";
+              time = "%H:%M";
+              label = "%time%  %date%";
+            };
+          }
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        description = "Additional configuration to add.";
+        default = "";
+        example = ''
+          [module/date]
+          type = internal/date
+          interval = 5
+          date = "%d.%m.%y"
+          time = %H:%M
+          format-prefix-foreground = \''${colors.foreground-alt}
+          label = %time%  %date%
+        '';
+      };
+
+      script = mkOption {
+        type = types.lines;
+        description = ''
+          This script will be used to start the polybars.
+          Set all necessary environment variables here and start all bars.
+          It can be assumed that <command>polybar</command> executable is in the <envar>PATH</envar>.
+
+          Note, this script must start all bars in the background and then terminate.
+        '';
+        example = "polybar bar &";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+    xdg.configFile."polybar/config".source = configFile;
+
+    systemd.user.services.polybar = {
+      Unit = {
+        Description = "Polybar status bar";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+        X-Restart-Triggers = [
+          "${config.xdg.configFile."polybar/config".source}"
+        ];
+      };
+
+      Service = {
+        Type = "forking";
+        Environment = "PATH=${cfg.package}/bin:/run/wrappers/bin";
+        ExecStart =
+          let
+            scriptPkg = pkgs.writeShellScriptBin "polybar-start" cfg.script;
+          in
+            "${scriptPkg}/bin/polybar-start";
+        Restart = "on-failure";
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+    };
+  };
+
+}
diff --git a/home-manager/modules/services/random-background.nix b/home-manager/modules/services/random-background.nix
new file mode 100644
index 00000000000..cbec97ae7cb
--- /dev/null
+++ b/home-manager/modules/services/random-background.nix
@@ -0,0 +1,103 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.random-background;
+
+  flags = lib.concatStringsSep " " (
+    [
+      "--bg-${cfg.display}"
+      "--no-fehbg"
+      "--randomize"
+    ]
+    ++ lib.optional (!cfg.enableXinerama) "--no-xinerama"
+  );
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    services.random-background = {
+      enable = mkEnableOption "random desktop background";
+
+      imageDirectory = mkOption {
+        type = types.str;
+        example = "%h/backgrounds";
+        description = ''
+          The directory of images from which a background should be
+          chosen. Should be formatted in a way understood by systemd,
+          e.g., '%h' is the home directory.
+        '';
+      };
+
+      display = mkOption {
+        type = types.enum [ "center" "fill" "max" "scale" "tile" ];
+        default = "fill";
+        description = "Display background images according to this option.";
+      };
+
+      interval = mkOption {
+        default = null;
+        type = types.nullOr types.str;
+        example = "1h";
+        description = ''
+          The duration between changing background image, set to null
+          to only set background when logging in. Should be formatted
+          as a duration understood by systemd.
+        '';
+      };
+
+      enableXinerama = mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          Will place a separate image per screen when enabled,
+          otherwise a single image will be stretched across all
+          screens.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (
+    mkMerge ([
+      {
+        systemd.user.services.random-background = {
+          Unit = {
+            Description = "Set random desktop background using feh";
+            After = [ "graphical-session-pre.target" ];
+            PartOf = [ "graphical-session.target" ];
+          };
+
+          Service = {
+            Type = "oneshot";
+            ExecStart = "${pkgs.feh}/bin/feh ${flags} ${cfg.imageDirectory}";
+            IOSchedulingClass = "idle";
+          };
+
+          Install = {
+            WantedBy = [ "graphical-session.target" ];
+          };
+        };
+      }
+      (mkIf (cfg.interval != null) {
+        systemd.user.timers.random-background = {
+          Unit = {
+            Description = "Set random desktop background using feh";
+          };
+
+          Timer = {
+            OnUnitActiveSec = cfg.interval;
+          };
+
+          Install = {
+            WantedBy = [ "timers.target" ];
+          };
+        };
+      })
+    ]));
+}
diff --git a/home-manager/modules/services/redshift.nix b/home-manager/modules/services/redshift.nix
new file mode 100644
index 00000000000..1452fcc95ed
--- /dev/null
+++ b/home-manager/modules/services/redshift.nix
@@ -0,0 +1,172 @@
+# Adapted from Nixpkgs.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.redshift;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options.services.redshift = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      example = true;
+      description = ''
+        Enable Redshift to change your screen's colour temperature depending on
+        the time of day.
+      '';
+    };
+
+    latitude = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        Your current latitude, between <literal>-90.0</literal> and
+        <literal>90.0</literal>. Must be provided along with
+        longitude.
+      '';
+    };
+
+    longitude = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        Your current longitude, between <literal>-180.0</literal> and
+        <literal>180.0</literal>. Must be provided along with
+        latitude.
+      '';
+    };
+
+    provider = mkOption {
+      type = types.enum [ "manual" "geoclue2" ];
+      default = "manual";
+      description = ''
+        The location provider to use for determining your location. If set to
+        <literal>manual</literal> you must also provide latitude/longitude.
+        If set to <literal>geoclue2</literal>, you must also enable the global
+        geoclue2 service.
+      '';
+    };
+
+    temperature = {
+      day = mkOption {
+        type = types.int;
+        default = 5500;
+        description = ''
+          Colour temperature to use during the day, between
+          <literal>1000</literal> and <literal>25000</literal> K.
+        '';
+      };
+      night = mkOption {
+        type = types.int;
+        default = 3700;
+        description = ''
+          Colour temperature to use at night, between
+          <literal>1000</literal> and <literal>25000</literal> K.
+        '';
+      };
+    };
+
+    brightness = {
+      day = mkOption {
+        type = types.str;
+        default = "1";
+        description = ''
+          Screen brightness to apply during the day,
+          between <literal>0.1</literal> and <literal>1.0</literal>.
+        '';
+      };
+      night = mkOption {
+        type = types.str;
+        default = "1";
+        description = ''
+          Screen brightness to apply during the night,
+          between <literal>0.1</literal> and <literal>1.0</literal>.
+        '';
+      };
+    };
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.redshift;
+      defaultText = literalExample "pkgs.redshift";
+      description = ''
+        redshift derivation to use.
+      '';
+    };
+
+    tray = mkOption {
+      type = types.bool;
+      default = false;
+      example = true;
+      description = ''
+        Start the redshift-gtk tray applet.
+      '';
+    };
+
+    extraOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "-v" "-m randr" ];
+      description = ''
+        Additional command-line arguments to pass to
+        <command>redshift</command>.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion =
+          cfg.provider == "manual"
+          -> cfg.latitude != null && cfg.longitude != null;
+        message =
+          "Must provide services.redshift.latitude and"
+          + " services.redshift.latitude when"
+          + " services.redshift.provider is set to \"manual\".";
+      }
+    ];
+
+    systemd.user.services.redshift = {
+      Unit = {
+        Description = "Redshift colour temperature adjuster";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        ExecStart =
+          let
+           providerString =
+             if cfg.provider == "manual"
+             then "${cfg.latitude}:${cfg.longitude}"
+             else cfg.provider;
+
+            args = [
+              "-l ${providerString}"
+              "-t ${toString cfg.temperature.day}:${toString cfg.temperature.night}"
+              "-b ${toString cfg.brightness.day}:${toString cfg.brightness.night}"
+            ] ++ cfg.extraOptions;
+
+            command = if cfg.tray then "redshift-gtk" else "redshift";
+          in
+            "${cfg.package}/bin/${command} ${concatStringsSep " " args}";
+        RestartSec = 3;
+        Restart = "always";
+      };
+    };
+  };
+
+}
diff --git a/home-manager/modules/services/rsibreak.nix b/home-manager/modules/services/rsibreak.nix
new file mode 100644
index 00000000000..242e03432e8
--- /dev/null
+++ b/home-manager/modules/services/rsibreak.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.rsibreak;
+
+in
+
+{
+  options.services.rsibreak = {
+
+    enable = mkEnableOption "rsibreak";
+
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.rsibreak = {
+      Unit = {
+        Description = "RSI break timer";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        Environment = "PATH=${config.home.profileDirectory}/bin";
+        ExecStart = "${pkgs.rsibreak}/bin/rsibreak";
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/screen-locker.nix b/home-manager/modules/services/screen-locker.nix
new file mode 100644
index 00000000000..e3da14069bc
--- /dev/null
+++ b/home-manager/modules/services/screen-locker.nix
@@ -0,0 +1,76 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.screen-locker;
+
+in {
+
+  options.services.screen-locker = {
+    enable = mkEnableOption "screen locker for X session";
+
+    lockCmd = mkOption {
+      type = types.str;
+      description = "Locker command to run.";
+      example = "\${pkgs.i3lock}/bin/i3lock -n -c 000000";
+    };
+
+    inactiveInterval = mkOption {
+      type = types.int;
+      default = 10;
+      description = ''
+        Inactive time interval in minutes after which session will be locked.
+        The minimum is 1 minute, and the maximum is 1 hour.
+        See <link xlink:href="https://linux.die.net/man/1/xautolock"/>.
+      '';
+    };
+
+    xautolockExtraOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Extra command-line arguments to pass to <command>xautolock</command>.
+      '';
+    };
+
+    xssLockExtraOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Extra command-line arguments to pass to <command>xss-lock</command>.
+      '';
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.xautolock-session = {
+      Unit = {
+        Description = "xautolock, session locker service";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        ExecStart = concatStringsSep " " ([
+          "${pkgs.xautolock}/bin/xautolock"
+          "-detectsleep"
+          "-time ${toString cfg.inactiveInterval}"
+          "-locker '${pkgs.systemd}/bin/loginctl lock-session $XDG_SESSION_ID'"
+        ] ++ cfg.xautolockExtraOptions);
+      };
+    };
+
+    # xss-lock will run specified screen locker when the session is locked via loginctl
+    # can't be started as a systemd service,
+    # see https://bitbucket.org/raymonad/xss-lock/issues/13/allow-operation-as-systemd-user-unit
+    xsession.initExtra = "${pkgs.xss-lock}/bin/xss-lock ${concatStringsSep " " cfg.xssLockExtraOptions} -- ${cfg.lockCmd} &";
+  };
+
+}
diff --git a/home-manager/modules/services/stalonetray.nix b/home-manager/modules/services/stalonetray.nix
new file mode 100644
index 00000000000..934e78c99a1
--- /dev/null
+++ b/home-manager/modules/services/stalonetray.nix
@@ -0,0 +1,94 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.stalonetray;
+
+in
+
+{
+  options = {
+    services.stalonetray = {
+      enable = mkEnableOption "Stalonetray system tray";
+
+      package = mkOption {
+        default = pkgs.stalonetray;
+        defaultText = literalExample "pkgs.stalonetray";
+        type = types.package;
+        example = literalExample "pkgs.stalonetray";
+        description = "The package to use for the Stalonetray binary.";
+      };
+
+      config = mkOption {
+          type = with types;
+            attrsOf (nullOr (either str (either bool int)));
+          description = ''
+            Stalonetray configuration as a set of attributes.
+          '';
+          default = {};
+          example = {
+            geometry = "3x1-600+0";
+            decorations = null;
+            icon_size = 30;
+            sticky = true;
+            background = "#cccccc";
+          };
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        description = "Additional configuration lines for stalonetrayrc.";
+        default = "";
+        example = ''
+            geometry 3x1-600+0
+            decorations none
+            icon_size 30
+            sticky true
+            background "#cccccc"
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    {
+      home.packages = [ cfg.package ];
+
+      systemd.user.services.stalonetray = {
+        Unit = {
+          Description = "Stalonetray system tray";
+          After = [ "graphical-session-pre.target" ];
+          PartOf = [ "graphical-session.target" ];
+        };
+
+        Install = {
+          WantedBy = [ "graphical-session.target" ];
+        };
+
+        Service = {
+          ExecStart = "${cfg.package}/bin/stalonetray";
+          Restart = "on-failure";
+        };
+      };
+    }
+
+    (mkIf (cfg.config != {}) {
+      home.file.".stalonetrayrc".text =
+        let
+          valueToString = v:
+            if isBool v then (if v then "true" else "false")
+            else if (v==null) then "none"
+            else ''"${toString v}"'';
+        in
+          concatStrings (
+            mapAttrsToList (k: v: "${k} ${valueToString v}\n") cfg.config
+          );
+    })
+
+    (mkIf (cfg.extraConfig != "") {
+      home.file.".stalonetrayrc".text = cfg.extraConfig;
+    })
+  ]);
+}
diff --git a/home-manager/modules/services/status-notifier-watcher.nix b/home-manager/modules/services/status-notifier-watcher.nix
new file mode 100644
index 00000000000..8a2ded8720a
--- /dev/null
+++ b/home-manager/modules/services/status-notifier-watcher.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.status-notifier-watcher;
+
+in
+
+{
+  meta.maintainers = [ maintainers.pltanton ];
+
+  options = {
+    services.status-notifier-watcher = {
+      enable = mkEnableOption "Status Notifier Watcher";
+
+      package = mkOption {
+        default = pkgs.haskellPackages.status-notifier-item;
+        defaultText = literalExample "pkgs.haskellPackages.status-notifier-item";
+        type = types.package;
+        example = literalExample "pkgs.haskellPackages.status-notifier-item";
+        description = "The package to use for the status notifier watcher binary.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.status-notifier-watcher = {
+        Unit = {
+          Description = "SNI watcher";
+          After = [ "graphical-session-pre.target" ];
+          PartOf = [ "graphical-session.target" ];
+          Before = [ "taffybar.service" ];
+        };
+
+        Service = {
+          ExecStart = "${cfg.package}/bin/status-notifier-watcher";
+        };
+
+        Install = {
+          WantedBy = [ "graphical-session.target" "taffybar.service" ];
+        };
+    };
+  };
+}
diff --git a/home-manager/modules/services/sxhkd.nix b/home-manager/modules/services/sxhkd.nix
new file mode 100644
index 00000000000..d9f0a968515
--- /dev/null
+++ b/home-manager/modules/services/sxhkd.nix
@@ -0,0 +1,86 @@
+{config, lib, pkgs, ...}:
+
+with lib;
+
+let
+
+  cfg = config.services.sxhkd;
+
+  keybindingsStr = concatStringsSep "\n" (
+    mapAttrsToList (hotkey: command:
+      optionalString (command != null) ''
+        ${hotkey}
+          ${command}
+      ''
+    )
+    cfg.keybindings
+  );
+
+in
+
+{
+  options.services.sxhkd = {
+    enable = mkEnableOption "simple X hotkey daemon";
+
+    keybindings = mkOption {
+      type = types.attrsOf (types.nullOr types.str);
+      default = {};
+      description = "An attribute set that assigns hotkeys to commands.";
+      example = literalExample ''
+        {
+          "super + shift + {r,c}" = "i3-msg {restart,reload}";
+          "super + {s,w}"         = "i3-msg {stacking,tabbed}";
+        }
+      '';
+    };
+
+    extraConfig = mkOption {
+      default = "";
+      type = types.lines;
+      description = "Additional configuration to add.";
+      example = literalExample ''
+        super + {_,shift +} {1-9,0}
+          i3-msg {workspace,move container to workspace} {1-10}
+      '';
+    };
+
+    extraPath = mkOption {
+      default = "";
+      type = types.envVar;
+      description = ''
+        Additional <envar>PATH</envar> entries to search for commands.
+      '';
+      example = "/home/some-user/bin:/extra/path/bin";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.sxhkd ];
+
+    xdg.configFile."sxhkd/sxhkdrc".text = concatStringsSep "\n" [
+      keybindingsStr
+      cfg.extraConfig
+    ];
+
+    systemd.user.services.sxhkd = {
+      Unit = {
+        Description = "simple X hotkey daemon";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        Environment =
+          "PATH="
+          + "${config.home.profileDirectory}/bin"
+          + optionalString (cfg.extraPath != "") ":"
+          + cfg.extraPath;
+        ExecStart = "${pkgs.sxhkd}/bin/sxhkd";
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/syncthing.nix b/home-manager/modules/services/syncthing.nix
new file mode 100644
index 00000000000..7fc556c5234
--- /dev/null
+++ b/home-manager/modules/services/syncthing.nix
@@ -0,0 +1,68 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    services.syncthing = {
+      enable = mkEnableOption "Syncthing continuous file synchronization";
+
+      tray = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable QSyncthingTray service.";
+      };
+    };
+  };
+
+  config = mkMerge [
+    (mkIf config.services.syncthing.enable {
+      systemd.user.services = {
+        syncthing = {
+          Unit = {
+            Description = "Syncthing - Open Source Continuous File Synchronization";
+            Documentation = "man:syncthing(1)";
+            After = [ "network.target" ];
+          };
+
+          Service = {
+            ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -no-restart -logflags=0";
+            Restart = "on-failure";
+            SuccessExitStatus = [ 3 4 ];
+            RestartForceExitStatus = [ 3 4 ];
+          };
+
+          Install = {
+            WantedBy = [ "default.target" ];
+          };
+        };
+      };
+    })
+
+    (mkIf config.services.syncthing.tray {
+      systemd.user.services = {
+        qsyncthingtray = {
+          Unit = {
+            Description = "QSyncthingTray";
+            After = [ "graphical-session-pre.target"
+                      "polybar.service"
+                      "taffybar.service"
+                      "stalonetray.service" ];
+            PartOf = [ "graphical-session.target" ];
+          };
+
+          Service = {
+            Environment = "PATH=${config.home.profileDirectory}/bin";
+            ExecStart = "${pkgs.qsyncthingtray}/bin/QSyncthingTray";
+          };
+
+          Install = {
+            WantedBy = [ "graphical-session.target" ];
+          };
+        };
+      };
+    })
+  ];
+}
diff --git a/home-manager/modules/services/taffybar.nix b/home-manager/modules/services/taffybar.nix
new file mode 100644
index 00000000000..69531a19dc9
--- /dev/null
+++ b/home-manager/modules/services/taffybar.nix
@@ -0,0 +1,48 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.taffybar;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    services.taffybar = {
+      enable = mkEnableOption "Taffybar";
+
+      package = mkOption {
+        default = pkgs.taffybar;
+        defaultText = literalExample "pkgs.taffybar";
+        type = types.package;
+        example = literalExample "pkgs.taffybar";
+        description = "The package to use for the Taffybar binary.";
+      };
+    };
+  };
+
+  config = mkIf config.services.taffybar.enable {
+    systemd.user.services.taffybar = {
+      Unit = {
+        Description = "Taffybar desktop bar";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        ExecStart = "${cfg.package}/bin/taffybar";
+        Restart = "on-failure";
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+    };
+
+    xsession.importedVariables = [ "GDK_PIXBUF_MODULE_FILE" ];
+  };
+}
diff --git a/home-manager/modules/services/tahoe-lafs.nix b/home-manager/modules/services/tahoe-lafs.nix
new file mode 100644
index 00000000000..bb7be8d7db9
--- /dev/null
+++ b/home-manager/modules/services/tahoe-lafs.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    services.tahoe-lafs = {
+      enable = mkEnableOption "Tahoe-LAFS";
+    };
+  };
+
+  config = mkIf config.services.tahoe-lafs.enable {
+    systemd.user.services.tahoe-lafs = {
+        Unit = {
+          Description = "Tahoe-LAFS";
+        };
+
+        Service = {
+          ExecStart = "${pkgs.tahoelafs}/bin/tahoe run -C %h/.tahoe";
+        };
+    };
+  };
+}
diff --git a/home-manager/modules/services/taskwarrior-sync.nix b/home-manager/modules/services/taskwarrior-sync.nix
new file mode 100644
index 00000000000..4179ac8aa85
--- /dev/null
+++ b/home-manager/modules/services/taskwarrior-sync.nix
@@ -0,0 +1,58 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.taskwarrior-sync;
+
+in
+
+{
+  meta.maintainers = with maintainers; [ minijackson pacien ];
+
+  options.services.taskwarrior-sync = {
+    enable = mkEnableOption "Taskwarrior periodic sync";
+
+    frequency = mkOption {
+      type = types.str;
+      default = "*:0/5";
+      description = ''
+        How often to run <literal>taskwarrior sync</literal>. This
+        value is passed to the systemd timer configuration as the
+        <literal>OnCalendar</literal> option. See
+        <citerefentry>
+          <refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>7</manvolnum>
+        </citerefentry>
+        for more information about the format.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.taskwarrior-sync = {
+      Unit = {
+        Description = "Taskwarrior sync";
+      };
+      Service = {
+        CPUSchedulingPolicy = "idle";
+        IOSchedulingClass = "idle";
+        ExecStart = "${pkgs.taskwarrior}/bin/task synchronize";
+      };
+    };
+
+    systemd.user.timers.taskwarrior-sync = {
+      Unit = {
+        Description = "Taskwarrior periodic sync";
+      };
+      Timer = {
+        Unit = "taskwarrior-sync.service";
+        OnCalendar = cfg.frequency;
+      };
+      Install = {
+        WantedBy = [ "timers.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/udiskie.nix b/home-manager/modules/services/udiskie.nix
new file mode 100644
index 00000000000..c058a23de6c
--- /dev/null
+++ b/home-manager/modules/services/udiskie.nix
@@ -0,0 +1,95 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.udiskie;
+
+  commandArgs =
+    concatStringsSep " " (
+      map (opt: "-" + opt) [
+        (if cfg.automount then "a" else "A")
+        (if cfg.notify then "n" else "N")
+        ({ always = "t"; auto = "s"; never = "T"; }.${cfg.tray})
+      ]
+      ++ optional config.xsession.preferStatusNotifierItems "--appindicator"
+    );
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  imports = [
+    (mkRemovedOptionModule [ "services" "udiskie" "sni" ] ''
+      Support for Status Notifier Items is now configured globally through the
+
+        xsession.preferStatusNotifierItems
+
+      option. Please change to use that instead.
+    '')
+  ];
+
+  options = {
+    services.udiskie = {
+      enable = mkEnableOption "udiskie mount daemon";
+
+      automount = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Whether to automatically mount new devices.";
+      };
+
+      notify = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Whether to show pop-up notifications.";
+      };
+
+      tray = mkOption {
+        type = types.enum [ "always" "auto" "never" ];
+        default = "auto";
+        description = ''
+          Whether to display tray icon.
+          </para><para>
+          The options are
+          <variablelist>
+          <varlistentry>
+            <term><literal>always</literal></term>
+            <listitem><para>Always show tray icon.</para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>auto</literal></term>
+            <listitem><para>
+              Show tray icon only when there is a device available.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>never</literal></term>
+            <listitem><para>Never show tray icon.</para></listitem>
+          </varlistentry>
+          </variablelist>
+        '';
+      };
+    };
+  };
+
+  config = mkIf config.services.udiskie.enable {
+    systemd.user.services.udiskie = {
+        Unit = {
+          Description = "udiskie mount daemon";
+          After = [ "graphical-session-pre.target" ];
+          PartOf = [ "graphical-session.target" ];
+        };
+
+        Service = {
+          ExecStart = "${pkgs.udiskie}/bin/udiskie -2 ${commandArgs}";
+        };
+
+        Install = {
+          WantedBy = [ "graphical-session.target" ];
+        };
+    };
+  };
+}
diff --git a/home-manager/modules/services/unclutter.nix b/home-manager/modules/services/unclutter.nix
new file mode 100644
index 00000000000..6b5ac866ec5
--- /dev/null
+++ b/home-manager/modules/services/unclutter.nix
@@ -0,0 +1,63 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.unclutter;
+
+in {
+  options.services.unclutter = {
+
+    enable = mkEnableOption "unclutter";
+
+    package = mkOption {
+      description = "unclutter derivation to use.";
+      type = types.package;
+      default = pkgs.unclutter-xfixes;
+      defaultText = literalExample "pkgs.unclutter-xfixes";
+    };
+
+    timeout = mkOption {
+      description = "Number of seconds before the cursor is marked inactive.";
+      type = types.int;
+      default = 1;
+    };
+
+    threshold = mkOption {
+      description = "Minimum number of pixels considered cursor movement.";
+      type = types.int;
+      default = 1;
+    };
+
+    extraOptions = mkOption {
+      description = "More arguments to pass to the unclutter command.";
+      type = types.listOf types.str;
+      default = [ ];
+      example = [ "exclude-root" "ignore-scrolling" ];
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.unclutter = {
+      Unit = {
+        Description = "unclutter";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        ExecStart = ''
+          ${cfg.package}/bin/unclutter \
+            --timeout ${toString cfg.timeout} \
+            --jitter ${toString (cfg.threshold - 1)} \
+            ${concatMapStrings (x: " --${x}") cfg.extraOptions}
+        '';
+        RestartSec = 3;
+        Restart = "always";
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/window-managers/awesome.nix b/home-manager/modules/services/window-managers/awesome.nix
new file mode 100644
index 00000000000..fe914864e2a
--- /dev/null
+++ b/home-manager/modules/services/window-managers/awesome.nix
@@ -0,0 +1,57 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.xsession.windowManager.awesome;
+  awesome = cfg.package;
+  getLuaPath = lib: dir: "${lib}/${dir}/lua/${pkgs.luaPackages.lua.luaversion}";
+  makeSearchPath = lib.concatMapStrings (path:
+    " --search ${getLuaPath path "share"}"
+    + " --search ${getLuaPath path "lib"}"
+  );
+
+in
+
+{
+  options = {
+    xsession.windowManager.awesome = {
+      enable = mkEnableOption "Awesome window manager.";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.awesome;
+        defaultText = literalExample "pkgs.awesome";
+        description = "Package to use for running the Awesome WM.";
+      };
+
+      luaModules = mkOption {
+          default = [];
+          type = types.listOf types.package;
+          description = ''
+            List of lua packages available for being
+            used in the Awesome configuration.
+          '';
+          example = literalExample "[ luaPackages.oocairo ]";
+      };
+
+      noArgb = mkOption {
+          default = false;
+          type = types.bool;
+          description = ''
+            Disable client transparency support, which can be greatly
+            detrimental to performance in some setups
+          '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ awesome ];
+    xsession.windowManager.command = 
+      "${awesome}/bin/awesome "
+      + optionalString cfg.noArgb "--no-argb "
+      + makeSearchPath cfg.luaModules;
+  };
+}
diff --git a/home-manager/modules/services/window-managers/i3.nix b/home-manager/modules/services/window-managers/i3.nix
new file mode 100644
index 00000000000..6c52ff6c335
--- /dev/null
+++ b/home-manager/modules/services/window-managers/i3.nix
@@ -0,0 +1,836 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.xsession.windowManager.i3;
+
+  commonOptions = {
+    fonts = mkOption {
+      type = types.listOf types.str;
+      default = ["monospace 8"];
+      description = ''
+        Font list used for window titles. Only FreeType fonts are supported.
+        The order here is improtant (e.g. icons font should go before the one used for text).
+      '';
+      example = [ "FontAwesome 10" "Terminus 10" ];
+    };
+  };
+
+  startupModule = types.submodule {
+    options = {
+      command = mkOption {
+        type = types.str;
+        description = "Command that will be executed on startup.";
+      };
+
+      always = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to run command on each i3 restart.";
+      };
+
+      notification = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to enable startup-notification support for the command.
+          See <option>--no-startup-id</option> option description in the i3 user guide.
+        '';
+      };
+
+      workspace = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Launch application on a particular workspace. DEPRECATED:
+          Use <varname><link linkend="opt-xsession.windowManager.i3.config.assigns">xsession.windowManager.i3.config.assigns</link></varname>
+          instead. See <link xlink:href="https://github.com/rycee/home-manager/issues/265"/>.
+        '';
+      };
+    };
+  };
+
+  barColorSetModule = types.submodule {
+    options = {
+      border = mkOption {
+        type = types.str;
+        visible = false;
+      };
+
+      background = mkOption {
+        type = types.str;
+        visible = false;
+      };
+
+      text = mkOption {
+        type = types.str;
+        visible = false;
+      };
+    };
+  };
+
+  colorSetModule = types.submodule {
+    options = {
+      border = mkOption {
+        type = types.str;
+        visible = false;
+      };
+
+      childBorder = mkOption {
+        type = types.str;
+        visible = false;
+      };
+
+      background = mkOption {
+        type = types.str;
+        visible = false;
+      };
+
+      text = mkOption {
+        type = types.str;
+        visible = false;
+      };
+
+      indicator = mkOption {
+        type = types.str;
+        visible = false;
+      };
+    };
+  };
+
+  barModule = types.submodule {
+    options = {
+      inherit (commonOptions) fonts;
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Extra configuration lines for this bar.";
+      };
+
+      id = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Specifies the bar ID for the configured bar instance.
+          If this option is missing, the ID is set to bar-x, where x corresponds
+          to the position of the embedding bar block in the config file.
+        '';
+      };
+
+      mode = mkOption {
+        type = types.enum [ "dock" "hide" "invisible" ];
+        default = "dock";
+        description = "Bar visibility mode.";
+      };
+
+      hiddenState = mkOption {
+        type = types.enum [ "hide" "show" ];
+        default = "hide";
+        description = "The default bar mode when 'bar.mode' == 'hide'.";
+      };
+
+      position = mkOption {
+        type = types.enum [ "top" "bottom" ];
+        default = "bottom";
+        description = "The edge of the screen i3bar should show up.";
+      };
+
+      workspaceButtons = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Whether workspace buttons should be shown or not.";
+      };
+
+      workspaceNumbers = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Whether workspace numbers should be displayed within the workspace buttons.";
+      };
+
+      command = mkOption {
+        type = types.str;
+        default = "${cfg.package}/bin/i3bar";
+        defaultText = "i3bar";
+        description = "Command that will be used to start a bar.";
+        example = "\${pkgs.i3-gaps}/bin/i3bar -t";
+      };
+
+      statusCommand = mkOption {
+        type = types.str;
+        default = "${pkgs.i3status}/bin/i3status";
+        description = "Command that will be used to get status lines.";
+      };
+
+      colors = mkOption {
+        type = types.submodule {
+          options = {
+            background = mkOption {
+              type = types.str;
+              default = "#000000";
+              description = "Background color of the bar.";
+            };
+
+            statusline = mkOption {
+              type = types.str;
+              default = "#ffffff";
+              description = "Text color to be used for the statusline.";
+            };
+
+            separator = mkOption {
+              type = types.str;
+              default = "#666666";
+              description = "Text color to be used for the separator.";
+            };
+
+            focusedWorkspace = mkOption {
+              type = barColorSetModule;
+              default = { border = "#4c7899"; background = "#285577"; text = "#ffffff"; };
+              description = ''
+                Border, background and text color for a workspace button when the workspace has focus.
+              '';
+            };
+
+            activeWorkspace = mkOption {
+              type = barColorSetModule;
+              default = { border = "#333333"; background = "#5f676a"; text = "#ffffff"; };
+              description = ''
+                Border, background and text color for a workspace button when the workspace is active.
+              '';
+            };
+
+            inactiveWorkspace = mkOption {
+              type = barColorSetModule;
+              default = { border = "#333333"; background = "#222222"; text = "#888888"; };
+              description = ''
+                Border, background and text color for a workspace button when the workspace does not
+                have focus and is not active.
+              '';
+            };
+
+            urgentWorkspace = mkOption {
+              type = barColorSetModule;
+              default = { border = "#2f343a"; background = "#900000"; text = "#ffffff"; };
+              description = ''
+                Border, background and text color for a workspace button when the workspace contains
+                a window with the urgency hint set.
+              '';
+            };
+
+            bindingMode = mkOption {
+              type = barColorSetModule;
+              default = { border = "#2f343a"; background = "#900000"; text = "#ffffff"; };
+              description = "Border, background and text color for the binding mode indicator";
+            };
+          };
+        };
+        default = {};
+        description = ''
+          Bar color settings. All color classes can be specified using submodules
+          with 'border', 'background', 'text', fields and RGB color hex-codes as values.
+          See default values for the reference.
+          Note that 'background', 'status', and 'separator' parameters take a single RGB value.
+
+          See <link xlink:href="https://i3wm.org/docs/userguide.html#_colors"/>.
+        '';
+      };
+
+      trayOutput = mkOption {
+        type = types.str;
+        default = "primary";
+        description = "Where to output tray.";
+      };
+    };
+  };
+
+  windowCommandModule = types.submodule {
+    options = {
+      command = mkOption {
+        type = types.str;
+        description = "i3wm command to execute.";
+        example = "border pixel 1";
+      };
+
+      criteria = mkOption {
+        type = criteriaModule;
+        description = "Criteria of the windows on which command should be executed.";
+        example = { title = "x200: ~/work"; };
+      };
+    };
+  };
+
+  criteriaModule = types.attrsOf types.str;
+
+  configModule = types.submodule {
+    options = {
+      inherit (commonOptions) fonts;
+
+      window = mkOption {
+        type = types.submodule {
+          options = {
+            titlebar = mkOption {
+              type = types.bool;
+              default = cfg.package != pkgs.i3-gaps;
+              defaultText = "xsession.windowManager.i3.package != nixpkgs.i3-gaps (titlebar should be disabled for i3-gaps)";
+              description = "Whether to show window titlebars.";
+            };
+
+            border = mkOption {
+              type = types.int;
+              default = 2;
+              description = "Window border width.";
+            };
+
+            hideEdgeBorders = mkOption {
+              type = types.enum [ "none" "vertical" "horizontal" "both" "smart" ];
+              default = "none";
+              description = "Hide window borders adjacent to the screen edges.";
+            };
+
+            commands = mkOption {
+              type = types.listOf windowCommandModule;
+              default = [];
+              description = ''
+                List of commands that should be executed on specific windows.
+                See <option>for_window</option> i3wm option documentation.
+              '';
+              example = [ { command = "border pixel 1"; criteria = { class = "XTerm"; }; } ];
+            };
+          };
+        };
+        default = {};
+        description = "Window titlebar and border settings.";
+      };
+
+      floating = mkOption {
+        type = types.submodule {
+          options = {
+            titlebar = mkOption {
+              type = types.bool;
+              default = cfg.package != pkgs.i3-gaps;
+              defaultText = "xsession.windowManager.i3.package != nixpkgs.i3-gaps (titlebar should be disabled for i3-gaps)";
+              description = "Whether to show floating window titlebars.";
+            };
+
+            border = mkOption {
+              type = types.int;
+              default = 2;
+              description = "Floating windows border width.";
+            };
+
+            modifier = mkOption {
+              type = types.enum [ "Shift" "Control" "Mod1" "Mod2" "Mod3" "Mod4" "Mod5" ];
+              default = cfg.config.modifier;
+              defaultText = "i3.config.modifier";
+              description = "Modifier key that can be used to drag floating windows.";
+              example = "Mod4";
+            };
+
+            criteria = mkOption {
+              type = types.listOf criteriaModule;
+              default = [];
+              description = "List of criteria for windows that should be opened in a floating mode.";
+              example = [ {"title" = "Steam - Update News";} {"class" = "Pavucontrol";} ];
+            };
+          };
+        };
+        default = {};
+        description = "Floating window settings.";
+      };
+
+      focus = mkOption {
+        type = types.submodule {
+          options = {
+            newWindow = mkOption {
+              type = types.enum [ "smart" "urgent" "focus" "none" ];
+              default = "smart";
+              description = ''
+                This option modifies focus behavior on new window activation.
+
+                See <link xlink:href="https://i3wm.org/docs/userguide.html#focus_on_window_activation"/>
+              '';
+              example = "none";
+            };
+
+            followMouse = mkOption {
+              type = types.bool;
+              default = true;
+              description = "Whether focus should follow the mouse.";
+            };
+
+            forceWrapping = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Whether to force focus wrapping in tabbed or stacked container.
+
+                See <link xlink:href="https://i3wm.org/docs/userguide.html#_focus_wrapping"/>
+              '';
+            };
+
+            mouseWarping = mkOption {
+              type = types.bool;
+              default = true;
+              description = ''
+                Whether mouse cursor should be warped to the center of the window when switching focus
+                to a window on a different output.
+              '';
+            };
+          };
+        };
+        default = {};
+        description = "Focus related settings.";
+      };
+
+      assigns = mkOption {
+        type = types.attrsOf (types.listOf criteriaModule);
+        default = {};
+        description = ''
+          An attribute set that assigns applications to workspaces based
+          on criteria.
+        '';
+        example = literalExample ''
+          {
+            "1: web" = [{ class = "^Firefox$"; }];
+            "0: extra" = [{ class = "^Firefox$"; window_role = "About"; }];
+          }
+        '';
+      };
+
+      modifier = mkOption {
+        type = types.enum [ "Shift" "Control" "Mod1" "Mod2" "Mod3" "Mod4" "Mod5" ];
+        default = "Mod1";
+        description = "Modifier key that is used for all default keybindings.";
+        example = "Mod4";
+      };
+
+      workspaceLayout = mkOption {
+        type = types.enum [ "default" "stacked" "tabbed" ];
+        default = "default";
+        example = "tabbed";
+        description = ''
+          The mode in which new containers on workspace level will
+          start.
+        '';
+      };
+
+      keybindings = mkOption {
+        type = types.attrsOf (types.nullOr types.str);
+        default = mapAttrs (n: mkOptionDefault) {
+          "${cfg.config.modifier}+Return" = "exec i3-sensible-terminal";
+          "${cfg.config.modifier}+Shift+q" = "kill";
+          "${cfg.config.modifier}+d" = "exec ${pkgs.dmenu}/bin/dmenu_run";
+
+          "${cfg.config.modifier}+Left" = "focus left";
+          "${cfg.config.modifier}+Down" = "focus down";
+          "${cfg.config.modifier}+Up" = "focus up";
+          "${cfg.config.modifier}+Right" = "focus right";
+
+          "${cfg.config.modifier}+Shift+Left" = "move left";
+          "${cfg.config.modifier}+Shift+Down" = "move down";
+          "${cfg.config.modifier}+Shift+Up" = "move up";
+          "${cfg.config.modifier}+Shift+Right" = "move right";
+
+          "${cfg.config.modifier}+h" = "split h";
+          "${cfg.config.modifier}+v" = "split v";
+          "${cfg.config.modifier}+f" = "fullscreen toggle";
+
+          "${cfg.config.modifier}+s" = "layout stacking";
+          "${cfg.config.modifier}+w" = "layout tabbed";
+          "${cfg.config.modifier}+e" = "layout toggle split";
+
+          "${cfg.config.modifier}+Shift+space" = "floating toggle";
+          "${cfg.config.modifier}+space" = "focus mode_toggle";
+
+          "${cfg.config.modifier}+1" = "workspace 1";
+          "${cfg.config.modifier}+2" = "workspace 2";
+          "${cfg.config.modifier}+3" = "workspace 3";
+          "${cfg.config.modifier}+4" = "workspace 4";
+          "${cfg.config.modifier}+5" = "workspace 5";
+          "${cfg.config.modifier}+6" = "workspace 6";
+          "${cfg.config.modifier}+7" = "workspace 7";
+          "${cfg.config.modifier}+8" = "workspace 8";
+          "${cfg.config.modifier}+9" = "workspace 9";
+
+          "${cfg.config.modifier}+Shift+1" = "move container to workspace 1";
+          "${cfg.config.modifier}+Shift+2" = "move container to workspace 2";
+          "${cfg.config.modifier}+Shift+3" = "move container to workspace 3";
+          "${cfg.config.modifier}+Shift+4" = "move container to workspace 4";
+          "${cfg.config.modifier}+Shift+5" = "move container to workspace 5";
+          "${cfg.config.modifier}+Shift+6" = "move container to workspace 6";
+          "${cfg.config.modifier}+Shift+7" = "move container to workspace 7";
+          "${cfg.config.modifier}+Shift+8" = "move container to workspace 8";
+          "${cfg.config.modifier}+Shift+9" = "move container to workspace 9";
+
+          "${cfg.config.modifier}+Shift+c" = "reload";
+          "${cfg.config.modifier}+Shift+r" = "restart";
+          "${cfg.config.modifier}+Shift+e" = "exec i3-nagbar -t warning -m 'Do you want to exit i3?' -b 'Yes' 'i3-msg exit'";
+
+          "${cfg.config.modifier}+r" = "mode resize";
+        };
+        defaultText = "Default i3 keybindings.";
+        description = ''
+          An attribute set that assigns a key press to an action using a key symbol.
+          See <link xlink:href="https://i3wm.org/docs/userguide.html#keybindings"/>.
+          </para><para>
+          Consider to use <code>lib.mkOptionDefault</code> function to extend or override
+          default keybindings instead of specifying all of them from scratch.
+        '';
+        example = literalExample ''
+          let
+            modifier = xsession.windowManager.i3.config.modifier;
+          in
+
+          lib.mkOptionDefault {
+            "''${modifier}+Return" = "exec i3-sensible-terminal";
+            "''${modifier}+Shift+q" = "kill";
+            "''${modifier}+d" = "exec \${pkgs.dmenu}/bin/dmenu_run";
+          }
+        '';
+      };
+
+      keycodebindings = mkOption {
+        type = types.attrsOf (types.nullOr types.str);
+        default = {};
+        description = ''
+          An attribute set that assigns keypress to an action using key code.
+          See <link xlink:href="https://i3wm.org/docs/userguide.html#keybindings"/>.
+        '';
+        example = { "214" = "exec --no-startup-id /bin/script.sh"; };
+      };
+
+      colors = mkOption {
+        type = types.submodule {
+          options = {
+            background = mkOption {
+              type = types.str;
+              default = "#ffffff";
+              description = ''
+                Background color of the window. Only applications which do not cover
+                the whole area expose the color.
+              '';
+            };
+
+            focused = mkOption {
+              type = colorSetModule;
+              default = {
+                border = "#4c7899"; background = "#285577"; text = "#ffffff";
+                indicator = "#2e9ef4"; childBorder = "#285577";
+              };
+              description = "A window which currently has the focus.";
+            };
+
+            focusedInactive = mkOption {
+              type = colorSetModule;
+              default = {
+                border = "#333333"; background = "#5f676a"; text = "#ffffff";
+                indicator = "#484e50"; childBorder = "#5f676a";
+              };
+              description = ''
+                A window which is the focused one of its container,
+                but it does not have the focus at the moment.
+              '';
+            };
+
+            unfocused = mkOption {
+              type = colorSetModule;
+              default = {
+                border = "#333333"; background = "#222222"; text = "#888888";
+                indicator = "#292d2e"; childBorder = "#222222";
+              };
+              description = "A window which is not focused.";
+            };
+
+            urgent = mkOption {
+              type = colorSetModule;
+              default = {
+                border = "#2f343a"; background = "#900000"; text = "#ffffff";
+                indicator = "#900000"; childBorder = "#900000";
+              };
+              description = "A window which has its urgency hint activated.";
+            };
+
+            placeholder = mkOption {
+              type = colorSetModule;
+              default = {
+                border = "#000000"; background = "#0c0c0c"; text = "#ffffff";
+                indicator = "#000000"; childBorder = "#0c0c0c";
+              };
+              description = ''
+                Background and text color are used to draw placeholder window
+                contents (when restoring layouts). Border and indicator are ignored.
+              '';
+            };
+          };
+        };
+        default = {};
+        description = ''
+          Color settings. All color classes can be specified using submodules
+          with 'border', 'background', 'text', 'indicator' and 'childBorder' fields
+          and RGB color hex-codes as values. See default values for the reference.
+          Note that 'i3.config.colors.background' parameter takes a single RGB value.
+
+          See <link xlink:href="https://i3wm.org/docs/userguide.html#_changing_colors"/>.
+        '';
+      };
+
+      modes = mkOption {
+        type = types.attrsOf (types.attrsOf types.str);
+        default = {
+          resize = {
+            "Left" = "resize shrink width 10 px or 10 ppt";
+            "Down" = "resize grow height 10 px or 10 ppt";
+            "Up" = "resize shrink height 10 px or 10 ppt";
+            "Right" = "resize grow width 10 px or 10 ppt";
+            "Escape" = "mode default";
+            "Return" = "mode default";
+          };
+        };
+        description = ''
+          An attribute set that defines binding modes and keybindings
+          inside them
+
+          Only basic keybinding is supported (bindsym keycomb action),
+          for more advanced setup use 'i3.extraConfig'.
+        '';
+      };
+
+      bars = mkOption {
+        type = types.listOf barModule;
+        default = [{}];
+        description = ''
+          i3 bars settings blocks. Set to empty list to remove bars completely.
+        '';
+      };
+
+      startup = mkOption {
+        type = types.listOf startupModule;
+        default = [];
+        description = ''
+          Commands that should be executed at startup.
+
+          See <link xlink:href="https://i3wm.org/docs/userguide.html#_automatically_starting_applications_on_i3_startup"/>.
+        '';
+        example = literalExample ''
+          [
+            { command = "systemctl --user restart polybar"; always = true; notification = false; }
+            { command = "dropbox start"; notification = false; }
+            { command = "firefox"; workspace = "1: web"; }
+          ];
+        '';
+      };
+
+      gaps = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            inner = mkOption {
+              type = types.nullOr types.int;
+              default = null;
+              description = "Inner gaps value.";
+              example = 12;
+            };
+
+            outer = mkOption {
+              type = types.nullOr types.int;
+              default = null;
+              description = "Outer gaps value.";
+              example = 5;
+            };
+
+            smartGaps = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                This option controls whether to disable all gaps (outer and inner)
+                on workspace with a single container.
+              '';
+              example = true;
+            };
+
+            smartBorders = mkOption {
+              type = types.enum [ "on" "off" "no_gaps" ];
+              default = "off";
+              description = ''
+                This option controls whether to disable container borders on
+                workspace with a single container.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = ''
+          i3gaps related settings.
+          Note that i3-gaps package should be set for this options to take effect.
+        '';
+      };
+    };
+  };
+
+  keybindingsStr = keybindings: concatStringsSep "\n" (
+    mapAttrsToList (keycomb: action: optionalString (action != null) "bindsym ${keycomb} ${action}") keybindings
+  );
+
+  keycodebindingsStr = keycodebindings: concatStringsSep "\n" (
+    mapAttrsToList (keycomb: action: optionalString (action != null) "bindcode ${keycomb} ${action}") keycodebindings
+  );
+
+  colorSetStr = c: concatStringsSep " " [ c.border c.background c.text c.indicator c.childBorder ];
+  barColorSetStr = c: concatStringsSep " " [ c.border c.background c.text ];
+
+  criteriaStr = criteria: "[${concatStringsSep " " (mapAttrsToList (k: v: ''${k}="${v}"'') criteria)}]";
+
+  modeStr = name: keybindings: ''
+    mode "${name}" {
+    ${keybindingsStr keybindings}
+    }
+  '';
+
+  assignStr = workspace: criteria: concatStringsSep "\n" (
+    map (c: "assign ${criteriaStr c} ${workspace}") criteria
+  );
+
+  barStr = {
+    id, fonts, mode, hiddenState, position, workspaceButtons,
+    workspaceNumbers, command, statusCommand, colors, trayOutput, extraConfig, ...
+  }: ''
+    bar {
+      ${optionalString (id != null) "id ${id}"}
+      font pango:${concatStringsSep ", " fonts}
+      mode ${mode}
+      hidden_state ${hiddenState}
+      position ${position}
+      status_command ${statusCommand}
+      i3bar_command ${command}
+      workspace_buttons ${if workspaceButtons then "yes" else "no"}
+      strip_workspace_numbers ${if !workspaceNumbers then "yes" else "no"}
+      tray_output ${trayOutput}
+      colors {
+        background ${colors.background}
+        statusline ${colors.statusline}
+        separator ${colors.separator}
+        focused_workspace ${barColorSetStr colors.focusedWorkspace}
+        active_workspace ${barColorSetStr colors.activeWorkspace}
+        inactive_workspace ${barColorSetStr colors.inactiveWorkspace}
+        urgent_workspace ${barColorSetStr colors.urgentWorkspace}
+        binding_mode ${barColorSetStr colors.bindingMode}
+      }
+      ${extraConfig}
+    }
+  '';
+
+  gapsStr = with cfg.config.gaps; ''
+    ${optionalString (inner != null) "gaps inner ${toString inner}"}
+    ${optionalString (outer != null) "gaps outer ${toString outer}"}
+    ${optionalString smartGaps "smart_gaps on"}
+    ${optionalString (smartBorders != "off") "smart_borders ${smartBorders}"}
+  '';
+
+  floatingCriteriaStr = criteria: "for_window ${criteriaStr criteria} floating enable";
+  windowCommandsStr = { command, criteria, ... }: "for_window ${criteriaStr criteria} ${command}";
+
+  startupEntryStr = { command, always, notification, workspace, ... }: ''
+    ${if always then "exec_always" else "exec"} ${
+      if (notification && workspace == null) then "" else "--no-startup-id"
+    } ${
+      if (workspace == null) then
+        command
+      else
+        "i3-msg 'workspace ${workspace}; exec ${command}'"
+    }
+  '';
+
+  configFile = pkgs.writeText "i3.conf" ((if cfg.config != null then with cfg.config; ''
+    font pango:${concatStringsSep ", " fonts}
+    floating_modifier ${floating.modifier}
+    new_window ${if window.titlebar then "normal" else "pixel"} ${toString window.border}
+    new_float ${if floating.titlebar then "normal" else "pixel"} ${toString floating.border}
+    hide_edge_borders ${window.hideEdgeBorders}
+    force_focus_wrapping ${if focus.forceWrapping then "yes" else "no"}
+    focus_follows_mouse ${if focus.followMouse then "yes" else "no"}
+    focus_on_window_activation ${focus.newWindow}
+    mouse_warping ${if focus.mouseWarping then "output" else "none"}
+    workspace_layout ${workspaceLayout}
+
+    client.focused ${colorSetStr colors.focused}
+    client.focused_inactive ${colorSetStr colors.focusedInactive}
+    client.unfocused ${colorSetStr colors.unfocused}
+    client.urgent ${colorSetStr colors.urgent}
+    client.placeholder ${colorSetStr colors.placeholder}
+    client.background ${colors.background}
+
+    ${keybindingsStr keybindings}
+    ${keycodebindingsStr keycodebindings}
+    ${concatStringsSep "\n" (mapAttrsToList modeStr modes)}
+    ${concatStringsSep "\n" (mapAttrsToList assignStr assigns)}
+    ${concatStringsSep "\n" (map barStr bars)}
+    ${optionalString (gaps != null) gapsStr}
+    ${concatStringsSep "\n" (map floatingCriteriaStr floating.criteria)}
+    ${concatStringsSep "\n" (map windowCommandsStr window.commands)}
+    ${concatStringsSep "\n" (map startupEntryStr startup)}
+  '' else "") + "\n" + cfg.extraConfig);
+
+in
+
+{
+  options = {
+    xsession.windowManager.i3 = {
+      enable = mkEnableOption "i3 window manager.";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.i3;
+        defaultText = literalExample "pkgs.i3";
+        example = literalExample "pkgs.i3-gaps";
+        description = ''
+          i3 package to use.
+          If 'i3.config.gaps' settings are specified, 'pkgs.i3-gaps' will be set as a default package.
+        '';
+      };
+
+      config = mkOption {
+        type = types.nullOr configModule;
+        default = {};
+        description = "i3 configuration options.";
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Extra configuration lines to add to ~/.config/i3/config.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    {
+      home.packages = [ cfg.package ];
+      xsession.windowManager.command = "${cfg.package}/bin/i3";
+      xdg.configFile."i3/config" = {
+        source = configFile;
+        onChange = ''
+          i3Socket=''${XDG_RUNTIME_DIR:-/run/user/$UID}/i3/ipc-socket.*
+          if [ -S $i3Socket ]; then
+            echo "Reloading i3"
+            $DRY_RUN_CMD ${cfg.package}/bin/i3-msg -s $i3Socket reload 1>/dev/null
+          fi
+        '';
+      };
+    }
+
+    (mkIf (cfg.config != null) {
+      xsession.windowManager.i3.package = mkDefault (
+        if (cfg.config.gaps != null) then pkgs.i3-gaps else pkgs.i3
+      );
+    })
+
+    (mkIf (cfg.config != null && (any (s: s.workspace != null) cfg.config.startup)) {
+      warnings = [
+        ("'xsession.windowManager.i3.config.startup.*.workspace' is deprecated, "
+          + "use 'xsession.windowManager.i3.config.assigns' instead."
+          + "See https://github.com/rycee/home-manager/issues/265.")
+      ];
+    })
+  ]);
+}
diff --git a/home-manager/modules/services/window-managers/xmonad.nix b/home-manager/modules/services/window-managers/xmonad.nix
new file mode 100644
index 00000000000..6b3426b963b
--- /dev/null
+++ b/home-manager/modules/services/window-managers/xmonad.nix
@@ -0,0 +1,103 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.xsession.windowManager.xmonad;
+
+  xmonad = pkgs.xmonad-with-packages.override {
+    ghcWithPackages = cfg.haskellPackages.ghcWithPackages;
+    packages = self:
+      cfg.extraPackages self
+      ++ optionals cfg.enableContribAndExtras [
+        self.xmonad-contrib self.xmonad-extras
+      ];
+  };
+
+in
+
+{
+  options = {
+    xsession.windowManager.xmonad = {
+      enable = mkEnableOption "xmonad window manager";
+
+      haskellPackages = mkOption {
+        default = pkgs.haskellPackages;
+        defaultText = literalExample "pkgs.haskellPackages";
+        example = literalExample "pkgs.haskell.packages.ghc784";
+        description = ''
+          The <varname>haskellPackages</varname> used to build xmonad
+          and other packages. This can be used to change the GHC
+          version used to build xmonad and the packages listed in
+          <varname>extraPackages</varname>.
+        '';
+      };
+
+      extraPackages = mkOption {
+        default = self: [];
+        defaultText = "self: []";
+        example = literalExample ''
+          haskellPackages: [
+            haskellPackages.xmonad-contrib
+            haskellPackages.monad-logger
+          ]
+        '';
+        description = ''
+          Extra packages available to GHC when rebuilding xmonad. The
+          value must be a function which receives the attribute set
+          defined in <varname>haskellPackages</varname> as the sole
+          argument.
+        '';
+      };
+
+      enableContribAndExtras = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Enable xmonad-{contrib,extras} in xmonad.";
+      };
+
+      config = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = literalExample ''
+          pkgs.writeText "xmonad.hs" '''
+            import XMonad
+            main = xmonad defaultConfig
+                { terminal    = "urxvt"
+                , modMask     = mod4Mask
+                , borderWidth = 3
+                }
+          '''
+        '';
+        description = ''
+          The configuration file to be used for xmonad. This must be
+          an absolute path or <literal>null</literal> in which case
+          <filename>~/.xmonad/xmonad.hs</filename> will not be managed
+          by Home Manager.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    {
+      home.packages = [ (lowPrio xmonad) ];
+      xsession.windowManager.command = "${xmonad}/bin/xmonad";
+    }
+
+    (mkIf (cfg.config != null) {
+      home.file.".xmonad/xmonad.hs".source = cfg.config;
+      home.file.".xmonad/xmonad.hs".onChange = ''
+        echo "Recompiling xmonad"
+        $DRY_RUN_CMD ${config.xsession.windowManager.command} --recompile
+
+        # Attempt to restart xmonad if X is running.
+        if [[ -v DISPLAY ]] ; then
+          echo "Restarting xmonad"
+          $DRY_RUN_CMD ${config.xsession.windowManager.command} --restart
+        fi
+      '';
+    })
+  ]);
+}
diff --git a/home-manager/modules/services/xcape.nix b/home-manager/modules/services/xcape.nix
new file mode 100644
index 00000000000..26115a93062
--- /dev/null
+++ b/home-manager/modules/services/xcape.nix
@@ -0,0 +1,76 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.xcape;
+
+in
+
+{
+  meta.maintainers = [ maintainers.nickhu ];
+
+  options = {
+    services.xcape = {
+      enable = mkEnableOption "xcape";
+
+      timeout = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        example = 500;
+        description = ''
+          If you hold a key longer than this timeout, xcape will not
+          generate a key event. Default is 500 ms.
+        '';
+      };
+
+      mapExpression = mkOption {
+        type = types.attrsOf types.str;
+        default = {};
+        example = { Shift_L = "Escape"; Control_L = "Control_L|O"; };
+        description = ''
+          The value has the grammar <literal>Key[|OtherKey]</literal>.
+          </para>
+          <para>
+          The list of key names is found in the header file
+          <filename>X11/keysymdef.h</filename> (remove the
+          <literal>XK_</literal> prefix). Note that due to limitations
+          of X11 shifted keys must be specified as a shift key
+          followed by the key to be pressed rather than the actual
+          name of the character. For example to generate "{" the
+          expression <literal>Shift_L|bracketleft</literal> could be
+          used (assuming that you have a key with "{" above "[").
+          </para>
+          <para>
+          You can also specify keys in decimal (prefix #), octal (#0),
+          or hexadecimal (#0x). They will be interpreted as keycodes
+          unless no corresponding key name is found.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.xcape = {
+      Unit = {
+        Description = "xcape";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        Type = "forking";
+        ExecStart = "${pkgs.xcape}/bin/xcape"
+          + optionalString (cfg.timeout != null) " -t ${toString cfg.timeout}"
+          + optionalString (cfg.mapExpression != {})
+            " -e '${builtins.concatStringsSep ";"
+              (attrsets.mapAttrsToList (n: v: "${n}=${v}") cfg.mapExpression)}'";
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/xembed-sni-proxy.nix b/home-manager/modules/services/xembed-sni-proxy.nix
new file mode 100644
index 00000000000..d9e5ae783f9
--- /dev/null
+++ b/home-manager/modules/services/xembed-sni-proxy.nix
@@ -0,0 +1,49 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.xembed-sni-proxy;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    services.xembed-sni-proxy = {
+      enable = mkEnableOption "XEmbed SNI Proxy";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.plasma-workspace;
+        defaultText = literalExample "pkgs.plasma-workspace";
+        description = ''
+          Package containing the <command>xembedsniproxy</command>
+          program.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.xembed-sni-proxy = {
+      Unit = {
+        Description = "XEmbed SNI Proxy";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        Environment = "PATH=${config.home.profileDirectory}/bin";
+        ExecStart = "${cfg.package}/bin/xembedsniproxy";
+        Restart = "on-abort";
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/services/xscreensaver.nix b/home-manager/modules/services/xscreensaver.nix
new file mode 100644
index 00000000000..4001c294e86
--- /dev/null
+++ b/home-manager/modules/services/xscreensaver.nix
@@ -0,0 +1,56 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.xscreensaver;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    services.xscreensaver = {
+      enable = mkEnableOption "XScreenSaver";
+
+      settings = mkOption {
+        type = with types; attrsOf (either bool (either int str));
+        default = {};
+        example = {
+          mode = "blank";
+          lock = false;
+          fadeTicks = 20;
+        };
+        description = ''
+          The settings to use for XScreenSaver.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # To make the xscreensaver-command tool available.
+    home.packages = [ pkgs.xscreensaver ];
+
+    xresources.properties =
+      mapAttrs' (n: nameValuePair "xscreensaver.${n}") cfg.settings;
+
+    systemd.user.services.xscreensaver = {
+        Unit = {
+          Description = "XScreenSaver";
+          After = [ "graphical-session-pre.target" ];
+          PartOf = [ "graphical-session.target" ];
+        };
+
+        Service = {
+          ExecStart = "${pkgs.xscreensaver}/bin/xscreensaver -no-splash";
+        };
+
+        Install = {
+          WantedBy = [ "graphical-session.target" ];
+        };
+    };
+  };
+}
diff --git a/home-manager/modules/services/xsuspender.nix b/home-manager/modules/services/xsuspender.nix
new file mode 100644
index 00000000000..22a5ca536a5
--- /dev/null
+++ b/home-manager/modules/services/xsuspender.nix
@@ -0,0 +1,198 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.xsuspender;
+
+  xsuspenderOptions = types.submodule {
+    options = {
+      matchWmClassContains = mkOption {
+        description = "Match windows that wm class contains string.";
+        type = types.nullOr types.str;
+        default = null;
+      };
+
+      matchWmClassGroupContains = mkOption {
+        description = "Match windows where wm class group contains string.";
+        type = types.nullOr types.str;
+        default = null;
+      };
+
+      matchWmNameContains = mkOption {
+        description = "Match windows where wm name contains string.";
+        type = types.nullOr types.str;
+        default = null;
+      };
+
+      suspendDelay = mkOption {
+        description = "Initial suspend delay in seconds.";
+        type = types.int;
+        default = 5;
+      };
+
+      resumeEvery = mkOption {
+        description = "Resume interval in seconds.";
+        type = types.int;
+        default = 50;
+      };
+
+      resumeFor = mkOption {
+        description = "Resume duration in seconds.";
+        type = types.int;
+        default = 5;
+      };
+
+      execSuspend = mkOption {
+        description = ''
+          Before suspending, execute this shell script. If it fails,
+          abort suspension.
+        '';
+        type = types.nullOr types.str;
+        default = null;
+        example = ''echo "suspending window $XID of process $PID"'';
+      };
+
+      execResume = mkOption {
+        description = ''
+          Before resuming, execute this shell script. Resume the
+          process regardless script failure.
+        '';
+        type = types.nullOr types.str;
+        default = null;
+        example = ''echo resuming ...'';
+      };
+
+      sendSignals = mkOption {
+        description = ''
+          Whether to send SIGSTOP / SIGCONT signals or not.
+          If false just the exec scripts are run.
+        '';
+        type = types.bool;
+        default = true;
+      };
+
+      suspendSubtreePattern = mkOption {
+        description = "Also suspend descendant processes that match this regex.";
+        type = types.nullOr types.str;
+        default = null;
+      };
+
+      onlyOnBattery = mkOption {
+        description = "Whether to enable process suspend only on battery.";
+        type = types.bool;
+        default = false;
+      };
+
+      autoSuspendOnBattery = mkOption {
+        description = ''
+          Whether to auto-apply rules when switching to battery
+          power even if the window(s) didn't just lose focus.
+        '';
+        type = types.bool;
+        default = true;
+      };
+
+      downclockOnBattery = mkOption {
+        description = ''
+          Limit CPU consumption for this factor when on battery power.
+          Value 1 means 50% decrease, 2 means 66%, 3 means 75% etc.
+        '';
+        type = types.int;
+        default = 0;
+      };
+    };
+  };
+
+in
+
+{
+  meta.maintainers = [ maintainers.offline ];
+
+  options = {
+    services.xsuspender = {
+      enable = mkEnableOption "XSuspender";
+
+      defaults = mkOption {
+        description = "XSuspender defaults.";
+        type = xsuspenderOptions;
+        default = {};
+      };
+
+      rules = mkOption {
+        description = "Attribute set of XSuspender rules.";
+        type = types.attrsOf xsuspenderOptions;
+        default = {};
+        example = {
+          Chromium = {
+            suspendDelay = 10;
+            matchWmClassContains = "chromium-browser";
+            suspendSubtreePattern = "chromium";
+          };
+        };
+      };
+
+      debug = mkOption {
+        description = "Whether to enable debug output.";
+        type = types.bool;
+        default = false;
+      };
+
+      iniContent = mkOption {
+        type = types.attrsOf types.attrs;
+        internal = true;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xsuspender.iniContent =
+      let
+        mkSection = values: filterAttrs (_: v: v != null) {
+          match_wm_class_contains = values.matchWmClassContains;
+          match_wm_class_group_contains = values.matchWmClassGroupContains;
+          match_wm_name_contains = values.matchWmNameContains;
+          suspend_delay = values.suspendDelay;
+          resume_every = values.resumeEvery;
+          resume_for = values.resumeFor;
+          exec_suspend = values.execSuspend;
+          exec_resume = values.execResume;
+          send_signals = values.sendSignals;
+          suspend_subtree_pattern = values.suspendSubtreePattern;
+          only_on_battery = values.onlyOnBattery;
+          auto_suspend_on_battery = values.autoSuspendOnBattery;
+          downclock_on_battery = values.downclockOnBattery;
+        };
+      in
+        {
+          Default = mkSection cfg.defaults;
+        }
+        // mapAttrs (_: mkSection) cfg.rules;
+
+    # To make the xsuspender tool available.
+    home.packages = [ pkgs.xsuspender ];
+
+    xdg.configFile."xsuspender.conf".text = generators.toINI {} cfg.iniContent;
+
+    systemd.user.services.xsuspender = {
+      Unit = {
+        Description = "XSuspender";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+        X-Restart-Triggers = [
+          "${config.xdg.configFile."xsuspender.conf".source}"
+        ];
+      };
+
+      Service = {
+        ExecStart = "${pkgs.xsuspender}/bin/xsuspender";
+        Environment = mkIf cfg.debug [ "G_MESSAGE_DEBUG=all" ];
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/systemd-activate.rb b/home-manager/modules/systemd-activate.rb
new file mode 100644
index 00000000000..8382c840e93
--- /dev/null
+++ b/home-manager/modules/systemd-activate.rb
@@ -0,0 +1,203 @@
+require 'set'
+require 'open3'
+require 'shellwords'
+
+@dry_run = ENV['DRY_RUN']
+@verbose = ENV['VERBOSE']
+
+UnitsDir = 'home-files/.config/systemd/user'
+
+# 1. Stop all services from the old generation that are not present in the new generation.
+# 2. Ensure all services from the new generation that are wanted by active targets are running:
+#    - Start services that are not already running.
+#    - Restart services whose unit config files have changed between generations.
+# 3. If any services were (re)started, wait 'start_timeout_ms' and report services
+#    that failed to start. This helps debugging quickly failing services.
+#
+# Whenever service failures are detected, show the output of
+# 'systemd --user status' for the affected services.
+#
+def setup_services(old_gen_path, new_gen_path, start_timeout_ms_string)
+  start_timeout_ms = start_timeout_ms_string.to_i
+
+  old_units_path = File.join(old_gen_path, UnitsDir) unless old_gen_path.empty?
+  new_units_path = File.join(new_gen_path, UnitsDir)
+
+  old_services = get_services(old_units_path)
+  new_services = get_services(new_units_path)
+
+  exit if old_services.empty? && new_services.empty?
+
+  # These services should be running when this script is finished
+  services_to_run = get_services_to_run(new_units_path)
+  maybe_changed_services = services_to_run & old_services
+
+  # Only stop active services, otherwise we might get a 'service not loaded' error
+  # for inactive services that were removed in the current generation.
+  to_stop = get_active_units(old_services - new_services)
+  to_restart = get_changed_services(old_units_path, new_units_path, maybe_changed_services)
+  to_start = get_inactive_units(services_to_run - to_restart)
+
+  raise "daemon-reload failed" unless run_cmd('systemctl --user daemon-reload')
+
+  # Exclude services that aren't allowed to be manually started or stopped
+  no_manual_start, no_manual_stop, no_restart = get_restricted_units(to_stop + to_restart + to_start)
+  to_stop -= no_manual_stop + no_restart
+  to_restart -= no_manual_stop + no_manual_start + no_restart
+  to_start -= no_manual_start
+
+  puts "Not restarting: #{no_restart.join(' ')}" unless no_restart.empty?
+
+  if to_stop.empty? && to_start.empty? && to_restart.empty?
+    print_service_msg("All services are already running", services_to_run)
+  else
+    puts "Setting up services" if @verbose
+    systemctl('stop', to_stop)
+    systemctl('start', to_start)
+    systemctl('restart', to_restart)
+    started_services = to_start + to_restart
+    if start_timeout_ms > 0 && !started_services.empty? && !@dry_run
+      failed = wait_and_get_failed_services(started_services, start_timeout_ms)
+      if failed.empty?
+        print_service_msg("All services are running", services_to_run)
+      else
+        puts
+        puts "Error. These services failed to start:", failed
+        show_failed_services_status(failed)
+        exit 1
+      end
+    end
+  end
+end
+
+def get_services(dir)
+  services = get_service_files(dir) if dir && Dir.exists?(dir)
+  Set.new(services)
+end
+
+def get_service_files(dir)
+  Dir.chdir(dir) { Dir['*.{service,socket}'] }
+end
+
+def get_changed_services(dir_a, dir_b, services)
+  services.select do |service|
+    a = File.join(dir_a, service)
+    b = File.join(dir_b, service)
+    (File.size(a) != File.size(b)) || (File.read(a) != File.read(b))
+  end
+end
+
+TargetDirRegexp = /^(.*\.target)\.wants$/
+
+# @return all services wanted by active targets
+def get_services_to_run(units_dir)
+  return Set.new unless Dir.exists?(units_dir)
+  targets = Dir.entries(units_dir).map { |entry| entry[TargetDirRegexp, 1] }.compact
+  active_targets = get_active_units(targets)
+  services_to_run = active_targets.map do |target|
+    get_service_files(File.join(units_dir, "#{target}.wants"))
+  end.flatten
+  Set.new(services_to_run)
+end
+
+# @return true on success
+def run_cmd(cmd)
+  print_cmd cmd
+  @dry_run || system(cmd)
+end
+
+def systemctl(cmd, services)
+  return if services.empty?
+
+  verb = (cmd == 'stop') ? 'Stopping' : "#{cmd.capitalize}ing"
+  puts "#{verb}: #{services.join(' ')}"
+
+  cmd = ['systemctl', '--user', cmd, *services]
+  if @dry_run
+    puts cmd
+    return
+  end
+
+  output, status = Open3.capture2e(*cmd)
+  print output
+  # Show status for failed services
+  unless status.success?
+    # Due to a bug in systemd, the '--user' argument is not always provided
+    output.scan(/systemctl (?:--user )?(status .*?)['"]/).flatten.each do |status_cmd|
+      puts
+      run_cmd("systemctl --user #{status_cmd}")
+    end
+    exit 1
+  end
+end
+
+def print_cmd(cmd)
+  puts cmd if @verbose || @dry_run
+end
+
+def get_active_units(units)
+  get_units_by_activity(units, true)
+end
+
+def get_inactive_units(units)
+  get_units_by_activity(units, false)
+end
+
+def get_units_by_activity(units, active)
+  return [] if units.empty?
+  units = units.to_a
+  is_active = `systemctl --user is-active #{units.shelljoin}`.split
+  units.select.with_index do |_, i|
+    (is_active[i] == 'active') == active
+  end
+end
+
+def get_restricted_units(units)
+  units = units.to_a
+  infos = `systemctl --user show -p RefuseManualStart -p RefuseManualStop #{units.shelljoin}`
+          .split("\n\n")
+  no_restart = []
+  no_manual_start = []
+  no_manual_stop = []
+  infos.zip(units).each do |info, unit|
+    no_start, no_stop = info.split("\n")
+    no_manual_start << unit if no_start.end_with?('yes')
+    no_manual_stop << unit if no_stop.end_with?('yes')
+  end
+  # Regular expression that indicates that a service should not be
+  # restarted even if a change has been detected.
+  restartRe = /^[ \t]*X-RestartIfChanged[ \t]*=[ \t]*false[ \t]*(?:#.*)?$/
+  units.each do |unit|
+    if `systemctl --user cat #{unit.shellescape}` =~ restartRe
+      no_restart << unit
+    end
+  end
+  [no_manual_start, no_manual_stop, no_restart]
+end
+
+def wait_and_get_failed_services(services, start_timeout_ms)
+  puts "Waiting #{start_timeout_ms} ms for services to fail"
+  # Force the previous message to always be visible before sleeping
+  STDOUT.flush
+  sleep(start_timeout_ms / 1000.0)
+  get_inactive_units(services)
+end
+
+def show_failed_services_status(services)
+  puts
+  services.each do |service|
+    run_cmd("systemctl --user status #{service.shellescape}")
+    puts
+  end
+end
+
+def print_service_msg(msg, services)
+  return if services.empty?
+  if @verbose
+    puts "#{msg}:", services.to_a
+  else
+    puts msg
+  end
+end
+
+setup_services(*ARGV)
diff --git a/home-manager/modules/systemd-activate.sh b/home-manager/modules/systemd-activate.sh
new file mode 100644
index 00000000000..1c464693cfc
--- /dev/null
+++ b/home-manager/modules/systemd-activate.sh
@@ -0,0 +1,114 @@
+#!/usr/bin/env bash
+
+function isStartable() {
+  local service="$1"
+  [[ $(systemctl --user show -p RefuseManualStart "$service") == *=no ]]
+}
+
+function isStoppable() {
+  if [[ -v oldGenPath ]] ; then
+    local service="$1"
+    [[ $(systemctl --user show -p RefuseManualStop "$service") == *=no ]]
+  fi
+}
+
+function systemdPostReload() {
+  local workDir
+  workDir="$(mktemp -d)"
+
+  if [[ -v oldGenPath ]] ; then
+    local oldUserServicePath="$oldGenPath/home-files/.config/systemd/user"
+  fi
+
+  local newUserServicePath="$newGenPath/home-files/.config/systemd/user"
+  local oldServiceFiles="$workDir/old-files"
+  local newServiceFiles="$workDir/new-files"
+  local servicesDiffFile="$workDir/diff-files"
+
+  if [[ ! (-v oldUserServicePath && -d "$oldUserServicePath") \
+      && ! -d "$newUserServicePath" ]]; then
+    return
+  fi
+
+  if [[ ! (-v oldUserServicePath && -d "$oldUserServicePath") ]]; then
+    touch "$oldServiceFiles"
+  else
+    find "$oldUserServicePath" \
+      -maxdepth 1 -name '*.service' -exec basename '{}' ';' \
+      | sort \
+      > "$oldServiceFiles"
+  fi
+
+  if [[ ! -d "$newUserServicePath" ]]; then
+    touch "$newServiceFiles"
+  else
+    find "$newUserServicePath" \
+      -maxdepth 1 -name '*.service' -exec basename '{}' ';' \
+      | sort \
+      > "$newServiceFiles"
+  fi
+
+  diff \
+    --new-line-format='+%L' \
+    --old-line-format='-%L' \
+    --unchanged-line-format=' %L' \
+    "$oldServiceFiles" "$newServiceFiles" \
+    > "$servicesDiffFile" || true
+
+  local -a maybeRestart=( $(grep '^ ' "$servicesDiffFile" | cut -c2-) )
+  local -a maybeStop=( $(grep '^-' "$servicesDiffFile" | cut -c2-) )
+  local -a maybeStart=( $(grep '^+' "$servicesDiffFile" | cut -c2-) )
+  local -a toRestart=( )
+  local -a toStop=( )
+  local -a toStart=( )
+
+  for f in "${maybeRestart[@]}" ; do
+    if isStoppable "$f" \
+        && isStartable "$f" \
+        && systemctl --quiet --user is-active "$f" \
+        && ! cmp --quiet \
+            "$oldUserServicePath/$f" \
+            "$newUserServicePath/$f" ; then
+      toRestart+=("$f")
+    fi
+  done
+
+  for f in "${maybeStop[@]}" ; do
+    if isStoppable "$f" ; then
+      toStop+=("$f")
+    fi
+  done
+
+  for f in "${maybeStart[@]}" ; do
+    if isStartable "$f" ; then
+      toStart+=("$f")
+    fi
+  done
+
+  rm -r "$workDir"
+
+  local sugg=""
+
+  if [[ -n "${toRestart[@]}" ]] ; then
+    sugg="${sugg}systemctl --user restart ${toRestart[@]}\n"
+  fi
+
+  if [[ -n "${toStop[@]}" ]] ; then
+    sugg="${sugg}systemctl --user stop ${toStop[@]}\n"
+  fi
+
+  if [[ -n "${toStart[@]}" ]] ; then
+    sugg="${sugg}systemctl --user start ${toStart[@]}\n"
+  fi
+
+  if [[ -n "$sugg" ]] ; then
+    echo "Suggested commands:"
+    echo -n -e "$sugg"
+  fi
+}
+
+oldGenPath="$1"
+newGenPath="$2"
+
+$DRY_RUN_CMD systemctl --user daemon-reload
+systemdPostReload
diff --git a/home-manager/modules/systemd.nix b/home-manager/modules/systemd.nix
new file mode 100644
index 00000000000..cdc4486f542
--- /dev/null
+++ b/home-manager/modules/systemd.nix
@@ -0,0 +1,258 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.systemd.user;
+
+  dag = config.lib.dag;
+
+  enabled = cfg.services != {}
+      || cfg.sockets != {}
+      || cfg.targets != {}
+      || cfg.timers != {}
+      || cfg.paths != {}
+      || cfg.sessionVariables != {};
+
+  toSystemdIni = generators.toINI {
+    mkKeyValue = key: value:
+      let
+        value' =
+          if isBool value then (if value then "true" else "false")
+          else toString value;
+      in
+        "${key}=${value'}";
+  };
+
+  buildService = style: name: serviceCfg:
+    let
+      filename = "${name}.${style}";
+      pathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"]
+                                      ["-" "-" "-"  ""  "" ]
+                                      filename;
+
+      # Needed because systemd derives unit names from the ultimate
+      # link target.
+      source = pkgs.writeTextFile {
+        name = pathSafeName;
+        text = toSystemdIni serviceCfg;
+        destination = "/${filename}";
+      } + "/${filename}";
+
+      wantedBy = target:
+        {
+          name = "systemd/user/${target}.wants/${filename}";
+          value = { inherit source; };
+        };
+    in
+      singleton {
+        name = "systemd/user/${filename}";
+        value = { inherit source; };
+      }
+      ++
+      map wantedBy (serviceCfg.Install.WantedBy or []);
+
+  buildServices = style: serviceCfgs:
+    concatLists (mapAttrsToList (buildService style) serviceCfgs);
+
+  servicesStartTimeoutMs = builtins.toString cfg.servicesStartTimeoutMs;
+
+  unitType = unitKind: with types;
+    let
+      primitive = either bool (either int str);
+    in
+      attrsOf (attrsOf (attrsOf (either primitive (listOf primitive))))
+      // {
+        description = "systemd ${unitKind} unit configuration";
+      };
+
+  unitDescription = type: ''
+    Definition of systemd per-user ${type} units. Attributes are
+    merged recursively.
+    </para><para>
+    Note that the attributes follow the capitalization and naming used
+    by systemd. More details can be found in
+    <citerefentry>
+      <refentrytitle>systemd.${type}</refentrytitle>
+      <manvolnum>5</manvolnum>
+    </citerefentry>.
+  '';
+
+  unitExample = type: literalExample ''
+    {
+      ${toLower type}-name = {
+        Unit = {
+          Description = "Example description";
+          Documentation = [ "man:example(1)" "man:example(5)" ];
+        };
+
+        ${type} = {
+          …
+        };
+      }
+    };
+  '';
+
+  sessionVariables = mkIf (cfg.sessionVariables != {}) {
+    "environment.d/10-home-manager.conf".text =
+      concatStringsSep "\n" (
+        mapAttrsToList (n: v: "${n}=${toString v}") cfg.sessionVariables
+      ) + "\n";
+    };
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    systemd.user = {
+      systemctlPath = mkOption {
+        default = "${pkgs.systemd}/bin/systemctl";
+        defaultText = "\${pkgs.systemd}/bin/systemctl";
+        type = types.str;
+        description = ''
+          Absolute path to the <command>systemctl</command> tool. This
+          option may need to be set if running Home Manager on a
+          non-NixOS distribution.
+        '';
+      };
+
+      services = mkOption {
+        default = {};
+        type = unitType "service";
+        description = unitDescription "service";
+        example = unitExample "Service";
+      };
+
+      sockets = mkOption {
+        default = {};
+        type = unitType "socket";
+        description = unitDescription "socket";
+        example = unitExample "Socket";
+      };
+
+      targets = mkOption {
+        default = {};
+        type = unitType "target";
+        description = unitDescription "target";
+        example = unitExample "Target";
+      };
+
+      timers = mkOption {
+        default = {};
+        type = unitType "timer";
+        description = unitDescription "timer";
+        example = unitExample "Timer";
+      };
+
+      paths = mkOption {
+        default = {};
+        type = unitType "path";
+        description = unitDescription "path";
+        example = unitExample "Path";
+      };
+
+      startServices = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Start all services that are wanted by active targets.
+          Additionally, stop obsolete services from the previous
+          generation.
+        '';
+      };
+
+      servicesStartTimeoutMs = mkOption {
+        default = 0;
+        type = types.int;
+        description = ''
+          How long to wait for started services to fail until their
+          start is considered successful.
+        '';
+      };
+
+      sessionVariables = mkOption {
+        default = {};
+        type = with types; attrsOf (either int str);
+        example = { EDITOR = "vim"; };
+        description = ''
+          Environment variables that will be set for the user session.
+          The variable values must be as described in
+          <citerefentry>
+            <refentrytitle>environment.d</refentrytitle>
+            <manvolnum>5</manvolnum>
+          </citerefentry>.
+        '';
+      };
+    };
+  };
+
+  config = mkMerge [
+    {
+      assertions = [
+        {
+          assertion = enabled -> pkgs.stdenv.isLinux;
+          message =
+            let
+              names = concatStringsSep ", " (
+                  attrNames (
+                      cfg.services // cfg.sockets // cfg.targets // cfg.timers // cfg.paths // cfg.sessionVariables
+                  )
+              );
+            in
+              "Must use Linux for modules that require systemd: " + names;
+        }
+      ];
+    }
+
+    # If we run under a Linux system we assume that systemd is
+    # available, in particular we assume that systemctl is in PATH.
+    (mkIf pkgs.stdenv.isLinux {
+      xdg.configFile = mkMerge [
+        (listToAttrs (
+          (buildServices "service" cfg.services)
+          ++
+          (buildServices "socket" cfg.sockets)
+          ++
+          (buildServices "target" cfg.targets)
+          ++
+          (buildServices "timer" cfg.timers)
+          ++
+          (buildServices "path" cfg.paths)
+          ))
+
+          sessionVariables
+        ];
+
+      # Run systemd service reload if user is logged in. If we're
+      # running this from the NixOS module then XDG_RUNTIME_DIR is not
+      # set and systemd commands will fail. We'll therefore have to
+      # set it ourselves in that case.
+      home.activation.reloadSystemD = dag.entryAfter ["linkGeneration"] (
+        let
+          autoReloadCmd = ''
+            ${pkgs.ruby}/bin/ruby ${./systemd-activate.rb} \
+              "''${oldGenPath=}" "$newGenPath" "${servicesStartTimeoutMs}"
+          '';
+
+          legacyReloadCmd = ''
+            bash ${./systemd-activate.sh} "''${oldGenPath=}" "$newGenPath"
+          '';
+
+          ensureRuntimeDir = "XDG_RUNTIME_DIR=\${XDG_RUNTIME_DIR:-/run/user/$(id -u)}";
+        in
+          ''
+            if ${ensureRuntimeDir} ${cfg.systemctlPath} --quiet --user is-system-running 2> /dev/null; then
+              ${ensureRuntimeDir} \
+              PATH=${dirOf cfg.systemctlPath}:$PATH \
+                ${if cfg.startServices then autoReloadCmd else legacyReloadCmd}
+            else
+              echo "User systemd daemon not running. Skipping reload."
+            fi
+          ''
+      );
+    })
+  ];
+}
diff --git a/home-manager/modules/xcursor.nix b/home-manager/modules/xcursor.nix
new file mode 100644
index 00000000000..171586028cd
--- /dev/null
+++ b/home-manager/modules/xcursor.nix
@@ -0,0 +1,83 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.xsession.pointerCursor;
+
+  cursorType = types.submodule {
+    options = {
+      package = mkOption {
+        type = types.package;
+        example = literalExample "pkgs.vanilla-dmz";
+        description = "Package providing the cursor theme.";
+      };
+
+      name = mkOption {
+        type = types.str;
+        example = "Vanilla-DMZ";
+        description = "The cursor name within the package.";
+      };
+
+      size = mkOption {
+        type = types.int;
+        default = 32;
+        example = 64;
+        description = "The cursor size.";
+      };
+
+      defaultCursor = mkOption {
+        type = types.str;
+        default = "left_ptr";
+        example = "X_cursor";
+        description = "The default cursor file to use within the package.";
+      };
+    };
+  };
+
+in
+
+{
+  meta.maintainers = [ maintainers.league ];
+
+  options = {
+    xsession.pointerCursor = mkOption {
+      type = types.nullOr cursorType;
+      default = null;
+      description = ''
+        The X cursor theme and settings. The package
+        <varname>xorg.xcursorthemes</varname> contains cursors named
+        whiteglass, redglass, and handhelds. The package
+        <varname>vanilla-dmz</varname> contains cursors named Vanilla-DMZ
+        and Vanilla-DMZ-AA. Note: handhelds does not seem to work at
+        custom sizes.
+      '';
+    };
+  };
+
+  config = mkIf (cfg != null) {
+
+    home.packages = [cfg.package];
+
+    xsession.initExtra = ''
+      ${pkgs.xorg.xsetroot}/bin/xsetroot -xcf ${cfg.package}/share/icons/${cfg.name}/cursors/${cfg.defaultCursor} ${toString cfg.size}
+    '';
+
+    xresources.properties = {
+      "Xcursor.theme" = cfg.name;
+      "Xcursor.size"  = cfg.size;
+    };
+
+    gtk.gtk2.extraConfig = ''
+      gtk-cursor-theme-name="${cfg.name}"
+      gtk-cursor-theme-size=${toString cfg.size}
+    '';
+
+    gtk.gtk3.extraConfig = {
+      "gtk-cursor-theme-name" = cfg.name;
+      "gtk-cursor-theme-size" = cfg.size;
+    };
+
+  };
+}
diff --git a/home-manager/modules/xresources.nix b/home-manager/modules/xresources.nix
new file mode 100644
index 00000000000..384008e2450
--- /dev/null
+++ b/home-manager/modules/xresources.nix
@@ -0,0 +1,85 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.xresources;
+
+  formatLine = n: v:
+    let
+      formatList = x:
+        if isList x
+        then throw "can not convert 2-dimensional lists to Xresources format"
+        else formatValue x;
+
+      formatValue = v:
+        if isBool v then (if v then "true" else "false")
+        else if isList v then concatMapStringsSep ", " formatList v
+        else toString v;
+    in
+      "${n}: ${formatValue v}";
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    xresources.properties = mkOption {
+      type = types.nullOr types.attrs;
+      default = null;
+      example = {
+        "Emacs*toolBar" = 0;
+        "XTerm*faceName" = "dejavu sans mono";
+        "XTerm*charClass" = [ "37:48" "45-47:48" "58:48" "64:48" "126:48" ];
+      };
+      description = ''
+        X server resources that should be set.
+        Booleans are formatted as "true" or "false" respectively.
+        List elements are recursively formatted as a string and joined by commas.
+        All other values are directly formatted using builtins.toString. 
+        Note, that 2-dimensional lists are not supported and specifying one will throw an exception.
+        If this and all other xresources options are
+        <code>null</code>, then this feature is disabled and no
+        <filename>~/.Xresources</filename> link is produced.
+      '';
+    };
+
+    xresources.extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      example = literalExample ''
+        builtins.readFile (
+            pkgs.fetchFromGitHub {
+                owner = "solarized";
+                repo = "xresources";
+                rev = "025ceddbddf55f2eb4ab40b05889148aab9699fc";
+                sha256 = "0lxv37gmh38y9d3l8nbnsm1mskcv10g3i83j0kac0a2qmypv1k9f";
+            } + "/Xresources.dark"
+        )
+      '';
+      description = ''
+        Additional X server resources contents.
+        If this and all other xresources options are
+        <code>null</code>, then this feature is disabled and no
+        <filename>~/.Xresources</filename> link is produced.
+      '';
+    };
+  };
+
+  config = mkIf (cfg.properties != null || cfg.extraConfig != "") {
+    home.file.".Xresources" = {
+      text =
+        concatStringsSep "\n" ([]
+          ++ optional (cfg.extraConfig != "") cfg.extraConfig
+          ++ optionals (cfg.properties != null) (mapAttrsToList formatLine cfg.properties)
+        ) + "\n";
+      onChange = ''
+        if [[ -v DISPLAY ]] ; then
+          $DRY_RUN_CMD ${pkgs.xorg.xrdb}/bin/xrdb -merge $HOME/.Xresources
+        fi
+      '';
+    };
+  };
+}
diff --git a/home-manager/modules/xsession.nix b/home-manager/modules/xsession.nix
new file mode 100644
index 00000000000..e1cf9942e7c
--- /dev/null
+++ b/home-manager/modules/xsession.nix
@@ -0,0 +1,176 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.xsession;
+
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options = {
+    xsession = {
+      enable = mkEnableOption "X Session";
+
+      scriptPath = mkOption {
+        type = types.str;
+        default = ".xsession";
+        example = ".xsession-hm";
+        description = ''
+          Path, relative <envar>HOME</envar>, where Home Manager
+          should write the X session script.
+        '';
+      };
+
+      windowManager.command = mkOption {
+        type = types.str;
+        example = literalExample ''
+          let
+            xmonad = pkgs.xmonad-with-packages.override {
+              packages = self: [ self.xmonad-contrib self.taffybar ];
+            };
+          in
+            "''${xmonad}/bin/xmonad";
+        '';
+        description = ''
+          Window manager start command.
+        '';
+      };
+
+      preferStatusNotifierItems = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = ''
+          Whether tray applets should prefer using the Status Notifier
+          Items (SNI) protocol, commonly called App Indicators. Note,
+          not all tray applets or status bars support SNI.
+        '';
+      };
+
+      profileExtra = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Extra shell commands to run before session start.";
+      };
+
+      initExtra = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Extra shell commands to run during initialization.";
+      };
+
+      importedVariables = mkOption {
+        type = types.listOf (types.strMatching "[a-zA-Z_][a-zA-Z0-9_]*");
+        example = [ "GDK_PIXBUF_ICON_LOADER" ];
+        visible = false;
+        description = ''
+          Environment variables to import into the user systemd
+          session. The will be available for use by graphical
+          services.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    xsession.importedVariables = [
+      "DBUS_SESSION_BUS_ADDRESS"
+      "DISPLAY"
+      "SSH_AUTH_SOCK"
+      "XAUTHORITY"
+      "XDG_DATA_DIRS"
+      "XDG_RUNTIME_DIR"
+      "XDG_SESSION_ID"
+    ];
+
+    systemd.user = {
+      services = mkIf (config.home.keyboard != null) {
+        setxkbmap =  {
+          Unit = {
+            Description = "Set up keyboard in X";
+            After = [ "graphical-session-pre.target" ];
+            PartOf = [ "graphical-session.target" ];
+          };
+
+          Install = {
+            WantedBy = [ "graphical-session.target" ];
+          };
+
+          Service = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+            ExecStart =
+              with config.home.keyboard;
+              let
+                args =
+                  optional (layout != null) "-layout '${layout}'"
+                  ++ optional (variant != null) "-variant '${variant}'"
+                  ++ optional (model != null) "-model '${model}'"
+                  ++ map (v: "-option '${v}'") options;
+              in
+                "${pkgs.xorg.setxkbmap}/bin/setxkbmap ${toString args}";
+          };
+        };
+      };
+
+      # A basic graphical session target for Home Manager.
+      targets.hm-graphical-session = {
+        Unit = {
+          Description = "Home Manager X session";
+          Requires = [ "graphical-session-pre.target" ];
+          BindsTo = [ "graphical-session.target" ];
+        };
+      };
+    };
+
+    home.file.".xprofile".text = ''
+        . "${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh"
+
+        if [ -e "$HOME/.profile" ]; then
+          . "$HOME/.profile"
+        fi
+
+        # If there are any running services from a previous session.
+        # Need to run this in xprofile because the NixOS xsession
+        # script starts up graphical-session.target.
+        systemctl --user stop graphical-session.target graphical-session-pre.target
+
+        ${optionalString (cfg.importedVariables != []) (
+          "systemctl --user import-environment "
+            + toString (unique cfg.importedVariables)
+        )}
+
+        ${cfg.profileExtra}
+
+        export HM_XPROFILE_SOURCED=1
+    '';
+
+    home.file.${cfg.scriptPath} = {
+      executable = true;
+      text = ''
+        if [ -z "$HM_XPROFILE_SOURCED" ]; then
+          . ~/.xprofile
+        fi
+        unset HM_XPROFILE_SOURCED
+
+        systemctl --user start hm-graphical-session.target
+
+        ${cfg.initExtra}
+
+        ${cfg.windowManager.command}
+
+        systemctl --user stop graphical-session.target
+        systemctl --user stop graphical-session-pre.target
+
+        # Wait until the units actually stop.
+        while [ -n "$(systemctl --user --no-legend --state=deactivating list-units)" ]; do
+          sleep 0.5
+        done
+      '';
+    };
+  };
+}
diff --git a/home-manager/nix-darwin/default.nix b/home-manager/nix-darwin/default.nix
new file mode 100644
index 00000000000..1482c7bb245
--- /dev/null
+++ b/home-manager/nix-darwin/default.nix
@@ -0,0 +1,71 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.home-manager;
+
+  hmModule = types.submodule ({name, ...}: {
+    imports = import ../modules/modules.nix { inherit lib pkgs; };
+
+    config = {
+      submoduleSupport.enable = true;
+      submoduleSupport.externalPackageInstall = cfg.useUserPackages;
+
+      home.username = config.users.users.${name}.name;
+      home.homeDirectory = config.users.users.${name}.home;
+    };
+  });
+
+in
+
+{
+  options = {
+    home-manager = {
+      useUserPackages = mkEnableOption ''
+        installation of user packages through the
+        <option>users.users.‹name?›.packages</option> option.
+      '';
+
+      users = mkOption {
+        type = types.attrsOf hmModule;
+        default = {};
+        description = ''
+          Per-user Home Manager configuration.
+        '';
+      };
+    };
+  };
+
+  config = mkIf (cfg.users != {}) {
+    warnings =
+      flatten (flip mapAttrsToList cfg.users (user: config:
+        flip map config.warnings (warning:
+          "${user} profile: ${warning}"
+        )
+      ));
+
+    assertions =
+      flatten (flip mapAttrsToList cfg.users (user: config:
+        flip map config.assertions (assertion:
+          {
+            inherit (assertion) assertion;
+            message = "${user} profile: ${assertion.message}";
+          }
+        )
+      ));
+
+    users.users = mkIf cfg.useUserPackages (
+      mapAttrs (username: usercfg: {
+        packages = usercfg.home.packages;
+      }) cfg.users
+    );
+
+    system.activationScripts.postActivation.text =
+      concatStringsSep "\n" (mapAttrsToList (username: usercfg: ''
+        echo Activating home-manager configuration for ${username}
+        sudo -u ${username} -i ${usercfg.home.activationPackage}/activate
+      '') cfg.users);
+  };
+}
diff --git a/home-manager/nixos/default.nix b/home-manager/nixos/default.nix
new file mode 100644
index 00000000000..f53b4d4d6b7
--- /dev/null
+++ b/home-manager/nixos/default.nix
@@ -0,0 +1,119 @@
+{ config, lib, pkgs, utils, ... }:
+
+with lib;
+
+let
+
+  cfg = config.home-manager;
+
+  hmModule = types.submodule ({name, ...}: {
+    imports = import ../modules/modules.nix { inherit lib pkgs; };
+
+    config = {
+      submoduleSupport.enable = true;
+      submoduleSupport.externalPackageInstall = cfg.useUserPackages;
+
+      # The per-user directory inside /etc/profiles is not known by
+      # fontconfig by default.
+      fonts.fontconfig.enable =
+        cfg.useUserPackages && config.fonts.fontconfig.enable;
+
+      home.username = config.users.users.${name}.name;
+      home.homeDirectory = config.users.users.${name}.home;
+    };
+  });
+
+  serviceEnvironment =
+    optionalAttrs (cfg.backupFileExtension != null) {
+      HOME_MANAGER_BACKUP_EXT = cfg.backupFileExtension;
+    }
+    // optionalAttrs cfg.verbose {
+      VERBOSE = "1";
+    };
+
+in
+
+{
+  options = {
+    home-manager = {
+      useUserPackages = mkEnableOption ''
+        installation of user packages through the
+        <option>users.users.‹name?›.packages</option> option.
+      '';
+
+      backupFileExtension = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "backup";
+        description = ''
+          On activation move existing files by appending the given
+          file extension rather than exiting with an error.
+        '';
+      };
+
+      verbose = mkEnableOption "verbose output on activation";
+
+      users = mkOption {
+        type = types.attrsOf hmModule;
+        default = {};
+        description = ''
+          Per-user Home Manager configuration.
+        '';
+      };
+    };
+  };
+
+  config = mkIf (cfg.users != {}) {
+    warnings =
+      flatten (flip mapAttrsToList cfg.users (user: config:
+        flip map config.warnings (warning:
+          "${user} profile: ${warning}"
+        )
+      ));
+
+    assertions =
+      flatten (flip mapAttrsToList cfg.users (user: config:
+        flip map config.assertions (assertion:
+          {
+            inherit (assertion) assertion;
+            message = "${user} profile: ${assertion.message}";
+          }
+        )
+      ));
+
+    users.users = mkIf cfg.useUserPackages (
+      mapAttrs (username: usercfg: {
+        packages = usercfg.home.packages;
+      }) cfg.users
+    );
+
+    systemd.services = mapAttrs' (_: usercfg:
+      let
+        username = usercfg.home.username;
+      in
+        nameValuePair ("home-manager-${utils.escapeSystemdPath username}") {
+          description = "Home Manager environment for ${username}";
+          wantedBy = [ "multi-user.target" ];
+          wants = [ "nix-daemon.socket" ];
+          after = [ "nix-daemon.socket" ];
+
+          environment = serviceEnvironment;
+
+          serviceConfig = {
+            User = usercfg.home.username;
+            Type = "oneshot";
+            RemainAfterExit = "yes";
+            SyslogIdentifier = "hm-activate-${username}";
+
+            # The activation script is run by a login shell to make sure
+            # that the user is given a sane Nix environment.
+            ExecStart = pkgs.writeScript "activate-${username}" ''
+              #! ${pkgs.runtimeShell} -el
+              echo Activating home-manager configuration for ${username}
+              exec ${usercfg.home.activationPackage}/activate
+            '';
+          };
+        }
+    ) cfg.users;
+  };
+}
diff --git a/home-manager/overlay.nix b/home-manager/overlay.nix
new file mode 100644
index 00000000000..fa779fe0370
--- /dev/null
+++ b/home-manager/overlay.nix
@@ -0,0 +1,5 @@
+self: super: {
+  home-manager = super.callPackage ./home-manager {
+    path = toString ./.;
+  };
+}
diff --git a/home-manager/tests/default.nix b/home-manager/tests/default.nix
new file mode 100644
index 00000000000..ecb98e14188
--- /dev/null
+++ b/home-manager/tests/default.nix
@@ -0,0 +1,53 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+let
+
+  nmt = pkgs.fetchFromGitLab {
+    owner = "rycee";
+    repo = "nmt";
+    rev = "89fb12a2aaa8ec671e22a033162c7738be714305";
+    sha256 = "07yc1jkgw8vhskzk937k9hfba401q8rn4sgj9baw3fkjl9zrbcyf";
+  };
+
+in
+
+import nmt {
+  inherit pkgs;
+  modules = import ../modules/modules.nix { inherit pkgs; lib = pkgs.lib; };
+  testedAttrPath = [ "home" "activationPackage" ];
+  tests = {
+    browserpass = ./modules/programs/browserpass.nix;
+    files-executable = ./modules/files/executable.nix;
+    files-hidden-source = ./modules/files/hidden-source.nix;
+    files-source-with-spaces = ./modules/files/source-with-spaces.nix;
+    files-text = ./modules/files/text.nix;
+    git-with-email = ./modules/programs/git-with-email.nix;
+    git-with-most-options = ./modules/programs/git.nix;
+    git-with-str-extra-config = ./modules/programs/git-with-str-extra-config.nix;
+    mbsync = ./modules/programs/mbsync.nix;
+    texlive-minimal = ./modules/programs/texlive-minimal.nix;
+    xresources = ./modules/xresources.nix;
+  }
+  // pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux (
+    {
+      getmail = ./modules/programs/getmail.nix;
+      i3-keybindings = ./modules/services/window-managers/i3-keybindings.nix;
+    }
+    // import ./modules/misc/pam
+    // import ./modules/misc/xdg
+    // import ./modules/misc/xsession
+    // import ./modules/programs/firefox
+    // import ./modules/programs/rofi
+    // import ./modules/services/sxhkd
+    // import ./modules/systemd
+  )
+  // import ./modules/home-environment
+  // import ./modules/misc/fontconfig
+  // import ./modules/programs/alacritty
+  // import ./modules/programs/bash
+  // import ./modules/programs/gpg
+  // import ./modules/programs/newsboat
+  // import ./modules/programs/ssh
+  // import ./modules/programs/tmux
+  // import ./modules/programs/zsh;
+}
diff --git a/home-manager/tests/modules/accounts/email-test-accounts.nix b/home-manager/tests/modules/accounts/email-test-accounts.nix
new file mode 100644
index 00000000000..9c9c90cf8fe
--- /dev/null
+++ b/home-manager/tests/modules/accounts/email-test-accounts.nix
@@ -0,0 +1,27 @@
+{ ... }:
+
+{
+  accounts.email = {
+    maildirBasePath = "Mail";
+
+    accounts = {
+      "hm@example.com" = {
+        address = "hm@example.com";
+        userName = "home.manager";
+        realName = "H. M. Test";
+        passwordCommand = "password-command";
+        imap.host = "imap.example.com";
+        smtp.host = "smtp.example.com";
+      };
+
+      hm-account = {
+        address = "hm@example.org";
+        userName = "home.manager.jr";
+        realName = "H. M. Test Jr.";
+        passwordCommand = "password-command 2";
+        imap.host = "imap.example.org";
+        smtp.host = "smtp.example.org";
+      };
+    };
+  };
+}
diff --git a/home-manager/tests/modules/files/.hidden b/home-manager/tests/modules/files/.hidden
new file mode 100644
index 00000000000..ca05448e7a0
--- /dev/null
+++ b/home-manager/tests/modules/files/.hidden
@@ -0,0 +1 @@
+The name of this file has a dot prefix.
diff --git a/home-manager/tests/modules/files/executable.nix b/home-manager/tests/modules/files/executable.nix
new file mode 100644
index 00000000000..b286c2b499f
--- /dev/null
+++ b/home-manager/tests/modules/files/executable.nix
@@ -0,0 +1,17 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    home.file."executable" = {
+      text = "";
+      executable = true;
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/executable
+      assertFileIsExecutable home-files/executable;
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/files/hidden-source.nix b/home-manager/tests/modules/files/hidden-source.nix
new file mode 100644
index 00000000000..a8635398f48
--- /dev/null
+++ b/home-manager/tests/modules/files/hidden-source.nix
@@ -0,0 +1,16 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    home.file.".hidden".source = ./.hidden;
+
+    nmt.script = ''
+      assertFileExists home-files/.hidden;
+      assertFileContent home-files/.hidden ${
+        builtins.path { path = ./.hidden; name = "expected"; }
+      }
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/files/source with spaces! b/home-manager/tests/modules/files/source with spaces!
new file mode 100644
index 00000000000..e1ace404174
--- /dev/null
+++ b/home-manager/tests/modules/files/source with spaces!
@@ -0,0 +1 @@
+Source with spaces!
diff --git a/home-manager/tests/modules/files/source-with-spaces.nix b/home-manager/tests/modules/files/source-with-spaces.nix
new file mode 100644
index 00000000000..1d593c64256
--- /dev/null
+++ b/home-manager/tests/modules/files/source-with-spaces.nix
@@ -0,0 +1,20 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    home.file."source with spaces!".source = ./. + "/source with spaces!";
+
+    nmt.script = ''
+      assertFileExists 'home-files/source with spaces!';
+      assertFileContent 'home-files/source with spaces!' \
+        ${
+          builtins.path {
+            path = ./. + "/source with spaces!";
+            name = "source-with-spaces-expected";
+          }
+        }
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/files/text-expected.txt b/home-manager/tests/modules/files/text-expected.txt
new file mode 100644
index 00000000000..b3a0ff2db12
--- /dev/null
+++ b/home-manager/tests/modules/files/text-expected.txt
@@ -0,0 +1,2 @@
+This is the
+expected text.
diff --git a/home-manager/tests/modules/files/text.nix b/home-manager/tests/modules/files/text.nix
new file mode 100644
index 00000000000..6fc9a26fcb4
--- /dev/null
+++ b/home-manager/tests/modules/files/text.nix
@@ -0,0 +1,18 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    home.file."using-text".text = ''
+      This is the
+      expected text.
+    '';
+
+    nmt.script = ''
+      assertFileExists home-files/using-text
+      assertFileIsNotExecutable home-files/using-text
+      assertFileContent home-files/using-text ${./text-expected.txt}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/home-environment/default.nix b/home-manager/tests/modules/home-environment/default.nix
new file mode 100644
index 00000000000..2a1201a2f0a
--- /dev/null
+++ b/home-manager/tests/modules/home-environment/default.nix
@@ -0,0 +1,3 @@
+{
+  home-session-variables = ./session-variables.nix;
+}
diff --git a/home-manager/tests/modules/home-environment/session-variables-expected.txt b/home-manager/tests/modules/home-environment/session-variables-expected.txt
new file mode 100644
index 00000000000..5c3868c3901
--- /dev/null
+++ b/home-manager/tests/modules/home-environment/session-variables-expected.txt
@@ -0,0 +1,6 @@
+# Only source this once.
+if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi
+export __HM_SESS_VARS_SOURCED=1
+
+export V1="v1"
+export V2="v2-v1"
diff --git a/home-manager/tests/modules/home-environment/session-variables.nix b/home-manager/tests/modules/home-environment/session-variables.nix
new file mode 100644
index 00000000000..9f326ebc1b8
--- /dev/null
+++ b/home-manager/tests/modules/home-environment/session-variables.nix
@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    home.sessionVariables = {
+      V1 = "v1";
+      V2 = "v2-${config.home.sessionVariables.V1}";
+    };
+
+    nmt.script = ''
+      assertFileExists home-path/etc/profile.d/hm-session-vars.sh
+      assertFileContent \
+        home-path/etc/profile.d/hm-session-vars.sh \
+        ${./session-variables-expected.txt}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/misc/fontconfig/default.nix b/home-manager/tests/modules/misc/fontconfig/default.nix
new file mode 100644
index 00000000000..b669e1c343c
--- /dev/null
+++ b/home-manager/tests/modules/misc/fontconfig/default.nix
@@ -0,0 +1,5 @@
+{
+  fontconfig-no-font-package = ./no-font-package.nix;
+  fontconfig-single-font-package = ./single-font-package.nix;
+  fontconfig-multiple-font-packages = ./multiple-font-packages.nix;
+}
diff --git a/home-manager/tests/modules/misc/fontconfig/multiple-font-packages.nix b/home-manager/tests/modules/misc/fontconfig/multiple-font-packages.nix
new file mode 100644
index 00000000000..3845b4ba4b1
--- /dev/null
+++ b/home-manager/tests/modules/misc/fontconfig/multiple-font-packages.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    home.packages = [ pkgs.comic-relief pkgs.unifont ];
+
+    fonts.fontconfig.enable = true;
+
+    nmt.script = ''
+      assertDirectoryNotEmpty home-path/lib/fontconfig/cache
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/misc/fontconfig/no-font-package.nix b/home-manager/tests/modules/misc/fontconfig/no-font-package.nix
new file mode 100644
index 00000000000..c4c687a1320
--- /dev/null
+++ b/home-manager/tests/modules/misc/fontconfig/no-font-package.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    home.packages = [
+      # Look, no font!
+    ];
+
+    fonts.fontconfig.enable = true;
+
+    nmt.script = ''
+      assertPathNotExists home-path/lib/fontconfig/cache
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/misc/fontconfig/single-font-package.nix b/home-manager/tests/modules/misc/fontconfig/single-font-package.nix
new file mode 100644
index 00000000000..b70bdf8a9a7
--- /dev/null
+++ b/home-manager/tests/modules/misc/fontconfig/single-font-package.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    home.packages = [ pkgs.comic-relief ];
+
+    fonts.fontconfig.enable = true;
+
+    nmt.script = ''
+      assertDirectoryNotEmpty home-path/lib/fontconfig/cache
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/misc/pam/default.nix b/home-manager/tests/modules/misc/pam/default.nix
new file mode 100644
index 00000000000..8a64f831caf
--- /dev/null
+++ b/home-manager/tests/modules/misc/pam/default.nix
@@ -0,0 +1,3 @@
+{
+  pam-session-variables = ./session-variables.nix;
+}
diff --git a/home-manager/tests/modules/misc/pam/session-variables-expected.txt b/home-manager/tests/modules/misc/pam/session-variables-expected.txt
new file mode 100644
index 00000000000..b84a12b7675
--- /dev/null
+++ b/home-manager/tests/modules/misc/pam/session-variables-expected.txt
@@ -0,0 +1,2 @@
+V1 OVERRIDE="v1"
+V2 OVERRIDE="v2-v1"
diff --git a/home-manager/tests/modules/misc/pam/session-variables.nix b/home-manager/tests/modules/misc/pam/session-variables.nix
new file mode 100644
index 00000000000..4fbec4163b5
--- /dev/null
+++ b/home-manager/tests/modules/misc/pam/session-variables.nix
@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    pam.sessionVariables = {
+      V1 = "v1";
+      V2 = "v2-${config.pam.sessionVariables.V1}";
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.pam_environment
+      assertFileContent \
+        home-files/.pam_environment \
+        ${./session-variables-expected.txt}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/misc/xdg/default.nix b/home-manager/tests/modules/misc/xdg/default.nix
new file mode 100644
index 00000000000..5772becd712
--- /dev/null
+++ b/home-manager/tests/modules/misc/xdg/default.nix
@@ -0,0 +1,3 @@
+{
+  xdg-mime-apps-basics = ./mime-apps-basics.nix;
+}
diff --git a/home-manager/tests/modules/misc/xdg/mime-apps-basics-expected.ini b/home-manager/tests/modules/misc/xdg/mime-apps-basics-expected.ini
new file mode 100644
index 00000000000..c27181eb58f
--- /dev/null
+++ b/home-manager/tests/modules/misc/xdg/mime-apps-basics-expected.ini
@@ -0,0 +1,9 @@
+[Added Associations]
+mimetype1=foo1.desktop;foo2.desktop;foo3.desktop
+mimetype2=foo4.desktop
+
+[Default Applications]
+mimetype1=default1.desktop;default2.desktop
+
+[Removed Associations]
+mimetype1=foo5.desktop
diff --git a/home-manager/tests/modules/misc/xdg/mime-apps-basics.nix b/home-manager/tests/modules/misc/xdg/mime-apps-basics.nix
new file mode 100644
index 00000000000..2c32071064c
--- /dev/null
+++ b/home-manager/tests/modules/misc/xdg/mime-apps-basics.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    xdg.mimeApps = {
+      enable = true;
+      associations = {
+        added = {
+          "mimetype1" = [ "foo1.desktop" "foo2.desktop" "foo3.desktop" ];
+          "mimetype2" = "foo4.desktop";
+        };
+        removed = {
+          mimetype1 = "foo5.desktop";
+        };
+      };
+      defaultApplications = {
+        "mimetype1" = [ "default1.desktop" "default2.desktop" ];
+      };
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.config/mimeapps.list
+      assertFileContent \
+        home-files/.config/mimeapps.list \
+        ${./mime-apps-basics-expected.ini}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/misc/xsession/basic-setxkbmap-expected.service b/home-manager/tests/modules/misc/xsession/basic-setxkbmap-expected.service
new file mode 100644
index 00000000000..39f876dd60e
--- /dev/null
+++ b/home-manager/tests/modules/misc/xsession/basic-setxkbmap-expected.service
@@ -0,0 +1,12 @@
+[Install]
+WantedBy=graphical-session.target
+
+[Service]
+ExecStart=@setxkbmap@/bin/setxkbmap -layout 'us' -variant ''
+RemainAfterExit=true
+Type=oneshot
+
+[Unit]
+After=graphical-session-pre.target
+Description=Set up keyboard in X
+PartOf=graphical-session.target
diff --git a/home-manager/tests/modules/misc/xsession/basic-xprofile-expected.txt b/home-manager/tests/modules/misc/xsession/basic-xprofile-expected.txt
new file mode 100644
index 00000000000..05733a974ff
--- /dev/null
+++ b/home-manager/tests/modules/misc/xsession/basic-xprofile-expected.txt
@@ -0,0 +1,16 @@
+. "/test-home/.nix-profile/etc/profile.d/hm-session-vars.sh"
+
+if [ -e "$HOME/.profile" ]; then
+  . "$HOME/.profile"
+fi
+
+# If there are any running services from a previous session.
+# Need to run this in xprofile because the NixOS xsession
+# script starts up graphical-session.target.
+systemctl --user stop graphical-session.target graphical-session-pre.target
+
+systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS DISPLAY SSH_AUTH_SOCK XAUTHORITY XDG_DATA_DIRS XDG_RUNTIME_DIR XDG_SESSION_ID EXTRA_IMPORTED_VARIABLE
+
+profile extra commands
+
+export HM_XPROFILE_SOURCED=1
diff --git a/home-manager/tests/modules/misc/xsession/basic-xsession-expected.txt b/home-manager/tests/modules/misc/xsession/basic-xsession-expected.txt
new file mode 100644
index 00000000000..c11b7c33048
--- /dev/null
+++ b/home-manager/tests/modules/misc/xsession/basic-xsession-expected.txt
@@ -0,0 +1,18 @@
+if [ -z "$HM_XPROFILE_SOURCED" ]; then
+  . ~/.xprofile
+fi
+unset HM_XPROFILE_SOURCED
+
+systemctl --user start hm-graphical-session.target
+
+init extra commands
+
+window manager command
+
+systemctl --user stop graphical-session.target
+systemctl --user stop graphical-session-pre.target
+
+# Wait until the units actually stop.
+while [ -n "$(systemctl --user --no-legend --state=deactivating list-units)" ]; do
+  sleep 0.5
+done
diff --git a/home-manager/tests/modules/misc/xsession/basic.nix b/home-manager/tests/modules/misc/xsession/basic.nix
new file mode 100644
index 00000000000..60623d1bf6b
--- /dev/null
+++ b/home-manager/tests/modules/misc/xsession/basic.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    home.homeDirectory = "/test-home";
+
+    xsession = {
+      enable = true;
+      windowManager.command = "window manager command";
+      importedVariables = [ "EXTRA_IMPORTED_VARIABLE" ];
+      initExtra = "init extra commands";
+      profileExtra = "profile extra commands";
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.xprofile
+      assertFileContent \
+        home-files/.xprofile \
+        ${./basic-xprofile-expected.txt}
+
+      assertFileExists home-files/.xsession
+      assertFileContent \
+        home-files/.xsession \
+        ${./basic-xsession-expected.txt}
+
+      assertFileExists home-files/.config/systemd/user/setxkbmap.service
+      assertFileContent \
+        home-files/.config/systemd/user/setxkbmap.service \
+        ${pkgs.substituteAll {
+          src = ./basic-setxkbmap-expected.service;
+          inherit (pkgs.xorg) setxkbmap;
+        }}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/misc/xsession/default.nix b/home-manager/tests/modules/misc/xsession/default.nix
new file mode 100644
index 00000000000..2ddbf47efac
--- /dev/null
+++ b/home-manager/tests/modules/misc/xsession/default.nix
@@ -0,0 +1,4 @@
+{
+  xsession-basic = ./basic.nix;
+  xsession-keyboard-without-layout = ./keyboard-without-layout.nix;
+}
diff --git a/home-manager/tests/modules/misc/xsession/keyboard-without-layout-expected.service b/home-manager/tests/modules/misc/xsession/keyboard-without-layout-expected.service
new file mode 100644
index 00000000000..a04af53dad7
--- /dev/null
+++ b/home-manager/tests/modules/misc/xsession/keyboard-without-layout-expected.service
@@ -0,0 +1,12 @@
+[Install]
+WantedBy=graphical-session.target
+
+[Service]
+ExecStart=@setxkbmap@/bin/setxkbmap -option 'ctrl:nocaps' -option 'altwin:no_win'
+RemainAfterExit=true
+Type=oneshot
+
+[Unit]
+After=graphical-session-pre.target
+Description=Set up keyboard in X
+PartOf=graphical-session.target
diff --git a/home-manager/tests/modules/misc/xsession/keyboard-without-layout.nix b/home-manager/tests/modules/misc/xsession/keyboard-without-layout.nix
new file mode 100644
index 00000000000..b7eb3decebb
--- /dev/null
+++ b/home-manager/tests/modules/misc/xsession/keyboard-without-layout.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    home.stateVersion = "19.09";
+
+    home.homeDirectory = "/test-home";
+
+    home.keyboard = {
+      options = [ "ctrl:nocaps" "altwin:no_win" ];
+    };
+
+    xsession = {
+      enable = true;
+      windowManager.command = "window manager command";
+      importedVariables = [ "EXTRA_IMPORTED_VARIABLE" ];
+      initExtra = "init extra commands";
+      profileExtra = "profile extra commands";
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.config/systemd/user/setxkbmap.service
+      assertFileContent \
+        home-files/.config/systemd/user/setxkbmap.service \
+        ${pkgs.substituteAll {
+          src = ./keyboard-without-layout-expected.service;
+          inherit (pkgs.xorg) setxkbmap;
+        }}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/alacritty/default.nix b/home-manager/tests/modules/programs/alacritty/default.nix
new file mode 100644
index 00000000000..f63e033d846
--- /dev/null
+++ b/home-manager/tests/modules/programs/alacritty/default.nix
@@ -0,0 +1,4 @@
+{
+  alacritty-example-settings = ./example-settings.nix;
+  alacritty-empty-settings = ./empty-settings.nix;
+}
diff --git a/home-manager/tests/modules/programs/alacritty/empty-settings.nix b/home-manager/tests/modules/programs/alacritty/empty-settings.nix
new file mode 100644
index 00000000000..f3f8486ad3d
--- /dev/null
+++ b/home-manager/tests/modules/programs/alacritty/empty-settings.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.alacritty.enable = true;
+
+    nmt.script = ''
+      assertPathNotExists home-files/.config/alacritty
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/alacritty/example-settings-expected.yml b/home-manager/tests/modules/programs/alacritty/example-settings-expected.yml
new file mode 100644
index 00000000000..061624192c3
--- /dev/null
+++ b/home-manager/tests/modules/programs/alacritty/example-settings-expected.yml
@@ -0,0 +1 @@
+{"key_bindings":[{"chars":"\x0c","key":"K","mods":"Control"}],"window":{"dimensions":{"columns":200,"lines":3}}}
\ No newline at end of file
diff --git a/home-manager/tests/modules/programs/alacritty/example-settings.nix b/home-manager/tests/modules/programs/alacritty/example-settings.nix
new file mode 100644
index 00000000000..2c84710d100
--- /dev/null
+++ b/home-manager/tests/modules/programs/alacritty/example-settings.nix
@@ -0,0 +1,32 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.alacritty = {
+      enable = true;
+
+      settings = {
+        window.dimensions = {
+          lines = 3;
+          columns = 200;
+        };
+
+        key_bindings = [
+          {
+            key = "K";
+            mods = "Control";
+            chars = "\\x0c";
+          }
+        ];
+      };
+    };
+
+    nmt.script = ''
+      assertFileContent \
+        home-files/.config/alacritty/alacritty.yml \
+        ${./example-settings-expected.yml}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/bash/default.nix b/home-manager/tests/modules/programs/bash/default.nix
new file mode 100644
index 00000000000..e9f431cd2b9
--- /dev/null
+++ b/home-manager/tests/modules/programs/bash/default.nix
@@ -0,0 +1,4 @@
+{
+  bash-logout = ./logout.nix;
+  bash-session-variables = ./session-variables.nix;
+}
diff --git a/home-manager/tests/modules/programs/bash/logout-expected.txt b/home-manager/tests/modules/programs/bash/logout-expected.txt
new file mode 100644
index 00000000000..9462f58f732
--- /dev/null
+++ b/home-manager/tests/modules/programs/bash/logout-expected.txt
@@ -0,0 +1,4 @@
+# -*- mode: sh -*-
+
+clear-console
+
diff --git a/home-manager/tests/modules/programs/bash/logout.nix b/home-manager/tests/modules/programs/bash/logout.nix
new file mode 100644
index 00000000000..8f96dc7e1ae
--- /dev/null
+++ b/home-manager/tests/modules/programs/bash/logout.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.bash = {
+      enable = true;
+
+      logoutExtra = ''
+        clear-console
+      '';
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.bash_logout
+      assertFileContent \
+        home-files/.bash_logout \
+        ${./logout-expected.txt}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/bash/session-variables-expected.txt b/home-manager/tests/modules/programs/bash/session-variables-expected.txt
new file mode 100644
index 00000000000..c586477ec4d
--- /dev/null
+++ b/home-manager/tests/modules/programs/bash/session-variables-expected.txt
@@ -0,0 +1,8 @@
+# -*- mode: sh -*-
+
+. "@homeDirectory@/.nix-profile/etc/profile.d/hm-session-vars.sh"
+
+export V1="v1"
+export V2="v2-v1"
+
+
diff --git a/home-manager/tests/modules/programs/bash/session-variables.nix b/home-manager/tests/modules/programs/bash/session-variables.nix
new file mode 100644
index 00000000000..a7a69a2a1f8
--- /dev/null
+++ b/home-manager/tests/modules/programs/bash/session-variables.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.bash = {
+      enable = true;
+
+      sessionVariables = {
+        V1 = "v1";
+        V2 = "v2-${config.programs.bash.sessionVariables.V1}";
+      };
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.profile
+      assertFileContent \
+        home-files/.profile \
+        ${
+          pkgs.substituteAll {
+            src = ./session-variables-expected.txt;
+            inherit (config.home) homeDirectory;
+          }
+        }
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/browserpass.nix b/home-manager/tests/modules/programs/browserpass.nix
new file mode 100644
index 00000000000..229392e171b
--- /dev/null
+++ b/home-manager/tests/modules/programs/browserpass.nix
@@ -0,0 +1,35 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.browserpass = {
+      enable = true;
+      browsers = [
+        "chrome"
+        "chromium"
+        "firefox"
+        "vivaldi"
+      ];
+    };
+
+    nmt.script =
+      if pkgs.stdenv.hostPlatform.isDarwin then ''
+        for dir in "Google/Chrome" "Chromium" "Mozilla" "Vivaldi"; do
+          assertFileExists "home-files/Library/Application Support/$dir/NativeMessagingHosts/com.github.browserpass.native.json"
+        done
+
+        for dir in "Google/Chrome" "Chromium" "Vivaldi"; do
+          assertFileExists "home-files/Library/Application Support/$dir/policies/managed/com.github.browserpass.native.json"
+        done
+      '' else ''
+        for dir in "google-chrome" "chromium" "vivaldi"; do
+          assertFileExists "home-files/.config/$dir/NativeMessagingHosts/com.github.browserpass.native.json"
+          assertFileExists "home-files/.config/$dir/policies/managed/com.github.browserpass.native.json"
+        done
+
+        assertFileExists "home-files/.mozilla/native-messaging-hosts/com.github.browserpass.native.json"
+      '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/firefox/default.nix b/home-manager/tests/modules/programs/firefox/default.nix
new file mode 100644
index 00000000000..6612a9ac978
--- /dev/null
+++ b/home-manager/tests/modules/programs/firefox/default.nix
@@ -0,0 +1,4 @@
+{
+  firefox-profile-settings = ./profile-settings.nix;
+  firefox-state-version-19_09 = ./state-version-19_09.nix;
+}
diff --git a/home-manager/tests/modules/programs/firefox/profile-settings-expected-user.js b/home-manager/tests/modules/programs/firefox/profile-settings-expected-user.js
new file mode 100644
index 00000000000..0edd47b9101
--- /dev/null
+++ b/home-manager/tests/modules/programs/firefox/profile-settings-expected-user.js
@@ -0,0 +1,6 @@
+// Generated by Home Manager.
+
+user_pref("general.smoothScroll", false);
+
+
+
diff --git a/home-manager/tests/modules/programs/firefox/profile-settings.nix b/home-manager/tests/modules/programs/firefox/profile-settings.nix
new file mode 100644
index 00000000000..45465b1d0bf
--- /dev/null
+++ b/home-manager/tests/modules/programs/firefox/profile-settings.nix
@@ -0,0 +1,24 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.firefox = {
+      enable = true;
+      profiles.test.settings = {
+        "general.smoothScroll" = false;
+      };
+    };
+
+    nmt.script = ''
+      assertFileRegex \
+        home-path/bin/firefox \
+        MOZ_APP_LAUNCHER
+
+      assertFileContent \
+        home-files/.mozilla/firefox/test/user.js \
+        ${./profile-settings-expected-user.js}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/firefox/state-version-19_09.nix b/home-manager/tests/modules/programs/firefox/state-version-19_09.nix
new file mode 100644
index 00000000000..0c93096190e
--- /dev/null
+++ b/home-manager/tests/modules/programs/firefox/state-version-19_09.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    home.stateVersion = "19.09";
+
+    programs.firefox.enable = true;
+
+    nmt.script = ''
+      assertFileRegex \
+        home-path/bin/firefox \
+        MOZ_APP_LAUNCHER
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/getmail-expected.conf b/home-manager/tests/modules/programs/getmail-expected.conf
new file mode 100644
index 00000000000..a652e7199d6
--- /dev/null
+++ b/home-manager/tests/modules/programs/getmail-expected.conf
@@ -0,0 +1,16 @@
+# Generated by Home-Manager.
+[retriever]
+type = SimpleIMAPSSLRetriever
+server = imap.example.com
+
+username = home.manager
+password_command = ('password-command')
+mailboxes = ( 'INBOX', 'Sent', 'Work' )
+
+[destination]
+type = MDA_external
+path = /bin/maildrop
+
+[options]
+delete = false
+read_all = true
diff --git a/home-manager/tests/modules/programs/getmail.nix b/home-manager/tests/modules/programs/getmail.nix
new file mode 100644
index 00000000000..12806c25679
--- /dev/null
+++ b/home-manager/tests/modules/programs/getmail.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  imports = [ ../accounts/email-test-accounts.nix ];
+
+  config = {
+    home.username = "hm-user";
+    home.homeDirectory = "/home/hm-user";
+
+    accounts.email.accounts = {
+      "hm@example.com".getmail = {
+        enable = true;
+        mailboxes = ["INBOX" "Sent" "Work"];
+        destinationCommand = "/bin/maildrop";
+        delete = false;
+      };
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.getmail/getmailhm@example.com
+      assertFileContent home-files/.getmail/getmailhm@example.com ${./getmail-expected.conf}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/git-expected.conf b/home-manager/tests/modules/programs/git-expected.conf
new file mode 100644
index 00000000000..d02ebf31649
--- /dev/null
+++ b/home-manager/tests/modules/programs/git-expected.conf
@@ -0,0 +1,42 @@
+[alias]
+a1=foo
+a2=baz
+
+[commit]
+gpgSign=true
+
+[extra]
+boolean=true
+integer=38
+multiple=1
+multiple=2
+name=value
+
+[extra "backcompat.with.dots"]
+previously=worked
+
+[extra "subsection"]
+value=test
+
+[filter "lfs"]
+clean=git-lfs clean -- %f
+process=git-lfs filter-process
+required=true
+smudge=git-lfs smudge -- %f
+
+[gpg]
+program=path-to-gpg
+
+[user]
+email=user@example.org
+name=John Doe
+signingKey=00112233445566778899AABBCCDDEEFF
+
+[include]
+path=~/path/to/config.inc
+
+[includeIf "gitdir:~/src/dir"]
+path=~/path/to/conditional.inc
+
+[includeIf "gitdir:~/src/dir"]
+path=@git_include_path@
diff --git a/home-manager/tests/modules/programs/git-with-email-expected.conf b/home-manager/tests/modules/programs/git-with-email-expected.conf
new file mode 100644
index 00000000000..01c1eec5823
--- /dev/null
+++ b/home-manager/tests/modules/programs/git-with-email-expected.conf
@@ -0,0 +1,15 @@
+[sendemail "hm-account"]
+from=hm@example.org
+smtpEncryption=tls
+smtpServer=smtp.example.org
+smtpUser=home.manager.jr
+
+[sendemail "hm@example.com"]
+from=hm@example.com
+smtpEncryption=tls
+smtpServer=smtp.example.com
+smtpUser=home.manager
+
+[user]
+email=hm@example.com
+name=H. M. Test
diff --git a/home-manager/tests/modules/programs/git-with-email.nix b/home-manager/tests/modules/programs/git-with-email.nix
new file mode 100644
index 00000000000..f8a762dcceb
--- /dev/null
+++ b/home-manager/tests/modules/programs/git-with-email.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  imports = [ ../accounts/email-test-accounts.nix ];
+
+  config = {
+    programs.git = {
+      enable = true;
+      userEmail = "hm@example.com";
+      userName = "H. M. Test";
+    };
+
+    nmt.script = ''
+      function assertGitConfig() {
+        local value
+        value=$(${pkgs.git}/bin/git config \
+          --file $TESTED/home-files/.config/git/config \
+          --get $1)
+        if [[ $value != $2 ]]; then
+          fail "Expected option '$1' to have value '$2' but it was '$value'"
+        fi
+      }
+
+      assertFileExists home-files/.config/git/config
+      assertFileContent home-files/.config/git/config ${./git-with-email-expected.conf}
+
+      assertGitConfig "sendemail.hm@example.com.from" "hm@example.com"
+      assertGitConfig "sendemail.hm-account.from" "hm@example.org"
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/git-with-str-extra-config-expected.conf b/home-manager/tests/modules/programs/git-with-str-extra-config-expected.conf
new file mode 100644
index 00000000000..957438de13a
--- /dev/null
+++ b/home-manager/tests/modules/programs/git-with-str-extra-config-expected.conf
@@ -0,0 +1,5 @@
+This can be anything.
+
+[user]
+email=user@example.org
+name=John Doe
diff --git a/home-manager/tests/modules/programs/git-with-str-extra-config.nix b/home-manager/tests/modules/programs/git-with-str-extra-config.nix
new file mode 100644
index 00000000000..734c5ee764c
--- /dev/null
+++ b/home-manager/tests/modules/programs/git-with-str-extra-config.nix
@@ -0,0 +1,22 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.git = {
+      enable = true;
+      extraConfig = ''
+        This can be anything.
+      '';
+      userEmail = "user@example.org";
+      userName = "John Doe";
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.config/git/config
+      assertFileContent home-files/.config/git/config \
+        ${./git-with-str-extra-config-expected.conf}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/git.nix b/home-manager/tests/modules/programs/git.nix
new file mode 100644
index 00000000000..c5203e417dc
--- /dev/null
+++ b/home-manager/tests/modules/programs/git.nix
@@ -0,0 +1,74 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  gitInclude = {
+    user = {
+      name = "John Doe";
+      email = "user@example.org";
+    };
+  };
+
+  substituteExpected = path: pkgs.substituteAll {
+    src = path;
+
+    git_include_path = pkgs.writeText "contents" (generators.toINI {} gitInclude);
+  };
+
+in
+
+{
+  config = {
+    programs.git = mkMerge [
+      {
+        enable = true;
+        aliases = {
+          a1 = "foo";
+          a2 = "bar";
+        };
+        extraConfig = {
+          extra = {
+            name = "value";
+            multiple = [1];
+          };
+        };
+        ignores = [ "*~" "*.swp" ];
+        includes = [
+          { path = "~/path/to/config.inc"; }
+          {
+            path = "~/path/to/conditional.inc";
+            condition = "gitdir:~/src/dir";
+          }
+          {
+            condition = "gitdir:~/src/dir";
+            contents = gitInclude;
+          }
+        ];
+        signing = {
+          gpgPath = "path-to-gpg";
+          key = "00112233445566778899AABBCCDDEEFF";
+          signByDefault = true;
+        };
+        userEmail = "user@example.org";
+        userName = "John Doe";
+        lfs.enable = true;
+      }
+
+      {
+        aliases.a2 = mkForce "baz";
+        extraConfig."extra \"backcompat.with.dots\"".previously = "worked";
+        extraConfig.extra.boolean = true;
+        extraConfig.extra.integer = 38;
+        extraConfig.extra.multiple = [2];
+        extraConfig.extra.subsection.value = "test";
+      }
+    ];
+
+    nmt.script = ''
+      assertFileExists home-files/.config/git/config
+      assertFileContent home-files/.config/git/config ${substituteExpected ./git-expected.conf}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/gpg/default.nix b/home-manager/tests/modules/programs/gpg/default.nix
new file mode 100644
index 00000000000..5cb24817cb0
--- /dev/null
+++ b/home-manager/tests/modules/programs/gpg/default.nix
@@ -0,0 +1,3 @@
+{
+  gpg-override-defaults = ./override-defaults.nix;
+}
diff --git a/home-manager/tests/modules/programs/gpg/override-defaults-expected.conf b/home-manager/tests/modules/programs/gpg/override-defaults-expected.conf
new file mode 100644
index 00000000000..3198183f723
--- /dev/null
+++ b/home-manager/tests/modules/programs/gpg/override-defaults-expected.conf
@@ -0,0 +1,19 @@
+cert-digest-algo SHA512
+charset utf-8
+default-preference-list SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed
+fixed-list-mode
+keyid-format 0xlong
+list-options show-uid-validity
+
+no-emit-version
+no-symkey-cache
+personal-cipher-preferences AES256 AES192 AES
+personal-compress-preferences ZLIB BZIP2 ZIP Uncompressed
+personal-digest-preferences SHA512 SHA384 SHA256
+require-cross-certification
+s2k-cipher-algo AES128
+s2k-digest-algo SHA512
+throw-keyids
+use-agent
+verify-options show-uid-validity
+with-fingerprint
\ No newline at end of file
diff --git a/home-manager/tests/modules/programs/gpg/override-defaults.nix b/home-manager/tests/modules/programs/gpg/override-defaults.nix
new file mode 100644
index 00000000000..850334dc589
--- /dev/null
+++ b/home-manager/tests/modules/programs/gpg/override-defaults.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.gpg = {
+      enable = true;
+
+      settings = {
+        no-comments = false;
+        s2k-cipher-algo = "AES128";
+        throw-keyids = true;
+      };
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.gnupg/gpg.conf
+      assertFileContent home-files/.gnupg/gpg.conf ${./override-defaults-expected.conf}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/mbsync-expected.conf b/home-manager/tests/modules/programs/mbsync-expected.conf
new file mode 100644
index 00000000000..f1ca79fe738
--- /dev/null
+++ b/home-manager/tests/modules/programs/mbsync-expected.conf
@@ -0,0 +1,55 @@
+# Generated by Home Manager.
+
+IMAPAccount hm-account
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+Host imap.example.org
+PassCmd "password-command 2"
+SSLType IMAPS
+User home.manager.jr
+
+IMAPStore hm-account-remote
+Account hm-account
+
+MaildirStore hm-account-local
+Inbox /home/hm-user/Mail/hm-account/Inbox
+Path /home/hm-user/Mail/hm-account/
+SubFolders Verbatim
+
+Channel hm-account
+Create None
+Expunge None
+Master :hm-account-remote:
+Patterns *
+Remove None
+Slave :hm-account-local:
+SyncState *
+
+
+IMAPAccount hm@example.com
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+Host imap.example.com
+PassCmd password-command
+SSLType IMAPS
+User home.manager
+
+IMAPStore hm@example.com-remote
+Account hm@example.com
+
+MaildirStore hm@example.com-local
+Inbox /home/hm-user/Mail/hm@example.com/Inbox
+Path /home/hm-user/Mail/hm@example.com/
+SubFolders Verbatim
+
+Channel hm@example.com
+Create None
+Expunge None
+Master :hm@example.com-remote:
+Patterns *
+Remove None
+Slave :hm@example.com-local:
+SyncState *
+
+
+Group inboxes
+Channel hm-account:Inbox
+Channel hm@example.com:Inbox1,Inbox2
diff --git a/home-manager/tests/modules/programs/mbsync.nix b/home-manager/tests/modules/programs/mbsync.nix
new file mode 100644
index 00000000000..fa9768a2fe1
--- /dev/null
+++ b/home-manager/tests/modules/programs/mbsync.nix
@@ -0,0 +1,35 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  imports = [ ../accounts/email-test-accounts.nix ];
+
+  config = {
+    home.username = "hm-user";
+    home.homeDirectory = "/home/hm-user";
+
+    programs.mbsync = {
+      enable = true;
+      groups.inboxes = {
+        "hm@example.com" = [ "Inbox1" "Inbox2" ];
+        hm-account = [ "Inbox" ];
+      };
+    };
+
+    accounts.email.accounts = {
+      "hm@example.com".mbsync = {
+        enable = true;
+      };
+
+      hm-account.mbsync = {
+        enable = true;
+      };
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.mbsyncrc
+      assertFileContent home-files/.mbsyncrc ${./mbsync-expected.conf}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/newsboat/default.nix b/home-manager/tests/modules/programs/newsboat/default.nix
new file mode 100644
index 00000000000..a9b15a44359
--- /dev/null
+++ b/home-manager/tests/modules/programs/newsboat/default.nix
@@ -0,0 +1,3 @@
+{
+  newsboat-basics = ./newsboat-basics.nix;
+}
diff --git a/home-manager/tests/modules/programs/newsboat/newsboat-basics-urls.txt b/home-manager/tests/modules/programs/newsboat/newsboat-basics-urls.txt
new file mode 100644
index 00000000000..7f084961345
--- /dev/null
+++ b/home-manager/tests/modules/programs/newsboat/newsboat-basics-urls.txt
@@ -0,0 +1,3 @@
+http://example.org/feed.xml "tag1" "tag2" "~Cool feed"
+http://example.org/feed2.xml
+"query:foo:rssurl =~ \"example.com\""
diff --git a/home-manager/tests/modules/programs/newsboat/newsboat-basics.nix b/home-manager/tests/modules/programs/newsboat/newsboat-basics.nix
new file mode 100644
index 00000000000..49a54f6d0c3
--- /dev/null
+++ b/home-manager/tests/modules/programs/newsboat/newsboat-basics.nix
@@ -0,0 +1,39 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.newsboat = {
+      enable = true;
+
+      urls = [
+        {
+          url = "http://example.org/feed.xml";
+          tags = [ "tag1" "tag2" ];
+          title = "Cool feed";
+        }
+
+        {
+          url = "http://example.org/feed2.xml";
+        }
+      ];
+
+      queries = {
+        "foo" = "rssurl =~ \"example.com\"";
+      };
+    };
+
+    nixpkgs.overlays = [
+      (self: super: {
+        newsboat = pkgs.writeScriptBin "dummy-newsboat" "";
+      })
+    ];
+
+    nmt.script = ''
+      assertFileContent \
+        home-files/.newsboat/urls \
+        ${./newsboat-basics-urls.txt}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/rofi/assert-on-both-theme-and-colors-expected.json b/home-manager/tests/modules/programs/rofi/assert-on-both-theme-and-colors-expected.json
new file mode 100644
index 00000000000..808288f4193
--- /dev/null
+++ b/home-manager/tests/modules/programs/rofi/assert-on-both-theme-and-colors-expected.json
@@ -0,0 +1 @@
+["Cannot use the rofi options 'theme' and 'colors' simultaneously.\n"]
\ No newline at end of file
diff --git a/home-manager/tests/modules/programs/rofi/assert-on-both-theme-and-colors.nix b/home-manager/tests/modules/programs/rofi/assert-on-both-theme-and-colors.nix
new file mode 100644
index 00000000000..2558a25832f
--- /dev/null
+++ b/home-manager/tests/modules/programs/rofi/assert-on-both-theme-and-colors.nix
@@ -0,0 +1,33 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.rofi = {
+      enable = true;
+      theme = "foo";
+      colors = {
+        window = {
+          background = "background";
+          border = "border";
+          separator = "separator";
+        };
+        rows = {
+        };
+      };
+    };
+
+    home.file.result.text =
+      builtins.toJSON
+      (map (a: a.message)
+      (filter (a: !a.assertion)
+        config.assertions));
+
+    nmt.script = ''
+      assertFileContent \
+        home-files/result \
+        ${./assert-on-both-theme-and-colors-expected.json}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/rofi/default.nix b/home-manager/tests/modules/programs/rofi/default.nix
new file mode 100644
index 00000000000..b42b43e949a
--- /dev/null
+++ b/home-manager/tests/modules/programs/rofi/default.nix
@@ -0,0 +1,3 @@
+{
+  rofi-assert-on-both-theme-and-colors = import ./assert-on-both-theme-and-colors.nix;
+}
diff --git a/home-manager/tests/modules/programs/ssh/default-config-expected.conf b/home-manager/tests/modules/programs/ssh/default-config-expected.conf
new file mode 100644
index 00000000000..55748ea6c82
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/default-config-expected.conf
@@ -0,0 +1,15 @@
+
+
+
+
+Host *
+  ForwardAgent no
+  Compression no
+  ServerAliveInterval 0
+  HashKnownHosts no
+  UserKnownHostsFile ~/.ssh/known_hosts
+  ControlMaster no
+  ControlPath ~/.ssh/master-%r@%n:%p
+  ControlPersist no
+
+  
diff --git a/home-manager/tests/modules/programs/ssh/default-config.nix b/home-manager/tests/modules/programs/ssh/default-config.nix
new file mode 100644
index 00000000000..266bc9d1f5d
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/default-config.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.ssh = {
+      enable = true;
+    };
+
+    home.file.assertions.text =
+      builtins.toJSON
+      (map (a: a.message)
+      (filter (a: !a.assertion)
+        config.assertions));
+
+    nmt.script = ''
+      assertFileExists home-files/.ssh/config
+      assertFileContent home-files/.ssh/config ${./default-config-expected.conf}
+      assertFileContent home-files/assertions ${./no-assertions.json}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/ssh/default.nix b/home-manager/tests/modules/programs/ssh/default.nix
new file mode 100644
index 00000000000..507eef0bdb8
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/default.nix
@@ -0,0 +1,17 @@
+{
+  ssh-defaults = ./default-config.nix;
+  ssh-match-blocks = ./match-blocks-attrs.nix;
+
+  ssh-forwards-dynamic-valid-bind-no-asserts =
+    ./forwards-dynamic-valid-bind-no-asserts.nix;
+  ssh-forwards-dynamic-bind-path-with-port-asserts =
+    ./forwards-dynamic-bind-path-with-port-asserts.nix;
+  ssh-forwards-local-bind-path-with-port-asserts =
+    ./forwards-local-bind-path-with-port-asserts.nix;
+  ssh-forwards-local-host-path-with-port-asserts =
+    ./forwards-local-host-path-with-port-asserts.nix;
+  ssh-forwards-remote-bind-path-with-port-asserts =
+    ./forwards-remote-bind-path-with-port-asserts.nix;
+  ssh-forwards-remote-host-path-with-port-asserts =
+    ./forwards-remote-host-path-with-port-asserts.nix;
+}
diff --git a/home-manager/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix b/home-manager/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix
new file mode 100644
index 00000000000..2e9082de378
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix
@@ -0,0 +1,32 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.ssh = {
+      enable = true;
+      matchBlocks = {
+        dynamicBindPathWithPort = {
+          dynamicForwards = [
+            {
+              # Error:
+              address = "/run/user/1000/gnupg/S.gpg-agent.extra";
+              port = 3000;
+            }
+          ];
+        };
+      };
+    };
+
+    home.file.result.text =
+      builtins.toJSON
+      (map (a: a.message)
+      (filter (a: !a.assertion)
+        config.assertions));
+
+    nmt.script = ''
+      assertFileContent home-files/result ${./forwards-paths-with-ports-error.json}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts-expected.conf b/home-manager/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts-expected.conf
new file mode 100644
index 00000000000..5213d282c28
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts-expected.conf
@@ -0,0 +1,19 @@
+
+
+Host dynamicBindAddressWithPort
+  DynamicForward [127.0.0.1]:3000
+
+Host dynamicBindPathNoPort
+  DynamicForward /run/user/1000/gnupg/S.gpg-agent.extra
+
+Host *
+  ForwardAgent no
+  Compression no
+  ServerAliveInterval 0
+  HashKnownHosts no
+  UserKnownHostsFile ~/.ssh/known_hosts
+  ControlMaster no
+  ControlPath ~/.ssh/master-%r@%n:%p
+  ControlPersist no
+
+  
diff --git a/home-manager/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix b/home-manager/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix
new file mode 100644
index 00000000000..15ab59e82ca
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix
@@ -0,0 +1,45 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.ssh = {
+      enable = true;
+      matchBlocks = {
+        dynamicBindPathNoPort = {
+          dynamicForwards = [
+            {
+              # OK:
+              address = "/run/user/1000/gnupg/S.gpg-agent.extra";
+            }
+          ];
+        };
+
+        dynamicBindAddressWithPort = {
+          dynamicForwards = [
+            {
+              # OK:
+              address = "127.0.0.1";
+              port = 3000;
+            }
+          ];
+        };
+      };
+    };
+
+    home.file.result.text =
+      builtins.toJSON
+      (map (a: a.message)
+      (filter (a: !a.assertion)
+        config.assertions));
+
+    nmt.script = ''
+      assertFileExists home-files/.ssh/config
+      assertFileContent \
+        home-files/.ssh/config \
+        ${./forwards-dynamic-valid-bind-no-asserts-expected.conf}
+      assertFileContent home-files/result ${./no-assertions.json}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix b/home-manager/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix
new file mode 100644
index 00000000000..c05cba82791
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.ssh = {
+      enable = true;
+      matchBlocks = {
+        localBindPathWithPort = {
+          localForwards = [
+            {
+              # OK:
+              host.address = "127.0.0.1";
+              host.port = 3000;
+
+              # Error:
+              bind.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
+              bind.port = 3000;
+            }
+          ];
+        };
+      };
+    };
+
+    home.file.result.text =
+      builtins.toJSON
+      (map (a: a.message)
+      (filter (a: !a.assertion)
+        config.assertions));
+
+    nmt.script = ''
+      assertFileContent home-files/result ${./forwards-paths-with-ports-error.json}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix b/home-manager/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix
new file mode 100644
index 00000000000..8cecc5e5121
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.ssh = {
+      enable = true;
+      matchBlocks = {
+        localHostPathWithPort = {
+          localForwards = [
+            {
+              # OK:
+              bind.address = "127.0.0.1";
+              bind.port = 3000;
+
+              # Error:
+              host.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
+              host.port = 3000;
+            }
+          ];
+        };
+      };
+    };
+
+    home.file.result.text =
+      builtins.toJSON
+      (map (a: a.message)
+      (filter (a: !a.assertion)
+        config.assertions));
+
+    nmt.script = ''
+      assertFileContent home-files/result ${./forwards-paths-with-ports-error.json}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/ssh/forwards-paths-with-ports-error.json b/home-manager/tests/modules/programs/ssh/forwards-paths-with-ports-error.json
new file mode 100644
index 00000000000..e7e3a374ecc
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/forwards-paths-with-ports-error.json
@@ -0,0 +1 @@
+["Forwarded paths cannot have ports."]
\ No newline at end of file
diff --git a/home-manager/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix b/home-manager/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix
new file mode 100644
index 00000000000..a0473147bd3
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.ssh = {
+      enable = true;
+      matchBlocks = {
+        remoteBindPathWithPort = {
+          remoteForwards = [
+            {
+              # OK:
+              host.address = "127.0.0.1";
+              host.port = 3000;
+
+              # Error:
+              bind.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
+              bind.port = 3000;
+            }
+          ];
+        };
+      };
+    };
+
+    home.file.result.text =
+      builtins.toJSON
+      (map (a: a.message)
+      (filter (a: !a.assertion)
+        config.assertions));
+
+    nmt.script = ''
+      assertFileContent home-files/result ${./forwards-paths-with-ports-error.json}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix b/home-manager/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix
new file mode 100644
index 00000000000..770b8ab2870
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.ssh = {
+      enable = true;
+      matchBlocks = {
+        remoteHostPathWithPort = {
+          remoteForwards = [
+            {
+              # OK:
+              bind.address = "127.0.0.1";
+              bind.port = 3000;
+
+              # Error:
+              host.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
+              host.port = 3000;
+            }
+          ];
+        };
+      };
+    };
+
+    home.file.result.text =
+      builtins.toJSON
+      (map (a: a.message)
+      (filter (a: !a.assertion)
+        config.assertions));
+
+    nmt.script = ''
+      assertFileContent home-files/result ${./forwards-paths-with-ports-error.json}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/ssh/match-blocks-attrs-expected.conf b/home-manager/tests/modules/programs/ssh/match-blocks-attrs-expected.conf
new file mode 100644
index 00000000000..f0d768375f0
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/match-blocks-attrs-expected.conf
@@ -0,0 +1,29 @@
+
+
+Host * !github.com
+  Port 516
+  IdentityFile file1
+  IdentityFile file2
+
+Host abc
+  ProxyJump jump-host
+
+Host xyz
+  ServerAliveInterval 60
+  IdentityFile file
+  LocalForward [localhost]:8080 [10.0.0.1]:80
+  RemoteForward [localhost]:8081 [10.0.0.2]:80
+  RemoteForward /run/user/1000/gnupg/S.gpg-agent.extra /run/user/1000/gnupg/S.gpg-agent
+  DynamicForward [localhost]:2839
+
+Host *
+  ForwardAgent no
+  Compression no
+  ServerAliveInterval 0
+  HashKnownHosts no
+  UserKnownHostsFile ~/.ssh/known_hosts
+  ControlMaster no
+  ControlPath ~/.ssh/master-%r@%n:%p
+  ControlPersist no
+
+  
diff --git a/home-manager/tests/modules/programs/ssh/match-blocks-attrs.nix b/home-manager/tests/modules/programs/ssh/match-blocks-attrs.nix
new file mode 100644
index 00000000000..94263ef9d27
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/match-blocks-attrs.nix
@@ -0,0 +1,64 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.ssh = {
+      enable = true;
+      matchBlocks = {
+        abc = {
+          identityFile = null;
+          proxyJump = "jump-host";
+        };
+
+        xyz = {
+          identityFile = "file";
+          serverAliveInterval = 60;
+          localForwards = [
+            {
+              bind.port = 8080;
+              host.address = "10.0.0.1";
+              host.port = 80;
+            }
+          ];
+          remoteForwards = [
+            {
+              bind.port = 8081;
+              host.address = "10.0.0.2";
+              host.port = 80;
+            }
+            {
+              bind.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
+              host.address = "/run/user/1000/gnupg/S.gpg-agent";
+            }
+          ];
+          dynamicForwards = [
+            {
+              port = 2839;
+            }
+          ];
+        };
+
+        "* !github.com" = {
+          identityFile = ["file1" "file2"];
+          port = 516;
+        };
+      };
+    };
+
+    home.file.assertions.text =
+      builtins.toJSON
+      (map (a: a.message)
+      (filter (a: !a.assertion)
+        config.assertions));
+
+    nmt.script = ''
+      assertFileExists home-files/.ssh/config
+      assertFileContent \
+        home-files/.ssh/config \
+        ${./match-blocks-attrs-expected.conf}
+      assertFileContent home-files/assertions ${./no-assertions.json}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/ssh/no-assertions.json b/home-manager/tests/modules/programs/ssh/no-assertions.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/home-manager/tests/modules/programs/ssh/no-assertions.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/home-manager/tests/modules/programs/texlive-minimal.nix b/home-manager/tests/modules/programs/texlive-minimal.nix
new file mode 100644
index 00000000000..df143dbc660
--- /dev/null
+++ b/home-manager/tests/modules/programs/texlive-minimal.nix
@@ -0,0 +1,13 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.texlive.enable = true;
+
+    nmt.script = ''
+      assertFileExists home-path/bin/tex
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/tmux/default.nix b/home-manager/tests/modules/programs/tmux/default.nix
new file mode 100644
index 00000000000..d4501c60981
--- /dev/null
+++ b/home-manager/tests/modules/programs/tmux/default.nix
@@ -0,0 +1,7 @@
+{
+  tmux-emacs-with-plugins = ./emacs-with-plugins.nix;
+  tmux-not-enabled = ./not-enabled.nix;
+  tmux-vi-all-true = ./vi-all-true.nix;
+  tmux-secure-socket-enabled = ./secure-socket-enabled.nix;
+  tmux-disable-confirmation-prompt = ./disable-confirmation-prompt.nix;
+}
diff --git a/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.conf b/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.conf
new file mode 100644
index 00000000000..b599e603e4a
--- /dev/null
+++ b/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.conf
@@ -0,0 +1,31 @@
+# ============================================= #
+# Start with defaults from the Sensible plugin  #
+# --------------------------------------------- #
+run-shell @sensible_rtp@
+# ============================================= #
+
+set  -g default-terminal "screen"
+set  -g base-index      0
+setw -g pane-base-index 0
+
+
+
+
+
+set -g status-keys emacs
+set -g mode-keys   emacs
+
+
+
+
+
+bind-key & kill-window
+bind-key x kill-pane
+
+
+setw -g aggressive-resize off
+setw -g clock-mode-style  12
+set  -s escape-time       500
+set  -g history-limit     2000
+
+
diff --git a/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.nix b/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.nix
new file mode 100644
index 00000000000..82c53438b00
--- /dev/null
+++ b/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  substituteExpected = path: pkgs.substituteAll {
+    src = path;
+
+    sensible_rtp = pkgs.tmuxPlugins.sensible.rtp;
+  };
+  
+in
+
+{
+  config = {
+    programs.tmux = {
+      enable = true;
+      disableConfirmationPrompt = true;
+    };
+  
+    nmt.script = ''
+      assertFileExists home-files/.tmux.conf
+      assertFileContent home-files/.tmux.conf \
+        ${substituteExpected ./disable-confirmation-prompt.conf}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/tmux/emacs-with-plugins.conf b/home-manager/tests/modules/programs/tmux/emacs-with-plugins.conf
new file mode 100644
index 00000000000..b047c97a766
--- /dev/null
+++ b/home-manager/tests/modules/programs/tmux/emacs-with-plugins.conf
@@ -0,0 +1,54 @@
+# ============================================= #
+# Start with defaults from the Sensible plugin  #
+# --------------------------------------------- #
+run-shell @tmuxplugin_sensible_rtp@
+# ============================================= #
+
+set  -g default-terminal "screen"
+set  -g base-index      0
+setw -g pane-base-index 0
+
+new-session
+
+bind v split-window -h
+bind s split-window -v
+
+
+set -g status-keys emacs
+set -g mode-keys   emacs
+
+
+
+
+
+
+
+setw -g aggressive-resize on
+setw -g clock-mode-style  24
+set  -s escape-time       500
+set  -g history-limit     2000
+
+
+
+# ============================================= #
+# Load plugins with Home Manager                #
+# --------------------------------------------- #
+
+# tmuxplugin-logging
+# ---------------------
+
+run-shell @tmuxplugin_logging@/share/tmux-plugins/logging/logging.tmux
+
+
+# tmuxplugin-prefix-highlight
+# ---------------------
+
+run-shell @tmuxplugin_prefix_highlight@/share/tmux-plugins/prefix-highlight/prefix_highlight.tmux
+
+
+# tmuxplugin-fzf-tmux-url
+# ---------------------
+
+run-shell @tmuxplugin_fzf_tmux_url@/share/tmux-plugins/fzf-tmux-url/fzf-url.tmux
+
+# ============================================= #
diff --git a/home-manager/tests/modules/programs/tmux/emacs-with-plugins.nix b/home-manager/tests/modules/programs/tmux/emacs-with-plugins.nix
new file mode 100644
index 00000000000..5e147b7290e
--- /dev/null
+++ b/home-manager/tests/modules/programs/tmux/emacs-with-plugins.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  substituteExpected = path: pkgs.substituteAll {
+    src = path;
+
+    tmuxplugin_fzf_tmux_url = pkgs.tmuxPlugins.fzf-tmux-url;
+    tmuxplugin_logging = pkgs.tmuxPlugins.logging;
+    tmuxplugin_prefix_highlight = pkgs.tmuxPlugins.prefix-highlight;
+    tmuxplugin_sensible_rtp = pkgs.tmuxPlugins.sensible.rtp;
+  };
+
+in
+
+{
+  config = {
+    programs.tmux = {
+      aggressiveResize = true;
+      clock24 = true;
+      enable = true;
+      keyMode = "emacs";
+      newSession = true;
+      reverseSplit = true;
+
+      plugins = with pkgs.tmuxPlugins; [
+        logging
+        prefix-highlight
+        fzf-tmux-url
+      ];
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.tmux.conf
+      assertFileContent home-files/.tmux.conf \
+        ${substituteExpected ./emacs-with-plugins.conf}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/tmux/hm-session-vars.sh b/home-manager/tests/modules/programs/tmux/hm-session-vars.sh
new file mode 100644
index 00000000000..40d9c24b50d
--- /dev/null
+++ b/home-manager/tests/modules/programs/tmux/hm-session-vars.sh
@@ -0,0 +1,5 @@
+# Only source this once.
+if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi
+export __HM_SESS_VARS_SOURCED=1
+
+export TMUX_TMPDIR="${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}"
diff --git a/home-manager/tests/modules/programs/tmux/not-enabled.nix b/home-manager/tests/modules/programs/tmux/not-enabled.nix
new file mode 100644
index 00000000000..b7c675a83a2
--- /dev/null
+++ b/home-manager/tests/modules/programs/tmux/not-enabled.nix
@@ -0,0 +1,13 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.tmux = { enable = false; };
+
+    nmt.script = ''
+      assertPathNotExists home-files/.tmux.conf
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/tmux/secure-socket-enabled.nix b/home-manager/tests/modules/programs/tmux/secure-socket-enabled.nix
new file mode 100644
index 00000000000..34e9129c5a4
--- /dev/null
+++ b/home-manager/tests/modules/programs/tmux/secure-socket-enabled.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.tmux = {
+      enable = true;
+      secureSocket = true;
+    };
+
+    nmt.script = ''
+      assertFileExists home-path/etc/profile.d/hm-session-vars.sh
+      assertFileContent home-path/etc/profile.d/hm-session-vars.sh ${./hm-session-vars.sh}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/tmux/vi-all-true.conf b/home-manager/tests/modules/programs/tmux/vi-all-true.conf
new file mode 100644
index 00000000000..08e37e19b97
--- /dev/null
+++ b/home-manager/tests/modules/programs/tmux/vi-all-true.conf
@@ -0,0 +1,31 @@
+# ============================================= #
+# Start with defaults from the Sensible plugin  #
+# --------------------------------------------- #
+run-shell @sensible_rtp@
+# ============================================= #
+
+set  -g default-terminal "screen"
+set  -g base-index      0
+setw -g pane-base-index 0
+
+new-session
+
+bind v split-window -h
+bind s split-window -v
+
+
+set -g status-keys vi
+set -g mode-keys   vi
+
+
+
+
+
+
+
+setw -g aggressive-resize on
+setw -g clock-mode-style  24
+set  -s escape-time       500
+set  -g history-limit     2000
+
+
diff --git a/home-manager/tests/modules/programs/tmux/vi-all-true.nix b/home-manager/tests/modules/programs/tmux/vi-all-true.nix
new file mode 100644
index 00000000000..e88ed587c03
--- /dev/null
+++ b/home-manager/tests/modules/programs/tmux/vi-all-true.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  substituteExpected = path: pkgs.substituteAll {
+    src = path;
+
+    sensible_rtp = pkgs.tmuxPlugins.sensible.rtp;
+  };
+
+in {
+  config = {
+    programs.tmux = {
+      aggressiveResize = true;
+      clock24 = true;
+      enable = true;
+      keyMode = "vi";
+      newSession = true;
+      reverseSplit = true;
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.tmux.conf
+      assertFileContent home-files/.tmux.conf \
+        ${substituteExpected ./vi-all-true.conf}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/programs/zsh/default.nix b/home-manager/tests/modules/programs/zsh/default.nix
new file mode 100644
index 00000000000..da5dd5b55ed
--- /dev/null
+++ b/home-manager/tests/modules/programs/zsh/default.nix
@@ -0,0 +1,3 @@
+{
+  zsh-session-variables = ./session-variables.nix;
+}
diff --git a/home-manager/tests/modules/programs/zsh/session-variables.nix b/home-manager/tests/modules/programs/zsh/session-variables.nix
new file mode 100644
index 00000000000..a87d39820cf
--- /dev/null
+++ b/home-manager/tests/modules/programs/zsh/session-variables.nix
@@ -0,0 +1,22 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.zsh = {
+      enable = true;
+
+      sessionVariables = {
+        V1 = "v1";
+        V2 = "v2-${config.programs.zsh.sessionVariables.V1}";
+      };
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.zshrc
+      assertFileRegex home-files/.zshrc 'export V1="v1"'
+      assertFileRegex home-files/.zshrc 'export V2="v2-v1"'
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/services/sxhkd/configuration.nix b/home-manager/tests/modules/services/sxhkd/configuration.nix
new file mode 100644
index 00000000000..ac04a7ecf30
--- /dev/null
+++ b/home-manager/tests/modules/services/sxhkd/configuration.nix
@@ -0,0 +1,31 @@
+{ config, ... }:
+{
+  config = {
+    services.sxhkd = {
+      enable = true;
+
+      keybindings = {
+        "super + a" = "run command a";
+        "super + b" = null;
+        "super + Shift + b" = "run command b";
+      };
+
+      extraConfig = ''
+        super + c
+          call command c
+ 
+        # comment
+        super + d
+          call command d
+      '';
+    };
+
+    nmt.script = ''
+      local sxhkdrc=home-files/.config/sxhkd/sxhkdrc
+
+      assertFileExists $sxhkdrc
+
+      assertFileContent $sxhkdrc ${./sxhkdrc}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/services/sxhkd/default.nix b/home-manager/tests/modules/services/sxhkd/default.nix
new file mode 100644
index 00000000000..ec25252cee0
--- /dev/null
+++ b/home-manager/tests/modules/services/sxhkd/default.nix
@@ -0,0 +1,4 @@
+{
+  sxhkd-configuration = ./configuration.nix;
+  sxhkd-service = ./service.nix;
+}
diff --git a/home-manager/tests/modules/services/sxhkd/service.nix b/home-manager/tests/modules/services/sxhkd/service.nix
new file mode 100644
index 00000000000..46ce259a718
--- /dev/null
+++ b/home-manager/tests/modules/services/sxhkd/service.nix
@@ -0,0 +1,20 @@
+{ config, ... }:
+{
+  config = {
+    services.sxhkd = {
+      enable = true;
+      extraPath = "/home/the-user/bin:/extra/path/bin";
+    };
+
+    nmt.script = ''
+      local serviceFile=home-files/.config/systemd/user/sxhkd.service
+
+      assertFileExists $serviceFile
+
+      assertFileRegex $serviceFile 'ExecStart=.*/bin/sxhkd'
+
+      assertFileRegex $serviceFile \
+        'Environment=PATH=.*\.nix-profile/bin:/home/the-user/bin:/extra/path/bin'
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/services/sxhkd/sxhkdrc b/home-manager/tests/modules/services/sxhkd/sxhkdrc
new file mode 100644
index 00000000000..c8883464b29
--- /dev/null
+++ b/home-manager/tests/modules/services/sxhkd/sxhkdrc
@@ -0,0 +1,13 @@
+super + Shift + b
+  run command b
+
+super + a
+  run command a
+
+
+super + c
+  call command c
+
+# comment
+super + d
+  call command d
diff --git a/home-manager/tests/modules/services/window-managers/i3-keybindings.nix b/home-manager/tests/modules/services/window-managers/i3-keybindings.nix
new file mode 100644
index 00000000000..b5ee4fd8765
--- /dev/null
+++ b/home-manager/tests/modules/services/window-managers/i3-keybindings.nix
@@ -0,0 +1,34 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    xsession.windowManager.i3 = {
+      enable = true;
+
+      config.keybindings =
+        let
+          modifier = config.xsession.windowManager.i3.config.modifier;
+        in
+          lib.mkOptionDefault {
+            "${modifier}+Left" = "overridden-command";
+            "${modifier}+Right" = null;
+            "${modifier}+Invented" = "invented-key-command";
+          };
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.config/i3/config
+
+      assertFileRegex home-files/.config/i3/config \
+        'bindsym Mod1+Left overridden-command'
+
+      assertFileNotRegex home-files/.config/i3/config \
+        'Mod1+Right'
+
+      assertFileRegex home-files/.config/i3/config \
+        'bindsym Mod1+Invented invented-key-command'
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/systemd/default.nix b/home-manager/tests/modules/systemd/default.nix
new file mode 100644
index 00000000000..c1779ac59fb
--- /dev/null
+++ b/home-manager/tests/modules/systemd/default.nix
@@ -0,0 +1,5 @@
+{
+  systemd-services = ./services.nix;
+  systemd-session-variables = ./session-variables.nix;
+  systemd-timers = ./timers.nix;
+}
diff --git a/home-manager/tests/modules/systemd/services-expected.conf b/home-manager/tests/modules/systemd/services-expected.conf
new file mode 100644
index 00000000000..34b9618d6d3
--- /dev/null
+++ b/home-manager/tests/modules/systemd/services-expected.conf
@@ -0,0 +1,5 @@
+[Service]
+ExecStart=/some/exec/start/command --with-arguments "%i"
+
+[Unit]
+Description=A basic test service
diff --git a/home-manager/tests/modules/systemd/services.nix b/home-manager/tests/modules/systemd/services.nix
new file mode 100644
index 00000000000..f1f7a42bb1a
--- /dev/null
+++ b/home-manager/tests/modules/systemd/services.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    systemd.user.services."test-service@" = {
+      Unit = {
+        Description = "A basic test service";
+      };
+
+      Service = {
+        ExecStart = ''/some/exec/start/command --with-arguments "%i"'';
+      };
+    };
+
+    nmt.script = ''
+      local serviceFile=home-files/.config/systemd/user/test-service@.service
+      assertFileExists $serviceFile
+      assertFileContent $serviceFile ${./services-expected.conf}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/systemd/session-variables-expected.conf b/home-manager/tests/modules/systemd/session-variables-expected.conf
new file mode 100644
index 00000000000..5b6e80bc32b
--- /dev/null
+++ b/home-manager/tests/modules/systemd/session-variables-expected.conf
@@ -0,0 +1,2 @@
+V_int=1
+V_str=2
diff --git a/home-manager/tests/modules/systemd/session-variables.nix b/home-manager/tests/modules/systemd/session-variables.nix
new file mode 100644
index 00000000000..7cfb4a6c7c3
--- /dev/null
+++ b/home-manager/tests/modules/systemd/session-variables.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    systemd.user.sessionVariables = {
+      V_int = 1;
+      V_str = "2";
+    };
+
+    nmt.script = ''
+      local envFile=home-files/.config/environment.d/10-home-manager.conf
+      assertFileExists $envFile
+      assertFileContent $envFile ${./session-variables-expected.conf}
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/systemd/timers-expected.conf b/home-manager/tests/modules/systemd/timers-expected.conf
new file mode 100644
index 00000000000..b19f044cc0b
--- /dev/null
+++ b/home-manager/tests/modules/systemd/timers-expected.conf
@@ -0,0 +1,8 @@
+[Install]
+WantedBy=timers.target
+
+[Timer]
+OnUnitActiveSec=1h 30m
+
+[Unit]
+Description=A basic test timer
diff --git a/home-manager/tests/modules/systemd/timers.nix b/home-manager/tests/modules/systemd/timers.nix
new file mode 100644
index 00000000000..0fa0070cd77
--- /dev/null
+++ b/home-manager/tests/modules/systemd/timers.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    systemd.user.timers.test-timer = {
+      Unit = {
+        Description = "A basic test timer";
+      };
+
+      Timer = {
+        OnUnitActiveSec = "1h 30m";
+      };
+
+      Install = {
+        WantedBy = [ "timers.target" ];
+      };
+    };
+
+    nmt.script = ''
+      local unitDir=home-files/.config/systemd/user
+      local timerFile=$unitDir/test-timer.timer
+
+      assertFileExists $timerFile
+      assertFileContent $timerFile ${./timers-expected.conf}
+
+      assertFileExists $unitDir/timers.target.wants/test-timer.timer
+    '';
+  };
+}
diff --git a/home-manager/tests/modules/xresources-expected.conf b/home-manager/tests/modules/xresources-expected.conf
new file mode 100644
index 00000000000..20b47e5080b
--- /dev/null
+++ b/home-manager/tests/modules/xresources-expected.conf
@@ -0,0 +1,5 @@
+Test*boolean1: true
+Test*boolean2: false
+Test*int: 10
+Test*list: list-str, true, false, 10
+Test*string: test-string
diff --git a/home-manager/tests/modules/xresources.nix b/home-manager/tests/modules/xresources.nix
new file mode 100644
index 00000000000..f73e326f31e
--- /dev/null
+++ b/home-manager/tests/modules/xresources.nix
@@ -0,0 +1,22 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  config = {
+    xresources = {
+      properties = {
+        "Test*string" = "test-string";
+        "Test*boolean1" = true;
+        "Test*boolean2" = false;
+        "Test*int" = 10;
+        "Test*list" = [ "list-str" true false 10 ];
+      };
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.Xresources
+      assertFileContent home-files/.Xresources ${./xresources-expected.conf}
+    '';
+  };
+}
diff --git a/modules/base/default.nix b/modules/base/default.nix
new file mode 100644
index 00000000000..4208e879a39
--- /dev/null
+++ b/modules/base/default.nix
@@ -0,0 +1,10 @@
+{ config, ... }:
+
+{
+  imports = [
+    ./fish
+    ./git
+    ./shell
+    ./user
+  ];
+}
diff --git a/modules/base/fish/alias.fish b/modules/base/fish/alias.fish
new file mode 100644
index 00000000000..078b21dca8c
--- /dev/null
+++ b/modules/base/fish/alias.fish
@@ -0,0 +1,10 @@
+# Useful
+alias todo="void /home/.local/todo.db"
+alias debug="env RUST_BACKTRACE=1 fish -c"
+alias stalk="watch -n 0.1"
+alias hib="systemctl hibernate"
+
+alias c="cargo"
+alias e="emacs"
+alias em="emacs (fzf --height=15 --reverse)"
+alias skcd="cd (sk ~)"
diff --git a/modules/base/fish/binds.fish b/modules/base/fish/binds.fish
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/modules/base/fish/binds.fish
@@ -0,0 +1 @@
+
diff --git a/modules/base/fish/config.fish b/modules/base/fish/config.fish
new file mode 100644
index 00000000000..9bc6c53c583
--- /dev/null
+++ b/modules/base/fish/config.fish
@@ -0,0 +1,22 @@
+# source $HOME/.cargo/env
+# set -gx PATH $HOME/.cargo/bin $PATH
+
+# The o bit is a bit of a hack
+# umask u=rw,g=rw,o-rwx
+
+# direnv hook fish | source
+
+# gnome-keyring insists on setting this to itself, even if ssh support is disabled
+set -x SSH_AUTH_SOCK "/run/user/1000/gnupg/S.gpg-agent.ssh"
+
+# Fix some utf-8 errors
+set -x LC_ALL en_GB.utf8
+
+# Better nix-shell support!
+any-nix-shell fish --info-right | source
+ 
+# Make git use emacs
+set -x EDITOR kak
+
+# tuuuuuuuurbofish!
+set fish_greeting 'Welcome to the '(set_color FF66CC)'::<>' (set_color normal)'...'
diff --git a/modules/base/fish/config.nix b/modules/base/fish/config.nix
new file mode 100644
index 00000000000..85c1c259920
--- /dev/null
+++ b/modules/base/fish/config.nix
@@ -0,0 +1,29 @@
+
+{ pkgs }:
+''
+set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
+
+
+${builtins.readFile ./functions/__fancy_history.fish }
+
+${builtins.readFile ./config.fish }
+${builtins.readFile ./alias.fish }
+
+${builtins.readFile ./functions/fish_prompt.fish }
+${builtins.readFile ./functions/fish_right_prompt.fish }
+${builtins.readFile ./functions/fish_user_key_bindings.fish }
+${builtins.readFile ./functions/gen-shell.fish }
+${builtins.readFile ./functions/__history_previous_command_arguments.fish }
+${builtins.readFile ./functions/__history_previous_command.fish }
+${builtins.readFile ./functions/__kakoune.fish }
+${builtins.readFile ./functions/e.fish }
+${builtins.readFile ./functions/k.fish }
+${builtins.readFile ./functions/nrepl.fish }
+${builtins.readFile ./functions/nxs.fish }
+${builtins.readFile ./functions/restart.fish }
+${builtins.readFile ./functions/rvm.fish }
+${builtins.readFile ./functions/search.fish }
+${builtins.readFile ./functions/__skim_cd.fish }
+
+${builtins.readFile ./binds.fish}
+''
diff --git a/modules/base/fish/default.nix b/modules/base/fish/default.nix
new file mode 100644
index 00000000000..73ca2e878b3
--- /dev/null
+++ b/modules/base/fish/default.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+  home-manager.users.spacekookie = { ... }: {
+    programs.fish.enable = true;
+    programs.fish.shellInit = import ./config.nix { inherit pkgs; };
+
+    home.packages = [
+      pkgs.any-nix-shell
+    ];
+  };
+
+  programs.fish.enable = true;
+}
diff --git a/modules/base/fish/functions/__fancy_history.fish b/modules/base/fish/functions/__fancy_history.fish
new file mode 100644
index 00000000000..7ea5a12d417
--- /dev/null
+++ b/modules/base/fish/functions/__fancy_history.fish
@@ -0,0 +1,5 @@
+function __fancy_history --description "history(1) but cool!"
+  set __queried_cmd (history | fzf --height=15 --reverse)
+  commandline -t $__queried_cmd
+  commandline -f repaint
+end
diff --git a/modules/base/fish/functions/__history_previous_command.fish b/modules/base/fish/functions/__history_previous_command.fish
new file mode 100644
index 00000000000..40555452230
--- /dev/null
+++ b/modules/base/fish/functions/__history_previous_command.fish
@@ -0,0 +1,8 @@
+function __history_previous_command
+  switch (commandline -t)
+  case "!"
+    commandline -t $history[1]; commandline -f repaint
+  case "*"
+    commandline -i !
+  end
+end
diff --git a/modules/base/fish/functions/__history_previous_command_arguments.fish b/modules/base/fish/functions/__history_previous_command_arguments.fish
new file mode 100644
index 00000000000..adc8fbd273d
--- /dev/null
+++ b/modules/base/fish/functions/__history_previous_command_arguments.fish
@@ -0,0 +1,9 @@
+function __history_previous_command_arguments
+  switch (commandline -t)
+  case "!"
+    commandline -t ""
+    commandline -f history-token-search-backward
+  case "*"
+    commandline -i '$'
+  end
+end
diff --git a/modules/base/fish/functions/__kakoune.fish b/modules/base/fish/functions/__kakoune.fish
new file mode 100644
index 00000000000..2515edaa00a
--- /dev/null
+++ b/modules/base/fish/functions/__kakoune.fish
@@ -0,0 +1,28 @@
+function __kakoune --description "Wrapper around starting and re-attaching to kakoune sessions"
+  set server_name (basename (pwd) | sed 's/\./-/g')
+  set socket_file (kak -l | grep $server_name)
+  set seek_point $argv[1]
+
+  if test -n ! $seek_point
+    return 130
+  end
+  
+  if test -z $socket_file
+    kak -d -s $server_name
+  end
+
+  kak -e "edit $seek_point" -c $server_name
+end
+
+function __kakoune_get_file_list --description "Get list of files to consider for fzf"
+  git status ^ /dev/null > /dev/null
+  if test $status -eq 0
+    git ls-files -oc --exclude-standard
+  else
+    find .
+  end
+end
+
+function __kakoune_get_folder_list --description "Get list of folder to consider for fzf"
+  find . -type d
+end
diff --git a/modules/base/fish/functions/__skim_cd.fish b/modules/base/fish/functions/__skim_cd.fish
new file mode 100644
index 00000000000..b4ae4234bed
--- /dev/null
+++ b/modules/base/fish/functions/__skim_cd.fish
@@ -0,0 +1,6 @@
+function __skim_cd --description "run fzf to find a directory to `cd` into"
+  set directory (find . -type d | fzf --reverse --height=15)
+  if test $status -eq 0
+    cd $directory
+  end
+end
diff --git a/modules/base/fish/functions/e.fish b/modules/base/fish/functions/e.fish
new file mode 100644
index 00000000000..cb3f2d6aaf4
--- /dev/null
+++ b/modules/base/fish/functions/e.fish
@@ -0,0 +1,12 @@
+# Spawn an emacs daemon for a project directory
+function e --description='Setup emacs server and open emacsclient'
+    set session (basename (pwd))
+    
+    ps x | grep emacs | grep $session > /dev/null
+
+    if test $status != 0
+        emacs --daemon=$session
+    end
+    
+    emacsclient -c -s $session --eval '(fzf)' ^ /dev/null > /dev/null &
+end
diff --git a/modules/base/fish/functions/fish_prompt.fish b/modules/base/fish/functions/fish_prompt.fish
new file mode 100644
index 00000000000..b6280bfbda6
--- /dev/null
+++ b/modules/base/fish/functions/fish_prompt.fish
@@ -0,0 +1,34 @@
+function fish_prompt --description 'Write out the prompt'
+	# Save our status
+    set -l last_status $status
+
+    set -l last_status_string ""
+    if [ $last_status -ne 0 ]
+        printf "%s(%d)%s " (set_color red --bold) $last_status (set_color normal)
+    end
+
+    if not set -q __hostname
+        set -g __hostname (hostname|cut -d . -f 1)
+    end
+
+    set -l color_cwd
+    set -l suffix
+    set -l CLOSEBRAC ]
+    set -l OPENBRAC [
+
+    switch $USER
+    case root toor
+        if set -q fish_color_cwd_root
+            set color_cwd $fish_color_cwd_root
+        else
+            set color_cwd $fish_color_cwd
+        end
+        set suffix '#'
+    case '*'
+        set color_cwd $fish_color_cwd
+        set suffix '>'
+    end
+
+    echo -n -s (set_color FF66CC) ' ❤ ' (set_color normal) '(' "$__hostname" ') ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
+    # echo -n -s (set_color FF66CC) ' I love you Kookie <3 Alyssa ' (set_color normal) '(' "$__hostname" ') ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
+end
diff --git a/modules/base/fish/functions/fish_right_prompt.fish b/modules/base/fish/functions/fish_right_prompt.fish
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/modules/base/fish/functions/fish_right_prompt.fish
@@ -0,0 +1 @@
+
diff --git a/modules/base/fish/functions/fish_user_key_bindings.fish b/modules/base/fish/functions/fish_user_key_bindings.fish
new file mode 100644
index 00000000000..9799d461120
--- /dev/null
+++ b/modules/base/fish/functions/fish_user_key_bindings.fish
@@ -0,0 +1,6 @@
+function fish_user_key_bindings
+    # Make `!!` and `!$` work
+    bind ! __history_previous_command
+    bind '$' __history_previous_command_arguments
+    bind \cr __fancy_history
+end
diff --git a/modules/base/fish/functions/gen-shell.fish b/modules/base/fish/functions/gen-shell.fish
new file mode 100644
index 00000000000..0c48fe2a5c3
--- /dev/null
+++ b/modules/base/fish/functions/gen-shell.fish
@@ -0,0 +1,22 @@
+function gen-shell
+    if not test $argv[1]
+        echo "Usage: gen-shell <name>"
+        return 1
+    end
+    
+    if test -e default.nix
+        echo "Refusing to override existing `default.nix`!"
+        return 1
+    end
+
+    set name $argv[1]
+    echo "with import <nixpkgs> {};
+
+stdenv.mkDerivation {
+  name = \"$name\";
+  buildInputs = with pkgs; [
+    # Hier könnte Ihre Werbung stehen
+  ];
+}" > default.nix
+    bat default.nix
+end
diff --git a/modules/base/fish/functions/k.fish b/modules/base/fish/functions/k.fish
new file mode 100644
index 00000000000..55b43ad5107
--- /dev/null
+++ b/modules/base/fish/functions/k.fish
@@ -0,0 +1,18 @@
+# Spawn a kak daemon in a project directory and fuzzy open a file
+function k --description='Open kakoune via fzf'
+  # Select a file with `fzf`
+  set file (__kakoune_get_file_list | fzf --height=25 --reverse)
+
+  # Open the file 
+  __kakoune $file
+end
+
+function ksm --description "Open a file at an exact line of code"
+  set file (sk --ansi -c 'rg --color=always --line-number "{}"')
+  set entry (echo $file | sed 's/\(\:[0-9]*\).*/\1/' | tr ':' ' ')
+
+  echo $entry
+
+  # Then open the file!
+  __kakoune $entry
+end
diff --git a/modules/base/fish/functions/nrepl.fish b/modules/base/fish/functions/nrepl.fish
new file mode 100644
index 00000000000..75febe575e4
--- /dev/null
+++ b/modules/base/fish/functions/nrepl.fish
@@ -0,0 +1,7 @@
+function nrepl
+    if test $argv[1]
+        nix repl $argv
+    else
+        nix repl '<nixpkgs>'
+    end
+end
diff --git a/modules/base/fish/functions/nxs.fish b/modules/base/fish/functions/nxs.fish
new file mode 100644
index 00000000000..a3fd915bbcc
--- /dev/null
+++ b/modules/base/fish/functions/nxs.fish
@@ -0,0 +1,12 @@
+function nxs
+    if test $argv[1]
+        nix run -f '<nixpkgs>' $argv
+    else
+        if test -e default.nix
+            nix-shell
+        else
+            echo "No `default.nix`"
+            return 1
+        end
+    end
+end
diff --git a/modules/base/fish/functions/restart.fish b/modules/base/fish/functions/restart.fish
new file mode 100644
index 00000000000..191fe791e81
--- /dev/null
+++ b/modules/base/fish/functions/restart.fish
@@ -0,0 +1,3 @@
+function restart
+    clear; exec fish
+end
diff --git a/modules/base/fish/functions/rvm.fish b/modules/base/fish/functions/rvm.fish
new file mode 100644
index 00000000000..834e73e5f75
--- /dev/null
+++ b/modules/base/fish/functions/rvm.fish
@@ -0,0 +1,40 @@
+function rvm --description='Ruby enVironment Manager'
+  # run RVM and capture the resulting environment
+  set --local env_file (mktemp -t rvm.fish.XXXXXXXXXX)
+  # This finds where RVM's root directory is and sources scripts/rvm from within it.  Then loads RVM in a clean environment and dumps the environment variables it generates out for us to use. 
+  bash -c 'PATH=$GEM_HOME/bin:$PATH;RVMA=$(which rvm);RVMB=$(whereis rvm | sed "s/rvm://");source $(if test $RVMA;then echo $RVMA | sed "s/\/bin\//\/scripts\//";elif test $RVMB; then echo $RVMB | sed "s/rvm/rvm\/scripts\/rvm/"; else echo ~/.rvm/scripts/rvm; fi); rvm "$@"; status=$?; env > "$0"; exit $status' $env_file $argv
+
+  # apply rvm_* and *PATH variables from the captured environment
+  and eval (grep -E '^rvm|^PATH|^GEM_PATH|^GEM_HOME' $env_file | grep -v '_clr=' | sed '/^[^=]*PATH/s/:/" "/g; s/^/set -xg /; s/=/ "/; s/$/" ;/; s/(//; s/)//')
+  # needed under fish >= 2.2.0
+  and set -xg GEM_PATH (echo $GEM_PATH | sed 's/ /:/g')
+
+  # clean up
+  rm -f $env_file
+end
+
+function __handle_rvmrc_stuff --on-variable PWD
+  # Source a .rvmrc file in a directory after changing to it, if it exists.
+  # To disable this feature, set rvm_project_rvmrc=0 in $HOME/.rvmrc
+  if test "$rvm_project_rvmrc" != 0
+    set -l cwd $PWD
+    while true
+      if contains $cwd "" $HOME "/"
+        if test "$rvm_project_rvmrc_default" = 1
+          rvm default 1>/dev/null 2>&1
+        end
+        break
+      else
+        if test -e .rvmrc -o -e .ruby-version -o -e .ruby-gemset
+          eval "rvm reload" > /dev/null
+          eval "rvm rvmrc load" >/dev/null
+          break
+        else
+          set cwd (dirname "$cwd")
+        end
+      end
+    end
+
+    set -e cwd
+  end
+end
diff --git a/modules/base/fish/functions/search.fish b/modules/base/fish/functions/search.fish
new file mode 100644
index 00000000000..11c89dc575d
--- /dev/null
+++ b/modules/base/fish/functions/search.fish
@@ -0,0 +1,4 @@
+function search --description "Finding some code with sk(1) and rg(1)"
+    set SELECTED (sk --ansi -c 'rg --color=always --line-number \"{}\"')
+    echo (cat $SELECTED | sed 's/\(\:[0-9]*\).*/\1/' | tr ':' ' ')
+end
diff --git a/modules/base/git/default.nix b/modules/base/git/default.nix
new file mode 100644
index 00000000000..36df829ba52
--- /dev/null
+++ b/modules/base/git/default.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+let
+  git = (pkgs.git.override { svnSupport = true; sendEmailSupport = true; });
+in
+{
+  environment.systemPackages = [ git ] ++
+                               (with pkgs.gitAndTools;
+                                 [ hub git-remote-hg ]);
+}
diff --git a/modules/base/shell/default.nix b/modules/base/shell/default.nix
new file mode 100644
index 00000000000..32a37330c3f
--- /dev/null
+++ b/modules/base/shell/default.nix
@@ -0,0 +1,34 @@
+/* ADDITIONAL SHELL TOOLS
+ *
+ * This module is a bit hard to wrap your head around, not because of
+ * what it does but because of the classification of tools it
+ * contains. It's a list of various utilities that are super useful
+ * for day-to-day use, but it's difficult to avoid just having one
+ * large file that contains _all_ applications you would ever use.
+ *
+ * Only add stuff to this list if you're sure that it will be useful
+ * on ALL workstations, as well as root-servers and user-servers!
+ */
+
+{ pkgs, ... }:
+
+{
+  home-manager.users.spacekookie = { ... }: {
+    home.packages = with pkgs; [
+      bat
+      curl
+      fzf
+      htop
+      kakoune # used to have a vim-type editor everywhere
+      moreutils
+      pciutils
+      pv
+      ripgrep
+      skim
+      tmux
+      tree
+      usbutils
+      wget
+    ];
+  };
+}
diff --git a/modules/base/user/default.nix b/modules/base/user/default.nix
new file mode 100644
index 00000000000..4983196e978
--- /dev/null
+++ b/modules/base/user/default.nix
@@ -0,0 +1,19 @@
+{ pkgs, lib, ... }:
+
+let
+  mkDefault = lib.mkOverride ((lib.mkDefault null).priority - 1);
+in
+{
+  users.mutableUsers = false;
+  users.groups.spacekookie = {};
+  users.users.spacekookie = {
+    createHome = true;
+    description = "Katharina Fey";
+    home = mkDefault "/home";
+    uid = mkDefault 1000;
+    group = "spacekookie";
+    extraGroups = [ "wheel" ];
+    shell = lib.mkDefault pkgs.fish;
+  };
+}
+
diff --git a/modules/docker/default.nix b/modules/docker/default.nix
new file mode 100644
index 00000000000..2d95cf45664
--- /dev/null
+++ b/modules/docker/default.nix
@@ -0,0 +1,6 @@
+{ config, ... }:
+
+{
+  virtualisation.docker.enable = true;
+  virtualisation.docker.storageDriver = "zfs";
+}
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
new file mode 100644
index 00000000000..cb79a0f2652
--- /dev/null
+++ b/modules/nix/default.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, lib, ... }:
+
+{
+  nix.trustedUsers = [ "@wheel" ];
+
+  nix.nixPath = [
+    "home-manager=/run/current-system/libkookie/home-manager"
+    "nixos-config=/run/current-system/libkookie/configuration.nix"
+    "nixpkgs-overlays=/run/current-system/libkookie/overlays"
+    "nixpkgs=/run/current-system/libkookie/nixpkgs"
+  ];
+
+  system.extraSystemBuilderCmds = ''
+    ln -s ${lib.cleanSource ../..} $out/libkookie
+  '';
+
+}
diff --git a/modules/server/blog/default.nix b/modules/server/blog/default.nix
new file mode 100644
index 00000000000..8a68302116d
--- /dev/null
+++ b/modules/server/blog/default.nix
@@ -0,0 +1,30 @@
+/* SPACEKOOKIE.DE BLOG WEBSITE
+ *
+ * Static website built with pelican and nix
+ */
+
+{ pkgs, ... }:
+
+let
+  webpkg = pkgs.spacekookie-de;
+in
+{
+  services.nginx.virtualHosts."spacekookie.de" = {
+    serverAliases = [ "www.spacekookie.de" ];
+    enableACME = true;
+    forceSSL = true;
+    locations."/" = {
+      root = webpkg;
+      index = "index.html";
+    };
+
+    # Provide the `downloads` directory from the store
+    # TODO: Improve this to be more updatable
+    locations."/downloads/" = {
+      root = webpkg;
+      extraConfig = ''
+        autoindex on;
+      '';
+    };
+  };
+}
diff --git a/modules/server/default.nix b/modules/server/default.nix
new file mode 100644
index 00000000000..cb5183bbc32
--- /dev/null
+++ b/modules/server/default.nix
@@ -0,0 +1,19 @@
+/* GENERAL SERVER CONFIGURATION
+ *
+ * A server is a computer, that runs headless on a network, performing
+ * various tasks, such as providing network services. It has a
+ * barebones set of tools installed to interact with it's
+ * configuration, and is otherwise pure infrastructure.
+ *
+ * Root access is generally assumed while rebuilding a server
+ * system. Although some machines might have specific tools that come
+ * from `base`, these are not important here.
+ */
+
+{ ... }:
+
+{
+  imports = [
+    ./ssh
+  ];
+}
diff --git a/modules/server/docker/default.nix b/modules/server/docker/default.nix
new file mode 100644
index 00000000000..931adcb8096
--- /dev/null
+++ b/modules/server/docker/default.nix
@@ -0,0 +1,14 @@
+/* SERVER DOCKER SETTINGS
+ *
+ * A server can run docker containers, that might need some
+ * more specific settings and options. These are defined here.
+ *
+ */
+
+{ ... }:
+
+{
+  virtualisation.docker.enable = true;
+  virtualisation.docker.storageDriver = "zfs";
+
+}
diff --git a/modules/server/nginx/default.nix b/modules/server/nginx/default.nix
new file mode 100644
index 00000000000..c81fee44294
--- /dev/null
+++ b/modules/server/nginx/default.nix
@@ -0,0 +1,25 @@
+/* NGINX ROOT CONFIGURATION
+ *
+ * Mostly sets up IP anonymisation in logs
+ */
+
+{ config, ... }:
+
+{
+  services.nginx = {
+    enable = true;
+    appendHttpConfig = ''
+      map $remote_addr $remote_addr_anon {
+        ~(?P<ip>\d+\.\d+\.\d+)\.    $ip.X;
+        ~(?P<ip>[^:]+:[^:]+):       $ip::X;
+        default                     0.0.0.0;
+      }
+    
+      log_format anonymous '$remote_addr_anon - $remote_user [$time_local] '
+                             '"$request" $status $body_bytes_sent '
+                             '"$http_referer" "$http_user_agent"';
+      access_log /var/spool/nginx/logs/access.log anonymous;
+      charset UTF-8;
+    '';
+  };
+}
diff --git a/modules/server/prosody/default.nix b/modules/server/prosody/default.nix
new file mode 100644
index 00000000000..65a1cf7b8c7
--- /dev/null
+++ b/modules/server/prosody/default.nix
@@ -0,0 +1,49 @@
+/* PROSODY XMPP SERVER
+ * 
+ * Convenient XMPP server with lots of XEP extentions, that also
+ * sets up ACME certificates specifically for the XMPP domain
+ */
+
+{ config, pkgs, ... }:
+
+let
+  ssl = {
+    cert = "/var/lib/acme/xmpp.spacekookie.de/fullchain.pem";
+    key = "/var/lib/acme/xmpp.spacekookie.de/key.pem";
+  };
+in
+{
+  networking.firewall.allowedTCPPorts = [ 5222 5269 ];
+
+  security.acme.certs."xmpp.spacekookie.de" = {
+    email = "letsencrypt@spacekookie.de";
+    webroot = "/var/lib/acme/acme-challenge";
+    extraDomains = { 
+      "spacekookie.de" = null;
+    };
+    user = "prosody";
+  };
+
+  services.prosody = {
+    enable = true;
+    modules = {
+      register = false;
+      http_files = true;
+      carbons = true;
+      mam = true;
+      pep = true;
+    };
+    inherit ssl;
+    virtualHosts."spacekookie.de" = { 
+      domain = "spacekookie.de";
+      enabled = true;
+      inherit ssl;
+    };
+    package = pkgs.prosody.override {
+      withCommunityModules = [ "http_upload" "smacks" "csi" "cloud_notify" ];
+    };
+    extraConfig = ''
+      http_upload_file_size_limit = 0 -- No limit
+    '';
+  };
+}
diff --git a/modules/server/quassel/default.nix b/modules/server/quassel/default.nix
new file mode 100644
index 00000000000..17b579ee314
--- /dev/null
+++ b/modules/server/quassel/default.nix
@@ -0,0 +1,22 @@
+/* QUASSEL SERVER
+ * 
+ * Provides a convenient IRC bouncer, that logs messages into a
+ * postgres database. This module depends on `nginx/acme` being loaded
+ * to handle certificates
+ */
+
+{ pkgs, ... }:
+
+{
+  services.quassel = {
+    enable = true;
+    interfaces = [ "0.0.0.0" ];
+    portNumber = 4242;
+  };
+
+  # quasselcore depends on Pgsql
+  services.postgresql = {
+    enable = true;
+    package = pkgs.postgresql_11;
+  };
+}
diff --git a/modules/server/ssh/default.nix b/modules/server/ssh/default.nix
new file mode 100644
index 00000000000..9fcdd9fe5cf
--- /dev/null
+++ b/modules/server/ssh/default.nix
@@ -0,0 +1,19 @@
+/* SSH SERVER DEFINITIONS
+ *
+ * This function sets up ssh and mosh, as well as
+ * access via SSH to specific users defined in libkookie
+ * `modules/users/`
+ */
+
+{ config, ... }:
+
+{
+  programs.mosh.enable = true;
+  services.openssh = {
+    enable = true;
+    passwordAuthentication = false;
+
+    # This setting is important for emacs TRAMP paths
+    permitRootLogin = "yes";
+  };
+}
diff --git a/modules/server/tor/default.nix b/modules/server/tor/default.nix
new file mode 100644
index 00000000000..7af4eee250d
--- /dev/null
+++ b/modules/server/tor/default.nix
@@ -0,0 +1,24 @@
+/* ONIONS ARE REALLY GOOD
+ *
+ * This module is not included by default and is somewhat specific 
+ * to the hyperion root server
+ * 
+ * TODO: make this a function that allows pasing a hostname and 
+ * more specific settings
+ */
+
+{ config, pkgs, ... }:
+
+{
+  networking.firewall.allowedTCPPorts = [ 143 ];
+  
+  services.tor = {
+    enable = true;
+    relay = {
+      enable = true;
+      role = "relay";
+      nickname = "hyp3rion";
+      port = 143;
+    };
+  };
+}
diff --git a/modules/workstation/chat/default.nix b/modules/workstation/chat/default.nix
new file mode 100644
index 00000000000..832b30a4e24
--- /dev/null
+++ b/modules/workstation/chat/default.nix
@@ -0,0 +1,16 @@
+/* REAL-TIME COMMUNICATION CLIENTS
+ *
+ * A bit of a mix of applications and no real configuration
+ */
+
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    dino
+    quasselClient
+    signal-desktop
+    tdesktop
+    weechat
+  ];
+}
diff --git a/modules/workstation/default.nix b/modules/workstation/default.nix
new file mode 100644
index 00000000000..e330a801484
--- /dev/null
+++ b/modules/workstation/default.nix
@@ -0,0 +1,38 @@
+/* GENERAL WORKSTATION CONFIGURATION
+ *
+ * A workstation is a computer with it's own screen,
+ * keyboard and (sometimes) mouse. It can also sometimes
+ * play music or print (provided the correct satanic
+ * sacrifice was precured first).
+ *
+ * Some of the modules included by this file depend on
+ * root access on a system (nixos-rebuild), while some
+ * can be operated entirely in userspace.
+ */
+
+{ home-manager, ... }:
+
+{
+  home-manager.users.spacekookie = { ... }: {
+    imports = [
+      ./chat
+      ./devel
+      ./emacs
+      ./pass
+      ./podman
+    ];
+  };
+  
+  imports = [
+    ./gpg
+    ./graphics
+    ./hardware
+    ./mail
+    ./networking
+    ./printing
+    ./redshift
+    ./sound
+    ./syncthing
+    ./time
+  ];
+}
diff --git a/modules/workstation/devel/base/default.nix b/modules/workstation/devel/base/default.nix
new file mode 100644
index 00000000000..a12f770fe58
--- /dev/null
+++ b/modules/workstation/devel/base/default.nix
@@ -0,0 +1,15 @@
+/* BASE DEVEL TOOLS
+ *
+ * Any tool that should be present on a system,
+ * without being required in a specific context
+ */
+
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    curl
+    gnupg
+    wget
+  ];
+}
diff --git a/modules/workstation/devel/default.nix b/modules/workstation/devel/default.nix
new file mode 100644
index 00000000000..ec0e81532a5
--- /dev/null
+++ b/modules/workstation/devel/default.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  imports = [
+    ./base
+    ./java
+    ./lorri
+    ./rust.nix
+  ];
+}
diff --git a/modules/workstation/devel/java/default.nix b/modules/workstation/devel/java/default.nix
new file mode 100644
index 00000000000..a3a62a597aa
--- /dev/null
+++ b/modules/workstation/devel/java/default.nix
@@ -0,0 +1,11 @@
+/* JAVA DEVELOPMENT MODE
+ *
+ * FIXME: Integrate building libgdx/ lwjgl with nix
+ */
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    android-studio
+    eclipses.eclipse-java
+    lombok
+  ];
+}
diff --git a/modules/workstation/devel/java/gdx.nix b/modules/workstation/devel/java/gdx.nix
new file mode 100644
index 00000000000..2e1649fb2a9
--- /dev/null
+++ b/modules/workstation/devel/java/gdx.nix
@@ -0,0 +1,32 @@
+{ stdenv, pkgs, ... }:
+
+with pkgs;
+stdenv.mkDerivation rec {
+  name = "libgdx-${version}";
+  version = "1.9.6";
+
+  src = fetchurl {
+    url = "https://github.com/libgdx/libgdx/archive/${version}.tar.gz";
+    sha256 = "1lxky0cz4qjpw4x06cf2kpa00cj0n0jp3vfsp67jy1d42dqyshgb";
+  };
+
+  buildInputs = [ ant openjdk gcc ];
+
+  buildPhase = "find . -name '*.so' -delete && cd gdx/jni && ant -f build-linux64.xml && cd ../../extensions/gdx-box2d/gdx-box2d/jni && ant -f build-linux64.xml && cd ../../../../";
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp gdx/libs/linux64/*.so $out/lib
+    cp extensions/gdx-box2d/gdx-box2d/libs/linux64/*.so $out/lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Desktop/Android/BlackBerry/iOS/HTML5 Java game development framework";
+    longDescription = '''';
+    homepage = http://libgdx.badlogicgames.com/;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ pmiddend ];
+    platforms = platforms.linux;
+  };
+}
+  
diff --git a/modules/workstation/devel/java/lwjgl.nix b/modules/workstation/devel/java/lwjgl.nix
new file mode 100644
index 00000000000..77ab765f207
--- /dev/null
+++ b/modules/workstation/devel/java/lwjgl.nix
@@ -0,0 +1,33 @@
+{ stdenv, pkgs, ... }:
+
+with pkgs;
+stdenv.mkDerivation rec {
+  name = "lwjgl-${version}";
+  version = "2.9.2";
+
+  src = fetchurl {
+    url = "https://github.com/LWJGL/lwjgl/archive/lwjgl${version}.tar.gz";
+    sha256 = "1m396ply3kspym3r00s1rbk77irn2f9vgr76xsy7272k649y3wky";
+  };
+
+  buildInputs = with xorg; [ ant openjdk gcc libX11 libXt libXcursor 
+                             libXxf86vm libXrandr libXext ];
+
+  buildPhase = "mkdir -p bin && ant generate-all && ant compile && ant compile_native";
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp bin/lwjgl/*.so $out/lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The Lightweight Java Game Library";
+    longDescription = ''
+      LWJGL is a Java library that enables cross-platform access to popular native APIs useful in the development of graphics (OpenGL), audio (OpenAL) and parallel computing (OpenCL) applications. This access is direct and high-performance, yet also wrapped in a type-safe and user-friendly layer, appropriate for the Java ecosystem.
+    '';
+    homepage = http://legacy.lwjgl.org/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ pmiddend ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/modules/workstation/devel/lorri/default.nix b/modules/workstation/devel/lorri/default.nix
new file mode 100644
index 00000000000..74b0801e6b8
--- /dev/null
+++ b/modules/workstation/devel/lorri/default.nix
@@ -0,0 +1,14 @@
+{ lib, pkgs, ... }:
+
+let
+  rev = "f20a3230bf7e93c4b5b41dff85740763d7ce02c8";
+  lorriSrc = fetchTarball {
+    url = "https://github.com/target/lorri/archive/${rev}.tar.gz";
+    sha256 = "1lp77rms6zlx04kz7nxar8ksay8xcl8bmi7nijgwyapzjy5q5cmq";
+  };
+in
+{
+  home.packages = [
+    (import lorriSrc { inherit pkgs; })
+  ];
+}
diff --git a/modules/workstation/devel/rust.nix b/modules/workstation/devel/rust.nix
new file mode 100644
index 00000000000..99758059973
--- /dev/null
+++ b/modules/workstation/devel/rust.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [ rustup ];
+}
diff --git a/modules/workstation/emacs/default.nix b/modules/workstation/emacs/default.nix
new file mode 100644
index 00000000000..6cebf336ae2
--- /dev/null
+++ b/modules/workstation/emacs/default.nix
@@ -0,0 +1,41 @@
+{ pkgs, ... }:
+
+let
+  emacs = with pkgs; emacsWithPackages (epkgs:
+    (with epkgs; [
+      (runCommand "init.el" {} ''
+          mkdir -p $out/share/emacs/site-lisp
+          cp ${./init.el} $out/share/emacs/site-lisp/default.el
+        '')
+
+      # Language support
+      fish-mode
+      lsp-mode
+      markdown-mode
+      nim-mode
+      nix-mode
+      python-mode
+      rust-mode
+
+      color-theme-sanityinc-tomorrow
+      company
+      company-lsp
+      direnv
+      fzf
+      ledger-mode
+      lsp-ui
+      magit
+      monokai-theme
+      notmuch
+      org
+      smex
+      sublimity
+      undo-tree
+      visual-fill-column
+      yasnippet
+      which-key
+    ]));
+in
+{
+  home.packages = [ emacs pkgs.direnv ];
+}
diff --git a/modules/workstation/emacs/init.el b/modules/workstation/emacs/init.el
new file mode 100644
index 00000000000..f372ea6b7fc
--- /dev/null
+++ b/modules/workstation/emacs/init.el
@@ -0,0 +1,271 @@
+;; Kookie's emacs config
+
+;; Enable automatic shell.nix loading
+(require 'direnv)
+(direnv-mode)
+
+(require 'magit)
+
+(require 'org)
+(add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
+
+(defun org-open-at-point-in-current-window ()
+  (interactive)
+  (let ((org-link-frame-setup (quote
+                               ((vm . vm-visit-folder)
+                                (vm-imap . vm-visit-imap-folder)
+                                (gnus . gnus)
+                                (file . find-file)
+                                (wl . wl)))
+                              ))
+    (org-open-at-point)))
+
+;; More sane line-number behaviour
+(setq display-line-numbers-grow-only 1)
+(setq display-line-numbers-width-start 1)
+(global-display-line-numbers-mode 1)
+
+;; I just need my personal space
+(setq tab-width 2)
+(setq-default indent-tabs-mode nil)
+(defvaralias 'c-basic-offset 'tab-width)
+(defvaralias 'cperl-indent-level 'tab-width)
+
+;; disable splash screen and startup message
+(setq inhibit-startup-message 1)
+(setq initial-scratch-message nil)
+
+(autoload 'notmuch "notmuch" "notmuch mail" t)
+(setq notmuch-search-oldest-first nil)
+(setq mml-secure-openpgp-encrypt-to-self t)
+(setq mml-secure-smime-encrypt-to-self t)
+
+(add-hook 'message-setup-hook 'mml-secure-message-sign-pgpmime)
+(add-hook 'notmuch-hello-refresh-hook
+          (lambda ()
+            (if (and (eq (point) (point-min))
+                     (search-forward "Saved searches:" nil t))
+                (progn
+                  (forward-line)
+                  (widget-forward 1))
+              (if (eq (widget-type (widget-at)) 'editable-field)
+                  (beginning-of-line)))))
+
+(define-transient-command notmuch-apply-email ()
+  "Apply patches received by email."
+  ["Arguments"
+   ("-s" "Sign off on patches" ("-s" "--signoff"))
+   ("-r" "Set this reject thingy" ("-r" "--reject"))
+   ("-o" "Skip cover letter automatically" ("-o" "--skip-coverletter"))]
+  ["Method"
+   ("p" "patchset" notmuch--apply-email)])
+
+(defun notmuch--apply-email ()
+  "Apply a patch directly from a notmuch frame."
+  (interactive)
+  (let ((repository (read-directory-name "Select repository")))
+    (cd repository)
+    (notmuch-show-pipe-message t "git am -3 -")))
+
+;; change the swap/autosave directory
+(let ((backup-dir (concat user-emacs-directory "backups")))
+  (make-directory backup-dir t)
+  (setq backup-directory-alist (list (cons "." backup-dir)))
+  (setq message-auto-save-directory backup-dir))
+
+;; Some editing niceties
+(delete-selection-mode 1)
+(show-paren-mode 1)
+(setq-default truncate-lines t)
+
+;; Explicitly enable lsp-mode for certain languages
+(add-hook 'rust-mode-hook #'lsp)
+(add-hook 'c-mode-hook #'lsp)
+(add-hook 'c++-mode-hook #'lsp)
+
+(menu-bar-mode -1)
+(tool-bar-mode -1)
+(scroll-bar-mode -1)
+
+(column-number-mode 1)
+(setq ido-enable-flex-matching t)
+(setq ido-everywhere t)
+(ido-mode 1)
+
+(add-hook 'find-file-hook (lambda () (ruler-mode 1)))
+
+(require 'color-theme-sanityinc-tomorrow)
+(load-theme 'sanityinc-tomorrow-eighties)
+
+;; Distraction free mode and minimap
+(require 'sublimity)
+(require 'sublimity-attractive)
+
+;; This is require for lsp-mode
+(require 'yasnippet)
+
+(defun lorri (&optional buffer-name)
+  (interactive)
+  (setq buffer-name (or buffer-name (generate-new-buffer "*lorri*")))
+  (start-process "lorri" buffer-name "lorri" "watch")
+  (display-buffer buffer-name))
+
+;; Better completion handling with lsp-mode
+(require 'company-lsp)
+(push 'company-lsp company-backends)
+(setq lsp-ui-doc-max-width 45)
+(setq lsp-ui-doc-max-height 10)
+
+;; Turns out I'm a huge dork
+(setq emacs-anchor default-directory)
+(defun mitosis () (interactive) (make-frame))
+
+;; Setup RSS feeds
+(setq elfeed-feeds
+  '(("https://alyssa.is/feed.xml" girlfriend blog)
+    ("https://spacekookie.de/rss.xml" self blog)
+    ("https://xkcd.com/rss.xml" webcomic)
+    ("https://deterministic.space/feed.xml" rust blog)
+  ))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;                               ;;;;;;;;;;;;
+;;;;;;;;; KOOKIE-MODE DEFINITIONS BELOW ;;;;;;;;;;;;
+;;;;;;;;;                               ;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun new-empty-buffer ()
+  "Opens a new empty buffer."
+  (interactive)
+  (let ((buf (generate-new-buffer "untitled")))
+    (switch-to-buffer buf)
+    (funcall (and initial-major-mode))
+    (setq buffer-offer-save t)))
+
+(defun user-buffer-q ()
+  "Check if a buffer is a user buffer"
+  (interactive)
+  (if (string-equal "*" (substring (buffer-name) 0 1))
+      nil
+    (if (string-equal major-mode "dired-mode")
+        nil
+      t
+      )))
+
+(defun next-user-buffer ()
+  "Switch to the next user buffer."
+  (interactive)
+  (next-buffer)
+  (let ((i 0))
+    (while (< i 20)
+      (if (not (user-buffer-q))
+          (progn (next-buffer)
+                 (setq i (1+ i)))
+        (progn (setq i 100))))))
+
+(defun previous-user-buffer ()
+  "Switch to the previous user buffer."
+  (interactive)
+  (previous-buffer)
+  (let ((i 0))
+    (while (< i 20)
+      (if (not (user-buffer-q))
+          (progn (previous-buffer)
+                 (setq i (1+ i)))
+        (progn (setq i 100))))))
+
+
+(defun move--section (offset)
+  "Move a line or reg up or down by on offset."
+
+  ;; We'll have to track 4 text points in this function
+  ;; Future me: the * is important....
+  (let* (txt-start
+         txt-end
+         (reg-start (point))
+         (reg-end reg-start)
+
+         ;; De we delete a trailing \n
+         del-nl-trail)
+
+    ;; Find the text borders
+    (when (region-active-p)
+      (if (> (point) (mark))
+          (setq reg-start (mark))
+        (exchange-point-and-mark)
+        (setq reg-end (point))))
+    (end-of-line)
+
+    ;; If point > point-max there is no trailing \n
+    (if (< (point) (point-max))
+        (forward-char 1)
+      (setq del-nl-trail t)
+      (insert-char ?\n))
+    (setq txt-end (point)
+          reg-end (- reg-end txt-end))
+
+    ;; text/region start points
+    (goto-char reg-start)
+    (beginning-of-line)
+    (setq txt-start (point)
+          reg-start (- reg-start txt-end))
+
+    ;; I'm tired and numbers are hard 
+    (message "ts: %d, te: %d, rs: %d, re: %d"
+             txt-start
+             txt-end
+             reg-start
+             reg-end)
+
+    ;; Fake the txt move
+    (let ((text (delete-and-extract-region txt-start txt-end)))
+      (forward-line offset)
+      (when (not (= (current-column) 0))
+        (insert-char ?\n)
+        (setq del-nl-trail t))
+      (insert text))
+
+    ;; Restore point position
+    (forward-char reg-start)
+
+    ;; Clean that annoying \n at the end
+    (when del-nl-trail
+      (save-excursion
+        (goto-char (point-max))
+        (delete-char -1)))
+
+    ;; If we operated on a region we need to fix the selection
+    (when (region-active-p)
+      (setq deactivate-mark nil)
+      (set-mark (+ (point) (- (- reg-start reg-end)))))))
+
+(defun move-section-up (offset)
+  "Move a line or reg upwards"
+  (interactive "p")
+  (if (eq offset nil)
+    setq offset 1)
+  (move--section (- offset)))
+
+(defun move-section-down (offset)
+  "Move a line or region dawnwards"
+  (interactive "p")
+  (if (eq offset nil)
+      setq offset 1)
+  (move--section offset))
+
+;;; Some stolen bindings from ergo-emacs
+(global-set-key (kbd "C-x C-k") 'kill-current-buffer)
+(global-set-key (kbd "C-x n") 'new-empty-buffer)
+(global-set-key (kbd "C-<next>") 'next-user-buffer)
+(global-set-key (kbd "C-<prior>") 'previous-user-buffer)
+(global-set-key (kbd "M-s M-s") 'save-buffer)
+(global-set-key (kbd "C-t") 'smex)
+(global-set-key (kbd "C-M-<up>") 'move-section-up)
+(global-set-key (kbd "C-M-<down>") 'move-section-down)
+
+;;; Org mode bindings replicated here to make it easier for me
+(define-key org-mode-map "\C-c\C-o" 'org-open-at-point-in-current-window)
+(define-key org-mode-map "\C-S-<up>" nil)
+(define-key org-mode-map "\C-S-<down>" nil)
diff --git a/modules/workstation/gpg/default.nix b/modules/workstation/gpg/default.nix
new file mode 100644
index 00000000000..f0d74d732e8
--- /dev/null
+++ b/modules/workstation/gpg/default.nix
@@ -0,0 +1,5 @@
+{ config, ... }:
+
+{
+  programs.gnupg.agent.enable = true;
+}
diff --git a/modules/workstation/graphics/browser.nix b/modules/workstation/graphics/browser.nix
new file mode 100644
index 00000000000..8fc60dd03df
--- /dev/null
+++ b/modules/workstation/graphics/browser.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  home.packages = [ pkgs.firefox ];
+}
diff --git a/modules/workstation/graphics/default.nix b/modules/workstation/graphics/default.nix
new file mode 100644
index 00000000000..f630023e036
--- /dev/null
+++ b/modules/workstation/graphics/default.nix
@@ -0,0 +1,43 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./fonts.nix
+  ];
+
+  services.gnome3.gnome-keyring.enable = true;
+  services.xserver = {
+    enable = true;
+    desktopManager = {
+      default = "xfce";
+      xfce = {
+        enable = true;
+        noDesktop = true;
+        enableXfwm = false;
+      };
+    };
+    windowManager.i3.enable = true;
+
+    videoDrivers = [ "intel" ];
+    deviceSection = ''
+      Option "DRI" "2"
+      Option "TearFree" "true"
+    '';
+    useGlamor = true;
+  };
+
+  home-manager.users.spacekookie = { ... }: {
+    imports = [
+      ./i3
+      ./browser.nix
+      ./fun.nix
+      ./kitty
+    ];
+
+    services.gnome-keyring.enable = true;
+
+    home.packages = [
+      pkgs.gnome3.gnome-screenshot
+    ];
+  };
+}
diff --git a/modules/workstation/graphics/fonts.nix b/modules/workstation/graphics/fonts.nix
new file mode 100644
index 00000000000..9f1239e8d7e
--- /dev/null
+++ b/modules/workstation/graphics/fonts.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+
+# let
+#   iosevka = (pkgs.iosevka.override {
+#     design = [ "v-at-long"
+#                "v-l-italic"
+#                "v-asterisk-low"
+#                "v-zero-dotted"
+#                "v-dollar-open"
+#                "v-numbersign-slanted" ];
+#     upright = [ "v-i-hooky" ];
+#     set = "iosevka-ss09-term";
+#   });
+# in
+{
+  fonts.fonts = with pkgs; [
+    google-fonts
+    inconsolata
+    iosevka
+    twemoji-color-font
+  ];
+}
diff --git a/modules/workstation/graphics/fun.nix b/modules/workstation/graphics/fun.nix
new file mode 100644
index 00000000000..56a6b4c0aef
--- /dev/null
+++ b/modules/workstation/graphics/fun.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    spotify
+    steam
+  ];
+}
diff --git a/modules/workstation/graphics/i3/compton.conf b/modules/workstation/graphics/i3/compton.conf
new file mode 100644
index 00000000000..a632c022593
--- /dev/null
+++ b/modules/workstation/graphics/i3/compton.conf
@@ -0,0 +1,20 @@
+unredir-if-possible = false;
+vsync = "opengl";
+
+### Opacity
+menu-opacity = 0.90;
+frame-opacity = 0.90;  # i.e. titlebars, borders
+inactive-opacity-override = false;
+alpha-step = 0.06;
+
+### Blur options
+blur-background = true;
+blur-background-frame = true;
+# blur-kern = "3x3box"
+# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"
+# blur-background-fixed = true;
+blur-background-exclude = [ "window_type = 'dock'", "window_type = 'desktop'" ];
+
+# # Detect rounded corners and treat them as rectangular when --shadow-ignore-shaped is on.
+detect-rounded-corners = true;
+detect-client-opacity = true
diff --git a/modules/workstation/graphics/i3/compton.nix b/modules/workstation/graphics/i3/compton.nix
new file mode 100644
index 00000000000..aef291b196e
--- /dev/null
+++ b/modules/workstation/graphics/i3/compton.nix
@@ -0,0 +1,5 @@
+{ config, ... }:
+
+{
+  
+}
diff --git a/modules/workstation/graphics/i3/config.nix b/modules/workstation/graphics/i3/config.nix
new file mode 100644
index 00000000000..d0732d97360
--- /dev/null
+++ b/modules/workstation/graphics/i3/config.nix
@@ -0,0 +1,165 @@
+{ pkgs, wallpaper }:
+
+{
+  enable = true;
+  package = pkgs.i3;
+  config = rec {
+    modifier = "Mod4";
+
+    # Use iosevka as default font
+    fonts = [ "iosevka-term-ss09 10" ];
+
+    keybindings = {
+
+      # Start a terminal
+      "${modifier}+Return" = "exec ${pkgs.kitty}/bin/kitty";
+
+      # Close individual windows
+      "${modifier}+Shift+q" = "kill";
+
+      # Full-screen window
+      "${modifier}+f" = "fullscreen";
+
+      # Start software on <this> or <other> workspace
+      "${modifier}+e" = "exec dmenu_run";
+      "${modifier}+Shift+e" = "exec ~/.config/i3/dynamic-tags/move.sh";
+
+      # Switch to workspace (optionally dragging windows with)
+      "${modifier}+o" = "exec ~/.config/i3/dynamic-tags/switch.sh -fn '$dfont'";
+      "${modifier}+Shift+o" = "exec ~/.config/i3/dynamic-tags/move.sh -fn '$dfont'";
+      
+      # Move focus around - vim style
+      "${modifier}+h" = "focus left";
+      "${modifier}+t" = "focus up";
+      "${modifier}+n" = "focus down";
+      "${modifier}+s" = "focus right";
+
+      # Move focus around - boring style
+      "${modifier}+Up" = "focus up";
+      "${modifier}+Down" = "focus down";
+      "${modifier}+Left" = "focus left";
+      "${modifier}+Right" = "focus right";
+
+      # Move windows - vim style
+      "${modifier}+Shift+h" = "move left";
+      "${modifier}+Shift+t" = "move up";
+      "${modifier}+Shift+n" = "move down";
+      "${modifier}+Shift+s" = "move right";
+
+      # Move windows - boring style
+      "${modifier}+Shift+Up" = "move up";
+      "${modifier}+Shift+Down" = "move down";
+      "${modifier}+Shift+Left" = "move left";
+      "${modifier}+Shift+Right" = "move right";
+
+      # Move workspaces between multi-monitor setups
+      "${modifier}+Ctrl+Shift+Up" = "move workspace to output up";
+      "${modifier}+Ctrl+Shift+Down" = "move workspace to output down";
+      "${modifier}+Ctrl+Shift+Left" = " move workspace to output left";
+      "${modifier}+Ctrl+Shift+Right" = "move workspace to output right";
+
+      # Define split behaviours
+      "${modifier}+2" = "split h";
+      "${modifier}+1" = "split v";
+
+      # A very fortunate lockscreen
+      "${modifier}+Ctrl+l" = "exec --no-startup-id i3lock -c 333333";
+      "${modifier}+Ctrl+Shift+l" = "exec --no-startup-id systemctl hibernate";
+
+      # Rename workspaces
+      "${modifier}+Ctrl+r" = "exec i3-input -F 'rename workspace to \"%s\"' -P 'New name: '";
+
+
+      # Some layout modifiers
+      "${modifier}+3" = "layout default";
+      "${modifier}+4" = "layout tabbed";
+      "${modifier}+5" = "layout stacked";
+
+      # Do I even use this?!
+      "${modifier}+Shift+space" = "floating toggle";
+      "${modifier}+space" = "focus mode_toggle";
+
+      # Focus the parent containers
+      "${modifier}+a" = "focus parent";
+
+      # Audio is good actually
+      "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume 0 +5%";
+      "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume 0 -5%";
+      "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute 0 toggle";
+
+      # Reload, restart and quit i3
+      "${modifier}+Shift+c" = "reload";
+      "${modifier}+Shift+r" = "restart";
+      # "${modifier}+Shift+e" = ''
+      #   exec i3-nagbar -t warning -m "Workspaces are sentient, you know. \
+      #   We just have a lot of them" "i3-msg exit"
+      # '';
+
+      # Switch to resize mode (defined below)
+      "${modifier}+r" = "mode \"resize\"";
+
+      # FIXME: What was this again?!
+      "button4" = "nop";
+      "button5" = "nop";
+    };
+
+    modes = {
+
+      # Explicitly handle the resize mode
+      resize = {
+        "h" = "resize shrink width 5 px or 5 ppt";
+        "j" = "resize grow height 5 px or 5 ppt";
+        "k" = "resize shrink height 5 px or 5 ppt";
+        "l" = "resize grow width 5 px or 5 ppt";
+
+        # same bindings, but for the arrow keys
+        "Left" = "resize shrink width 5 px or 5 ppt";
+        "Down" = "resize grow height 5 px or 5 ppt";
+        "Up" = "resize shrink height 5 px or 5 ppt";
+        "Right" = "resize grow width 5 px or 5 ppt";
+
+        # back to normal: Enter or Escape or $mod+r
+        "Return" = "mode \"default\"";
+        "Escape" = "mode \"default\"";
+        "${modifier}+r" = "mode \"default\"";
+      } ;
+    };
+
+    # The `bars` module does weird stuff so we init it ourselves
+    bars = [];
+  };
+
+  extraConfig = with pkgs; ''
+    # Setup compton compositor
+    exec_always --no-startup-id "${coreutils}/bin/pkill compton; ${compton}/bin/compton --config ~/.config/i3/compton.conf"
+
+    # Make CAPSLOCK into ESC because it's 2018
+    #
+    # Okay actually this is slightly more complicated than that. Actually I'm
+    # binding CAPSLOCK to HYPER, so that I can use it as a modifier in emacs,
+    # but then using xcape(1) to also make short CAPSLOCK presses into ESCAPE.
+
+    exec_always --no-startup-id "${xorg.xmodmap}/bin/setxkbmap -layout us -variant altgr-intl -option caps:hyper"
+    exec ${xcape}/bin/xcape -e "#66=Escape" -t 150
+
+    # Always set a wallpaper
+    exec_always --no-startup-id ${feh}/bin/feh --bg-fill ${wallpaper}
+
+    bar {
+        status_command ${i3status}/bin/i3status -c ~/.config/i3/i3status.conf
+        position bottom
+        bindsym button4 nop
+        bindsym button5 nop
+        colors  {
+            background #0F0F0F
+            statusline #D5D5D5
+        }
+    }
+
+    focus_follows_mouse no
+
+    # Layout and design settings that should _really_ be in the module
+    default_border pixel 3
+    client.focused #4c7899 #285577 #ffffff #F73E5F #666666
+  '';
+}
diff --git a/modules/workstation/graphics/i3/default.nix b/modules/workstation/graphics/i3/default.nix
new file mode 100644
index 00000000000..c6ec4aa6ce5
--- /dev/null
+++ b/modules/workstation/graphics/i3/default.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+
+let
+  wallpaper = "~/pictures/wallpaper/my-cyber-city-4k-28-2560x1440.jpg";
+in
+{
+  xsession.windowManager.i3 = import ./config.nix { inherit pkgs wallpaper; };
+
+  home.packages = with pkgs; [ jq coreutils ];
+  xdg.configFile."i3/dynamic-tags/" = {
+    recursive = true;
+    executable = true;
+    source = ./dynamic-tags;
+  };
+
+  xdg.configFile."i3/compton.conf" = {
+    source = ./compton.conf;
+  };
+
+  xdg.configFile."i3/i3status.conf" = {
+    source = ./i3status.conf;
+  };
+}
diff --git a/modules/workstation/graphics/i3/dynamic-tags/move.sh b/modules/workstation/graphics/i3/dynamic-tags/move.sh
new file mode 100755
index 00000000000..84f39fdc3ac
--- /dev/null
+++ b/modules/workstation/graphics/i3/dynamic-tags/move.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+### Move a window to a given workspace. If it doesn't exist it creates it.
+
+I3MSG=$(command -v i3-msg) || exit 1
+JQ=$(command -v jq) || exit 2
+
+WORKSPACE=$($I3MSG -t get_workspaces | $JQ -M '.[] | .name' | tr -d '"' | sort -u | dmenu -b -i "$@")
+
+# Move the window first
+$I3MSG -t command move workspace $WORKSPACE
+
+# Then move the user
+$I3MSG workspace $WORKSPACE
diff --git a/modules/workstation/graphics/i3/dynamic-tags/switch.sh b/modules/workstation/graphics/i3/dynamic-tags/switch.sh
new file mode 100755
index 00000000000..9c50eb48083
--- /dev/null
+++ b/modules/workstation/graphics/i3/dynamic-tags/switch.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+### Move the focus to a particular workspace using dmenu.
+
+set -u
+
+I3MSG=$(command -v i3-msg) || exit 1
+JQ=$(command -v jq) || exit 2
+
+$I3MSG workspace $($I3MSG -t get_workspaces | $JQ -M '.[] | .name' | tr -d '"' | sort -u | dmenu -b -i "$@")
diff --git a/modules/workstation/graphics/i3/i3status.conf b/modules/workstation/graphics/i3/i3status.conf
new file mode 100644
index 00000000000..fb36d20e7a0
--- /dev/null
+++ b/modules/workstation/graphics/i3/i3status.conf
@@ -0,0 +1,47 @@
+# i3status configuration file.
+# see "man i3status" for documentation.
+
+# It is important that this file is edited as UTF-8.
+# The following line should contain a sharp s:
+# ß
+# If the above line is not correctly displayed, fix your editor first!
+
+general {
+        colors = true
+        interval = 5
+}
+
+order += "ipv6"
+order += "disk /"
+order += "wireless _first_"
+order += "ethernet _first_"
+order += "battery all"
+order += "load"
+order += "tztime local"
+
+wireless _first_ {
+    format_up = "W: (%quality at %essid) %ip"
+    format_down = "W: <down>"
+}
+
+ethernet _first_ {
+    # if you use %speed, i3status requires root privileges
+    format_up = "E: %ip (%speed)"
+    format_down = "E: <down>"
+}
+
+battery all {
+    format = "%status %percentage"
+}
+
+tztime local {
+    format = "%Y-%m-%d %H:%M:%S"
+}
+
+load {
+    format = "%1min"
+}
+
+disk "/" {
+    format = "%avail"
+}
diff --git a/modules/workstation/graphics/i3/locker b/modules/workstation/graphics/i3/locker
new file mode 100644
index 00000000000..af64e74eb6b
--- /dev/null
+++ b/modules/workstation/graphics/i3/locker
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+BASEDIR="/tmp/i3lock"
+ICON="/usr/share/i3lock-fancy/icons/lock.png"
+IMAGE="$BASEDIR/lock.png"
+FORTUNE=$(fortune | sed -e 's/\t/    /g')
+TMP_RES=$(xrandr | grep \* | cut -d' ' -f4 | sed ':a;N;$!ba;s/\n/ /g')
+RESOLUTION=(`echo $TMP_RES | sed 's/ /\n/g'`)
+
+mkdir -p "$BASEDIR"
+convert -size 0x0 canvas:black "$IMAGE"
+
+for monitor in "${RESOLUTION[@]}" 
+do
+    echo "Running for monitor $monitor"
+    TMPLOCK="/tmp/i3lock/tmplock.png"
+    convert -size "$monitor" canvas:black -font Inconsolata -pointsize 18 \
+        -fill white -gravity center -annotate +0+250 "$FORTUNE" \
+        "$ICON" -gravity center -composite "$TMPLOCK"
+    convert "$IMAGE" "$TMPLOCK" +append "$IMAGE"
+    rm "$TMPLOCK"
+done
+
+i3lock -i "$IMAGE"
+
diff --git a/modules/workstation/graphics/kitty/default.nix b/modules/workstation/graphics/kitty/default.nix
new file mode 100644
index 00000000000..99635383b51
--- /dev/null
+++ b/modules/workstation/graphics/kitty/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  home.packages = [ pkgs.kitty ];
+
+  xdg.configFile."kitty/kitty.conf" = {
+    source = ./kitty.conf;
+  };
+}
diff --git a/modules/workstation/graphics/kitty/kitty.conf b/modules/workstation/graphics/kitty/kitty.conf
new file mode 100644
index 00000000000..ab8c6a059f7
--- /dev/null
+++ b/modules/workstation/graphics/kitty/kitty.conf
@@ -0,0 +1,52 @@
+font_size 10
+font_familt twemoji-color-font
+
+open_url_modifiers ctrl+shift
+open_url_with default
+
+term xterm-256color
+
+background_opacity   0.85
+
+selection_foreground  #93a1a1
+selection_background  #073642
+active_border_color   #00ff00
+inactive_border_color #cccccc
+cursor                #ffffff
+cursor_shape          block
+
+foreground     #c5c8c6
+background     #1d1f21
+
+# black
+color0   #1d1f21
+color8   #969896
+
+# red
+color1     #cc6666
+color9     #cc6666
+
+# green
+color2   #b5bd68
+color10   #b5bd68
+
+# yellow
+color3  #f0c674
+color11  #f0c674
+
+# blue
+color4    #81a2be
+color12    #81a2be
+
+# magenta
+color5 #b294bb
+color13 #b294bb
+
+# cyan
+color6   #8abeb7
+color14    #8abeb7
+
+# white
+color7   #c5c8c6
+color15   #ffffff
+
diff --git a/modules/workstation/hardware/ckb/default.nix b/modules/workstation/hardware/ckb/default.nix
new file mode 100644
index 00000000000..88d8592d48a
--- /dev/null
+++ b/modules/workstation/hardware/ckb/default.nix
@@ -0,0 +1,10 @@
+/* CORSAIR KEYBOARD SUPPORT
+ *
+ * Setup the K65 corsair keyboard daemon
+ * with themes properly
+ */
+{ config, ... }:
+
+{
+  (builtins.abort "CKB module not implemented!")
+}
diff --git a/modules/workstation/hardware/default.nix b/modules/workstation/hardware/default.nix
new file mode 100644
index 00000000000..29f590df27a
--- /dev/null
+++ b/modules/workstation/hardware/default.nix
@@ -0,0 +1,21 @@
+/* HARDWARE SUPPORT MODULE
+ *
+ * This module doesn't include ALL submodules because
+ * some are only relevant for specific platforms. Still
+ * the general support should be provided by the
+ * WORKSTATION module, not be bound to be device specific
+ *
+ * Not included but available:
+ *
+ * - TRACKPOINT
+ * - CKB
+ */
+
+{ ... }:
+
+{
+  imports = [
+    ./xkblayout
+    ./yubikey
+  ];
+}
diff --git a/modules/workstation/hardware/trackpoint/default.nix b/modules/workstation/hardware/trackpoint/default.nix
new file mode 100644
index 00000000000..58de0a72be6
--- /dev/null
+++ b/modules/workstation/hardware/trackpoint/default.nix
@@ -0,0 +1,17 @@
+/* TRACKPOINT INPUT CONFIGURATION
+ *
+ * This is a compatibility module for Thinkpad computers
+ */
+
+{ config, ... }: {
+  services.xserver.libinput = {
+    accelProfile = "flat";
+    accelSpeed = "-0.2";
+    scrollButton = 2;
+  };
+
+  hardware.trackpoint = {
+    enable = true;
+    emulateWheel = true;
+  };
+}
diff --git a/modules/workstation/hardware/xkblayout/default.nix b/modules/workstation/hardware/xkblayout/default.nix
new file mode 100644
index 00000000000..a77068cfd92
--- /dev/null
+++ b/modules/workstation/hardware/xkblayout/default.nix
@@ -0,0 +1,32 @@
+/* KEYBOARD LAYOUT MODULE
+ *
+ * (INCOMPLETE) Setup keyboard layout
+ * and overrides. Currently this is
+ * mostly handled by GRAPHICS/I3 but
+ * should maybe be moved here?
+ */
+{ pkgs, config, ... }:
+
+{
+  i18n.consoleUseXkbConfig = true;
+
+  services.xserver = {
+    layout = "us";
+    xkbVariant = "altgr-intl";
+    xkbOptions = "caps:hyper";
+
+    # We want to set this layout modification as a per-device setting
+    # to avoid interpreting hardware keyboards with the same
+    # layout, which would otherwise lead to "double dvorak".
+    extraConfig = ''
+      Section "InputClass"
+        Identifier "Internal Keyboard"
+        MatchIsKeyboard "yes"
+        MatchProduct "AT Translated Set 2 keyboard"
+        Option "XkbLayout"  "dvorak"
+        Option "XkbVariant" "altgr-intl"
+        Option "XkbOptions" "caps:hyper"
+      EndSection
+    '';
+  };  
+}
diff --git a/modules/workstation/hardware/yubikey/default.nix b/modules/workstation/hardware/yubikey/default.nix
new file mode 100644
index 00000000000..851f9acea39
--- /dev/null
+++ b/modules/workstation/hardware/yubikey/default.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+  services.udev.packages = with pkgs; [ yubikey-personalization ];
+  
+  # FIXME: Can I remove these?
+  # Previously these rules were required to make
+  # Yubikey support work on `uwu`, but maybe this
+  # is redundant with special udev rules?
+  environment.systemPackages = with pkgs; [
+    yubikey-manager
+    yubikey-personalization
+  ];
+}
diff --git a/modules/workstation/kitty/default.nix b/modules/workstation/kitty/default.nix
new file mode 100644
index 00000000000..aa7f697b3f8
--- /dev/null
+++ b/modules/workstation/kitty/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = [ pkgs.kitty ];
+
+  xdg.configFile."kitty/kitty.conf" = {
+    source = ./kitty.conf;
+  };
+}
diff --git a/modules/workstation/kitty/kitty.conf b/modules/workstation/kitty/kitty.conf
new file mode 100644
index 00000000000..65c2ed15e7b
--- /dev/null
+++ b/modules/workstation/kitty/kitty.conf
@@ -0,0 +1,53 @@
+font_size 10
+font_family twemoji-color-font
+
+open_url_modifiers ctrl+shift
+open_url_with default
+
+term xterm-256color
+shell tmux -f ~/.config/tmux/tmux.conf
+
+background_opacity   0.85
+
+selection_foreground  #93a1a1
+selection_background  #073642
+active_border_color   #00ff00
+inactive_border_color #cccccc
+cursor                #ffffff
+cursor_shape          block
+
+foreground     #c5c8c6
+background     #1d1f21
+
+# black
+color0   #1d1f21
+color8   #969896
+
+# red
+color1     #cc6666
+color9     #cc6666
+
+# green
+color2   #b5bd68
+color10   #b5bd68
+
+# yellow
+color3  #f0c674
+color11  #f0c674
+
+# blue
+color4    #81a2be
+color12    #81a2be
+
+# magenta
+color5 #b294bb
+color13 #b294bb
+
+# cyan
+color6   #8abeb7
+color14    #8abeb7
+
+# white
+color7   #c5c8c6
+color15   #ffffff
+
diff --git a/modules/workstation/mail/default.nix b/modules/workstation/mail/default.nix
new file mode 100644
index 00000000000..eda0ecf609c
--- /dev/null
+++ b/modules/workstation/mail/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  home-manager.users.spacekookie = { ... }: {
+    imports = [ ./pkgs.nix ];
+  };
+
+  imports = [ ./timer.nix ];
+}
diff --git a/modules/workstation/mail/pkgs.nix b/modules/workstation/mail/pkgs.nix
new file mode 100644
index 00000000000..883142046fe
--- /dev/null
+++ b/modules/workstation/mail/pkgs.nix
@@ -0,0 +1,16 @@
+/* USERSPACE MAIL CONFIGURATION
+ *
+ * This module depends on the `ext` hook in the repo
+ * root, because it includes private config files
+ * that contain sensitive information.
+ */
+
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [ msmtp neomutt notmuch thunderbird ];
+#   imports = [
+#     ../../../ext/mail/neomutt.nix
+#     ../../../ext/mail/notmuch.nix
+#   ];
+}
diff --git a/modules/workstation/mail/timer.nix b/modules/workstation/mail/timer.nix
new file mode 100644
index 00000000000..e777abfd329
--- /dev/null
+++ b/modules/workstation/mail/timer.nix
@@ -0,0 +1,65 @@
+{ pkgs, config, ... }:
+
+let
+  startISync = pkgs.writeShellScriptBin "start-isync" ''
+    systemctl start isync.service
+  '';
+in
+{
+  # Might want to run mbsync manually
+  environment.systemPackages = with pkgs; [ isync startISync ];
+
+  # Setup spacekookie-mail user
+  users.users.spacekookie-mail = {
+    createHome = true;
+    group = "spacekookie";
+    home = "/var/lib/spacekookie-mail";
+  };
+  
+  systemd.services.isync =
+    let
+      maildir = "${config.users.users.spacekookie.home}/office/mail";
+      mbsyncrc = pkgs.writeText "mbsyncrc"
+        (import ../../../ext/mail/mbsyncrc.nix { inherit maildir; });
+    in with pkgs; {
+      serviceConfig.Type = "oneshot";
+      script = ''
+        ${sudo}/bin/sudo -u spacekookie-mail \
+        ${isync}/bin/mbsync -a -V -c ${mbsyncrc}
+      '';
+      postStart = ''
+        ${findutils}/bin/find \
+            "${maildir}" \
+            \! -name .mbsyncstate* \
+            \( \
+              \( \! -user spacekookie -o \! -group spacekookie \) \
+              -exec ${coreutils}/bin/chown spacekookie:spacekookie '{}' \; \
+            , \
+              -type f \! -perm 660 \
+              -exec ${coreutils}/bin/chmod 0660 '{}' \; \
+            , \
+              -type d \! -perm 770 \
+              -exec ${coreutils}/bin/chmod 0770 '{}' \; \
+            \)
+            ${sudo}/bin/sudo -u spacekookie \
+              ${notmuch}/bin/notmuch new
+      '';
+    };
+
+  systemd.timers.isync = {
+    timerConfig.Unit = "isync.service";
+    timerConfig.OnCalendar = "*:0/5";
+    timerConfig.Persistent = "true";
+    after = [ "network-online.target" ];
+    wantedBy = [ "timers.target" ];
+  };
+
+  # This sudoers rule allows anyone in the wheel group to run this
+  # particular command without a password. Make sure that 'startISync'
+  # is present in a path (environment.systemPackages above)!
+  security.sudo.extraRules = [
+    { commands = [ { command = "${startISync}/bin/start-isync";
+                     options = [ "NOPASSWD" ]; } ];
+      groups = [ "wheel" ];  }
+  ];
+}
diff --git a/modules/workstation/networking/default.nix b/modules/workstation/networking/default.nix
new file mode 100644
index 00000000000..7295a7377ff
--- /dev/null
+++ b/modules/workstation/networking/default.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = [ pkgs.mullvad-vpn ];
+
+  networking = {
+    networkmanager = {
+      enable = true;
+
+      # Plausible MAC randomization
+      ethernet.macAddress = "random";
+      wifi.macAddress = "random";
+      extraConfig = ''
+        # Integrate networkmanager with resolvd
+        rc-manager="resolvconf";
+
+        [connection-extra]
+        ethernet.generate-mac-address-mask=FE:FF:FF:00:00:00
+        wifi.generate-mac-address-mask=FE:FF:FF:00:00:00
+      '';
+    };
+
+    firewall.enable = true;
+  };
+}
diff --git a/modules/workstation/pass/default.nix b/modules/workstation/pass/default.nix
new file mode 100644
index 00000000000..c157af788ee
--- /dev/null
+++ b/modules/workstation/pass/default.nix
@@ -0,0 +1 @@
+{ ... }: {}
diff --git a/modules/workstation/podman/default.nix b/modules/workstation/podman/default.nix
new file mode 100644
index 00000000000..915bcf4eb41
--- /dev/null
+++ b/modules/workstation/podman/default.nix
@@ -0,0 +1,35 @@
+{ pkgs, ... }:
+   
+{
+  home.packages = [ pkgs.podman ];
+
+  xdg.configFile."podman/containers/libpod.conf" = {
+    text = ''
+      runtime_path = ["${pkgs.runc}/bin/runc"]
+      conmon_path = ["${pkgs.conmon}/bin/conmon"]
+    '';
+  };
+
+  xdg.configFile."podman/containers/policy.json" = {
+    text = builtins.toJSON {
+      default = [ { type = "insecureAcceptAnything"; } ];
+    };
+  };
+
+  xdg.configFile."podman/containers/registries.conf" = {
+    text = ''
+      [registries.search]
+      registries = ['docker.io']
+    '';
+  };
+
+  xdg.configFile."podman/containers/storage.conf" = {
+    text = ''
+      [storage]
+      driver = "zfs"
+      runroot = "/tmp/1000"
+      graphroot = "/home/.local/podman
+    '';
+  };
+
+}
diff --git a/modules/workstation/printing/default.nix b/modules/workstation/printing/default.nix
new file mode 100644
index 00000000000..5206a92f15c
--- /dev/null
+++ b/modules/workstation/printing/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  services.avahi.enable = true;
+  services.printing = {
+    enable = true;
+    # drivers = [ pkgs.foo2zjs ];
+  };
+}
+  
diff --git a/modules/workstation/redshift/default.nix b/modules/workstation/redshift/default.nix
new file mode 100644
index 00000000000..50c7fc721b8
--- /dev/null
+++ b/modules/workstation/redshift/default.nix
@@ -0,0 +1,8 @@
+{ ... }: {
+  services.redshift = {
+    enable = true;
+    temperature.night = 3500;
+  };
+
+  location.provider = "geoclue2";
+}
diff --git a/modules/workstation/sound/default.nix b/modules/workstation/sound/default.nix
new file mode 100644
index 00000000000..5d10b71ffdc
--- /dev/null
+++ b/modules/workstation/sound/default.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  sound.enable = true;
+  hardware.pulseaudio.enable = true;
+  hardware.pulseaudio.zeroconf.discovery.enable = true;
+}
diff --git a/modules/workstation/syncthing/default.nix b/modules/workstation/syncthing/default.nix
new file mode 100644
index 00000000000..04ee4b43d9c
--- /dev/null
+++ b/modules/workstation/syncthing/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+  services.syncthing = {
+    enable = true;
+    dataDir = "/home/.local/syncthing/";
+    user = "spacekookie";
+    group = "spacekookie";
+    openDefaultPorts = false;
+    guiAddress = "127.0.0.1:1234";
+  };
+}
diff --git a/modules/workstation/time/default.nix b/modules/workstation/time/default.nix
new file mode 100644
index 00000000000..ee2c8f0bedf
--- /dev/null
+++ b/modules/workstation/time/default.nix
@@ -0,0 +1,5 @@
+{ config, ... }:
+
+{
+  services.localtime.enable = true;
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
deleted file mode 100644
index b6b41f6a169..00000000000
--- a/nixos/modules/module-list.nix
+++ /dev/null
@@ -1,988 +0,0 @@
-[
-  ./config/debug-info.nix
-  ./config/fonts/fontconfig.nix
-  ./config/fonts/fontconfig-penultimate.nix
-  ./config/fonts/fontdir.nix
-  ./config/fonts/fonts.nix
-  ./config/fonts/ghostscript.nix
-  ./config/xdg/autostart.nix
-  ./config/xdg/icons.nix
-  ./config/xdg/menus.nix
-  ./config/xdg/mime.nix
-  ./config/xdg/portal.nix
-  ./config/appstream.nix
-  ./config/console.nix
-  ./config/xdg/sounds.nix
-  ./config/gtk/gtk-icon-cache.nix
-  ./config/gnu.nix
-  ./config/i18n.nix
-  ./config/iproute2.nix
-  ./config/krb5/default.nix
-  ./config/ldap.nix
-  ./config/locale.nix
-  ./config/malloc.nix
-  ./config/networking.nix
-  ./config/no-x-libs.nix
-  ./config/nsswitch.nix
-  ./config/power-management.nix
-  ./config/pulseaudio.nix
-  ./config/qt5.nix
-  ./config/resolvconf.nix
-  ./config/shells-environment.nix
-  ./config/swap.nix
-  ./config/sysctl.nix
-  ./config/system-environment.nix
-  ./config/system-path.nix
-  ./config/terminfo.nix
-  ./config/unix-odbc-drivers.nix
-  ./config/users-groups.nix
-  ./config/vte.nix
-  ./config/zram.nix
-  ./hardware/acpilight.nix
-  ./hardware/all-firmware.nix
-  ./hardware/bladeRF.nix
-  ./hardware/brightnessctl.nix
-  ./hardware/brillo.nix
-  ./hardware/ckb-next.nix
-  ./hardware/cpu/amd-microcode.nix
-  ./hardware/cpu/intel-microcode.nix
-  ./hardware/digitalbitbox.nix
-  ./hardware/device-tree.nix
-  ./hardware/sensor/iio.nix
-  ./hardware/ksm.nix
-  ./hardware/ledger.nix
-  ./hardware/logitech.nix
-  ./hardware/mcelog.nix
-  ./hardware/network/b43.nix
-  ./hardware/network/intel-2200bg.nix
-  ./hardware/nitrokey.nix
-  ./hardware/opengl.nix
-  ./hardware/openrazer.nix
-  ./hardware/pcmcia.nix
-  ./hardware/printers.nix
-  ./hardware/raid/hpsa.nix
-  ./hardware/steam-hardware.nix
-  ./hardware/tuxedo-keyboard.nix
-  ./hardware/usb-wwan.nix
-  ./hardware/onlykey.nix
-  ./hardware/video/amdgpu.nix
-  ./hardware/video/amdgpu-pro.nix
-  ./hardware/video/ati.nix
-  ./hardware/video/capture/mwprocapture.nix
-  ./hardware/video/bumblebee.nix
-  ./hardware/video/displaylink.nix
-  ./hardware/video/nvidia.nix
-  ./hardware/video/uvcvideo/default.nix
-  ./hardware/video/webcam/facetimehd.nix
-  ./i18n/input-method/default.nix
-  ./i18n/input-method/fcitx.nix
-  ./i18n/input-method/ibus.nix
-  ./i18n/input-method/nabi.nix
-  ./i18n/input-method/uim.nix
-  ./installer/tools/tools.nix
-  ./misc/assertions.nix
-  ./misc/crashdump.nix
-  ./misc/documentation.nix
-  ./misc/extra-arguments.nix
-  ./misc/ids.nix
-  ./misc/lib.nix
-  ./misc/label.nix
-  ./misc/locate.nix
-  ./misc/meta.nix
-  ./misc/nixpkgs.nix
-  ./misc/passthru.nix
-  ./misc/version.nix
-  ./misc/nixops-autoluks.nix
-  ./programs/adb.nix
-  ./programs/atop.nix
-  ./programs/autojump.nix
-  ./programs/bandwhich.nix
-  ./programs/bash/bash.nix
-  ./programs/bcc.nix
-  ./programs/browserpass.nix
-  ./programs/captive-browser.nix
-  ./programs/ccache.nix
-  ./programs/cdemu.nix
-  ./programs/chromium.nix
-  ./programs/clickshare.nix
-  ./programs/command-not-found/command-not-found.nix
-  ./programs/criu.nix
-  ./programs/dconf.nix
-  ./programs/digitalbitbox/default.nix
-  ./programs/dmrconfig.nix
-  ./programs/environment.nix
-  ./programs/evince.nix
-  ./programs/file-roller.nix
-  ./programs/firejail.nix
-  ./programs/fish.nix
-  ./programs/freetds.nix
-  ./programs/fuse.nix
-  ./programs/geary.nix
-  ./programs/gnome-disks.nix
-  ./programs/gnome-documents.nix
-  ./programs/gnome-terminal.nix
-  ./programs/gpaste.nix
-  ./programs/gnupg.nix
-  ./programs/gphoto2.nix
-  ./programs/iftop.nix
-  ./programs/iotop.nix
-  ./programs/java.nix
-  ./programs/kbdlight.nix
-  ./programs/less.nix
-  ./programs/liboping.nix
-  ./programs/light.nix
-  ./programs/mosh.nix
-  ./programs/mininet.nix
-  ./programs/mtr.nix
-  ./programs/nano.nix
-  ./programs/nm-applet.nix
-  ./programs/npm.nix
-  ./programs/oblogout.nix
-  ./programs/plotinus.nix
-  ./programs/qt5ct.nix
-  ./programs/screen.nix
-  ./programs/sedutil.nix
-  ./programs/seahorse.nix
-  ./programs/slock.nix
-  ./programs/shadow.nix
-  ./programs/spacefm.nix
-  ./programs/singularity.nix
-  ./programs/ssh.nix
-  ./programs/ssmtp.nix
-  ./programs/sysdig.nix
-  ./programs/systemtap.nix
-  ./programs/sway.nix
-  ./programs/system-config-printer.nix
-  ./programs/thefuck.nix
-  ./programs/tmux.nix
-  ./programs/traceroute.nix
-  ./programs/tsm-client.nix
-  ./programs/udevil.nix
-  ./programs/usbtop.nix
-  ./programs/venus.nix
-  ./programs/vim.nix
-  ./programs/wavemon.nix
-  ./programs/waybar.nix
-  ./programs/wireshark.nix
-  ./programs/x2goserver.nix
-  ./programs/xfs_quota.nix
-  ./programs/xonsh.nix
-  ./programs/xss-lock.nix
-  ./programs/yabar.nix
-  ./programs/zmap.nix
-  ./programs/zsh/oh-my-zsh.nix
-  ./programs/zsh/zsh.nix
-  ./programs/zsh/zsh-autoenv.nix
-  ./programs/zsh/zsh-autosuggestions.nix
-  ./programs/zsh/zsh-syntax-highlighting.nix
-  ./rename.nix
-  ./security/acme.nix
-  ./security/apparmor.nix
-  ./security/apparmor-suid.nix
-  ./security/audit.nix
-  ./security/auditd.nix
-  ./security/ca.nix
-  ./security/chromium-suid-sandbox.nix
-  ./security/dhparams.nix
-  ./security/duosec.nix
-  ./security/google_oslogin.nix
-  ./security/hidepid.nix
-  ./security/lock-kernel-modules.nix
-  ./security/misc.nix
-  ./security/oath.nix
-  ./security/pam.nix
-  ./security/pam_usb.nix
-  ./security/pam_mount.nix
-  ./security/polkit.nix
-  ./security/prey.nix
-  ./security/rngd.nix
-  ./security/rtkit.nix
-  ./security/wrappers/default.nix
-  ./security/sudo.nix
-  ./security/systemd-confinement.nix
-  ./services/admin/oxidized.nix
-  ./services/admin/salt/master.nix
-  ./services/admin/salt/minion.nix
-  ./services/amqp/activemq/default.nix
-  ./services/amqp/rabbitmq.nix
-  ./services/audio/alsa.nix
-  ./services/audio/jack.nix
-  ./services/audio/icecast.nix
-  ./services/audio/liquidsoap.nix
-  ./services/audio/mpd.nix
-  ./services/audio/mopidy.nix
-  ./services/audio/roon-server.nix
-  ./services/audio/slimserver.nix
-  ./services/audio/snapserver.nix
-  ./services/audio/squeezelite.nix
-  ./services/audio/spotifyd.nix
-  ./services/audio/ympd.nix
-  ./services/backup/automysqlbackup.nix
-  ./services/backup/bacula.nix
-  ./services/backup/borgbackup.nix
-  ./services/backup/duplicati.nix
-  ./services/backup/duplicity.nix
-  ./services/backup/mysql-backup.nix
-  ./services/backup/postgresql-backup.nix
-  ./services/backup/postgresql-wal-receiver.nix
-  ./services/backup/restic.nix
-  ./services/backup/restic-rest-server.nix
-  ./services/backup/rsnapshot.nix
-  ./services/backup/tarsnap.nix
-  ./services/backup/tsm.nix
-  ./services/backup/zfs-replication.nix
-  ./services/backup/znapzend.nix
-  ./services/cluster/hadoop/default.nix
-  ./services/cluster/kubernetes/addons/dns.nix
-  ./services/cluster/kubernetes/addons/dashboard.nix
-  ./services/cluster/kubernetes/addon-manager.nix
-  ./services/cluster/kubernetes/apiserver.nix
-  ./services/cluster/kubernetes/controller-manager.nix
-  ./services/cluster/kubernetes/default.nix
-  ./services/cluster/kubernetes/flannel.nix
-  ./services/cluster/kubernetes/kubelet.nix
-  ./services/cluster/kubernetes/pki.nix
-  ./services/cluster/kubernetes/proxy.nix
-  ./services/cluster/kubernetes/scheduler.nix
-  ./services/computing/boinc/client.nix
-  ./services/computing/torque/server.nix
-  ./services/computing/torque/mom.nix
-  ./services/computing/slurm/slurm.nix
-  ./services/continuous-integration/buildbot/master.nix
-  ./services/continuous-integration/buildbot/worker.nix
-  ./services/continuous-integration/buildkite-agent.nix
-  ./services/continuous-integration/hail.nix
-  ./services/continuous-integration/hydra/default.nix
-  ./services/continuous-integration/gitlab-runner.nix
-  ./services/continuous-integration/gocd-agent/default.nix
-  ./services/continuous-integration/gocd-server/default.nix
-  ./services/continuous-integration/jenkins/default.nix
-  ./services/continuous-integration/jenkins/job-builder.nix
-  ./services/continuous-integration/jenkins/slave.nix
-  ./services/databases/aerospike.nix
-  ./services/databases/cassandra.nix
-  ./services/databases/clickhouse.nix
-  ./services/databases/cockroachdb.nix
-  ./services/databases/couchdb.nix
-  ./services/databases/firebird.nix
-  ./services/databases/foundationdb.nix
-  ./services/databases/hbase.nix
-  ./services/databases/influxdb.nix
-  ./services/databases/memcached.nix
-  ./services/databases/monetdb.nix
-  ./services/databases/mongodb.nix
-  ./services/databases/mysql.nix
-  ./services/databases/neo4j.nix
-  ./services/databases/openldap.nix
-  ./services/databases/opentsdb.nix
-  ./services/databases/pgmanage.nix
-  ./services/databases/postgresql.nix
-  ./services/databases/redis.nix
-  ./services/databases/riak.nix
-  ./services/databases/riak-cs.nix
-  ./services/databases/stanchion.nix
-  ./services/databases/victoriametrics.nix
-  ./services/databases/virtuoso.nix
-  ./services/desktops/accountsservice.nix
-  ./services/desktops/bamf.nix
-  ./services/desktops/blueman.nix
-  ./services/desktops/deepin/deepin.nix
-  ./services/desktops/dleyna-renderer.nix
-  ./services/desktops/dleyna-server.nix
-  ./services/desktops/pantheon/contractor.nix
-  ./services/desktops/pantheon/files.nix
-  ./services/desktops/flatpak.nix
-  ./services/desktops/geoclue2.nix
-  ./services/desktops/gsignond.nix
-  ./services/desktops/gvfs.nix
-  ./services/desktops/pipewire.nix
-  ./services/desktops/gnome3/at-spi2-core.nix
-  ./services/desktops/gnome3/chrome-gnome-shell.nix
-  ./services/desktops/gnome3/evolution-data-server.nix
-  ./services/desktops/gnome3/glib-networking.nix
-  ./services/desktops/gnome3/gnome-initial-setup.nix
-  ./services/desktops/gnome3/gnome-keyring.nix
-  ./services/desktops/gnome3/gnome-online-accounts.nix
-  ./services/desktops/gnome3/gnome-online-miners.nix
-  ./services/desktops/gnome3/gnome-remote-desktop.nix
-  ./services/desktops/gnome3/gnome-settings-daemon.nix
-  ./services/desktops/gnome3/gnome-user-share.nix
-  ./services/desktops/gnome3/rygel.nix
-  ./services/desktops/gnome3/sushi.nix
-  ./services/desktops/gnome3/tracker.nix
-  ./services/desktops/gnome3/tracker-miners.nix
-  ./services/desktops/neard.nix
-  ./services/desktops/profile-sync-daemon.nix
-  ./services/desktops/system-config-printer.nix
-  ./services/desktops/telepathy.nix
-  ./services/desktops/tumbler.nix
-  ./services/desktops/zeitgeist.nix
-  ./services/development/bloop.nix
-  ./services/development/hoogle.nix
-  ./services/development/jupyter/default.nix
-  ./services/development/lorri.nix
-  ./services/editors/emacs.nix
-  ./services/editors/infinoted.nix
-  ./services/games/factorio.nix
-  ./services/games/minecraft-server.nix
-  ./services/games/minetest-server.nix
-  ./services/games/openarena.nix
-  ./services/games/terraria.nix
-  ./services/hardware/acpid.nix
-  ./services/hardware/actkbd.nix
-  ./services/hardware/bluetooth.nix
-  ./services/hardware/bolt.nix
-  ./services/hardware/brltty.nix
-  ./services/hardware/fancontrol.nix
-  ./services/hardware/freefall.nix
-  ./services/hardware/fwupd.nix
-  ./services/hardware/illum.nix
-  ./services/hardware/interception-tools.nix
-  ./services/hardware/irqbalance.nix
-  ./services/hardware/lcd.nix
-  ./services/hardware/lirc.nix
-  ./services/hardware/nvidia-optimus.nix
-  ./services/hardware/pcscd.nix
-  ./services/hardware/pommed.nix
-  ./services/hardware/ratbagd.nix
-  ./services/hardware/sane.nix
-  ./services/hardware/sane_extra_backends/brscan4.nix
-  ./services/hardware/sane_extra_backends/dsseries.nix
-  ./services/hardware/tcsd.nix
-  ./services/hardware/tlp.nix
-  ./services/hardware/thinkfan.nix
-  ./services/hardware/throttled.nix
-  ./services/hardware/trezord.nix
-  ./services/hardware/triggerhappy.nix
-  ./services/hardware/u2f.nix
-  ./services/hardware/udev.nix
-  ./services/hardware/udisks2.nix
-  ./services/hardware/upower.nix
-  ./services/hardware/usbmuxd.nix
-  ./services/hardware/thermald.nix
-  ./services/hardware/undervolt.nix
-  ./services/hardware/vdr.nix
-  ./services/logging/SystemdJournal2Gelf.nix
-  ./services/logging/awstats.nix
-  ./services/logging/fluentd.nix
-  ./services/logging/graylog.nix
-  ./services/logging/heartbeat.nix
-  ./services/logging/journalbeat.nix
-  ./services/logging/journaldriver.nix
-  ./services/logging/journalwatch.nix
-  ./services/logging/klogd.nix
-  ./services/logging/logcheck.nix
-  ./services/logging/logrotate.nix
-  ./services/logging/logstash.nix
-  ./services/logging/rsyslogd.nix
-  ./services/logging/syslog-ng.nix
-  ./services/logging/syslogd.nix
-  ./services/mail/clamsmtp.nix
-  ./services/mail/davmail.nix
-  ./services/mail/dkimproxy-out.nix
-  ./services/mail/dovecot.nix
-  ./services/mail/dspam.nix
-  ./services/mail/exim.nix
-  ./services/mail/freepops.nix
-  ./services/mail/mail.nix
-  ./services/mail/mailcatcher.nix
-  ./services/mail/mailhog.nix
-  ./services/mail/mailman.nix
-  ./services/mail/mlmmj.nix
-  ./services/mail/offlineimap.nix
-  ./services/mail/opendkim.nix
-  ./services/mail/opensmtpd.nix
-  ./services/mail/pfix-srsd.nix
-  ./services/mail/postfix.nix
-  ./services/mail/postsrsd.nix
-  ./services/mail/postgrey.nix
-  ./services/mail/spamassassin.nix
-  ./services/mail/rspamd.nix
-  ./services/mail/rss2email.nix
-  ./services/mail/roundcube.nix
-  ./services/mail/nullmailer.nix
-  ./services/misc/airsonic.nix
-  ./services/misc/apache-kafka.nix
-  ./services/misc/autofs.nix
-  ./services/misc/autorandr.nix
-  ./services/misc/beanstalkd.nix
-  ./services/misc/bees.nix
-  ./services/misc/bepasty.nix
-  ./services/misc/canto-daemon.nix
-  ./services/misc/calibre-server.nix
-  ./services/misc/cfdyndns.nix
-  ./services/misc/clipmenu.nix
-  ./services/misc/cpuminer-cryptonight.nix
-  ./services/misc/cgminer.nix
-  ./services/misc/confd.nix
-  ./services/misc/couchpotato.nix
-  ./services/misc/devmon.nix
-  ./services/misc/dictd.nix
-  ./services/misc/dwm-status.nix
-  ./services/misc/dysnomia.nix
-  ./services/misc/disnix.nix
-  ./services/misc/docker-registry.nix
-  ./services/misc/errbot.nix
-  ./services/misc/etcd.nix
-  ./services/misc/ethminer.nix
-  ./services/misc/exhibitor.nix
-  ./services/misc/felix.nix
-  ./services/misc/folding-at-home.nix
-  ./services/misc/freeswitch.nix
-  ./services/misc/fstrim.nix
-  ./services/misc/gammu-smsd.nix
-  ./services/misc/geoip-updater.nix
-  ./services/misc/gitea.nix
-  #./services/misc/gitit.nix
-  ./services/misc/gitlab.nix
-  ./services/misc/gitolite.nix
-  ./services/misc/gitweb.nix
-  ./services/misc/gogs.nix
-  ./services/misc/gollum.nix
-  ./services/misc/gpsd.nix
-  ./services/misc/headphones.nix
-  ./services/misc/greenclip.nix
-  ./services/misc/home-assistant.nix
-  ./services/misc/ihaskell.nix
-  ./services/misc/irkerd.nix
-  ./services/misc/jackett.nix
-  ./services/misc/jellyfin.nix
-  ./services/misc/logkeys.nix
-  ./services/misc/leaps.nix
-  ./services/misc/lidarr.nix
-  ./services/misc/mame.nix
-  ./services/misc/mathics.nix
-  ./services/misc/matrix-synapse.nix
-  ./services/misc/mbpfan.nix
-  ./services/misc/mediatomb.nix
-  ./services/misc/mesos-master.nix
-  ./services/misc/mesos-slave.nix
-  ./services/misc/metabase.nix
-  ./services/misc/mwlib.nix
-  ./services/misc/nix-daemon.nix
-  ./services/misc/nix-gc.nix
-  ./services/misc/nix-optimise.nix
-  ./services/misc/nixos-manual.nix
-  ./services/misc/nix-ssh-serve.nix
-  ./services/misc/novacomd.nix
-  ./services/misc/nzbget.nix
-  ./services/misc/octoprint.nix
-  ./services/misc/osrm.nix
-  ./services/misc/packagekit.nix
-  ./services/misc/paperless.nix
-  ./services/misc/parsoid.nix
-  ./services/misc/plex.nix
-  ./services/misc/tautulli.nix
-  ./services/misc/pykms.nix
-  ./services/misc/radarr.nix
-  ./services/misc/redmine.nix
-  ./services/misc/rippled.nix
-  ./services/misc/ripple-data-api.nix
-  ./services/misc/rogue.nix
-  ./services/misc/serviio.nix
-  ./services/misc/safeeyes.nix
-  ./services/misc/sickbeard.nix
-  ./services/misc/siproxd.nix
-  ./services/misc/snapper.nix
-  ./services/misc/sonarr.nix
-  ./services/misc/spice-vdagentd.nix
-  ./services/misc/ssm-agent.nix
-  ./services/misc/sssd.nix
-  ./services/misc/subsonic.nix
-  ./services/misc/sundtek.nix
-  ./services/misc/svnserve.nix
-  ./services/misc/synergy.nix
-  ./services/misc/sysprof.nix
-  ./services/misc/taskserver
-  ./services/misc/tiddlywiki.nix
-  ./services/misc/tzupdate.nix
-  ./services/misc/uhub.nix
-  ./services/misc/weechat.nix
-  ./services/misc/xmr-stak.nix
-  ./services/misc/zoneminder.nix
-  ./services/misc/zookeeper.nix
-  ./services/monitoring/alerta.nix
-  ./services/monitoring/apcupsd.nix
-  ./services/monitoring/arbtt.nix
-  ./services/monitoring/bosun.nix
-  ./services/monitoring/cadvisor.nix
-  ./services/monitoring/collectd.nix
-  ./services/monitoring/das_watchdog.nix
-  ./services/monitoring/datadog-agent.nix
-  ./services/monitoring/dd-agent/dd-agent.nix
-  ./services/monitoring/do-agent.nix
-  ./services/monitoring/fusion-inventory.nix
-  ./services/monitoring/grafana.nix
-  ./services/monitoring/grafana-reporter.nix
-  ./services/monitoring/graphite.nix
-  ./services/monitoring/hdaps.nix
-  ./services/monitoring/heapster.nix
-  ./services/monitoring/incron.nix
-  ./services/monitoring/kapacitor.nix
-  ./services/monitoring/loki.nix
-  ./services/monitoring/longview.nix
-  ./services/monitoring/monit.nix
-  ./services/monitoring/munin.nix
-  ./services/monitoring/nagios.nix
-  ./services/monitoring/netdata.nix
-  ./services/monitoring/prometheus/default.nix
-  ./services/monitoring/prometheus/alertmanager.nix
-  ./services/monitoring/prometheus/exporters.nix
-  ./services/monitoring/prometheus/pushgateway.nix
-  ./services/monitoring/riemann.nix
-  ./services/monitoring/riemann-dash.nix
-  ./services/monitoring/riemann-tools.nix
-  ./services/monitoring/scollector.nix
-  ./services/monitoring/smartd.nix
-  ./services/monitoring/sysstat.nix
-  ./services/monitoring/teamviewer.nix
-  ./services/monitoring/telegraf.nix
-  ./services/monitoring/thanos.nix
-  ./services/monitoring/ups.nix
-  ./services/monitoring/uptime.nix
-  ./services/monitoring/vnstat.nix
-  ./services/monitoring/zabbix-agent.nix
-  ./services/monitoring/zabbix-proxy.nix
-  ./services/monitoring/zabbix-server.nix
-  ./services/network-filesystems/cachefilesd.nix
-  ./services/network-filesystems/davfs2.nix
-  ./services/network-filesystems/drbd.nix
-  ./services/network-filesystems/glusterfs.nix
-  ./services/network-filesystems/kbfs.nix
-  ./services/network-filesystems/ipfs.nix
-  ./services/network-filesystems/netatalk.nix
-  ./services/network-filesystems/nfsd.nix
-  ./services/network-filesystems/openafs/client.nix
-  ./services/network-filesystems/openafs/server.nix
-  ./services/network-filesystems/orangefs/server.nix
-  ./services/network-filesystems/orangefs/client.nix
-  ./services/network-filesystems/rsyncd.nix
-  ./services/network-filesystems/samba.nix
-  ./services/network-filesystems/tahoe.nix
-  ./services/network-filesystems/diod.nix
-  ./services/network-filesystems/u9fs.nix
-  ./services/network-filesystems/yandex-disk.nix
-  ./services/network-filesystems/xtreemfs.nix
-  ./services/network-filesystems/ceph.nix
-  ./services/networking/3proxy.nix
-  ./services/networking/amuled.nix
-  ./services/networking/aria2.nix
-  ./services/networking/asterisk.nix
-  ./services/networking/atftpd.nix
-  ./services/networking/avahi-daemon.nix
-  ./services/networking/babeld.nix
-  ./services/networking/bind.nix
-  ./services/networking/bitcoind.nix
-  ./services/networking/autossh.nix
-  ./services/networking/bird.nix
-  ./services/networking/bitlbee.nix
-  ./services/networking/charybdis.nix
-  ./services/networking/cjdns.nix
-  ./services/networking/cntlm.nix
-  ./services/networking/connman.nix
-  ./services/networking/consul.nix
-  ./services/networking/coredns.nix
-  ./services/networking/corerad.nix
-  ./services/networking/coturn.nix
-  ./services/networking/dante.nix
-  ./services/networking/ddclient.nix
-  ./services/networking/dhcpcd.nix
-  ./services/networking/dhcpd.nix
-  ./services/networking/dnscache.nix
-  ./services/networking/dnschain.nix
-  ./services/networking/dnscrypt-proxy.nix
-  ./services/networking/dnscrypt-wrapper.nix
-  ./services/networking/dnsdist.nix
-  ./services/networking/dnsmasq.nix
-  ./services/networking/ejabberd.nix
-  ./services/networking/epmd.nix
-  ./services/networking/eternal-terminal.nix
-  ./services/networking/fakeroute.nix
-  ./services/networking/ferm.nix
-  ./services/networking/firefox/sync-server.nix
-  ./services/networking/fireqos.nix
-  ./services/networking/firewall.nix
-  ./services/networking/flannel.nix
-  ./services/networking/flashpolicyd.nix
-  ./services/networking/freenet.nix
-  ./services/networking/freeradius.nix
-  ./services/networking/gale.nix
-  ./services/networking/gateone.nix
-  ./services/networking/gdomap.nix
-  ./services/networking/git-daemon.nix
-  ./services/networking/gnunet.nix
-  ./services/networking/go-shadowsocks2.nix
-  ./services/networking/gogoclient.nix
-  ./services/networking/gvpe.nix
-  ./services/networking/hans.nix
-  ./services/networking/haproxy.nix
-  ./services/networking/heyefi.nix
-  ./services/networking/hostapd.nix
-  ./services/networking/htpdate.nix
-  ./services/networking/hylafax/default.nix
-  ./services/networking/i2pd.nix
-  ./services/networking/i2p.nix
-  ./services/networking/iodine.nix
-  ./services/networking/iperf3.nix
-  ./services/networking/ircd-hybrid/default.nix
-  ./services/networking/iwd.nix
-  ./services/networking/keepalived/default.nix
-  ./services/networking/keybase.nix
-  ./services/networking/kippo.nix
-  ./services/networking/knot.nix
-  ./services/networking/kresd.nix
-  ./services/networking/lambdabot.nix
-  ./services/networking/libreswan.nix
-  ./services/networking/lldpd.nix
-  ./services/networking/logmein-hamachi.nix
-  ./services/networking/mailpile.nix
-  ./services/networking/matterbridge.nix
-  ./services/networking/mjpg-streamer.nix
-  ./services/networking/minidlna.nix
-  ./services/networking/miniupnpd.nix
-  ./services/networking/mosquitto.nix
-  ./services/networking/monero.nix
-  ./services/networking/morty.nix
-  ./services/networking/miredo.nix
-  ./services/networking/mstpd.nix
-  ./services/networking/mtprotoproxy.nix
-  ./services/networking/murmur.nix
-  ./services/networking/mxisd.nix
-  ./services/networking/namecoind.nix
-  ./services/networking/nat.nix
-  ./services/networking/ndppd.nix
-  ./services/networking/networkmanager.nix
-  ./services/networking/nftables.nix
-  ./services/networking/ngircd.nix
-  ./services/networking/nghttpx/default.nix
-  ./services/networking/nix-serve.nix
-  ./services/networking/nixops-dns.nix
-  ./services/networking/nntp-proxy.nix
-  ./services/networking/nsd.nix
-  ./services/networking/ntopng.nix
-  ./services/networking/ntp/chrony.nix
-  ./services/networking/ntp/ntpd.nix
-  ./services/networking/ntp/openntpd.nix
-  ./services/networking/nullidentdmod.nix
-  ./services/networking/nylon.nix
-  ./services/networking/ocserv.nix
-  ./services/networking/ofono.nix
-  ./services/networking/oidentd.nix
-  ./services/networking/openfire.nix
-  ./services/networking/openvpn.nix
-  ./services/networking/ostinato.nix
-  ./services/networking/owamp.nix
-  ./services/networking/pdnsd.nix
-  ./services/networking/polipo.nix
-  ./services/networking/powerdns.nix
-  ./services/networking/pdns-recursor.nix
-  ./services/networking/pppd.nix
-  ./services/networking/pptpd.nix
-  ./services/networking/prayer.nix
-  ./services/networking/privoxy.nix
-  ./services/networking/prosody.nix
-  ./services/networking/quagga.nix
-  ./services/networking/quassel.nix
-  ./services/networking/quicktun.nix
-  ./services/networking/racoon.nix
-  ./services/networking/radicale.nix
-  ./services/networking/radvd.nix
-  ./services/networking/rdnssd.nix
-  ./services/networking/redsocks.nix
-  ./services/networking/resilio.nix
-  ./services/networking/rpcbind.nix
-  ./services/networking/rxe.nix
-  ./services/networking/sabnzbd.nix
-  ./services/networking/searx.nix
-  ./services/networking/seeks.nix
-  ./services/networking/skydns.nix
-  ./services/networking/shadowsocks.nix
-  ./services/networking/shairport-sync.nix
-  ./services/networking/shorewall.nix
-  ./services/networking/shorewall6.nix
-  ./services/networking/shout.nix
-  ./services/networking/sniproxy.nix
-  ./services/networking/smokeping.nix
-  ./services/networking/softether.nix
-  ./services/networking/spacecookie.nix
-  ./services/networking/spiped.nix
-  ./services/networking/squid.nix
-  ./services/networking/sslh.nix
-  ./services/networking/ssh/lshd.nix
-  ./services/networking/ssh/sshd.nix
-  ./services/networking/strongswan.nix
-  ./services/networking/strongswan-swanctl/module.nix
-  ./services/networking/stunnel.nix
-  ./services/networking/stubby.nix
-  ./services/networking/supplicant.nix
-  ./services/networking/supybot.nix
-  ./services/networking/syncthing.nix
-  ./services/networking/syncthing-relay.nix
-  ./services/networking/syncplay.nix
-  ./services/networking/tcpcrypt.nix
-  ./services/networking/teamspeak3.nix
-  ./services/networking/tedicross.nix
-  ./services/networking/thelounge.nix
-  ./services/networking/tinc.nix
-  ./services/networking/tinydns.nix
-  ./services/networking/tftpd.nix
-  ./services/networking/trickster.nix
-  ./services/networking/tox-bootstrapd.nix
-  ./services/networking/tox-node.nix
-  ./services/networking/toxvpn.nix
-  ./services/networking/tvheadend.nix
-  ./services/networking/unbound.nix
-  ./services/networking/unifi.nix
-  ./services/networking/v2ray.nix
-  ./services/networking/vsftpd.nix
-  ./services/networking/wakeonlan.nix
-  ./services/networking/websockify.nix
-  ./services/networking/wg-quick.nix
-  ./services/networking/wicd.nix
-  ./services/networking/wireguard.nix
-  ./services/networking/wpa_supplicant.nix
-  ./services/networking/xandikos.nix
-  ./services/networking/xinetd.nix
-  ./services/networking/xl2tpd.nix
-  ./services/networking/xrdp.nix
-  ./services/networking/yggdrasil.nix
-  ./services/networking/zerobin.nix
-  ./services/networking/zeronet.nix
-  ./services/networking/zerotierone.nix
-  ./services/networking/znc/default.nix
-  ./services/printing/cupsd.nix
-  ./services/scheduling/atd.nix
-  ./services/scheduling/chronos.nix
-  ./services/scheduling/cron.nix
-  ./services/scheduling/fcron.nix
-  ./services/scheduling/marathon.nix
-  ./services/search/elasticsearch.nix
-  ./services/search/elasticsearch-curator.nix
-  ./services/search/hound.nix
-  ./services/search/kibana.nix
-  ./services/search/solr.nix
-  ./services/security/bitwarden_rs/default.nix
-  ./services/security/certmgr.nix
-  ./services/security/cfssl.nix
-  ./services/security/clamav.nix
-  ./services/security/fail2ban.nix
-  ./services/security/fprintd.nix
-  ./services/security/fprot.nix
-  ./services/security/haka.nix
-  ./services/security/haveged.nix
-  ./services/security/hologram-server.nix
-  ./services/security/hologram-agent.nix
-  ./services/security/munge.nix
-  ./services/security/nginx-sso.nix
-  ./services/security/oauth2_proxy.nix
-  ./services/security/oauth2_proxy_nginx.nix
-  ./services/security/physlock.nix
-  ./services/security/shibboleth-sp.nix
-  ./services/security/sks.nix
-  ./services/security/sshguard.nix
-  ./services/security/tor.nix
-  ./services/security/torify.nix
-  ./services/security/torsocks.nix
-  ./services/security/usbguard.nix
-  ./services/security/vault.nix
-  ./services/system/cgmanager.nix
-  ./services/system/cloud-init.nix
-  ./services/system/dbus.nix
-  ./services/system/earlyoom.nix
-  ./services/system/localtime.nix
-  ./services/system/kerberos/default.nix
-  ./services/system/nscd.nix
-  ./services/system/saslauthd.nix
-  ./services/system/uptimed.nix
-  ./services/torrent/deluge.nix
-  ./services/torrent/flexget.nix
-  ./services/torrent/magnetico.nix
-  ./services/torrent/opentracker.nix
-  ./services/torrent/peerflix.nix
-  ./services/torrent/transmission.nix
-  ./services/ttys/agetty.nix
-  ./services/ttys/gpm.nix
-  ./services/ttys/kmscon.nix
-  ./services/web-apps/atlassian/confluence.nix
-  ./services/web-apps/atlassian/crowd.nix
-  ./services/web-apps/atlassian/jira.nix
-  ./services/web-apps/codimd.nix
-  ./services/web-apps/cryptpad.nix
-  ./services/web-apps/documize.nix
-  ./services/web-apps/dokuwiki.nix
-  ./services/web-apps/frab.nix
-  ./services/web-apps/gotify-server.nix
-  ./services/web-apps/icingaweb2/icingaweb2.nix
-  ./services/web-apps/icingaweb2/module-monitoring.nix
-  ./services/web-apps/ihatemoney
-  ./services/web-apps/limesurvey.nix
-  ./services/web-apps/mattermost.nix
-  ./services/web-apps/mediawiki.nix
-  ./services/web-apps/miniflux.nix
-  ./services/web-apps/moodle.nix
-  ./services/web-apps/nextcloud.nix
-  ./services/web-apps/nexus.nix
-  ./services/web-apps/pgpkeyserver-lite.nix
-  ./services/web-apps/matomo.nix
-  ./services/web-apps/moinmoin.nix
-  ./services/web-apps/restya-board.nix
-  ./services/web-apps/tt-rss.nix
-  ./services/web-apps/trac.nix
-  ./services/web-apps/trilium.nix
-  ./services/web-apps/selfoss.nix
-  ./services/web-apps/shiori.nix
-  ./services/web-apps/virtlyst.nix
-  ./services/web-apps/wordpress.nix
-  ./services/web-apps/youtrack.nix
-  ./services/web-apps/zabbix.nix
-  ./services/web-servers/apache-httpd/default.nix
-  ./services/web-servers/caddy.nix
-  ./services/web-servers/darkhttpd.nix
-  ./services/web-servers/fcgiwrap.nix
-  ./services/web-servers/hitch/default.nix
-  ./services/web-servers/hydron.nix
-  ./services/web-servers/jboss/default.nix
-  ./services/web-servers/lighttpd/cgit.nix
-  ./services/web-servers/lighttpd/collectd.nix
-  ./services/web-servers/lighttpd/default.nix
-  ./services/web-servers/lighttpd/gitweb.nix
-  ./services/web-servers/meguca.nix
-  ./services/web-servers/mighttpd2.nix
-  ./services/web-servers/minio.nix
-  ./services/web-servers/nginx/default.nix
-  ./services/web-servers/nginx/gitweb.nix
-  ./services/web-servers/phpfpm/default.nix
-  ./services/web-servers/unit/default.nix
-  ./services/web-servers/shellinabox.nix
-  ./services/web-servers/tomcat.nix
-  ./services/web-servers/traefik.nix
-  ./services/web-servers/ttyd.nix
-  ./services/web-servers/uwsgi.nix
-  ./services/web-servers/varnish/default.nix
-  ./services/web-servers/zope2.nix
-  ./services/x11/extra-layouts.nix
-  ./services/x11/clight.nix
-  ./services/x11/colord.nix
-  ./services/x11/picom.nix
-  ./services/x11/unclutter.nix
-  ./services/x11/unclutter-xfixes.nix
-  ./services/x11/desktop-managers/default.nix
-  ./services/x11/display-managers/default.nix
-  ./services/x11/display-managers/gdm.nix
-  ./services/x11/display-managers/lightdm.nix
-  ./services/x11/display-managers/sddm.nix
-  ./services/x11/display-managers/slim.nix
-  ./services/x11/display-managers/startx.nix
-  ./services/x11/display-managers/xpra.nix
-  ./services/x11/fractalart.nix
-  ./services/x11/hardware/libinput.nix
-  ./services/x11/hardware/synaptics.nix
-  ./services/x11/hardware/wacom.nix
-  ./services/x11/hardware/digimend.nix
-  ./services/x11/hardware/cmt.nix
-  ./services/x11/gdk-pixbuf.nix
-  ./services/x11/imwheel.nix
-  ./services/x11/redshift.nix
-  ./services/x11/urxvtd.nix
-  ./services/x11/window-managers/awesome.nix
-  ./services/x11/window-managers/default.nix
-  ./services/x11/window-managers/fluxbox.nix
-  ./services/x11/window-managers/icewm.nix
-  ./services/x11/window-managers/bspwm.nix
-  ./services/x11/window-managers/metacity.nix
-  ./services/x11/window-managers/none.nix
-  ./services/x11/window-managers/twm.nix
-  ./services/x11/window-managers/windowlab.nix
-  ./services/x11/window-managers/wmii.nix
-  ./services/x11/window-managers/xmonad.nix
-  ./services/x11/xautolock.nix
-  ./services/x11/xbanish.nix
-  ./services/x11/xfs.nix
-  ./services/x11/xserver.nix
-  ./system/activation/activation-script.nix
-  ./system/activation/top-level.nix
-  ./system/boot/binfmt.nix
-  ./system/boot/emergency-mode.nix
-  ./system/boot/grow-partition.nix
-  ./system/boot/initrd-network.nix
-  ./system/boot/initrd-ssh.nix
-  ./system/boot/kernel.nix
-  ./system/boot/kexec.nix
-  ./system/boot/loader/efi.nix
-  ./system/boot/loader/generations-dir/generations-dir.nix
-  ./system/boot/loader/generic-extlinux-compatible
-  ./system/boot/loader/grub/grub.nix
-  ./system/boot/loader/grub/ipxe.nix
-  ./system/boot/loader/grub/memtest.nix
-  ./system/boot/loader/init-script/init-script.nix
-  ./system/boot/loader/loader.nix
-  ./system/boot/loader/raspberrypi/raspberrypi.nix
-  ./system/boot/loader/systemd-boot/systemd-boot.nix
-  ./system/boot/luksroot.nix
-  ./system/boot/modprobe.nix
-  ./system/boot/networkd.nix
-  ./system/boot/plymouth.nix
-  ./system/boot/resolved.nix
-  ./system/boot/shutdown.nix
-  ./system/boot/stage-1.nix
-  ./system/boot/stage-2.nix
-  ./system/boot/systemd.nix
-  ./system/boot/systemd-nspawn.nix
-  ./system/boot/timesyncd.nix
-  ./system/boot/tmp.nix
-  ./system/etc/etc.nix
-  ./tasks/auto-upgrade.nix
-  ./tasks/bcache.nix
-  ./tasks/cpu-freq.nix
-  ./tasks/encrypted-devices.nix
-  ./tasks/filesystems.nix
-  ./tasks/filesystems/bcachefs.nix
-  ./tasks/filesystems/btrfs.nix
-  ./tasks/filesystems/cifs.nix
-  ./tasks/filesystems/ecryptfs.nix
-  ./tasks/filesystems/exfat.nix
-  ./tasks/filesystems/ext.nix
-  ./tasks/filesystems/f2fs.nix
-  ./tasks/filesystems/jfs.nix
-  ./tasks/filesystems/nfs.nix
-  ./tasks/filesystems/ntfs.nix
-  ./tasks/filesystems/reiserfs.nix
-  ./tasks/filesystems/unionfs-fuse.nix
-  ./tasks/filesystems/vboxsf.nix
-  ./tasks/filesystems/vfat.nix
-  ./tasks/filesystems/xfs.nix
-  ./tasks/filesystems/zfs.nix
-  ./tasks/lvm.nix
-  ./tasks/network-interfaces.nix
-  ./tasks/network-interfaces-systemd.nix
-  ./tasks/network-interfaces-scripted.nix
-  ./tasks/scsi-link-power-management.nix
-  ./tasks/swraid.nix
-  ./tasks/trackpoint.nix
-  ./tasks/powertop.nix
-  ./testing/service-runner.nix
-  ./virtualisation/anbox.nix
-  ./virtualisation/container-config.nix
-  ./virtualisation/containers.nix
-  ./virtualisation/cri-o.nix
-  ./virtualisation/docker.nix
-  ./virtualisation/docker-containers.nix
-  ./virtualisation/ecs-agent.nix
-  ./virtualisation/libvirtd.nix
-  ./virtualisation/lxc.nix
-  ./virtualisation/lxcfs.nix
-  ./virtualisation/lxd.nix
-  ./virtualisation/amazon-options.nix
-  ./virtualisation/hyperv-guest.nix
-  ./virtualisation/kvmgt.nix
-  ./virtualisation/openvswitch.nix
-  ./virtualisation/parallels-guest.nix
-  ./virtualisation/qemu-guest-agent.nix
-  ./virtualisation/railcar.nix
-  ./virtualisation/rkt.nix
-  ./virtualisation/virtualbox-guest.nix
-  ./virtualisation/virtualbox-host.nix
-  ./virtualisation/vmware-guest.nix
-  ./virtualisation/xen-dom0.nix
-  ./virtualisation/xe-guest-utilities.nix
-]
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
deleted file mode 100644
index 7a503e71166..00000000000
--- a/nixos/modules/services/networking/prosody.nix
+++ /dev/null
@@ -1,530 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.prosody;
-
-  sslOpts = { ... }: {
-
-    options = {
-
-      key = mkOption {
-        type = types.path;
-        description = "Path to the key file.";
-      };
-
-      # TODO: rename to certificate to match the prosody config
-      cert = mkOption {
-        type = types.path;
-        description = "Path to the certificate file.";
-      };
-
-      extraOptions = mkOption {
-        type = types.attrs;
-        default = {};
-        description = "Extra SSL configuration options.";
-      };
-
-    };
-  };
-
-  moduleOpts = {
-    # Generally required
-    roster = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Allow users to have a roster";
-    };
-
-    saslauth = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Authentication for clients and servers. Recommended if you want to log in.";
-    };
-
-    tls = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Add support for secure TLS on c2s/s2s connections";
-    };
-
-    dialback = mkOption {
-      type = types.bool;
-      default = true;
-      description = "s2s dialback support";
-    };
-
-    disco = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Service discovery";
-    };
-
-    # Not essential, but recommended
-    carbons = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Keep multiple clients in sync";
-    };
-
-    pep = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Enables users to publish their mood, activity, playing music and more";
-    };
-
-    private = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Private XML storage (for room bookmarks, etc.)";
-    };
-
-    blocklist = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Allow users to block communications with other users";
-    };
-
-    vcard = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Allow users to set vCards";
-    };
-
-    # Nice to have
-    version = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Replies to server version requests";
-    };
-
-    uptime = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Report how long server has been running";
-    };
-
-    time = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Let others know the time here on this server";
-    };
-
-    ping = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Replies to XMPP pings with pongs";
-    };
-
-    register = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Allow users to register on this server using a client and change passwords";
-    };
-
-    mam = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Store messages in an archive and allow users to access it";
-    };
-
-    # Admin interfaces
-    admin_adhoc = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Allows administration via an XMPP client that supports ad-hoc commands";
-    };
-
-    admin_telnet = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Opens telnet console interface on localhost port 5582";
-    };
-
-    # HTTP modules
-    bosh = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable BOSH clients, aka 'Jabber over HTTP'";
-    };
-
-    websocket = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable WebSocket support";
-    };
-
-    http_files = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Serve static files from a directory over HTTP";
-    };
-
-    # Other specific functionality
-    limits = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable bandwidth limiting for XMPP connections";
-    };
-
-    groups = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Shared roster support";
-    };
-
-    server_contact_info = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Publish contact information for this service";
-    };
-
-    announce = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Send announcement to all online users";
-    };
-
-    welcome = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Welcome users who register accounts";
-    };
-
-    watchregistrations = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Alert admins of registrations";
-    };
-
-    motd = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Send a message to users when they log in";
-    };
-
-    legacyauth = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Legacy authentication. Only used by some old clients and bots";
-    };
-
-    proxy65 = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enables a file transfer proxy service which clients behind NAT can use";
-    };
-
-  };
-
-  toLua = x:
-    if builtins.isString x then ''"${x}"''
-    else if builtins.isBool x then (if x == true then "true" else "false")
-    else if builtins.isInt x then toString x
-    else if builtins.isList x then ''{ ${lib.concatStringsSep ", " (map (n: toLua n) x) } }''
-    else throw "Invalid Lua value";
-
-  createSSLOptsStr = o: ''
-    ssl = {
-      cafile = "/etc/ssl/certs/ca-bundle.crt";
-      key = "${o.key}";
-      certificate = "${o.cert}";
-      ${concatStringsSep "\n" (mapAttrsToList (name: value: "${name} = ${toLua value};") o.extraOptions)}
-    };
-  '';
-
-  vHostOpts = { ... }: {
-
-    options = {
-
-      # TODO: require attribute
-      domain = mkOption {
-        type = types.str;
-        description = "Domain name";
-      };
-
-      enabled = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether to enable the virtual host";
-      };
-
-      ssl = mkOption {
-        type = types.nullOr (types.submodule sslOpts);
-        default = null;
-        description = "Paths to SSL files";
-      };
-
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Additional virtual host specific configuration";
-      };
-
-    };
-
-  };
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.prosody = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether to enable the prosody server";
-      };
-
-      package = mkOption {
-        type = types.package;
-        description = "Prosody package to use";
-        default = pkgs.prosody;
-        defaultText = "pkgs.prosody";
-        example = literalExample ''
-          pkgs.prosody.override {
-            withExtraLibs = [ pkgs.luaPackages.lpty ];
-            withCommunityModules = [ "auth_external" ];
-          };
-        '';
-      };
-
-      dataDir = mkOption {
-        type = types.path;
-        description = "Directory where Prosody stores its data";
-        default = "/var/lib/prosody";
-      };
-
-      user = mkOption {
-        type = types.str;
-        default = "prosody";
-        description = "User account under which prosody runs.";
-      };
-
-      group = mkOption {
-        type = types.str;
-        default = "prosody";
-        description = "Group account under which prosody runs.";
-      };
-
-      allowRegistration = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Allow account creation";
-      };
-
-      c2sRequireEncryption = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Force clients to use encrypted connections? This option will
-          prevent clients from authenticating unless they are using encryption.
-        '';
-      };
-
-      s2sRequireEncryption = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Force servers to use encrypted connections? This option will
-          prevent servers from authenticating unless they are using encryption.
-          Note that this is different from authentication.
-        '';
-      };
-
-      s2sSecureAuth = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Force certificate authentication for server-to-server connections?
-          This provides ideal security, but requires servers you communicate
-          with to support encryption AND present valid, trusted certificates.
-          For more information see https://prosody.im/doc/s2s#security
-        '';
-      };
-
-      s2sInsecureDomains = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        example = [ "insecure.example.com" ];
-        description = ''
-          Some servers have invalid or self-signed certificates. You can list
-          remote domains here that will not be required to authenticate using
-          certificates. They will be authenticated using DNS instead, even
-          when s2s_secure_auth is enabled.
-        '';
-      };
-
-      s2sSecureDomains = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        example = [ "jabber.org" ];
-        description = ''
-          Even if you leave s2s_secure_auth disabled, you can still require valid
-          certificates for some domains by specifying a list here.
-        '';
-      };
-
-
-      modules = moduleOpts;
-
-      extraModules = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = "Enable custom modules";
-      };
-
-      extraPluginPaths = mkOption {
-        type = types.listOf types.path;
-        default = [];
-        description = "Addtional path in which to look find plugins/modules";
-      };
-
-      virtualHosts = mkOption {
-
-        description = "Define the virtual hosts";
-
-        type = with types; loaOf (submodule vHostOpts);
-
-        example = {
-          myhost = {
-            domain = "my-xmpp-example-host.org";
-            enabled = true;
-          };
-        };
-
-        default = {
-          localhost = {
-            domain = "localhost";
-            enabled = true;
-          };
-        };
-
-      };
-
-      ssl = mkOption {
-        type = types.nullOr (types.submodule sslOpts);
-        default = null;
-        description = "Paths to SSL files";
-      };
-
-      admins = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        example = [ "admin1@example.com" "admin2@example.com" ];
-        description = "List of administrators of the current host";
-      };
-
-      authentication = mkOption {
-        type = types.enum [ "internal_plain" "internal_hashed" "cyrus" "anonymous" ];
-        default = "internal_hashed";
-        example = "internal_plain";
-        description = "Authentication mechanism used for logins.";
-      };
-
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Additional prosody configuration";
-      };
-
-    };
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    environment.systemPackages = [ cfg.package ];
-
-    environment.etc."prosody/prosody.cfg.lua".text = ''
-
-      pidfile = "/run/prosody/prosody.pid"
-
-      log = "*syslog"
-
-      data_path = "${cfg.dataDir}"
-      plugin_paths = {
-        ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.extraPluginPaths) }
-      }
-
-      ${ optionalString  (cfg.ssl != null) (createSSLOptsStr cfg.ssl) }
-
-      admins = ${toLua cfg.admins}
-
-      -- we already build with libevent, so we can just enable it for a more performant server
-      use_libevent = true
-
-      modules_enabled = {
-
-        ${ lib.concatStringsSep "\n  " (lib.mapAttrsToList
-          (name: val: optionalString val "${toLua name};")
-        cfg.modules) }
-        ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)}
-        ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.extraModules)}
-      };
-
-      allow_registration = ${toLua cfg.allowRegistration}
-
-      c2s_require_encryption = ${toLua cfg.c2sRequireEncryption}
-
-      s2s_require_encryption = ${toLua cfg.s2sRequireEncryption}
-
-      s2s_secure_auth = ${toLua cfg.s2sSecureAuth}
-
-      s2s_insecure_domains = ${toLua cfg.s2sInsecureDomains}
-
-      s2s_secure_domains = ${toLua cfg.s2sSecureDomains}
-
-      authentication = ${toLua cfg.authentication}
-
-      ${ cfg.extraConfig }
-
-      ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: ''
-        VirtualHost "${v.domain}"
-          enabled = ${boolToString v.enabled};
-          ${ optionalString (v.ssl != null) (createSSLOptsStr v.ssl) }
-          ${ v.extraConfig }
-        '') cfg.virtualHosts) }
-    '';
-
-    users.users.prosody = mkIf (cfg.user == "prosody") {
-      uid = config.ids.uids.prosody;
-      description = "Prosody user";
-      createHome = true;
-      inherit (cfg) group;
-      home = "${cfg.dataDir}";
-    };
-
-    users.groups.prosody = mkIf (cfg.group == "prosody") {
-      gid = config.ids.gids.prosody;
-    };
-
-    systemd.services.prosody = {
-      description = "Prosody XMPP server";
-      after = [ "network-online.target" ];
-      wants = [ "network-online.target" ];
-      wantedBy = [ "multi-user.target" ];
-      restartTriggers = [ config.environment.etc."prosody/prosody.cfg.lua".source ];
-      serviceConfig = {
-        User = cfg.user;
-        Group = cfg.group;
-        Type = "forking";
-        RuntimeDirectory = [ "prosody" ];
-        PIDFile = "/run/prosody/prosody.pid";
-        ExecStart = "${cfg.package}/bin/prosodyctl start";
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-      };
-    };
-
-  };
-
-}
diff --git a/.editorconfig b/nixpkgs/.editorconfig
index f272739f240..f272739f240 100644
--- a/.editorconfig
+++ b/nixpkgs/.editorconfig
diff --git a/.gitattributes b/nixpkgs/.gitattributes
index 4862e0eab93..4862e0eab93 100644
--- a/.gitattributes
+++ b/nixpkgs/.gitattributes
diff --git a/.github/CODEOWNERS b/nixpkgs/.github/CODEOWNERS
index 3392fa5dab9..3392fa5dab9 100644
--- a/.github/CODEOWNERS
+++ b/nixpkgs/.github/CODEOWNERS
diff --git a/.github/CONTRIBUTING.md b/nixpkgs/.github/CONTRIBUTING.md
index a50a8a507de..a50a8a507de 100644
--- a/.github/CONTRIBUTING.md
+++ b/nixpkgs/.github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/nixpkgs/.github/ISSUE_TEMPLATE.md
index 1913e321a8c..1913e321a8c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/nixpkgs/.github/ISSUE_TEMPLATE.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md
index 07c93f84fe0..07c93f84fe0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/packaging_request.md b/nixpkgs/.github/ISSUE_TEMPLATE/packaging_request.md
index 1ddcd983f31..1ddcd983f31 100644
--- a/.github/ISSUE_TEMPLATE/packaging_request.md
+++ b/nixpkgs/.github/ISSUE_TEMPLATE/packaging_request.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md
index 8b12c5f1aac..8b12c5f1aac 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/stale.yml b/nixpkgs/.github/stale.yml
index bf47ba3c25b..bf47ba3c25b 100644
--- a/.github/stale.yml
+++ b/nixpkgs/.github/stale.yml
diff --git a/nixpkgs/.gitignore b/nixpkgs/.gitignore
new file mode 100644
index 00000000000..b3ae9e6ea86
--- /dev/null
+++ b/nixpkgs/.gitignore
@@ -0,0 +1,17 @@
+*~
+,*
+.*.swp
+.*.swo
+result
+result-*
+/doc/NEWS.html
+/doc/NEWS.txt
+/doc/manual.html
+/doc/manual.pdf
+.version-suffix
+
+.DS_Store
+
+/pkgs/development/libraries/qt-5/*/tmp/
+/pkgs/desktops/kde-5/*/tmp/
+/pkgs/development/mobile/androidenv/xml/*
diff --git a/.version b/nixpkgs/.version
index 88b8320330d..88b8320330d 100644
--- a/.version
+++ b/nixpkgs/.version
diff --git a/COPYING b/nixpkgs/COPYING
index a422167e117..a422167e117 100644
--- a/COPYING
+++ b/nixpkgs/COPYING
diff --git a/README.md b/nixpkgs/README.md
index f5090e02328..f5090e02328 100644
--- a/README.md
+++ b/nixpkgs/README.md
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
new file mode 100644
index 00000000000..a74a01719c7
--- /dev/null
+++ b/nixpkgs/default.nix
@@ -0,0 +1,28 @@
+let requiredVersion = import ./lib/minver.nix; in
+
+if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then
+
+  abort ''
+
+    This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade:
+
+    - If you are running NixOS, `nixos-rebuild' can be used to upgrade your system.
+
+    - Alternatively, with Nix > 2.0 `nix upgrade-nix' can be used to imperatively
+      upgrade Nix. You may use `nix-env --version' to check which version you have.
+
+    - If you installed Nix using the install script (https://nixos.org/nix/install),
+      it is safe to upgrade by running it again:
+
+          curl https://nixos.org/nix/install | sh
+
+    For more information, please see the NixOS release notes at
+    https://nixos.org/nixos/manual or locally at
+    ${toString ./nixos/doc/manual/release-notes}.
+
+    If you need further help, see https://nixos.org/nixos/support.html
+  ''
+
+else
+
+  import ./pkgs/top-level/impure.nix
diff --git a/doc/.gitignore b/nixpkgs/doc/.gitignore
index b5c58be03d1..b5c58be03d1 100644
--- a/doc/.gitignore
+++ b/nixpkgs/doc/.gitignore
diff --git a/doc/Makefile b/nixpkgs/doc/Makefile
index e7ca31b20d7..e7ca31b20d7 100644
--- a/doc/Makefile
+++ b/nixpkgs/doc/Makefile
diff --git a/doc/builders/fetchers.xml b/nixpkgs/doc/builders/fetchers.xml
index f07c310dcdf..f07c310dcdf 100644
--- a/doc/builders/fetchers.xml
+++ b/nixpkgs/doc/builders/fetchers.xml
diff --git a/doc/builders/images.xml b/nixpkgs/doc/builders/images.xml
index 5e042a8ada8..5e042a8ada8 100644
--- a/doc/builders/images.xml
+++ b/nixpkgs/doc/builders/images.xml
diff --git a/doc/builders/images/appimagetools.xml b/nixpkgs/doc/builders/images/appimagetools.xml
index 0767a509a43..0767a509a43 100644
--- a/doc/builders/images/appimagetools.xml
+++ b/nixpkgs/doc/builders/images/appimagetools.xml
diff --git a/doc/builders/images/dockertools.xml b/nixpkgs/doc/builders/images/dockertools.xml
index e7f37fdaaf0..e7f37fdaaf0 100644
--- a/doc/builders/images/dockertools.xml
+++ b/nixpkgs/doc/builders/images/dockertools.xml
diff --git a/doc/builders/images/ocitools.xml b/nixpkgs/doc/builders/images/ocitools.xml
index f61075b242f..f61075b242f 100644
--- a/doc/builders/images/ocitools.xml
+++ b/nixpkgs/doc/builders/images/ocitools.xml
diff --git a/doc/builders/images/snap/example-firefox.nix b/nixpkgs/doc/builders/images/snap/example-firefox.nix
index d58c98a65a2..d58c98a65a2 100644
--- a/doc/builders/images/snap/example-firefox.nix
+++ b/nixpkgs/doc/builders/images/snap/example-firefox.nix
diff --git a/doc/builders/images/snap/example-hello.nix b/nixpkgs/doc/builders/images/snap/example-hello.nix
index 123da80c547..123da80c547 100644
--- a/doc/builders/images/snap/example-hello.nix
+++ b/nixpkgs/doc/builders/images/snap/example-hello.nix
diff --git a/doc/builders/images/snaptools.xml b/nixpkgs/doc/builders/images/snaptools.xml
index 422fcfa37d8..422fcfa37d8 100644
--- a/doc/builders/images/snaptools.xml
+++ b/nixpkgs/doc/builders/images/snaptools.xml
diff --git a/doc/builders/packages/citrix.xml b/nixpkgs/doc/builders/packages/citrix.xml
index c629dc9ee50..c629dc9ee50 100644
--- a/doc/builders/packages/citrix.xml
+++ b/nixpkgs/doc/builders/packages/citrix.xml
diff --git a/doc/builders/packages/dlib.xml b/nixpkgs/doc/builders/packages/dlib.xml
index 5f768dd51b6..5f768dd51b6 100644
--- a/doc/builders/packages/dlib.xml
+++ b/nixpkgs/doc/builders/packages/dlib.xml
diff --git a/doc/builders/packages/eclipse.xml b/nixpkgs/doc/builders/packages/eclipse.xml
index fc5094ed8f3..fc5094ed8f3 100644
--- a/doc/builders/packages/eclipse.xml
+++ b/nixpkgs/doc/builders/packages/eclipse.xml
diff --git a/doc/builders/packages/elm.xml b/nixpkgs/doc/builders/packages/elm.xml
index a067f6c7c70..a067f6c7c70 100644
--- a/doc/builders/packages/elm.xml
+++ b/nixpkgs/doc/builders/packages/elm.xml
diff --git a/doc/builders/packages/emacs.xml b/nixpkgs/doc/builders/packages/emacs.xml
index 9cce7c40863..9cce7c40863 100644
--- a/doc/builders/packages/emacs.xml
+++ b/nixpkgs/doc/builders/packages/emacs.xml
diff --git a/doc/builders/packages/ibus.xml b/nixpkgs/doc/builders/packages/ibus.xml
index 2ed37903a27..2ed37903a27 100644
--- a/doc/builders/packages/ibus.xml
+++ b/nixpkgs/doc/builders/packages/ibus.xml
diff --git a/doc/builders/packages/index.xml b/nixpkgs/doc/builders/packages/index.xml
index 9f3f58a8d90..9f3f58a8d90 100644
--- a/doc/builders/packages/index.xml
+++ b/nixpkgs/doc/builders/packages/index.xml
diff --git a/doc/builders/packages/kakoune.xml b/nixpkgs/doc/builders/packages/kakoune.xml
index 728d40dacc9..728d40dacc9 100644
--- a/doc/builders/packages/kakoune.xml
+++ b/nixpkgs/doc/builders/packages/kakoune.xml
diff --git a/doc/builders/packages/linux.xml b/nixpkgs/doc/builders/packages/linux.xml
index 72d0e21493b..72d0e21493b 100644
--- a/doc/builders/packages/linux.xml
+++ b/nixpkgs/doc/builders/packages/linux.xml
diff --git a/doc/builders/packages/locales.xml b/nixpkgs/doc/builders/packages/locales.xml
index 44fdef034e7..44fdef034e7 100644
--- a/doc/builders/packages/locales.xml
+++ b/nixpkgs/doc/builders/packages/locales.xml
diff --git a/doc/builders/packages/nginx.xml b/nixpkgs/doc/builders/packages/nginx.xml
index 65854ba0236..65854ba0236 100644
--- a/doc/builders/packages/nginx.xml
+++ b/nixpkgs/doc/builders/packages/nginx.xml
diff --git a/doc/builders/packages/opengl.xml b/nixpkgs/doc/builders/packages/opengl.xml
index 5f4433a2884..5f4433a2884 100644
--- a/doc/builders/packages/opengl.xml
+++ b/nixpkgs/doc/builders/packages/opengl.xml
diff --git a/doc/builders/packages/shell-helpers.xml b/nixpkgs/doc/builders/packages/shell-helpers.xml
index cb70d527d67..cb70d527d67 100644
--- a/doc/builders/packages/shell-helpers.xml
+++ b/nixpkgs/doc/builders/packages/shell-helpers.xml
diff --git a/doc/builders/packages/steam.xml b/nixpkgs/doc/builders/packages/steam.xml
index 8dfede59ac1..8dfede59ac1 100644
--- a/doc/builders/packages/steam.xml
+++ b/nixpkgs/doc/builders/packages/steam.xml
diff --git a/doc/builders/packages/unfree.xml b/nixpkgs/doc/builders/packages/unfree.xml
index 3d4f199f8fb..3d4f199f8fb 100644
--- a/doc/builders/packages/unfree.xml
+++ b/nixpkgs/doc/builders/packages/unfree.xml
diff --git a/doc/builders/packages/weechat.xml b/nixpkgs/doc/builders/packages/weechat.xml
index a110d3f491c..a110d3f491c 100644
--- a/doc/builders/packages/weechat.xml
+++ b/nixpkgs/doc/builders/packages/weechat.xml
diff --git a/doc/builders/packages/xorg.xml b/nixpkgs/doc/builders/packages/xorg.xml
index ebf4930cc09..ebf4930cc09 100644
--- a/doc/builders/packages/xorg.xml
+++ b/nixpkgs/doc/builders/packages/xorg.xml
diff --git a/doc/builders/special.xml b/nixpkgs/doc/builders/special.xml
index 15fdba9a041..15fdba9a041 100644
--- a/doc/builders/special.xml
+++ b/nixpkgs/doc/builders/special.xml
diff --git a/doc/builders/special/fhs-environments.xml b/nixpkgs/doc/builders/special/fhs-environments.xml
index e7b81e97a23..e7b81e97a23 100644
--- a/doc/builders/special/fhs-environments.xml
+++ b/nixpkgs/doc/builders/special/fhs-environments.xml
diff --git a/doc/builders/special/mkshell.xml b/nixpkgs/doc/builders/special/mkshell.xml
index cef65d06b88..cef65d06b88 100644
--- a/doc/builders/special/mkshell.xml
+++ b/nixpkgs/doc/builders/special/mkshell.xml
diff --git a/doc/builders/trivial-builders.xml b/nixpkgs/doc/builders/trivial-builders.xml
index 94948c57b91..94948c57b91 100644
--- a/doc/builders/trivial-builders.xml
+++ b/nixpkgs/doc/builders/trivial-builders.xml
diff --git a/doc/contributing/coding-conventions.xml b/nixpkgs/doc/contributing/coding-conventions.xml
index fcb6501f615..fcb6501f615 100644
--- a/doc/contributing/coding-conventions.xml
+++ b/nixpkgs/doc/contributing/coding-conventions.xml
diff --git a/doc/contributing/contributing-to-documentation.xml b/nixpkgs/doc/contributing/contributing-to-documentation.xml
index b0266043775..b0266043775 100644
--- a/doc/contributing/contributing-to-documentation.xml
+++ b/nixpkgs/doc/contributing/contributing-to-documentation.xml
diff --git a/doc/contributing/quick-start.xml b/nixpkgs/doc/contributing/quick-start.xml
index 80514cba490..80514cba490 100644
--- a/doc/contributing/quick-start.xml
+++ b/nixpkgs/doc/contributing/quick-start.xml
diff --git a/doc/contributing/reviewing-contributions.xml b/nixpkgs/doc/contributing/reviewing-contributions.xml
index fe79d8d992b..fe79d8d992b 100644
--- a/doc/contributing/reviewing-contributions.xml
+++ b/nixpkgs/doc/contributing/reviewing-contributions.xml
diff --git a/doc/contributing/submitting-changes.xml b/nixpkgs/doc/contributing/submitting-changes.xml
index 73222c1a49a..73222c1a49a 100644
--- a/doc/contributing/submitting-changes.xml
+++ b/nixpkgs/doc/contributing/submitting-changes.xml
diff --git a/doc/default.nix b/nixpkgs/doc/default.nix
index d9051167dee..d9051167dee 100644
--- a/doc/default.nix
+++ b/nixpkgs/doc/default.nix
diff --git a/doc/doc-support/default.nix b/nixpkgs/doc/doc-support/default.nix
index 53990b67719..53990b67719 100644
--- a/doc/doc-support/default.nix
+++ b/nixpkgs/doc/doc-support/default.nix
diff --git a/doc/doc-support/lib-function-docs.nix b/nixpkgs/doc/doc-support/lib-function-docs.nix
index 5199b949e7b..5199b949e7b 100644
--- a/doc/doc-support/lib-function-docs.nix
+++ b/nixpkgs/doc/doc-support/lib-function-docs.nix
diff --git a/doc/doc-support/lib-function-locations.nix b/nixpkgs/doc/doc-support/lib-function-locations.nix
index 68edd270985..68edd270985 100644
--- a/doc/doc-support/lib-function-locations.nix
+++ b/nixpkgs/doc/doc-support/lib-function-locations.nix
diff --git a/doc/doc-support/parameters.xml b/nixpkgs/doc/doc-support/parameters.xml
index e4b33e66ee4..e4b33e66ee4 100644
--- a/doc/doc-support/parameters.xml
+++ b/nixpkgs/doc/doc-support/parameters.xml
diff --git a/doc/functions.xml b/nixpkgs/doc/functions.xml
index 5a9240ec800..5a9240ec800 100644
--- a/doc/functions.xml
+++ b/nixpkgs/doc/functions.xml
diff --git a/doc/functions/debug.xml b/nixpkgs/doc/functions/debug.xml
index c27421f12e7..c27421f12e7 100644
--- a/doc/functions/debug.xml
+++ b/nixpkgs/doc/functions/debug.xml
diff --git a/doc/functions/generators.xml b/nixpkgs/doc/functions/generators.xml
index 9ce1f85eb17..9ce1f85eb17 100644
--- a/doc/functions/generators.xml
+++ b/nixpkgs/doc/functions/generators.xml
diff --git a/doc/functions/library.xml b/nixpkgs/doc/functions/library.xml
index 6ffb944b5a6..6ffb944b5a6 100644
--- a/doc/functions/library.xml
+++ b/nixpkgs/doc/functions/library.xml
diff --git a/doc/functions/library/asserts.xml b/nixpkgs/doc/functions/library/asserts.xml
index 10891039e86..10891039e86 100644
--- a/doc/functions/library/asserts.xml
+++ b/nixpkgs/doc/functions/library/asserts.xml
diff --git a/doc/functions/library/attrsets.xml b/nixpkgs/doc/functions/library/attrsets.xml
index b1ea05a2381..b1ea05a2381 100644
--- a/doc/functions/library/attrsets.xml
+++ b/nixpkgs/doc/functions/library/attrsets.xml
diff --git a/doc/functions/nix-gitignore.xml b/nixpkgs/doc/functions/nix-gitignore.xml
index 37a82b196cc..37a82b196cc 100644
--- a/doc/functions/nix-gitignore.xml
+++ b/nixpkgs/doc/functions/nix-gitignore.xml
diff --git a/doc/functions/prefer-remote-fetch.xml b/nixpkgs/doc/functions/prefer-remote-fetch.xml
index 94d25d3d3ae..94d25d3d3ae 100644
--- a/doc/functions/prefer-remote-fetch.xml
+++ b/nixpkgs/doc/functions/prefer-remote-fetch.xml
diff --git a/doc/languages-frameworks/android.section.md b/nixpkgs/doc/languages-frameworks/android.section.md
index 9a5df2523a2..9a5df2523a2 100644
--- a/doc/languages-frameworks/android.section.md
+++ b/nixpkgs/doc/languages-frameworks/android.section.md
diff --git a/doc/languages-frameworks/beam.xml b/nixpkgs/doc/languages-frameworks/beam.xml
index 278535237c2..278535237c2 100644
--- a/doc/languages-frameworks/beam.xml
+++ b/nixpkgs/doc/languages-frameworks/beam.xml
diff --git a/doc/languages-frameworks/bower.xml b/nixpkgs/doc/languages-frameworks/bower.xml
index b0738cad293..b0738cad293 100644
--- a/doc/languages-frameworks/bower.xml
+++ b/nixpkgs/doc/languages-frameworks/bower.xml
diff --git a/doc/languages-frameworks/coq.xml b/nixpkgs/doc/languages-frameworks/coq.xml
index 86d9226166f..86d9226166f 100644
--- a/doc/languages-frameworks/coq.xml
+++ b/nixpkgs/doc/languages-frameworks/coq.xml
diff --git a/doc/languages-frameworks/crystal.section.md b/nixpkgs/doc/languages-frameworks/crystal.section.md
index 07bfc65a553..07bfc65a553 100644
--- a/doc/languages-frameworks/crystal.section.md
+++ b/nixpkgs/doc/languages-frameworks/crystal.section.md
diff --git a/doc/languages-frameworks/emscripten.section.md b/nixpkgs/doc/languages-frameworks/emscripten.section.md
index 80e1094809a..80e1094809a 100644
--- a/doc/languages-frameworks/emscripten.section.md
+++ b/nixpkgs/doc/languages-frameworks/emscripten.section.md
diff --git a/doc/languages-frameworks/gnome.xml b/nixpkgs/doc/languages-frameworks/gnome.xml
index bb68d026ae2..bb68d026ae2 100644
--- a/doc/languages-frameworks/gnome.xml
+++ b/nixpkgs/doc/languages-frameworks/gnome.xml
diff --git a/doc/languages-frameworks/go.xml b/nixpkgs/doc/languages-frameworks/go.xml
index e8cf27d0565..e8cf27d0565 100644
--- a/doc/languages-frameworks/go.xml
+++ b/nixpkgs/doc/languages-frameworks/go.xml
diff --git a/doc/languages-frameworks/haskell.section.md b/nixpkgs/doc/languages-frameworks/haskell.section.md
index b485ec583ec..b485ec583ec 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/nixpkgs/doc/languages-frameworks/haskell.section.md
diff --git a/doc/languages-frameworks/idris.section.md b/nixpkgs/doc/languages-frameworks/idris.section.md
index 8d7962d7fb9..8d7962d7fb9 100644
--- a/doc/languages-frameworks/idris.section.md
+++ b/nixpkgs/doc/languages-frameworks/idris.section.md
diff --git a/doc/languages-frameworks/index.xml b/nixpkgs/doc/languages-frameworks/index.xml
index 9364c764bbf..9364c764bbf 100644
--- a/doc/languages-frameworks/index.xml
+++ b/nixpkgs/doc/languages-frameworks/index.xml
diff --git a/doc/languages-frameworks/ios.section.md b/nixpkgs/doc/languages-frameworks/ios.section.md
index 5a81795c004..5a81795c004 100644
--- a/doc/languages-frameworks/ios.section.md
+++ b/nixpkgs/doc/languages-frameworks/ios.section.md
diff --git a/doc/languages-frameworks/java.xml b/nixpkgs/doc/languages-frameworks/java.xml
index bf0fc488392..bf0fc488392 100644
--- a/doc/languages-frameworks/java.xml
+++ b/nixpkgs/doc/languages-frameworks/java.xml
diff --git a/doc/languages-frameworks/lua.xml b/nixpkgs/doc/languages-frameworks/lua.xml
index bcca6b73753..bcca6b73753 100644
--- a/doc/languages-frameworks/lua.xml
+++ b/nixpkgs/doc/languages-frameworks/lua.xml
diff --git a/doc/languages-frameworks/node.section.md b/nixpkgs/doc/languages-frameworks/node.section.md
index 4dc95fc1dd9..4dc95fc1dd9 100644
--- a/doc/languages-frameworks/node.section.md
+++ b/nixpkgs/doc/languages-frameworks/node.section.md
diff --git a/doc/languages-frameworks/ocaml.xml b/nixpkgs/doc/languages-frameworks/ocaml.xml
index a0ea209b493..a0ea209b493 100644
--- a/doc/languages-frameworks/ocaml.xml
+++ b/nixpkgs/doc/languages-frameworks/ocaml.xml
diff --git a/doc/languages-frameworks/perl.xml b/nixpkgs/doc/languages-frameworks/perl.xml
index d9b6b2721c6..d9b6b2721c6 100644
--- a/doc/languages-frameworks/perl.xml
+++ b/nixpkgs/doc/languages-frameworks/perl.xml
diff --git a/doc/languages-frameworks/python.section.md b/nixpkgs/doc/languages-frameworks/python.section.md
index 9b6de47c8e8..9b6de47c8e8 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/nixpkgs/doc/languages-frameworks/python.section.md
diff --git a/doc/languages-frameworks/qt.xml b/nixpkgs/doc/languages-frameworks/qt.xml
index 8d97de504ad..8d97de504ad 100644
--- a/doc/languages-frameworks/qt.xml
+++ b/nixpkgs/doc/languages-frameworks/qt.xml
diff --git a/doc/languages-frameworks/r.section.md b/nixpkgs/doc/languages-frameworks/r.section.md
index d4e1617779c..d4e1617779c 100644
--- a/doc/languages-frameworks/r.section.md
+++ b/nixpkgs/doc/languages-frameworks/r.section.md
diff --git a/doc/languages-frameworks/ruby.section.md b/nixpkgs/doc/languages-frameworks/ruby.section.md
index e4c4ffce043..e4c4ffce043 100644
--- a/doc/languages-frameworks/ruby.section.md
+++ b/nixpkgs/doc/languages-frameworks/ruby.section.md
diff --git a/doc/languages-frameworks/ruby.xml b/nixpkgs/doc/languages-frameworks/ruby.xml
index b28745fd6e2..b28745fd6e2 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/nixpkgs/doc/languages-frameworks/ruby.xml
diff --git a/doc/languages-frameworks/rust.section.md b/nixpkgs/doc/languages-frameworks/rust.section.md
index 3332dff1eb0..3332dff1eb0 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/nixpkgs/doc/languages-frameworks/rust.section.md
diff --git a/doc/languages-frameworks/texlive.xml b/nixpkgs/doc/languages-frameworks/texlive.xml
index 8fa8f963b2f..8fa8f963b2f 100644
--- a/doc/languages-frameworks/texlive.xml
+++ b/nixpkgs/doc/languages-frameworks/texlive.xml
diff --git a/doc/languages-frameworks/titanium.section.md b/nixpkgs/doc/languages-frameworks/titanium.section.md
index 7a97664ec59..7a97664ec59 100644
--- a/doc/languages-frameworks/titanium.section.md
+++ b/nixpkgs/doc/languages-frameworks/titanium.section.md
diff --git a/doc/languages-frameworks/vim.section.md b/nixpkgs/doc/languages-frameworks/vim.section.md
index 05a23d26cf2..05a23d26cf2 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/nixpkgs/doc/languages-frameworks/vim.section.md
diff --git a/doc/manual.xml b/nixpkgs/doc/manual.xml
index 1f69872d2a7..1f69872d2a7 100644
--- a/doc/manual.xml
+++ b/nixpkgs/doc/manual.xml
diff --git a/doc/old/cross.txt b/nixpkgs/doc/old/cross.txt
index ff9fefb04a8..ff9fefb04a8 100644
--- a/doc/old/cross.txt
+++ b/nixpkgs/doc/old/cross.txt
diff --git a/doc/overrides.css b/nixpkgs/doc/overrides.css
index 73901a3f543..73901a3f543 100644
--- a/doc/overrides.css
+++ b/nixpkgs/doc/overrides.css
diff --git a/doc/preface.chapter.md b/nixpkgs/doc/preface.chapter.md
index 88ca5e2e3ce..88ca5e2e3ce 100644
--- a/doc/preface.chapter.md
+++ b/nixpkgs/doc/preface.chapter.md
diff --git a/doc/release-notes.xml b/nixpkgs/doc/release-notes.xml
index b85f61da079..b85f61da079 100644
--- a/doc/release-notes.xml
+++ b/nixpkgs/doc/release-notes.xml
diff --git a/doc/shell.nix b/nixpkgs/doc/shell.nix
index 8ac2019f9d6..8ac2019f9d6 100644
--- a/doc/shell.nix
+++ b/nixpkgs/doc/shell.nix
diff --git a/doc/stdenv/cross-compilation.xml b/nixpkgs/doc/stdenv/cross-compilation.xml
index bea56a0c2fc..bea56a0c2fc 100644
--- a/doc/stdenv/cross-compilation.xml
+++ b/nixpkgs/doc/stdenv/cross-compilation.xml
diff --git a/doc/stdenv/meta.xml b/nixpkgs/doc/stdenv/meta.xml
index 9371196818a..9371196818a 100644
--- a/doc/stdenv/meta.xml
+++ b/nixpkgs/doc/stdenv/meta.xml
diff --git a/doc/stdenv/multiple-output.xml b/nixpkgs/doc/stdenv/multiple-output.xml
index 83275bb2fbd..83275bb2fbd 100644
--- a/doc/stdenv/multiple-output.xml
+++ b/nixpkgs/doc/stdenv/multiple-output.xml
diff --git a/doc/stdenv/platform-notes.xml b/nixpkgs/doc/stdenv/platform-notes.xml
index 5a266fdc0ee..5a266fdc0ee 100644
--- a/doc/stdenv/platform-notes.xml
+++ b/nixpkgs/doc/stdenv/platform-notes.xml
diff --git a/doc/stdenv/stdenv.xml b/nixpkgs/doc/stdenv/stdenv.xml
index 1e97bf6157b..1e97bf6157b 100644
--- a/doc/stdenv/stdenv.xml
+++ b/nixpkgs/doc/stdenv/stdenv.xml
diff --git a/doc/style.css b/nixpkgs/doc/style.css
index 474dd32e3fb..474dd32e3fb 100644
--- a/doc/style.css
+++ b/nixpkgs/doc/style.css
diff --git a/doc/using/configuration.xml b/nixpkgs/doc/using/configuration.xml
index f4d6e911006..f4d6e911006 100644
--- a/doc/using/configuration.xml
+++ b/nixpkgs/doc/using/configuration.xml
diff --git a/doc/using/overlays.xml b/nixpkgs/doc/using/overlays.xml
index 26a888368ab..26a888368ab 100644
--- a/doc/using/overlays.xml
+++ b/nixpkgs/doc/using/overlays.xml
diff --git a/doc/using/overrides.xml b/nixpkgs/doc/using/overrides.xml
index c9d36ddb2d7..c9d36ddb2d7 100644
--- a/doc/using/overrides.xml
+++ b/nixpkgs/doc/using/overrides.xml
diff --git a/lib/asserts.nix b/nixpkgs/lib/asserts.nix
index 8a5f1fb3feb..8a5f1fb3feb 100644
--- a/lib/asserts.nix
+++ b/nixpkgs/lib/asserts.nix
diff --git a/lib/attrsets.nix b/nixpkgs/lib/attrsets.nix
index 32994432d53..32994432d53 100644
--- a/lib/attrsets.nix
+++ b/nixpkgs/lib/attrsets.nix
diff --git a/lib/cli.nix b/nixpkgs/lib/cli.nix
index c96d4dbb043..c96d4dbb043 100644
--- a/lib/cli.nix
+++ b/nixpkgs/lib/cli.nix
diff --git a/lib/customisation.nix b/nixpkgs/lib/customisation.nix
index ac234e3b8c6..ac234e3b8c6 100644
--- a/lib/customisation.nix
+++ b/nixpkgs/lib/customisation.nix
diff --git a/lib/debug.nix b/nixpkgs/lib/debug.nix
index 2879f72ed2b..2879f72ed2b 100644
--- a/lib/debug.nix
+++ b/nixpkgs/lib/debug.nix
diff --git a/lib/default.nix b/nixpkgs/lib/default.nix
index d2fe018aa6a..d2fe018aa6a 100644
--- a/lib/default.nix
+++ b/nixpkgs/lib/default.nix
diff --git a/lib/deprecated.nix b/nixpkgs/lib/deprecated.nix
index 155d6f0c361..155d6f0c361 100644
--- a/lib/deprecated.nix
+++ b/nixpkgs/lib/deprecated.nix
diff --git a/lib/fetchers.nix b/nixpkgs/lib/fetchers.nix
index 1107353b51d..1107353b51d 100644
--- a/lib/fetchers.nix
+++ b/nixpkgs/lib/fetchers.nix
diff --git a/lib/filesystem.nix b/nixpkgs/lib/filesystem.nix
index fc35a1a72c6..fc35a1a72c6 100644
--- a/lib/filesystem.nix
+++ b/nixpkgs/lib/filesystem.nix
diff --git a/lib/fixed-points.nix b/nixpkgs/lib/fixed-points.nix
index 968930526a6..968930526a6 100644
--- a/lib/fixed-points.nix
+++ b/nixpkgs/lib/fixed-points.nix
diff --git a/lib/generators.nix b/nixpkgs/lib/generators.nix
index a64e94bd5cb..a64e94bd5cb 100644
--- a/lib/generators.nix
+++ b/nixpkgs/lib/generators.nix
diff --git a/lib/kernel.nix b/nixpkgs/lib/kernel.nix
index 36ea3083828..36ea3083828 100644
--- a/lib/kernel.nix
+++ b/nixpkgs/lib/kernel.nix
diff --git a/lib/licenses.nix b/nixpkgs/lib/licenses.nix
index e2f94e565ce..e2f94e565ce 100644
--- a/lib/licenses.nix
+++ b/nixpkgs/lib/licenses.nix
diff --git a/lib/lists.nix b/nixpkgs/lib/lists.nix
index f9f30412770..f9f30412770 100644
--- a/lib/lists.nix
+++ b/nixpkgs/lib/lists.nix
diff --git a/lib/meta.nix b/nixpkgs/lib/meta.nix
index 2e83c4247dd..2e83c4247dd 100644
--- a/lib/meta.nix
+++ b/nixpkgs/lib/meta.nix
diff --git a/lib/minver.nix b/nixpkgs/lib/minver.nix
index fee6b65a244..fee6b65a244 100644
--- a/lib/minver.nix
+++ b/nixpkgs/lib/minver.nix
diff --git a/lib/modules.nix b/nixpkgs/lib/modules.nix
index 2b1faf4f0c2..2b1faf4f0c2 100644
--- a/lib/modules.nix
+++ b/nixpkgs/lib/modules.nix
diff --git a/lib/options.nix b/nixpkgs/lib/options.nix
index e5c0631a543..e5c0631a543 100644
--- a/lib/options.nix
+++ b/nixpkgs/lib/options.nix
diff --git a/lib/sources.nix b/nixpkgs/lib/sources.nix
index 05519c3e392..05519c3e392 100644
--- a/lib/sources.nix
+++ b/nixpkgs/lib/sources.nix
diff --git a/lib/strings-with-deps.nix b/nixpkgs/lib/strings-with-deps.nix
index e3336983428..e3336983428 100644
--- a/lib/strings-with-deps.nix
+++ b/nixpkgs/lib/strings-with-deps.nix
diff --git a/lib/strings.nix b/nixpkgs/lib/strings.nix
index 6dbb3d3a3e8..6dbb3d3a3e8 100644
--- a/lib/strings.nix
+++ b/nixpkgs/lib/strings.nix
diff --git a/lib/systems/default.nix b/nixpkgs/lib/systems/default.nix
index 026117cc34f..026117cc34f 100644
--- a/lib/systems/default.nix
+++ b/nixpkgs/lib/systems/default.nix
diff --git a/lib/systems/doubles.nix b/nixpkgs/lib/systems/doubles.nix
index 96e602d0e16..96e602d0e16 100644
--- a/lib/systems/doubles.nix
+++ b/nixpkgs/lib/systems/doubles.nix
diff --git a/lib/systems/examples.nix b/nixpkgs/lib/systems/examples.nix
index 19b3790ecbe..19b3790ecbe 100644
--- a/lib/systems/examples.nix
+++ b/nixpkgs/lib/systems/examples.nix
diff --git a/lib/systems/inspect.nix b/nixpkgs/lib/systems/inspect.nix
index d1980c6dff8..d1980c6dff8 100644
--- a/lib/systems/inspect.nix
+++ b/nixpkgs/lib/systems/inspect.nix
diff --git a/lib/systems/parse.nix b/nixpkgs/lib/systems/parse.nix
index 6a02dbb5152..6a02dbb5152 100644
--- a/lib/systems/parse.nix
+++ b/nixpkgs/lib/systems/parse.nix
diff --git a/lib/systems/platforms.nix b/nixpkgs/lib/systems/platforms.nix
index ab3cf1d5430..ab3cf1d5430 100644
--- a/lib/systems/platforms.nix
+++ b/nixpkgs/lib/systems/platforms.nix
diff --git a/lib/tests/check-eval.nix b/nixpkgs/lib/tests/check-eval.nix
index 8bd7b605a39..8bd7b605a39 100644
--- a/lib/tests/check-eval.nix
+++ b/nixpkgs/lib/tests/check-eval.nix
diff --git a/lib/tests/misc.nix b/nixpkgs/lib/tests/misc.nix
index 59ed1e507e2..59ed1e507e2 100644
--- a/lib/tests/misc.nix
+++ b/nixpkgs/lib/tests/misc.nix
diff --git a/lib/tests/modules.sh b/nixpkgs/lib/tests/modules.sh
index 8cd632a439c..8cd632a439c 100755
--- a/lib/tests/modules.sh
+++ b/nixpkgs/lib/tests/modules.sh
diff --git a/lib/tests/modules/alias-with-priority-can-override.nix b/nixpkgs/lib/tests/modules/alias-with-priority-can-override.nix
index 9a18c9d9f61..9a18c9d9f61 100644
--- a/lib/tests/modules/alias-with-priority-can-override.nix
+++ b/nixpkgs/lib/tests/modules/alias-with-priority-can-override.nix
diff --git a/lib/tests/modules/alias-with-priority.nix b/nixpkgs/lib/tests/modules/alias-with-priority.nix
index a35a06fc697..a35a06fc697 100644
--- a/lib/tests/modules/alias-with-priority.nix
+++ b/nixpkgs/lib/tests/modules/alias-with-priority.nix
diff --git a/lib/tests/modules/attrsOf-conditional-check.nix b/nixpkgs/lib/tests/modules/attrsOf-conditional-check.nix
index 0f00ebca155..0f00ebca155 100644
--- a/lib/tests/modules/attrsOf-conditional-check.nix
+++ b/nixpkgs/lib/tests/modules/attrsOf-conditional-check.nix
diff --git a/lib/tests/modules/attrsOf-lazy-check.nix b/nixpkgs/lib/tests/modules/attrsOf-lazy-check.nix
index ec5b418b15a..ec5b418b15a 100644
--- a/lib/tests/modules/attrsOf-lazy-check.nix
+++ b/nixpkgs/lib/tests/modules/attrsOf-lazy-check.nix
diff --git a/lib/tests/modules/declare-attrsOf.nix b/nixpkgs/lib/tests/modules/declare-attrsOf.nix
index b3999de7e5f..b3999de7e5f 100644
--- a/lib/tests/modules/declare-attrsOf.nix
+++ b/nixpkgs/lib/tests/modules/declare-attrsOf.nix
diff --git a/lib/tests/modules/declare-attrsOfSub-any-enable.nix b/nixpkgs/lib/tests/modules/declare-attrsOfSub-any-enable.nix
index 986d07227e1..986d07227e1 100644
--- a/lib/tests/modules/declare-attrsOfSub-any-enable.nix
+++ b/nixpkgs/lib/tests/modules/declare-attrsOfSub-any-enable.nix
diff --git a/lib/tests/modules/declare-coerced-value-unsound.nix b/nixpkgs/lib/tests/modules/declare-coerced-value-unsound.nix
index 7a017f24e77..7a017f24e77 100644
--- a/lib/tests/modules/declare-coerced-value-unsound.nix
+++ b/nixpkgs/lib/tests/modules/declare-coerced-value-unsound.nix
diff --git a/lib/tests/modules/declare-coerced-value.nix b/nixpkgs/lib/tests/modules/declare-coerced-value.nix
index 76b12ad53f0..76b12ad53f0 100644
--- a/lib/tests/modules/declare-coerced-value.nix
+++ b/nixpkgs/lib/tests/modules/declare-coerced-value.nix
diff --git a/lib/tests/modules/declare-either.nix b/nixpkgs/lib/tests/modules/declare-either.nix
index 5a0fa978a13..5a0fa978a13 100644
--- a/lib/tests/modules/declare-either.nix
+++ b/nixpkgs/lib/tests/modules/declare-either.nix
diff --git a/lib/tests/modules/declare-enable.nix b/nixpkgs/lib/tests/modules/declare-enable.nix
index ebee243c756..ebee243c756 100644
--- a/lib/tests/modules/declare-enable.nix
+++ b/nixpkgs/lib/tests/modules/declare-enable.nix
diff --git a/lib/tests/modules/declare-int-between-value.nix b/nixpkgs/lib/tests/modules/declare-int-between-value.nix
index 8b2624cc5d6..8b2624cc5d6 100644
--- a/lib/tests/modules/declare-int-between-value.nix
+++ b/nixpkgs/lib/tests/modules/declare-int-between-value.nix
diff --git a/lib/tests/modules/declare-int-positive-value.nix b/nixpkgs/lib/tests/modules/declare-int-positive-value.nix
index 6e48c6ac8fe..6e48c6ac8fe 100644
--- a/lib/tests/modules/declare-int-positive-value.nix
+++ b/nixpkgs/lib/tests/modules/declare-int-positive-value.nix
diff --git a/lib/tests/modules/declare-int-unsigned-value.nix b/nixpkgs/lib/tests/modules/declare-int-unsigned-value.nix
index 05d0eff01c9..05d0eff01c9 100644
--- a/lib/tests/modules/declare-int-unsigned-value.nix
+++ b/nixpkgs/lib/tests/modules/declare-int-unsigned-value.nix
diff --git a/lib/tests/modules/declare-lazyAttrsOf.nix b/nixpkgs/lib/tests/modules/declare-lazyAttrsOf.nix
index 1d9fec25f90..1d9fec25f90 100644
--- a/lib/tests/modules/declare-lazyAttrsOf.nix
+++ b/nixpkgs/lib/tests/modules/declare-lazyAttrsOf.nix
diff --git a/lib/tests/modules/declare-oneOf.nix b/nixpkgs/lib/tests/modules/declare-oneOf.nix
index df092a14f81..df092a14f81 100644
--- a/lib/tests/modules/declare-oneOf.nix
+++ b/nixpkgs/lib/tests/modules/declare-oneOf.nix
diff --git a/lib/tests/modules/declare-submoduleWith-modules.nix b/nixpkgs/lib/tests/modules/declare-submoduleWith-modules.nix
index 4736ab41751..4736ab41751 100644
--- a/lib/tests/modules/declare-submoduleWith-modules.nix
+++ b/nixpkgs/lib/tests/modules/declare-submoduleWith-modules.nix
diff --git a/lib/tests/modules/declare-submoduleWith-noshorthand.nix b/nixpkgs/lib/tests/modules/declare-submoduleWith-noshorthand.nix
index af3b4ba470f..af3b4ba470f 100644
--- a/lib/tests/modules/declare-submoduleWith-noshorthand.nix
+++ b/nixpkgs/lib/tests/modules/declare-submoduleWith-noshorthand.nix
diff --git a/lib/tests/modules/declare-submoduleWith-path.nix b/nixpkgs/lib/tests/modules/declare-submoduleWith-path.nix
index 477647f3212..477647f3212 100644
--- a/lib/tests/modules/declare-submoduleWith-path.nix
+++ b/nixpkgs/lib/tests/modules/declare-submoduleWith-path.nix
diff --git a/lib/tests/modules/declare-submoduleWith-shorthand.nix b/nixpkgs/lib/tests/modules/declare-submoduleWith-shorthand.nix
index 63ac16293e2..63ac16293e2 100644
--- a/lib/tests/modules/declare-submoduleWith-shorthand.nix
+++ b/nixpkgs/lib/tests/modules/declare-submoduleWith-shorthand.nix
diff --git a/lib/tests/modules/declare-submoduleWith-special.nix b/nixpkgs/lib/tests/modules/declare-submoduleWith-special.nix
index 6b15c5bde20..6b15c5bde20 100644
--- a/lib/tests/modules/declare-submoduleWith-special.nix
+++ b/nixpkgs/lib/tests/modules/declare-submoduleWith-special.nix
diff --git a/lib/tests/modules/default.nix b/nixpkgs/lib/tests/modules/default.nix
index 5b094710419..5b094710419 100644
--- a/lib/tests/modules/default.nix
+++ b/nixpkgs/lib/tests/modules/default.nix
diff --git a/lib/tests/modules/define-_module-args-custom.nix b/nixpkgs/lib/tests/modules/define-_module-args-custom.nix
index e565fd215a5..e565fd215a5 100644
--- a/lib/tests/modules/define-_module-args-custom.nix
+++ b/nixpkgs/lib/tests/modules/define-_module-args-custom.nix
diff --git a/lib/tests/modules/define-attrsOfSub-bar-enable.nix b/nixpkgs/lib/tests/modules/define-attrsOfSub-bar-enable.nix
index 99c55d8b360..99c55d8b360 100644
--- a/lib/tests/modules/define-attrsOfSub-bar-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-attrsOfSub-bar-enable.nix
diff --git a/lib/tests/modules/define-attrsOfSub-bar.nix b/nixpkgs/lib/tests/modules/define-attrsOfSub-bar.nix
index 2a33068a568..2a33068a568 100644
--- a/lib/tests/modules/define-attrsOfSub-bar.nix
+++ b/nixpkgs/lib/tests/modules/define-attrsOfSub-bar.nix
diff --git a/lib/tests/modules/define-attrsOfSub-foo-enable-force.nix b/nixpkgs/lib/tests/modules/define-attrsOfSub-foo-enable-force.nix
index c9ee36446f1..c9ee36446f1 100644
--- a/lib/tests/modules/define-attrsOfSub-foo-enable-force.nix
+++ b/nixpkgs/lib/tests/modules/define-attrsOfSub-foo-enable-force.nix
diff --git a/lib/tests/modules/define-attrsOfSub-foo-enable-if.nix b/nixpkgs/lib/tests/modules/define-attrsOfSub-foo-enable-if.nix
index 0b3baddb5ec..0b3baddb5ec 100644
--- a/lib/tests/modules/define-attrsOfSub-foo-enable-if.nix
+++ b/nixpkgs/lib/tests/modules/define-attrsOfSub-foo-enable-if.nix
diff --git a/lib/tests/modules/define-attrsOfSub-foo-enable.nix b/nixpkgs/lib/tests/modules/define-attrsOfSub-foo-enable.nix
index 39cd63cef72..39cd63cef72 100644
--- a/lib/tests/modules/define-attrsOfSub-foo-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-attrsOfSub-foo-enable.nix
diff --git a/lib/tests/modules/define-attrsOfSub-foo-force-enable.nix b/nixpkgs/lib/tests/modules/define-attrsOfSub-foo-force-enable.nix
index 009da7c77cd..009da7c77cd 100644
--- a/lib/tests/modules/define-attrsOfSub-foo-force-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-attrsOfSub-foo-force-enable.nix
diff --git a/lib/tests/modules/define-attrsOfSub-foo-if-enable.nix b/nixpkgs/lib/tests/modules/define-attrsOfSub-foo-if-enable.nix
index 93702dfa86f..93702dfa86f 100644
--- a/lib/tests/modules/define-attrsOfSub-foo-if-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-attrsOfSub-foo-if-enable.nix
diff --git a/lib/tests/modules/define-attrsOfSub-foo.nix b/nixpkgs/lib/tests/modules/define-attrsOfSub-foo.nix
index e6bb531dedd..e6bb531dedd 100644
--- a/lib/tests/modules/define-attrsOfSub-foo.nix
+++ b/nixpkgs/lib/tests/modules/define-attrsOfSub-foo.nix
diff --git a/lib/tests/modules/define-attrsOfSub-force-foo-enable.nix b/nixpkgs/lib/tests/modules/define-attrsOfSub-force-foo-enable.nix
index 5c02dd34314..5c02dd34314 100644
--- a/lib/tests/modules/define-attrsOfSub-force-foo-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-attrsOfSub-force-foo-enable.nix
diff --git a/lib/tests/modules/define-attrsOfSub-if-foo-enable.nix b/nixpkgs/lib/tests/modules/define-attrsOfSub-if-foo-enable.nix
index a3fe6051d41..a3fe6051d41 100644
--- a/lib/tests/modules/define-attrsOfSub-if-foo-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-attrsOfSub-if-foo-enable.nix
diff --git a/lib/tests/modules/define-enable-force.nix b/nixpkgs/lib/tests/modules/define-enable-force.nix
index f4990a32863..f4990a32863 100644
--- a/lib/tests/modules/define-enable-force.nix
+++ b/nixpkgs/lib/tests/modules/define-enable-force.nix
diff --git a/lib/tests/modules/define-enable-with-custom-arg.nix b/nixpkgs/lib/tests/modules/define-enable-with-custom-arg.nix
index 7da74671d14..7da74671d14 100644
--- a/lib/tests/modules/define-enable-with-custom-arg.nix
+++ b/nixpkgs/lib/tests/modules/define-enable-with-custom-arg.nix
diff --git a/lib/tests/modules/define-enable.nix b/nixpkgs/lib/tests/modules/define-enable.nix
index 7dc26010ae5..7dc26010ae5 100644
--- a/lib/tests/modules/define-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-enable.nix
diff --git a/lib/tests/modules/define-force-attrsOfSub-foo-enable.nix b/nixpkgs/lib/tests/modules/define-force-attrsOfSub-foo-enable.nix
index dafb2360e1f..dafb2360e1f 100644
--- a/lib/tests/modules/define-force-attrsOfSub-foo-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-force-attrsOfSub-foo-enable.nix
diff --git a/lib/tests/modules/define-force-enable.nix b/nixpkgs/lib/tests/modules/define-force-enable.nix
index 978caa2a8c0..978caa2a8c0 100644
--- a/lib/tests/modules/define-force-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-force-enable.nix
diff --git a/lib/tests/modules/define-if-attrsOfSub-foo-enable.nix b/nixpkgs/lib/tests/modules/define-if-attrsOfSub-foo-enable.nix
index 6a8e32e802a..6a8e32e802a 100644
--- a/lib/tests/modules/define-if-attrsOfSub-foo-enable.nix
+++ b/nixpkgs/lib/tests/modules/define-if-attrsOfSub-foo-enable.nix
diff --git a/lib/tests/modules/define-module-check.nix b/nixpkgs/lib/tests/modules/define-module-check.nix
index 5a0707c975f..5a0707c975f 100644
--- a/lib/tests/modules/define-module-check.nix
+++ b/nixpkgs/lib/tests/modules/define-module-check.nix
diff --git a/lib/tests/modules/define-submoduleWith-noshorthand.nix b/nixpkgs/lib/tests/modules/define-submoduleWith-noshorthand.nix
index 35e1607b6f1..35e1607b6f1 100644
--- a/lib/tests/modules/define-submoduleWith-noshorthand.nix
+++ b/nixpkgs/lib/tests/modules/define-submoduleWith-noshorthand.nix
diff --git a/lib/tests/modules/define-submoduleWith-shorthand.nix b/nixpkgs/lib/tests/modules/define-submoduleWith-shorthand.nix
index 17df248db8e..17df248db8e 100644
--- a/lib/tests/modules/define-submoduleWith-shorthand.nix
+++ b/nixpkgs/lib/tests/modules/define-submoduleWith-shorthand.nix
diff --git a/lib/tests/modules/define-value-int-negative.nix b/nixpkgs/lib/tests/modules/define-value-int-negative.nix
index a041222987a..a041222987a 100644
--- a/lib/tests/modules/define-value-int-negative.nix
+++ b/nixpkgs/lib/tests/modules/define-value-int-negative.nix
diff --git a/lib/tests/modules/define-value-int-positive.nix b/nixpkgs/lib/tests/modules/define-value-int-positive.nix
index 5803de17263..5803de17263 100644
--- a/lib/tests/modules/define-value-int-positive.nix
+++ b/nixpkgs/lib/tests/modules/define-value-int-positive.nix
diff --git a/lib/tests/modules/define-value-int-zero.nix b/nixpkgs/lib/tests/modules/define-value-int-zero.nix
index 68bb9f415c3..68bb9f415c3 100644
--- a/lib/tests/modules/define-value-int-zero.nix
+++ b/nixpkgs/lib/tests/modules/define-value-int-zero.nix
diff --git a/lib/tests/modules/define-value-list.nix b/nixpkgs/lib/tests/modules/define-value-list.nix
index 4831c1cc09b..4831c1cc09b 100644
--- a/lib/tests/modules/define-value-list.nix
+++ b/nixpkgs/lib/tests/modules/define-value-list.nix
diff --git a/lib/tests/modules/define-value-string-arbitrary.nix b/nixpkgs/lib/tests/modules/define-value-string-arbitrary.nix
index 8e3abaf536a..8e3abaf536a 100644
--- a/lib/tests/modules/define-value-string-arbitrary.nix
+++ b/nixpkgs/lib/tests/modules/define-value-string-arbitrary.nix
diff --git a/lib/tests/modules/define-value-string-bigint.nix b/nixpkgs/lib/tests/modules/define-value-string-bigint.nix
index f27e31985c9..f27e31985c9 100644
--- a/lib/tests/modules/define-value-string-bigint.nix
+++ b/nixpkgs/lib/tests/modules/define-value-string-bigint.nix
diff --git a/lib/tests/modules/define-value-string.nix b/nixpkgs/lib/tests/modules/define-value-string.nix
index e7a166965a7..e7a166965a7 100644
--- a/lib/tests/modules/define-value-string.nix
+++ b/nixpkgs/lib/tests/modules/define-value-string.nix
diff --git a/lib/tests/modules/disable-declare-enable.nix b/nixpkgs/lib/tests/modules/disable-declare-enable.nix
index a373ee7e550..a373ee7e550 100644
--- a/lib/tests/modules/disable-declare-enable.nix
+++ b/nixpkgs/lib/tests/modules/disable-declare-enable.nix
diff --git a/lib/tests/modules/disable-define-enable.nix b/nixpkgs/lib/tests/modules/disable-define-enable.nix
index 0d84a7c3cb6..0d84a7c3cb6 100644
--- a/lib/tests/modules/disable-define-enable.nix
+++ b/nixpkgs/lib/tests/modules/disable-define-enable.nix
diff --git a/lib/tests/modules/disable-enable-modules.nix b/nixpkgs/lib/tests/modules/disable-enable-modules.nix
index c325f4e0743..c325f4e0743 100644
--- a/lib/tests/modules/disable-enable-modules.nix
+++ b/nixpkgs/lib/tests/modules/disable-enable-modules.nix
diff --git a/lib/tests/modules/disable-recursive/bar.nix b/nixpkgs/lib/tests/modules/disable-recursive/bar.nix
index 4d9240a432d..4d9240a432d 100644
--- a/lib/tests/modules/disable-recursive/bar.nix
+++ b/nixpkgs/lib/tests/modules/disable-recursive/bar.nix
diff --git a/lib/tests/modules/disable-recursive/disable-bar.nix b/nixpkgs/lib/tests/modules/disable-recursive/disable-bar.nix
index 987b2802ae8..987b2802ae8 100644
--- a/lib/tests/modules/disable-recursive/disable-bar.nix
+++ b/nixpkgs/lib/tests/modules/disable-recursive/disable-bar.nix
diff --git a/lib/tests/modules/disable-recursive/disable-foo.nix b/nixpkgs/lib/tests/modules/disable-recursive/disable-foo.nix
index 5b68a3c4610..5b68a3c4610 100644
--- a/lib/tests/modules/disable-recursive/disable-foo.nix
+++ b/nixpkgs/lib/tests/modules/disable-recursive/disable-foo.nix
diff --git a/lib/tests/modules/disable-recursive/foo.nix b/nixpkgs/lib/tests/modules/disable-recursive/foo.nix
index 4d9240a432d..4d9240a432d 100644
--- a/lib/tests/modules/disable-recursive/foo.nix
+++ b/nixpkgs/lib/tests/modules/disable-recursive/foo.nix
diff --git a/lib/tests/modules/disable-recursive/main.nix b/nixpkgs/lib/tests/modules/disable-recursive/main.nix
index 48a3c6218cf..48a3c6218cf 100644
--- a/lib/tests/modules/disable-recursive/main.nix
+++ b/nixpkgs/lib/tests/modules/disable-recursive/main.nix
diff --git a/lib/tests/modules/import-custom-arg.nix b/nixpkgs/lib/tests/modules/import-custom-arg.nix
index 3e687b661c1..3e687b661c1 100644
--- a/lib/tests/modules/import-custom-arg.nix
+++ b/nixpkgs/lib/tests/modules/import-custom-arg.nix
diff --git a/lib/tests/modules/import-from-store.nix b/nixpkgs/lib/tests/modules/import-from-store.nix
index f5af22432ce..f5af22432ce 100644
--- a/lib/tests/modules/import-from-store.nix
+++ b/nixpkgs/lib/tests/modules/import-from-store.nix
diff --git a/lib/tests/release.nix b/nixpkgs/lib/tests/release.nix
index 737d142d253..737d142d253 100644
--- a/lib/tests/release.nix
+++ b/nixpkgs/lib/tests/release.nix
diff --git a/lib/tests/systems.nix b/nixpkgs/lib/tests/systems.nix
index 6f52912994d..6f52912994d 100644
--- a/lib/tests/systems.nix
+++ b/nixpkgs/lib/tests/systems.nix
diff --git a/lib/trivial.nix b/nixpkgs/lib/trivial.nix
index a281cd70fb0..a281cd70fb0 100644
--- a/lib/trivial.nix
+++ b/nixpkgs/lib/trivial.nix
diff --git a/lib/types.nix b/nixpkgs/lib/types.nix
index 6fd6de7e1fd..6fd6de7e1fd 100644
--- a/lib/types.nix
+++ b/nixpkgs/lib/types.nix
diff --git a/lib/versions.nix b/nixpkgs/lib/versions.nix
index 0e9d81ac78b..0e9d81ac78b 100644
--- a/lib/versions.nix
+++ b/nixpkgs/lib/versions.nix
diff --git a/lib/zip-int-bits.nix b/nixpkgs/lib/zip-int-bits.nix
index edbcdfe1e68..edbcdfe1e68 100644
--- a/lib/zip-int-bits.nix
+++ b/nixpkgs/lib/zip-int-bits.nix
diff --git a/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix
index 43668ab4318..43668ab4318 100644
--- a/maintainers/maintainer-list.nix
+++ b/nixpkgs/maintainers/maintainer-list.nix
diff --git a/maintainers/scripts/all-tarballs.nix b/nixpkgs/maintainers/scripts/all-tarballs.nix
index 6a4de8a4b95..6a4de8a4b95 100644
--- a/maintainers/scripts/all-tarballs.nix
+++ b/nixpkgs/maintainers/scripts/all-tarballs.nix
diff --git a/maintainers/scripts/check-maintainer-github-handles.sh b/nixpkgs/maintainers/scripts/check-maintainer-github-handles.sh
index 879a2e452cb..879a2e452cb 100755
--- a/maintainers/scripts/check-maintainer-github-handles.sh
+++ b/nixpkgs/maintainers/scripts/check-maintainer-github-handles.sh
diff --git a/maintainers/scripts/copy-tarballs.pl b/nixpkgs/maintainers/scripts/copy-tarballs.pl
index 59696a4432d..59696a4432d 100755
--- a/maintainers/scripts/copy-tarballs.pl
+++ b/nixpkgs/maintainers/scripts/copy-tarballs.pl
diff --git a/maintainers/scripts/debian-patches.sh b/nixpkgs/maintainers/scripts/debian-patches.sh
index b4923fb537e..b4923fb537e 100755
--- a/maintainers/scripts/debian-patches.sh
+++ b/nixpkgs/maintainers/scripts/debian-patches.sh
diff --git a/maintainers/scripts/dep-licenses.sh b/nixpkgs/maintainers/scripts/dep-licenses.sh
index 28ad22c334f..28ad22c334f 100755
--- a/maintainers/scripts/dep-licenses.sh
+++ b/nixpkgs/maintainers/scripts/dep-licenses.sh
diff --git a/maintainers/scripts/eval-release.nix b/nixpkgs/maintainers/scripts/eval-release.nix
index bb9572cbc79..bb9572cbc79 100644
--- a/maintainers/scripts/eval-release.nix
+++ b/nixpkgs/maintainers/scripts/eval-release.nix
diff --git a/maintainers/scripts/eval-release.sh b/nixpkgs/maintainers/scripts/eval-release.sh
index e0dfaf1de74..e0dfaf1de74 100755
--- a/maintainers/scripts/eval-release.sh
+++ b/nixpkgs/maintainers/scripts/eval-release.sh
diff --git a/maintainers/scripts/fetch-kde-qt.sh b/nixpkgs/maintainers/scripts/fetch-kde-qt.sh
index a267a5fa871..a267a5fa871 100755
--- a/maintainers/scripts/fetch-kde-qt.sh
+++ b/nixpkgs/maintainers/scripts/fetch-kde-qt.sh
diff --git a/maintainers/scripts/find-tarballs.nix b/nixpkgs/maintainers/scripts/find-tarballs.nix
index 52cce909918..52cce909918 100644
--- a/maintainers/scripts/find-tarballs.nix
+++ b/nixpkgs/maintainers/scripts/find-tarballs.nix
diff --git a/maintainers/scripts/hydra-eval-failures.py b/nixpkgs/maintainers/scripts/hydra-eval-failures.py
index 6e7ec2dbc00..6e7ec2dbc00 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/nixpkgs/maintainers/scripts/hydra-eval-failures.py
diff --git a/maintainers/scripts/hydra_eval_check b/nixpkgs/maintainers/scripts/hydra_eval_check
index c8e03424f32..c8e03424f32 100755
--- a/maintainers/scripts/hydra_eval_check
+++ b/nixpkgs/maintainers/scripts/hydra_eval_check
diff --git a/maintainers/scripts/luarocks-config.lua b/nixpkgs/maintainers/scripts/luarocks-config.lua
index 89e74c00ea8..89e74c00ea8 100644
--- a/maintainers/scripts/luarocks-config.lua
+++ b/nixpkgs/maintainers/scripts/luarocks-config.lua
diff --git a/maintainers/scripts/luarocks-packages.csv b/nixpkgs/maintainers/scripts/luarocks-packages.csv
index 01e3150ede1..01e3150ede1 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/nixpkgs/maintainers/scripts/luarocks-packages.csv
diff --git a/maintainers/scripts/nix-call-package b/nixpkgs/maintainers/scripts/nix-call-package
index be478fca2b7..be478fca2b7 100755
--- a/maintainers/scripts/nix-call-package
+++ b/nixpkgs/maintainers/scripts/nix-call-package
diff --git a/maintainers/scripts/nix-diff.sh b/nixpkgs/maintainers/scripts/nix-diff.sh
index 0c65e29cf43..0c65e29cf43 100755
--- a/maintainers/scripts/nix-diff.sh
+++ b/nixpkgs/maintainers/scripts/nix-diff.sh
diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/nixpkgs/maintainers/scripts/nix-generate-from-cpan.nix
index 5c4cf0f6c55..5c4cf0f6c55 100644
--- a/maintainers/scripts/nix-generate-from-cpan.nix
+++ b/nixpkgs/maintainers/scripts/nix-generate-from-cpan.nix
diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/nixpkgs/maintainers/scripts/nix-generate-from-cpan.pl
index e04d3713e9a..e04d3713e9a 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/nixpkgs/maintainers/scripts/nix-generate-from-cpan.pl
diff --git a/maintainers/scripts/nixpkgs-lint.nix b/nixpkgs/maintainers/scripts/nixpkgs-lint.nix
index 6d99c94bf33..6d99c94bf33 100644
--- a/maintainers/scripts/nixpkgs-lint.nix
+++ b/nixpkgs/maintainers/scripts/nixpkgs-lint.nix
diff --git a/maintainers/scripts/nixpkgs-lint.pl b/nixpkgs/maintainers/scripts/nixpkgs-lint.pl
index 638d1b2aaa1..638d1b2aaa1 100755
--- a/maintainers/scripts/nixpkgs-lint.pl
+++ b/nixpkgs/maintainers/scripts/nixpkgs-lint.pl
diff --git a/maintainers/scripts/patchelf-hints.sh b/nixpkgs/maintainers/scripts/patchelf-hints.sh
index 5fdfc15dc23..5fdfc15dc23 100755
--- a/maintainers/scripts/patchelf-hints.sh
+++ b/nixpkgs/maintainers/scripts/patchelf-hints.sh
diff --git a/maintainers/scripts/rebuild-amount.sh b/nixpkgs/maintainers/scripts/rebuild-amount.sh
index 1a54cada8af..1a54cada8af 100755
--- a/maintainers/scripts/rebuild-amount.sh
+++ b/nixpkgs/maintainers/scripts/rebuild-amount.sh
diff --git a/maintainers/scripts/update-channel-branches.sh b/nixpkgs/maintainers/scripts/update-channel-branches.sh
index d65cf3ec5f6..d65cf3ec5f6 100755
--- a/maintainers/scripts/update-channel-branches.sh
+++ b/nixpkgs/maintainers/scripts/update-channel-branches.sh
diff --git a/maintainers/scripts/update-discord b/nixpkgs/maintainers/scripts/update-discord
index b4c26b3bdef..b4c26b3bdef 100755
--- a/maintainers/scripts/update-discord
+++ b/nixpkgs/maintainers/scripts/update-discord
diff --git a/maintainers/scripts/update-luarocks-packages b/nixpkgs/maintainers/scripts/update-luarocks-packages
index 5c42080745e..5c42080745e 100755
--- a/maintainers/scripts/update-luarocks-packages
+++ b/nixpkgs/maintainers/scripts/update-luarocks-packages
diff --git a/maintainers/scripts/update-luarocks-shell.nix b/nixpkgs/maintainers/scripts/update-luarocks-shell.nix
index 23a940b3691..23a940b3691 100644
--- a/maintainers/scripts/update-luarocks-shell.nix
+++ b/nixpkgs/maintainers/scripts/update-luarocks-shell.nix
diff --git a/maintainers/scripts/update-python-libraries b/nixpkgs/maintainers/scripts/update-python-libraries
index 4a6024c4038..4a6024c4038 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/nixpkgs/maintainers/scripts/update-python-libraries
diff --git a/maintainers/scripts/update-ruby-packages b/nixpkgs/maintainers/scripts/update-ruby-packages
index fef6b75ded0..fef6b75ded0 100755
--- a/maintainers/scripts/update-ruby-packages
+++ b/nixpkgs/maintainers/scripts/update-ruby-packages
diff --git a/maintainers/scripts/update.nix b/nixpkgs/maintainers/scripts/update.nix
index bbc3004b1c4..bbc3004b1c4 100755
--- a/maintainers/scripts/update.nix
+++ b/nixpkgs/maintainers/scripts/update.nix
diff --git a/maintainers/scripts/update.py b/nixpkgs/maintainers/scripts/update.py
index eb7d0ef2647..eb7d0ef2647 100644
--- a/maintainers/scripts/update.py
+++ b/nixpkgs/maintainers/scripts/update.py
diff --git a/maintainers/scripts/vanity-manual-equalities.txt b/nixpkgs/maintainers/scripts/vanity-manual-equalities.txt
index 4a7bc3aea44..4a7bc3aea44 100644
--- a/maintainers/scripts/vanity-manual-equalities.txt
+++ b/nixpkgs/maintainers/scripts/vanity-manual-equalities.txt
diff --git a/maintainers/scripts/vanity.sh b/nixpkgs/maintainers/scripts/vanity.sh
index aa7d4ec967d..aa7d4ec967d 100755
--- a/maintainers/scripts/vanity.sh
+++ b/nixpkgs/maintainers/scripts/vanity.sh
diff --git a/nixos/COPYING b/nixpkgs/nixos/COPYING
index c9b44cb8aae..c9b44cb8aae 100644
--- a/nixos/COPYING
+++ b/nixpkgs/nixos/COPYING
diff --git a/nixos/README b/nixpkgs/nixos/README
index 4ecf648a930..4ecf648a930 100644
--- a/nixos/README
+++ b/nixpkgs/nixos/README
diff --git a/nixos/default.nix b/nixpkgs/nixos/default.nix
index 45da78e9261..45da78e9261 100644
--- a/nixos/default.nix
+++ b/nixpkgs/nixos/default.nix
diff --git a/nixos/doc/manual/.gitignore b/nixpkgs/nixos/doc/manual/.gitignore
index 87928262421..87928262421 100644
--- a/nixos/doc/manual/.gitignore
+++ b/nixpkgs/nixos/doc/manual/.gitignore
diff --git a/nixos/doc/manual/Makefile b/nixpkgs/nixos/doc/manual/Makefile
index b86a7600575..b86a7600575 100644
--- a/nixos/doc/manual/Makefile
+++ b/nixpkgs/nixos/doc/manual/Makefile
diff --git a/nixos/doc/manual/README b/nixpkgs/nixos/doc/manual/README
index 587f6275197..587f6275197 100644
--- a/nixos/doc/manual/README
+++ b/nixpkgs/nixos/doc/manual/README
diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixpkgs/nixos/doc/manual/administration/boot-problems.xml
index de3d8ac21ae..de3d8ac21ae 100644
--- a/nixos/doc/manual/administration/boot-problems.xml
+++ b/nixpkgs/nixos/doc/manual/administration/boot-problems.xml
diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixpkgs/nixos/doc/manual/administration/cleaning-store.xml
index 526803e429b..526803e429b 100644
--- a/nixos/doc/manual/administration/cleaning-store.xml
+++ b/nixpkgs/nixos/doc/manual/administration/cleaning-store.xml
diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixpkgs/nixos/doc/manual/administration/container-networking.xml
index 42486f01fe8..42486f01fe8 100644
--- a/nixos/doc/manual/administration/container-networking.xml
+++ b/nixpkgs/nixos/doc/manual/administration/container-networking.xml
diff --git a/nixos/doc/manual/administration/containers.xml b/nixpkgs/nixos/doc/manual/administration/containers.xml
index 0d3355e56a5..0d3355e56a5 100644
--- a/nixos/doc/manual/administration/containers.xml
+++ b/nixpkgs/nixos/doc/manual/administration/containers.xml
diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixpkgs/nixos/doc/manual/administration/control-groups.xml
index 16d03cc0d1a..16d03cc0d1a 100644
--- a/nixos/doc/manual/administration/control-groups.xml
+++ b/nixpkgs/nixos/doc/manual/administration/control-groups.xml
diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixpkgs/nixos/doc/manual/administration/declarative-containers.xml
index d03dbc4d705..d03dbc4d705 100644
--- a/nixos/doc/manual/administration/declarative-containers.xml
+++ b/nixpkgs/nixos/doc/manual/administration/declarative-containers.xml
diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixpkgs/nixos/doc/manual/administration/imperative-containers.xml
index 7ded0c11786..7ded0c11786 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixpkgs/nixos/doc/manual/administration/imperative-containers.xml
diff --git a/nixos/doc/manual/administration/logging.xml b/nixpkgs/nixos/doc/manual/administration/logging.xml
index da4877fcdf0..da4877fcdf0 100644
--- a/nixos/doc/manual/administration/logging.xml
+++ b/nixpkgs/nixos/doc/manual/administration/logging.xml
diff --git a/nixos/doc/manual/administration/maintenance-mode.xml b/nixpkgs/nixos/doc/manual/administration/maintenance-mode.xml
index 71e3f9ea665..71e3f9ea665 100644
--- a/nixos/doc/manual/administration/maintenance-mode.xml
+++ b/nixpkgs/nixos/doc/manual/administration/maintenance-mode.xml
diff --git a/nixos/doc/manual/administration/network-problems.xml b/nixpkgs/nixos/doc/manual/administration/network-problems.xml
index 570f5835884..570f5835884 100644
--- a/nixos/doc/manual/administration/network-problems.xml
+++ b/nixpkgs/nixos/doc/manual/administration/network-problems.xml
diff --git a/nixos/doc/manual/administration/rebooting.xml b/nixpkgs/nixos/doc/manual/administration/rebooting.xml
index a5abd6f0258..a5abd6f0258 100644
--- a/nixos/doc/manual/administration/rebooting.xml
+++ b/nixpkgs/nixos/doc/manual/administration/rebooting.xml
diff --git a/nixos/doc/manual/administration/rollback.xml b/nixpkgs/nixos/doc/manual/administration/rollback.xml
index fb87810ba46..fb87810ba46 100644
--- a/nixos/doc/manual/administration/rollback.xml
+++ b/nixpkgs/nixos/doc/manual/administration/rollback.xml
diff --git a/nixos/doc/manual/administration/running.xml b/nixpkgs/nixos/doc/manual/administration/running.xml
index 19bec1f7794..19bec1f7794 100644
--- a/nixos/doc/manual/administration/running.xml
+++ b/nixpkgs/nixos/doc/manual/administration/running.xml
diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml
index 1b9c745eb59..1b9c745eb59 100644
--- a/nixos/doc/manual/administration/service-mgmt.xml
+++ b/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml
diff --git a/nixos/doc/manual/administration/store-corruption.xml b/nixpkgs/nixos/doc/manual/administration/store-corruption.xml
index b9d11152d5e..b9d11152d5e 100644
--- a/nixos/doc/manual/administration/store-corruption.xml
+++ b/nixpkgs/nixos/doc/manual/administration/store-corruption.xml
diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixpkgs/nixos/doc/manual/administration/troubleshooting.xml
index 6496e7bde38..6496e7bde38 100644
--- a/nixos/doc/manual/administration/troubleshooting.xml
+++ b/nixpkgs/nixos/doc/manual/administration/troubleshooting.xml
diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixpkgs/nixos/doc/manual/administration/user-sessions.xml
index 80daf6bdbff..80daf6bdbff 100644
--- a/nixos/doc/manual/administration/user-sessions.xml
+++ b/nixpkgs/nixos/doc/manual/administration/user-sessions.xml
diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixpkgs/nixos/doc/manual/configuration/abstractions.xml
index df9ff2615e1..df9ff2615e1 100644
--- a/nixos/doc/manual/configuration/abstractions.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/abstractions.xml
diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixpkgs/nixos/doc/manual/configuration/ad-hoc-network-config.xml
index 00e595c7cb7..00e595c7cb7 100644
--- a/nixos/doc/manual/configuration/ad-hoc-network-config.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/ad-hoc-network-config.xml
diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixpkgs/nixos/doc/manual/configuration/ad-hoc-packages.xml
index c7e882d846f..c7e882d846f 100644
--- a/nixos/doc/manual/configuration/ad-hoc-packages.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/ad-hoc-packages.xml
diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml
index 182641055e4..182641055e4 100644
--- a/nixos/doc/manual/configuration/adding-custom-packages.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixpkgs/nixos/doc/manual/configuration/config-file.xml
index 7ccb5b3664e..7ccb5b3664e 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/config-file.xml
diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixpkgs/nixos/doc/manual/configuration/config-syntax.xml
index 5ef498cf9ae..5ef498cf9ae 100644
--- a/nixos/doc/manual/configuration/config-syntax.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/config-syntax.xml
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixpkgs/nixos/doc/manual/configuration/configuration.xml
index 5961209bc13..5961209bc13 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/configuration.xml
diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixpkgs/nixos/doc/manual/configuration/customizing-packages.xml
index 34e6ab4b24d..34e6ab4b24d 100644
--- a/nixos/doc/manual/configuration/customizing-packages.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/customizing-packages.xml
diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixpkgs/nixos/doc/manual/configuration/declarative-packages.xml
index cd84d1951d2..cd84d1951d2 100644
--- a/nixos/doc/manual/configuration/declarative-packages.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/declarative-packages.xml
diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixpkgs/nixos/doc/manual/configuration/file-systems.xml
index e4c03de71b7..e4c03de71b7 100644
--- a/nixos/doc/manual/configuration/file-systems.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/file-systems.xml
diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixpkgs/nixos/doc/manual/configuration/firewall.xml
index 47a19ac82c0..47a19ac82c0 100644
--- a/nixos/doc/manual/configuration/firewall.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/firewall.xml
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixpkgs/nixos/doc/manual/configuration/ipv4-config.xml
index 71ddf41491b..71ddf41491b 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/ipv4-config.xml
diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml
index 675a5d9a260..675a5d9a260 100644
--- a/nixos/doc/manual/configuration/ipv6-config.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml
diff --git a/nixos/doc/manual/configuration/kubernetes.xml b/nixpkgs/nixos/doc/manual/configuration/kubernetes.xml
index 54a100e4479..54a100e4479 100644
--- a/nixos/doc/manual/configuration/kubernetes.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/kubernetes.xml
diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixpkgs/nixos/doc/manual/configuration/linux-kernel.xml
index 644d3a33ffd..644d3a33ffd 100644
--- a/nixos/doc/manual/configuration/linux-kernel.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/linux-kernel.xml
diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml
index d3007843d68..d3007843d68 100644
--- a/nixos/doc/manual/configuration/luks-file-systems.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml
diff --git a/nixos/doc/manual/configuration/matrix.xml b/nixpkgs/nixos/doc/manual/configuration/matrix.xml
index ef8d5cbda88..ef8d5cbda88 100644
--- a/nixos/doc/manual/configuration/matrix.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/matrix.xml
diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixpkgs/nixos/doc/manual/configuration/modularity.xml
index 7ad0ae80a48..7ad0ae80a48 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/modularity.xml
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixpkgs/nixos/doc/manual/configuration/network-manager.xml
index d103ee24978..d103ee24978 100644
--- a/nixos/doc/manual/configuration/network-manager.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/network-manager.xml
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixpkgs/nixos/doc/manual/configuration/networking.xml
index 02cf811e0bd..02cf811e0bd 100644
--- a/nixos/doc/manual/configuration/networking.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/networking.xml
diff --git a/nixos/doc/manual/configuration/package-mgmt.xml b/nixpkgs/nixos/doc/manual/configuration/package-mgmt.xml
index e8ac5d0681a..e8ac5d0681a 100644
--- a/nixos/doc/manual/configuration/package-mgmt.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/package-mgmt.xml
diff --git a/nixos/doc/manual/configuration/profiles.xml b/nixpkgs/nixos/doc/manual/configuration/profiles.xml
index 9d08f7f7bed..9d08f7f7bed 100644
--- a/nixos/doc/manual/configuration/profiles.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/profiles.xml
diff --git a/nixos/doc/manual/configuration/profiles/all-hardware.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/all-hardware.xml
index 2936f71069d..2936f71069d 100644
--- a/nixos/doc/manual/configuration/profiles/all-hardware.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/profiles/all-hardware.xml
diff --git a/nixos/doc/manual/configuration/profiles/base.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/base.xml
index b75f6ba25b4..b75f6ba25b4 100644
--- a/nixos/doc/manual/configuration/profiles/base.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/profiles/base.xml
diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml
index 04fa1643d0f..04fa1643d0f 100644
--- a/nixos/doc/manual/configuration/profiles/clone-config.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml
diff --git a/nixos/doc/manual/configuration/profiles/demo.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/demo.xml
index 395a5ec357c..395a5ec357c 100644
--- a/nixos/doc/manual/configuration/profiles/demo.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/profiles/demo.xml
diff --git a/nixos/doc/manual/configuration/profiles/docker-container.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/docker-container.xml
index efa7b8f24c4..efa7b8f24c4 100644
--- a/nixos/doc/manual/configuration/profiles/docker-container.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/profiles/docker-container.xml
diff --git a/nixos/doc/manual/configuration/profiles/graphical.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/graphical.xml
index cc6d0825d24..cc6d0825d24 100644
--- a/nixos/doc/manual/configuration/profiles/graphical.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/profiles/graphical.xml
diff --git a/nixos/doc/manual/configuration/profiles/hardened.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/hardened.xml
index dc83fc837e2..dc83fc837e2 100644
--- a/nixos/doc/manual/configuration/profiles/hardened.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/profiles/hardened.xml
diff --git a/nixos/doc/manual/configuration/profiles/headless.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/headless.xml
index 1b64497ebf7..1b64497ebf7 100644
--- a/nixos/doc/manual/configuration/profiles/headless.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/profiles/headless.xml
diff --git a/nixos/doc/manual/configuration/profiles/installation-device.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/installation-device.xml
index 192ae955b68..192ae955b68 100644
--- a/nixos/doc/manual/configuration/profiles/installation-device.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/profiles/installation-device.xml
diff --git a/nixos/doc/manual/configuration/profiles/minimal.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/minimal.xml
index 179f2d0be64..179f2d0be64 100644
--- a/nixos/doc/manual/configuration/profiles/minimal.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/profiles/minimal.xml
diff --git a/nixos/doc/manual/configuration/profiles/qemu-guest.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/qemu-guest.xml
index 5d055c45d2d..5d055c45d2d 100644
--- a/nixos/doc/manual/configuration/profiles/qemu-guest.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/profiles/qemu-guest.xml
diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixpkgs/nixos/doc/manual/configuration/ssh.xml
index a4af1b96583..a4af1b96583 100644
--- a/nixos/doc/manual/configuration/ssh.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/ssh.xml
diff --git a/nixos/doc/manual/configuration/summary.xml b/nixpkgs/nixos/doc/manual/configuration/summary.xml
index ea980254a8f..ea980254a8f 100644
--- a/nixos/doc/manual/configuration/summary.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/summary.xml
diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml
index 4b1710f3a2b..4b1710f3a2b 100644
--- a/nixos/doc/manual/configuration/user-mgmt.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml
diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixpkgs/nixos/doc/manual/configuration/wireless.xml
index 247d29d5831..247d29d5831 100644
--- a/nixos/doc/manual/configuration/wireless.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/wireless.xml
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixpkgs/nixos/doc/manual/configuration/x-windows.xml
index 06dd7c8bfb9..06dd7c8bfb9 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/x-windows.xml
diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixpkgs/nixos/doc/manual/configuration/xfce.xml
index 7d2862f8b31..7d2862f8b31 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixpkgs/nixos/doc/manual/configuration/xfce.xml
diff --git a/nixos/doc/manual/default.nix b/nixpkgs/nixos/doc/manual/default.nix
index 6ca75f869f4..6ca75f869f4 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixpkgs/nixos/doc/manual/default.nix
diff --git a/nixos/doc/manual/development/assertions.xml b/nixpkgs/nixos/doc/manual/development/assertions.xml
index 32f90cf2e7c..32f90cf2e7c 100644
--- a/nixos/doc/manual/development/assertions.xml
+++ b/nixpkgs/nixos/doc/manual/development/assertions.xml
diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixpkgs/nixos/doc/manual/development/building-nixos.xml
index 56a596baed0..56a596baed0 100644
--- a/nixos/doc/manual/development/building-nixos.xml
+++ b/nixpkgs/nixos/doc/manual/development/building-nixos.xml
diff --git a/nixos/doc/manual/development/building-parts.xml b/nixpkgs/nixos/doc/manual/development/building-parts.xml
index 88369fb891b..88369fb891b 100644
--- a/nixos/doc/manual/development/building-parts.xml
+++ b/nixpkgs/nixos/doc/manual/development/building-parts.xml
diff --git a/nixos/doc/manual/development/development.xml b/nixpkgs/nixos/doc/manual/development/development.xml
index 43f511b3e96..43f511b3e96 100644
--- a/nixos/doc/manual/development/development.xml
+++ b/nixpkgs/nixos/doc/manual/development/development.xml
diff --git a/nixos/doc/manual/development/importing-modules.xml b/nixpkgs/nixos/doc/manual/development/importing-modules.xml
index 1c6a5671eda..1c6a5671eda 100644
--- a/nixos/doc/manual/development/importing-modules.xml
+++ b/nixpkgs/nixos/doc/manual/development/importing-modules.xml
diff --git a/nixos/doc/manual/development/meta-attributes.xml b/nixpkgs/nixos/doc/manual/development/meta-attributes.xml
index 3d019a4987e..3d019a4987e 100644
--- a/nixos/doc/manual/development/meta-attributes.xml
+++ b/nixpkgs/nixos/doc/manual/development/meta-attributes.xml
diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixpkgs/nixos/doc/manual/development/nixos-tests.xml
index 2695082e386..2695082e386 100644
--- a/nixos/doc/manual/development/nixos-tests.xml
+++ b/nixpkgs/nixos/doc/manual/development/nixos-tests.xml
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixpkgs/nixos/doc/manual/development/option-declarations.xml
index 56ebf481630..56ebf481630 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixpkgs/nixos/doc/manual/development/option-declarations.xml
diff --git a/nixos/doc/manual/development/option-def.xml b/nixpkgs/nixos/doc/manual/development/option-def.xml
index 50a705d0cb8..50a705d0cb8 100644
--- a/nixos/doc/manual/development/option-def.xml
+++ b/nixpkgs/nixos/doc/manual/development/option-def.xml
diff --git a/nixos/doc/manual/development/option-types.xml b/nixpkgs/nixos/doc/manual/development/option-types.xml
index 957349ad181..957349ad181 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixpkgs/nixos/doc/manual/development/option-types.xml
diff --git a/nixos/doc/manual/development/releases.xml b/nixpkgs/nixos/doc/manual/development/releases.xml
index a22a0a3707b..a22a0a3707b 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixpkgs/nixos/doc/manual/development/releases.xml
diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixpkgs/nixos/doc/manual/development/replace-modules.xml
index b4a466e2294..b4a466e2294 100644
--- a/nixos/doc/manual/development/replace-modules.xml
+++ b/nixpkgs/nixos/doc/manual/development/replace-modules.xml
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.xml
index 31216874c70..31216874c70 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml
+++ b/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.xml
diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixpkgs/nixos/doc/manual/development/running-nixos-tests.xml
index e9257c907da..e9257c907da 100644
--- a/nixos/doc/manual/development/running-nixos-tests.xml
+++ b/nixpkgs/nixos/doc/manual/development/running-nixos-tests.xml
diff --git a/nixos/doc/manual/development/sources.xml b/nixpkgs/nixos/doc/manual/development/sources.xml
index b333ccabb42..b333ccabb42 100644
--- a/nixos/doc/manual/development/sources.xml
+++ b/nixpkgs/nixos/doc/manual/development/sources.xml
diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixpkgs/nixos/doc/manual/development/testing-installer.xml
index 902f995fbc1..902f995fbc1 100644
--- a/nixos/doc/manual/development/testing-installer.xml
+++ b/nixpkgs/nixos/doc/manual/development/testing-installer.xml
diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixpkgs/nixos/doc/manual/development/writing-documentation.xml
index 2183937ad0d..2183937ad0d 100644
--- a/nixos/doc/manual/development/writing-documentation.xml
+++ b/nixpkgs/nixos/doc/manual/development/writing-documentation.xml
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixpkgs/nixos/doc/manual/development/writing-modules.xml
index bbf793bb0be..bbf793bb0be 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixpkgs/nixos/doc/manual/development/writing-modules.xml
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml
index e5a887c18c7..e5a887c18c7 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.xml
+++ b/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml
diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixpkgs/nixos/doc/manual/installation/changing-config.xml
index 48193d986ab..48193d986ab 100644
--- a/nixos/doc/manual/installation/changing-config.xml
+++ b/nixpkgs/nixos/doc/manual/installation/changing-config.xml
diff --git a/nixos/doc/manual/installation/installation.xml b/nixpkgs/nixos/doc/manual/installation/installation.xml
index 2901f462dee..2901f462dee 100644
--- a/nixos/doc/manual/installation/installation.xml
+++ b/nixpkgs/nixos/doc/manual/installation/installation.xml
diff --git a/nixos/doc/manual/installation/installing-behind-a-proxy.xml b/nixpkgs/nixos/doc/manual/installation/installing-behind-a-proxy.xml
index 8f9baff44b5..8f9baff44b5 100644
--- a/nixos/doc/manual/installation/installing-behind-a-proxy.xml
+++ b/nixpkgs/nixos/doc/manual/installation/installing-behind-a-proxy.xml
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml
index 8ed45899fd7..8ed45899fd7 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml
diff --git a/nixos/doc/manual/installation/installing-pxe.xml b/nixpkgs/nixos/doc/manual/installation/installing-pxe.xml
index 94199e5e028..94199e5e028 100644
--- a/nixos/doc/manual/installation/installing-pxe.xml
+++ b/nixpkgs/nixos/doc/manual/installation/installing-pxe.xml
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixpkgs/nixos/doc/manual/installation/installing-usb.xml
index 83598635acc..83598635acc 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixpkgs/nixos/doc/manual/installation/installing-usb.xml
diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml
index 0ba909fa953..0ba909fa953 100644
--- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml
+++ b/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml
diff --git a/nixos/doc/manual/installation/installing.xml b/nixpkgs/nixos/doc/manual/installation/installing.xml
index 4041b4ad163..4041b4ad163 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixpkgs/nixos/doc/manual/installation/installing.xml
diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixpkgs/nixos/doc/manual/installation/obtaining.xml
index 56af5c0e25a..56af5c0e25a 100644
--- a/nixos/doc/manual/installation/obtaining.xml
+++ b/nixpkgs/nixos/doc/manual/installation/obtaining.xml
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixpkgs/nixos/doc/manual/installation/upgrading.xml
index 8d3f35b7c26..8d3f35b7c26 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixpkgs/nixos/doc/manual/installation/upgrading.xml
diff --git a/nixos/doc/manual/man-configuration.xml b/nixpkgs/nixos/doc/manual/man-configuration.xml
index ddb1408fdcf..ddb1408fdcf 100644
--- a/nixos/doc/manual/man-configuration.xml
+++ b/nixpkgs/nixos/doc/manual/man-configuration.xml
diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixpkgs/nixos/doc/manual/man-nixos-build-vms.xml
index d114261f53b..d114261f53b 100644
--- a/nixos/doc/manual/man-nixos-build-vms.xml
+++ b/nixpkgs/nixos/doc/manual/man-nixos-build-vms.xml
diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixpkgs/nixos/doc/manual/man-nixos-enter.xml
index fe560d3efdd..fe560d3efdd 100644
--- a/nixos/doc/manual/man-nixos-enter.xml
+++ b/nixpkgs/nixos/doc/manual/man-nixos-enter.xml
diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixpkgs/nixos/doc/manual/man-nixos-generate-config.xml
index 9ac3b918ff6..9ac3b918ff6 100644
--- a/nixos/doc/manual/man-nixos-generate-config.xml
+++ b/nixpkgs/nixos/doc/manual/man-nixos-generate-config.xml
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixpkgs/nixos/doc/manual/man-nixos-install.xml
index 9255ce763ef..9255ce763ef 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixpkgs/nixos/doc/manual/man-nixos-install.xml
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixpkgs/nixos/doc/manual/man-nixos-option.xml
index b82f3125609..b82f3125609 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixpkgs/nixos/doc/manual/man-nixos-option.xml
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml
index 495dbc8859b..495dbc8859b 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml
diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixpkgs/nixos/doc/manual/man-nixos-version.xml
index e9ad8bddcac..e9ad8bddcac 100644
--- a/nixos/doc/manual/man-nixos-version.xml
+++ b/nixpkgs/nixos/doc/manual/man-nixos-version.xml
diff --git a/nixos/doc/manual/man-pages.xml b/nixpkgs/nixos/doc/manual/man-pages.xml
index 49acfe7330b..49acfe7330b 100644
--- a/nixos/doc/manual/man-pages.xml
+++ b/nixpkgs/nixos/doc/manual/man-pages.xml
diff --git a/nixos/doc/manual/manual.xml b/nixpkgs/nixos/doc/manual/manual.xml
index 18a67a2dd94..18a67a2dd94 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixpkgs/nixos/doc/manual/manual.xml
diff --git a/nixos/doc/manual/preface.xml b/nixpkgs/nixos/doc/manual/preface.xml
index 6ac9ae7e786..6ac9ae7e786 100644
--- a/nixos/doc/manual/preface.xml
+++ b/nixpkgs/nixos/doc/manual/preface.xml
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml
index 444862c5739..444862c5739 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml
diff --git a/nixos/doc/manual/release-notes/rl-1310.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1310.xml
index 248bab70c36..248bab70c36 100644
--- a/nixos/doc/manual/release-notes/rl-1310.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1310.xml
diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1404.xml
index 8d8cea4303a..8d8cea4303a 100644
--- a/nixos/doc/manual/release-notes/rl-1404.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1404.xml
diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1412.xml
index 139f61c2a55..139f61c2a55 100644
--- a/nixos/doc/manual/release-notes/rl-1412.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1412.xml
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1509.xml
index 5c4d9970178..5c4d9970178 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1509.xml
diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1603.xml
index 9b512c4b1e5..9b512c4b1e5 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1603.xml
diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1609.xml
index 4a2343edc97..4a2343edc97 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1609.xml
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1703.xml
index 14b31b232e9..14b31b232e9 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1703.xml
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1709.xml
index 795c51d2923..795c51d2923 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1709.xml
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1803.xml
index c14679eea07..c14679eea07 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1803.xml
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1809.xml
index 3f10b26223d..3f10b26223d 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1809.xml
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml
index 8ff1681d3b4..8ff1681d3b4 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml
index 4102fe206e1..4102fe206e1 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml
index 13981c0853d..13981c0853d 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml
diff --git a/nixos/doc/manual/shell.nix b/nixpkgs/nixos/doc/manual/shell.nix
index cc3609d750e..cc3609d750e 100644
--- a/nixos/doc/manual/shell.nix
+++ b/nixpkgs/nixos/doc/manual/shell.nix
diff --git a/nixos/doc/varlistentry-fixer.rb b/nixpkgs/nixos/doc/varlistentry-fixer.rb
index 6c7cc1e6439..6c7cc1e6439 100755
--- a/nixos/doc/varlistentry-fixer.rb
+++ b/nixpkgs/nixos/doc/varlistentry-fixer.rb
diff --git a/nixos/doc/xmlformat.conf b/nixpkgs/nixos/doc/xmlformat.conf
index c3f39c7fd81..c3f39c7fd81 100644
--- a/nixos/doc/xmlformat.conf
+++ b/nixpkgs/nixos/doc/xmlformat.conf
diff --git a/nixos/lib/build-vms.nix b/nixpkgs/nixos/lib/build-vms.nix
index 1bad63b9194..1bad63b9194 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixpkgs/nixos/lib/build-vms.nix
diff --git a/nixos/lib/eval-config.nix b/nixpkgs/nixos/lib/eval-config.nix
index 77490ca3762..77490ca3762 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixpkgs/nixos/lib/eval-config.nix
diff --git a/nixos/lib/from-env.nix b/nixpkgs/nixos/lib/from-env.nix
index 6bd71e40e9a..6bd71e40e9a 100644
--- a/nixos/lib/from-env.nix
+++ b/nixpkgs/nixos/lib/from-env.nix
diff --git a/nixos/lib/make-channel.nix b/nixpkgs/nixos/lib/make-channel.nix
index 9b920b989fc..9b920b989fc 100644
--- a/nixos/lib/make-channel.nix
+++ b/nixpkgs/nixos/lib/make-channel.nix
diff --git a/nixos/lib/make-disk-image.nix b/nixpkgs/nixos/lib/make-disk-image.nix
index 5e86ea479d5..5e86ea479d5 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixpkgs/nixos/lib/make-disk-image.nix
diff --git a/nixos/lib/make-ext4-fs.nix b/nixpkgs/nixos/lib/make-ext4-fs.nix
index f46d3990c06..f46d3990c06 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixpkgs/nixos/lib/make-ext4-fs.nix
diff --git a/nixos/lib/make-iso9660-image.nix b/nixpkgs/nixos/lib/make-iso9660-image.nix
index 0f3f2b5b523..0f3f2b5b523 100644
--- a/nixos/lib/make-iso9660-image.nix
+++ b/nixpkgs/nixos/lib/make-iso9660-image.nix
diff --git a/nixos/lib/make-iso9660-image.sh b/nixpkgs/nixos/lib/make-iso9660-image.sh
index b7b1ab52a63..b7b1ab52a63 100644
--- a/nixos/lib/make-iso9660-image.sh
+++ b/nixpkgs/nixos/lib/make-iso9660-image.sh
diff --git a/nixos/lib/make-options-doc/default.nix b/nixpkgs/nixos/lib/make-options-doc/default.nix
index eee8f612410..eee8f612410 100644
--- a/nixos/lib/make-options-doc/default.nix
+++ b/nixpkgs/nixos/lib/make-options-doc/default.nix
diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl
index 72ac89d4ff6..72ac89d4ff6 100644
--- a/nixos/lib/make-options-doc/options-to-docbook.xsl
+++ b/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl
diff --git a/nixos/lib/make-options-doc/postprocess-option-descriptions.xsl b/nixpkgs/nixos/lib/make-options-doc/postprocess-option-descriptions.xsl
index 1201c7612c2..1201c7612c2 100644
--- a/nixos/lib/make-options-doc/postprocess-option-descriptions.xsl
+++ b/nixpkgs/nixos/lib/make-options-doc/postprocess-option-descriptions.xsl
diff --git a/nixos/lib/make-squashfs.nix b/nixpkgs/nixos/lib/make-squashfs.nix
index ee76c9c5bf2..ee76c9c5bf2 100644
--- a/nixos/lib/make-squashfs.nix
+++ b/nixpkgs/nixos/lib/make-squashfs.nix
diff --git a/nixos/lib/make-system-tarball.nix b/nixpkgs/nixos/lib/make-system-tarball.nix
index dee91a6ce3f..dee91a6ce3f 100644
--- a/nixos/lib/make-system-tarball.nix
+++ b/nixpkgs/nixos/lib/make-system-tarball.nix
diff --git a/nixos/lib/make-system-tarball.sh b/nixpkgs/nixos/lib/make-system-tarball.sh
index 1a0017a1799..1a0017a1799 100644
--- a/nixos/lib/make-system-tarball.sh
+++ b/nixpkgs/nixos/lib/make-system-tarball.sh
diff --git a/nixos/lib/qemu-flags.nix b/nixpkgs/nixos/lib/qemu-flags.nix
index 774f66b4804..774f66b4804 100644
--- a/nixos/lib/qemu-flags.nix
+++ b/nixpkgs/nixos/lib/qemu-flags.nix
diff --git a/nixos/lib/test-driver/Logger.pm b/nixpkgs/nixos/lib/test-driver/Logger.pm
index 080310ea34e..080310ea34e 100644
--- a/nixos/lib/test-driver/Logger.pm
+++ b/nixpkgs/nixos/lib/test-driver/Logger.pm
diff --git a/nixos/lib/test-driver/Machine.pm b/nixpkgs/nixos/lib/test-driver/Machine.pm
index 4d3d63cd2db..4d3d63cd2db 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixpkgs/nixos/lib/test-driver/Machine.pm
diff --git a/nixos/lib/test-driver/log2html.xsl b/nixpkgs/nixos/lib/test-driver/log2html.xsl
index 0485412b4c8..0485412b4c8 100644
--- a/nixos/lib/test-driver/log2html.xsl
+++ b/nixpkgs/nixos/lib/test-driver/log2html.xsl
diff --git a/nixos/lib/test-driver/logfile.css b/nixpkgs/nixos/lib/test-driver/logfile.css
index a54d8504a86..a54d8504a86 100644
--- a/nixos/lib/test-driver/logfile.css
+++ b/nixpkgs/nixos/lib/test-driver/logfile.css
diff --git a/nixos/lib/test-driver/test-driver.pl b/nixpkgs/nixos/lib/test-driver/test-driver.pl
index a3354fb0e1e..a3354fb0e1e 100644
--- a/nixos/lib/test-driver/test-driver.pl
+++ b/nixpkgs/nixos/lib/test-driver/test-driver.pl
diff --git a/nixos/lib/test-driver/test-driver.py b/nixpkgs/nixos/lib/test-driver/test-driver.py
index 75f80df53f2..75f80df53f2 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixpkgs/nixos/lib/test-driver/test-driver.py
diff --git a/nixos/lib/test-driver/treebits.js b/nixpkgs/nixos/lib/test-driver/treebits.js
index 9754093dfd0..9754093dfd0 100644
--- a/nixos/lib/test-driver/treebits.js
+++ b/nixpkgs/nixos/lib/test-driver/treebits.js
diff --git a/nixos/lib/testing-python.nix b/nixpkgs/nixos/lib/testing-python.nix
index a7f6d792651..a7f6d792651 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixpkgs/nixos/lib/testing-python.nix
diff --git a/nixos/lib/testing.nix b/nixpkgs/nixos/lib/testing.nix
index ae8ecd6270c..ae8ecd6270c 100644
--- a/nixos/lib/testing.nix
+++ b/nixpkgs/nixos/lib/testing.nix
diff --git a/nixos/lib/testing/jquery-ui.nix b/nixpkgs/nixos/lib/testing/jquery-ui.nix
index abd59da2d28..abd59da2d28 100644
--- a/nixos/lib/testing/jquery-ui.nix
+++ b/nixpkgs/nixos/lib/testing/jquery-ui.nix
diff --git a/nixos/lib/testing/jquery.nix b/nixpkgs/nixos/lib/testing/jquery.nix
index e272f66a576..e272f66a576 100644
--- a/nixos/lib/testing/jquery.nix
+++ b/nixpkgs/nixos/lib/testing/jquery.nix
diff --git a/nixos/lib/utils.nix b/nixpkgs/nixos/lib/utils.nix
index a522834e429..a522834e429 100644
--- a/nixos/lib/utils.nix
+++ b/nixpkgs/nixos/lib/utils.nix
diff --git a/nixos/maintainers/option-usages.nix b/nixpkgs/nixos/maintainers/option-usages.nix
index 11247666ecd..11247666ecd 100644
--- a/nixos/maintainers/option-usages.nix
+++ b/nixpkgs/nixos/maintainers/option-usages.nix
diff --git a/nixos/maintainers/scripts/azure/create-azure.sh b/nixpkgs/nixos/maintainers/scripts/azure/create-azure.sh
index 0558f8dfffc..0558f8dfffc 100755
--- a/nixos/maintainers/scripts/azure/create-azure.sh
+++ b/nixpkgs/nixos/maintainers/scripts/azure/create-azure.sh
diff --git a/nixos/maintainers/scripts/azure/upload-azure.sh b/nixpkgs/nixos/maintainers/scripts/azure/upload-azure.sh
index 2ea35d1d4c3..2ea35d1d4c3 100755
--- a/nixos/maintainers/scripts/azure/upload-azure.sh
+++ b/nixpkgs/nixos/maintainers/scripts/azure/upload-azure.sh
diff --git a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix b/nixpkgs/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix
index 37b46db059c..37b46db059c 100644
--- a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix
+++ b/nixpkgs/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix
index 31e15537179..31e15537179 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixpkgs/nixos/maintainers/scripts/ec2/create-amis.sh
index 5dc1c5aaed5..5dc1c5aaed5 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixpkgs/nixos/maintainers/scripts/ec2/create-amis.sh
diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixpkgs/nixos/maintainers/scripts/gce/create-gce.sh
index 77cc64e591e..77cc64e591e 100755
--- a/nixos/maintainers/scripts/gce/create-gce.sh
+++ b/nixpkgs/nixos/maintainers/scripts/gce/create-gce.sh
diff --git a/nixos/maintainers/scripts/openstack/openstack-image.nix b/nixpkgs/nixos/maintainers/scripts/openstack/openstack-image.nix
index 4c464f43f61..4c464f43f61 100644
--- a/nixos/maintainers/scripts/openstack/openstack-image.nix
+++ b/nixpkgs/nixos/maintainers/scripts/openstack/openstack-image.nix
diff --git a/nixos/modules/config/appstream.nix b/nixpkgs/nixos/modules/config/appstream.nix
index 483ac9c3cd7..483ac9c3cd7 100644
--- a/nixos/modules/config/appstream.nix
+++ b/nixpkgs/nixos/modules/config/appstream.nix
diff --git a/nixos/modules/config/console.nix b/nixpkgs/nixos/modules/config/console.nix
index f662ed62d31..f662ed62d31 100644
--- a/nixos/modules/config/console.nix
+++ b/nixpkgs/nixos/modules/config/console.nix
diff --git a/nixos/modules/config/debug-info.nix b/nixpkgs/nixos/modules/config/debug-info.nix
index 2942ae5905d..2942ae5905d 100644
--- a/nixos/modules/config/debug-info.nix
+++ b/nixpkgs/nixos/modules/config/debug-info.nix
diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixpkgs/nixos/modules/config/fonts/fontconfig-penultimate.nix
index 7e311a21acf..7e311a21acf 100644
--- a/nixos/modules/config/fonts/fontconfig-penultimate.nix
+++ b/nixpkgs/nixos/modules/config/fonts/fontconfig-penultimate.nix
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixpkgs/nixos/modules/config/fonts/fontconfig.nix
index 3bfa1893a8b..3bfa1893a8b 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixpkgs/nixos/modules/config/fonts/fontconfig.nix
diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixpkgs/nixos/modules/config/fonts/fontdir.nix
index cc70fbf8744..cc70fbf8744 100644
--- a/nixos/modules/config/fonts/fontdir.nix
+++ b/nixpkgs/nixos/modules/config/fonts/fontdir.nix
diff --git a/nixos/modules/config/fonts/fonts.nix b/nixpkgs/nixos/modules/config/fonts/fonts.nix
index b9bae44b2f9..b9bae44b2f9 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixpkgs/nixos/modules/config/fonts/fonts.nix
diff --git a/nixos/modules/config/fonts/ghostscript.nix b/nixpkgs/nixos/modules/config/fonts/ghostscript.nix
index 1c62a525de9..1c62a525de9 100644
--- a/nixos/modules/config/fonts/ghostscript.nix
+++ b/nixpkgs/nixos/modules/config/fonts/ghostscript.nix
diff --git a/nixos/modules/config/gnu.nix b/nixpkgs/nixos/modules/config/gnu.nix
index 93d13097019..93d13097019 100644
--- a/nixos/modules/config/gnu.nix
+++ b/nixpkgs/nixos/modules/config/gnu.nix
diff --git a/nixos/modules/config/gtk/gtk-icon-cache.nix b/nixpkgs/nixos/modules/config/gtk/gtk-icon-cache.nix
index 86a6bfb5af4..86a6bfb5af4 100644
--- a/nixos/modules/config/gtk/gtk-icon-cache.nix
+++ b/nixpkgs/nixos/modules/config/gtk/gtk-icon-cache.nix
diff --git a/nixos/modules/config/i18n.nix b/nixpkgs/nixos/modules/config/i18n.nix
index cc2ddda9d32..cc2ddda9d32 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixpkgs/nixos/modules/config/i18n.nix
diff --git a/nixos/modules/config/iproute2.nix b/nixpkgs/nixos/modules/config/iproute2.nix
index a1d9ebcec66..a1d9ebcec66 100644
--- a/nixos/modules/config/iproute2.nix
+++ b/nixpkgs/nixos/modules/config/iproute2.nix
diff --git a/nixos/modules/config/krb5/default.nix b/nixpkgs/nixos/modules/config/krb5/default.nix
index ff16ffcf9c6..ff16ffcf9c6 100644
--- a/nixos/modules/config/krb5/default.nix
+++ b/nixpkgs/nixos/modules/config/krb5/default.nix
diff --git a/nixos/modules/config/ldap.nix b/nixpkgs/nixos/modules/config/ldap.nix
index 9c8e9d14937..9c8e9d14937 100644
--- a/nixos/modules/config/ldap.nix
+++ b/nixpkgs/nixos/modules/config/ldap.nix
diff --git a/nixos/modules/config/locale.nix b/nixpkgs/nixos/modules/config/locale.nix
index 6f056588187..6f056588187 100644
--- a/nixos/modules/config/locale.nix
+++ b/nixpkgs/nixos/modules/config/locale.nix
diff --git a/nixos/modules/config/malloc.nix b/nixpkgs/nixos/modules/config/malloc.nix
index 31a659ee83f..31a659ee83f 100644
--- a/nixos/modules/config/malloc.nix
+++ b/nixpkgs/nixos/modules/config/malloc.nix
diff --git a/nixos/modules/config/networking.nix b/nixpkgs/nixos/modules/config/networking.nix
index 81427bb8ee6..81427bb8ee6 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixpkgs/nixos/modules/config/networking.nix
diff --git a/nixos/modules/config/no-x-libs.nix b/nixpkgs/nixos/modules/config/no-x-libs.nix
index 873b8073fed..873b8073fed 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixpkgs/nixos/modules/config/no-x-libs.nix
diff --git a/nixos/modules/config/nsswitch.nix b/nixpkgs/nixos/modules/config/nsswitch.nix
index 13277fe56e4..13277fe56e4 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixpkgs/nixos/modules/config/nsswitch.nix
diff --git a/nixos/modules/config/power-management.nix b/nixpkgs/nixos/modules/config/power-management.nix
index 64cdf50f141..64cdf50f141 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixpkgs/nixos/modules/config/power-management.nix
diff --git a/nixos/modules/config/pulseaudio.nix b/nixpkgs/nixos/modules/config/pulseaudio.nix
index 048bbb30c73..048bbb30c73 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixpkgs/nixos/modules/config/pulseaudio.nix
diff --git a/nixos/modules/config/qt5.nix b/nixpkgs/nixos/modules/config/qt5.nix
index d9dec74f155..d9dec74f155 100644
--- a/nixos/modules/config/qt5.nix
+++ b/nixpkgs/nixos/modules/config/qt5.nix
diff --git a/nixos/modules/config/resolvconf.nix b/nixpkgs/nixos/modules/config/resolvconf.nix
index 7d2f252a888..7d2f252a888 100644
--- a/nixos/modules/config/resolvconf.nix
+++ b/nixpkgs/nixos/modules/config/resolvconf.nix
diff --git a/nixos/modules/config/shells-environment.nix b/nixpkgs/nixos/modules/config/shells-environment.nix
index a0a20228a74..a0a20228a74 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixpkgs/nixos/modules/config/shells-environment.nix
diff --git a/nixos/modules/config/swap.nix b/nixpkgs/nixos/modules/config/swap.nix
index d0fc0d4a3ea..d0fc0d4a3ea 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixpkgs/nixos/modules/config/swap.nix
diff --git a/nixos/modules/config/sysctl.nix b/nixpkgs/nixos/modules/config/sysctl.nix
index e59c7a32c28..e59c7a32c28 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixpkgs/nixos/modules/config/sysctl.nix
diff --git a/nixos/modules/config/system-environment.nix b/nixpkgs/nixos/modules/config/system-environment.nix
index 4888740ba3d..4888740ba3d 100644
--- a/nixos/modules/config/system-environment.nix
+++ b/nixpkgs/nixos/modules/config/system-environment.nix
diff --git a/nixos/modules/config/system-path.nix b/nixpkgs/nixos/modules/config/system-path.nix
index aba9bc0945b..aba9bc0945b 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixpkgs/nixos/modules/config/system-path.nix
diff --git a/nixos/modules/config/terminfo.nix b/nixpkgs/nixos/modules/config/terminfo.nix
index 1396640af67..1396640af67 100644
--- a/nixos/modules/config/terminfo.nix
+++ b/nixpkgs/nixos/modules/config/terminfo.nix
diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixpkgs/nixos/modules/config/unix-odbc-drivers.nix
index abc12a627d6..abc12a627d6 100644
--- a/nixos/modules/config/unix-odbc-drivers.nix
+++ b/nixpkgs/nixos/modules/config/unix-odbc-drivers.nix
diff --git a/nixos/modules/config/update-users-groups.pl b/nixpkgs/nixos/modules/config/update-users-groups.pl
index 15e448b787a..15e448b787a 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixpkgs/nixos/modules/config/update-users-groups.pl
diff --git a/nixos/modules/config/users-groups.nix b/nixpkgs/nixos/modules/config/users-groups.nix
index 141e43fec39..141e43fec39 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixpkgs/nixos/modules/config/users-groups.nix
diff --git a/nixos/modules/config/vte.nix b/nixpkgs/nixos/modules/config/vte.nix
index d4a8c926fef..d4a8c926fef 100644
--- a/nixos/modules/config/vte.nix
+++ b/nixpkgs/nixos/modules/config/vte.nix
diff --git a/nixos/modules/config/xdg/autostart.nix b/nixpkgs/nixos/modules/config/xdg/autostart.nix
index 0ee94fed818..0ee94fed818 100644
--- a/nixos/modules/config/xdg/autostart.nix
+++ b/nixpkgs/nixos/modules/config/xdg/autostart.nix
diff --git a/nixos/modules/config/xdg/icons.nix b/nixpkgs/nixos/modules/config/xdg/icons.nix
index 4677ce090b0..4677ce090b0 100644
--- a/nixos/modules/config/xdg/icons.nix
+++ b/nixpkgs/nixos/modules/config/xdg/icons.nix
diff --git a/nixos/modules/config/xdg/menus.nix b/nixpkgs/nixos/modules/config/xdg/menus.nix
index c172692df5d..c172692df5d 100644
--- a/nixos/modules/config/xdg/menus.nix
+++ b/nixpkgs/nixos/modules/config/xdg/menus.nix
diff --git a/nixos/modules/config/xdg/mime.nix b/nixpkgs/nixos/modules/config/xdg/mime.nix
index a5374c2b468..a5374c2b468 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixpkgs/nixos/modules/config/xdg/mime.nix
diff --git a/nixos/modules/config/xdg/portal.nix b/nixpkgs/nixos/modules/config/xdg/portal.nix
index 95fa8e05fa3..95fa8e05fa3 100644
--- a/nixos/modules/config/xdg/portal.nix
+++ b/nixpkgs/nixos/modules/config/xdg/portal.nix
diff --git a/nixos/modules/config/xdg/sounds.nix b/nixpkgs/nixos/modules/config/xdg/sounds.nix
index 14d6340fc33..14d6340fc33 100644
--- a/nixos/modules/config/xdg/sounds.nix
+++ b/nixpkgs/nixos/modules/config/xdg/sounds.nix
diff --git a/nixos/modules/config/zram.nix b/nixpkgs/nixos/modules/config/zram.nix
index 5d411c73a56..5d411c73a56 100644
--- a/nixos/modules/config/zram.nix
+++ b/nixpkgs/nixos/modules/config/zram.nix
diff --git a/nixos/modules/hardware/acpilight.nix b/nixpkgs/nixos/modules/hardware/acpilight.nix
index 34e8a222096..34e8a222096 100644
--- a/nixos/modules/hardware/acpilight.nix
+++ b/nixpkgs/nixos/modules/hardware/acpilight.nix
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixpkgs/nixos/modules/hardware/all-firmware.nix
index 16be8bcfdd7..16be8bcfdd7 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixpkgs/nixos/modules/hardware/all-firmware.nix
diff --git a/nixos/modules/hardware/bladeRF.nix b/nixpkgs/nixos/modules/hardware/bladeRF.nix
index 92544347714..92544347714 100644
--- a/nixos/modules/hardware/bladeRF.nix
+++ b/nixpkgs/nixos/modules/hardware/bladeRF.nix
diff --git a/nixos/modules/hardware/brightnessctl.nix b/nixpkgs/nixos/modules/hardware/brightnessctl.nix
index 2d54398d10d..2d54398d10d 100644
--- a/nixos/modules/hardware/brightnessctl.nix
+++ b/nixpkgs/nixos/modules/hardware/brightnessctl.nix
diff --git a/nixos/modules/hardware/brillo.nix b/nixpkgs/nixos/modules/hardware/brillo.nix
index e970c948099..e970c948099 100644
--- a/nixos/modules/hardware/brillo.nix
+++ b/nixpkgs/nixos/modules/hardware/brillo.nix
diff --git a/nixos/modules/hardware/ckb-next.nix b/nixpkgs/nixos/modules/hardware/ckb-next.nix
index fe0ca9f26d5..fe0ca9f26d5 100644
--- a/nixos/modules/hardware/ckb-next.nix
+++ b/nixpkgs/nixos/modules/hardware/ckb-next.nix
diff --git a/nixos/modules/hardware/cpu/amd-microcode.nix b/nixpkgs/nixos/modules/hardware/cpu/amd-microcode.nix
index 621c7066bfe..621c7066bfe 100644
--- a/nixos/modules/hardware/cpu/amd-microcode.nix
+++ b/nixpkgs/nixos/modules/hardware/cpu/amd-microcode.nix
diff --git a/nixos/modules/hardware/cpu/intel-microcode.nix b/nixpkgs/nixos/modules/hardware/cpu/intel-microcode.nix
index acce565fd80..acce565fd80 100644
--- a/nixos/modules/hardware/cpu/intel-microcode.nix
+++ b/nixpkgs/nixos/modules/hardware/cpu/intel-microcode.nix
diff --git a/nixos/modules/hardware/device-tree.nix b/nixpkgs/nixos/modules/hardware/device-tree.nix
index f57502d4c83..f57502d4c83 100644
--- a/nixos/modules/hardware/device-tree.nix
+++ b/nixpkgs/nixos/modules/hardware/device-tree.nix
diff --git a/nixos/modules/hardware/digitalbitbox.nix b/nixpkgs/nixos/modules/hardware/digitalbitbox.nix
index 0888cfbef2a..0888cfbef2a 100644
--- a/nixos/modules/hardware/digitalbitbox.nix
+++ b/nixpkgs/nixos/modules/hardware/digitalbitbox.nix
diff --git a/nixos/modules/hardware/ksm.nix b/nixpkgs/nixos/modules/hardware/ksm.nix
index 0938dbdc110..0938dbdc110 100644
--- a/nixos/modules/hardware/ksm.nix
+++ b/nixpkgs/nixos/modules/hardware/ksm.nix
diff --git a/nixos/modules/hardware/ledger.nix b/nixpkgs/nixos/modules/hardware/ledger.nix
index 41abe74315a..41abe74315a 100644
--- a/nixos/modules/hardware/ledger.nix
+++ b/nixpkgs/nixos/modules/hardware/ledger.nix
diff --git a/nixos/modules/hardware/logitech.nix b/nixpkgs/nixos/modules/hardware/logitech.nix
index d6f43bdddcc..d6f43bdddcc 100644
--- a/nixos/modules/hardware/logitech.nix
+++ b/nixpkgs/nixos/modules/hardware/logitech.nix
diff --git a/nixos/modules/hardware/mcelog.nix b/nixpkgs/nixos/modules/hardware/mcelog.nix
index 13ad238870c..13ad238870c 100644
--- a/nixos/modules/hardware/mcelog.nix
+++ b/nixpkgs/nixos/modules/hardware/mcelog.nix
diff --git a/nixos/modules/hardware/network/b43.nix b/nixpkgs/nixos/modules/hardware/network/b43.nix
index e63f2d04d1a..e63f2d04d1a 100644
--- a/nixos/modules/hardware/network/b43.nix
+++ b/nixpkgs/nixos/modules/hardware/network/b43.nix
diff --git a/nixos/modules/hardware/network/broadcom-43xx.nix b/nixpkgs/nixos/modules/hardware/network/broadcom-43xx.nix
index c92b7a0509d..c92b7a0509d 100644
--- a/nixos/modules/hardware/network/broadcom-43xx.nix
+++ b/nixpkgs/nixos/modules/hardware/network/broadcom-43xx.nix
diff --git a/nixos/modules/hardware/network/intel-2200bg.nix b/nixpkgs/nixos/modules/hardware/network/intel-2200bg.nix
index 17b973474c9..17b973474c9 100644
--- a/nixos/modules/hardware/network/intel-2200bg.nix
+++ b/nixpkgs/nixos/modules/hardware/network/intel-2200bg.nix
diff --git a/nixos/modules/hardware/network/smc-2632w/default.nix b/nixpkgs/nixos/modules/hardware/network/smc-2632w/default.nix
index b00286464f3..b00286464f3 100644
--- a/nixos/modules/hardware/network/smc-2632w/default.nix
+++ b/nixpkgs/nixos/modules/hardware/network/smc-2632w/default.nix
diff --git a/nixos/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis b/nixpkgs/nixos/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
index 5f13088c373..5f13088c373 100644
--- a/nixos/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
+++ b/nixpkgs/nixos/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
diff --git a/nixos/modules/hardware/network/zydas-zd1211.nix b/nixpkgs/nixos/modules/hardware/network/zydas-zd1211.nix
index 5dd7f30ed82..5dd7f30ed82 100644
--- a/nixos/modules/hardware/network/zydas-zd1211.nix
+++ b/nixpkgs/nixos/modules/hardware/network/zydas-zd1211.nix
diff --git a/nixos/modules/hardware/nitrokey.nix b/nixpkgs/nixos/modules/hardware/nitrokey.nix
index 02e4c3f46f8..02e4c3f46f8 100644
--- a/nixos/modules/hardware/nitrokey.nix
+++ b/nixpkgs/nixos/modules/hardware/nitrokey.nix
diff --git a/nixos/modules/hardware/onlykey.nix b/nixpkgs/nixos/modules/hardware/onlykey.nix
index b6820fe0191..b6820fe0191 100644
--- a/nixos/modules/hardware/onlykey.nix
+++ b/nixpkgs/nixos/modules/hardware/onlykey.nix
diff --git a/nixos/modules/hardware/onlykey.udev b/nixpkgs/nixos/modules/hardware/onlykey.udev
index 6583530e568..6583530e568 100644
--- a/nixos/modules/hardware/onlykey.udev
+++ b/nixpkgs/nixos/modules/hardware/onlykey.udev
diff --git a/nixos/modules/hardware/opengl.nix b/nixpkgs/nixos/modules/hardware/opengl.nix
index 28cddea8b79..28cddea8b79 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixpkgs/nixos/modules/hardware/opengl.nix
diff --git a/nixos/modules/hardware/openrazer.nix b/nixpkgs/nixos/modules/hardware/openrazer.nix
index 883db7f2f4f..883db7f2f4f 100644
--- a/nixos/modules/hardware/openrazer.nix
+++ b/nixpkgs/nixos/modules/hardware/openrazer.nix
diff --git a/nixos/modules/hardware/pcmcia.nix b/nixpkgs/nixos/modules/hardware/pcmcia.nix
index d7d002ae6c8..d7d002ae6c8 100644
--- a/nixos/modules/hardware/pcmcia.nix
+++ b/nixpkgs/nixos/modules/hardware/pcmcia.nix
diff --git a/nixos/modules/hardware/printers.nix b/nixpkgs/nixos/modules/hardware/printers.nix
index 56b91933477..56b91933477 100644
--- a/nixos/modules/hardware/printers.nix
+++ b/nixpkgs/nixos/modules/hardware/printers.nix
diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixpkgs/nixos/modules/hardware/raid/hpsa.nix
index 4d7af138292..4d7af138292 100644
--- a/nixos/modules/hardware/raid/hpsa.nix
+++ b/nixpkgs/nixos/modules/hardware/raid/hpsa.nix
diff --git a/nixos/modules/hardware/sensor/iio.nix b/nixpkgs/nixos/modules/hardware/sensor/iio.nix
index a8bc1880002..a8bc1880002 100644
--- a/nixos/modules/hardware/sensor/iio.nix
+++ b/nixpkgs/nixos/modules/hardware/sensor/iio.nix
diff --git a/nixos/modules/hardware/steam-hardware.nix b/nixpkgs/nixos/modules/hardware/steam-hardware.nix
index 6218c9ffbb9..6218c9ffbb9 100644
--- a/nixos/modules/hardware/steam-hardware.nix
+++ b/nixpkgs/nixos/modules/hardware/steam-hardware.nix
diff --git a/nixos/modules/hardware/tuxedo-keyboard.nix b/nixpkgs/nixos/modules/hardware/tuxedo-keyboard.nix
index 898eed24493..898eed24493 100644
--- a/nixos/modules/hardware/tuxedo-keyboard.nix
+++ b/nixpkgs/nixos/modules/hardware/tuxedo-keyboard.nix
diff --git a/nixos/modules/hardware/usb-wwan.nix b/nixpkgs/nixos/modules/hardware/usb-wwan.nix
index 679a6c6497c..679a6c6497c 100644
--- a/nixos/modules/hardware/usb-wwan.nix
+++ b/nixpkgs/nixos/modules/hardware/usb-wwan.nix
diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixpkgs/nixos/modules/hardware/video/amdgpu-pro.nix
index 8e91e9d2baa..8e91e9d2baa 100644
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixpkgs/nixos/modules/hardware/video/amdgpu-pro.nix
diff --git a/nixos/modules/hardware/video/amdgpu.nix b/nixpkgs/nixos/modules/hardware/video/amdgpu.nix
index 42fc8fa362d..42fc8fa362d 100644
--- a/nixos/modules/hardware/video/amdgpu.nix
+++ b/nixpkgs/nixos/modules/hardware/video/amdgpu.nix
diff --git a/nixos/modules/hardware/video/ati.nix b/nixpkgs/nixos/modules/hardware/video/ati.nix
index 0aab7bd6b92..0aab7bd6b92 100644
--- a/nixos/modules/hardware/video/ati.nix
+++ b/nixpkgs/nixos/modules/hardware/video/ati.nix
diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixpkgs/nixos/modules/hardware/video/bumblebee.nix
index 2278c7b4061..2278c7b4061 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixpkgs/nixos/modules/hardware/video/bumblebee.nix
diff --git a/nixos/modules/hardware/video/capture/mwprocapture.nix b/nixpkgs/nixos/modules/hardware/video/capture/mwprocapture.nix
index 61bab533eda..61bab533eda 100644
--- a/nixos/modules/hardware/video/capture/mwprocapture.nix
+++ b/nixpkgs/nixos/modules/hardware/video/capture/mwprocapture.nix
diff --git a/nixos/modules/hardware/video/displaylink.nix b/nixpkgs/nixos/modules/hardware/video/displaylink.nix
index 912f53da836..912f53da836 100644
--- a/nixos/modules/hardware/video/displaylink.nix
+++ b/nixpkgs/nixos/modules/hardware/video/displaylink.nix
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixpkgs/nixos/modules/hardware/video/nvidia.nix
index 1794bb4b433..1794bb4b433 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixpkgs/nixos/modules/hardware/video/nvidia.nix
diff --git a/nixos/modules/hardware/video/radeon.nix b/nixpkgs/nixos/modules/hardware/video/radeon.nix
index c92b7a0509d..c92b7a0509d 100644
--- a/nixos/modules/hardware/video/radeon.nix
+++ b/nixpkgs/nixos/modules/hardware/video/radeon.nix
diff --git a/nixos/modules/hardware/video/uvcvideo/default.nix b/nixpkgs/nixos/modules/hardware/video/uvcvideo/default.nix
index 7e3e94fdf2b..7e3e94fdf2b 100644
--- a/nixos/modules/hardware/video/uvcvideo/default.nix
+++ b/nixpkgs/nixos/modules/hardware/video/uvcvideo/default.nix
diff --git a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix b/nixpkgs/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
index a808429c999..a808429c999 100644
--- a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
+++ b/nixpkgs/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixpkgs/nixos/modules/hardware/video/webcam/facetimehd.nix
index d311f600c31..d311f600c31 100644
--- a/nixos/modules/hardware/video/webcam/facetimehd.nix
+++ b/nixpkgs/nixos/modules/hardware/video/webcam/facetimehd.nix
diff --git a/nixos/modules/i18n/input-method/default.nix b/nixpkgs/nixos/modules/i18n/input-method/default.nix
index 9548a249efa..9548a249efa 100644
--- a/nixos/modules/i18n/input-method/default.nix
+++ b/nixpkgs/nixos/modules/i18n/input-method/default.nix
diff --git a/nixos/modules/i18n/input-method/default.xml b/nixpkgs/nixos/modules/i18n/input-method/default.xml
index 117482fb0d5..117482fb0d5 100644
--- a/nixos/modules/i18n/input-method/default.xml
+++ b/nixpkgs/nixos/modules/i18n/input-method/default.xml
diff --git a/nixos/modules/i18n/input-method/fcitx.nix b/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix
index 440f13b4152..440f13b4152 100644
--- a/nixos/modules/i18n/input-method/fcitx.nix
+++ b/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix
diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixpkgs/nixos/modules/i18n/input-method/ibus.nix
index a3d97619fc4..a3d97619fc4 100644
--- a/nixos/modules/i18n/input-method/ibus.nix
+++ b/nixpkgs/nixos/modules/i18n/input-method/ibus.nix
diff --git a/nixos/modules/i18n/input-method/nabi.nix b/nixpkgs/nixos/modules/i18n/input-method/nabi.nix
index 87620ae4e7b..87620ae4e7b 100644
--- a/nixos/modules/i18n/input-method/nabi.nix
+++ b/nixpkgs/nixos/modules/i18n/input-method/nabi.nix
diff --git a/nixos/modules/i18n/input-method/uim.nix b/nixpkgs/nixos/modules/i18n/input-method/uim.nix
index 7ad68bf851f..7ad68bf851f 100644
--- a/nixos/modules/i18n/input-method/uim.nix
+++ b/nixpkgs/nixos/modules/i18n/input-method/uim.nix
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixpkgs/nixos/modules/installer/cd-dvd/channel.nix
index ab5e7c0645f..ab5e7c0645f 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/channel.nix
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 24070a78694..24070a78694 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-base.nix
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
index e0b558dcb0d..e0b558dcb0d 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
index 23c3426bff0..23c3426bff0 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix
index d98325a99ac..d98325a99ac 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
index e00d3f7535b..e00d3f7535b 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
index 3911a2b01b1..3911a2b01b1 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
index bcdbffdc20b..bcdbffdc20b 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix
index 11319e5f4f8..11319e5f4f8 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
index 2882fbcc730..2882fbcc730 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index 2d34406a032..2d34406a032 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index 651d1a36dc1..651d1a36dc1 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index ba4127eaa0e..ba4127eaa0e 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
index c545a1e7e24..c545a1e7e24 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix
index 901c60befb6..901c60befb6 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 6d4ba96dba0..6d4ba96dba0 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt
index 84252f292c5..84252f292c5 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
index f2af7dcde3d..f2af7dcde3d 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 8408f56f94f..8408f56f94f 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball.nix
index 58098c45535..58098c45535 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball.nix
+++ b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball.nix
diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixpkgs/nixos/modules/installer/netboot/netboot-base.nix
index 7e66a49c739..7e66a49c739 100644
--- a/nixos/modules/installer/netboot/netboot-base.nix
+++ b/nixpkgs/nixos/modules/installer/netboot/netboot-base.nix
diff --git a/nixos/modules/installer/netboot/netboot-minimal.nix b/nixpkgs/nixos/modules/installer/netboot/netboot-minimal.nix
index 1563501a7e0..1563501a7e0 100644
--- a/nixos/modules/installer/netboot/netboot-minimal.nix
+++ b/nixpkgs/nixos/modules/installer/netboot/netboot-minimal.nix
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixpkgs/nixos/modules/installer/netboot/netboot.nix
index 5146858cccf..5146858cccf 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixpkgs/nixos/modules/installer/netboot/netboot.nix
diff --git a/nixos/modules/installer/scan/detected.nix b/nixpkgs/nixos/modules/installer/scan/detected.nix
index 5c5fba56f51..5c5fba56f51 100644
--- a/nixos/modules/installer/scan/detected.nix
+++ b/nixpkgs/nixos/modules/installer/scan/detected.nix
diff --git a/nixos/modules/installer/scan/not-detected.nix b/nixpkgs/nixos/modules/installer/scan/not-detected.nix
index baa068c08db..baa068c08db 100644
--- a/nixos/modules/installer/scan/not-detected.nix
+++ b/nixpkgs/nixos/modules/installer/scan/not-detected.nix
diff --git a/nixos/modules/installer/tools/get-version-suffix b/nixpkgs/nixos/modules/installer/tools/get-version-suffix
index b8972cd57d2..b8972cd57d2 100644
--- a/nixos/modules/installer/tools/get-version-suffix
+++ b/nixpkgs/nixos/modules/installer/tools/get-version-suffix
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix
index c2f2578733b..c2f2578733b 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix
diff --git a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
index c1028a0ad7e..c1028a0ad7e 100644
--- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
diff --git a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index 25106733087..25106733087 100644
--- a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixpkgs/nixos/modules/installer/tools/nixos-enter.sh
index 4680cd8ae95..4680cd8ae95 100644
--- a/nixos/modules/installer/tools/nixos-enter.sh
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-enter.sh
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl
index 629c56814a1..629c56814a1 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixpkgs/nixos/modules/installer/tools/nixos-install.sh
index a3ff3fe2c0c..a3ff3fe2c0c 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-install.sh
diff --git a/nixos/modules/installer/tools/nixos-option/CMakeLists.txt b/nixpkgs/nixos/modules/installer/tools/nixos-option/CMakeLists.txt
index e5834598c4f..e5834598c4f 100644
--- a/nixos/modules/installer/tools/nixos-option/CMakeLists.txt
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-option/CMakeLists.txt
diff --git a/nixos/modules/installer/tools/nixos-option/default.nix b/nixpkgs/nixos/modules/installer/tools/nixos-option/default.nix
index 753fd92c7bb..753fd92c7bb 100644
--- a/nixos/modules/installer/tools/nixos-option/default.nix
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-option/default.nix
diff --git a/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.cc b/nixpkgs/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.cc
index 875c07da639..875c07da639 100644
--- a/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.cc
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.cc
diff --git a/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.hh b/nixpkgs/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.hh
index 2274e9a0f85..2274e9a0f85 100644
--- a/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.hh
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.hh
diff --git a/nixos/modules/installer/tools/nixos-option/nixos-option.cc b/nixpkgs/nixos/modules/installer/tools/nixos-option/nixos-option.cc
index 9b92dc829cd..9b92dc829cd 100644
--- a/nixos/modules/installer/tools/nixos-option/nixos-option.cc
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-option/nixos-option.cc
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixpkgs/nixos/modules/installer/tools/nixos-rebuild.sh
index 61b4af11027..61b4af11027 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-rebuild.sh
diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixpkgs/nixos/modules/installer/tools/nixos-version.sh
index 190c49a33ec..190c49a33ec 100644
--- a/nixos/modules/installer/tools/nixos-version.sh
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-version.sh
diff --git a/nixos/modules/installer/tools/tools.nix b/nixpkgs/nixos/modules/installer/tools/tools.nix
index 5df9c23e6b6..5df9c23e6b6 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixpkgs/nixos/modules/installer/tools/tools.nix
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixpkgs/nixos/modules/installer/virtualbox-demo.nix
index af3e1aecca7..af3e1aecca7 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixpkgs/nixos/modules/installer/virtualbox-demo.nix
diff --git a/nixos/modules/misc/assertions.nix b/nixpkgs/nixos/modules/misc/assertions.nix
index 550b3ac97f6..550b3ac97f6 100644
--- a/nixos/modules/misc/assertions.nix
+++ b/nixpkgs/nixos/modules/misc/assertions.nix
diff --git a/nixos/modules/misc/crashdump.nix b/nixpkgs/nixos/modules/misc/crashdump.nix
index 3c47e79d051..3c47e79d051 100644
--- a/nixos/modules/misc/crashdump.nix
+++ b/nixpkgs/nixos/modules/misc/crashdump.nix
diff --git a/nixos/modules/misc/documentation.nix b/nixpkgs/nixos/modules/misc/documentation.nix
index d09afadd609..d09afadd609 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixpkgs/nixos/modules/misc/documentation.nix
diff --git a/nixos/modules/misc/extra-arguments.nix b/nixpkgs/nixos/modules/misc/extra-arguments.nix
index 8716e3d9fef..8716e3d9fef 100644
--- a/nixos/modules/misc/extra-arguments.nix
+++ b/nixpkgs/nixos/modules/misc/extra-arguments.nix
diff --git a/nixos/modules/misc/ids.nix b/nixpkgs/nixos/modules/misc/ids.nix
index bedd87a368e..bedd87a368e 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixpkgs/nixos/modules/misc/ids.nix
diff --git a/nixos/modules/misc/label.nix b/nixpkgs/nixos/modules/misc/label.nix
index 02b91555b3c..02b91555b3c 100644
--- a/nixos/modules/misc/label.nix
+++ b/nixpkgs/nixos/modules/misc/label.nix
diff --git a/nixos/modules/misc/lib.nix b/nixpkgs/nixos/modules/misc/lib.nix
index 121f396701e..121f396701e 100644
--- a/nixos/modules/misc/lib.nix
+++ b/nixpkgs/nixos/modules/misc/lib.nix
diff --git a/nixos/modules/misc/locate.nix b/nixpkgs/nixos/modules/misc/locate.nix
index 552535c253e..552535c253e 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixpkgs/nixos/modules/misc/locate.nix
diff --git a/nixos/modules/misc/meta.nix b/nixpkgs/nixos/modules/misc/meta.nix
index be3f4cbbcfe..be3f4cbbcfe 100644
--- a/nixos/modules/misc/meta.nix
+++ b/nixpkgs/nixos/modules/misc/meta.nix
diff --git a/nixos/modules/misc/nixops-autoluks.nix b/nixpkgs/nixos/modules/misc/nixops-autoluks.nix
index 20c143286af..20c143286af 100644
--- a/nixos/modules/misc/nixops-autoluks.nix
+++ b/nixpkgs/nixos/modules/misc/nixops-autoluks.nix
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixpkgs/nixos/modules/misc/nixpkgs.nix
index afb74581e23..afb74581e23 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixpkgs/nixos/modules/misc/nixpkgs.nix
diff --git a/nixos/modules/misc/passthru.nix b/nixpkgs/nixos/modules/misc/passthru.nix
index 4e99631fdd8..4e99631fdd8 100644
--- a/nixos/modules/misc/passthru.nix
+++ b/nixpkgs/nixos/modules/misc/passthru.nix
diff --git a/nixos/modules/misc/version.nix b/nixpkgs/nixos/modules/misc/version.nix
index 8a85035ceb7..8a85035ceb7 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixpkgs/nixos/modules/misc/version.nix
diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix
new file mode 100644
index 00000000000..29dbc39ac7e
--- /dev/null
+++ b/nixpkgs/nixos/modules/module-list.nix
@@ -0,0 +1,989 @@
+[
+  ./config/debug-info.nix
+  ./config/fonts/fontconfig.nix
+  ./config/fonts/fontconfig-penultimate.nix
+  ./config/fonts/fontdir.nix
+  ./config/fonts/fonts.nix
+  ./config/fonts/ghostscript.nix
+  ./config/xdg/autostart.nix
+  ./config/xdg/icons.nix
+  ./config/xdg/menus.nix
+  ./config/xdg/mime.nix
+  ./config/xdg/portal.nix
+  ./config/appstream.nix
+  ./config/console.nix
+  ./config/xdg/sounds.nix
+  ./config/gtk/gtk-icon-cache.nix
+  ./config/gnu.nix
+  ./config/i18n.nix
+  ./config/iproute2.nix
+  ./config/krb5/default.nix
+  ./config/ldap.nix
+  ./config/locale.nix
+  ./config/malloc.nix
+  ./config/networking.nix
+  ./config/no-x-libs.nix
+  ./config/nsswitch.nix
+  ./config/power-management.nix
+  ./config/pulseaudio.nix
+  ./config/qt5.nix
+  ./config/resolvconf.nix
+  ./config/shells-environment.nix
+  ./config/swap.nix
+  ./config/sysctl.nix
+  ./config/system-environment.nix
+  ./config/system-path.nix
+  ./config/terminfo.nix
+  ./config/unix-odbc-drivers.nix
+  ./config/users-groups.nix
+  ./config/vte.nix
+  ./config/zram.nix
+  ./hardware/acpilight.nix
+  ./hardware/all-firmware.nix
+  ./hardware/bladeRF.nix
+  ./hardware/brightnessctl.nix
+  ./hardware/brillo.nix
+  ./hardware/ckb-next.nix
+  ./hardware/cpu/amd-microcode.nix
+  ./hardware/cpu/intel-microcode.nix
+  ./hardware/digitalbitbox.nix
+  ./hardware/device-tree.nix
+  ./hardware/sensor/iio.nix
+  ./hardware/ksm.nix
+  ./hardware/ledger.nix
+  ./hardware/logitech.nix
+  ./hardware/mcelog.nix
+  ./hardware/network/b43.nix
+  ./hardware/network/intel-2200bg.nix
+  ./hardware/nitrokey.nix
+  ./hardware/opengl.nix
+  ./hardware/openrazer.nix
+  ./hardware/pcmcia.nix
+  ./hardware/printers.nix
+  ./hardware/raid/hpsa.nix
+  ./hardware/steam-hardware.nix
+  ./hardware/tuxedo-keyboard.nix
+  ./hardware/usb-wwan.nix
+  ./hardware/onlykey.nix
+  ./hardware/video/amdgpu.nix
+  ./hardware/video/amdgpu-pro.nix
+  ./hardware/video/ati.nix
+  ./hardware/video/capture/mwprocapture.nix
+  ./hardware/video/bumblebee.nix
+  ./hardware/video/displaylink.nix
+  ./hardware/video/nvidia.nix
+  ./hardware/video/uvcvideo/default.nix
+  ./hardware/video/webcam/facetimehd.nix
+  ./i18n/input-method/default.nix
+  ./i18n/input-method/fcitx.nix
+  ./i18n/input-method/ibus.nix
+  ./i18n/input-method/nabi.nix
+  ./i18n/input-method/uim.nix
+  ./installer/tools/tools.nix
+  ./misc/assertions.nix
+  ./misc/crashdump.nix
+  ./misc/documentation.nix
+  ./misc/extra-arguments.nix
+  ./misc/ids.nix
+  ./misc/lib.nix
+  ./misc/label.nix
+  ./misc/locate.nix
+  ./misc/meta.nix
+  ./misc/nixpkgs.nix
+  ./misc/passthru.nix
+  ./misc/version.nix
+  ./misc/nixops-autoluks.nix
+  ./programs/adb.nix
+  ./programs/atop.nix
+  ./programs/autojump.nix
+  ./programs/bandwhich.nix
+  ./programs/bash/bash.nix
+  ./programs/bcc.nix
+  ./programs/browserpass.nix
+  ./programs/captive-browser.nix
+  ./programs/ccache.nix
+  ./programs/cdemu.nix
+  ./programs/chromium.nix
+  ./programs/clickshare.nix
+  ./programs/command-not-found/command-not-found.nix
+  ./programs/criu.nix
+  ./programs/dconf.nix
+  ./programs/digitalbitbox/default.nix
+  ./programs/dmrconfig.nix
+  ./programs/environment.nix
+  ./programs/evince.nix
+  ./programs/file-roller.nix
+  ./programs/firejail.nix
+  ./programs/fish.nix
+  ./programs/freetds.nix
+  ./programs/fuse.nix
+  ./programs/geary.nix
+  ./programs/gnome-disks.nix
+  ./programs/gnome-documents.nix
+  ./programs/gnome-terminal.nix
+  ./programs/gpaste.nix
+  ./programs/gnupg.nix
+  ./programs/gphoto2.nix
+  ./programs/iftop.nix
+  ./programs/iotop.nix
+  ./programs/java.nix
+  ./programs/kbdlight.nix
+  ./programs/less.nix
+  ./programs/liboping.nix
+  ./programs/light.nix
+  ./programs/mosh.nix
+  ./programs/mininet.nix
+  ./programs/mtr.nix
+  ./programs/nano.nix
+  ./programs/nm-applet.nix
+  ./programs/npm.nix
+  ./programs/oblogout.nix
+  ./programs/plotinus.nix
+  ./programs/qt5ct.nix
+  ./programs/screen.nix
+  ./programs/sedutil.nix
+  ./programs/seahorse.nix
+  ./programs/slock.nix
+  ./programs/shadow.nix
+  ./programs/spacefm.nix
+  ./programs/singularity.nix
+  ./programs/ssh.nix
+  ./programs/ssmtp.nix
+  ./programs/sysdig.nix
+  ./programs/systemtap.nix
+  ./programs/sway.nix
+  ./programs/system-config-printer.nix
+  ./programs/thefuck.nix
+  ./programs/tmux.nix
+  ./programs/traceroute.nix
+  ./programs/tsm-client.nix
+  ./programs/udevil.nix
+  ./programs/usbtop.nix
+  ./programs/venus.nix
+  ./programs/vim.nix
+  ./programs/wavemon.nix
+  ./programs/waybar.nix
+  ./programs/wireshark.nix
+  ./programs/x2goserver.nix
+  ./programs/xfs_quota.nix
+  ./programs/xonsh.nix
+  ./programs/xss-lock.nix
+  ./programs/yabar.nix
+  ./programs/zmap.nix
+  ./programs/zsh/oh-my-zsh.nix
+  ./programs/zsh/zsh.nix
+  ./programs/zsh/zsh-autoenv.nix
+  ./programs/zsh/zsh-autosuggestions.nix
+  ./programs/zsh/zsh-syntax-highlighting.nix
+  ./rename.nix
+  ./security/acme.nix
+  ./security/apparmor.nix
+  ./security/apparmor-suid.nix
+  ./security/audit.nix
+  ./security/auditd.nix
+  ./security/ca.nix
+  ./security/chromium-suid-sandbox.nix
+  ./security/dhparams.nix
+  ./security/duosec.nix
+  ./security/google_oslogin.nix
+  ./security/hidepid.nix
+  ./security/lock-kernel-modules.nix
+  ./security/misc.nix
+  ./security/oath.nix
+  ./security/pam.nix
+  ./security/pam_usb.nix
+  ./security/pam_mount.nix
+  ./security/polkit.nix
+  ./security/prey.nix
+  ./security/rngd.nix
+  ./security/rtkit.nix
+  ./security/wrappers/default.nix
+  ./security/sudo.nix
+  ./security/systemd-confinement.nix
+  ./services/admin/oxidized.nix
+  ./services/admin/salt/master.nix
+  ./services/admin/salt/minion.nix
+  ./services/amqp/activemq/default.nix
+  ./services/amqp/rabbitmq.nix
+  ./services/audio/alsa.nix
+  ./services/audio/jack.nix
+  ./services/audio/icecast.nix
+  ./services/audio/liquidsoap.nix
+  ./services/audio/mpd.nix
+  ./services/audio/mopidy.nix
+  ./services/audio/roon-server.nix
+  ./services/audio/slimserver.nix
+  ./services/audio/snapserver.nix
+  ./services/audio/squeezelite.nix
+  ./services/audio/spotifyd.nix
+  ./services/audio/ympd.nix
+  ./services/backup/automysqlbackup.nix
+  ./services/backup/bacula.nix
+  ./services/backup/borgbackup.nix
+  ./services/backup/duplicati.nix
+  ./services/backup/duplicity.nix
+  ./services/backup/mysql-backup.nix
+  ./services/backup/postgresql-backup.nix
+  ./services/backup/postgresql-wal-receiver.nix
+  ./services/backup/restic.nix
+  ./services/backup/restic-rest-server.nix
+  ./services/backup/rsnapshot.nix
+  ./services/backup/tarsnap.nix
+  ./services/backup/tsm.nix
+  ./services/backup/zfs-replication.nix
+  ./services/backup/znapzend.nix
+  ./services/cluster/hadoop/default.nix
+  ./services/cluster/kubernetes/addons/dns.nix
+  ./services/cluster/kubernetes/addons/dashboard.nix
+  ./services/cluster/kubernetes/addon-manager.nix
+  ./services/cluster/kubernetes/apiserver.nix
+  ./services/cluster/kubernetes/controller-manager.nix
+  ./services/cluster/kubernetes/default.nix
+  ./services/cluster/kubernetes/flannel.nix
+  ./services/cluster/kubernetes/kubelet.nix
+  ./services/cluster/kubernetes/pki.nix
+  ./services/cluster/kubernetes/proxy.nix
+  ./services/cluster/kubernetes/scheduler.nix
+  ./services/computing/boinc/client.nix
+  ./services/computing/torque/server.nix
+  ./services/computing/torque/mom.nix
+  ./services/computing/slurm/slurm.nix
+  ./services/continuous-integration/buildbot/master.nix
+  ./services/continuous-integration/buildbot/worker.nix
+  ./services/continuous-integration/buildkite-agent.nix
+  ./services/continuous-integration/hail.nix
+  ./services/continuous-integration/hydra/default.nix
+  ./services/continuous-integration/gitlab-runner.nix
+  ./services/continuous-integration/gocd-agent/default.nix
+  ./services/continuous-integration/gocd-server/default.nix
+  ./services/continuous-integration/jenkins/default.nix
+  ./services/continuous-integration/jenkins/job-builder.nix
+  ./services/continuous-integration/jenkins/slave.nix
+  ./services/databases/aerospike.nix
+  ./services/databases/cassandra.nix
+  ./services/databases/clickhouse.nix
+  ./services/databases/cockroachdb.nix
+  ./services/databases/couchdb.nix
+  ./services/databases/firebird.nix
+  ./services/databases/foundationdb.nix
+  ./services/databases/hbase.nix
+  ./services/databases/influxdb.nix
+  ./services/databases/memcached.nix
+  ./services/databases/monetdb.nix
+  ./services/databases/mongodb.nix
+  ./services/databases/mysql.nix
+  ./services/databases/neo4j.nix
+  ./services/databases/openldap.nix
+  ./services/databases/opentsdb.nix
+  ./services/databases/pgmanage.nix
+  ./services/databases/postgresql.nix
+  ./services/databases/redis.nix
+  ./services/databases/riak.nix
+  ./services/databases/riak-cs.nix
+  ./services/databases/stanchion.nix
+  ./services/databases/victoriametrics.nix
+  ./services/databases/virtuoso.nix
+  ./services/desktops/accountsservice.nix
+  ./services/desktops/bamf.nix
+  ./services/desktops/blueman.nix
+  ./services/desktops/deepin/deepin.nix
+  ./services/desktops/dleyna-renderer.nix
+  ./services/desktops/dleyna-server.nix
+  ./services/desktops/pantheon/contractor.nix
+  ./services/desktops/pantheon/files.nix
+  ./services/desktops/flatpak.nix
+  ./services/desktops/geoclue2.nix
+  ./services/desktops/gsignond.nix
+  ./services/desktops/gvfs.nix
+  ./services/desktops/pipewire.nix
+  ./services/desktops/gnome3/at-spi2-core.nix
+  ./services/desktops/gnome3/chrome-gnome-shell.nix
+  ./services/desktops/gnome3/evolution-data-server.nix
+  ./services/desktops/gnome3/glib-networking.nix
+  ./services/desktops/gnome3/gnome-initial-setup.nix
+  ./services/desktops/gnome3/gnome-keyring.nix
+  ./services/desktops/gnome3/gnome-online-accounts.nix
+  ./services/desktops/gnome3/gnome-online-miners.nix
+  ./services/desktops/gnome3/gnome-remote-desktop.nix
+  ./services/desktops/gnome3/gnome-settings-daemon.nix
+  ./services/desktops/gnome3/gnome-user-share.nix
+  ./services/desktops/gnome3/rygel.nix
+  ./services/desktops/gnome3/sushi.nix
+  ./services/desktops/gnome3/tracker.nix
+  ./services/desktops/gnome3/tracker-miners.nix
+  ./services/desktops/neard.nix
+  ./services/desktops/profile-sync-daemon.nix
+  ./services/desktops/system-config-printer.nix
+  ./services/desktops/telepathy.nix
+  ./services/desktops/tumbler.nix
+  ./services/desktops/zeitgeist.nix
+  ./services/development/bloop.nix
+  ./services/development/hoogle.nix
+  ./services/development/jupyter/default.nix
+  ./services/development/lorri.nix
+  ./services/editors/emacs.nix
+  ./services/editors/infinoted.nix
+  ./services/games/factorio.nix
+  ./services/games/minecraft-server.nix
+  ./services/games/minetest-server.nix
+  ./services/games/openarena.nix
+  ./services/games/terraria.nix
+  ./services/hardware/acpid.nix
+  ./services/hardware/actkbd.nix
+  ./services/hardware/bluetooth.nix
+  ./services/hardware/bolt.nix
+  ./services/hardware/brltty.nix
+  ./services/hardware/fancontrol.nix
+  ./services/hardware/freefall.nix
+  ./services/hardware/fwupd.nix
+  ./services/hardware/illum.nix
+  ./services/hardware/interception-tools.nix
+  ./services/hardware/irqbalance.nix
+  ./services/hardware/lcd.nix
+  ./services/hardware/lirc.nix
+  ./services/hardware/nvidia-optimus.nix
+  ./services/hardware/pcscd.nix
+  ./services/hardware/pommed.nix
+  ./services/hardware/ratbagd.nix
+  ./services/hardware/sane.nix
+  ./services/hardware/sane_extra_backends/brscan4.nix
+  ./services/hardware/sane_extra_backends/dsseries.nix
+  ./services/hardware/tcsd.nix
+  ./services/hardware/tlp.nix
+  ./services/hardware/thinkfan.nix
+  ./services/hardware/throttled.nix
+  ./services/hardware/trezord.nix
+  ./services/hardware/triggerhappy.nix
+  ./services/hardware/u2f.nix
+  ./services/hardware/udev.nix
+  ./services/hardware/udisks2.nix
+  ./services/hardware/upower.nix
+  ./services/hardware/usbmuxd.nix
+  ./services/hardware/thermald.nix
+  ./services/hardware/undervolt.nix
+  ./services/hardware/vdr.nix
+  ./services/logging/SystemdJournal2Gelf.nix
+  ./services/logging/awstats.nix
+  ./services/logging/fluentd.nix
+  ./services/logging/graylog.nix
+  ./services/logging/heartbeat.nix
+  ./services/logging/journalbeat.nix
+  ./services/logging/journaldriver.nix
+  ./services/logging/journalwatch.nix
+  ./services/logging/klogd.nix
+  ./services/logging/logcheck.nix
+  ./services/logging/logrotate.nix
+  ./services/logging/logstash.nix
+  ./services/logging/rsyslogd.nix
+  ./services/logging/syslog-ng.nix
+  ./services/logging/syslogd.nix
+  ./services/mail/clamsmtp.nix
+  ./services/mail/davmail.nix
+  ./services/mail/dkimproxy-out.nix
+  ./services/mail/dovecot.nix
+  ./services/mail/dspam.nix
+  ./services/mail/exim.nix
+  ./services/mail/freepops.nix
+  ./services/mail/mail.nix
+  ./services/mail/mailcatcher.nix
+  ./services/mail/mailhog.nix
+  ./services/mail/mailman.nix
+  ./services/mail/mlmmj.nix
+  ./services/mail/offlineimap.nix
+  ./services/mail/opendkim.nix
+  ./services/mail/opensmtpd.nix
+  ./services/mail/pfix-srsd.nix
+  ./services/mail/postfix.nix
+  ./services/mail/postsrsd.nix
+  ./services/mail/postgrey.nix
+  ./services/mail/spamassassin.nix
+  ./services/mail/rspamd.nix
+  ./services/mail/rss2email.nix
+  ./services/mail/roundcube.nix
+  ./services/mail/nullmailer.nix
+  ./services/misc/airsonic.nix
+  ./services/misc/apache-kafka.nix
+  ./services/misc/autofs.nix
+  ./services/misc/autorandr.nix
+  ./services/misc/beanstalkd.nix
+  ./services/misc/bees.nix
+  ./services/misc/bepasty.nix
+  ./services/misc/canto-daemon.nix
+  ./services/misc/calibre-server.nix
+  ./services/misc/cfdyndns.nix
+  ./services/misc/clipmenu.nix
+  ./services/misc/cpuminer-cryptonight.nix
+  ./services/misc/cgminer.nix
+  ./services/misc/confd.nix
+  ./services/misc/couchpotato.nix
+  ./services/misc/devmon.nix
+  ./services/misc/dictd.nix
+  ./services/misc/dwm-status.nix
+  ./services/misc/dysnomia.nix
+  ./services/misc/disnix.nix
+  ./services/misc/docker-registry.nix
+  ./services/misc/errbot.nix
+  ./services/misc/etcd.nix
+  ./services/misc/ethminer.nix
+  ./services/misc/exhibitor.nix
+  ./services/misc/felix.nix
+  ./services/misc/folding-at-home.nix
+  ./services/misc/freeswitch.nix
+  ./services/misc/fstrim.nix
+  ./services/misc/gammu-smsd.nix
+  ./services/misc/geoip-updater.nix
+  ./services/misc/gitea.nix
+  #./services/misc/gitit.nix
+  ./services/misc/gitlab.nix
+  ./services/misc/gitolite.nix
+  ./services/misc/gitweb.nix
+  ./services/misc/gogs.nix
+  ./services/misc/gollum.nix
+  ./services/misc/gpsd.nix
+  ./services/misc/headphones.nix
+  ./services/misc/greenclip.nix
+  ./services/misc/home-assistant.nix
+  ./services/misc/ihaskell.nix
+  ./services/misc/irkerd.nix
+  ./services/misc/jackett.nix
+  ./services/misc/jellyfin.nix
+  ./services/misc/logkeys.nix
+  ./services/misc/leaps.nix
+  ./services/misc/lidarr.nix
+  ./services/misc/mame.nix
+  ./services/misc/mathics.nix
+  ./services/misc/matrix-synapse.nix
+  ./services/misc/mbpfan.nix
+  ./services/misc/mediatomb.nix
+  ./services/misc/mesos-master.nix
+  ./services/misc/mesos-slave.nix
+  ./services/misc/metabase.nix
+  ./services/misc/mwlib.nix
+  ./services/misc/nix-daemon.nix
+  ./services/misc/nix-gc.nix
+  ./services/misc/nix-optimise.nix
+  ./services/misc/nixos-manual.nix
+  ./services/misc/nix-ssh-serve.nix
+  ./services/misc/novacomd.nix
+  ./services/misc/nzbget.nix
+  ./services/misc/octoprint.nix
+  ./services/misc/osrm.nix
+  ./services/misc/packagekit.nix
+  ./services/misc/paperless.nix
+  ./services/misc/parsoid.nix
+  ./services/misc/plex.nix
+  ./services/misc/tautulli.nix
+  ./services/misc/pykms.nix
+  ./services/misc/radarr.nix
+  ./services/misc/redmine.nix
+  ./services/misc/rippled.nix
+  ./services/misc/ripple-data-api.nix
+  ./services/misc/rogue.nix
+  ./services/misc/serviio.nix
+  ./services/misc/safeeyes.nix
+  ./services/misc/sickbeard.nix
+  ./services/misc/siproxd.nix
+  ./services/misc/snapper.nix
+  ./services/misc/sonarr.nix
+  ./services/misc/spice-vdagentd.nix
+  ./services/misc/ssm-agent.nix
+  ./services/misc/sssd.nix
+  ./services/misc/subsonic.nix
+  ./services/misc/sundtek.nix
+  ./services/misc/svnserve.nix
+  ./services/misc/synergy.nix
+  ./services/misc/sysprof.nix
+  ./services/misc/taskserver
+  ./services/misc/tiddlywiki.nix
+  ./services/misc/tzupdate.nix
+  ./services/misc/uhub.nix
+  ./services/misc/weechat.nix
+  ./services/misc/xmr-stak.nix
+  ./services/misc/zoneminder.nix
+  ./services/misc/zookeeper.nix
+  ./services/monitoring/alerta.nix
+  ./services/monitoring/apcupsd.nix
+  ./services/monitoring/arbtt.nix
+  ./services/monitoring/bosun.nix
+  ./services/monitoring/cadvisor.nix
+  ./services/monitoring/collectd.nix
+  ./services/monitoring/das_watchdog.nix
+  ./services/monitoring/datadog-agent.nix
+  ./services/monitoring/dd-agent/dd-agent.nix
+  ./services/monitoring/do-agent.nix
+  ./services/monitoring/fusion-inventory.nix
+  ./services/monitoring/grafana.nix
+  ./services/monitoring/grafana-reporter.nix
+  ./services/monitoring/graphite.nix
+  ./services/monitoring/hdaps.nix
+  ./services/monitoring/heapster.nix
+  ./services/monitoring/incron.nix
+  ./services/monitoring/kapacitor.nix
+  ./services/monitoring/loki.nix
+  ./services/monitoring/longview.nix
+  ./services/monitoring/monit.nix
+  ./services/monitoring/munin.nix
+  ./services/monitoring/nagios.nix
+  ./services/monitoring/netdata.nix
+  ./services/monitoring/prometheus/default.nix
+  ./services/monitoring/prometheus/alertmanager.nix
+  ./services/monitoring/prometheus/exporters.nix
+  ./services/monitoring/prometheus/pushgateway.nix
+  ./services/monitoring/riemann.nix
+  ./services/monitoring/riemann-dash.nix
+  ./services/monitoring/riemann-tools.nix
+  ./services/monitoring/scollector.nix
+  ./services/monitoring/smartd.nix
+  ./services/monitoring/sysstat.nix
+  ./services/monitoring/teamviewer.nix
+  ./services/monitoring/telegraf.nix
+  ./services/monitoring/thanos.nix
+  ./services/monitoring/ups.nix
+  ./services/monitoring/uptime.nix
+  ./services/monitoring/vnstat.nix
+  ./services/monitoring/zabbix-agent.nix
+  ./services/monitoring/zabbix-proxy.nix
+  ./services/monitoring/zabbix-server.nix
+  ./services/network-filesystems/cachefilesd.nix
+  ./services/network-filesystems/davfs2.nix
+  ./services/network-filesystems/drbd.nix
+  ./services/network-filesystems/glusterfs.nix
+  ./services/network-filesystems/kbfs.nix
+  ./services/network-filesystems/ipfs.nix
+  ./services/network-filesystems/netatalk.nix
+  ./services/network-filesystems/nfsd.nix
+  ./services/network-filesystems/openafs/client.nix
+  ./services/network-filesystems/openafs/server.nix
+  ./services/network-filesystems/orangefs/server.nix
+  ./services/network-filesystems/orangefs/client.nix
+  ./services/network-filesystems/rsyncd.nix
+  ./services/network-filesystems/samba.nix
+  ./services/network-filesystems/tahoe.nix
+  ./services/network-filesystems/diod.nix
+  ./services/network-filesystems/u9fs.nix
+  ./services/network-filesystems/yandex-disk.nix
+  ./services/network-filesystems/xtreemfs.nix
+  ./services/network-filesystems/ceph.nix
+  ./services/networking/3proxy.nix
+  ./services/networking/amuled.nix
+  ./services/networking/aria2.nix
+  ./services/networking/asterisk.nix
+  ./services/networking/atftpd.nix
+  ./services/networking/avahi-daemon.nix
+  ./services/networking/babeld.nix
+  ./services/networking/bind.nix
+  ./services/networking/bitcoind.nix
+  ./services/networking/autossh.nix
+  ./services/networking/bird.nix
+  ./services/networking/bitlbee.nix
+  ./services/networking/charybdis.nix
+  ./services/networking/cjdns.nix
+  ./services/networking/cntlm.nix
+  ./services/networking/connman.nix
+  ./services/networking/consul.nix
+  ./services/networking/coredns.nix
+  ./services/networking/corerad.nix
+  ./services/networking/coturn.nix
+  ./services/networking/dante.nix
+  ./services/networking/ddclient.nix
+  ./services/networking/dhcpcd.nix
+  ./services/networking/dhcpd.nix
+  ./services/networking/dnscache.nix
+  ./services/networking/dnschain.nix
+  ./services/networking/dnscrypt-proxy.nix
+  ./services/networking/dnscrypt-wrapper.nix
+  ./services/networking/dnsdist.nix
+  ./services/networking/dnsmasq.nix
+  ./services/networking/ejabberd.nix
+  ./services/networking/epmd.nix
+  ./services/networking/eternal-terminal.nix
+  ./services/networking/fakeroute.nix
+  ./services/networking/ferm.nix
+  ./services/networking/firefox/sync-server.nix
+  ./services/networking/fireqos.nix
+  ./services/networking/firewall.nix
+  ./services/networking/flannel.nix
+  ./services/networking/flashpolicyd.nix
+  ./services/networking/freenet.nix
+  ./services/networking/freeradius.nix
+  ./services/networking/gale.nix
+  ./services/networking/gateone.nix
+  ./services/networking/gdomap.nix
+  ./services/networking/git-daemon.nix
+  ./services/networking/gnunet.nix
+  ./services/networking/go-shadowsocks2.nix
+  ./services/networking/gogoclient.nix
+  ./services/networking/gvpe.nix
+  ./services/networking/hans.nix
+  ./services/networking/haproxy.nix
+  ./services/networking/heyefi.nix
+  ./services/networking/hostapd.nix
+  ./services/networking/htpdate.nix
+  ./services/networking/hylafax/default.nix
+  ./services/networking/i2pd.nix
+  ./services/networking/i2p.nix
+  ./services/networking/iodine.nix
+  ./services/networking/iperf3.nix
+  ./services/networking/ircd-hybrid/default.nix
+  ./services/networking/iwd.nix
+  ./services/networking/keepalived/default.nix
+  ./services/networking/keybase.nix
+  ./services/networking/kippo.nix
+  ./services/networking/knot.nix
+  ./services/networking/kresd.nix
+  ./services/networking/lambdabot.nix
+  ./services/networking/libreswan.nix
+  ./services/networking/lldpd.nix
+  ./services/networking/logmein-hamachi.nix
+  ./services/networking/mailpile.nix
+  ./services/networking/matterbridge.nix
+  ./services/networking/mjpg-streamer.nix
+  ./services/networking/minidlna.nix
+  ./services/networking/miniupnpd.nix
+  ./services/networking/mosquitto.nix
+  ./services/networking/monero.nix
+  ./services/networking/morty.nix
+  ./services/networking/miredo.nix
+  ./services/networking/mstpd.nix
+  ./services/networking/mtprotoproxy.nix
+  ./services/networking/mullvad.nix
+  ./services/networking/murmur.nix
+  ./services/networking/mxisd.nix
+  ./services/networking/namecoind.nix
+  ./services/networking/nat.nix
+  ./services/networking/ndppd.nix
+  ./services/networking/networkmanager.nix
+  ./services/networking/nftables.nix
+  ./services/networking/ngircd.nix
+  ./services/networking/nghttpx/default.nix
+  ./services/networking/nix-serve.nix
+  ./services/networking/nixops-dns.nix
+  ./services/networking/nntp-proxy.nix
+  ./services/networking/nsd.nix
+  ./services/networking/ntopng.nix
+  ./services/networking/ntp/chrony.nix
+  ./services/networking/ntp/ntpd.nix
+  ./services/networking/ntp/openntpd.nix
+  ./services/networking/nullidentdmod.nix
+  ./services/networking/nylon.nix
+  ./services/networking/ocserv.nix
+  ./services/networking/ofono.nix
+  ./services/networking/oidentd.nix
+  ./services/networking/openfire.nix
+  ./services/networking/openvpn.nix
+  ./services/networking/ostinato.nix
+  ./services/networking/owamp.nix
+  ./services/networking/pdnsd.nix
+  ./services/networking/polipo.nix
+  ./services/networking/powerdns.nix
+  ./services/networking/pdns-recursor.nix
+  ./services/networking/pppd.nix
+  ./services/networking/pptpd.nix
+  ./services/networking/prayer.nix
+  ./services/networking/privoxy.nix
+  ./services/networking/prosody.nix
+  ./services/networking/quagga.nix
+  ./services/networking/quassel.nix
+  ./services/networking/quicktun.nix
+  ./services/networking/racoon.nix
+  ./services/networking/radicale.nix
+  ./services/networking/radvd.nix
+  ./services/networking/rdnssd.nix
+  ./services/networking/redsocks.nix
+  ./services/networking/resilio.nix
+  ./services/networking/rpcbind.nix
+  ./services/networking/rxe.nix
+  ./services/networking/sabnzbd.nix
+  ./services/networking/searx.nix
+  ./services/networking/seeks.nix
+  ./services/networking/skydns.nix
+  ./services/networking/shadowsocks.nix
+  ./services/networking/shairport-sync.nix
+  ./services/networking/shorewall.nix
+  ./services/networking/shorewall6.nix
+  ./services/networking/shout.nix
+  ./services/networking/sniproxy.nix
+  ./services/networking/smokeping.nix
+  ./services/networking/softether.nix
+  ./services/networking/spacecookie.nix
+  ./services/networking/spiped.nix
+  ./services/networking/squid.nix
+  ./services/networking/sslh.nix
+  ./services/networking/ssh/lshd.nix
+  ./services/networking/ssh/sshd.nix
+  ./services/networking/strongswan.nix
+  ./services/networking/strongswan-swanctl/module.nix
+  ./services/networking/stunnel.nix
+  ./services/networking/stubby.nix
+  ./services/networking/supplicant.nix
+  ./services/networking/supybot.nix
+  ./services/networking/syncthing.nix
+  ./services/networking/syncthing-relay.nix
+  ./services/networking/syncplay.nix
+  ./services/networking/tcpcrypt.nix
+  ./services/networking/teamspeak3.nix
+  ./services/networking/tedicross.nix
+  ./services/networking/thelounge.nix
+  ./services/networking/tinc.nix
+  ./services/networking/tinydns.nix
+  ./services/networking/tftpd.nix
+  ./services/networking/trickster.nix
+  ./services/networking/tox-bootstrapd.nix
+  ./services/networking/tox-node.nix
+  ./services/networking/toxvpn.nix
+  ./services/networking/tvheadend.nix
+  ./services/networking/unbound.nix
+  ./services/networking/unifi.nix
+  ./services/networking/v2ray.nix
+  ./services/networking/vsftpd.nix
+  ./services/networking/wakeonlan.nix
+  ./services/networking/websockify.nix
+  ./services/networking/wg-quick.nix
+  ./services/networking/wicd.nix
+  ./services/networking/wireguard.nix
+  ./services/networking/wpa_supplicant.nix
+  ./services/networking/xandikos.nix
+  ./services/networking/xinetd.nix
+  ./services/networking/xl2tpd.nix
+  ./services/networking/xrdp.nix
+  ./services/networking/yggdrasil.nix
+  ./services/networking/zerobin.nix
+  ./services/networking/zeronet.nix
+  ./services/networking/zerotierone.nix
+  ./services/networking/znc/default.nix
+  ./services/printing/cupsd.nix
+  ./services/scheduling/atd.nix
+  ./services/scheduling/chronos.nix
+  ./services/scheduling/cron.nix
+  ./services/scheduling/fcron.nix
+  ./services/scheduling/marathon.nix
+  ./services/search/elasticsearch.nix
+  ./services/search/elasticsearch-curator.nix
+  ./services/search/hound.nix
+  ./services/search/kibana.nix
+  ./services/search/solr.nix
+  ./services/security/bitwarden_rs/default.nix
+  ./services/security/certmgr.nix
+  ./services/security/cfssl.nix
+  ./services/security/clamav.nix
+  ./services/security/fail2ban.nix
+  ./services/security/fprintd.nix
+  ./services/security/fprot.nix
+  ./services/security/haka.nix
+  ./services/security/haveged.nix
+  ./services/security/hologram-server.nix
+  ./services/security/hologram-agent.nix
+  ./services/security/munge.nix
+  ./services/security/nginx-sso.nix
+  ./services/security/oauth2_proxy.nix
+  ./services/security/oauth2_proxy_nginx.nix
+  ./services/security/physlock.nix
+  ./services/security/shibboleth-sp.nix
+  ./services/security/sks.nix
+  ./services/security/sshguard.nix
+  ./services/security/tor.nix
+  ./services/security/torify.nix
+  ./services/security/torsocks.nix
+  ./services/security/usbguard.nix
+  ./services/security/vault.nix
+  ./services/system/cgmanager.nix
+  ./services/system/cloud-init.nix
+  ./services/system/dbus.nix
+  ./services/system/earlyoom.nix
+  ./services/system/localtime.nix
+  ./services/system/kerberos/default.nix
+  ./services/system/nscd.nix
+  ./services/system/saslauthd.nix
+  ./services/system/uptimed.nix
+  ./services/torrent/deluge.nix
+  ./services/torrent/flexget.nix
+  ./services/torrent/magnetico.nix
+  ./services/torrent/opentracker.nix
+  ./services/torrent/peerflix.nix
+  ./services/torrent/transmission.nix
+  ./services/ttys/agetty.nix
+  ./services/ttys/gpm.nix
+  ./services/ttys/kmscon.nix
+  ./services/web-apps/atlassian/confluence.nix
+  ./services/web-apps/atlassian/crowd.nix
+  ./services/web-apps/atlassian/jira.nix
+  ./services/web-apps/codimd.nix
+  ./services/web-apps/cryptpad.nix
+  ./services/web-apps/documize.nix
+  ./services/web-apps/dokuwiki.nix
+  ./services/web-apps/frab.nix
+  ./services/web-apps/gotify-server.nix
+  ./services/web-apps/icingaweb2/icingaweb2.nix
+  ./services/web-apps/icingaweb2/module-monitoring.nix
+  ./services/web-apps/ihatemoney
+  ./services/web-apps/limesurvey.nix
+  ./services/web-apps/mattermost.nix
+  ./services/web-apps/mediawiki.nix
+  ./services/web-apps/miniflux.nix
+  ./services/web-apps/moodle.nix
+  ./services/web-apps/nextcloud.nix
+  ./services/web-apps/nexus.nix
+  ./services/web-apps/pgpkeyserver-lite.nix
+  ./services/web-apps/matomo.nix
+  ./services/web-apps/moinmoin.nix
+  ./services/web-apps/restya-board.nix
+  ./services/web-apps/tt-rss.nix
+  ./services/web-apps/trac.nix
+  ./services/web-apps/trilium.nix
+  ./services/web-apps/selfoss.nix
+  ./services/web-apps/shiori.nix
+  ./services/web-apps/virtlyst.nix
+  ./services/web-apps/wordpress.nix
+  ./services/web-apps/youtrack.nix
+  ./services/web-apps/zabbix.nix
+  ./services/web-servers/apache-httpd/default.nix
+  ./services/web-servers/caddy.nix
+  ./services/web-servers/darkhttpd.nix
+  ./services/web-servers/fcgiwrap.nix
+  ./services/web-servers/hitch/default.nix
+  ./services/web-servers/hydron.nix
+  ./services/web-servers/jboss/default.nix
+  ./services/web-servers/lighttpd/cgit.nix
+  ./services/web-servers/lighttpd/collectd.nix
+  ./services/web-servers/lighttpd/default.nix
+  ./services/web-servers/lighttpd/gitweb.nix
+  ./services/web-servers/meguca.nix
+  ./services/web-servers/mighttpd2.nix
+  ./services/web-servers/minio.nix
+  ./services/web-servers/nginx/default.nix
+  ./services/web-servers/nginx/gitweb.nix
+  ./services/web-servers/phpfpm/default.nix
+  ./services/web-servers/unit/default.nix
+  ./services/web-servers/shellinabox.nix
+  ./services/web-servers/tomcat.nix
+  ./services/web-servers/traefik.nix
+  ./services/web-servers/ttyd.nix
+  ./services/web-servers/uwsgi.nix
+  ./services/web-servers/varnish/default.nix
+  ./services/web-servers/zope2.nix
+  ./services/x11/extra-layouts.nix
+  ./services/x11/clight.nix
+  ./services/x11/colord.nix
+  ./services/x11/picom.nix
+  ./services/x11/unclutter.nix
+  ./services/x11/unclutter-xfixes.nix
+  ./services/x11/desktop-managers/default.nix
+  ./services/x11/display-managers/default.nix
+  ./services/x11/display-managers/gdm.nix
+  ./services/x11/display-managers/lightdm.nix
+  ./services/x11/display-managers/sddm.nix
+  ./services/x11/display-managers/slim.nix
+  ./services/x11/display-managers/startx.nix
+  ./services/x11/display-managers/xpra.nix
+  ./services/x11/fractalart.nix
+  ./services/x11/hardware/libinput.nix
+  ./services/x11/hardware/synaptics.nix
+  ./services/x11/hardware/wacom.nix
+  ./services/x11/hardware/digimend.nix
+  ./services/x11/hardware/cmt.nix
+  ./services/x11/gdk-pixbuf.nix
+  ./services/x11/imwheel.nix
+  ./services/x11/redshift.nix
+  ./services/x11/urxvtd.nix
+  ./services/x11/window-managers/awesome.nix
+  ./services/x11/window-managers/default.nix
+  ./services/x11/window-managers/fluxbox.nix
+  ./services/x11/window-managers/icewm.nix
+  ./services/x11/window-managers/bspwm.nix
+  ./services/x11/window-managers/metacity.nix
+  ./services/x11/window-managers/none.nix
+  ./services/x11/window-managers/twm.nix
+  ./services/x11/window-managers/windowlab.nix
+  ./services/x11/window-managers/wmii.nix
+  ./services/x11/window-managers/xmonad.nix
+  ./services/x11/xautolock.nix
+  ./services/x11/xbanish.nix
+  ./services/x11/xfs.nix
+  ./services/x11/xserver.nix
+  ./system/activation/activation-script.nix
+  ./system/activation/top-level.nix
+  ./system/boot/binfmt.nix
+  ./system/boot/emergency-mode.nix
+  ./system/boot/grow-partition.nix
+  ./system/boot/initrd-network.nix
+  ./system/boot/initrd-ssh.nix
+  ./system/boot/kernel.nix
+  ./system/boot/kexec.nix
+  ./system/boot/loader/efi.nix
+  ./system/boot/loader/generations-dir/generations-dir.nix
+  ./system/boot/loader/generic-extlinux-compatible
+  ./system/boot/loader/grub/grub.nix
+  ./system/boot/loader/grub/ipxe.nix
+  ./system/boot/loader/grub/memtest.nix
+  ./system/boot/loader/init-script/init-script.nix
+  ./system/boot/loader/loader.nix
+  ./system/boot/loader/raspberrypi/raspberrypi.nix
+  ./system/boot/loader/systemd-boot/systemd-boot.nix
+  ./system/boot/luksroot.nix
+  ./system/boot/modprobe.nix
+  ./system/boot/networkd.nix
+  ./system/boot/plymouth.nix
+  ./system/boot/resolved.nix
+  ./system/boot/shutdown.nix
+  ./system/boot/stage-1.nix
+  ./system/boot/stage-2.nix
+  ./system/boot/systemd.nix
+  ./system/boot/systemd-nspawn.nix
+  ./system/boot/timesyncd.nix
+  ./system/boot/tmp.nix
+  ./system/etc/etc.nix
+  ./tasks/auto-upgrade.nix
+  ./tasks/bcache.nix
+  ./tasks/cpu-freq.nix
+  ./tasks/encrypted-devices.nix
+  ./tasks/filesystems.nix
+  ./tasks/filesystems/bcachefs.nix
+  ./tasks/filesystems/btrfs.nix
+  ./tasks/filesystems/cifs.nix
+  ./tasks/filesystems/ecryptfs.nix
+  ./tasks/filesystems/exfat.nix
+  ./tasks/filesystems/ext.nix
+  ./tasks/filesystems/f2fs.nix
+  ./tasks/filesystems/jfs.nix
+  ./tasks/filesystems/nfs.nix
+  ./tasks/filesystems/ntfs.nix
+  ./tasks/filesystems/reiserfs.nix
+  ./tasks/filesystems/unionfs-fuse.nix
+  ./tasks/filesystems/vboxsf.nix
+  ./tasks/filesystems/vfat.nix
+  ./tasks/filesystems/xfs.nix
+  ./tasks/filesystems/zfs.nix
+  ./tasks/lvm.nix
+  ./tasks/network-interfaces.nix
+  ./tasks/network-interfaces-systemd.nix
+  ./tasks/network-interfaces-scripted.nix
+  ./tasks/scsi-link-power-management.nix
+  ./tasks/swraid.nix
+  ./tasks/trackpoint.nix
+  ./tasks/powertop.nix
+  ./testing/service-runner.nix
+  ./virtualisation/anbox.nix
+  ./virtualisation/container-config.nix
+  ./virtualisation/containers.nix
+  ./virtualisation/cri-o.nix
+  ./virtualisation/docker.nix
+  ./virtualisation/docker-containers.nix
+  ./virtualisation/ecs-agent.nix
+  ./virtualisation/libvirtd.nix
+  ./virtualisation/lxc.nix
+  ./virtualisation/lxcfs.nix
+  ./virtualisation/lxd.nix
+  ./virtualisation/amazon-options.nix
+  ./virtualisation/hyperv-guest.nix
+  ./virtualisation/kvmgt.nix
+  ./virtualisation/openvswitch.nix
+  ./virtualisation/parallels-guest.nix
+  ./virtualisation/qemu-guest-agent.nix
+  ./virtualisation/railcar.nix
+  ./virtualisation/rkt.nix
+  ./virtualisation/virtualbox-guest.nix
+  ./virtualisation/virtualbox-host.nix
+  ./virtualisation/vmware-guest.nix
+  ./virtualisation/xen-dom0.nix
+  ./virtualisation/xe-guest-utilities.nix
+]
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixpkgs/nixos/modules/profiles/all-hardware.nix
index 19f821ae17f..19f821ae17f 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixpkgs/nixos/modules/profiles/all-hardware.nix
diff --git a/nixos/modules/profiles/base.nix b/nixpkgs/nixos/modules/profiles/base.nix
index 2a2fe119d30..2a2fe119d30 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixpkgs/nixos/modules/profiles/base.nix
diff --git a/nixos/modules/profiles/clone-config.nix b/nixpkgs/nixos/modules/profiles/clone-config.nix
index 3f669ba7d2e..3f669ba7d2e 100644
--- a/nixos/modules/profiles/clone-config.nix
+++ b/nixpkgs/nixos/modules/profiles/clone-config.nix
diff --git a/nixos/modules/profiles/demo.nix b/nixpkgs/nixos/modules/profiles/demo.nix
index 18f190071ba..18f190071ba 100644
--- a/nixos/modules/profiles/demo.nix
+++ b/nixpkgs/nixos/modules/profiles/demo.nix
diff --git a/nixos/modules/profiles/docker-container.nix b/nixpkgs/nixos/modules/profiles/docker-container.nix
index 5d6b11498b5..5d6b11498b5 100644
--- a/nixos/modules/profiles/docker-container.nix
+++ b/nixpkgs/nixos/modules/profiles/docker-container.nix
diff --git a/nixos/modules/profiles/graphical.nix b/nixpkgs/nixos/modules/profiles/graphical.nix
index d80456cede5..d80456cede5 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixpkgs/nixos/modules/profiles/graphical.nix
diff --git a/nixos/modules/profiles/hardened.nix b/nixpkgs/nixos/modules/profiles/hardened.nix
index f7b2f5c7fc1..f7b2f5c7fc1 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixpkgs/nixos/modules/profiles/hardened.nix
diff --git a/nixos/modules/profiles/headless.nix b/nixpkgs/nixos/modules/profiles/headless.nix
index 46a9b6a7d8d..46a9b6a7d8d 100644
--- a/nixos/modules/profiles/headless.nix
+++ b/nixpkgs/nixos/modules/profiles/headless.nix
diff --git a/nixos/modules/profiles/installation-device.nix b/nixpkgs/nixos/modules/profiles/installation-device.nix
index 4596e163404..4596e163404 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixpkgs/nixos/modules/profiles/installation-device.nix
diff --git a/nixos/modules/profiles/minimal.nix b/nixpkgs/nixos/modules/profiles/minimal.nix
index f044e6f39ea..f044e6f39ea 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixpkgs/nixos/modules/profiles/minimal.nix
diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixpkgs/nixos/modules/profiles/qemu-guest.nix
index 0ea70107f71..0ea70107f71 100644
--- a/nixos/modules/profiles/qemu-guest.nix
+++ b/nixpkgs/nixos/modules/profiles/qemu-guest.nix
diff --git a/nixos/modules/programs/adb.nix b/nixpkgs/nixos/modules/programs/adb.nix
index 83bcfe886aa..83bcfe886aa 100644
--- a/nixos/modules/programs/adb.nix
+++ b/nixpkgs/nixos/modules/programs/adb.nix
diff --git a/nixos/modules/programs/atop.nix b/nixpkgs/nixos/modules/programs/atop.nix
index 7ef8d687ca1..7ef8d687ca1 100644
--- a/nixos/modules/programs/atop.nix
+++ b/nixpkgs/nixos/modules/programs/atop.nix
diff --git a/nixos/modules/programs/autojump.nix b/nixpkgs/nixos/modules/programs/autojump.nix
index 3a8feec4bb4..3a8feec4bb4 100644
--- a/nixos/modules/programs/autojump.nix
+++ b/nixpkgs/nixos/modules/programs/autojump.nix
diff --git a/nixos/modules/programs/bandwhich.nix b/nixpkgs/nixos/modules/programs/bandwhich.nix
index 5413044f461..5413044f461 100644
--- a/nixos/modules/programs/bandwhich.nix
+++ b/nixpkgs/nixos/modules/programs/bandwhich.nix
diff --git a/nixos/modules/programs/bash/bash.nix b/nixpkgs/nixos/modules/programs/bash/bash.nix
index 366c07c0a35..366c07c0a35 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixpkgs/nixos/modules/programs/bash/bash.nix
diff --git a/nixos/modules/programs/bash/inputrc b/nixpkgs/nixos/modules/programs/bash/inputrc
index f339eb649ed..f339eb649ed 100644
--- a/nixos/modules/programs/bash/inputrc
+++ b/nixpkgs/nixos/modules/programs/bash/inputrc
diff --git a/nixos/modules/programs/bcc.nix b/nixpkgs/nixos/modules/programs/bcc.nix
index d76249bb5ca..d76249bb5ca 100644
--- a/nixos/modules/programs/bcc.nix
+++ b/nixpkgs/nixos/modules/programs/bcc.nix
diff --git a/nixos/modules/programs/browserpass.nix b/nixpkgs/nixos/modules/programs/browserpass.nix
index e1456d3c184..e1456d3c184 100644
--- a/nixos/modules/programs/browserpass.nix
+++ b/nixpkgs/nixos/modules/programs/browserpass.nix
diff --git a/nixos/modules/programs/captive-browser.nix b/nixpkgs/nixos/modules/programs/captive-browser.nix
index 55d474e5c9d..55d474e5c9d 100644
--- a/nixos/modules/programs/captive-browser.nix
+++ b/nixpkgs/nixos/modules/programs/captive-browser.nix
diff --git a/nixos/modules/programs/ccache.nix b/nixpkgs/nixos/modules/programs/ccache.nix
index 874774c72b4..874774c72b4 100644
--- a/nixos/modules/programs/ccache.nix
+++ b/nixpkgs/nixos/modules/programs/ccache.nix
diff --git a/nixos/modules/programs/cdemu.nix b/nixpkgs/nixos/modules/programs/cdemu.nix
index 6a0185d362c..6a0185d362c 100644
--- a/nixos/modules/programs/cdemu.nix
+++ b/nixpkgs/nixos/modules/programs/cdemu.nix
diff --git a/nixos/modules/programs/chromium.nix b/nixpkgs/nixos/modules/programs/chromium.nix
index 41c49db8c71..41c49db8c71 100644
--- a/nixos/modules/programs/chromium.nix
+++ b/nixpkgs/nixos/modules/programs/chromium.nix
diff --git a/nixos/modules/programs/clickshare.nix b/nixpkgs/nixos/modules/programs/clickshare.nix
index 9980a7daf52..9980a7daf52 100644
--- a/nixos/modules/programs/clickshare.nix
+++ b/nixpkgs/nixos/modules/programs/clickshare.nix
diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix
index 656c255fcb1..656c255fcb1 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.nix
+++ b/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix
diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.pl
index ab7aa204653..ab7aa204653 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.pl
+++ b/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.pl
diff --git a/nixos/modules/programs/criu.nix b/nixpkgs/nixos/modules/programs/criu.nix
index 48cf5c88a9f..48cf5c88a9f 100644
--- a/nixos/modules/programs/criu.nix
+++ b/nixpkgs/nixos/modules/programs/criu.nix
diff --git a/nixos/modules/programs/dconf.nix b/nixpkgs/nixos/modules/programs/dconf.nix
index 6702e8efd1c..6702e8efd1c 100644
--- a/nixos/modules/programs/dconf.nix
+++ b/nixpkgs/nixos/modules/programs/dconf.nix
diff --git a/nixos/modules/programs/digitalbitbox/default.nix b/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix
index 2fe0a14412c..2fe0a14412c 100644
--- a/nixos/modules/programs/digitalbitbox/default.nix
+++ b/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix
diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixpkgs/nixos/modules/programs/digitalbitbox/doc.xml
index c63201628db..c63201628db 100644
--- a/nixos/modules/programs/digitalbitbox/doc.xml
+++ b/nixpkgs/nixos/modules/programs/digitalbitbox/doc.xml
diff --git a/nixos/modules/programs/dmrconfig.nix b/nixpkgs/nixos/modules/programs/dmrconfig.nix
index e48a4f31837..e48a4f31837 100644
--- a/nixos/modules/programs/dmrconfig.nix
+++ b/nixpkgs/nixos/modules/programs/dmrconfig.nix
diff --git a/nixos/modules/programs/environment.nix b/nixpkgs/nixos/modules/programs/environment.nix
index 38bdabb4fa8..38bdabb4fa8 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixpkgs/nixos/modules/programs/environment.nix
diff --git a/nixos/modules/programs/evince.nix b/nixpkgs/nixos/modules/programs/evince.nix
index 473fddb09d0..473fddb09d0 100644
--- a/nixos/modules/programs/evince.nix
+++ b/nixpkgs/nixos/modules/programs/evince.nix
diff --git a/nixos/modules/programs/file-roller.nix b/nixpkgs/nixos/modules/programs/file-roller.nix
index 64f6a94e764..64f6a94e764 100644
--- a/nixos/modules/programs/file-roller.nix
+++ b/nixpkgs/nixos/modules/programs/file-roller.nix
diff --git a/nixos/modules/programs/firejail.nix b/nixpkgs/nixos/modules/programs/firejail.nix
index 74c3e4425a7..74c3e4425a7 100644
--- a/nixos/modules/programs/firejail.nix
+++ b/nixpkgs/nixos/modules/programs/firejail.nix
diff --git a/nixos/modules/programs/fish.nix b/nixpkgs/nixos/modules/programs/fish.nix
index 87f6816e4ac..87f6816e4ac 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixpkgs/nixos/modules/programs/fish.nix
diff --git a/nixos/modules/programs/fish_completion-generator.patch b/nixpkgs/nixos/modules/programs/fish_completion-generator.patch
index a8c797d185a..a8c797d185a 100644
--- a/nixos/modules/programs/fish_completion-generator.patch
+++ b/nixpkgs/nixos/modules/programs/fish_completion-generator.patch
diff --git a/nixos/modules/programs/freetds.nix b/nixpkgs/nixos/modules/programs/freetds.nix
index e0860a242b7..e0860a242b7 100644
--- a/nixos/modules/programs/freetds.nix
+++ b/nixpkgs/nixos/modules/programs/freetds.nix
diff --git a/nixos/modules/programs/fuse.nix b/nixpkgs/nixos/modules/programs/fuse.nix
index c15896efbb5..c15896efbb5 100644
--- a/nixos/modules/programs/fuse.nix
+++ b/nixpkgs/nixos/modules/programs/fuse.nix
diff --git a/nixos/modules/programs/geary.nix b/nixpkgs/nixos/modules/programs/geary.nix
index 01803bc411e..01803bc411e 100644
--- a/nixos/modules/programs/geary.nix
+++ b/nixpkgs/nixos/modules/programs/geary.nix
diff --git a/nixos/modules/programs/gnome-disks.nix b/nixpkgs/nixos/modules/programs/gnome-disks.nix
index 1cf839a6ddb..1cf839a6ddb 100644
--- a/nixos/modules/programs/gnome-disks.nix
+++ b/nixpkgs/nixos/modules/programs/gnome-disks.nix
diff --git a/nixos/modules/programs/gnome-documents.nix b/nixpkgs/nixos/modules/programs/gnome-documents.nix
index bfa3d409ee3..bfa3d409ee3 100644
--- a/nixos/modules/programs/gnome-documents.nix
+++ b/nixpkgs/nixos/modules/programs/gnome-documents.nix
diff --git a/nixos/modules/programs/gnome-terminal.nix b/nixpkgs/nixos/modules/programs/gnome-terminal.nix
index 0036677a157..0036677a157 100644
--- a/nixos/modules/programs/gnome-terminal.nix
+++ b/nixpkgs/nixos/modules/programs/gnome-terminal.nix
diff --git a/nixos/modules/programs/gnupg.nix b/nixpkgs/nixos/modules/programs/gnupg.nix
index 7a3cb588ee7..7a3cb588ee7 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixpkgs/nixos/modules/programs/gnupg.nix
diff --git a/nixos/modules/programs/gpaste.nix b/nixpkgs/nixos/modules/programs/gpaste.nix
index 4f6deb77e5e..4f6deb77e5e 100644
--- a/nixos/modules/programs/gpaste.nix
+++ b/nixpkgs/nixos/modules/programs/gpaste.nix
diff --git a/nixos/modules/programs/gphoto2.nix b/nixpkgs/nixos/modules/programs/gphoto2.nix
index 93923ff3133..93923ff3133 100644
--- a/nixos/modules/programs/gphoto2.nix
+++ b/nixpkgs/nixos/modules/programs/gphoto2.nix
diff --git a/nixos/modules/programs/iftop.nix b/nixpkgs/nixos/modules/programs/iftop.nix
index a98a9a8187d..a98a9a8187d 100644
--- a/nixos/modules/programs/iftop.nix
+++ b/nixpkgs/nixos/modules/programs/iftop.nix
diff --git a/nixos/modules/programs/iotop.nix b/nixpkgs/nixos/modules/programs/iotop.nix
index 5512dbc62f7..5512dbc62f7 100644
--- a/nixos/modules/programs/iotop.nix
+++ b/nixpkgs/nixos/modules/programs/iotop.nix
diff --git a/nixos/modules/programs/java.nix b/nixpkgs/nixos/modules/programs/java.nix
index d31698c3b39..d31698c3b39 100644
--- a/nixos/modules/programs/java.nix
+++ b/nixpkgs/nixos/modules/programs/java.nix
diff --git a/nixos/modules/programs/kbdlight.nix b/nixpkgs/nixos/modules/programs/kbdlight.nix
index 58e45872fac..58e45872fac 100644
--- a/nixos/modules/programs/kbdlight.nix
+++ b/nixpkgs/nixos/modules/programs/kbdlight.nix
diff --git a/nixos/modules/programs/less.nix b/nixpkgs/nixos/modules/programs/less.nix
index 75b3e707d57..75b3e707d57 100644
--- a/nixos/modules/programs/less.nix
+++ b/nixpkgs/nixos/modules/programs/less.nix
diff --git a/nixos/modules/programs/liboping.nix b/nixpkgs/nixos/modules/programs/liboping.nix
index 4e4c235ccde..4e4c235ccde 100644
--- a/nixos/modules/programs/liboping.nix
+++ b/nixpkgs/nixos/modules/programs/liboping.nix
diff --git a/nixos/modules/programs/light.nix b/nixpkgs/nixos/modules/programs/light.nix
index 9f2a03e7e76..9f2a03e7e76 100644
--- a/nixos/modules/programs/light.nix
+++ b/nixpkgs/nixos/modules/programs/light.nix
diff --git a/nixos/modules/programs/mininet.nix b/nixpkgs/nixos/modules/programs/mininet.nix
index ecc924325e6..ecc924325e6 100644
--- a/nixos/modules/programs/mininet.nix
+++ b/nixpkgs/nixos/modules/programs/mininet.nix
diff --git a/nixos/modules/programs/mosh.nix b/nixpkgs/nixos/modules/programs/mosh.nix
index 359fe23e0ec..359fe23e0ec 100644
--- a/nixos/modules/programs/mosh.nix
+++ b/nixpkgs/nixos/modules/programs/mosh.nix
diff --git a/nixos/modules/programs/mtr.nix b/nixpkgs/nixos/modules/programs/mtr.nix
index 75b710c1584..75b710c1584 100644
--- a/nixos/modules/programs/mtr.nix
+++ b/nixpkgs/nixos/modules/programs/mtr.nix
diff --git a/nixos/modules/programs/nano.nix b/nixpkgs/nixos/modules/programs/nano.nix
index 5837dd46d7c..5837dd46d7c 100644
--- a/nixos/modules/programs/nano.nix
+++ b/nixpkgs/nixos/modules/programs/nano.nix
diff --git a/nixos/modules/programs/nm-applet.nix b/nixpkgs/nixos/modules/programs/nm-applet.nix
index 1b806071c43..1b806071c43 100644
--- a/nixos/modules/programs/nm-applet.nix
+++ b/nixpkgs/nixos/modules/programs/nm-applet.nix
diff --git a/nixos/modules/programs/npm.nix b/nixpkgs/nixos/modules/programs/npm.nix
index b351d80c7ac..b351d80c7ac 100644
--- a/nixos/modules/programs/npm.nix
+++ b/nixpkgs/nixos/modules/programs/npm.nix
diff --git a/nixos/modules/programs/oblogout.nix b/nixpkgs/nixos/modules/programs/oblogout.nix
index a039b0623b5..a039b0623b5 100644
--- a/nixos/modules/programs/oblogout.nix
+++ b/nixpkgs/nixos/modules/programs/oblogout.nix
diff --git a/nixos/modules/programs/plotinus.nix b/nixpkgs/nixos/modules/programs/plotinus.nix
index e3549c79588..e3549c79588 100644
--- a/nixos/modules/programs/plotinus.nix
+++ b/nixpkgs/nixos/modules/programs/plotinus.nix
diff --git a/nixos/modules/programs/plotinus.xml b/nixpkgs/nixos/modules/programs/plotinus.xml
index 8fc8c22c6d7..8fc8c22c6d7 100644
--- a/nixos/modules/programs/plotinus.xml
+++ b/nixpkgs/nixos/modules/programs/plotinus.xml
diff --git a/nixos/modules/programs/qt5ct.nix b/nixpkgs/nixos/modules/programs/qt5ct.nix
index aeb7fc50849..aeb7fc50849 100644
--- a/nixos/modules/programs/qt5ct.nix
+++ b/nixpkgs/nixos/modules/programs/qt5ct.nix
diff --git a/nixos/modules/programs/screen.nix b/nixpkgs/nixos/modules/programs/screen.nix
index 728a0eb8cea..728a0eb8cea 100644
--- a/nixos/modules/programs/screen.nix
+++ b/nixpkgs/nixos/modules/programs/screen.nix
diff --git a/nixos/modules/programs/seahorse.nix b/nixpkgs/nixos/modules/programs/seahorse.nix
index b229d2a2c0d..b229d2a2c0d 100644
--- a/nixos/modules/programs/seahorse.nix
+++ b/nixpkgs/nixos/modules/programs/seahorse.nix
diff --git a/nixos/modules/programs/sedutil.nix b/nixpkgs/nixos/modules/programs/sedutil.nix
index 7efc80f4abb..7efc80f4abb 100644
--- a/nixos/modules/programs/sedutil.nix
+++ b/nixpkgs/nixos/modules/programs/sedutil.nix
diff --git a/nixos/modules/programs/shadow.nix b/nixpkgs/nixos/modules/programs/shadow.nix
index fc352795c01..fc352795c01 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixpkgs/nixos/modules/programs/shadow.nix
diff --git a/nixos/modules/programs/singularity.nix b/nixpkgs/nixos/modules/programs/singularity.nix
index b27e122bd1d..b27e122bd1d 100644
--- a/nixos/modules/programs/singularity.nix
+++ b/nixpkgs/nixos/modules/programs/singularity.nix
diff --git a/nixos/modules/programs/slock.nix b/nixpkgs/nixos/modules/programs/slock.nix
index 0e1281e62cd..0e1281e62cd 100644
--- a/nixos/modules/programs/slock.nix
+++ b/nixpkgs/nixos/modules/programs/slock.nix
diff --git a/nixos/modules/programs/spacefm.nix b/nixpkgs/nixos/modules/programs/spacefm.nix
index 6d03608402f..6d03608402f 100644
--- a/nixos/modules/programs/spacefm.nix
+++ b/nixpkgs/nixos/modules/programs/spacefm.nix
diff --git a/nixos/modules/programs/ssh.nix b/nixpkgs/nixos/modules/programs/ssh.nix
index 80198990ed1..80198990ed1 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixpkgs/nixos/modules/programs/ssh.nix
diff --git a/nixos/modules/programs/ssmtp.nix b/nixpkgs/nixos/modules/programs/ssmtp.nix
index f794eac8af0..f794eac8af0 100644
--- a/nixos/modules/programs/ssmtp.nix
+++ b/nixpkgs/nixos/modules/programs/ssmtp.nix
diff --git a/nixos/modules/programs/sway.nix b/nixpkgs/nixos/modules/programs/sway.nix
index 7e646f8737d..7e646f8737d 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixpkgs/nixos/modules/programs/sway.nix
diff --git a/nixos/modules/programs/sysdig.nix b/nixpkgs/nixos/modules/programs/sysdig.nix
index fbbf2906556..fbbf2906556 100644
--- a/nixos/modules/programs/sysdig.nix
+++ b/nixpkgs/nixos/modules/programs/sysdig.nix
diff --git a/nixos/modules/programs/system-config-printer.nix b/nixpkgs/nixos/modules/programs/system-config-printer.nix
index 34592dd7064..34592dd7064 100644
--- a/nixos/modules/programs/system-config-printer.nix
+++ b/nixpkgs/nixos/modules/programs/system-config-printer.nix
diff --git a/nixos/modules/programs/systemtap.nix b/nixpkgs/nixos/modules/programs/systemtap.nix
index ca81e018c9d..ca81e018c9d 100644
--- a/nixos/modules/programs/systemtap.nix
+++ b/nixpkgs/nixos/modules/programs/systemtap.nix
diff --git a/nixos/modules/programs/thefuck.nix b/nixpkgs/nixos/modules/programs/thefuck.nix
index b909916158d..b909916158d 100644
--- a/nixos/modules/programs/thefuck.nix
+++ b/nixpkgs/nixos/modules/programs/thefuck.nix
diff --git a/nixos/modules/programs/tmux.nix b/nixpkgs/nixos/modules/programs/tmux.nix
index ed077e3daa7..ed077e3daa7 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixpkgs/nixos/modules/programs/tmux.nix
diff --git a/nixos/modules/programs/traceroute.nix b/nixpkgs/nixos/modules/programs/traceroute.nix
index 4eb0be3f0e0..4eb0be3f0e0 100644
--- a/nixos/modules/programs/traceroute.nix
+++ b/nixpkgs/nixos/modules/programs/traceroute.nix
diff --git a/nixos/modules/programs/tsm-client.nix b/nixpkgs/nixos/modules/programs/tsm-client.nix
index eb6f1247528..eb6f1247528 100644
--- a/nixos/modules/programs/tsm-client.nix
+++ b/nixpkgs/nixos/modules/programs/tsm-client.nix
diff --git a/nixos/modules/programs/udevil.nix b/nixpkgs/nixos/modules/programs/udevil.nix
index ba5670f9dfe..ba5670f9dfe 100644
--- a/nixos/modules/programs/udevil.nix
+++ b/nixpkgs/nixos/modules/programs/udevil.nix
diff --git a/nixos/modules/programs/usbtop.nix b/nixpkgs/nixos/modules/programs/usbtop.nix
index c1b6ee38caa..c1b6ee38caa 100644
--- a/nixos/modules/programs/usbtop.nix
+++ b/nixpkgs/nixos/modules/programs/usbtop.nix
diff --git a/nixos/modules/programs/venus.nix b/nixpkgs/nixos/modules/programs/venus.nix
index 110570ac3f0..110570ac3f0 100644
--- a/nixos/modules/programs/venus.nix
+++ b/nixpkgs/nixos/modules/programs/venus.nix
diff --git a/nixos/modules/programs/vim.nix b/nixpkgs/nixos/modules/programs/vim.nix
index fe0e7f2c6d6..fe0e7f2c6d6 100644
--- a/nixos/modules/programs/vim.nix
+++ b/nixpkgs/nixos/modules/programs/vim.nix
diff --git a/nixos/modules/programs/virtualbox.nix b/nixpkgs/nixos/modules/programs/virtualbox.nix
index be96cf23b39..be96cf23b39 100644
--- a/nixos/modules/programs/virtualbox.nix
+++ b/nixpkgs/nixos/modules/programs/virtualbox.nix
diff --git a/nixos/modules/programs/wavemon.nix b/nixpkgs/nixos/modules/programs/wavemon.nix
index ac665fe4a02..ac665fe4a02 100644
--- a/nixos/modules/programs/wavemon.nix
+++ b/nixpkgs/nixos/modules/programs/wavemon.nix
diff --git a/nixos/modules/programs/waybar.nix b/nixpkgs/nixos/modules/programs/waybar.nix
index 22530e6c7d4..22530e6c7d4 100644
--- a/nixos/modules/programs/waybar.nix
+++ b/nixpkgs/nixos/modules/programs/waybar.nix
diff --git a/nixos/modules/programs/wireshark.nix b/nixpkgs/nixos/modules/programs/wireshark.nix
index 819f15b98a0..819f15b98a0 100644
--- a/nixos/modules/programs/wireshark.nix
+++ b/nixpkgs/nixos/modules/programs/wireshark.nix
diff --git a/nixos/modules/programs/x2goserver.nix b/nixpkgs/nixos/modules/programs/x2goserver.nix
index 7d74231e956..7d74231e956 100644
--- a/nixos/modules/programs/x2goserver.nix
+++ b/nixpkgs/nixos/modules/programs/x2goserver.nix
diff --git a/nixos/modules/programs/xfs_quota.nix b/nixpkgs/nixos/modules/programs/xfs_quota.nix
index c03e59a5b4a..c03e59a5b4a 100644
--- a/nixos/modules/programs/xfs_quota.nix
+++ b/nixpkgs/nixos/modules/programs/xfs_quota.nix
diff --git a/nixos/modules/programs/xonsh.nix b/nixpkgs/nixos/modules/programs/xonsh.nix
index 1590020f7b6..1590020f7b6 100644
--- a/nixos/modules/programs/xonsh.nix
+++ b/nixpkgs/nixos/modules/programs/xonsh.nix
diff --git a/nixos/modules/programs/xss-lock.nix b/nixpkgs/nixos/modules/programs/xss-lock.nix
index a7ad9b89db4..a7ad9b89db4 100644
--- a/nixos/modules/programs/xss-lock.nix
+++ b/nixpkgs/nixos/modules/programs/xss-lock.nix
diff --git a/nixos/modules/programs/yabar.nix b/nixpkgs/nixos/modules/programs/yabar.nix
index 5de9331ac52..5de9331ac52 100644
--- a/nixos/modules/programs/yabar.nix
+++ b/nixpkgs/nixos/modules/programs/yabar.nix
diff --git a/nixos/modules/programs/zmap.nix b/nixpkgs/nixos/modules/programs/zmap.nix
index 2e27fce4d7c..2e27fce4d7c 100644
--- a/nixos/modules/programs/zmap.nix
+++ b/nixpkgs/nixos/modules/programs/zmap.nix
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix
index 932a780a356..932a780a356 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.nix
+++ b/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.xml
index 568c2de6557..568c2de6557 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.xml
+++ b/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.xml
diff --git a/nixos/modules/programs/zsh/zinputrc b/nixpkgs/nixos/modules/programs/zsh/zinputrc
index 6121f3e21f1..6121f3e21f1 100644
--- a/nixos/modules/programs/zsh/zinputrc
+++ b/nixpkgs/nixos/modules/programs/zsh/zinputrc
diff --git a/nixos/modules/programs/zsh/zsh-autoenv.nix b/nixpkgs/nixos/modules/programs/zsh/zsh-autoenv.nix
index 630114bcda9..630114bcda9 100644
--- a/nixos/modules/programs/zsh/zsh-autoenv.nix
+++ b/nixpkgs/nixos/modules/programs/zsh/zsh-autoenv.nix
diff --git a/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix
index 037888fdc5a..037888fdc5a 100644
--- a/nixos/modules/programs/zsh/zsh-autosuggestions.nix
+++ b/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix
diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
index 927a904369d..927a904369d 100644
--- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
+++ b/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixpkgs/nixos/modules/programs/zsh/zsh.nix
index c66c29ed45f..c66c29ed45f 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixpkgs/nixos/modules/programs/zsh/zsh.nix
diff --git a/nixos/modules/rename.nix b/nixpkgs/nixos/modules/rename.nix
index dbe687d8e22..dbe687d8e22 100644
--- a/nixos/modules/rename.nix
+++ b/nixpkgs/nixos/modules/rename.nix
diff --git a/nixos/modules/security/acme.nix b/nixpkgs/nixos/modules/security/acme.nix
index 890c421b0ea..890c421b0ea 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixpkgs/nixos/modules/security/acme.nix
diff --git a/nixos/modules/security/acme.xml b/nixpkgs/nixos/modules/security/acme.xml
index 9d0a1995e0f..9d0a1995e0f 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixpkgs/nixos/modules/security/acme.xml
diff --git a/nixos/modules/security/apparmor-suid.nix b/nixpkgs/nixos/modules/security/apparmor-suid.nix
index 3c93f5440ab..3c93f5440ab 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixpkgs/nixos/modules/security/apparmor-suid.nix
diff --git a/nixos/modules/security/apparmor.nix b/nixpkgs/nixos/modules/security/apparmor.nix
index cfc65b347bc..cfc65b347bc 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixpkgs/nixos/modules/security/apparmor.nix
diff --git a/nixos/modules/security/audit.nix b/nixpkgs/nixos/modules/security/audit.nix
index 2b22bdd9f0a..2b22bdd9f0a 100644
--- a/nixos/modules/security/audit.nix
+++ b/nixpkgs/nixos/modules/security/audit.nix
diff --git a/nixos/modules/security/auditd.nix b/nixpkgs/nixos/modules/security/auditd.nix
index 9d26cfbcfb1..9d26cfbcfb1 100644
--- a/nixos/modules/security/auditd.nix
+++ b/nixpkgs/nixos/modules/security/auditd.nix
diff --git a/nixos/modules/security/ca.nix b/nixpkgs/nixos/modules/security/ca.nix
index 1c4ee421fc5..1c4ee421fc5 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixpkgs/nixos/modules/security/ca.nix
diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix
index b83dbc4202a..b83dbc4202a 100644
--- a/nixos/modules/security/chromium-suid-sandbox.nix
+++ b/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix
diff --git a/nixos/modules/security/dhparams.nix b/nixpkgs/nixos/modules/security/dhparams.nix
index 62a499ea624..62a499ea624 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixpkgs/nixos/modules/security/dhparams.nix
diff --git a/nixos/modules/security/duosec.nix b/nixpkgs/nixos/modules/security/duosec.nix
index 78a82b7154e..78a82b7154e 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixpkgs/nixos/modules/security/duosec.nix
diff --git a/nixos/modules/security/google_oslogin.nix b/nixpkgs/nixos/modules/security/google_oslogin.nix
index 246419b681a..246419b681a 100644
--- a/nixos/modules/security/google_oslogin.nix
+++ b/nixpkgs/nixos/modules/security/google_oslogin.nix
diff --git a/nixos/modules/security/hidepid.nix b/nixpkgs/nixos/modules/security/hidepid.nix
index 55a48ea3c9c..55a48ea3c9c 100644
--- a/nixos/modules/security/hidepid.nix
+++ b/nixpkgs/nixos/modules/security/hidepid.nix
diff --git a/nixos/modules/security/hidepid.xml b/nixpkgs/nixos/modules/security/hidepid.xml
index 5a17cb1da41..5a17cb1da41 100644
--- a/nixos/modules/security/hidepid.xml
+++ b/nixpkgs/nixos/modules/security/hidepid.xml
diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixpkgs/nixos/modules/security/lock-kernel-modules.nix
index fc9e7939d81..fc9e7939d81 100644
--- a/nixos/modules/security/lock-kernel-modules.nix
+++ b/nixpkgs/nixos/modules/security/lock-kernel-modules.nix
diff --git a/nixos/modules/security/misc.nix b/nixpkgs/nixos/modules/security/misc.nix
index 16e3bfb1419..16e3bfb1419 100644
--- a/nixos/modules/security/misc.nix
+++ b/nixpkgs/nixos/modules/security/misc.nix
diff --git a/nixos/modules/security/oath.nix b/nixpkgs/nixos/modules/security/oath.nix
index 93bdc851117..93bdc851117 100644
--- a/nixos/modules/security/oath.nix
+++ b/nixpkgs/nixos/modules/security/oath.nix
diff --git a/nixos/modules/security/pam.nix b/nixpkgs/nixos/modules/security/pam.nix
index bfc2a881387..bfc2a881387 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixpkgs/nixos/modules/security/pam.nix
diff --git a/nixos/modules/security/pam_mount.nix b/nixpkgs/nixos/modules/security/pam_mount.nix
index 77e22a96b55..77e22a96b55 100644
--- a/nixos/modules/security/pam_mount.nix
+++ b/nixpkgs/nixos/modules/security/pam_mount.nix
diff --git a/nixos/modules/security/pam_usb.nix b/nixpkgs/nixos/modules/security/pam_usb.nix
index c695ba075ca..c695ba075ca 100644
--- a/nixos/modules/security/pam_usb.nix
+++ b/nixpkgs/nixos/modules/security/pam_usb.nix
diff --git a/nixos/modules/security/polkit.nix b/nixpkgs/nixos/modules/security/polkit.nix
index a6724bd7583..a6724bd7583 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixpkgs/nixos/modules/security/polkit.nix
diff --git a/nixos/modules/security/prey.nix b/nixpkgs/nixos/modules/security/prey.nix
index b899ccb6c3e..b899ccb6c3e 100644
--- a/nixos/modules/security/prey.nix
+++ b/nixpkgs/nixos/modules/security/prey.nix
diff --git a/nixos/modules/security/rngd.nix b/nixpkgs/nixos/modules/security/rngd.nix
index d9d6d9c9f25..d9d6d9c9f25 100644
--- a/nixos/modules/security/rngd.nix
+++ b/nixpkgs/nixos/modules/security/rngd.nix
diff --git a/nixos/modules/security/rtkit.nix b/nixpkgs/nixos/modules/security/rtkit.nix
index a7b27cbcf21..a7b27cbcf21 100644
--- a/nixos/modules/security/rtkit.nix
+++ b/nixpkgs/nixos/modules/security/rtkit.nix
diff --git a/nixos/modules/security/sudo.nix b/nixpkgs/nixos/modules/security/sudo.nix
index d899806ef05..d899806ef05 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixpkgs/nixos/modules/security/sudo.nix
diff --git a/nixos/modules/security/systemd-confinement.nix b/nixpkgs/nixos/modules/security/systemd-confinement.nix
index cd4eb81dbe1..cd4eb81dbe1 100644
--- a/nixos/modules/security/systemd-confinement.nix
+++ b/nixpkgs/nixos/modules/security/systemd-confinement.nix
diff --git a/nixos/modules/security/wrappers/default.nix b/nixpkgs/nixos/modules/security/wrappers/default.nix
index a0fadb018ec..a0fadb018ec 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixpkgs/nixos/modules/security/wrappers/default.nix
diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixpkgs/nixos/modules/security/wrappers/wrapper.c
index 494e9e93ac2..494e9e93ac2 100644
--- a/nixos/modules/security/wrappers/wrapper.c
+++ b/nixpkgs/nixos/modules/security/wrappers/wrapper.c
diff --git a/nixos/modules/services/admin/oxidized.nix b/nixpkgs/nixos/modules/services/admin/oxidized.nix
index 94b44630ba6..94b44630ba6 100644
--- a/nixos/modules/services/admin/oxidized.nix
+++ b/nixpkgs/nixos/modules/services/admin/oxidized.nix
diff --git a/nixos/modules/services/admin/salt/master.nix b/nixpkgs/nixos/modules/services/admin/salt/master.nix
index c6b1b0cc0bd..c6b1b0cc0bd 100644
--- a/nixos/modules/services/admin/salt/master.nix
+++ b/nixpkgs/nixos/modules/services/admin/salt/master.nix
diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixpkgs/nixos/modules/services/admin/salt/minion.nix
index c8fa9461a20..c8fa9461a20 100644
--- a/nixos/modules/services/admin/salt/minion.nix
+++ b/nixpkgs/nixos/modules/services/admin/salt/minion.nix
diff --git a/nixos/modules/services/amqp/activemq/ActiveMQBroker.java b/nixpkgs/nixos/modules/services/amqp/activemq/ActiveMQBroker.java
index c0f5d16ea11..c0f5d16ea11 100644
--- a/nixos/modules/services/amqp/activemq/ActiveMQBroker.java
+++ b/nixpkgs/nixos/modules/services/amqp/activemq/ActiveMQBroker.java
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixpkgs/nixos/modules/services/amqp/activemq/default.nix
index 7729da27304..7729da27304 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixpkgs/nixos/modules/services/amqp/activemq/default.nix
diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix
index f80d6b3f1ba..f80d6b3f1ba 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix
diff --git a/nixos/modules/services/audio/alsa.nix b/nixpkgs/nixos/modules/services/audio/alsa.nix
index 990398e6546..990398e6546 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixpkgs/nixos/modules/services/audio/alsa.nix
diff --git a/nixos/modules/services/audio/icecast.nix b/nixpkgs/nixos/modules/services/audio/icecast.nix
index 6a8a0f9975b..6a8a0f9975b 100644
--- a/nixos/modules/services/audio/icecast.nix
+++ b/nixpkgs/nixos/modules/services/audio/icecast.nix
diff --git a/nixos/modules/services/audio/jack.nix b/nixpkgs/nixos/modules/services/audio/jack.nix
index ceff366d0bb..ceff366d0bb 100644
--- a/nixos/modules/services/audio/jack.nix
+++ b/nixpkgs/nixos/modules/services/audio/jack.nix
diff --git a/nixos/modules/services/audio/liquidsoap.nix b/nixpkgs/nixos/modules/services/audio/liquidsoap.nix
index 3a047d10a63..3a047d10a63 100644
--- a/nixos/modules/services/audio/liquidsoap.nix
+++ b/nixpkgs/nixos/modules/services/audio/liquidsoap.nix
diff --git a/nixos/modules/services/audio/mopidy.nix b/nixpkgs/nixos/modules/services/audio/mopidy.nix
index a534b692f17..a534b692f17 100644
--- a/nixos/modules/services/audio/mopidy.nix
+++ b/nixpkgs/nixos/modules/services/audio/mopidy.nix
diff --git a/nixos/modules/services/audio/mpd.nix b/nixpkgs/nixos/modules/services/audio/mpd.nix
index e20591b5beb..e20591b5beb 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixpkgs/nixos/modules/services/audio/mpd.nix
diff --git a/nixos/modules/services/audio/roon-server.nix b/nixpkgs/nixos/modules/services/audio/roon-server.nix
index 6aed485638c..6aed485638c 100644
--- a/nixos/modules/services/audio/roon-server.nix
+++ b/nixpkgs/nixos/modules/services/audio/roon-server.nix
diff --git a/nixos/modules/services/audio/slimserver.nix b/nixpkgs/nixos/modules/services/audio/slimserver.nix
index 8f94a2b4940..8f94a2b4940 100644
--- a/nixos/modules/services/audio/slimserver.nix
+++ b/nixpkgs/nixos/modules/services/audio/slimserver.nix
diff --git a/nixos/modules/services/audio/snapserver.nix b/nixpkgs/nixos/modules/services/audio/snapserver.nix
index b0b9264e816..b0b9264e816 100644
--- a/nixos/modules/services/audio/snapserver.nix
+++ b/nixpkgs/nixos/modules/services/audio/snapserver.nix
diff --git a/nixos/modules/services/audio/spotifyd.nix b/nixpkgs/nixos/modules/services/audio/spotifyd.nix
index 4b74e753279..4b74e753279 100644
--- a/nixos/modules/services/audio/spotifyd.nix
+++ b/nixpkgs/nixos/modules/services/audio/spotifyd.nix
diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixpkgs/nixos/modules/services/audio/squeezelite.nix
index 05506f5bcc7..05506f5bcc7 100644
--- a/nixos/modules/services/audio/squeezelite.nix
+++ b/nixpkgs/nixos/modules/services/audio/squeezelite.nix
diff --git a/nixos/modules/services/audio/ympd.nix b/nixpkgs/nixos/modules/services/audio/ympd.nix
index 551bd941fe6..551bd941fe6 100644
--- a/nixos/modules/services/audio/ympd.nix
+++ b/nixpkgs/nixos/modules/services/audio/ympd.nix
diff --git a/nixos/modules/services/backup/automysqlbackup.nix b/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix
index e3a8d1f7993..e3a8d1f7993 100644
--- a/nixos/modules/services/backup/automysqlbackup.nix
+++ b/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix
diff --git a/nixos/modules/services/backup/bacula.nix b/nixpkgs/nixos/modules/services/backup/bacula.nix
index cef304734ae..cef304734ae 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixpkgs/nixos/modules/services/backup/bacula.nix
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixpkgs/nixos/modules/services/backup/borgbackup.nix
index a2eb80c55a8..a2eb80c55a8 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixpkgs/nixos/modules/services/backup/borgbackup.nix
diff --git a/nixos/modules/services/backup/duplicati.nix b/nixpkgs/nixos/modules/services/backup/duplicati.nix
index 0ff720c5897..0ff720c5897 100644
--- a/nixos/modules/services/backup/duplicati.nix
+++ b/nixpkgs/nixos/modules/services/backup/duplicati.nix
diff --git a/nixos/modules/services/backup/duplicity.nix b/nixpkgs/nixos/modules/services/backup/duplicity.nix
index a8d56424862..a8d56424862 100644
--- a/nixos/modules/services/backup/duplicity.nix
+++ b/nixpkgs/nixos/modules/services/backup/duplicity.nix
diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixpkgs/nixos/modules/services/backup/mysql-backup.nix
index f58af82773f..f58af82773f 100644
--- a/nixos/modules/services/backup/mysql-backup.nix
+++ b/nixpkgs/nixos/modules/services/backup/mysql-backup.nix
diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix
index 580c7ce68f1..580c7ce68f1 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix
diff --git a/nixos/modules/services/backup/postgresql-wal-receiver.nix b/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix
index 3d9869d5343..3d9869d5343 100644
--- a/nixos/modules/services/backup/postgresql-wal-receiver.nix
+++ b/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix
diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix
index d1b775f150d..d1b775f150d 100644
--- a/nixos/modules/services/backup/restic-rest-server.nix
+++ b/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix
diff --git a/nixos/modules/services/backup/restic.nix b/nixpkgs/nixos/modules/services/backup/restic.nix
index 7e8e91e4b9c..7e8e91e4b9c 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixpkgs/nixos/modules/services/backup/restic.nix
diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixpkgs/nixos/modules/services/backup/rsnapshot.nix
index 6635a51ec2c..6635a51ec2c 100644
--- a/nixos/modules/services/backup/rsnapshot.nix
+++ b/nixpkgs/nixos/modules/services/backup/rsnapshot.nix
diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixpkgs/nixos/modules/services/backup/tarsnap.nix
index 6d99a1efb61..6d99a1efb61 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixpkgs/nixos/modules/services/backup/tarsnap.nix
diff --git a/nixos/modules/services/backup/tsm.nix b/nixpkgs/nixos/modules/services/backup/tsm.nix
index 6c238745797..6c238745797 100644
--- a/nixos/modules/services/backup/tsm.nix
+++ b/nixpkgs/nixos/modules/services/backup/tsm.nix
diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixpkgs/nixos/modules/services/backup/zfs-replication.nix
index 5a64304275d..5a64304275d 100644
--- a/nixos/modules/services/backup/zfs-replication.nix
+++ b/nixpkgs/nixos/modules/services/backup/zfs-replication.nix
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixpkgs/nixos/modules/services/backup/znapzend.nix
index 203631a577f..203631a577f 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixpkgs/nixos/modules/services/backup/znapzend.nix
diff --git a/nixos/modules/services/cluster/hadoop/conf.nix b/nixpkgs/nixos/modules/services/cluster/hadoop/conf.nix
index 38db10406b9..38db10406b9 100644
--- a/nixos/modules/services/cluster/hadoop/conf.nix
+++ b/nixpkgs/nixos/modules/services/cluster/hadoop/conf.nix
diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix
index f0f5a6ecbfc..f0f5a6ecbfc 100644
--- a/nixos/modules/services/cluster/hadoop/default.nix
+++ b/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix
diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixpkgs/nixos/modules/services/cluster/hadoop/hdfs.nix
index 4f4b0a92108..4f4b0a92108 100644
--- a/nixos/modules/services/cluster/hadoop/hdfs.nix
+++ b/nixpkgs/nixos/modules/services/cluster/hadoop/hdfs.nix
diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix
index c92020637e4..c92020637e4 100644
--- a/nixos/modules/services/cluster/hadoop/yarn.nix
+++ b/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix
diff --git a/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix
index 17f2dde31a7..17f2dde31a7 100644
--- a/nixos/modules/services/cluster/kubernetes/addon-manager.nix
+++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix
diff --git a/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
index 2ed7742eda0..2ed7742eda0 100644
--- a/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
+++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix
index f12e866930d..f12e866930d 100644
--- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix
+++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix
diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix
index 95bdb4c0d14..95bdb4c0d14 100644
--- a/nixos/modules/services/cluster/kubernetes/apiserver.nix
+++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix
diff --git a/nixos/modules/services/cluster/kubernetes/controller-manager.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix
index a99ef6640e9..a99ef6640e9 100644
--- a/nixos/modules/services/cluster/kubernetes/controller-manager.nix
+++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix
index 3a11a6513a4..3a11a6513a4 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix
diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix
index 548ffed1ddb..548ffed1ddb 100644
--- a/nixos/modules/services/cluster/kubernetes/flannel.nix
+++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix
index c3d67552cc8..c3d67552cc8 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix
diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix
index 4275563f1a3..4275563f1a3 100644
--- a/nixos/modules/services/cluster/kubernetes/pki.nix
+++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix
diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix
index 86d1dc2439b..86d1dc2439b 100644
--- a/nixos/modules/services/cluster/kubernetes/proxy.nix
+++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix
diff --git a/nixos/modules/services/cluster/kubernetes/scheduler.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix
index 5f6113227d9..5f6113227d9 100644
--- a/nixos/modules/services/cluster/kubernetes/scheduler.nix
+++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix
diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixpkgs/nixos/modules/services/computing/boinc/client.nix
index a7edac02538..a7edac02538 100644
--- a/nixos/modules/services/computing/boinc/client.nix
+++ b/nixpkgs/nixos/modules/services/computing/boinc/client.nix
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix
index c70d999ca96..c70d999ca96 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix
diff --git a/nixos/modules/services/computing/torque/mom.nix b/nixpkgs/nixos/modules/services/computing/torque/mom.nix
index 83772539a7a..83772539a7a 100644
--- a/nixos/modules/services/computing/torque/mom.nix
+++ b/nixpkgs/nixos/modules/services/computing/torque/mom.nix
diff --git a/nixos/modules/services/computing/torque/server.nix b/nixpkgs/nixos/modules/services/computing/torque/server.nix
index 655d1500497..655d1500497 100644
--- a/nixos/modules/services/computing/torque/server.nix
+++ b/nixpkgs/nixos/modules/services/computing/torque/server.nix
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix
index e3da3092d45..e3da3092d45 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix
diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix
index 52f24b8cee3..52f24b8cee3 100644
--- a/nixos/modules/services/continuous-integration/buildbot/worker.nix
+++ b/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix
diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 58bce654941..58bce654941 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agent.nix
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 3d307b1abcf..3d307b1abcf 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix
diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix
index 2e9e1c94857..2e9e1c94857 100644
--- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix
+++ b/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix
diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix
index 4fa41ac49ed..4fa41ac49ed 100644
--- a/nixos/modules/services/continuous-integration/gocd-server/default.nix
+++ b/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix
diff --git a/nixos/modules/services/continuous-integration/hail.nix b/nixpkgs/nixos/modules/services/continuous-integration/hail.nix
index 5d0c3f7b4ab..5d0c3f7b4ab 100644
--- a/nixos/modules/services/continuous-integration/hail.nix
+++ b/nixpkgs/nixos/modules/services/continuous-integration/hail.nix
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix
index 8b56207590a..8b56207590a 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix
index 1477c471f8a..1477c471f8a 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix
diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
index 5d1bfe4ec40..5d1bfe4ec40 100644
--- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
+++ b/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixpkgs/nixos/modules/services/continuous-integration/jenkins/slave.nix
index 3c0e6f78e74..3c0e6f78e74 100644
--- a/nixos/modules/services/continuous-integration/jenkins/slave.nix
+++ b/nixpkgs/nixos/modules/services/continuous-integration/jenkins/slave.nix
diff --git a/nixos/modules/services/databases/aerospike.nix b/nixpkgs/nixos/modules/services/databases/aerospike.nix
index 4b905f90529..4b905f90529 100644
--- a/nixos/modules/services/databases/aerospike.nix
+++ b/nixpkgs/nixos/modules/services/databases/aerospike.nix
diff --git a/nixos/modules/services/databases/cassandra.nix b/nixpkgs/nixos/modules/services/databases/cassandra.nix
index 90c094f68b6..90c094f68b6 100644
--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixpkgs/nixos/modules/services/databases/cassandra.nix
diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixpkgs/nixos/modules/services/databases/clickhouse.nix
index dbabcae43ee..dbabcae43ee 100644
--- a/nixos/modules/services/databases/clickhouse.nix
+++ b/nixpkgs/nixos/modules/services/databases/clickhouse.nix
diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixpkgs/nixos/modules/services/databases/cockroachdb.nix
index b6f94a4881a..b6f94a4881a 100644
--- a/nixos/modules/services/databases/cockroachdb.nix
+++ b/nixpkgs/nixos/modules/services/databases/cockroachdb.nix
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixpkgs/nixos/modules/services/databases/couchdb.nix
index 53224db1d89..53224db1d89 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixpkgs/nixos/modules/services/databases/couchdb.nix
diff --git a/nixos/modules/services/databases/firebird.nix b/nixpkgs/nixos/modules/services/databases/firebird.nix
index 042c9841df5..042c9841df5 100644
--- a/nixos/modules/services/databases/firebird.nix
+++ b/nixpkgs/nixos/modules/services/databases/firebird.nix
diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixpkgs/nixos/modules/services/databases/foundationdb.nix
index 18727acc7c7..18727acc7c7 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixpkgs/nixos/modules/services/databases/foundationdb.nix
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixpkgs/nixos/modules/services/databases/foundationdb.xml
index b0b1ebeab45..b0b1ebeab45 100644
--- a/nixos/modules/services/databases/foundationdb.xml
+++ b/nixpkgs/nixos/modules/services/databases/foundationdb.xml
diff --git a/nixos/modules/services/databases/hbase.nix b/nixpkgs/nixos/modules/services/databases/hbase.nix
index 2d1a47bbaa3..2d1a47bbaa3 100644
--- a/nixos/modules/services/databases/hbase.nix
+++ b/nixpkgs/nixos/modules/services/databases/hbase.nix
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixpkgs/nixos/modules/services/databases/influxdb.nix
index dd5d69b1147..dd5d69b1147 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixpkgs/nixos/modules/services/databases/influxdb.nix
diff --git a/nixos/modules/services/databases/memcached.nix b/nixpkgs/nixos/modules/services/databases/memcached.nix
index 89ff957babf..89ff957babf 100644
--- a/nixos/modules/services/databases/memcached.nix
+++ b/nixpkgs/nixos/modules/services/databases/memcached.nix
diff --git a/nixos/modules/services/databases/monetdb.nix b/nixpkgs/nixos/modules/services/databases/monetdb.nix
index 5c66fc7b2e3..5c66fc7b2e3 100644
--- a/nixos/modules/services/databases/monetdb.nix
+++ b/nixpkgs/nixos/modules/services/databases/monetdb.nix
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixpkgs/nixos/modules/services/databases/mongodb.nix
index 12879afed47..12879afed47 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixpkgs/nixos/modules/services/databases/mongodb.nix
diff --git a/nixos/modules/services/databases/mysql.nix b/nixpkgs/nixos/modules/services/databases/mysql.nix
index 8d520b82fb5..8d520b82fb5 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixpkgs/nixos/modules/services/databases/mysql.nix
diff --git a/nixos/modules/services/databases/neo4j.nix b/nixpkgs/nixos/modules/services/databases/neo4j.nix
index 09b453e7584..09b453e7584 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixpkgs/nixos/modules/services/databases/neo4j.nix
diff --git a/nixos/modules/services/databases/openldap.nix b/nixpkgs/nixos/modules/services/databases/openldap.nix
index 809f61cfa81..809f61cfa81 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixpkgs/nixos/modules/services/databases/openldap.nix
diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixpkgs/nixos/modules/services/databases/opentsdb.nix
index c4bd71f3d60..c4bd71f3d60 100644
--- a/nixos/modules/services/databases/opentsdb.nix
+++ b/nixpkgs/nixos/modules/services/databases/opentsdb.nix
diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixpkgs/nixos/modules/services/databases/pgmanage.nix
index 0f8634dab31..0f8634dab31 100644
--- a/nixos/modules/services/databases/pgmanage.nix
+++ b/nixpkgs/nixos/modules/services/databases/pgmanage.nix
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixpkgs/nixos/modules/services/databases/postgresql.nix
index c8fdd89d0d8..c8fdd89d0d8 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixpkgs/nixos/modules/services/databases/postgresql.nix
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixpkgs/nixos/modules/services/databases/postgresql.xml
index 72d4a8249a3..72d4a8249a3 100644
--- a/nixos/modules/services/databases/postgresql.xml
+++ b/nixpkgs/nixos/modules/services/databases/postgresql.xml
diff --git a/nixos/modules/services/databases/redis.nix b/nixpkgs/nixos/modules/services/databases/redis.nix
index 70895fa53e4..70895fa53e4 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixpkgs/nixos/modules/services/databases/redis.nix
diff --git a/nixos/modules/services/databases/rethinkdb.nix b/nixpkgs/nixos/modules/services/databases/rethinkdb.nix
index f18fbaf5b06..f18fbaf5b06 100644
--- a/nixos/modules/services/databases/rethinkdb.nix
+++ b/nixpkgs/nixos/modules/services/databases/rethinkdb.nix
diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixpkgs/nixos/modules/services/databases/riak-cs.nix
index 2cb204f729a..2cb204f729a 100644
--- a/nixos/modules/services/databases/riak-cs.nix
+++ b/nixpkgs/nixos/modules/services/databases/riak-cs.nix
diff --git a/nixos/modules/services/databases/riak.nix b/nixpkgs/nixos/modules/services/databases/riak.nix
index 885215209bd..885215209bd 100644
--- a/nixos/modules/services/databases/riak.nix
+++ b/nixpkgs/nixos/modules/services/databases/riak.nix
diff --git a/nixos/modules/services/databases/stanchion.nix b/nixpkgs/nixos/modules/services/databases/stanchion.nix
index 97e55bc70c4..97e55bc70c4 100644
--- a/nixos/modules/services/databases/stanchion.nix
+++ b/nixpkgs/nixos/modules/services/databases/stanchion.nix
diff --git a/nixos/modules/services/databases/victoriametrics.nix b/nixpkgs/nixos/modules/services/databases/victoriametrics.nix
index cb6bf8508fb..cb6bf8508fb 100644
--- a/nixos/modules/services/databases/victoriametrics.nix
+++ b/nixpkgs/nixos/modules/services/databases/victoriametrics.nix
diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixpkgs/nixos/modules/services/databases/virtuoso.nix
index 0cc027cb1d7..0cc027cb1d7 100644
--- a/nixos/modules/services/databases/virtuoso.nix
+++ b/nixpkgs/nixos/modules/services/databases/virtuoso.nix
diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixpkgs/nixos/modules/services/desktops/accountsservice.nix
index c48036a99e8..c48036a99e8 100644
--- a/nixos/modules/services/desktops/accountsservice.nix
+++ b/nixpkgs/nixos/modules/services/desktops/accountsservice.nix
diff --git a/nixos/modules/services/desktops/bamf.nix b/nixpkgs/nixos/modules/services/desktops/bamf.nix
index 0928ee81a64..0928ee81a64 100644
--- a/nixos/modules/services/desktops/bamf.nix
+++ b/nixpkgs/nixos/modules/services/desktops/bamf.nix
diff --git a/nixos/modules/services/desktops/blueman.nix b/nixpkgs/nixos/modules/services/desktops/blueman.nix
index 18ad610247e..18ad610247e 100644
--- a/nixos/modules/services/desktops/blueman.nix
+++ b/nixpkgs/nixos/modules/services/desktops/blueman.nix
diff --git a/nixos/modules/services/desktops/deepin/deepin.nix b/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix
index 931bac58ace..931bac58ace 100644
--- a/nixos/modules/services/desktops/deepin/deepin.nix
+++ b/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix
diff --git a/nixos/modules/services/desktops/dleyna-renderer.nix b/nixpkgs/nixos/modules/services/desktops/dleyna-renderer.nix
index 7f88605f627..7f88605f627 100644
--- a/nixos/modules/services/desktops/dleyna-renderer.nix
+++ b/nixpkgs/nixos/modules/services/desktops/dleyna-renderer.nix
diff --git a/nixos/modules/services/desktops/dleyna-server.nix b/nixpkgs/nixos/modules/services/desktops/dleyna-server.nix
index 9a131a5e700..9a131a5e700 100644
--- a/nixos/modules/services/desktops/dleyna-server.nix
+++ b/nixpkgs/nixos/modules/services/desktops/dleyna-server.nix
diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixpkgs/nixos/modules/services/desktops/flatpak.nix
index 7fb0024f37d..7fb0024f37d 100644
--- a/nixos/modules/services/desktops/flatpak.nix
+++ b/nixpkgs/nixos/modules/services/desktops/flatpak.nix
diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixpkgs/nixos/modules/services/desktops/flatpak.xml
index 8f080b25022..8f080b25022 100644
--- a/nixos/modules/services/desktops/flatpak.xml
+++ b/nixpkgs/nixos/modules/services/desktops/flatpak.xml
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixpkgs/nixos/modules/services/desktops/geoclue2.nix
index 542b2ead410..542b2ead410 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixpkgs/nixos/modules/services/desktops/geoclue2.nix
diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
index 8fa108c4f9d..8fa108c4f9d 100644
--- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
diff --git a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix
index 3d2b3ed85e3..3d2b3ed85e3 100644
--- a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix
diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
index 7e312a1b81e..7e312a1b81e 100644
--- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
diff --git a/nixos/modules/services/desktops/gnome3/glib-networking.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix
index fcd58509d6f..fcd58509d6f 100644
--- a/nixos/modules/services/desktops/gnome3/glib-networking.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix
index d715d52c2d0..d715d52c2d0 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
index db60445ef77..db60445ef77 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
index 748a025414a..748a025414a 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
index d406bf6f5e3..d406bf6f5e3 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
index 021f4f9534b..021f4f9534b 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
index 2f83fd653bd..2f83fd653bd 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
index f8396287770..f8396287770 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/rygel.nix
index 55d5e703aa1..55d5e703aa1 100644
--- a/nixos/modules/services/desktops/gnome3/rygel.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/rygel.nix
diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/sushi.nix
index 7a4389038b2..7a4389038b2 100644
--- a/nixos/modules/services/desktops/gnome3/sushi.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/sushi.nix
diff --git a/nixos/modules/services/desktops/gnome3/tracker-miners.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/tracker-miners.nix
index b390d8368c6..b390d8368c6 100644
--- a/nixos/modules/services/desktops/gnome3/tracker-miners.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/tracker-miners.nix
diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/tracker.nix
index 2e829274226..2e829274226 100644
--- a/nixos/modules/services/desktops/gnome3/tracker.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gnome3/tracker.nix
diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixpkgs/nixos/modules/services/desktops/gsignond.nix
index 5ab9add9f32..5ab9add9f32 100644
--- a/nixos/modules/services/desktops/gsignond.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gsignond.nix
diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixpkgs/nixos/modules/services/desktops/gvfs.nix
index 1d002eac41d..1d002eac41d 100644
--- a/nixos/modules/services/desktops/gvfs.nix
+++ b/nixpkgs/nixos/modules/services/desktops/gvfs.nix
diff --git a/nixos/modules/services/desktops/neard.nix b/nixpkgs/nixos/modules/services/desktops/neard.nix
index 9b0f8d1b3a7..9b0f8d1b3a7 100644
--- a/nixos/modules/services/desktops/neard.nix
+++ b/nixpkgs/nixos/modules/services/desktops/neard.nix
diff --git a/nixos/modules/services/desktops/pantheon/contractor.nix b/nixpkgs/nixos/modules/services/desktops/pantheon/contractor.nix
index c76145191a7..c76145191a7 100644
--- a/nixos/modules/services/desktops/pantheon/contractor.nix
+++ b/nixpkgs/nixos/modules/services/desktops/pantheon/contractor.nix
diff --git a/nixos/modules/services/desktops/pantheon/files.nix b/nixpkgs/nixos/modules/services/desktops/pantheon/files.nix
index 8cee9f42b62..8cee9f42b62 100644
--- a/nixos/modules/services/desktops/pantheon/files.nix
+++ b/nixpkgs/nixos/modules/services/desktops/pantheon/files.nix
diff --git a/nixos/modules/services/desktops/pipewire.nix b/nixpkgs/nixos/modules/services/desktops/pipewire.nix
index 13f3d61e84c..13f3d61e84c 100644
--- a/nixos/modules/services/desktops/pipewire.nix
+++ b/nixpkgs/nixos/modules/services/desktops/pipewire.nix
diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixpkgs/nixos/modules/services/desktops/profile-sync-daemon.nix
index a8ac22ac127..a8ac22ac127 100644
--- a/nixos/modules/services/desktops/profile-sync-daemon.nix
+++ b/nixpkgs/nixos/modules/services/desktops/profile-sync-daemon.nix
diff --git a/nixos/modules/services/desktops/system-config-printer.nix b/nixpkgs/nixos/modules/services/desktops/system-config-printer.nix
index 09c68c587b4..09c68c587b4 100644
--- a/nixos/modules/services/desktops/system-config-printer.nix
+++ b/nixpkgs/nixos/modules/services/desktops/system-config-printer.nix
diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixpkgs/nixos/modules/services/desktops/telepathy.nix
index f5401c18098..f5401c18098 100644
--- a/nixos/modules/services/desktops/telepathy.nix
+++ b/nixpkgs/nixos/modules/services/desktops/telepathy.nix
diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixpkgs/nixos/modules/services/desktops/tumbler.nix
index a833e99ff8c..a833e99ff8c 100644
--- a/nixos/modules/services/desktops/tumbler.nix
+++ b/nixpkgs/nixos/modules/services/desktops/tumbler.nix
diff --git a/nixos/modules/services/desktops/zeitgeist.nix b/nixpkgs/nixos/modules/services/desktops/zeitgeist.nix
index 20c82ccdd56..20c82ccdd56 100644
--- a/nixos/modules/services/desktops/zeitgeist.nix
+++ b/nixpkgs/nixos/modules/services/desktops/zeitgeist.nix
diff --git a/nixos/modules/services/development/bloop.nix b/nixpkgs/nixos/modules/services/development/bloop.nix
index 226718a9e80..226718a9e80 100644
--- a/nixos/modules/services/development/bloop.nix
+++ b/nixpkgs/nixos/modules/services/development/bloop.nix
diff --git a/nixos/modules/services/development/hoogle.nix b/nixpkgs/nixos/modules/services/development/hoogle.nix
index 1a98f005602..1a98f005602 100644
--- a/nixos/modules/services/development/hoogle.nix
+++ b/nixpkgs/nixos/modules/services/development/hoogle.nix
diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixpkgs/nixos/modules/services/development/jupyter/default.nix
index f20860af6e1..f20860af6e1 100644
--- a/nixos/modules/services/development/jupyter/default.nix
+++ b/nixpkgs/nixos/modules/services/development/jupyter/default.nix
diff --git a/nixos/modules/services/development/jupyter/kernel-options.nix b/nixpkgs/nixos/modules/services/development/jupyter/kernel-options.nix
index 03547637449..03547637449 100644
--- a/nixos/modules/services/development/jupyter/kernel-options.nix
+++ b/nixpkgs/nixos/modules/services/development/jupyter/kernel-options.nix
diff --git a/nixos/modules/services/development/lorri.nix b/nixpkgs/nixos/modules/services/development/lorri.nix
index c843aa56d13..c843aa56d13 100644
--- a/nixos/modules/services/development/lorri.nix
+++ b/nixpkgs/nixos/modules/services/development/lorri.nix
diff --git a/nixos/modules/services/editors/emacs.nix b/nixpkgs/nixos/modules/services/editors/emacs.nix
index d791b387665..d791b387665 100644
--- a/nixos/modules/services/editors/emacs.nix
+++ b/nixpkgs/nixos/modules/services/editors/emacs.nix
diff --git a/nixos/modules/services/editors/emacs.xml b/nixpkgs/nixos/modules/services/editors/emacs.xml
index 03483f69fa2..03483f69fa2 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixpkgs/nixos/modules/services/editors/emacs.xml
diff --git a/nixos/modules/services/editors/infinoted.nix b/nixpkgs/nixos/modules/services/editors/infinoted.nix
index 8b997ccbf66..8b997ccbf66 100644
--- a/nixos/modules/services/editors/infinoted.nix
+++ b/nixpkgs/nixos/modules/services/editors/infinoted.nix
diff --git a/nixos/modules/services/games/factorio.nix b/nixpkgs/nixos/modules/services/games/factorio.nix
index f3831156f45..f3831156f45 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixpkgs/nixos/modules/services/games/factorio.nix
diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixpkgs/nixos/modules/services/games/minecraft-server.nix
index eb9288fca58..eb9288fca58 100644
--- a/nixos/modules/services/games/minecraft-server.nix
+++ b/nixpkgs/nixos/modules/services/games/minecraft-server.nix
diff --git a/nixos/modules/services/games/minetest-server.nix b/nixpkgs/nixos/modules/services/games/minetest-server.nix
index 98e69c6dc0e..98e69c6dc0e 100644
--- a/nixos/modules/services/games/minetest-server.nix
+++ b/nixpkgs/nixos/modules/services/games/minetest-server.nix
diff --git a/nixos/modules/services/games/openarena.nix b/nixpkgs/nixos/modules/services/games/openarena.nix
index 8c014d78809..8c014d78809 100644
--- a/nixos/modules/services/games/openarena.nix
+++ b/nixpkgs/nixos/modules/services/games/openarena.nix
diff --git a/nixos/modules/services/games/terraria.nix b/nixpkgs/nixos/modules/services/games/terraria.nix
index a59b74c0b4c..a59b74c0b4c 100644
--- a/nixos/modules/services/games/terraria.nix
+++ b/nixpkgs/nixos/modules/services/games/terraria.nix
diff --git a/nixos/modules/services/hardware/acpid.nix b/nixpkgs/nixos/modules/services/hardware/acpid.nix
index 4c97485d972..4c97485d972 100644
--- a/nixos/modules/services/hardware/acpid.nix
+++ b/nixpkgs/nixos/modules/services/hardware/acpid.nix
diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixpkgs/nixos/modules/services/hardware/actkbd.nix
index daa407ca1f0..daa407ca1f0 100644
--- a/nixos/modules/services/hardware/actkbd.nix
+++ b/nixpkgs/nixos/modules/services/hardware/actkbd.nix
diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixpkgs/nixos/modules/services/hardware/bluetooth.nix
index dfa39e7f602..dfa39e7f602 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixpkgs/nixos/modules/services/hardware/bluetooth.nix
diff --git a/nixos/modules/services/hardware/bolt.nix b/nixpkgs/nixos/modules/services/hardware/bolt.nix
index 32b60af0603..32b60af0603 100644
--- a/nixos/modules/services/hardware/bolt.nix
+++ b/nixpkgs/nixos/modules/services/hardware/bolt.nix
diff --git a/nixos/modules/services/hardware/brltty.nix b/nixpkgs/nixos/modules/services/hardware/brltty.nix
index 1266e8f81e5..1266e8f81e5 100644
--- a/nixos/modules/services/hardware/brltty.nix
+++ b/nixpkgs/nixos/modules/services/hardware/brltty.nix
diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixpkgs/nixos/modules/services/hardware/fancontrol.nix
index bb4541a784d..bb4541a784d 100644
--- a/nixos/modules/services/hardware/fancontrol.nix
+++ b/nixpkgs/nixos/modules/services/hardware/fancontrol.nix
diff --git a/nixos/modules/services/hardware/freefall.nix b/nixpkgs/nixos/modules/services/hardware/freefall.nix
index 83f1e8c84f2..83f1e8c84f2 100644
--- a/nixos/modules/services/hardware/freefall.nix
+++ b/nixpkgs/nixos/modules/services/hardware/freefall.nix
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixpkgs/nixos/modules/services/hardware/fwupd.nix
index 51877970a8b..51877970a8b 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixpkgs/nixos/modules/services/hardware/fwupd.nix
diff --git a/nixos/modules/services/hardware/illum.nix b/nixpkgs/nixos/modules/services/hardware/illum.nix
index ff73c99a653..ff73c99a653 100644
--- a/nixos/modules/services/hardware/illum.nix
+++ b/nixpkgs/nixos/modules/services/hardware/illum.nix
diff --git a/nixos/modules/services/hardware/interception-tools.nix b/nixpkgs/nixos/modules/services/hardware/interception-tools.nix
index fadcb19a016..fadcb19a016 100644
--- a/nixos/modules/services/hardware/interception-tools.nix
+++ b/nixpkgs/nixos/modules/services/hardware/interception-tools.nix
diff --git a/nixos/modules/services/hardware/irqbalance.nix b/nixpkgs/nixos/modules/services/hardware/irqbalance.nix
index b139154432c..b139154432c 100644
--- a/nixos/modules/services/hardware/irqbalance.nix
+++ b/nixpkgs/nixos/modules/services/hardware/irqbalance.nix
diff --git a/nixos/modules/services/hardware/lcd.nix b/nixpkgs/nixos/modules/services/hardware/lcd.nix
index d78d742cd31..d78d742cd31 100644
--- a/nixos/modules/services/hardware/lcd.nix
+++ b/nixpkgs/nixos/modules/services/hardware/lcd.nix
diff --git a/nixos/modules/services/hardware/lirc.nix b/nixpkgs/nixos/modules/services/hardware/lirc.nix
index 826e512c75d..826e512c75d 100644
--- a/nixos/modules/services/hardware/lirc.nix
+++ b/nixpkgs/nixos/modules/services/hardware/lirc.nix
diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixpkgs/nixos/modules/services/hardware/nvidia-optimus.nix
index d53175052c7..d53175052c7 100644
--- a/nixos/modules/services/hardware/nvidia-optimus.nix
+++ b/nixpkgs/nixos/modules/services/hardware/nvidia-optimus.nix
diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixpkgs/nixos/modules/services/hardware/pcscd.nix
index f3fc4c3cc79..f3fc4c3cc79 100644
--- a/nixos/modules/services/hardware/pcscd.nix
+++ b/nixpkgs/nixos/modules/services/hardware/pcscd.nix
diff --git a/nixos/modules/services/hardware/pommed.nix b/nixpkgs/nixos/modules/services/hardware/pommed.nix
index bf7d6a46a29..bf7d6a46a29 100644
--- a/nixos/modules/services/hardware/pommed.nix
+++ b/nixpkgs/nixos/modules/services/hardware/pommed.nix
diff --git a/nixos/modules/services/hardware/ratbagd.nix b/nixpkgs/nixos/modules/services/hardware/ratbagd.nix
index 103e1d2315a..103e1d2315a 100644
--- a/nixos/modules/services/hardware/ratbagd.nix
+++ b/nixpkgs/nixos/modules/services/hardware/ratbagd.nix
diff --git a/nixos/modules/services/hardware/sane.nix b/nixpkgs/nixos/modules/services/hardware/sane.nix
index b344dfc2061..b344dfc2061 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixpkgs/nixos/modules/services/hardware/sane.nix
diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
index 6f49a1ab6d4..6f49a1ab6d4 100644
--- a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
+++ b/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
index 6bf31982b71..6bf31982b71 100644
--- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
+++ b/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
diff --git a/nixos/modules/services/hardware/sane_extra_backends/dsseries.nix b/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/dsseries.nix
index d71a17f5ea6..d71a17f5ea6 100644
--- a/nixos/modules/services/hardware/sane_extra_backends/dsseries.nix
+++ b/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/dsseries.nix
diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixpkgs/nixos/modules/services/hardware/tcsd.nix
index 68cb5d791aa..68cb5d791aa 100644
--- a/nixos/modules/services/hardware/tcsd.nix
+++ b/nixpkgs/nixos/modules/services/hardware/tcsd.nix
diff --git a/nixos/modules/services/hardware/thermald.nix b/nixpkgs/nixos/modules/services/hardware/thermald.nix
index 69577bbe018..69577bbe018 100644
--- a/nixos/modules/services/hardware/thermald.nix
+++ b/nixpkgs/nixos/modules/services/hardware/thermald.nix
diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixpkgs/nixos/modules/services/hardware/thinkfan.nix
index 7c105e99ca5..7c105e99ca5 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixpkgs/nixos/modules/services/hardware/thinkfan.nix
diff --git a/nixos/modules/services/hardware/throttled.nix b/nixpkgs/nixos/modules/services/hardware/throttled.nix
index 7617c4492d7..7617c4492d7 100644
--- a/nixos/modules/services/hardware/throttled.nix
+++ b/nixpkgs/nixos/modules/services/hardware/throttled.nix
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixpkgs/nixos/modules/services/hardware/tlp.nix
index 955a6067799..955a6067799 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixpkgs/nixos/modules/services/hardware/tlp.nix
diff --git a/nixos/modules/services/hardware/trezord.nix b/nixpkgs/nixos/modules/services/hardware/trezord.nix
index c517e9fbb2b..c517e9fbb2b 100644
--- a/nixos/modules/services/hardware/trezord.nix
+++ b/nixpkgs/nixos/modules/services/hardware/trezord.nix
diff --git a/nixos/modules/services/hardware/trezord.xml b/nixpkgs/nixos/modules/services/hardware/trezord.xml
index 972d409d9d0..972d409d9d0 100644
--- a/nixos/modules/services/hardware/trezord.xml
+++ b/nixpkgs/nixos/modules/services/hardware/trezord.xml
diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix
index f9f5234bdc3..f9f5234bdc3 100644
--- a/nixos/modules/services/hardware/triggerhappy.nix
+++ b/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix
diff --git a/nixos/modules/services/hardware/u2f.nix b/nixpkgs/nixos/modules/services/hardware/u2f.nix
index bb4b2f05f89..bb4b2f05f89 100644
--- a/nixos/modules/services/hardware/u2f.nix
+++ b/nixpkgs/nixos/modules/services/hardware/u2f.nix
diff --git a/nixos/modules/services/hardware/udev.nix b/nixpkgs/nixos/modules/services/hardware/udev.nix
index 168056a475e..168056a475e 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixpkgs/nixos/modules/services/hardware/udev.nix
diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixpkgs/nixos/modules/services/hardware/udisks2.nix
index e898f326058..e898f326058 100644
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixpkgs/nixos/modules/services/hardware/udisks2.nix
diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixpkgs/nixos/modules/services/hardware/undervolt.nix
index e5ef0601de3..e5ef0601de3 100644
--- a/nixos/modules/services/hardware/undervolt.nix
+++ b/nixpkgs/nixos/modules/services/hardware/undervolt.nix
diff --git a/nixos/modules/services/hardware/upower.nix b/nixpkgs/nixos/modules/services/hardware/upower.nix
index 449810b5315..449810b5315 100644
--- a/nixos/modules/services/hardware/upower.nix
+++ b/nixpkgs/nixos/modules/services/hardware/upower.nix
diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixpkgs/nixos/modules/services/hardware/usbmuxd.nix
index 11a4b0a858f..11a4b0a858f 100644
--- a/nixos/modules/services/hardware/usbmuxd.nix
+++ b/nixpkgs/nixos/modules/services/hardware/usbmuxd.nix
diff --git a/nixos/modules/services/hardware/vdr.nix b/nixpkgs/nixos/modules/services/hardware/vdr.nix
index 8a6cde51b06..8a6cde51b06 100644
--- a/nixos/modules/services/hardware/vdr.nix
+++ b/nixpkgs/nixos/modules/services/hardware/vdr.nix
diff --git a/nixos/modules/services/logging/SystemdJournal2Gelf.nix b/nixpkgs/nixos/modules/services/logging/SystemdJournal2Gelf.nix
index f26aef7262b..f26aef7262b 100644
--- a/nixos/modules/services/logging/SystemdJournal2Gelf.nix
+++ b/nixpkgs/nixos/modules/services/logging/SystemdJournal2Gelf.nix
diff --git a/nixos/modules/services/logging/awstats.nix b/nixpkgs/nixos/modules/services/logging/awstats.nix
index 5939d7808f7..5939d7808f7 100644
--- a/nixos/modules/services/logging/awstats.nix
+++ b/nixpkgs/nixos/modules/services/logging/awstats.nix
diff --git a/nixos/modules/services/logging/fluentd.nix b/nixpkgs/nixos/modules/services/logging/fluentd.nix
index 95825705d9d..95825705d9d 100644
--- a/nixos/modules/services/logging/fluentd.nix
+++ b/nixpkgs/nixos/modules/services/logging/fluentd.nix
diff --git a/nixos/modules/services/logging/graylog.nix b/nixpkgs/nixos/modules/services/logging/graylog.nix
index a889a44d4b2..a889a44d4b2 100644
--- a/nixos/modules/services/logging/graylog.nix
+++ b/nixpkgs/nixos/modules/services/logging/graylog.nix
diff --git a/nixos/modules/services/logging/heartbeat.nix b/nixpkgs/nixos/modules/services/logging/heartbeat.nix
index 56fb4deabda..56fb4deabda 100644
--- a/nixos/modules/services/logging/heartbeat.nix
+++ b/nixpkgs/nixos/modules/services/logging/heartbeat.nix
diff --git a/nixos/modules/services/logging/journalbeat.nix b/nixpkgs/nixos/modules/services/logging/journalbeat.nix
index 89f53b1b245..89f53b1b245 100644
--- a/nixos/modules/services/logging/journalbeat.nix
+++ b/nixpkgs/nixos/modules/services/logging/journalbeat.nix
diff --git a/nixos/modules/services/logging/journaldriver.nix b/nixpkgs/nixos/modules/services/logging/journaldriver.nix
index 9bd581e9ec0..9bd581e9ec0 100644
--- a/nixos/modules/services/logging/journaldriver.nix
+++ b/nixpkgs/nixos/modules/services/logging/journaldriver.nix
diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixpkgs/nixos/modules/services/logging/journalwatch.nix
index 576c646c0f5..576c646c0f5 100644
--- a/nixos/modules/services/logging/journalwatch.nix
+++ b/nixpkgs/nixos/modules/services/logging/journalwatch.nix
diff --git a/nixos/modules/services/logging/klogd.nix b/nixpkgs/nixos/modules/services/logging/klogd.nix
index 2d1f515da92..2d1f515da92 100644
--- a/nixos/modules/services/logging/klogd.nix
+++ b/nixpkgs/nixos/modules/services/logging/klogd.nix
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixpkgs/nixos/modules/services/logging/logcheck.nix
index 4296b2270c2..4296b2270c2 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixpkgs/nixos/modules/services/logging/logcheck.nix
diff --git a/nixos/modules/services/logging/logrotate.nix b/nixpkgs/nixos/modules/services/logging/logrotate.nix
index fdd9f0f3e5c..fdd9f0f3e5c 100644
--- a/nixos/modules/services/logging/logrotate.nix
+++ b/nixpkgs/nixos/modules/services/logging/logrotate.nix
diff --git a/nixos/modules/services/logging/logstash.nix b/nixpkgs/nixos/modules/services/logging/logstash.nix
index 21a83803fd8..21a83803fd8 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixpkgs/nixos/modules/services/logging/logstash.nix
diff --git a/nixos/modules/services/logging/rsyslogd.nix b/nixpkgs/nixos/modules/services/logging/rsyslogd.nix
index b924d94e0b0..b924d94e0b0 100644
--- a/nixos/modules/services/logging/rsyslogd.nix
+++ b/nixpkgs/nixos/modules/services/logging/rsyslogd.nix
diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixpkgs/nixos/modules/services/logging/syslog-ng.nix
index 35055311680..35055311680 100644
--- a/nixos/modules/services/logging/syslog-ng.nix
+++ b/nixpkgs/nixos/modules/services/logging/syslog-ng.nix
diff --git a/nixos/modules/services/logging/syslogd.nix b/nixpkgs/nixos/modules/services/logging/syslogd.nix
index fe0b0490811..fe0b0490811 100644
--- a/nixos/modules/services/logging/syslogd.nix
+++ b/nixpkgs/nixos/modules/services/logging/syslogd.nix
diff --git a/nixos/modules/services/mail/clamsmtp.nix b/nixpkgs/nixos/modules/services/mail/clamsmtp.nix
index fc1267c5d28..fc1267c5d28 100644
--- a/nixos/modules/services/mail/clamsmtp.nix
+++ b/nixpkgs/nixos/modules/services/mail/clamsmtp.nix
diff --git a/nixos/modules/services/mail/davmail.nix b/nixpkgs/nixos/modules/services/mail/davmail.nix
index 374a3dd75c1..374a3dd75c1 100644
--- a/nixos/modules/services/mail/davmail.nix
+++ b/nixpkgs/nixos/modules/services/mail/davmail.nix
diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixpkgs/nixos/modules/services/mail/dkimproxy-out.nix
index f4ac9e47007..f4ac9e47007 100644
--- a/nixos/modules/services/mail/dkimproxy-out.nix
+++ b/nixpkgs/nixos/modules/services/mail/dkimproxy-out.nix
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixpkgs/nixos/modules/services/mail/dovecot.nix
index b5ed2c594f7..b5ed2c594f7 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixpkgs/nixos/modules/services/mail/dovecot.nix
diff --git a/nixos/modules/services/mail/dspam.nix b/nixpkgs/nixos/modules/services/mail/dspam.nix
index 766ebc8095a..766ebc8095a 100644
--- a/nixos/modules/services/mail/dspam.nix
+++ b/nixpkgs/nixos/modules/services/mail/dspam.nix
diff --git a/nixos/modules/services/mail/exim.nix b/nixpkgs/nixos/modules/services/mail/exim.nix
index 892fbd33214..892fbd33214 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixpkgs/nixos/modules/services/mail/exim.nix
diff --git a/nixos/modules/services/mail/freepops.nix b/nixpkgs/nixos/modules/services/mail/freepops.nix
index 5b729ca50a5..5b729ca50a5 100644
--- a/nixos/modules/services/mail/freepops.nix
+++ b/nixpkgs/nixos/modules/services/mail/freepops.nix
diff --git a/nixos/modules/services/mail/mail.nix b/nixpkgs/nixos/modules/services/mail/mail.nix
index fed313e4738..fed313e4738 100644
--- a/nixos/modules/services/mail/mail.nix
+++ b/nixpkgs/nixos/modules/services/mail/mail.nix
diff --git a/nixos/modules/services/mail/mailcatcher.nix b/nixpkgs/nixos/modules/services/mail/mailcatcher.nix
index 84f06ed199d..84f06ed199d 100644
--- a/nixos/modules/services/mail/mailcatcher.nix
+++ b/nixpkgs/nixos/modules/services/mail/mailcatcher.nix
diff --git a/nixos/modules/services/mail/mailhog.nix b/nixpkgs/nixos/modules/services/mail/mailhog.nix
index 0f998c6d0ea..0f998c6d0ea 100644
--- a/nixos/modules/services/mail/mailhog.nix
+++ b/nixpkgs/nixos/modules/services/mail/mailhog.nix
diff --git a/nixos/modules/services/mail/mailman.nix b/nixpkgs/nixos/modules/services/mail/mailman.nix
index 43dc185cdd7..43dc185cdd7 100644
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixpkgs/nixos/modules/services/mail/mailman.nix
diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixpkgs/nixos/modules/services/mail/mlmmj.nix
index d58d93c4214..d58d93c4214 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixpkgs/nixos/modules/services/mail/mlmmj.nix
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixpkgs/nixos/modules/services/mail/nullmailer.nix
index fe3f8ef9b39..fe3f8ef9b39 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixpkgs/nixos/modules/services/mail/nullmailer.nix
diff --git a/nixos/modules/services/mail/offlineimap.nix b/nixpkgs/nixos/modules/services/mail/offlineimap.nix
index 294e3806f94..294e3806f94 100644
--- a/nixos/modules/services/mail/offlineimap.nix
+++ b/nixpkgs/nixos/modules/services/mail/offlineimap.nix
diff --git a/nixos/modules/services/mail/opendkim.nix b/nixpkgs/nixos/modules/services/mail/opendkim.nix
index eb6a426684d..eb6a426684d 100644
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixpkgs/nixos/modules/services/mail/opendkim.nix
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixpkgs/nixos/modules/services/mail/opensmtpd.nix
index 1fabe2da45c..1fabe2da45c 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixpkgs/nixos/modules/services/mail/opensmtpd.nix
diff --git a/nixos/modules/services/mail/pfix-srsd.nix b/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix
index 38984f896d6..38984f896d6 100644
--- a/nixos/modules/services/mail/pfix-srsd.nix
+++ b/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix
diff --git a/nixos/modules/services/mail/postfix.nix b/nixpkgs/nixos/modules/services/mail/postfix.nix
index 19e11b31d9c..19e11b31d9c 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixpkgs/nixos/modules/services/mail/postfix.nix
diff --git a/nixos/modules/services/mail/postgrey.nix b/nixpkgs/nixos/modules/services/mail/postgrey.nix
index 709f6b21aa0..709f6b21aa0 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixpkgs/nixos/modules/services/mail/postgrey.nix
diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixpkgs/nixos/modules/services/mail/postsrsd.nix
index 2ebc675ab10..2ebc675ab10 100644
--- a/nixos/modules/services/mail/postsrsd.nix
+++ b/nixpkgs/nixos/modules/services/mail/postsrsd.nix
diff --git a/nixos/modules/services/mail/roundcube.nix b/nixpkgs/nixos/modules/services/mail/roundcube.nix
index 0bb0eaedad5..0bb0eaedad5 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixpkgs/nixos/modules/services/mail/roundcube.nix
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixpkgs/nixos/modules/services/mail/rspamd.nix
index aacdbe2aeed..aacdbe2aeed 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixpkgs/nixos/modules/services/mail/rspamd.nix
diff --git a/nixos/modules/services/mail/rss2email.nix b/nixpkgs/nixos/modules/services/mail/rss2email.nix
index c1e5964c453..c1e5964c453 100644
--- a/nixos/modules/services/mail/rss2email.nix
+++ b/nixpkgs/nixos/modules/services/mail/rss2email.nix
diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixpkgs/nixos/modules/services/mail/spamassassin.nix
index 2d5fb40fad3..2d5fb40fad3 100644
--- a/nixos/modules/services/mail/spamassassin.nix
+++ b/nixpkgs/nixos/modules/services/mail/spamassassin.nix
diff --git a/nixos/modules/services/misc/airsonic.nix b/nixpkgs/nixos/modules/services/misc/airsonic.nix
index c296e048cea..c296e048cea 100644
--- a/nixos/modules/services/misc/airsonic.nix
+++ b/nixpkgs/nixos/modules/services/misc/airsonic.nix
diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixpkgs/nixos/modules/services/misc/apache-kafka.nix
index f3a650a260f..f3a650a260f 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixpkgs/nixos/modules/services/misc/apache-kafka.nix
diff --git a/nixos/modules/services/misc/autofs.nix b/nixpkgs/nixos/modules/services/misc/autofs.nix
index f1742177326..f1742177326 100644
--- a/nixos/modules/services/misc/autofs.nix
+++ b/nixpkgs/nixos/modules/services/misc/autofs.nix
diff --git a/nixos/modules/services/misc/autorandr.nix b/nixpkgs/nixos/modules/services/misc/autorandr.nix
index 4708e16e2a6..4708e16e2a6 100644
--- a/nixos/modules/services/misc/autorandr.nix
+++ b/nixpkgs/nixos/modules/services/misc/autorandr.nix
diff --git a/nixos/modules/services/misc/beanstalkd.nix b/nixpkgs/nixos/modules/services/misc/beanstalkd.nix
index bcd133c9741..bcd133c9741 100644
--- a/nixos/modules/services/misc/beanstalkd.nix
+++ b/nixpkgs/nixos/modules/services/misc/beanstalkd.nix
diff --git a/nixos/modules/services/misc/bees.nix b/nixpkgs/nixos/modules/services/misc/bees.nix
index b0ed2d5c286..b0ed2d5c286 100644
--- a/nixos/modules/services/misc/bees.nix
+++ b/nixpkgs/nixos/modules/services/misc/bees.nix
diff --git a/nixos/modules/services/misc/bepasty.nix b/nixpkgs/nixos/modules/services/misc/bepasty.nix
index f69832e5b2b..f69832e5b2b 100644
--- a/nixos/modules/services/misc/bepasty.nix
+++ b/nixpkgs/nixos/modules/services/misc/bepasty.nix
diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixpkgs/nixos/modules/services/misc/calibre-server.nix
index 84c04f403d3..84c04f403d3 100644
--- a/nixos/modules/services/misc/calibre-server.nix
+++ b/nixpkgs/nixos/modules/services/misc/calibre-server.nix
diff --git a/nixos/modules/services/misc/canto-daemon.nix b/nixpkgs/nixos/modules/services/misc/canto-daemon.nix
index db51a263aab..db51a263aab 100644
--- a/nixos/modules/services/misc/canto-daemon.nix
+++ b/nixpkgs/nixos/modules/services/misc/canto-daemon.nix
diff --git a/nixos/modules/services/misc/cfdyndns.nix b/nixpkgs/nixos/modules/services/misc/cfdyndns.nix
index dcf41602273..dcf41602273 100644
--- a/nixos/modules/services/misc/cfdyndns.nix
+++ b/nixpkgs/nixos/modules/services/misc/cfdyndns.nix
diff --git a/nixos/modules/services/misc/cgminer.nix b/nixpkgs/nixos/modules/services/misc/cgminer.nix
index 9fcae645269..9fcae645269 100644
--- a/nixos/modules/services/misc/cgminer.nix
+++ b/nixpkgs/nixos/modules/services/misc/cgminer.nix
diff --git a/nixos/modules/services/misc/clipmenu.nix b/nixpkgs/nixos/modules/services/misc/clipmenu.nix
index 3ba050044ca..3ba050044ca 100644
--- a/nixos/modules/services/misc/clipmenu.nix
+++ b/nixpkgs/nixos/modules/services/misc/clipmenu.nix
diff --git a/nixos/modules/services/misc/confd.nix b/nixpkgs/nixos/modules/services/misc/confd.nix
index 8e9bec15dd4..8e9bec15dd4 100755
--- a/nixos/modules/services/misc/confd.nix
+++ b/nixpkgs/nixos/modules/services/misc/confd.nix
diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixpkgs/nixos/modules/services/misc/couchpotato.nix
index f5163cf86cf..f5163cf86cf 100644
--- a/nixos/modules/services/misc/couchpotato.nix
+++ b/nixpkgs/nixos/modules/services/misc/couchpotato.nix
diff --git a/nixos/modules/services/misc/cpuminer-cryptonight.nix b/nixpkgs/nixos/modules/services/misc/cpuminer-cryptonight.nix
index 907b9d90da2..907b9d90da2 100644
--- a/nixos/modules/services/misc/cpuminer-cryptonight.nix
+++ b/nixpkgs/nixos/modules/services/misc/cpuminer-cryptonight.nix
diff --git a/nixos/modules/services/misc/defaultUnicornConfig.rb b/nixpkgs/nixos/modules/services/misc/defaultUnicornConfig.rb
index 0b58c59c7a5..0b58c59c7a5 100644
--- a/nixos/modules/services/misc/defaultUnicornConfig.rb
+++ b/nixpkgs/nixos/modules/services/misc/defaultUnicornConfig.rb
diff --git a/nixos/modules/services/misc/devmon.nix b/nixpkgs/nixos/modules/services/misc/devmon.nix
index 9dc8fee2964..9dc8fee2964 100644
--- a/nixos/modules/services/misc/devmon.nix
+++ b/nixpkgs/nixos/modules/services/misc/devmon.nix
diff --git a/nixos/modules/services/misc/dictd.nix b/nixpkgs/nixos/modules/services/misc/dictd.nix
index d175854d2d1..d175854d2d1 100644
--- a/nixos/modules/services/misc/dictd.nix
+++ b/nixpkgs/nixos/modules/services/misc/dictd.nix
diff --git a/nixos/modules/services/misc/disnix.nix b/nixpkgs/nixos/modules/services/misc/disnix.nix
index c21cb2afc3c..c21cb2afc3c 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixpkgs/nixos/modules/services/misc/disnix.nix
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixpkgs/nixos/modules/services/misc/docker-registry.nix
index 89bac4f47d7..89bac4f47d7 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixpkgs/nixos/modules/services/misc/docker-registry.nix
diff --git a/nixos/modules/services/misc/dwm-status.nix b/nixpkgs/nixos/modules/services/misc/dwm-status.nix
index b98a42e6a6d..b98a42e6a6d 100644
--- a/nixos/modules/services/misc/dwm-status.nix
+++ b/nixpkgs/nixos/modules/services/misc/dwm-status.nix
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixpkgs/nixos/modules/services/misc/dysnomia.nix
index 33a6fb15264..33a6fb15264 100644
--- a/nixos/modules/services/misc/dysnomia.nix
+++ b/nixpkgs/nixos/modules/services/misc/dysnomia.nix
diff --git a/nixos/modules/services/misc/errbot.nix b/nixpkgs/nixos/modules/services/misc/errbot.nix
index b447ba5d438..b447ba5d438 100644
--- a/nixos/modules/services/misc/errbot.nix
+++ b/nixpkgs/nixos/modules/services/misc/errbot.nix
diff --git a/nixos/modules/services/misc/etcd.nix b/nixpkgs/nixos/modules/services/misc/etcd.nix
index 7322e1c080b..7322e1c080b 100644
--- a/nixos/modules/services/misc/etcd.nix
+++ b/nixpkgs/nixos/modules/services/misc/etcd.nix
diff --git a/nixos/modules/services/misc/ethminer.nix b/nixpkgs/nixos/modules/services/misc/ethminer.nix
index 95afb0460fb..95afb0460fb 100644
--- a/nixos/modules/services/misc/ethminer.nix
+++ b/nixpkgs/nixos/modules/services/misc/ethminer.nix
diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixpkgs/nixos/modules/services/misc/exhibitor.nix
index f8c79f892da..f8c79f892da 100644
--- a/nixos/modules/services/misc/exhibitor.nix
+++ b/nixpkgs/nixos/modules/services/misc/exhibitor.nix
diff --git a/nixos/modules/services/misc/felix.nix b/nixpkgs/nixos/modules/services/misc/felix.nix
index 188e45abc58..188e45abc58 100644
--- a/nixos/modules/services/misc/felix.nix
+++ b/nixpkgs/nixos/modules/services/misc/felix.nix
diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixpkgs/nixos/modules/services/misc/folding-at-home.nix
index fd2ea3948f6..fd2ea3948f6 100644
--- a/nixos/modules/services/misc/folding-at-home.nix
+++ b/nixpkgs/nixos/modules/services/misc/folding-at-home.nix
diff --git a/nixos/modules/services/misc/freeswitch.nix b/nixpkgs/nixos/modules/services/misc/freeswitch.nix
index 0de5ba42811..0de5ba42811 100644
--- a/nixos/modules/services/misc/freeswitch.nix
+++ b/nixpkgs/nixos/modules/services/misc/freeswitch.nix
diff --git a/nixos/modules/services/misc/fstrim.nix b/nixpkgs/nixos/modules/services/misc/fstrim.nix
index b8841a7fe74..b8841a7fe74 100644
--- a/nixos/modules/services/misc/fstrim.nix
+++ b/nixpkgs/nixos/modules/services/misc/fstrim.nix
diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix
index 3057d7fd1a0..3057d7fd1a0 100644
--- a/nixos/modules/services/misc/gammu-smsd.nix
+++ b/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix
diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixpkgs/nixos/modules/services/misc/geoip-updater.nix
index baf0a8d73d1..baf0a8d73d1 100644
--- a/nixos/modules/services/misc/geoip-updater.nix
+++ b/nixpkgs/nixos/modules/services/misc/geoip-updater.nix
diff --git a/nixos/modules/services/misc/gitea.nix b/nixpkgs/nixos/modules/services/misc/gitea.nix
index 38910a5a005..38910a5a005 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixpkgs/nixos/modules/services/misc/gitea.nix
diff --git a/nixos/modules/services/misc/gitit.nix b/nixpkgs/nixos/modules/services/misc/gitit.nix
index 1ec030549f9..1ec030549f9 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixpkgs/nixos/modules/services/misc/gitit.nix
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixpkgs/nixos/modules/services/misc/gitlab.nix
index aa958985379..aa958985379 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixpkgs/nixos/modules/services/misc/gitlab.nix
diff --git a/nixos/modules/services/misc/gitlab.xml b/nixpkgs/nixos/modules/services/misc/gitlab.xml
index b6171a9a194..b6171a9a194 100644
--- a/nixos/modules/services/misc/gitlab.xml
+++ b/nixpkgs/nixos/modules/services/misc/gitlab.xml
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixpkgs/nixos/modules/services/misc/gitolite.nix
index cc69f81bbcc..cc69f81bbcc 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixpkgs/nixos/modules/services/misc/gitolite.nix
diff --git a/nixos/modules/services/misc/gitweb.nix b/nixpkgs/nixos/modules/services/misc/gitweb.nix
index ca21366b779..ca21366b779 100644
--- a/nixos/modules/services/misc/gitweb.nix
+++ b/nixpkgs/nixos/modules/services/misc/gitweb.nix
diff --git a/nixos/modules/services/misc/gogs.nix b/nixpkgs/nixos/modules/services/misc/gogs.nix
index ee99967c261..ee99967c261 100644
--- a/nixos/modules/services/misc/gogs.nix
+++ b/nixpkgs/nixos/modules/services/misc/gogs.nix
diff --git a/nixos/modules/services/misc/gollum.nix b/nixpkgs/nixos/modules/services/misc/gollum.nix
index f4a9c72b154..f4a9c72b154 100644
--- a/nixos/modules/services/misc/gollum.nix
+++ b/nixpkgs/nixos/modules/services/misc/gollum.nix
diff --git a/nixos/modules/services/misc/gpsd.nix b/nixpkgs/nixos/modules/services/misc/gpsd.nix
index f954249942a..f954249942a 100644
--- a/nixos/modules/services/misc/gpsd.nix
+++ b/nixpkgs/nixos/modules/services/misc/gpsd.nix
diff --git a/nixos/modules/services/misc/greenclip.nix b/nixpkgs/nixos/modules/services/misc/greenclip.nix
index 9152a782d7f..9152a782d7f 100644
--- a/nixos/modules/services/misc/greenclip.nix
+++ b/nixpkgs/nixos/modules/services/misc/greenclip.nix
diff --git a/nixos/modules/services/misc/headphones.nix b/nixpkgs/nixos/modules/services/misc/headphones.nix
index 3ee0a4458bd..3ee0a4458bd 100644
--- a/nixos/modules/services/misc/headphones.nix
+++ b/nixpkgs/nixos/modules/services/misc/headphones.nix
diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixpkgs/nixos/modules/services/misc/home-assistant.nix
index d63f38e93b8..d63f38e93b8 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixpkgs/nixos/modules/services/misc/home-assistant.nix
diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixpkgs/nixos/modules/services/misc/ihaskell.nix
index 11597706d0d..11597706d0d 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixpkgs/nixos/modules/services/misc/ihaskell.nix
diff --git a/nixos/modules/services/misc/irkerd.nix b/nixpkgs/nixos/modules/services/misc/irkerd.nix
index 993d77ba424..993d77ba424 100644
--- a/nixos/modules/services/misc/irkerd.nix
+++ b/nixpkgs/nixos/modules/services/misc/irkerd.nix
diff --git a/nixos/modules/services/misc/jackett.nix b/nixpkgs/nixos/modules/services/misc/jackett.nix
index f2dc6635df9..f2dc6635df9 100644
--- a/nixos/modules/services/misc/jackett.nix
+++ b/nixpkgs/nixos/modules/services/misc/jackett.nix
diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixpkgs/nixos/modules/services/misc/jellyfin.nix
index 6ecdfb57dc3..6ecdfb57dc3 100644
--- a/nixos/modules/services/misc/jellyfin.nix
+++ b/nixpkgs/nixos/modules/services/misc/jellyfin.nix
diff --git a/nixos/modules/services/misc/leaps.nix b/nixpkgs/nixos/modules/services/misc/leaps.nix
index d4e88ecbebd..d4e88ecbebd 100644
--- a/nixos/modules/services/misc/leaps.nix
+++ b/nixpkgs/nixos/modules/services/misc/leaps.nix
diff --git a/nixos/modules/services/misc/lidarr.nix b/nixpkgs/nixos/modules/services/misc/lidarr.nix
index 8ff1adadcf2..8ff1adadcf2 100644
--- a/nixos/modules/services/misc/lidarr.nix
+++ b/nixpkgs/nixos/modules/services/misc/lidarr.nix
diff --git a/nixos/modules/services/misc/logkeys.nix b/nixpkgs/nixos/modules/services/misc/logkeys.nix
index 0082db63a06..0082db63a06 100644
--- a/nixos/modules/services/misc/logkeys.nix
+++ b/nixpkgs/nixos/modules/services/misc/logkeys.nix
diff --git a/nixos/modules/services/misc/mame.nix b/nixpkgs/nixos/modules/services/misc/mame.nix
index c5d5e9e4837..c5d5e9e4837 100644
--- a/nixos/modules/services/misc/mame.nix
+++ b/nixpkgs/nixos/modules/services/misc/mame.nix
diff --git a/nixos/modules/services/misc/mathics.nix b/nixpkgs/nixos/modules/services/misc/mathics.nix
index c588a30d76c..c588a30d76c 100644
--- a/nixos/modules/services/misc/mathics.nix
+++ b/nixpkgs/nixos/modules/services/misc/mathics.nix
diff --git a/nixos/modules/services/misc/matrix-synapse-log_config.yaml b/nixpkgs/nixos/modules/services/misc/matrix-synapse-log_config.yaml
index d85bdd1208f..d85bdd1208f 100644
--- a/nixos/modules/services/misc/matrix-synapse-log_config.yaml
+++ b/nixpkgs/nixos/modules/services/misc/matrix-synapse-log_config.yaml
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix
index 750f4a292fb..750f4a292fb 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix
diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixpkgs/nixos/modules/services/misc/mbpfan.nix
index e22d1ed61f9..e22d1ed61f9 100644
--- a/nixos/modules/services/misc/mbpfan.nix
+++ b/nixpkgs/nixos/modules/services/misc/mbpfan.nix
diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixpkgs/nixos/modules/services/misc/mediatomb.nix
index 529f584a201..529f584a201 100644
--- a/nixos/modules/services/misc/mediatomb.nix
+++ b/nixpkgs/nixos/modules/services/misc/mediatomb.nix
diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixpkgs/nixos/modules/services/misc/mesos-master.nix
index 572a9847e46..572a9847e46 100644
--- a/nixos/modules/services/misc/mesos-master.nix
+++ b/nixpkgs/nixos/modules/services/misc/mesos-master.nix
diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixpkgs/nixos/modules/services/misc/mesos-slave.nix
index 170065d0065..170065d0065 100644
--- a/nixos/modules/services/misc/mesos-slave.nix
+++ b/nixpkgs/nixos/modules/services/misc/mesos-slave.nix
diff --git a/nixos/modules/services/misc/metabase.nix b/nixpkgs/nixos/modules/services/misc/metabase.nix
index e78100a046a..e78100a046a 100644
--- a/nixos/modules/services/misc/metabase.nix
+++ b/nixpkgs/nixos/modules/services/misc/metabase.nix
diff --git a/nixos/modules/services/misc/mwlib.nix b/nixpkgs/nixos/modules/services/misc/mwlib.nix
index 6b41b552a86..6b41b552a86 100644
--- a/nixos/modules/services/misc/mwlib.nix
+++ b/nixpkgs/nixos/modules/services/misc/mwlib.nix
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixpkgs/nixos/modules/services/misc/nix-daemon.nix
index 17c3582db0f..17c3582db0f 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixpkgs/nixos/modules/services/misc/nix-daemon.nix
diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixpkgs/nixos/modules/services/misc/nix-gc.nix
index 12bed05757a..12bed05757a 100644
--- a/nixos/modules/services/misc/nix-gc.nix
+++ b/nixpkgs/nixos/modules/services/misc/nix-gc.nix
diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixpkgs/nixos/modules/services/misc/nix-optimise.nix
index e02026d5f76..e02026d5f76 100644
--- a/nixos/modules/services/misc/nix-optimise.nix
+++ b/nixpkgs/nixos/modules/services/misc/nix-optimise.nix
diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix
index 7ce3841be2f..7ce3841be2f 100644
--- a/nixos/modules/services/misc/nix-ssh-serve.nix
+++ b/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixpkgs/nixos/modules/services/misc/nixos-manual.nix
index ab73f49d4be..ab73f49d4be 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixpkgs/nixos/modules/services/misc/nixos-manual.nix
diff --git a/nixos/modules/services/misc/novacomd.nix b/nixpkgs/nixos/modules/services/misc/novacomd.nix
index 7cfc68d2b67..7cfc68d2b67 100644
--- a/nixos/modules/services/misc/novacomd.nix
+++ b/nixpkgs/nixos/modules/services/misc/novacomd.nix
diff --git a/nixos/modules/services/misc/nzbget.nix b/nixpkgs/nixos/modules/services/misc/nzbget.nix
index 715ec891cd6..715ec891cd6 100644
--- a/nixos/modules/services/misc/nzbget.nix
+++ b/nixpkgs/nixos/modules/services/misc/nzbget.nix
diff --git a/nixos/modules/services/misc/octoprint.nix b/nixpkgs/nixos/modules/services/misc/octoprint.nix
index 651ed374388..651ed374388 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixpkgs/nixos/modules/services/misc/octoprint.nix
diff --git a/nixos/modules/services/misc/osrm.nix b/nixpkgs/nixos/modules/services/misc/osrm.nix
index 79c347ab7e0..79c347ab7e0 100644
--- a/nixos/modules/services/misc/osrm.nix
+++ b/nixpkgs/nixos/modules/services/misc/osrm.nix
diff --git a/nixos/modules/services/misc/packagekit.nix b/nixpkgs/nixos/modules/services/misc/packagekit.nix
index 325c4e84e0d..325c4e84e0d 100644
--- a/nixos/modules/services/misc/packagekit.nix
+++ b/nixpkgs/nixos/modules/services/misc/packagekit.nix
diff --git a/nixos/modules/services/misc/paperless.nix b/nixpkgs/nixos/modules/services/misc/paperless.nix
index bfaf760fb83..bfaf760fb83 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixpkgs/nixos/modules/services/misc/paperless.nix
diff --git a/nixos/modules/services/misc/parsoid.nix b/nixpkgs/nixos/modules/services/misc/parsoid.nix
index 61626e78f8b..61626e78f8b 100644
--- a/nixos/modules/services/misc/parsoid.nix
+++ b/nixpkgs/nixos/modules/services/misc/parsoid.nix
diff --git a/nixos/modules/services/misc/plex.nix b/nixpkgs/nixos/modules/services/misc/plex.nix
index 7efadf1b9bb..7efadf1b9bb 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixpkgs/nixos/modules/services/misc/plex.nix
diff --git a/nixos/modules/services/misc/pykms.nix b/nixpkgs/nixos/modules/services/misc/pykms.nix
index 25aa27ae767..25aa27ae767 100644
--- a/nixos/modules/services/misc/pykms.nix
+++ b/nixpkgs/nixos/modules/services/misc/pykms.nix
diff --git a/nixos/modules/services/misc/radarr.nix b/nixpkgs/nixos/modules/services/misc/radarr.nix
index 74444e24043..74444e24043 100644
--- a/nixos/modules/services/misc/radarr.nix
+++ b/nixpkgs/nixos/modules/services/misc/radarr.nix
diff --git a/nixos/modules/services/misc/redmine.nix b/nixpkgs/nixos/modules/services/misc/redmine.nix
index 3b8c14d196f..3b8c14d196f 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixpkgs/nixos/modules/services/misc/redmine.nix
diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixpkgs/nixos/modules/services/misc/ripple-data-api.nix
index 9fab462f7e3..9fab462f7e3 100644
--- a/nixos/modules/services/misc/ripple-data-api.nix
+++ b/nixpkgs/nixos/modules/services/misc/ripple-data-api.nix
diff --git a/nixos/modules/services/misc/rippled.nix b/nixpkgs/nixos/modules/services/misc/rippled.nix
index ef34e3a779f..ef34e3a779f 100644
--- a/nixos/modules/services/misc/rippled.nix
+++ b/nixpkgs/nixos/modules/services/misc/rippled.nix
diff --git a/nixos/modules/services/misc/rogue.nix b/nixpkgs/nixos/modules/services/misc/rogue.nix
index d56d103b5f3..d56d103b5f3 100644
--- a/nixos/modules/services/misc/rogue.nix
+++ b/nixpkgs/nixos/modules/services/misc/rogue.nix
diff --git a/nixos/modules/services/misc/safeeyes.nix b/nixpkgs/nixos/modules/services/misc/safeeyes.nix
index 1a33971d922..1a33971d922 100644
--- a/nixos/modules/services/misc/safeeyes.nix
+++ b/nixpkgs/nixos/modules/services/misc/safeeyes.nix
diff --git a/nixos/modules/services/misc/serviio.nix b/nixpkgs/nixos/modules/services/misc/serviio.nix
index 0ead6a81691..0ead6a81691 100644
--- a/nixos/modules/services/misc/serviio.nix
+++ b/nixpkgs/nixos/modules/services/misc/serviio.nix
diff --git a/nixos/modules/services/misc/sickbeard.nix b/nixpkgs/nixos/modules/services/misc/sickbeard.nix
index a32dbfa3108..a32dbfa3108 100644
--- a/nixos/modules/services/misc/sickbeard.nix
+++ b/nixpkgs/nixos/modules/services/misc/sickbeard.nix
diff --git a/nixos/modules/services/misc/siproxd.nix b/nixpkgs/nixos/modules/services/misc/siproxd.nix
index ae7b27de8e7..ae7b27de8e7 100644
--- a/nixos/modules/services/misc/siproxd.nix
+++ b/nixpkgs/nixos/modules/services/misc/siproxd.nix
diff --git a/nixos/modules/services/misc/snapper.nix b/nixpkgs/nixos/modules/services/misc/snapper.nix
index 6f3aaa973a0..6f3aaa973a0 100644
--- a/nixos/modules/services/misc/snapper.nix
+++ b/nixpkgs/nixos/modules/services/misc/snapper.nix
diff --git a/nixos/modules/services/misc/sonarr.nix b/nixpkgs/nixos/modules/services/misc/sonarr.nix
index 77c7f0582d0..77c7f0582d0 100644
--- a/nixos/modules/services/misc/sonarr.nix
+++ b/nixpkgs/nixos/modules/services/misc/sonarr.nix
diff --git a/nixos/modules/services/misc/spice-vdagentd.nix b/nixpkgs/nixos/modules/services/misc/spice-vdagentd.nix
index 2dd9fcf68ab..2dd9fcf68ab 100644
--- a/nixos/modules/services/misc/spice-vdagentd.nix
+++ b/nixpkgs/nixos/modules/services/misc/spice-vdagentd.nix
diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixpkgs/nixos/modules/services/misc/ssm-agent.nix
index e951a4c7ffa..e951a4c7ffa 100644
--- a/nixos/modules/services/misc/ssm-agent.nix
+++ b/nixpkgs/nixos/modules/services/misc/ssm-agent.nix
diff --git a/nixos/modules/services/misc/sssd.nix b/nixpkgs/nixos/modules/services/misc/sssd.nix
index 6b64045dde8..6b64045dde8 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixpkgs/nixos/modules/services/misc/sssd.nix
diff --git a/nixos/modules/services/misc/subsonic.nix b/nixpkgs/nixos/modules/services/misc/subsonic.nix
index 152917d345c..152917d345c 100644
--- a/nixos/modules/services/misc/subsonic.nix
+++ b/nixpkgs/nixos/modules/services/misc/subsonic.nix
diff --git a/nixos/modules/services/misc/sundtek.nix b/nixpkgs/nixos/modules/services/misc/sundtek.nix
index e3234518c94..e3234518c94 100644
--- a/nixos/modules/services/misc/sundtek.nix
+++ b/nixpkgs/nixos/modules/services/misc/sundtek.nix
diff --git a/nixos/modules/services/misc/svnserve.nix b/nixpkgs/nixos/modules/services/misc/svnserve.nix
index 6292bc52b1e..6292bc52b1e 100644
--- a/nixos/modules/services/misc/svnserve.nix
+++ b/nixpkgs/nixos/modules/services/misc/svnserve.nix
diff --git a/nixos/modules/services/misc/synergy.nix b/nixpkgs/nixos/modules/services/misc/synergy.nix
index bfab8c534d8..bfab8c534d8 100644
--- a/nixos/modules/services/misc/synergy.nix
+++ b/nixpkgs/nixos/modules/services/misc/synergy.nix
diff --git a/nixos/modules/services/misc/sysprof.nix b/nixpkgs/nixos/modules/services/misc/sysprof.nix
index ab91a8b586a..ab91a8b586a 100644
--- a/nixos/modules/services/misc/sysprof.nix
+++ b/nixpkgs/nixos/modules/services/misc/sysprof.nix
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixpkgs/nixos/modules/services/misc/taskserver/default.nix
index a894caed1a3..a894caed1a3 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixpkgs/nixos/modules/services/misc/taskserver/default.nix
diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixpkgs/nixos/modules/services/misc/taskserver/doc.xml
index 5656bb85b37..5656bb85b37 100644
--- a/nixos/modules/services/misc/taskserver/doc.xml
+++ b/nixpkgs/nixos/modules/services/misc/taskserver/doc.xml
diff --git a/nixos/modules/services/misc/taskserver/helper-tool.py b/nixpkgs/nixos/modules/services/misc/taskserver/helper-tool.py
index 22a3d8d5311..22a3d8d5311 100644
--- a/nixos/modules/services/misc/taskserver/helper-tool.py
+++ b/nixpkgs/nixos/modules/services/misc/taskserver/helper-tool.py
diff --git a/nixos/modules/services/misc/tautulli.nix b/nixpkgs/nixos/modules/services/misc/tautulli.nix
index aded33629f1..aded33629f1 100644
--- a/nixos/modules/services/misc/tautulli.nix
+++ b/nixpkgs/nixos/modules/services/misc/tautulli.nix
diff --git a/nixos/modules/services/misc/tiddlywiki.nix b/nixpkgs/nixos/modules/services/misc/tiddlywiki.nix
index 2adc08f6cfe..2adc08f6cfe 100644
--- a/nixos/modules/services/misc/tiddlywiki.nix
+++ b/nixpkgs/nixos/modules/services/misc/tiddlywiki.nix
diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixpkgs/nixos/modules/services/misc/tzupdate.nix
index 570982ced29..570982ced29 100644
--- a/nixos/modules/services/misc/tzupdate.nix
+++ b/nixpkgs/nixos/modules/services/misc/tzupdate.nix
diff --git a/nixos/modules/services/misc/uhub.nix b/nixpkgs/nixos/modules/services/misc/uhub.nix
index d1b38831028..d1b38831028 100644
--- a/nixos/modules/services/misc/uhub.nix
+++ b/nixpkgs/nixos/modules/services/misc/uhub.nix
diff --git a/nixos/modules/services/misc/weechat.nix b/nixpkgs/nixos/modules/services/misc/weechat.nix
index c6ff540ea12..c6ff540ea12 100644
--- a/nixos/modules/services/misc/weechat.nix
+++ b/nixpkgs/nixos/modules/services/misc/weechat.nix
diff --git a/nixos/modules/services/misc/weechat.xml b/nixpkgs/nixos/modules/services/misc/weechat.xml
index 7255edfb9da..7255edfb9da 100644
--- a/nixos/modules/services/misc/weechat.xml
+++ b/nixpkgs/nixos/modules/services/misc/weechat.xml
diff --git a/nixos/modules/services/misc/xmr-stak.nix b/nixpkgs/nixos/modules/services/misc/xmr-stak.nix
index a87878c31e0..a87878c31e0 100644
--- a/nixos/modules/services/misc/xmr-stak.nix
+++ b/nixpkgs/nixos/modules/services/misc/xmr-stak.nix
diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixpkgs/nixos/modules/services/misc/zoneminder.nix
index d7f7324580c..d7f7324580c 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixpkgs/nixos/modules/services/misc/zoneminder.nix
diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixpkgs/nixos/modules/services/misc/zookeeper.nix
index f6af7c75eba..f6af7c75eba 100644
--- a/nixos/modules/services/misc/zookeeper.nix
+++ b/nixpkgs/nixos/modules/services/misc/zookeeper.nix
diff --git a/nixos/modules/services/monitoring/alerta.nix b/nixpkgs/nixos/modules/services/monitoring/alerta.nix
index 34f2d41706a..34f2d41706a 100644
--- a/nixos/modules/services/monitoring/alerta.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/alerta.nix
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixpkgs/nixos/modules/services/monitoring/apcupsd.nix
index 75218aa1d46..75218aa1d46 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/apcupsd.nix
diff --git a/nixos/modules/services/monitoring/arbtt.nix b/nixpkgs/nixos/modules/services/monitoring/arbtt.nix
index b41a3c7b501..b41a3c7b501 100644
--- a/nixos/modules/services/monitoring/arbtt.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/arbtt.nix
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixpkgs/nixos/modules/services/monitoring/bosun.nix
index b1c12cce1f8..b1c12cce1f8 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/bosun.nix
diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixpkgs/nixos/modules/services/monitoring/cadvisor.nix
index 695a8c42e85..695a8c42e85 100644
--- a/nixos/modules/services/monitoring/cadvisor.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/cadvisor.nix
diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixpkgs/nixos/modules/services/monitoring/collectd.nix
index ef3663c62e0..ef3663c62e0 100644
--- a/nixos/modules/services/monitoring/collectd.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/collectd.nix
diff --git a/nixos/modules/services/monitoring/das_watchdog.nix b/nixpkgs/nixos/modules/services/monitoring/das_watchdog.nix
index 88ca3a9227d..88ca3a9227d 100644
--- a/nixos/modules/services/monitoring/das_watchdog.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/das_watchdog.nix
diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix
index 2c5fe47242e..2c5fe47242e 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix b/nixpkgs/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix
index 04512819742..04512819742 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixpkgs/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index e91717fb205..e91717fb205 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
diff --git a/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults b/nixpkgs/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults
index 76724173171..76724173171 100755
--- a/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults
+++ b/nixpkgs/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults
diff --git a/nixos/modules/services/monitoring/do-agent.nix b/nixpkgs/nixos/modules/services/monitoring/do-agent.nix
index 2d3fe2f7976..2d3fe2f7976 100644
--- a/nixos/modules/services/monitoring/do-agent.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/do-agent.nix
diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixpkgs/nixos/modules/services/monitoring/fusion-inventory.nix
index 9b65c76ce02..9b65c76ce02 100644
--- a/nixos/modules/services/monitoring/fusion-inventory.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/fusion-inventory.nix
diff --git a/nixos/modules/services/monitoring/grafana-reporter.nix b/nixpkgs/nixos/modules/services/monitoring/grafana-reporter.nix
index b5a78e4583e..b5a78e4583e 100644
--- a/nixos/modules/services/monitoring/grafana-reporter.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/grafana-reporter.nix
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixpkgs/nixos/modules/services/monitoring/grafana.nix
index 0f8bc2471e3..0f8bc2471e3 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/grafana.nix
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixpkgs/nixos/modules/services/monitoring/graphite.nix
index dd147bb3793..dd147bb3793 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/graphite.nix
diff --git a/nixos/modules/services/monitoring/hdaps.nix b/nixpkgs/nixos/modules/services/monitoring/hdaps.nix
index 2cad3b84d84..2cad3b84d84 100644
--- a/nixos/modules/services/monitoring/hdaps.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/hdaps.nix
diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixpkgs/nixos/modules/services/monitoring/heapster.nix
index 585632943fd..585632943fd 100644
--- a/nixos/modules/services/monitoring/heapster.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/heapster.nix
diff --git a/nixos/modules/services/monitoring/incron.nix b/nixpkgs/nixos/modules/services/monitoring/incron.nix
index 1789fd9f205..1789fd9f205 100644
--- a/nixos/modules/services/monitoring/incron.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/incron.nix
diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixpkgs/nixos/modules/services/monitoring/kapacitor.nix
index 9b4ff3c5612..9b4ff3c5612 100644
--- a/nixos/modules/services/monitoring/kapacitor.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/kapacitor.nix
diff --git a/nixos/modules/services/monitoring/loki.nix b/nixpkgs/nixos/modules/services/monitoring/loki.nix
index f4eec7e0d28..f4eec7e0d28 100644
--- a/nixos/modules/services/monitoring/loki.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/loki.nix
diff --git a/nixos/modules/services/monitoring/longview.nix b/nixpkgs/nixos/modules/services/monitoring/longview.nix
index 9c38956f9ba..9c38956f9ba 100644
--- a/nixos/modules/services/monitoring/longview.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/longview.nix
diff --git a/nixos/modules/services/monitoring/monit.nix b/nixpkgs/nixos/modules/services/monitoring/monit.nix
index ca935227217..ca935227217 100644
--- a/nixos/modules/services/monitoring/monit.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/monit.nix
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixpkgs/nixos/modules/services/monitoring/munin.nix
index 1ebf7ee6a76..1ebf7ee6a76 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/munin.nix
diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixpkgs/nixos/modules/services/monitoring/nagios.nix
index 3ca79dddaf5..3ca79dddaf5 100644
--- a/nixos/modules/services/monitoring/nagios.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/nagios.nix
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixpkgs/nixos/modules/services/monitoring/netdata.nix
index f8225af2042..f8225af2042 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/netdata.nix
diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index 4534d150885..4534d150885 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix
index b67f697ca0d..b67f697ca0d 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix
index 36ebffa4463..36ebffa4463 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.xml
index c2d4b05996a..c2d4b05996a 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.xml
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.xml
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/bind.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bind.nix
index 972632b5a24..972632b5a24 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/bind.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bind.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
index 8a90afa9984..8a90afa9984 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
index 1cc34641809..1cc34641809 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix
index e9fa26cb1f5..e9fa26cb1f5 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix
index a01074758ff..a01074758ff 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix
index 9526597b8c9..9526597b8c9 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/json.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/json.nix
index 82a55bafc98..82a55bafc98 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/json.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/json.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
index 7d8c6fb6140..7d8c6fb6140 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/minio.nix
index ab3e3d7d5d5..ab3e3d7d5d5 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/minio.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix
index 5f9a52053f7..5f9a52053f7 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
index ba852fea433..ba852fea433 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix
index adc2abe0b91..adc2abe0b91 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
index d50564717ea..d50564717ea 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
index 1ece73a1159..1ece73a1159 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix
index 1f02ae20724..1f02ae20724 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
index fe7ae8a8ac9..fe7ae8a8ac9 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix
index 81c5c70ed93..81c5c70ed93 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
index 36c473677ef..36c473677ef 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix
index 9aa0f1b85aa..9aa0f1b85aa 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
index 12153fa021e..12153fa021e 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
index 374f83a2939..374f83a2939 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
diff --git a/nixos/modules/services/monitoring/prometheus/pushgateway.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix
index f8fcc3eb97e..f8fcc3eb97e 100644
--- a/nixos/modules/services/monitoring/prometheus/pushgateway.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix
diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixpkgs/nixos/modules/services/monitoring/riemann-dash.nix
index 16eb8300850..16eb8300850 100644
--- a/nixos/modules/services/monitoring/riemann-dash.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/riemann-dash.nix
diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixpkgs/nixos/modules/services/monitoring/riemann-tools.nix
index 86a11694e7b..86a11694e7b 100644
--- a/nixos/modules/services/monitoring/riemann-tools.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/riemann-tools.nix
diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixpkgs/nixos/modules/services/monitoring/riemann.nix
index 13d2b1cc060..13d2b1cc060 100644
--- a/nixos/modules/services/monitoring/riemann.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/riemann.nix
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixpkgs/nixos/modules/services/monitoring/scollector.nix
index 38cd2213de7..38cd2213de7 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/scollector.nix
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixpkgs/nixos/modules/services/monitoring/smartd.nix
index c345ec48a01..c345ec48a01 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/smartd.nix
diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixpkgs/nixos/modules/services/monitoring/statsd.nix
index 17836e95a6f..17836e95a6f 100644
--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/statsd.nix
diff --git a/nixos/modules/services/monitoring/sysstat.nix b/nixpkgs/nixos/modules/services/monitoring/sysstat.nix
index ca2cff82723..ca2cff82723 100644
--- a/nixos/modules/services/monitoring/sysstat.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/sysstat.nix
diff --git a/nixos/modules/services/monitoring/teamviewer.nix b/nixpkgs/nixos/modules/services/monitoring/teamviewer.nix
index dd98ecab828..dd98ecab828 100644
--- a/nixos/modules/services/monitoring/teamviewer.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/teamviewer.nix
diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixpkgs/nixos/modules/services/monitoring/telegraf.nix
index 5d131557e8b..5d131557e8b 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/telegraf.nix
diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixpkgs/nixos/modules/services/monitoring/thanos.nix
index 52dab28cf72..52dab28cf72 100644
--- a/nixos/modules/services/monitoring/thanos.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/thanos.nix
diff --git a/nixos/modules/services/monitoring/ups.nix b/nixpkgs/nixos/modules/services/monitoring/ups.nix
index a45e806d4ad..a45e806d4ad 100644
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/ups.nix
diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixpkgs/nixos/modules/services/monitoring/uptime.nix
index 245badc3e44..245badc3e44 100644
--- a/nixos/modules/services/monitoring/uptime.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/uptime.nix
diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixpkgs/nixos/modules/services/monitoring/vnstat.nix
index e9bedb704a4..e9bedb704a4 100644
--- a/nixos/modules/services/monitoring/vnstat.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/vnstat.nix
diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix
index b3383ed628b..b3383ed628b 100644
--- a/nixos/modules/services/monitoring/zabbix-agent.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix
diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix
index 9d214469c3b..9d214469c3b 100644
--- a/nixos/modules/services/monitoring/zabbix-proxy.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix
diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix
index b4e4378ce1e..b4e4378ce1e 100644
--- a/nixos/modules/services/monitoring/zabbix-server.nix
+++ b/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix
diff --git a/nixos/modules/services/network-filesystems/cachefilesd.nix b/nixpkgs/nixos/modules/services/network-filesystems/cachefilesd.nix
index 61981340840..61981340840 100644
--- a/nixos/modules/services/network-filesystems/cachefilesd.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/cachefilesd.nix
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix
index d17959a6a30..d17959a6a30 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix
diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixpkgs/nixos/modules/services/network-filesystems/davfs2.nix
index 4b6f85e4a2c..4b6f85e4a2c 100644
--- a/nixos/modules/services/network-filesystems/davfs2.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/davfs2.nix
diff --git a/nixos/modules/services/network-filesystems/diod.nix b/nixpkgs/nixos/modules/services/network-filesystems/diod.nix
index 063bae6ddb1..063bae6ddb1 100644
--- a/nixos/modules/services/network-filesystems/diod.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/diod.nix
diff --git a/nixos/modules/services/network-filesystems/drbd.nix b/nixpkgs/nixos/modules/services/network-filesystems/drbd.nix
index 916e7eaaaa9..916e7eaaaa9 100644
--- a/nixos/modules/services/network-filesystems/drbd.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/drbd.nix
diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixpkgs/nixos/modules/services/network-filesystems/glusterfs.nix
index d70092999f6..d70092999f6 100644
--- a/nixos/modules/services/network-filesystems/glusterfs.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/glusterfs.nix
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix
index b6d881afd7b..b6d881afd7b 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix
diff --git a/nixos/modules/services/network-filesystems/kbfs.nix b/nixpkgs/nixos/modules/services/network-filesystems/kbfs.nix
index a43ac656f66..a43ac656f66 100644
--- a/nixos/modules/services/network-filesystems/kbfs.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/kbfs.nix
diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix
index 1dd869043f0..1dd869043f0 100644
--- a/nixos/modules/services/network-filesystems/netatalk.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix
diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixpkgs/nixos/modules/services/network-filesystems/nfsd.nix
index 1b62bfa8203..1b62bfa8203 100644
--- a/nixos/modules/services/network-filesystems/nfsd.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/nfsd.nix
diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixpkgs/nixos/modules/services/network-filesystems/openafs/client.nix
index 79c4b7aee06..79c4b7aee06 100644
--- a/nixos/modules/services/network-filesystems/openafs/client.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/openafs/client.nix
diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixpkgs/nixos/modules/services/network-filesystems/openafs/lib.nix
index e068ee761c2..e068ee761c2 100644
--- a/nixos/modules/services/network-filesystems/openafs/lib.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/openafs/lib.nix
diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix
index 095024d2c8a..095024d2c8a 100644
--- a/nixos/modules/services/network-filesystems/openafs/server.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix
diff --git a/nixos/modules/services/network-filesystems/orangefs/client.nix b/nixpkgs/nixos/modules/services/network-filesystems/orangefs/client.nix
index b69d9e713c3..b69d9e713c3 100644
--- a/nixos/modules/services/network-filesystems/orangefs/client.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/orangefs/client.nix
diff --git a/nixos/modules/services/network-filesystems/orangefs/server.nix b/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix
index 74ebdc13402..74ebdc13402 100644
--- a/nixos/modules/services/network-filesystems/orangefs/server.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix
diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix
index b17ec3aa930..b17ec3aa930 100644
--- a/nixos/modules/services/network-filesystems/rsyncd.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixpkgs/nixos/modules/services/network-filesystems/samba.nix
index a3c22ce6948..a3c22ce6948 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/samba.nix
diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixpkgs/nixos/modules/services/network-filesystems/tahoe.nix
index 7d75eb28610..7d75eb28610 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/tahoe.nix
diff --git a/nixos/modules/services/network-filesystems/u9fs.nix b/nixpkgs/nixos/modules/services/network-filesystems/u9fs.nix
index 77961b78cad..77961b78cad 100644
--- a/nixos/modules/services/network-filesystems/u9fs.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/u9fs.nix
diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix
index c93e201da56..c93e201da56 100644
--- a/nixos/modules/services/network-filesystems/xtreemfs.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix
diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixpkgs/nixos/modules/services/network-filesystems/yandex-disk.nix
index 0aa01ef9e6d..0aa01ef9e6d 100644
--- a/nixos/modules/services/network-filesystems/yandex-disk.nix
+++ b/nixpkgs/nixos/modules/services/network-filesystems/yandex-disk.nix
diff --git a/nixos/modules/services/networking/3proxy.nix b/nixpkgs/nixos/modules/services/networking/3proxy.nix
index 26aa1667946..26aa1667946 100644
--- a/nixos/modules/services/networking/3proxy.nix
+++ b/nixpkgs/nixos/modules/services/networking/3proxy.nix
diff --git a/nixos/modules/services/networking/amuled.nix b/nixpkgs/nixos/modules/services/networking/amuled.nix
index 57f02542eaf..57f02542eaf 100644
--- a/nixos/modules/services/networking/amuled.nix
+++ b/nixpkgs/nixos/modules/services/networking/amuled.nix
diff --git a/nixos/modules/services/networking/aria2.nix b/nixpkgs/nixos/modules/services/networking/aria2.nix
index 156fef14479..156fef14479 100644
--- a/nixos/modules/services/networking/aria2.nix
+++ b/nixpkgs/nixos/modules/services/networking/aria2.nix
diff --git a/nixos/modules/services/networking/asterisk.nix b/nixpkgs/nixos/modules/services/networking/asterisk.nix
index 03a2544b9a7..03a2544b9a7 100644
--- a/nixos/modules/services/networking/asterisk.nix
+++ b/nixpkgs/nixos/modules/services/networking/asterisk.nix
diff --git a/nixos/modules/services/networking/atftpd.nix b/nixpkgs/nixos/modules/services/networking/atftpd.nix
index e7fd48c99a8..e7fd48c99a8 100644
--- a/nixos/modules/services/networking/atftpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/atftpd.nix
diff --git a/nixos/modules/services/networking/autossh.nix b/nixpkgs/nixos/modules/services/networking/autossh.nix
index a8d9a027e9f..a8d9a027e9f 100644
--- a/nixos/modules/services/networking/autossh.nix
+++ b/nixpkgs/nixos/modules/services/networking/autossh.nix
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix
index ddcfe3d77e2..ddcfe3d77e2 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix
diff --git a/nixos/modules/services/networking/babeld.nix b/nixpkgs/nixos/modules/services/networking/babeld.nix
index de863461eab..de863461eab 100644
--- a/nixos/modules/services/networking/babeld.nix
+++ b/nixpkgs/nixos/modules/services/networking/babeld.nix
diff --git a/nixos/modules/services/networking/bind.nix b/nixpkgs/nixos/modules/services/networking/bind.nix
index e3b95afb3d8..e3b95afb3d8 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixpkgs/nixos/modules/services/networking/bind.nix
diff --git a/nixos/modules/services/networking/bird.nix b/nixpkgs/nixos/modules/services/networking/bird.nix
index 4ae35875c0f..4ae35875c0f 100644
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixpkgs/nixos/modules/services/networking/bird.nix
diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixpkgs/nixos/modules/services/networking/bitcoind.nix
index 4e00a886547..4e00a886547 100644
--- a/nixos/modules/services/networking/bitcoind.nix
+++ b/nixpkgs/nixos/modules/services/networking/bitcoind.nix
diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixpkgs/nixos/modules/services/networking/bitlbee.nix
index 01a16698384..01a16698384 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixpkgs/nixos/modules/services/networking/bitlbee.nix
diff --git a/nixos/modules/services/networking/charybdis.nix b/nixpkgs/nixos/modules/services/networking/charybdis.nix
index 43829d36e41..43829d36e41 100644
--- a/nixos/modules/services/networking/charybdis.nix
+++ b/nixpkgs/nixos/modules/services/networking/charybdis.nix
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixpkgs/nixos/modules/services/networking/cjdns.nix
index 3fb85b16cbe..3fb85b16cbe 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixpkgs/nixos/modules/services/networking/cjdns.nix
diff --git a/nixos/modules/services/networking/cntlm.nix b/nixpkgs/nixos/modules/services/networking/cntlm.nix
index 4e4e3104c3a..4e4e3104c3a 100644
--- a/nixos/modules/services/networking/cntlm.nix
+++ b/nixpkgs/nixos/modules/services/networking/cntlm.nix
diff --git a/nixos/modules/services/networking/connman.nix b/nixpkgs/nixos/modules/services/networking/connman.nix
index e8eadc4e187..e8eadc4e187 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixpkgs/nixos/modules/services/networking/connman.nix
diff --git a/nixos/modules/services/networking/consul.nix b/nixpkgs/nixos/modules/services/networking/consul.nix
index 689cbc8a986..689cbc8a986 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixpkgs/nixos/modules/services/networking/consul.nix
diff --git a/nixos/modules/services/networking/coredns.nix b/nixpkgs/nixos/modules/services/networking/coredns.nix
index afb2b547a46..afb2b547a46 100644
--- a/nixos/modules/services/networking/coredns.nix
+++ b/nixpkgs/nixos/modules/services/networking/coredns.nix
diff --git a/nixos/modules/services/networking/corerad.nix b/nixpkgs/nixos/modules/services/networking/corerad.nix
index 1a2c4aec665..1a2c4aec665 100644
--- a/nixos/modules/services/networking/corerad.nix
+++ b/nixpkgs/nixos/modules/services/networking/corerad.nix
diff --git a/nixos/modules/services/networking/coturn.nix b/nixpkgs/nixos/modules/services/networking/coturn.nix
index 1bfbc307c59..1bfbc307c59 100644
--- a/nixos/modules/services/networking/coturn.nix
+++ b/nixpkgs/nixos/modules/services/networking/coturn.nix
diff --git a/nixos/modules/services/networking/dante.nix b/nixpkgs/nixos/modules/services/networking/dante.nix
index 20d4faa1cdb..20d4faa1cdb 100644
--- a/nixos/modules/services/networking/dante.nix
+++ b/nixpkgs/nixos/modules/services/networking/dante.nix
diff --git a/nixos/modules/services/networking/ddclient.nix b/nixpkgs/nixos/modules/services/networking/ddclient.nix
index 053efe71270..053efe71270 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixpkgs/nixos/modules/services/networking/ddclient.nix
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixpkgs/nixos/modules/services/networking/dhcpcd.nix
index 6972c833cc5..6972c833cc5 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixpkgs/nixos/modules/services/networking/dhcpcd.nix
diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixpkgs/nixos/modules/services/networking/dhcpd.nix
index 67f7d811887..67f7d811887 100644
--- a/nixos/modules/services/networking/dhcpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/dhcpd.nix
diff --git a/nixos/modules/services/networking/dnscache.nix b/nixpkgs/nixos/modules/services/networking/dnscache.nix
index d123bca9321..d123bca9321 100644
--- a/nixos/modules/services/networking/dnscache.nix
+++ b/nixpkgs/nixos/modules/services/networking/dnscache.nix
diff --git a/nixos/modules/services/networking/dnschain.nix b/nixpkgs/nixos/modules/services/networking/dnschain.nix
index 003609ea705..003609ea705 100644
--- a/nixos/modules/services/networking/dnschain.nix
+++ b/nixpkgs/nixos/modules/services/networking/dnschain.nix
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy.nix
index 8edcf925dbf..8edcf925dbf 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy.nix
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy.xml
index afc7880392a..afc7880392a 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.xml
+++ b/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy.xml
diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix
index e53fb7a1578..e53fb7a1578 100644
--- a/nixos/modules/services/networking/dnscrypt-wrapper.nix
+++ b/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix
diff --git a/nixos/modules/services/networking/dnsdist.nix b/nixpkgs/nixos/modules/services/networking/dnsdist.nix
index 8249da69bc1..8249da69bc1 100644
--- a/nixos/modules/services/networking/dnsdist.nix
+++ b/nixpkgs/nixos/modules/services/networking/dnsdist.nix
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixpkgs/nixos/modules/services/networking/dnsmasq.nix
index 377d7bc5705..377d7bc5705 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixpkgs/nixos/modules/services/networking/dnsmasq.nix
diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixpkgs/nixos/modules/services/networking/ejabberd.nix
index a5af25b983b..a5af25b983b 100644
--- a/nixos/modules/services/networking/ejabberd.nix
+++ b/nixpkgs/nixos/modules/services/networking/ejabberd.nix
diff --git a/nixos/modules/services/networking/epmd.nix b/nixpkgs/nixos/modules/services/networking/epmd.nix
index 692b75e4f08..692b75e4f08 100644
--- a/nixos/modules/services/networking/epmd.nix
+++ b/nixpkgs/nixos/modules/services/networking/epmd.nix
diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixpkgs/nixos/modules/services/networking/eternal-terminal.nix
index a2e5b30dc0f..a2e5b30dc0f 100644
--- a/nixos/modules/services/networking/eternal-terminal.nix
+++ b/nixpkgs/nixos/modules/services/networking/eternal-terminal.nix
diff --git a/nixos/modules/services/networking/fakeroute.nix b/nixpkgs/nixos/modules/services/networking/fakeroute.nix
index 7916ad4098a..7916ad4098a 100644
--- a/nixos/modules/services/networking/fakeroute.nix
+++ b/nixpkgs/nixos/modules/services/networking/fakeroute.nix
diff --git a/nixos/modules/services/networking/ferm.nix b/nixpkgs/nixos/modules/services/networking/ferm.nix
index 07338ccf4d9..07338ccf4d9 100644
--- a/nixos/modules/services/networking/ferm.nix
+++ b/nixpkgs/nixos/modules/services/networking/ferm.nix
diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixpkgs/nixos/modules/services/networking/firefox/sync-server.nix
index 6842aa73561..6842aa73561 100644
--- a/nixos/modules/services/networking/firefox/sync-server.nix
+++ b/nixpkgs/nixos/modules/services/networking/firefox/sync-server.nix
diff --git a/nixos/modules/services/networking/fireqos.nix b/nixpkgs/nixos/modules/services/networking/fireqos.nix
index 0b34f0b6b8b..0b34f0b6b8b 100644
--- a/nixos/modules/services/networking/fireqos.nix
+++ b/nixpkgs/nixos/modules/services/networking/fireqos.nix
diff --git a/nixos/modules/services/networking/firewall.nix b/nixpkgs/nixos/modules/services/networking/firewall.nix
index 15aaf741067..15aaf741067 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixpkgs/nixos/modules/services/networking/firewall.nix
diff --git a/nixos/modules/services/networking/flannel.nix b/nixpkgs/nixos/modules/services/networking/flannel.nix
index dd2f6454e95..dd2f6454e95 100644
--- a/nixos/modules/services/networking/flannel.nix
+++ b/nixpkgs/nixos/modules/services/networking/flannel.nix
diff --git a/nixos/modules/services/networking/flashpolicyd.nix b/nixpkgs/nixos/modules/services/networking/flashpolicyd.nix
index 9c51b88ef67..9c51b88ef67 100644
--- a/nixos/modules/services/networking/flashpolicyd.nix
+++ b/nixpkgs/nixos/modules/services/networking/flashpolicyd.nix
diff --git a/nixos/modules/services/networking/freenet.nix b/nixpkgs/nixos/modules/services/networking/freenet.nix
index 3da3ab0c7df..3da3ab0c7df 100644
--- a/nixos/modules/services/networking/freenet.nix
+++ b/nixpkgs/nixos/modules/services/networking/freenet.nix
diff --git a/nixos/modules/services/networking/freeradius.nix b/nixpkgs/nixos/modules/services/networking/freeradius.nix
index e192b70c129..e192b70c129 100644
--- a/nixos/modules/services/networking/freeradius.nix
+++ b/nixpkgs/nixos/modules/services/networking/freeradius.nix
diff --git a/nixos/modules/services/networking/gale.nix b/nixpkgs/nixos/modules/services/networking/gale.nix
index cb954fd836b..cb954fd836b 100644
--- a/nixos/modules/services/networking/gale.nix
+++ b/nixpkgs/nixos/modules/services/networking/gale.nix
diff --git a/nixos/modules/services/networking/gateone.nix b/nixpkgs/nixos/modules/services/networking/gateone.nix
index 4456a95402e..4456a95402e 100644
--- a/nixos/modules/services/networking/gateone.nix
+++ b/nixpkgs/nixos/modules/services/networking/gateone.nix
diff --git a/nixos/modules/services/networking/gdomap.nix b/nixpkgs/nixos/modules/services/networking/gdomap.nix
index 3d829cb6913..3d829cb6913 100644
--- a/nixos/modules/services/networking/gdomap.nix
+++ b/nixpkgs/nixos/modules/services/networking/gdomap.nix
diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixpkgs/nixos/modules/services/networking/git-daemon.nix
index 6f2e149433f..6f2e149433f 100644
--- a/nixos/modules/services/networking/git-daemon.nix
+++ b/nixpkgs/nixos/modules/services/networking/git-daemon.nix
diff --git a/nixos/modules/services/networking/gnunet.nix b/nixpkgs/nixos/modules/services/networking/gnunet.nix
index 69d4ed04775..69d4ed04775 100644
--- a/nixos/modules/services/networking/gnunet.nix
+++ b/nixpkgs/nixos/modules/services/networking/gnunet.nix
diff --git a/nixos/modules/services/networking/go-shadowsocks2.nix b/nixpkgs/nixos/modules/services/networking/go-shadowsocks2.nix
index afbd7ea27c6..afbd7ea27c6 100644
--- a/nixos/modules/services/networking/go-shadowsocks2.nix
+++ b/nixpkgs/nixos/modules/services/networking/go-shadowsocks2.nix
diff --git a/nixos/modules/services/networking/gogoclient.nix b/nixpkgs/nixos/modules/services/networking/gogoclient.nix
index c9b03bca711..c9b03bca711 100644
--- a/nixos/modules/services/networking/gogoclient.nix
+++ b/nixpkgs/nixos/modules/services/networking/gogoclient.nix
diff --git a/nixos/modules/services/networking/gvpe.nix b/nixpkgs/nixos/modules/services/networking/gvpe.nix
index 3ef3548e0a0..3ef3548e0a0 100644
--- a/nixos/modules/services/networking/gvpe.nix
+++ b/nixpkgs/nixos/modules/services/networking/gvpe.nix
diff --git a/nixos/modules/services/networking/hans.nix b/nixpkgs/nixos/modules/services/networking/hans.nix
index 8334dc68d62..8334dc68d62 100644
--- a/nixos/modules/services/networking/hans.nix
+++ b/nixpkgs/nixos/modules/services/networking/hans.nix
diff --git a/nixos/modules/services/networking/haproxy.nix b/nixpkgs/nixos/modules/services/networking/haproxy.nix
index aff71e5e97d..aff71e5e97d 100644
--- a/nixos/modules/services/networking/haproxy.nix
+++ b/nixpkgs/nixos/modules/services/networking/haproxy.nix
diff --git a/nixos/modules/services/networking/helpers.nix b/nixpkgs/nixos/modules/services/networking/helpers.nix
index d7d42de0e3a..d7d42de0e3a 100644
--- a/nixos/modules/services/networking/helpers.nix
+++ b/nixpkgs/nixos/modules/services/networking/helpers.nix
diff --git a/nixos/modules/services/networking/heyefi.nix b/nixpkgs/nixos/modules/services/networking/heyefi.nix
index fc2b5a84857..fc2b5a84857 100644
--- a/nixos/modules/services/networking/heyefi.nix
+++ b/nixpkgs/nixos/modules/services/networking/heyefi.nix
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixpkgs/nixos/modules/services/networking/hostapd.nix
index 2915b54f05b..2915b54f05b 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixpkgs/nixos/modules/services/networking/hostapd.nix
diff --git a/nixos/modules/services/networking/htpdate.nix b/nixpkgs/nixos/modules/services/networking/htpdate.nix
index 6954e5b060c..6954e5b060c 100644
--- a/nixos/modules/services/networking/htpdate.nix
+++ b/nixpkgs/nixos/modules/services/networking/htpdate.nix
diff --git a/nixos/modules/services/networking/hylafax/default.nix b/nixpkgs/nixos/modules/services/networking/hylafax/default.nix
index d8ffa3fc04d..d8ffa3fc04d 100644
--- a/nixos/modules/services/networking/hylafax/default.nix
+++ b/nixpkgs/nixos/modules/services/networking/hylafax/default.nix
diff --git a/nixos/modules/services/networking/hylafax/faxq-default.nix b/nixpkgs/nixos/modules/services/networking/hylafax/faxq-default.nix
index 9b634650cf7..9b634650cf7 100644
--- a/nixos/modules/services/networking/hylafax/faxq-default.nix
+++ b/nixpkgs/nixos/modules/services/networking/hylafax/faxq-default.nix
diff --git a/nixos/modules/services/networking/hylafax/faxq-wait.sh b/nixpkgs/nixos/modules/services/networking/hylafax/faxq-wait.sh
index 8c39e9d20c1..8c39e9d20c1 100755
--- a/nixos/modules/services/networking/hylafax/faxq-wait.sh
+++ b/nixpkgs/nixos/modules/services/networking/hylafax/faxq-wait.sh
diff --git a/nixos/modules/services/networking/hylafax/hfaxd-default.nix b/nixpkgs/nixos/modules/services/networking/hylafax/hfaxd-default.nix
index 8999dae57f4..8999dae57f4 100644
--- a/nixos/modules/services/networking/hylafax/hfaxd-default.nix
+++ b/nixpkgs/nixos/modules/services/networking/hylafax/hfaxd-default.nix
diff --git a/nixos/modules/services/networking/hylafax/modem-default.nix b/nixpkgs/nixos/modules/services/networking/hylafax/modem-default.nix
index 7529b5b0aaf..7529b5b0aaf 100644
--- a/nixos/modules/services/networking/hylafax/modem-default.nix
+++ b/nixpkgs/nixos/modules/services/networking/hylafax/modem-default.nix
diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixpkgs/nixos/modules/services/networking/hylafax/options.nix
index 4ac6d3fa843..4ac6d3fa843 100644
--- a/nixos/modules/services/networking/hylafax/options.nix
+++ b/nixpkgs/nixos/modules/services/networking/hylafax/options.nix
diff --git a/nixos/modules/services/networking/hylafax/spool.sh b/nixpkgs/nixos/modules/services/networking/hylafax/spool.sh
index 31e930e8c59..31e930e8c59 100755
--- a/nixos/modules/services/networking/hylafax/spool.sh
+++ b/nixpkgs/nixos/modules/services/networking/hylafax/spool.sh
diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixpkgs/nixos/modules/services/networking/hylafax/systemd.nix
index b9b9b9dca4f..b9b9b9dca4f 100644
--- a/nixos/modules/services/networking/hylafax/systemd.nix
+++ b/nixpkgs/nixos/modules/services/networking/hylafax/systemd.nix
diff --git a/nixos/modules/services/networking/i2p.nix b/nixpkgs/nixos/modules/services/networking/i2p.nix
index 3b6010531f1..3b6010531f1 100644
--- a/nixos/modules/services/networking/i2p.nix
+++ b/nixpkgs/nixos/modules/services/networking/i2p.nix
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixpkgs/nixos/modules/services/networking/i2pd.nix
index 326d34f6ca9..326d34f6ca9 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixpkgs/nixos/modules/services/networking/i2pd.nix
diff --git a/nixos/modules/services/networking/iodine.nix b/nixpkgs/nixos/modules/services/networking/iodine.nix
index f9ca26c2796..f9ca26c2796 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixpkgs/nixos/modules/services/networking/iodine.nix
diff --git a/nixos/modules/services/networking/iperf3.nix b/nixpkgs/nixos/modules/services/networking/iperf3.nix
index 0fe378b225d..0fe378b225d 100644
--- a/nixos/modules/services/networking/iperf3.nix
+++ b/nixpkgs/nixos/modules/services/networking/iperf3.nix
diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/builder.sh
index 38312210df2..38312210df2 100644
--- a/nixos/modules/services/networking/ircd-hybrid/builder.sh
+++ b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/builder.sh
diff --git a/nixos/modules/services/networking/ircd-hybrid/control.in b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/control.in
index 312dfaada32..312dfaada32 100644
--- a/nixos/modules/services/networking/ircd-hybrid/control.in
+++ b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/control.in
diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix
index b236552eb65..b236552eb65 100644
--- a/nixos/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix
diff --git a/nixos/modules/services/networking/ircd-hybrid/ircd.conf b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/ircd.conf
index 17ef203840a..17ef203840a 100644
--- a/nixos/modules/services/networking/ircd-hybrid/ircd.conf
+++ b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/ircd.conf
diff --git a/nixos/modules/services/networking/iwd.nix b/nixpkgs/nixos/modules/services/networking/iwd.nix
index 839fa48d9a4..839fa48d9a4 100644
--- a/nixos/modules/services/networking/iwd.nix
+++ b/nixpkgs/nixos/modules/services/networking/iwd.nix
diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixpkgs/nixos/modules/services/networking/keepalived/default.nix
index c9ac2ee2599..c9ac2ee2599 100644
--- a/nixos/modules/services/networking/keepalived/default.nix
+++ b/nixpkgs/nixos/modules/services/networking/keepalived/default.nix
diff --git a/nixos/modules/services/networking/keepalived/virtual-ip-options.nix b/nixpkgs/nixos/modules/services/networking/keepalived/virtual-ip-options.nix
index 1b8889b1b47..1b8889b1b47 100644
--- a/nixos/modules/services/networking/keepalived/virtual-ip-options.nix
+++ b/nixpkgs/nixos/modules/services/networking/keepalived/virtual-ip-options.nix
diff --git a/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix b/nixpkgs/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix
index 85b9bc33772..85b9bc33772 100644
--- a/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix
+++ b/nixpkgs/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix
diff --git a/nixos/modules/services/networking/keepalived/vrrp-script-options.nix b/nixpkgs/nixos/modules/services/networking/keepalived/vrrp-script-options.nix
index a3f794c40a8..a3f794c40a8 100644
--- a/nixos/modules/services/networking/keepalived/vrrp-script-options.nix
+++ b/nixpkgs/nixos/modules/services/networking/keepalived/vrrp-script-options.nix
diff --git a/nixos/modules/services/networking/keybase.nix b/nixpkgs/nixos/modules/services/networking/keybase.nix
index 495102cb7ee..495102cb7ee 100644
--- a/nixos/modules/services/networking/keybase.nix
+++ b/nixpkgs/nixos/modules/services/networking/keybase.nix
diff --git a/nixos/modules/services/networking/kippo.nix b/nixpkgs/nixos/modules/services/networking/kippo.nix
index 553415a2f32..553415a2f32 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixpkgs/nixos/modules/services/networking/kippo.nix
diff --git a/nixos/modules/services/networking/knot.nix b/nixpkgs/nixos/modules/services/networking/knot.nix
index 47364ecb846..47364ecb846 100644
--- a/nixos/modules/services/networking/knot.nix
+++ b/nixpkgs/nixos/modules/services/networking/knot.nix
diff --git a/nixos/modules/services/networking/kresd.nix b/nixpkgs/nixos/modules/services/networking/kresd.nix
index bb941e93e15..bb941e93e15 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixpkgs/nixos/modules/services/networking/kresd.nix
diff --git a/nixos/modules/services/networking/lambdabot.nix b/nixpkgs/nixos/modules/services/networking/lambdabot.nix
index b7c8bd008fe..b7c8bd008fe 100644
--- a/nixos/modules/services/networking/lambdabot.nix
+++ b/nixpkgs/nixos/modules/services/networking/lambdabot.nix
diff --git a/nixos/modules/services/networking/libreswan.nix b/nixpkgs/nixos/modules/services/networking/libreswan.nix
index 280158b89f6..280158b89f6 100644
--- a/nixos/modules/services/networking/libreswan.nix
+++ b/nixpkgs/nixos/modules/services/networking/libreswan.nix
diff --git a/nixos/modules/services/networking/lldpd.nix b/nixpkgs/nixos/modules/services/networking/lldpd.nix
index d5de9c45d84..d5de9c45d84 100644
--- a/nixos/modules/services/networking/lldpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/lldpd.nix
diff --git a/nixos/modules/services/networking/logmein-hamachi.nix b/nixpkgs/nixos/modules/services/networking/logmein-hamachi.nix
index 11cbdda2f84..11cbdda2f84 100644
--- a/nixos/modules/services/networking/logmein-hamachi.nix
+++ b/nixpkgs/nixos/modules/services/networking/logmein-hamachi.nix
diff --git a/nixos/modules/services/networking/mailpile.nix b/nixpkgs/nixos/modules/services/networking/mailpile.nix
index c42d3d5a44c..c42d3d5a44c 100644
--- a/nixos/modules/services/networking/mailpile.nix
+++ b/nixpkgs/nixos/modules/services/networking/mailpile.nix
diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixpkgs/nixos/modules/services/networking/matterbridge.nix
index b8b4f37c84a..b8b4f37c84a 100644
--- a/nixos/modules/services/networking/matterbridge.nix
+++ b/nixpkgs/nixos/modules/services/networking/matterbridge.nix
diff --git a/nixos/modules/services/networking/minidlna.nix b/nixpkgs/nixos/modules/services/networking/minidlna.nix
index 3ddea3c9757..3ddea3c9757 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixpkgs/nixos/modules/services/networking/minidlna.nix
diff --git a/nixos/modules/services/networking/miniupnpd.nix b/nixpkgs/nixos/modules/services/networking/miniupnpd.nix
index c095d994854..c095d994854 100644
--- a/nixos/modules/services/networking/miniupnpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/miniupnpd.nix
diff --git a/nixos/modules/services/networking/miredo.nix b/nixpkgs/nixos/modules/services/networking/miredo.nix
index 2c8393fb5b4..2c8393fb5b4 100644
--- a/nixos/modules/services/networking/miredo.nix
+++ b/nixpkgs/nixos/modules/services/networking/miredo.nix
diff --git a/nixos/modules/services/networking/mjpg-streamer.nix b/nixpkgs/nixos/modules/services/networking/mjpg-streamer.nix
index dbc35e2e71c..dbc35e2e71c 100644
--- a/nixos/modules/services/networking/mjpg-streamer.nix
+++ b/nixpkgs/nixos/modules/services/networking/mjpg-streamer.nix
diff --git a/nixos/modules/services/networking/monero.nix b/nixpkgs/nixos/modules/services/networking/monero.nix
index b9536430868..b9536430868 100644
--- a/nixos/modules/services/networking/monero.nix
+++ b/nixpkgs/nixos/modules/services/networking/monero.nix
diff --git a/nixos/modules/services/networking/morty.nix b/nixpkgs/nixos/modules/services/networking/morty.nix
index e3a6444c116..e3a6444c116 100644
--- a/nixos/modules/services/networking/morty.nix
+++ b/nixpkgs/nixos/modules/services/networking/morty.nix
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixpkgs/nixos/modules/services/networking/mosquitto.nix
index d2feb93e2b7..d2feb93e2b7 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixpkgs/nixos/modules/services/networking/mosquitto.nix
diff --git a/nixos/modules/services/networking/mstpd.nix b/nixpkgs/nixos/modules/services/networking/mstpd.nix
index 5d1fc4a6542..5d1fc4a6542 100644
--- a/nixos/modules/services/networking/mstpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/mstpd.nix
diff --git a/nixos/modules/services/networking/mtprotoproxy.nix b/nixpkgs/nixos/modules/services/networking/mtprotoproxy.nix
index d896f227b82..d896f227b82 100644
--- a/nixos/modules/services/networking/mtprotoproxy.nix
+++ b/nixpkgs/nixos/modules/services/networking/mtprotoproxy.nix
diff --git a/nixpkgs/nixos/modules/services/networking/mullvad.nix b/nixpkgs/nixos/modules/services/networking/mullvad.nix
new file mode 100644
index 00000000000..1531025caeb
--- /dev/null
+++ b/nixpkgs/nixos/modules/services/networking/mullvad.nix
@@ -0,0 +1,34 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.mullvad;
+in
+{
+  options.services.mullvad = {
+    enable = mkEnableOption "the Mullvad VPN daemon";
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.mullvad-vpn ];
+    
+    systemd.services."mullvad-vpn" = {
+      enable = true;
+      wantedBy = [ "multi-user.target" ];
+      path = with pkgs; [ iproute ];
+      environment = 
+        {
+          MULLVAD_SETTINGS_DIR = "/var/lib/mullvad-vpn";
+        };
+      serviceConfig = {
+        StateDirectory = "mullvad-vpn";
+        CacheDirectory = "mullvad-vpn";
+        ExecStart = ''
+          ${pkgs.mullvad-vpn}/bin/mullvad-daemon --disable-log-to-file
+        '';
+      };
+    };
+  };
+}
+ 
diff --git a/nixos/modules/services/networking/murmur.nix b/nixpkgs/nixos/modules/services/networking/murmur.nix
index 3054ae1b201..3054ae1b201 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixpkgs/nixos/modules/services/networking/murmur.nix
diff --git a/nixos/modules/services/networking/mxisd.nix b/nixpkgs/nixos/modules/services/networking/mxisd.nix
index 482d6ff456b..482d6ff456b 100644
--- a/nixos/modules/services/networking/mxisd.nix
+++ b/nixpkgs/nixos/modules/services/networking/mxisd.nix
diff --git a/nixos/modules/services/networking/namecoind.nix b/nixpkgs/nixos/modules/services/networking/namecoind.nix
index ead7f085943..ead7f085943 100644
--- a/nixos/modules/services/networking/namecoind.nix
+++ b/nixpkgs/nixos/modules/services/networking/namecoind.nix
diff --git a/nixos/modules/services/networking/nat.nix b/nixpkgs/nixos/modules/services/networking/nat.nix
index 9c658af30f7..9c658af30f7 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixpkgs/nixos/modules/services/networking/nat.nix
diff --git a/nixos/modules/services/networking/ndppd.nix b/nixpkgs/nixos/modules/services/networking/ndppd.nix
index e015f76f622..e015f76f622 100644
--- a/nixos/modules/services/networking/ndppd.nix
+++ b/nixpkgs/nixos/modules/services/networking/ndppd.nix
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixpkgs/nixos/modules/services/networking/networkmanager.nix
index e817f295a44..e817f295a44 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixpkgs/nixos/modules/services/networking/networkmanager.nix
diff --git a/nixos/modules/services/networking/nftables.nix b/nixpkgs/nixos/modules/services/networking/nftables.nix
index ad7c013a544..ad7c013a544 100644
--- a/nixos/modules/services/networking/nftables.nix
+++ b/nixpkgs/nixos/modules/services/networking/nftables.nix
diff --git a/nixos/modules/services/networking/nghttpx/backend-params-submodule.nix b/nixpkgs/nixos/modules/services/networking/nghttpx/backend-params-submodule.nix
index 6523f4b8b9e..6523f4b8b9e 100644
--- a/nixos/modules/services/networking/nghttpx/backend-params-submodule.nix
+++ b/nixpkgs/nixos/modules/services/networking/nghttpx/backend-params-submodule.nix
diff --git a/nixos/modules/services/networking/nghttpx/backend-submodule.nix b/nixpkgs/nixos/modules/services/networking/nghttpx/backend-submodule.nix
index eb559e926e7..eb559e926e7 100644
--- a/nixos/modules/services/networking/nghttpx/backend-submodule.nix
+++ b/nixpkgs/nixos/modules/services/networking/nghttpx/backend-submodule.nix
diff --git a/nixos/modules/services/networking/nghttpx/default.nix b/nixpkgs/nixos/modules/services/networking/nghttpx/default.nix
index 881a2670f5d..881a2670f5d 100644
--- a/nixos/modules/services/networking/nghttpx/default.nix
+++ b/nixpkgs/nixos/modules/services/networking/nghttpx/default.nix
diff --git a/nixos/modules/services/networking/nghttpx/frontend-params-submodule.nix b/nixpkgs/nixos/modules/services/networking/nghttpx/frontend-params-submodule.nix
index 33c8572bd14..33c8572bd14 100644
--- a/nixos/modules/services/networking/nghttpx/frontend-params-submodule.nix
+++ b/nixpkgs/nixos/modules/services/networking/nghttpx/frontend-params-submodule.nix
diff --git a/nixos/modules/services/networking/nghttpx/frontend-submodule.nix b/nixpkgs/nixos/modules/services/networking/nghttpx/frontend-submodule.nix
index 887ef450213..887ef450213 100644
--- a/nixos/modules/services/networking/nghttpx/frontend-submodule.nix
+++ b/nixpkgs/nixos/modules/services/networking/nghttpx/frontend-submodule.nix
diff --git a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix b/nixpkgs/nixos/modules/services/networking/nghttpx/nghttpx-options.nix
index 51f1d081b97..51f1d081b97 100644
--- a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix
+++ b/nixpkgs/nixos/modules/services/networking/nghttpx/nghttpx-options.nix
diff --git a/nixos/modules/services/networking/nghttpx/server-options.nix b/nixpkgs/nixos/modules/services/networking/nghttpx/server-options.nix
index ef23bfd793c..ef23bfd793c 100644
--- a/nixos/modules/services/networking/nghttpx/server-options.nix
+++ b/nixpkgs/nixos/modules/services/networking/nghttpx/server-options.nix
diff --git a/nixos/modules/services/networking/nghttpx/tls-submodule.nix b/nixpkgs/nixos/modules/services/networking/nghttpx/tls-submodule.nix
index 8f3cdaae2c8..8f3cdaae2c8 100644
--- a/nixos/modules/services/networking/nghttpx/tls-submodule.nix
+++ b/nixpkgs/nixos/modules/services/networking/nghttpx/tls-submodule.nix
diff --git a/nixos/modules/services/networking/ngircd.nix b/nixpkgs/nixos/modules/services/networking/ngircd.nix
index 4b2fa779592..4b2fa779592 100644
--- a/nixos/modules/services/networking/ngircd.nix
+++ b/nixpkgs/nixos/modules/services/networking/ngircd.nix
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixpkgs/nixos/modules/services/networking/nix-serve.nix
index 347d87b3f38..347d87b3f38 100644
--- a/nixos/modules/services/networking/nix-serve.nix
+++ b/nixpkgs/nixos/modules/services/networking/nix-serve.nix
diff --git a/nixos/modules/services/networking/nixops-dns.nix b/nixpkgs/nixos/modules/services/networking/nixops-dns.nix
index 2bb1263b7fa..2bb1263b7fa 100644
--- a/nixos/modules/services/networking/nixops-dns.nix
+++ b/nixpkgs/nixos/modules/services/networking/nixops-dns.nix
diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix
index cc061bf6e3b..cc061bf6e3b 100644
--- a/nixos/modules/services/networking/nntp-proxy.nix
+++ b/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix
diff --git a/nixos/modules/services/networking/nsd.nix b/nixpkgs/nixos/modules/services/networking/nsd.nix
index 344396638a6..344396638a6 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixpkgs/nixos/modules/services/networking/nsd.nix
diff --git a/nixos/modules/services/networking/ntopng.nix b/nixpkgs/nixos/modules/services/networking/ntopng.nix
index c1525711713..c1525711713 100644
--- a/nixos/modules/services/networking/ntopng.nix
+++ b/nixpkgs/nixos/modules/services/networking/ntopng.nix
diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix
index da9d960cc14..da9d960cc14 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix
diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix
index b5403cb747d..b5403cb747d 100644
--- a/nixos/modules/services/networking/ntp/ntpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix
diff --git a/nixos/modules/services/networking/ntp/openntpd.nix b/nixpkgs/nixos/modules/services/networking/ntp/openntpd.nix
index 67a04d48d30..67a04d48d30 100644
--- a/nixos/modules/services/networking/ntp/openntpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/ntp/openntpd.nix
diff --git a/nixos/modules/services/networking/nullidentdmod.nix b/nixpkgs/nixos/modules/services/networking/nullidentdmod.nix
index b0d338a2794..b0d338a2794 100644
--- a/nixos/modules/services/networking/nullidentdmod.nix
+++ b/nixpkgs/nixos/modules/services/networking/nullidentdmod.nix
diff --git a/nixos/modules/services/networking/nylon.nix b/nixpkgs/nixos/modules/services/networking/nylon.nix
index 7c171281a92..7c171281a92 100644
--- a/nixos/modules/services/networking/nylon.nix
+++ b/nixpkgs/nixos/modules/services/networking/nylon.nix
diff --git a/nixos/modules/services/networking/ocserv.nix b/nixpkgs/nixos/modules/services/networking/ocserv.nix
index dc26ffeafee..dc26ffeafee 100644
--- a/nixos/modules/services/networking/ocserv.nix
+++ b/nixpkgs/nixos/modules/services/networking/ocserv.nix
diff --git a/nixos/modules/services/networking/ofono.nix b/nixpkgs/nixos/modules/services/networking/ofono.nix
index 40ef9433de0..40ef9433de0 100644
--- a/nixos/modules/services/networking/ofono.nix
+++ b/nixpkgs/nixos/modules/services/networking/ofono.nix
diff --git a/nixos/modules/services/networking/oidentd.nix b/nixpkgs/nixos/modules/services/networking/oidentd.nix
index feb84806ba9..feb84806ba9 100644
--- a/nixos/modules/services/networking/oidentd.nix
+++ b/nixpkgs/nixos/modules/services/networking/oidentd.nix
diff --git a/nixos/modules/services/networking/openfire.nix b/nixpkgs/nixos/modules/services/networking/openfire.nix
index 4059eb3db83..4059eb3db83 100644
--- a/nixos/modules/services/networking/openfire.nix
+++ b/nixpkgs/nixos/modules/services/networking/openfire.nix
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixpkgs/nixos/modules/services/networking/openvpn.nix
index dcd7e9e5fa4..dcd7e9e5fa4 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixpkgs/nixos/modules/services/networking/openvpn.nix
diff --git a/nixos/modules/services/networking/ostinato.nix b/nixpkgs/nixos/modules/services/networking/ostinato.nix
index 5e8cce5b89a..5e8cce5b89a 100644
--- a/nixos/modules/services/networking/ostinato.nix
+++ b/nixpkgs/nixos/modules/services/networking/ostinato.nix
diff --git a/nixos/modules/services/networking/owamp.nix b/nixpkgs/nixos/modules/services/networking/owamp.nix
index 637ed618b89..637ed618b89 100644
--- a/nixos/modules/services/networking/owamp.nix
+++ b/nixpkgs/nixos/modules/services/networking/owamp.nix
diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix
index 6ff181377fc..6ff181377fc 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix
diff --git a/nixos/modules/services/networking/pdnsd.nix b/nixpkgs/nixos/modules/services/networking/pdnsd.nix
index 24b5bbc5104..24b5bbc5104 100644
--- a/nixos/modules/services/networking/pdnsd.nix
+++ b/nixpkgs/nixos/modules/services/networking/pdnsd.nix
diff --git a/nixos/modules/services/networking/polipo.nix b/nixpkgs/nixos/modules/services/networking/polipo.nix
index 1ff9388346b..1ff9388346b 100644
--- a/nixos/modules/services/networking/polipo.nix
+++ b/nixpkgs/nixos/modules/services/networking/polipo.nix
diff --git a/nixos/modules/services/networking/powerdns.nix b/nixpkgs/nixos/modules/services/networking/powerdns.nix
index ba05e15389f..ba05e15389f 100644
--- a/nixos/modules/services/networking/powerdns.nix
+++ b/nixpkgs/nixos/modules/services/networking/powerdns.nix
diff --git a/nixos/modules/services/networking/pppd.nix b/nixpkgs/nixos/modules/services/networking/pppd.nix
index b31bfa64235..b31bfa64235 100644
--- a/nixos/modules/services/networking/pppd.nix
+++ b/nixpkgs/nixos/modules/services/networking/pppd.nix
diff --git a/nixos/modules/services/networking/pptpd.nix b/nixpkgs/nixos/modules/services/networking/pptpd.nix
index 3e7753b9dd3..3e7753b9dd3 100644
--- a/nixos/modules/services/networking/pptpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/pptpd.nix
diff --git a/nixos/modules/services/networking/prayer.nix b/nixpkgs/nixos/modules/services/networking/prayer.nix
index 9c9eeba23da..9c9eeba23da 100644
--- a/nixos/modules/services/networking/prayer.nix
+++ b/nixpkgs/nixos/modules/services/networking/prayer.nix
diff --git a/nixos/modules/services/networking/privoxy.nix b/nixpkgs/nixos/modules/services/networking/privoxy.nix
index 1f41c720adf..1f41c720adf 100644
--- a/nixos/modules/services/networking/privoxy.nix
+++ b/nixpkgs/nixos/modules/services/networking/privoxy.nix
diff --git a/nixpkgs/nixos/modules/services/networking/prosody.nix b/nixpkgs/nixos/modules/services/networking/prosody.nix
new file mode 100644
index 00000000000..0fd84efc403
--- /dev/null
+++ b/nixpkgs/nixos/modules/services/networking/prosody.nix
@@ -0,0 +1,536 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.prosody;
+
+  sslOpts = { ... }: {
+
+    options = {
+
+      key = mkOption {
+        type = types.path;
+        description = "Path to the key file.";
+      };
+
+      # TODO: rename to certificate to match the prosody config
+      cert = mkOption {
+        type = types.path;
+        description = "Path to the certificate file.";
+      };
+
+      extraOptions = mkOption {
+        type = types.attrs;
+        default = {};
+        description = "Extra SSL configuration options.";
+      };
+
+    };
+  };
+
+  moduleOpts = {
+    # Generally required
+    roster = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Allow users to have a roster";
+    };
+
+    saslauth = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Authentication for clients and servers. Recommended if you want to log in.";
+    };
+
+    tls = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Add support for secure TLS on c2s/s2s connections";
+    };
+
+    dialback = mkOption {
+      type = types.bool;
+      default = true;
+      description = "s2s dialback support";
+    };
+
+    disco = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Service discovery";
+    };
+
+    # Not essential, but recommended
+    carbons = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Keep multiple clients in sync";
+    };
+
+    pep = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Enables users to publish their mood, activity, playing music and more";
+    };
+
+    private = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Private XML storage (for room bookmarks, etc.)";
+    };
+
+    blocklist = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Allow users to block communications with other users";
+    };
+
+    vcard = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Allow users to set vCards";
+    };
+
+    # Nice to have
+    version = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Replies to server version requests";
+    };
+
+    uptime = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Report how long server has been running";
+    };
+
+    time = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Let others know the time here on this server";
+    };
+
+    ping = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Replies to XMPP pings with pongs";
+    };
+
+    register = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Allow users to register on this server using a client and change passwords";
+    };
+
+    mam = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Store messages in an archive and allow users to access it";
+    };
+
+    # Admin interfaces
+    admin_adhoc = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Allows administration via an XMPP client that supports ad-hoc commands";
+    };
+
+    admin_telnet = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Opens telnet console interface on localhost port 5582";
+    };
+
+    # HTTP modules
+    bosh = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable BOSH clients, aka 'Jabber over HTTP'";
+    };
+
+    websocket = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable WebSocket support";
+    };
+
+    http_files = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Serve static files from a directory over HTTP";
+    };
+
+    http_upload = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Allows clients to upload files via HTTP requests";
+    };
+
+    # Other specific functionality
+    limits = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable bandwidth limiting for XMPP connections";
+    };
+
+    groups = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Shared roster support";
+    };
+
+    server_contact_info = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Publish contact information for this service";
+    };
+
+    announce = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Send announcement to all online users";
+    };
+
+    welcome = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Welcome users who register accounts";
+    };
+
+    watchregistrations = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Alert admins of registrations";
+    };
+
+    motd = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Send a message to users when they log in";
+    };
+
+    legacyauth = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Legacy authentication. Only used by some old clients and bots";
+    };
+
+    proxy65 = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enables a file transfer proxy service which clients behind NAT can use";
+    };
+
+  };
+
+  toLua = x:
+    if builtins.isString x then ''"${x}"''
+    else if builtins.isBool x then (if x == true then "true" else "false")
+    else if builtins.isInt x then toString x
+    else if builtins.isList x then ''{ ${lib.concatStringsSep ", " (map (n: toLua n) x) } }''
+    else throw "Invalid Lua value";
+
+  createSSLOptsStr = o: ''
+    ssl = {
+      cafile = "/etc/ssl/certs/ca-bundle.crt";
+      key = "${o.key}";
+      certificate = "${o.cert}";
+      ${concatStringsSep "\n" (mapAttrsToList (name: value: "${name} = ${toLua value};") o.extraOptions)}
+    };
+  '';
+
+  vHostOpts = { ... }: {
+
+    options = {
+
+      # TODO: require attribute
+      domain = mkOption {
+        type = types.str;
+        description = "Domain name";
+      };
+
+      enabled = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the virtual host";
+      };
+
+      ssl = mkOption {
+        type = types.nullOr (types.submodule sslOpts);
+        default = null;
+        description = "Paths to SSL files";
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Additional virtual host specific configuration";
+      };
+
+    };
+
+  };
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.prosody = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the prosody server";
+      };
+
+      package = mkOption {
+        type = types.package;
+        description = "Prosody package to use";
+        default = pkgs.prosody;
+        defaultText = "pkgs.prosody";
+        example = literalExample ''
+          pkgs.prosody.override {
+            withExtraLibs = [ pkgs.luaPackages.lpty ];
+            withCommunityModules = [ "auth_external" ];
+          };
+        '';
+      };
+
+      dataDir = mkOption {
+        type = types.path;
+        description = "Directory where Prosody stores its data";
+        default = "/var/lib/prosody";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "prosody";
+        description = "User account under which prosody runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "prosody";
+        description = "Group account under which prosody runs.";
+      };
+
+      allowRegistration = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Allow account creation";
+      };
+
+      c2sRequireEncryption = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Force clients to use encrypted connections? This option will
+          prevent clients from authenticating unless they are using encryption.
+        '';
+      };
+
+      s2sRequireEncryption = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Force servers to use encrypted connections? This option will
+          prevent servers from authenticating unless they are using encryption.
+          Note that this is different from authentication.
+        '';
+      };
+
+      s2sSecureAuth = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Force certificate authentication for server-to-server connections?
+          This provides ideal security, but requires servers you communicate
+          with to support encryption AND present valid, trusted certificates.
+          For more information see https://prosody.im/doc/s2s#security
+        '';
+      };
+
+      s2sInsecureDomains = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "insecure.example.com" ];
+        description = ''
+          Some servers have invalid or self-signed certificates. You can list
+          remote domains here that will not be required to authenticate using
+          certificates. They will be authenticated using DNS instead, even
+          when s2s_secure_auth is enabled.
+        '';
+      };
+
+      s2sSecureDomains = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "jabber.org" ];
+        description = ''
+          Even if you leave s2s_secure_auth disabled, you can still require valid
+          certificates for some domains by specifying a list here.
+        '';
+      };
+
+
+      modules = moduleOpts;
+
+      extraModules = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = "Enable custom modules";
+      };
+
+      extraPluginPaths = mkOption {
+        type = types.listOf types.path;
+        default = [];
+        description = "Addtional path in which to look find plugins/modules";
+      };
+
+      virtualHosts = mkOption {
+
+        description = "Define the virtual hosts";
+
+        type = with types; loaOf (submodule vHostOpts);
+
+        example = {
+          myhost = {
+            domain = "my-xmpp-example-host.org";
+            enabled = true;
+          };
+        };
+
+        default = {
+          localhost = {
+            domain = "localhost";
+            enabled = true;
+          };
+        };
+
+      };
+
+      ssl = mkOption {
+        type = types.nullOr (types.submodule sslOpts);
+        default = null;
+        description = "Paths to SSL files";
+      };
+
+      admins = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "admin1@example.com" "admin2@example.com" ];
+        description = "List of administrators of the current host";
+      };
+
+      authentication = mkOption {
+        type = types.enum [ "internal_plain" "internal_hashed" "cyrus" "anonymous" ];
+        default = "internal_hashed";
+        example = "internal_plain";
+        description = "Authentication mechanism used for logins.";
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Additional prosody configuration";
+      };
+
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ cfg.package ];
+
+    environment.etc."prosody/prosody.cfg.lua".text = ''
+
+      pidfile = "/run/prosody/prosody.pid"
+
+      log = "*syslog"
+
+      data_path = "${cfg.dataDir}"
+      plugin_paths = {
+        ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.extraPluginPaths) }
+      }
+
+      ${ optionalString  (cfg.ssl != null) (createSSLOptsStr cfg.ssl) }
+
+      admins = ${toLua cfg.admins}
+
+      -- we already build with libevent, so we can just enable it for a more performant server
+      use_libevent = true
+
+      modules_enabled = {
+
+        ${ lib.concatStringsSep "\n  " (lib.mapAttrsToList
+          (name: val: optionalString val "${toLua name};")
+        cfg.modules) }
+        ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)}
+        ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.extraModules)}
+      };
+
+      allow_registration = ${toLua cfg.allowRegistration}
+
+      c2s_require_encryption = ${toLua cfg.c2sRequireEncryption}
+
+      s2s_require_encryption = ${toLua cfg.s2sRequireEncryption}
+
+      s2s_secure_auth = ${toLua cfg.s2sSecureAuth}
+
+      s2s_insecure_domains = ${toLua cfg.s2sInsecureDomains}
+
+      s2s_secure_domains = ${toLua cfg.s2sSecureDomains}
+
+      authentication = ${toLua cfg.authentication}
+
+      ${ cfg.extraConfig }
+
+      ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: ''
+        VirtualHost "${v.domain}"
+          enabled = ${boolToString v.enabled};
+          ${ optionalString (v.ssl != null) (createSSLOptsStr v.ssl) }
+          ${ v.extraConfig }
+        '') cfg.virtualHosts) }
+    '';
+
+    users.users.prosody = mkIf (cfg.user == "prosody") {
+      uid = config.ids.uids.prosody;
+      description = "Prosody user";
+      createHome = true;
+      inherit (cfg) group;
+      home = "${cfg.dataDir}";
+    };
+
+    users.groups.prosody = mkIf (cfg.group == "prosody") {
+      gid = config.ids.gids.prosody;
+    };
+
+    systemd.services.prosody = {
+      description = "Prosody XMPP server";
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+      restartTriggers = [ config.environment.etc."prosody/prosody.cfg.lua".source ];
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        Type = "forking";
+        RuntimeDirectory = [ "prosody" ];
+        PIDFile = "/run/prosody/prosody.pid";
+        ExecStart = "${cfg.package}/bin/prosodyctl start";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+      };
+    };
+
+  };
+
+}
diff --git a/nixos/modules/services/networking/quagga.nix b/nixpkgs/nixos/modules/services/networking/quagga.nix
index 5acdd5af8f8..5acdd5af8f8 100644
--- a/nixos/modules/services/networking/quagga.nix
+++ b/nixpkgs/nixos/modules/services/networking/quagga.nix
diff --git a/nixos/modules/services/networking/quassel.nix b/nixpkgs/nixos/modules/services/networking/quassel.nix
index 52ecd90b7c6..52ecd90b7c6 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixpkgs/nixos/modules/services/networking/quassel.nix
diff --git a/nixos/modules/services/networking/quicktun.nix b/nixpkgs/nixos/modules/services/networking/quicktun.nix
index fb783c83646..fb783c83646 100644
--- a/nixos/modules/services/networking/quicktun.nix
+++ b/nixpkgs/nixos/modules/services/networking/quicktun.nix
diff --git a/nixos/modules/services/networking/racoon.nix b/nixpkgs/nixos/modules/services/networking/racoon.nix
index 328f4cb1497..328f4cb1497 100644
--- a/nixos/modules/services/networking/racoon.nix
+++ b/nixpkgs/nixos/modules/services/networking/racoon.nix
diff --git a/nixos/modules/services/networking/radicale.nix b/nixpkgs/nixos/modules/services/networking/radicale.nix
index 30bf22586f8..30bf22586f8 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixpkgs/nixos/modules/services/networking/radicale.nix
diff --git a/nixos/modules/services/networking/radvd.nix b/nixpkgs/nixos/modules/services/networking/radvd.nix
index 020faa34922..020faa34922 100644
--- a/nixos/modules/services/networking/radvd.nix
+++ b/nixpkgs/nixos/modules/services/networking/radvd.nix
diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixpkgs/nixos/modules/services/networking/rdnssd.nix
index bccab805bee..bccab805bee 100644
--- a/nixos/modules/services/networking/rdnssd.nix
+++ b/nixpkgs/nixos/modules/services/networking/rdnssd.nix
diff --git a/nixos/modules/services/networking/redsocks.nix b/nixpkgs/nixos/modules/services/networking/redsocks.nix
index 8481f9debf3..8481f9debf3 100644
--- a/nixos/modules/services/networking/redsocks.nix
+++ b/nixpkgs/nixos/modules/services/networking/redsocks.nix
diff --git a/nixos/modules/services/networking/resilio.nix b/nixpkgs/nixos/modules/services/networking/resilio.nix
index 9b25aa57583..9b25aa57583 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixpkgs/nixos/modules/services/networking/resilio.nix
diff --git a/nixos/modules/services/networking/rpcbind.nix b/nixpkgs/nixos/modules/services/networking/rpcbind.nix
index 0a5df698709..0a5df698709 100644
--- a/nixos/modules/services/networking/rpcbind.nix
+++ b/nixpkgs/nixos/modules/services/networking/rpcbind.nix
diff --git a/nixos/modules/services/networking/rxe.nix b/nixpkgs/nixos/modules/services/networking/rxe.nix
index a6a069ec50c..a6a069ec50c 100644
--- a/nixos/modules/services/networking/rxe.nix
+++ b/nixpkgs/nixos/modules/services/networking/rxe.nix
diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixpkgs/nixos/modules/services/networking/sabnzbd.nix
index 62b24d4377f..62b24d4377f 100644
--- a/nixos/modules/services/networking/sabnzbd.nix
+++ b/nixpkgs/nixos/modules/services/networking/sabnzbd.nix
diff --git a/nixos/modules/services/networking/searx.nix b/nixpkgs/nixos/modules/services/networking/searx.nix
index 60fb3d5d6d4..60fb3d5d6d4 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixpkgs/nixos/modules/services/networking/searx.nix
diff --git a/nixos/modules/services/networking/seeks.nix b/nixpkgs/nixos/modules/services/networking/seeks.nix
index 40729225b6d..40729225b6d 100644
--- a/nixos/modules/services/networking/seeks.nix
+++ b/nixpkgs/nixos/modules/services/networking/seeks.nix
diff --git a/nixos/modules/services/networking/shadowsocks.nix b/nixpkgs/nixos/modules/services/networking/shadowsocks.nix
index af12db590f0..af12db590f0 100644
--- a/nixos/modules/services/networking/shadowsocks.nix
+++ b/nixpkgs/nixos/modules/services/networking/shadowsocks.nix
diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixpkgs/nixos/modules/services/networking/shairport-sync.nix
index 2e988e0ca2e..2e988e0ca2e 100644
--- a/nixos/modules/services/networking/shairport-sync.nix
+++ b/nixpkgs/nixos/modules/services/networking/shairport-sync.nix
diff --git a/nixos/modules/services/networking/shorewall.nix b/nixpkgs/nixos/modules/services/networking/shorewall.nix
index 0f94d414fcf..0f94d414fcf 100644
--- a/nixos/modules/services/networking/shorewall.nix
+++ b/nixpkgs/nixos/modules/services/networking/shorewall.nix
diff --git a/nixos/modules/services/networking/shorewall6.nix b/nixpkgs/nixos/modules/services/networking/shorewall6.nix
index 9c22a037c0b..9c22a037c0b 100644
--- a/nixos/modules/services/networking/shorewall6.nix
+++ b/nixpkgs/nixos/modules/services/networking/shorewall6.nix
diff --git a/nixos/modules/services/networking/shout.nix b/nixpkgs/nixos/modules/services/networking/shout.nix
index a808a7f39d0..a808a7f39d0 100644
--- a/nixos/modules/services/networking/shout.nix
+++ b/nixpkgs/nixos/modules/services/networking/shout.nix
diff --git a/nixos/modules/services/networking/skydns.nix b/nixpkgs/nixos/modules/services/networking/skydns.nix
index 6ad18bb2240..6ad18bb2240 100644
--- a/nixos/modules/services/networking/skydns.nix
+++ b/nixpkgs/nixos/modules/services/networking/skydns.nix
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixpkgs/nixos/modules/services/networking/smokeping.nix
index 37ee2a80389..37ee2a80389 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixpkgs/nixos/modules/services/networking/smokeping.nix
diff --git a/nixos/modules/services/networking/sniproxy.nix b/nixpkgs/nixos/modules/services/networking/sniproxy.nix
index 0345c12d3af..0345c12d3af 100644
--- a/nixos/modules/services/networking/sniproxy.nix
+++ b/nixpkgs/nixos/modules/services/networking/sniproxy.nix
diff --git a/nixos/modules/services/networking/softether.nix b/nixpkgs/nixos/modules/services/networking/softether.nix
index 2dc73d81b25..2dc73d81b25 100644
--- a/nixos/modules/services/networking/softether.nix
+++ b/nixpkgs/nixos/modules/services/networking/softether.nix
diff --git a/nixos/modules/services/networking/spacecookie.nix b/nixpkgs/nixos/modules/services/networking/spacecookie.nix
index c4d06df6ad4..c4d06df6ad4 100644
--- a/nixos/modules/services/networking/spacecookie.nix
+++ b/nixpkgs/nixos/modules/services/networking/spacecookie.nix
diff --git a/nixos/modules/services/networking/spiped.nix b/nixpkgs/nixos/modules/services/networking/spiped.nix
index e60d9abf42a..e60d9abf42a 100644
--- a/nixos/modules/services/networking/spiped.nix
+++ b/nixpkgs/nixos/modules/services/networking/spiped.nix
diff --git a/nixos/modules/services/networking/squid.nix b/nixpkgs/nixos/modules/services/networking/squid.nix
index 9d063b92aa1..9d063b92aa1 100644
--- a/nixos/modules/services/networking/squid.nix
+++ b/nixpkgs/nixos/modules/services/networking/squid.nix
diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix
index eca599afb33..eca599afb33 100644
--- a/nixos/modules/services/networking/ssh/lshd.nix
+++ b/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
index b0e2e303cbc..b0e2e303cbc 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
diff --git a/nixos/modules/services/networking/sslh.nix b/nixpkgs/nixos/modules/services/networking/sslh.nix
index 0222e8ce8b5..0222e8ce8b5 100644
--- a/nixos/modules/services/networking/sslh.nix
+++ b/nixpkgs/nixos/modules/services/networking/sslh.nix
diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix
index 0fec3ef00ad..0fec3ef00ad 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/module.nix
+++ b/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix
diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
index dfdfc50d8ae..dfdfc50d8ae 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
+++ b/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix b/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix
index 2bbb39a7604..2bbb39a7604 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix
+++ b/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix
diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
index 808cb863a9c..808cb863a9c 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
+++ b/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
diff --git a/nixos/modules/services/networking/strongswan.nix b/nixpkgs/nixos/modules/services/networking/strongswan.nix
index 4ff9c486059..4ff9c486059 100644
--- a/nixos/modules/services/networking/strongswan.nix
+++ b/nixpkgs/nixos/modules/services/networking/strongswan.nix
diff --git a/nixos/modules/services/networking/stubby.nix b/nixpkgs/nixos/modules/services/networking/stubby.nix
index b38bcd4cec0..b38bcd4cec0 100644
--- a/nixos/modules/services/networking/stubby.nix
+++ b/nixpkgs/nixos/modules/services/networking/stubby.nix
diff --git a/nixos/modules/services/networking/stunnel.nix b/nixpkgs/nixos/modules/services/networking/stunnel.nix
index ab51bba2f6a..ab51bba2f6a 100644
--- a/nixos/modules/services/networking/stunnel.nix
+++ b/nixpkgs/nixos/modules/services/networking/stunnel.nix
diff --git a/nixos/modules/services/networking/supplicant.nix b/nixpkgs/nixos/modules/services/networking/supplicant.nix
index 35c1e649e2e..35c1e649e2e 100644
--- a/nixos/modules/services/networking/supplicant.nix
+++ b/nixpkgs/nixos/modules/services/networking/supplicant.nix
diff --git a/nixos/modules/services/networking/supybot.nix b/nixpkgs/nixos/modules/services/networking/supybot.nix
index 92c84bd0e1e..92c84bd0e1e 100644
--- a/nixos/modules/services/networking/supybot.nix
+++ b/nixpkgs/nixos/modules/services/networking/supybot.nix
diff --git a/nixos/modules/services/networking/syncplay.nix b/nixpkgs/nixos/modules/services/networking/syncplay.nix
index e3147c10502..e3147c10502 100644
--- a/nixos/modules/services/networking/syncplay.nix
+++ b/nixpkgs/nixos/modules/services/networking/syncplay.nix
diff --git a/nixos/modules/services/networking/syncthing-relay.nix b/nixpkgs/nixos/modules/services/networking/syncthing-relay.nix
index f5ca63e7893..f5ca63e7893 100644
--- a/nixos/modules/services/networking/syncthing-relay.nix
+++ b/nixpkgs/nixos/modules/services/networking/syncthing-relay.nix
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixpkgs/nixos/modules/services/networking/syncthing.nix
index 5b3eb6f04b4..5b3eb6f04b4 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixpkgs/nixos/modules/services/networking/syncthing.nix
diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixpkgs/nixos/modules/services/networking/tcpcrypt.nix
index 18f2e135124..18f2e135124 100644
--- a/nixos/modules/services/networking/tcpcrypt.nix
+++ b/nixpkgs/nixos/modules/services/networking/tcpcrypt.nix
diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixpkgs/nixos/modules/services/networking/teamspeak3.nix
index fadb32dcd77..fadb32dcd77 100644
--- a/nixos/modules/services/networking/teamspeak3.nix
+++ b/nixpkgs/nixos/modules/services/networking/teamspeak3.nix
diff --git a/nixos/modules/services/networking/tedicross.nix b/nixpkgs/nixos/modules/services/networking/tedicross.nix
index 0716975f594..0716975f594 100644
--- a/nixos/modules/services/networking/tedicross.nix
+++ b/nixpkgs/nixos/modules/services/networking/tedicross.nix
diff --git a/nixos/modules/services/networking/tftpd.nix b/nixpkgs/nixos/modules/services/networking/tftpd.nix
index c9c0a2b321d..c9c0a2b321d 100644
--- a/nixos/modules/services/networking/tftpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/tftpd.nix
diff --git a/nixos/modules/services/networking/thelounge.nix b/nixpkgs/nixos/modules/services/networking/thelounge.nix
index 875d8f66169..875d8f66169 100644
--- a/nixos/modules/services/networking/thelounge.nix
+++ b/nixpkgs/nixos/modules/services/networking/thelounge.nix
diff --git a/nixos/modules/services/networking/tinc.nix b/nixpkgs/nixos/modules/services/networking/tinc.nix
index e98aafc2093..e98aafc2093 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixpkgs/nixos/modules/services/networking/tinc.nix
diff --git a/nixos/modules/services/networking/tinydns.nix b/nixpkgs/nixos/modules/services/networking/tinydns.nix
index 79507b2ebcd..79507b2ebcd 100644
--- a/nixos/modules/services/networking/tinydns.nix
+++ b/nixpkgs/nixos/modules/services/networking/tinydns.nix
diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix
index f88e34827d0..f88e34827d0 100644
--- a/nixos/modules/services/networking/tox-bootstrapd.nix
+++ b/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix
diff --git a/nixos/modules/services/networking/tox-node.nix b/nixpkgs/nixos/modules/services/networking/tox-node.nix
index c24e7fd1285..c24e7fd1285 100644
--- a/nixos/modules/services/networking/tox-node.nix
+++ b/nixpkgs/nixos/modules/services/networking/tox-node.nix
diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixpkgs/nixos/modules/services/networking/toxvpn.nix
index 9e97faeebc1..9e97faeebc1 100644
--- a/nixos/modules/services/networking/toxvpn.nix
+++ b/nixpkgs/nixos/modules/services/networking/toxvpn.nix
diff --git a/nixos/modules/services/networking/trickster.nix b/nixpkgs/nixos/modules/services/networking/trickster.nix
index 8760dd5a938..8760dd5a938 100644
--- a/nixos/modules/services/networking/trickster.nix
+++ b/nixpkgs/nixos/modules/services/networking/trickster.nix
diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixpkgs/nixos/modules/services/networking/tvheadend.nix
index ccf87999663..ccf87999663 100644
--- a/nixos/modules/services/networking/tvheadend.nix
+++ b/nixpkgs/nixos/modules/services/networking/tvheadend.nix
diff --git a/nixos/modules/services/networking/unbound.nix b/nixpkgs/nixos/modules/services/networking/unbound.nix
index baed83591e1..baed83591e1 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixpkgs/nixos/modules/services/networking/unbound.nix
diff --git a/nixos/modules/services/networking/unifi.nix b/nixpkgs/nixos/modules/services/networking/unifi.nix
index 4bdfa8143dc..4bdfa8143dc 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixpkgs/nixos/modules/services/networking/unifi.nix
diff --git a/nixos/modules/services/networking/v2ray.nix b/nixpkgs/nixos/modules/services/networking/v2ray.nix
index a1774cdffbb..a1774cdffbb 100644
--- a/nixos/modules/services/networking/v2ray.nix
+++ b/nixpkgs/nixos/modules/services/networking/v2ray.nix
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixpkgs/nixos/modules/services/networking/vsftpd.nix
index 47990dbb377..47990dbb377 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/vsftpd.nix
diff --git a/nixos/modules/services/networking/wakeonlan.nix b/nixpkgs/nixos/modules/services/networking/wakeonlan.nix
index ebfba263cd8..ebfba263cd8 100644
--- a/nixos/modules/services/networking/wakeonlan.nix
+++ b/nixpkgs/nixos/modules/services/networking/wakeonlan.nix
diff --git a/nixos/modules/services/networking/websockify.nix b/nixpkgs/nixos/modules/services/networking/websockify.nix
index d9177df65bd..d9177df65bd 100644
--- a/nixos/modules/services/networking/websockify.nix
+++ b/nixpkgs/nixos/modules/services/networking/websockify.nix
diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixpkgs/nixos/modules/services/networking/wg-quick.nix
index b770d47d269..b770d47d269 100644
--- a/nixos/modules/services/networking/wg-quick.nix
+++ b/nixpkgs/nixos/modules/services/networking/wg-quick.nix
diff --git a/nixos/modules/services/networking/wicd.nix b/nixpkgs/nixos/modules/services/networking/wicd.nix
index 03c6bd28aab..03c6bd28aab 100644
--- a/nixos/modules/services/networking/wicd.nix
+++ b/nixpkgs/nixos/modules/services/networking/wicd.nix
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixpkgs/nixos/modules/services/networking/wireguard.nix
index 980961225c9..980961225c9 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixpkgs/nixos/modules/services/networking/wireguard.nix
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix
index de0f11595a9..de0f11595a9 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix
diff --git a/nixos/modules/services/networking/xandikos.nix b/nixpkgs/nixos/modules/services/networking/xandikos.nix
index 87c029156b9..87c029156b9 100644
--- a/nixos/modules/services/networking/xandikos.nix
+++ b/nixpkgs/nixos/modules/services/networking/xandikos.nix
diff --git a/nixos/modules/services/networking/xinetd.nix b/nixpkgs/nixos/modules/services/networking/xinetd.nix
index 8dc6f845ed8..8dc6f845ed8 100644
--- a/nixos/modules/services/networking/xinetd.nix
+++ b/nixpkgs/nixos/modules/services/networking/xinetd.nix
diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixpkgs/nixos/modules/services/networking/xl2tpd.nix
index 7dbe51422d9..7dbe51422d9 100644
--- a/nixos/modules/services/networking/xl2tpd.nix
+++ b/nixpkgs/nixos/modules/services/networking/xl2tpd.nix
diff --git a/nixos/modules/services/networking/xrdp.nix b/nixpkgs/nixos/modules/services/networking/xrdp.nix
index b7dd1c5d99d..b7dd1c5d99d 100644
--- a/nixos/modules/services/networking/xrdp.nix
+++ b/nixpkgs/nixos/modules/services/networking/xrdp.nix
diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixpkgs/nixos/modules/services/networking/yggdrasil.nix
index 9e675ecd6f4..9e675ecd6f4 100644
--- a/nixos/modules/services/networking/yggdrasil.nix
+++ b/nixpkgs/nixos/modules/services/networking/yggdrasil.nix
diff --git a/nixos/modules/services/networking/zerobin.nix b/nixpkgs/nixos/modules/services/networking/zerobin.nix
index 78de246a816..78de246a816 100644
--- a/nixos/modules/services/networking/zerobin.nix
+++ b/nixpkgs/nixos/modules/services/networking/zerobin.nix
diff --git a/nixos/modules/services/networking/zeronet.nix b/nixpkgs/nixos/modules/services/networking/zeronet.nix
index f354a9d42c7..f354a9d42c7 100644
--- a/nixos/modules/services/networking/zeronet.nix
+++ b/nixpkgs/nixos/modules/services/networking/zeronet.nix
diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixpkgs/nixos/modules/services/networking/zerotierone.nix
index 069e15a909b..069e15a909b 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixpkgs/nixos/modules/services/networking/zerotierone.nix
diff --git a/nixos/modules/services/networking/znc/default.nix b/nixpkgs/nixos/modules/services/networking/znc/default.nix
index a7315896c50..a7315896c50 100644
--- a/nixos/modules/services/networking/znc/default.nix
+++ b/nixpkgs/nixos/modules/services/networking/znc/default.nix
diff --git a/nixos/modules/services/networking/znc/options.nix b/nixpkgs/nixos/modules/services/networking/znc/options.nix
index 048dbd73863..048dbd73863 100644
--- a/nixos/modules/services/networking/znc/options.nix
+++ b/nixpkgs/nixos/modules/services/networking/znc/options.nix
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixpkgs/nixos/modules/services/printing/cupsd.nix
index 59306d625e6..59306d625e6 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixpkgs/nixos/modules/services/printing/cupsd.nix
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixpkgs/nixos/modules/services/scheduling/atd.nix
index 93ed9231d3c..93ed9231d3c 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixpkgs/nixos/modules/services/scheduling/atd.nix
diff --git a/nixos/modules/services/scheduling/chronos.nix b/nixpkgs/nixos/modules/services/scheduling/chronos.nix
index 9a8ed4c09ac..9a8ed4c09ac 100644
--- a/nixos/modules/services/scheduling/chronos.nix
+++ b/nixpkgs/nixos/modules/services/scheduling/chronos.nix
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixpkgs/nixos/modules/services/scheduling/cron.nix
index 3bc31832946..3bc31832946 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixpkgs/nixos/modules/services/scheduling/cron.nix
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixpkgs/nixos/modules/services/scheduling/fcron.nix
index 42bed21bf25..42bed21bf25 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixpkgs/nixos/modules/services/scheduling/fcron.nix
diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixpkgs/nixos/modules/services/scheduling/marathon.nix
index 2e0d20c64b2..2e0d20c64b2 100644
--- a/nixos/modules/services/scheduling/marathon.nix
+++ b/nixpkgs/nixos/modules/services/scheduling/marathon.nix
diff --git a/nixos/modules/services/search/elasticsearch-curator.nix b/nixpkgs/nixos/modules/services/search/elasticsearch-curator.nix
index 9620c3e0b6d..9620c3e0b6d 100644
--- a/nixos/modules/services/search/elasticsearch-curator.nix
+++ b/nixpkgs/nixos/modules/services/search/elasticsearch-curator.nix
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixpkgs/nixos/modules/services/search/elasticsearch.nix
index 91d8f544e16..91d8f544e16 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixpkgs/nixos/modules/services/search/elasticsearch.nix
diff --git a/nixos/modules/services/search/hound.nix b/nixpkgs/nixos/modules/services/search/hound.nix
index 7a44489efe6..7a44489efe6 100644
--- a/nixos/modules/services/search/hound.nix
+++ b/nixpkgs/nixos/modules/services/search/hound.nix
diff --git a/nixos/modules/services/search/kibana.nix b/nixpkgs/nixos/modules/services/search/kibana.nix
index 2beb265ee5d..2beb265ee5d 100644
--- a/nixos/modules/services/search/kibana.nix
+++ b/nixpkgs/nixos/modules/services/search/kibana.nix
diff --git a/nixos/modules/services/search/solr.nix b/nixpkgs/nixos/modules/services/search/solr.nix
index a8615a20a1c..a8615a20a1c 100644
--- a/nixos/modules/services/search/solr.nix
+++ b/nixpkgs/nixos/modules/services/search/solr.nix
diff --git a/nixos/modules/services/security/bitwarden_rs/backup.sh b/nixpkgs/nixos/modules/services/security/bitwarden_rs/backup.sh
index 264a7da9cbb..264a7da9cbb 100644
--- a/nixos/modules/services/security/bitwarden_rs/backup.sh
+++ b/nixpkgs/nixos/modules/services/security/bitwarden_rs/backup.sh
diff --git a/nixos/modules/services/security/bitwarden_rs/default.nix b/nixpkgs/nixos/modules/services/security/bitwarden_rs/default.nix
index a63be0ee766..a63be0ee766 100644
--- a/nixos/modules/services/security/bitwarden_rs/default.nix
+++ b/nixpkgs/nixos/modules/services/security/bitwarden_rs/default.nix
diff --git a/nixos/modules/services/security/certmgr.nix b/nixpkgs/nixos/modules/services/security/certmgr.nix
index 94c0ba14117..94c0ba14117 100644
--- a/nixos/modules/services/security/certmgr.nix
+++ b/nixpkgs/nixos/modules/services/security/certmgr.nix
diff --git a/nixos/modules/services/security/cfssl.nix b/nixpkgs/nixos/modules/services/security/cfssl.nix
index ee6d5d91fe1..ee6d5d91fe1 100644
--- a/nixos/modules/services/security/cfssl.nix
+++ b/nixpkgs/nixos/modules/services/security/cfssl.nix
diff --git a/nixos/modules/services/security/clamav.nix b/nixpkgs/nixos/modules/services/security/clamav.nix
index aaf6fb0479b..aaf6fb0479b 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixpkgs/nixos/modules/services/security/clamav.nix
diff --git a/nixos/modules/services/security/fail2ban.nix b/nixpkgs/nixos/modules/services/security/fail2ban.nix
index cb748c93d24..cb748c93d24 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixpkgs/nixos/modules/services/security/fail2ban.nix
diff --git a/nixos/modules/services/security/fprintd.nix b/nixpkgs/nixos/modules/services/security/fprintd.nix
index 8ece1ca1901..8ece1ca1901 100644
--- a/nixos/modules/services/security/fprintd.nix
+++ b/nixpkgs/nixos/modules/services/security/fprintd.nix
diff --git a/nixos/modules/services/security/fprot.nix b/nixpkgs/nixos/modules/services/security/fprot.nix
index f203f2abc03..f203f2abc03 100644
--- a/nixos/modules/services/security/fprot.nix
+++ b/nixpkgs/nixos/modules/services/security/fprot.nix
diff --git a/nixos/modules/services/security/haka.nix b/nixpkgs/nixos/modules/services/security/haka.nix
index 618e689924f..618e689924f 100644
--- a/nixos/modules/services/security/haka.nix
+++ b/nixpkgs/nixos/modules/services/security/haka.nix
diff --git a/nixos/modules/services/security/haveged.nix b/nixpkgs/nixos/modules/services/security/haveged.nix
index eca52918881..eca52918881 100644
--- a/nixos/modules/services/security/haveged.nix
+++ b/nixpkgs/nixos/modules/services/security/haveged.nix
diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixpkgs/nixos/modules/services/security/hologram-agent.nix
index a5087b0a99b..a5087b0a99b 100644
--- a/nixos/modules/services/security/hologram-agent.nix
+++ b/nixpkgs/nixos/modules/services/security/hologram-agent.nix
diff --git a/nixos/modules/services/security/hologram-server.nix b/nixpkgs/nixos/modules/services/security/hologram-server.nix
index bad02c7440b..bad02c7440b 100644
--- a/nixos/modules/services/security/hologram-server.nix
+++ b/nixpkgs/nixos/modules/services/security/hologram-server.nix
diff --git a/nixos/modules/services/security/munge.nix b/nixpkgs/nixos/modules/services/security/munge.nix
index 89178886471..89178886471 100644
--- a/nixos/modules/services/security/munge.nix
+++ b/nixpkgs/nixos/modules/services/security/munge.nix
diff --git a/nixos/modules/services/security/nginx-sso.nix b/nixpkgs/nixos/modules/services/security/nginx-sso.nix
index d792f90abe6..d792f90abe6 100644
--- a/nixos/modules/services/security/nginx-sso.nix
+++ b/nixpkgs/nixos/modules/services/security/nginx-sso.nix
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix
index 2abb9ec32ac..2abb9ec32ac 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix
diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix
index be6734f439f..be6734f439f 100644
--- a/nixos/modules/services/security/oauth2_proxy_nginx.nix
+++ b/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix
diff --git a/nixos/modules/services/security/physlock.nix b/nixpkgs/nixos/modules/services/security/physlock.nix
index 61bcd84f2e6..61bcd84f2e6 100644
--- a/nixos/modules/services/security/physlock.nix
+++ b/nixpkgs/nixos/modules/services/security/physlock.nix
diff --git a/nixos/modules/services/security/shibboleth-sp.nix b/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix
index 5908f727d53..5908f727d53 100644
--- a/nixos/modules/services/security/shibboleth-sp.nix
+++ b/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix
diff --git a/nixos/modules/services/security/sks.nix b/nixpkgs/nixos/modules/services/security/sks.nix
index a91060dc659..a91060dc659 100644
--- a/nixos/modules/services/security/sks.nix
+++ b/nixpkgs/nixos/modules/services/security/sks.nix
diff --git a/nixos/modules/services/security/sshguard.nix b/nixpkgs/nixos/modules/services/security/sshguard.nix
index e7a9cefdef3..e7a9cefdef3 100644
--- a/nixos/modules/services/security/sshguard.nix
+++ b/nixpkgs/nixos/modules/services/security/sshguard.nix
diff --git a/nixos/modules/services/security/tor.nix b/nixpkgs/nixos/modules/services/security/tor.nix
index 18c105b2f57..18c105b2f57 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixpkgs/nixos/modules/services/security/tor.nix
diff --git a/nixos/modules/services/security/torify.nix b/nixpkgs/nixos/modules/services/security/torify.nix
index 39551190dd3..39551190dd3 100644
--- a/nixos/modules/services/security/torify.nix
+++ b/nixpkgs/nixos/modules/services/security/torify.nix
diff --git a/nixos/modules/services/security/torsocks.nix b/nixpkgs/nixos/modules/services/security/torsocks.nix
index 47ac95c4626..47ac95c4626 100644
--- a/nixos/modules/services/security/torsocks.nix
+++ b/nixpkgs/nixos/modules/services/security/torsocks.nix
diff --git a/nixos/modules/services/security/usbguard.nix b/nixpkgs/nixos/modules/services/security/usbguard.nix
index 4ced5acd9bd..4ced5acd9bd 100644
--- a/nixos/modules/services/security/usbguard.nix
+++ b/nixpkgs/nixos/modules/services/security/usbguard.nix
diff --git a/nixos/modules/services/security/vault.nix b/nixpkgs/nixos/modules/services/security/vault.nix
index 6a8a3a93327..6a8a3a93327 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixpkgs/nixos/modules/services/security/vault.nix
diff --git a/nixos/modules/services/system/cgmanager.nix b/nixpkgs/nixos/modules/services/system/cgmanager.nix
index d3d57aa7692..d3d57aa7692 100644
--- a/nixos/modules/services/system/cgmanager.nix
+++ b/nixpkgs/nixos/modules/services/system/cgmanager.nix
diff --git a/nixos/modules/services/system/cloud-init.nix b/nixpkgs/nixos/modules/services/system/cloud-init.nix
index 15fe822aec6..15fe822aec6 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixpkgs/nixos/modules/services/system/cloud-init.nix
diff --git a/nixos/modules/services/system/dbus.nix b/nixpkgs/nixos/modules/services/system/dbus.nix
index 4a60fec1ca8..4a60fec1ca8 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixpkgs/nixos/modules/services/system/dbus.nix
diff --git a/nixos/modules/services/system/earlyoom.nix b/nixpkgs/nixos/modules/services/system/earlyoom.nix
index 39d1bf274bd..39d1bf274bd 100644
--- a/nixos/modules/services/system/earlyoom.nix
+++ b/nixpkgs/nixos/modules/services/system/earlyoom.nix
diff --git a/nixos/modules/services/system/kerberos/default.nix b/nixpkgs/nixos/modules/services/system/kerberos/default.nix
index c55241c4cff..c55241c4cff 100644
--- a/nixos/modules/services/system/kerberos/default.nix
+++ b/nixpkgs/nixos/modules/services/system/kerberos/default.nix
diff --git a/nixos/modules/services/system/kerberos/heimdal.nix b/nixpkgs/nixos/modules/services/system/kerberos/heimdal.nix
index f0e56c7951a..f0e56c7951a 100644
--- a/nixos/modules/services/system/kerberos/heimdal.nix
+++ b/nixpkgs/nixos/modules/services/system/kerberos/heimdal.nix
diff --git a/nixos/modules/services/system/kerberos/mit.nix b/nixpkgs/nixos/modules/services/system/kerberos/mit.nix
index 25d7d51e808..25d7d51e808 100644
--- a/nixos/modules/services/system/kerberos/mit.nix
+++ b/nixpkgs/nixos/modules/services/system/kerberos/mit.nix
diff --git a/nixos/modules/services/system/localtime.nix b/nixpkgs/nixos/modules/services/system/localtime.nix
index 74925c5e2c4..74925c5e2c4 100644
--- a/nixos/modules/services/system/localtime.nix
+++ b/nixpkgs/nixos/modules/services/system/localtime.nix
diff --git a/nixos/modules/services/system/nscd.conf b/nixpkgs/nixos/modules/services/system/nscd.conf
index 2b7523a7346..2b7523a7346 100644
--- a/nixos/modules/services/system/nscd.conf
+++ b/nixpkgs/nixos/modules/services/system/nscd.conf
diff --git a/nixos/modules/services/system/nscd.nix b/nixpkgs/nixos/modules/services/system/nscd.nix
index e11f7e049d8..e11f7e049d8 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixpkgs/nixos/modules/services/system/nscd.nix
diff --git a/nixos/modules/services/system/saslauthd.nix b/nixpkgs/nixos/modules/services/system/saslauthd.nix
index 8fcf4fb91fc..8fcf4fb91fc 100644
--- a/nixos/modules/services/system/saslauthd.nix
+++ b/nixpkgs/nixos/modules/services/system/saslauthd.nix
diff --git a/nixos/modules/services/system/uptimed.nix b/nixpkgs/nixos/modules/services/system/uptimed.nix
index 3c9978ab226..3c9978ab226 100644
--- a/nixos/modules/services/system/uptimed.nix
+++ b/nixpkgs/nixos/modules/services/system/uptimed.nix
diff --git a/nixos/modules/services/torrent/deluge.nix b/nixpkgs/nixos/modules/services/torrent/deluge.nix
index 0c72505395d..0c72505395d 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixpkgs/nixos/modules/services/torrent/deluge.nix
diff --git a/nixos/modules/services/torrent/flexget.nix b/nixpkgs/nixos/modules/services/torrent/flexget.nix
index 6ac85f8fa17..6ac85f8fa17 100644
--- a/nixos/modules/services/torrent/flexget.nix
+++ b/nixpkgs/nixos/modules/services/torrent/flexget.nix
diff --git a/nixos/modules/services/torrent/magnetico.nix b/nixpkgs/nixos/modules/services/torrent/magnetico.nix
index 7465c10e002..7465c10e002 100644
--- a/nixos/modules/services/torrent/magnetico.nix
+++ b/nixpkgs/nixos/modules/services/torrent/magnetico.nix
diff --git a/nixos/modules/services/torrent/opentracker.nix b/nixpkgs/nixos/modules/services/torrent/opentracker.nix
index 74f443381d9..74f443381d9 100644
--- a/nixos/modules/services/torrent/opentracker.nix
+++ b/nixpkgs/nixos/modules/services/torrent/opentracker.nix
diff --git a/nixos/modules/services/torrent/peerflix.nix b/nixpkgs/nixos/modules/services/torrent/peerflix.nix
index a74f6598432..a74f6598432 100644
--- a/nixos/modules/services/torrent/peerflix.nix
+++ b/nixpkgs/nixos/modules/services/torrent/peerflix.nix
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixpkgs/nixos/modules/services/torrent/transmission.nix
index 5ba72e8d773..5ba72e8d773 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixpkgs/nixos/modules/services/torrent/transmission.nix
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixpkgs/nixos/modules/services/ttys/agetty.nix
index f3a629f7af7..f3a629f7af7 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixpkgs/nixos/modules/services/ttys/agetty.nix
diff --git a/nixos/modules/services/ttys/gpm.nix b/nixpkgs/nixos/modules/services/ttys/gpm.nix
index 308a6d3643a..308a6d3643a 100644
--- a/nixos/modules/services/ttys/gpm.nix
+++ b/nixpkgs/nixos/modules/services/ttys/gpm.nix
diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixpkgs/nixos/modules/services/ttys/kmscon.nix
index dc37f9bee4b..dc37f9bee4b 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixpkgs/nixos/modules/services/ttys/kmscon.nix
diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix
index 59185fdbd36..59185fdbd36 100644
--- a/nixos/modules/services/web-apps/atlassian/confluence.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix
diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix
index ceab656b15e..ceab656b15e 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix
diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix
index ce04982e8a9..ce04982e8a9 100644
--- a/nixos/modules/services/web-apps/atlassian/jira.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix
diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixpkgs/nixos/modules/services/web-apps/codimd.nix
index 5f56f8ed5a0..5f56f8ed5a0 100644
--- a/nixos/modules/services/web-apps/codimd.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/codimd.nix
diff --git a/nixos/modules/services/web-apps/cryptpad.nix b/nixpkgs/nixos/modules/services/web-apps/cryptpad.nix
index 69a89107d31..69a89107d31 100644
--- a/nixos/modules/services/web-apps/cryptpad.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/cryptpad.nix
diff --git a/nixos/modules/services/web-apps/documize.nix b/nixpkgs/nixos/modules/services/web-apps/documize.nix
index 1b90299aa23..1b90299aa23 100644
--- a/nixos/modules/services/web-apps/documize.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/documize.nix
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
index 07af7aa0dfe..07af7aa0dfe 100644
--- a/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
diff --git a/nixos/modules/services/web-apps/frab.nix b/nixpkgs/nixos/modules/services/web-apps/frab.nix
index 1b5890d6b0c..1b5890d6b0c 100644
--- a/nixos/modules/services/web-apps/frab.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/frab.nix
diff --git a/nixos/modules/services/web-apps/gotify-server.nix b/nixpkgs/nixos/modules/services/web-apps/gotify-server.nix
index 03e01f46a94..03e01f46a94 100644
--- a/nixos/modules/services/web-apps/gotify-server.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/gotify-server.nix
diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
index d9ad7e9e3d3..d9ad7e9e3d3 100644
--- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
diff --git a/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix b/nixpkgs/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
index e9c1d4ffe5e..e9c1d4ffe5e 100644
--- a/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
diff --git a/nixos/modules/services/web-apps/ihatemoney/default.nix b/nixpkgs/nixos/modules/services/web-apps/ihatemoney/default.nix
index 68769ac8c03..68769ac8c03 100644
--- a/nixos/modules/services/web-apps/ihatemoney/default.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/ihatemoney/default.nix
diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix
index e00a47191c6..e00a47191c6 100644
--- a/nixos/modules/services/web-apps/limesurvey.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix
diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixpkgs/nixos/modules/services/web-apps/matomo-doc.xml
index 69d1170e452..69d1170e452 100644
--- a/nixos/modules/services/web-apps/matomo-doc.xml
+++ b/nixpkgs/nixos/modules/services/web-apps/matomo-doc.xml
diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixpkgs/nixos/modules/services/web-apps/matomo.nix
index 75da474dc44..75da474dc44 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/matomo.nix
diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixpkgs/nixos/modules/services/web-apps/mattermost.nix
index 41c52b9653b..41c52b9653b 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/mattermost.nix
diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix
index 8a109b39bb5..8a109b39bb5 100644
--- a/nixos/modules/services/web-apps/mediawiki.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix
diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixpkgs/nixos/modules/services/web-apps/miniflux.nix
index 304712d0efc..304712d0efc 100644
--- a/nixos/modules/services/web-apps/miniflux.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/miniflux.nix
diff --git a/nixos/modules/services/web-apps/moinmoin.nix b/nixpkgs/nixos/modules/services/web-apps/moinmoin.nix
index 0fee64be0bb..0fee64be0bb 100644
--- a/nixos/modules/services/web-apps/moinmoin.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/moinmoin.nix
diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixpkgs/nixos/modules/services/web-apps/moodle.nix
index 595d070d940..595d070d940 100644
--- a/nixos/modules/services/web-apps/moodle.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/moodle.nix
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
index d79f2bb735f..d79f2bb735f 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml
index d66e0f0c299..d66e0f0c299 100644
--- a/nixos/modules/services/web-apps/nextcloud.xml
+++ b/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml
diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixpkgs/nixos/modules/services/web-apps/nexus.nix
index d4d507362c9..d4d507362c9 100644
--- a/nixos/modules/services/web-apps/nexus.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/nexus.nix
diff --git a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix b/nixpkgs/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
index ad70ba70bbe..ad70ba70bbe 100644
--- a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixpkgs/nixos/modules/services/web-apps/restya-board.nix
index 9d0a3f65253..9d0a3f65253 100644
--- a/nixos/modules/services/web-apps/restya-board.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/restya-board.nix
diff --git a/nixos/modules/services/web-apps/selfoss.nix b/nixpkgs/nixos/modules/services/web-apps/selfoss.nix
index d5a660ebf28..d5a660ebf28 100644
--- a/nixos/modules/services/web-apps/selfoss.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/selfoss.nix
diff --git a/nixos/modules/services/web-apps/shiori.nix b/nixpkgs/nixos/modules/services/web-apps/shiori.nix
index 1817a203935..1817a203935 100644
--- a/nixos/modules/services/web-apps/shiori.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/shiori.nix
diff --git a/nixos/modules/services/web-apps/trac.nix b/nixpkgs/nixos/modules/services/web-apps/trac.nix
index 207fb857438..207fb857438 100644
--- a/nixos/modules/services/web-apps/trac.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/trac.nix
diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixpkgs/nixos/modules/services/web-apps/trilium.nix
index 6f47193c62b..6f47193c62b 100644
--- a/nixos/modules/services/web-apps/trilium.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/trilium.nix
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix
index b92e3449894..b92e3449894 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix
diff --git a/nixos/modules/services/web-apps/virtlyst.nix b/nixpkgs/nixos/modules/services/web-apps/virtlyst.nix
index 37bdbb0e3b4..37bdbb0e3b4 100644
--- a/nixos/modules/services/web-apps/virtlyst.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/virtlyst.nix
diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixpkgs/nixos/modules/services/web-apps/wordpress.nix
index ad4f39fbf52..ad4f39fbf52 100644
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/wordpress.nix
diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixpkgs/nixos/modules/services/web-apps/youtrack.nix
index 830edac20ba..830edac20ba 100644
--- a/nixos/modules/services/web-apps/youtrack.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/youtrack.nix
diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixpkgs/nixos/modules/services/web-apps/zabbix.nix
index ee8447810c6..ee8447810c6 100644
--- a/nixos/modules/services/web-apps/zabbix.nix
+++ b/nixpkgs/nixos/modules/services/web-apps/zabbix.nix
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix
index 9942c63acce..9942c63acce 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix
diff --git a/nixos/modules/services/web-servers/apache-httpd/location-options.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/location-options.nix
index 8ea88f94f97..8ea88f94f97 100644
--- a/nixos/modules/services/web-servers/apache-httpd/location-options.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/location-options.nix
diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index f34f8b4acdf..f34f8b4acdf 100644
--- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixpkgs/nixos/modules/services/web-servers/caddy.nix
index 132c50735d9..132c50735d9 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/caddy.nix
diff --git a/nixos/modules/services/web-servers/darkhttpd.nix b/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix
index d6649fd472d..d6649fd472d 100644
--- a/nixos/modules/services/web-servers/darkhttpd.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix
diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix
index a64a187255a..a64a187255a 100644
--- a/nixos/modules/services/web-servers/fcgiwrap.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix
diff --git a/nixos/modules/services/web-servers/hitch/default.nix b/nixpkgs/nixos/modules/services/web-servers/hitch/default.nix
index 1812f225b74..1812f225b74 100644
--- a/nixos/modules/services/web-servers/hitch/default.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/hitch/default.nix
diff --git a/nixos/modules/services/web-servers/hydron.nix b/nixpkgs/nixos/modules/services/web-servers/hydron.nix
index a4a5a435b2e..a4a5a435b2e 100644
--- a/nixos/modules/services/web-servers/hydron.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/hydron.nix
diff --git a/nixos/modules/services/web-servers/jboss/builder.sh b/nixpkgs/nixos/modules/services/web-servers/jboss/builder.sh
index 2eb89a90f67..2eb89a90f67 100644
--- a/nixos/modules/services/web-servers/jboss/builder.sh
+++ b/nixpkgs/nixos/modules/services/web-servers/jboss/builder.sh
diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixpkgs/nixos/modules/services/web-servers/jboss/default.nix
index d28724281a8..d28724281a8 100644
--- a/nixos/modules/services/web-servers/jboss/default.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/jboss/default.nix
diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix
index 9f25dc34f3f..9f25dc34f3f 100644
--- a/nixos/modules/services/web-servers/lighttpd/cgit.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix
diff --git a/nixos/modules/services/web-servers/lighttpd/collectd.nix b/nixpkgs/nixos/modules/services/web-servers/lighttpd/collectd.nix
index 3f262451c2c..3f262451c2c 100644
--- a/nixos/modules/services/web-servers/lighttpd/collectd.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/lighttpd/collectd.nix
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix
index 7a3df26e47a..7a3df26e47a 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix
diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixpkgs/nixos/modules/services/web-servers/lighttpd/gitweb.nix
index c494d6966a7..c494d6966a7 100644
--- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/lighttpd/gitweb.nix
diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixpkgs/nixos/modules/services/web-servers/meguca.nix
index 5a00070dc94..5a00070dc94 100644
--- a/nixos/modules/services/web-servers/meguca.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/meguca.nix
diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix
index f9b1a8b6ccc..f9b1a8b6ccc 100644
--- a/nixos/modules/services/web-servers/mighttpd2.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix
diff --git a/nixos/modules/services/web-servers/minio.nix b/nixpkgs/nixos/modules/services/web-servers/minio.nix
index cd123000f00..cd123000f00 100644
--- a/nixos/modules/services/web-servers/minio.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/minio.nix
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
index c8602e5975b..c8602e5975b 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix
index f7fb07bb797..f7fb07bb797 100644
--- a/nixos/modules/services/web-servers/nginx/gitweb.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix
diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixpkgs/nixos/modules/services/web-servers/nginx/location-options.nix
index 3d9e391ecf2..3d9e391ecf2 100644
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/nginx/location-options.nix
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 455854e2a96..455854e2a96 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix
diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix
index 2c73da10394..2c73da10394 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix
diff --git a/nixos/modules/services/web-servers/shellinabox.nix b/nixpkgs/nixos/modules/services/web-servers/shellinabox.nix
index 58a02ac59c3..58a02ac59c3 100644
--- a/nixos/modules/services/web-servers/shellinabox.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/shellinabox.nix
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixpkgs/nixos/modules/services/web-servers/tomcat.nix
index 6d12925829f..6d12925829f 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/tomcat.nix
diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixpkgs/nixos/modules/services/web-servers/traefik.nix
index 5b0fc467ea4..5b0fc467ea4 100644
--- a/nixos/modules/services/web-servers/traefik.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/traefik.nix
diff --git a/nixos/modules/services/web-servers/ttyd.nix b/nixpkgs/nixos/modules/services/web-servers/ttyd.nix
index 01a01d97a23..01a01d97a23 100644
--- a/nixos/modules/services/web-servers/ttyd.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/ttyd.nix
diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixpkgs/nixos/modules/services/web-servers/unit/default.nix
index f8a18954fc9..f8a18954fc9 100644
--- a/nixos/modules/services/web-servers/unit/default.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/unit/default.nix
diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix
index 3481b5e6040..3481b5e6040 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix
diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixpkgs/nixos/modules/services/web-servers/varnish/default.nix
index 01fe3d12917..01fe3d12917 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/varnish/default.nix
diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixpkgs/nixos/modules/services/web-servers/zope2.nix
index 3abd506827c..3abd506827c 100644
--- a/nixos/modules/services/web-servers/zope2.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/zope2.nix
diff --git a/nixos/modules/services/x11/clight.nix b/nixpkgs/nixos/modules/services/x11/clight.nix
index 4daf6d8d9db..4daf6d8d9db 100644
--- a/nixos/modules/services/x11/clight.nix
+++ b/nixpkgs/nixos/modules/services/x11/clight.nix
diff --git a/nixos/modules/services/x11/colord.nix b/nixpkgs/nixos/modules/services/x11/colord.nix
index cf113ad2af8..cf113ad2af8 100644
--- a/nixos/modules/services/x11/colord.nix
+++ b/nixpkgs/nixos/modules/services/x11/colord.nix
diff --git a/nixos/modules/services/x11/desktop-managers/cde.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix
index c1b6d3bf064..c1b6d3bf064 100644
--- a/nixos/modules/services/x11/desktop-managers/cde.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix
index ea6aac9f6c9..ea6aac9f6c9 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 26b662a2a64..26b662a2a64 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 5756cf14ed9..5756cf14ed9 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix
diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix
index 65a7b9c628e..65a7b9c628e 100644
--- a/nixos/modules/services/x11/desktop-managers/kodi.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix
diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/lumina.nix
index 2224bcd5a2a..2224bcd5a2a 100644
--- a/nixos/modules/services/x11/desktop-managers/lumina.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/lumina.nix
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix
index bf53082b267..bf53082b267 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix
index 4a6f2ca727d..4a6f2ca727d 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix
diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/maxx.nix
index 1c04104df41..1c04104df41 100644
--- a/nixos/modules/services/x11/desktop-managers/maxx.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/maxx.nix
diff --git a/nixos/modules/services/x11/desktop-managers/none.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/none.nix
index af7a376ae02..af7a376ae02 100644
--- a/nixos/modules/services/x11/desktop-managers/none.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/none.nix
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix
index b46a2d189ef..b46a2d189ef 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 2538858ac0f..2538858ac0f 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix
diff --git a/nixos/modules/services/x11/desktop-managers/surf-display.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/surf-display.nix
index 9aeb0bbd2a8..9aeb0bbd2a8 100644
--- a/nixos/modules/services/x11/desktop-managers/surf-display.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/surf-display.nix
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix
index 21f59074f3a..21f59074f3a 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix
diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/xterm.nix
index f76db278a92..f76db278a92 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/xterm.nix
diff --git a/nixos/modules/services/x11/display-managers/account-service-util.nix b/nixpkgs/nixos/modules/services/x11/display-managers/account-service-util.nix
index 1dbe703b566..1dbe703b566 100644
--- a/nixos/modules/services/x11/display-managers/account-service-util.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/account-service-util.nix
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixpkgs/nixos/modules/services/x11/display-managers/default.nix
index 1efd0739376..1efd0739376 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/default.nix
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix
index 325023f4121..325023f4121 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
index 129df139c61..129df139c61 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index de932e6e840..de932e6e840 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
index 0025f9b3603..0025f9b3603 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
index 77c94114e6d..77c94114e6d 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix
index f7face0adb7..f7face0adb7 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix
index 4224c557ed6..4224c557ed6 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix
diff --git a/nixos/modules/services/x11/display-managers/set-session.py b/nixpkgs/nixos/modules/services/x11/display-managers/set-session.py
index 0cca80af44e..0cca80af44e 100755
--- a/nixos/modules/services/x11/display-managers/set-session.py
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/set-session.py
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixpkgs/nixos/modules/services/x11/display-managers/slim.nix
index 4b0948a5b7a..4b0948a5b7a 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/slim.nix
diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixpkgs/nixos/modules/services/x11/display-managers/startx.nix
index 57046984358..57046984358 100644
--- a/nixos/modules/services/x11/display-managers/startx.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/startx.nix
diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix
index c23e479140f..c23e479140f 100644
--- a/nixos/modules/services/x11/display-managers/xpra.nix
+++ b/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix
diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixpkgs/nixos/modules/services/x11/extra-layouts.nix
index f48216ff446..f48216ff446 100644
--- a/nixos/modules/services/x11/extra-layouts.nix
+++ b/nixpkgs/nixos/modules/services/x11/extra-layouts.nix
diff --git a/nixos/modules/services/x11/fractalart.nix b/nixpkgs/nixos/modules/services/x11/fractalart.nix
index 448248a5879..448248a5879 100644
--- a/nixos/modules/services/x11/fractalart.nix
+++ b/nixpkgs/nixos/modules/services/x11/fractalart.nix
diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixpkgs/nixos/modules/services/x11/gdk-pixbuf.nix
index 9ad926369ec..9ad926369ec 100644
--- a/nixos/modules/services/x11/gdk-pixbuf.nix
+++ b/nixpkgs/nixos/modules/services/x11/gdk-pixbuf.nix
diff --git a/nixos/modules/services/x11/hardware/cmt.nix b/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix
index 5ac824c5e41..5ac824c5e41 100644
--- a/nixos/modules/services/x11/hardware/cmt.nix
+++ b/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix
diff --git a/nixos/modules/services/x11/hardware/digimend.nix b/nixpkgs/nixos/modules/services/x11/hardware/digimend.nix
index a9f5640905a..a9f5640905a 100644
--- a/nixos/modules/services/x11/hardware/digimend.nix
+++ b/nixpkgs/nixos/modules/services/x11/hardware/digimend.nix
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix
index f6b0e7c09f5..f6b0e7c09f5 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix
index 22af869f1f8..22af869f1f8 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix
diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixpkgs/nixos/modules/services/x11/hardware/wacom.nix
index a27889c36a7..a27889c36a7 100644
--- a/nixos/modules/services/x11/hardware/wacom.nix
+++ b/nixpkgs/nixos/modules/services/x11/hardware/wacom.nix
diff --git a/nixos/modules/services/x11/imwheel.nix b/nixpkgs/nixos/modules/services/x11/imwheel.nix
index 3923df498e7..3923df498e7 100644
--- a/nixos/modules/services/x11/imwheel.nix
+++ b/nixpkgs/nixos/modules/services/x11/imwheel.nix
diff --git a/nixos/modules/services/x11/picom.nix b/nixpkgs/nixos/modules/services/x11/picom.nix
index e3bd21be73e..e3bd21be73e 100644
--- a/nixos/modules/services/x11/picom.nix
+++ b/nixpkgs/nixos/modules/services/x11/picom.nix
diff --git a/nixos/modules/services/x11/redshift.nix b/nixpkgs/nixos/modules/services/x11/redshift.nix
index 21b0b33553a..21b0b33553a 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixpkgs/nixos/modules/services/x11/redshift.nix
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixpkgs/nixos/modules/services/x11/terminal-server.nix
index 503c14c9b62..503c14c9b62 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixpkgs/nixos/modules/services/x11/terminal-server.nix
diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixpkgs/nixos/modules/services/x11/unclutter-xfixes.nix
index 71262431b68..71262431b68 100644
--- a/nixos/modules/services/x11/unclutter-xfixes.nix
+++ b/nixpkgs/nixos/modules/services/x11/unclutter-xfixes.nix
diff --git a/nixos/modules/services/x11/unclutter.nix b/nixpkgs/nixos/modules/services/x11/unclutter.nix
index c0868604a68..c0868604a68 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixpkgs/nixos/modules/services/x11/unclutter.nix
diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixpkgs/nixos/modules/services/x11/urxvtd.nix
index 9bfcfa9b065..9bfcfa9b065 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixpkgs/nixos/modules/services/x11/urxvtd.nix
diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/2bwm.nix
index fdbdf35b0f5..fdbdf35b0f5 100644
--- a/nixos/modules/services/x11/window-managers/2bwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/2bwm.nix
diff --git a/nixos/modules/services/x11/window-managers/afterstep.nix b/nixpkgs/nixos/modules/services/x11/window-managers/afterstep.nix
index ba88a64c702..ba88a64c702 100644
--- a/nixos/modules/services/x11/window-managers/afterstep.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/afterstep.nix
diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixpkgs/nixos/modules/services/x11/window-managers/awesome.nix
index 089e9f769f0..089e9f769f0 100644
--- a/nixos/modules/services/x11/window-managers/awesome.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/awesome.nix
diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/bspwm.nix
index 23cd4f6529a..23cd4f6529a 100644
--- a/nixos/modules/services/x11/window-managers/bspwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/bspwm.nix
diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix
index 176c1f46127..176c1f46127 100644
--- a/nixos/modules/services/x11/window-managers/clfswm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix
diff --git a/nixos/modules/services/x11/window-managers/cwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/cwm.nix
index 03375a226bb..03375a226bb 100644
--- a/nixos/modules/services/x11/window-managers/cwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/cwm.nix
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixpkgs/nixos/modules/services/x11/window-managers/default.nix
index 04a9fc46628..04a9fc46628 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/default.nix
diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/dwm.nix
index 7777913ce1e..7777913ce1e 100644
--- a/nixos/modules/services/x11/window-managers/dwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/dwm.nix
diff --git a/nixos/modules/services/x11/window-managers/evilwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/evilwm.nix
index 6e19e3572c7..6e19e3572c7 100644
--- a/nixos/modules/services/x11/window-managers/evilwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/evilwm.nix
diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix
index dc1d957c170..dc1d957c170 100644
--- a/nixos/modules/services/x11/window-managers/exwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix
diff --git a/nixos/modules/services/x11/window-managers/fluxbox.nix b/nixpkgs/nixos/modules/services/x11/window-managers/fluxbox.nix
index b409335702a..b409335702a 100644
--- a/nixos/modules/services/x11/window-managers/fluxbox.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/fluxbox.nix
diff --git a/nixos/modules/services/x11/window-managers/fvwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/fvwm.nix
index 9a51b9cd660..9a51b9cd660 100644
--- a/nixos/modules/services/x11/window-managers/fvwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/fvwm.nix
diff --git a/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix
index e3ea61cb9a6..e3ea61cb9a6 100644
--- a/nixos/modules/services/x11/window-managers/herbstluftwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix
diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixpkgs/nixos/modules/services/x11/window-managers/i3.nix
index 0ef55d5f2c0..0ef55d5f2c0 100644
--- a/nixos/modules/services/x11/window-managers/i3.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/i3.nix
diff --git a/nixos/modules/services/x11/window-managers/icewm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/icewm.nix
index f4ae9222df6..f4ae9222df6 100644
--- a/nixos/modules/services/x11/window-managers/icewm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/icewm.nix
diff --git a/nixos/modules/services/x11/window-managers/jwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/jwm.nix
index 0e8dab2e922..0e8dab2e922 100644
--- a/nixos/modules/services/x11/window-managers/jwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/jwm.nix
diff --git a/nixos/modules/services/x11/window-managers/leftwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/leftwm.nix
index 3ef40df95df..3ef40df95df 100644
--- a/nixos/modules/services/x11/window-managers/leftwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/leftwm.nix
diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixpkgs/nixos/modules/services/x11/window-managers/metacity.nix
index 5175fd7f3b1..5175fd7f3b1 100644
--- a/nixos/modules/services/x11/window-managers/metacity.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/metacity.nix
diff --git a/nixos/modules/services/x11/window-managers/mwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/mwm.nix
index 31f7b725f74..31f7b725f74 100644
--- a/nixos/modules/services/x11/window-managers/mwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/mwm.nix
diff --git a/nixos/modules/services/x11/window-managers/none.nix b/nixpkgs/nixos/modules/services/x11/window-managers/none.nix
index 84cf1d77077..84cf1d77077 100644
--- a/nixos/modules/services/x11/window-managers/none.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/none.nix
diff --git a/nixos/modules/services/x11/window-managers/notion.nix b/nixpkgs/nixos/modules/services/x11/window-managers/notion.nix
index 4ece0d241c9..4ece0d241c9 100644
--- a/nixos/modules/services/x11/window-managers/notion.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/notion.nix
diff --git a/nixos/modules/services/x11/window-managers/openbox.nix b/nixpkgs/nixos/modules/services/x11/window-managers/openbox.nix
index 165772d1aa0..165772d1aa0 100644
--- a/nixos/modules/services/x11/window-managers/openbox.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/openbox.nix
diff --git a/nixos/modules/services/x11/window-managers/oroborus.nix b/nixpkgs/nixos/modules/services/x11/window-managers/oroborus.nix
index bd7e3396864..bd7e3396864 100644
--- a/nixos/modules/services/x11/window-managers/oroborus.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/oroborus.nix
diff --git a/nixos/modules/services/x11/window-managers/pekwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/pekwm.nix
index 850335ce7dd..850335ce7dd 100644
--- a/nixos/modules/services/x11/window-managers/pekwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/pekwm.nix
diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixpkgs/nixos/modules/services/x11/window-managers/qtile.nix
index ad3b65150b0..ad3b65150b0 100644
--- a/nixos/modules/services/x11/window-managers/qtile.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/qtile.nix
diff --git a/nixos/modules/services/x11/window-managers/ratpoison.nix b/nixpkgs/nixos/modules/services/x11/window-managers/ratpoison.nix
index 0d58481d457..0d58481d457 100644
--- a/nixos/modules/services/x11/window-managers/ratpoison.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/ratpoison.nix
diff --git a/nixos/modules/services/x11/window-managers/sawfish.nix b/nixpkgs/nixos/modules/services/x11/window-managers/sawfish.nix
index b988b5e1829..b988b5e1829 100644
--- a/nixos/modules/services/x11/window-managers/sawfish.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/sawfish.nix
diff --git a/nixos/modules/services/x11/window-managers/spectrwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/spectrwm.nix
index a1dc298d242..a1dc298d242 100644
--- a/nixos/modules/services/x11/window-managers/spectrwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/spectrwm.nix
diff --git a/nixos/modules/services/x11/window-managers/stumpwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/stumpwm.nix
index 27a17178476..27a17178476 100644
--- a/nixos/modules/services/x11/window-managers/stumpwm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/stumpwm.nix
diff --git a/nixos/modules/services/x11/window-managers/twm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/twm.nix
index fc09901aae3..fc09901aae3 100644
--- a/nixos/modules/services/x11/window-managers/twm.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/twm.nix
diff --git a/nixos/modules/services/x11/window-managers/windowlab.nix b/nixpkgs/nixos/modules/services/x11/window-managers/windowlab.nix
index fb891a39fa4..fb891a39fa4 100644
--- a/nixos/modules/services/x11/window-managers/windowlab.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/windowlab.nix
diff --git a/nixos/modules/services/x11/window-managers/windowmaker.nix b/nixpkgs/nixos/modules/services/x11/window-managers/windowmaker.nix
index b6272375805..b6272375805 100644
--- a/nixos/modules/services/x11/window-managers/windowmaker.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/windowmaker.nix
diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixpkgs/nixos/modules/services/x11/window-managers/wmii.nix
index 9b50a99bf23..9b50a99bf23 100644
--- a/nixos/modules/services/x11/window-managers/wmii.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/wmii.nix
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix
index 30c59b88f82..30c59b88f82 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix
diff --git a/nixos/modules/services/x11/xautolock.nix b/nixpkgs/nixos/modules/services/x11/xautolock.nix
index 3e03131ca11..3e03131ca11 100644
--- a/nixos/modules/services/x11/xautolock.nix
+++ b/nixpkgs/nixos/modules/services/x11/xautolock.nix
diff --git a/nixos/modules/services/x11/xbanish.nix b/nixpkgs/nixos/modules/services/x11/xbanish.nix
index b95fac68f16..b95fac68f16 100644
--- a/nixos/modules/services/x11/xbanish.nix
+++ b/nixpkgs/nixos/modules/services/x11/xbanish.nix
diff --git a/nixos/modules/services/x11/xfs.conf b/nixpkgs/nixos/modules/services/x11/xfs.conf
index 13dcf803db2..13dcf803db2 100644
--- a/nixos/modules/services/x11/xfs.conf
+++ b/nixpkgs/nixos/modules/services/x11/xfs.conf
diff --git a/nixos/modules/services/x11/xfs.nix b/nixpkgs/nixos/modules/services/x11/xfs.nix
index ea7cfa1aa43..ea7cfa1aa43 100644
--- a/nixos/modules/services/x11/xfs.nix
+++ b/nixpkgs/nixos/modules/services/x11/xfs.nix
diff --git a/nixos/modules/services/x11/xserver.nix b/nixpkgs/nixos/modules/services/x11/xserver.nix
index 7f0de96d208..7f0de96d208 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixpkgs/nixos/modules/services/x11/xserver.nix
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixpkgs/nixos/modules/system/activation/activation-script.nix
index 495d77dfd49..495d77dfd49 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixpkgs/nixos/modules/system/activation/activation-script.nix
diff --git a/nixos/modules/system/activation/no-clone.nix b/nixpkgs/nixos/modules/system/activation/no-clone.nix
index 7f458443526..7f458443526 100644
--- a/nixos/modules/system/activation/no-clone.nix
+++ b/nixpkgs/nixos/modules/system/activation/no-clone.nix
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl
index 641cf9faadc..641cf9faadc 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl
diff --git a/nixos/modules/system/activation/top-level.nix b/nixpkgs/nixos/modules/system/activation/top-level.nix
index f67d2900561..f67d2900561 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixpkgs/nixos/modules/system/activation/top-level.nix
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixpkgs/nixos/modules/system/boot/binfmt.nix
index a677ab4cb71..a677ab4cb71 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixpkgs/nixos/modules/system/boot/binfmt.nix
diff --git a/nixos/modules/system/boot/emergency-mode.nix b/nixpkgs/nixos/modules/system/boot/emergency-mode.nix
index 9cdab841619..9cdab841619 100644
--- a/nixos/modules/system/boot/emergency-mode.nix
+++ b/nixpkgs/nixos/modules/system/boot/emergency-mode.nix
diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixpkgs/nixos/modules/system/boot/grow-partition.nix
index 71a86c74772..71a86c74772 100644
--- a/nixos/modules/system/boot/grow-partition.nix
+++ b/nixpkgs/nixos/modules/system/boot/grow-partition.nix
diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixpkgs/nixos/modules/system/boot/initrd-network.nix
index cb8fc957a99..cb8fc957a99 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixpkgs/nixos/modules/system/boot/initrd-network.nix
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix
index 2d3e3b05c98..2d3e3b05c98 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix
diff --git a/nixos/modules/system/boot/kernel.nix b/nixpkgs/nixos/modules/system/boot/kernel.nix
index 6edb9082e75..6edb9082e75 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixpkgs/nixos/modules/system/boot/kernel.nix
diff --git a/nixos/modules/system/boot/kernel_config.nix b/nixpkgs/nixos/modules/system/boot/kernel_config.nix
index a316782dfc5..a316782dfc5 100644
--- a/nixos/modules/system/boot/kernel_config.nix
+++ b/nixpkgs/nixos/modules/system/boot/kernel_config.nix
diff --git a/nixos/modules/system/boot/kexec.nix b/nixpkgs/nixos/modules/system/boot/kexec.nix
index 27a8e0217c5..27a8e0217c5 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixpkgs/nixos/modules/system/boot/kexec.nix
diff --git a/nixos/modules/system/boot/loader/efi.nix b/nixpkgs/nixos/modules/system/boot/loader/efi.nix
index 6043c904c45..6043c904c45 100644
--- a/nixos/modules/system/boot/loader/efi.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/efi.nix
diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh b/nixpkgs/nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
index e723b9eb7cb..e723b9eb7cb 100644
--- a/nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
+++ b/nixpkgs/nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixpkgs/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
index 2d27611946e..2d27611946e 100644
--- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
index af39c7bb684..af39c7bb684 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix b/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix
index 576a07c1d27..576a07c1d27 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
index 0092ee92b62..0092ee92b62 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
+++ b/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix
index 9a4db84f7b7..9a4db84f7b7 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl
index a09c5dc4761..a09c5dc4761 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl
diff --git a/nixos/modules/system/boot/loader/grub/ipxe.nix b/nixpkgs/nixos/modules/system/boot/loader/grub/ipxe.nix
index 249c2761934..249c2761934 100644
--- a/nixos/modules/system/boot/loader/grub/ipxe.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/grub/ipxe.nix
diff --git a/nixos/modules/system/boot/loader/grub/memtest.nix b/nixpkgs/nixos/modules/system/boot/loader/grub/memtest.nix
index 94e5a14174b..94e5a14174b 100644
--- a/nixos/modules/system/boot/loader/grub/memtest.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/grub/memtest.nix
diff --git a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh b/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
index 08d4ab14c9c..08d4ab14c9c 100644
--- a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
+++ b/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
diff --git a/nixos/modules/system/boot/loader/init-script/init-script.nix b/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script.nix
index 374d9524ff1..374d9524ff1 100644
--- a/nixos/modules/system/boot/loader/init-script/init-script.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script.nix
diff --git a/nixos/modules/system/boot/loader/loader.nix b/nixpkgs/nixos/modules/system/boot/loader/loader.nix
index 01475f79b9c..01475f79b9c 100644
--- a/nixos/modules/system/boot/loader/loader.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/loader.nix
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix
index 7eb52e3d021..7eb52e3d021 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
index c8b5bf2e61a..c8b5bf2e61a 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
+++ b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index 337afe9ef62..337afe9ef62 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
index 1dc397e521b..1dc397e521b 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh
index ea591427179..ea591427179 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh
+++ b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh
diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index f48a085ce57..f48a085ce57 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
index 22d459ceb04..22d459ceb04 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixpkgs/nixos/modules/system/boot/luksroot.nix
index 31f1e22cda3..31f1e22cda3 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixpkgs/nixos/modules/system/boot/luksroot.nix
diff --git a/nixos/modules/system/boot/modprobe.nix b/nixpkgs/nixos/modules/system/boot/modprobe.nix
index dee0ab470c9..dee0ab470c9 100644
--- a/nixos/modules/system/boot/modprobe.nix
+++ b/nixpkgs/nixos/modules/system/boot/modprobe.nix
diff --git a/nixos/modules/system/boot/networkd.nix b/nixpkgs/nixos/modules/system/boot/networkd.nix
index 56a9d6b1138..56a9d6b1138 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixpkgs/nixos/modules/system/boot/networkd.nix
diff --git a/nixos/modules/system/boot/pbkdf2-sha512.c b/nixpkgs/nixos/modules/system/boot/pbkdf2-sha512.c
index b40c383ac02..b40c383ac02 100644
--- a/nixos/modules/system/boot/pbkdf2-sha512.c
+++ b/nixpkgs/nixos/modules/system/boot/pbkdf2-sha512.c
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixpkgs/nixos/modules/system/boot/plymouth.nix
index 23fce22366d..23fce22366d 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixpkgs/nixos/modules/system/boot/plymouth.nix
diff --git a/nixos/modules/system/boot/resolved.nix b/nixpkgs/nixos/modules/system/boot/resolved.nix
index da61c64faf8..da61c64faf8 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixpkgs/nixos/modules/system/boot/resolved.nix
diff --git a/nixos/modules/system/boot/shutdown.nix b/nixpkgs/nixos/modules/system/boot/shutdown.nix
index 11041066e07..11041066e07 100644
--- a/nixos/modules/system/boot/shutdown.nix
+++ b/nixpkgs/nixos/modules/system/boot/shutdown.nix
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixpkgs/nixos/modules/system/boot/stage-1-init.sh
index f520bf54ad1..f520bf54ad1 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixpkgs/nixos/modules/system/boot/stage-1-init.sh
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixpkgs/nixos/modules/system/boot/stage-1.nix
index 4c2d130d5a5..4c2d130d5a5 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixpkgs/nixos/modules/system/boot/stage-1.nix
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixpkgs/nixos/modules/system/boot/stage-2-init.sh
index d1de7920df9..d1de7920df9 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixpkgs/nixos/modules/system/boot/stage-2-init.sh
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixpkgs/nixos/modules/system/boot/stage-2.nix
index 6b0b4722730..6b0b4722730 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixpkgs/nixos/modules/system/boot/stage-2.nix
diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixpkgs/nixos/modules/system/boot/systemd-lib.nix
index fd1a5b9f62c..fd1a5b9f62c 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixpkgs/nixos/modules/system/boot/systemd-lib.nix
diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixpkgs/nixos/modules/system/boot/systemd-nspawn.nix
index 1e2435e36f0..1e2435e36f0 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixpkgs/nixos/modules/system/boot/systemd-nspawn.nix
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixpkgs/nixos/modules/system/boot/systemd-unit-options.nix
index bee21f1a8f3..bee21f1a8f3 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixpkgs/nixos/modules/system/boot/systemd-unit-options.nix
diff --git a/nixos/modules/system/boot/systemd.nix b/nixpkgs/nixos/modules/system/boot/systemd.nix
index 941df5797c6..941df5797c6 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixpkgs/nixos/modules/system/boot/systemd.nix
diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixpkgs/nixos/modules/system/boot/timesyncd.nix
index 9e2f36ca01f..9e2f36ca01f 100644
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixpkgs/nixos/modules/system/boot/timesyncd.nix
diff --git a/nixos/modules/system/boot/tmp.nix b/nixpkgs/nixos/modules/system/boot/tmp.nix
index 5bf5e2eb2ec..5bf5e2eb2ec 100644
--- a/nixos/modules/system/boot/tmp.nix
+++ b/nixpkgs/nixos/modules/system/boot/tmp.nix
diff --git a/nixos/modules/system/etc/etc.nix b/nixpkgs/nixos/modules/system/etc/etc.nix
index 57ade288096..57ade288096 100644
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixpkgs/nixos/modules/system/etc/etc.nix
diff --git a/nixos/modules/system/etc/make-etc.sh b/nixpkgs/nixos/modules/system/etc/make-etc.sh
index 1ca4c3046f0..1ca4c3046f0 100644
--- a/nixos/modules/system/etc/make-etc.sh
+++ b/nixpkgs/nixos/modules/system/etc/make-etc.sh
diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixpkgs/nixos/modules/system/etc/setup-etc.pl
index eed20065087..eed20065087 100644
--- a/nixos/modules/system/etc/setup-etc.pl
+++ b/nixpkgs/nixos/modules/system/etc/setup-etc.pl
diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixpkgs/nixos/modules/tasks/auto-upgrade.nix
index 7fe06699191..7fe06699191 100644
--- a/nixos/modules/tasks/auto-upgrade.nix
+++ b/nixpkgs/nixos/modules/tasks/auto-upgrade.nix
diff --git a/nixos/modules/tasks/bcache.nix b/nixpkgs/nixos/modules/tasks/bcache.nix
index 8bab91c721f..8bab91c721f 100644
--- a/nixos/modules/tasks/bcache.nix
+++ b/nixpkgs/nixos/modules/tasks/bcache.nix
diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixpkgs/nixos/modules/tasks/cpu-freq.nix
index 513382936e4..513382936e4 100644
--- a/nixos/modules/tasks/cpu-freq.nix
+++ b/nixpkgs/nixos/modules/tasks/cpu-freq.nix
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixpkgs/nixos/modules/tasks/encrypted-devices.nix
index 2c9231f5523..2c9231f5523 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixpkgs/nixos/modules/tasks/encrypted-devices.nix
diff --git a/nixos/modules/tasks/filesystems.nix b/nixpkgs/nixos/modules/tasks/filesystems.nix
index 688c77cb22d..688c77cb22d 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems.nix
diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixpkgs/nixos/modules/tasks/filesystems/bcachefs.nix
index 5fda24adb97..5fda24adb97 100644
--- a/nixos/modules/tasks/filesystems/bcachefs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/bcachefs.nix
diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixpkgs/nixos/modules/tasks/filesystems/btrfs.nix
index 48be18c7102..48be18c7102 100644
--- a/nixos/modules/tasks/filesystems/btrfs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/btrfs.nix
diff --git a/nixos/modules/tasks/filesystems/cifs.nix b/nixpkgs/nixos/modules/tasks/filesystems/cifs.nix
index 47ba0c03c56..47ba0c03c56 100644
--- a/nixos/modules/tasks/filesystems/cifs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/cifs.nix
diff --git a/nixos/modules/tasks/filesystems/ecryptfs.nix b/nixpkgs/nixos/modules/tasks/filesystems/ecryptfs.nix
index 12a407cabbf..12a407cabbf 100644
--- a/nixos/modules/tasks/filesystems/ecryptfs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/ecryptfs.nix
diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixpkgs/nixos/modules/tasks/filesystems/exfat.nix
index 1527f993fdd..1527f993fdd 100644
--- a/nixos/modules/tasks/filesystems/exfat.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/exfat.nix
diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixpkgs/nixos/modules/tasks/filesystems/ext.nix
index a14a3ac3854..a14a3ac3854 100644
--- a/nixos/modules/tasks/filesystems/ext.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/ext.nix
diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixpkgs/nixos/modules/tasks/filesystems/f2fs.nix
index a305235979a..a305235979a 100644
--- a/nixos/modules/tasks/filesystems/f2fs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/f2fs.nix
diff --git a/nixos/modules/tasks/filesystems/glusterfs.nix b/nixpkgs/nixos/modules/tasks/filesystems/glusterfs.nix
index e8c7fa8efba..e8c7fa8efba 100644
--- a/nixos/modules/tasks/filesystems/glusterfs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/glusterfs.nix
diff --git a/nixos/modules/tasks/filesystems/jfs.nix b/nixpkgs/nixos/modules/tasks/filesystems/jfs.nix
index fc3905c7dc2..fc3905c7dc2 100644
--- a/nixos/modules/tasks/filesystems/jfs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/jfs.nix
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixpkgs/nixos/modules/tasks/filesystems/nfs.nix
index ddcc0ed8f5a..ddcc0ed8f5a 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/nfs.nix
diff --git a/nixos/modules/tasks/filesystems/ntfs.nix b/nixpkgs/nixos/modules/tasks/filesystems/ntfs.nix
index c40d2a1a80b..c40d2a1a80b 100644
--- a/nixos/modules/tasks/filesystems/ntfs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/ntfs.nix
diff --git a/nixos/modules/tasks/filesystems/reiserfs.nix b/nixpkgs/nixos/modules/tasks/filesystems/reiserfs.nix
index ab4c43e2ab8..ab4c43e2ab8 100644
--- a/nixos/modules/tasks/filesystems/reiserfs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/reiserfs.nix
diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixpkgs/nixos/modules/tasks/filesystems/unionfs-fuse.nix
index 1dcc4c87e3c..1dcc4c87e3c 100644
--- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/unionfs-fuse.nix
diff --git a/nixos/modules/tasks/filesystems/vboxsf.nix b/nixpkgs/nixos/modules/tasks/filesystems/vboxsf.nix
index 5497194f6a8..5497194f6a8 100644
--- a/nixos/modules/tasks/filesystems/vboxsf.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/vboxsf.nix
diff --git a/nixos/modules/tasks/filesystems/vfat.nix b/nixpkgs/nixos/modules/tasks/filesystems/vfat.nix
index 958e27ae8a3..958e27ae8a3 100644
--- a/nixos/modules/tasks/filesystems/vfat.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/vfat.nix
diff --git a/nixos/modules/tasks/filesystems/xfs.nix b/nixpkgs/nixos/modules/tasks/filesystems/xfs.nix
index 98038701ca5..98038701ca5 100644
--- a/nixos/modules/tasks/filesystems/xfs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/xfs.nix
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix
index d14ba98ec48..d14ba98ec48 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix
diff --git a/nixos/modules/tasks/lvm.nix b/nixpkgs/nixos/modules/tasks/lvm.nix
index d56a8a2f63a..d56a8a2f63a 100644
--- a/nixos/modules/tasks/lvm.nix
+++ b/nixpkgs/nixos/modules/tasks/lvm.nix
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix
index 1726d05115e..1726d05115e 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
index e25dc0c0b39..e25dc0c0b39 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixpkgs/nixos/modules/tasks/network-interfaces.nix
index 31e2ed1cd1e..31e2ed1cd1e 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixpkgs/nixos/modules/tasks/network-interfaces.nix
diff --git a/nixos/modules/tasks/powertop.nix b/nixpkgs/nixos/modules/tasks/powertop.nix
index e8064f9fa80..e8064f9fa80 100644
--- a/nixos/modules/tasks/powertop.nix
+++ b/nixpkgs/nixos/modules/tasks/powertop.nix
diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixpkgs/nixos/modules/tasks/scsi-link-power-management.nix
index a9d987780ee..a9d987780ee 100644
--- a/nixos/modules/tasks/scsi-link-power-management.nix
+++ b/nixpkgs/nixos/modules/tasks/scsi-link-power-management.nix
diff --git a/nixos/modules/tasks/swraid.nix b/nixpkgs/nixos/modules/tasks/swraid.nix
index 8fa19194bed..8fa19194bed 100644
--- a/nixos/modules/tasks/swraid.nix
+++ b/nixpkgs/nixos/modules/tasks/swraid.nix
diff --git a/nixos/modules/tasks/trackpoint.nix b/nixpkgs/nixos/modules/tasks/trackpoint.nix
index b154cf9f5f0..b154cf9f5f0 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixpkgs/nixos/modules/tasks/trackpoint.nix
diff --git a/nixos/modules/tasks/tty-backgrounds-combine.sh b/nixpkgs/nixos/modules/tasks/tty-backgrounds-combine.sh
index 55c3a1ebfa8..55c3a1ebfa8 100644
--- a/nixos/modules/tasks/tty-backgrounds-combine.sh
+++ b/nixpkgs/nixos/modules/tasks/tty-backgrounds-combine.sh
diff --git a/nixos/modules/testing/minimal-kernel.nix b/nixpkgs/nixos/modules/testing/minimal-kernel.nix
index 7c2b9c05cf9..7c2b9c05cf9 100644
--- a/nixos/modules/testing/minimal-kernel.nix
+++ b/nixpkgs/nixos/modules/testing/minimal-kernel.nix
diff --git a/nixos/modules/testing/service-runner.nix b/nixpkgs/nixos/modules/testing/service-runner.nix
index 17d5e337690..17d5e337690 100644
--- a/nixos/modules/testing/service-runner.nix
+++ b/nixpkgs/nixos/modules/testing/service-runner.nix
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixpkgs/nixos/modules/testing/test-instrumentation.nix
index 1baeab53b0c..1baeab53b0c 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixpkgs/nixos/modules/testing/test-instrumentation.nix
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixpkgs/nixos/modules/virtualisation/amazon-image.nix
index 20d48add712..20d48add712 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixpkgs/nixos/modules/virtualisation/amazon-image.nix
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixpkgs/nixos/modules/virtualisation/amazon-init.nix
index 8c12e0e49bf..8c12e0e49bf 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixpkgs/nixos/modules/virtualisation/amazon-init.nix
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixpkgs/nixos/modules/virtualisation/amazon-options.nix
index 2e807131e93..2e807131e93 100644
--- a/nixos/modules/virtualisation/amazon-options.nix
+++ b/nixpkgs/nixos/modules/virtualisation/amazon-options.nix
diff --git a/nixos/modules/virtualisation/anbox.nix b/nixpkgs/nixos/modules/virtualisation/anbox.nix
index da5df358073..da5df358073 100644
--- a/nixos/modules/virtualisation/anbox.nix
+++ b/nixpkgs/nixos/modules/virtualisation/anbox.nix
diff --git a/nixos/modules/virtualisation/azure-agent-entropy.patch b/nixpkgs/nixos/modules/virtualisation/azure-agent-entropy.patch
index 2a7ad08a4af..2a7ad08a4af 100644
--- a/nixos/modules/virtualisation/azure-agent-entropy.patch
+++ b/nixpkgs/nixos/modules/virtualisation/azure-agent-entropy.patch
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixpkgs/nixos/modules/virtualisation/azure-agent.nix
index 036b1036f92..036b1036f92 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixpkgs/nixos/modules/virtualisation/azure-agent.nix
diff --git a/nixos/modules/virtualisation/azure-bootstrap-blobs.nix b/nixpkgs/nixos/modules/virtualisation/azure-bootstrap-blobs.nix
index 281be9a1231..281be9a1231 100644
--- a/nixos/modules/virtualisation/azure-bootstrap-blobs.nix
+++ b/nixpkgs/nixos/modules/virtualisation/azure-bootstrap-blobs.nix
diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixpkgs/nixos/modules/virtualisation/azure-common.nix
index 03239991b95..03239991b95 100644
--- a/nixos/modules/virtualisation/azure-common.nix
+++ b/nixpkgs/nixos/modules/virtualisation/azure-common.nix
diff --git a/nixos/modules/virtualisation/azure-config-user.nix b/nixpkgs/nixos/modules/virtualisation/azure-config-user.nix
index 267ba50ae02..267ba50ae02 100644
--- a/nixos/modules/virtualisation/azure-config-user.nix
+++ b/nixpkgs/nixos/modules/virtualisation/azure-config-user.nix
diff --git a/nixos/modules/virtualisation/azure-config.nix b/nixpkgs/nixos/modules/virtualisation/azure-config.nix
index 780bd1b78dc..780bd1b78dc 100644
--- a/nixos/modules/virtualisation/azure-config.nix
+++ b/nixpkgs/nixos/modules/virtualisation/azure-config.nix
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixpkgs/nixos/modules/virtualisation/azure-image.nix
index e91dd72ff5d..e91dd72ff5d 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixpkgs/nixos/modules/virtualisation/azure-image.nix
diff --git a/nixos/modules/virtualisation/azure-images.nix b/nixpkgs/nixos/modules/virtualisation/azure-images.nix
index 22c82fc14f6..22c82fc14f6 100644
--- a/nixos/modules/virtualisation/azure-images.nix
+++ b/nixpkgs/nixos/modules/virtualisation/azure-images.nix
diff --git a/nixos/modules/virtualisation/brightbox-config.nix b/nixpkgs/nixos/modules/virtualisation/brightbox-config.nix
index 0a018e4cd69..0a018e4cd69 100644
--- a/nixos/modules/virtualisation/brightbox-config.nix
+++ b/nixpkgs/nixos/modules/virtualisation/brightbox-config.nix
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixpkgs/nixos/modules/virtualisation/brightbox-image.nix
index d0efbcc808a..d0efbcc808a 100644
--- a/nixos/modules/virtualisation/brightbox-image.nix
+++ b/nixpkgs/nixos/modules/virtualisation/brightbox-image.nix
diff --git a/nixos/modules/virtualisation/cloudstack-config.nix b/nixpkgs/nixos/modules/virtualisation/cloudstack-config.nix
index 78afebdc5dd..78afebdc5dd 100644
--- a/nixos/modules/virtualisation/cloudstack-config.nix
+++ b/nixpkgs/nixos/modules/virtualisation/cloudstack-config.nix
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixpkgs/nixos/modules/virtualisation/container-config.nix
index 6ff6bdd30c2..6ff6bdd30c2 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixpkgs/nixos/modules/virtualisation/container-config.nix
diff --git a/nixos/modules/virtualisation/containers.nix b/nixpkgs/nixos/modules/virtualisation/containers.nix
index 02de5801da2..02de5801da2 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixpkgs/nixos/modules/virtualisation/containers.nix
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixpkgs/nixos/modules/virtualisation/cri-o.nix
index 14a435f6c8b..14a435f6c8b 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixpkgs/nixos/modules/virtualisation/cri-o.nix
diff --git a/nixos/modules/virtualisation/digital-ocean-config.nix b/nixpkgs/nixos/modules/virtualisation/digital-ocean-config.nix
index 88cb0cd450e..88cb0cd450e 100644
--- a/nixos/modules/virtualisation/digital-ocean-config.nix
+++ b/nixpkgs/nixos/modules/virtualisation/digital-ocean-config.nix
diff --git a/nixos/modules/virtualisation/digital-ocean-image.nix b/nixpkgs/nixos/modules/virtualisation/digital-ocean-image.nix
index b582e235d43..b582e235d43 100644
--- a/nixos/modules/virtualisation/digital-ocean-image.nix
+++ b/nixpkgs/nixos/modules/virtualisation/digital-ocean-image.nix
diff --git a/nixos/modules/virtualisation/digital-ocean-init.nix b/nixpkgs/nixos/modules/virtualisation/digital-ocean-init.nix
index 02f4de009fa..02f4de009fa 100644
--- a/nixos/modules/virtualisation/digital-ocean-init.nix
+++ b/nixpkgs/nixos/modules/virtualisation/digital-ocean-init.nix
diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixpkgs/nixos/modules/virtualisation/docker-containers.nix
index 3a2eb97d1bf..3a2eb97d1bf 100644
--- a/nixos/modules/virtualisation/docker-containers.nix
+++ b/nixpkgs/nixos/modules/virtualisation/docker-containers.nix
diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixpkgs/nixos/modules/virtualisation/docker-image.nix
index baac3a35a78..baac3a35a78 100644
--- a/nixos/modules/virtualisation/docker-image.nix
+++ b/nixpkgs/nixos/modules/virtualisation/docker-image.nix
diff --git a/nixos/modules/virtualisation/docker-preloader.nix b/nixpkgs/nixos/modules/virtualisation/docker-preloader.nix
index 6ab83058dee..6ab83058dee 100644
--- a/nixos/modules/virtualisation/docker-preloader.nix
+++ b/nixpkgs/nixos/modules/virtualisation/docker-preloader.nix
diff --git a/nixos/modules/virtualisation/docker.nix b/nixpkgs/nixos/modules/virtualisation/docker.nix
index 7d196a46276..7d196a46276 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixpkgs/nixos/modules/virtualisation/docker.nix
diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixpkgs/nixos/modules/virtualisation/ec2-amis.nix
index 3b4e55d39d7..3b4e55d39d7 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixpkgs/nixos/modules/virtualisation/ec2-amis.nix
diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixpkgs/nixos/modules/virtualisation/ec2-data.nix
index 62912535018..62912535018 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixpkgs/nixos/modules/virtualisation/ec2-data.nix
diff --git a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix b/nixpkgs/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
index b531787c31a..b531787c31a 100644
--- a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
+++ b/nixpkgs/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixpkgs/nixos/modules/virtualisation/ecs-agent.nix
index fc51b159579..fc51b159579 100644
--- a/nixos/modules/virtualisation/ecs-agent.nix
+++ b/nixpkgs/nixos/modules/virtualisation/ecs-agent.nix
diff --git a/nixos/modules/virtualisation/gce-images.nix b/nixpkgs/nixos/modules/virtualisation/gce-images.nix
index 5354d91deb9..5354d91deb9 100644
--- a/nixos/modules/virtualisation/gce-images.nix
+++ b/nixpkgs/nixos/modules/virtualisation/gce-images.nix
diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix
index 327324f2921..327324f2921 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixpkgs/nixos/modules/virtualisation/google-compute-image.nix
index d172ae38fdc..d172ae38fdc 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixpkgs/nixos/modules/virtualisation/google-compute-image.nix
diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixpkgs/nixos/modules/virtualisation/grow-partition.nix
index 444c0bc1630..444c0bc1630 100644
--- a/nixos/modules/virtualisation/grow-partition.nix
+++ b/nixpkgs/nixos/modules/virtualisation/grow-partition.nix
diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixpkgs/nixos/modules/virtualisation/hyperv-guest.nix
index 0f1f052880c..0f1f052880c 100644
--- a/nixos/modules/virtualisation/hyperv-guest.nix
+++ b/nixpkgs/nixos/modules/virtualisation/hyperv-guest.nix
diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixpkgs/nixos/modules/virtualisation/kvmgt.nix
index 36ef6d17df6..36ef6d17df6 100644
--- a/nixos/modules/virtualisation/kvmgt.nix
+++ b/nixpkgs/nixos/modules/virtualisation/kvmgt.nix
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixpkgs/nixos/modules/virtualisation/libvirtd.nix
index 52d852894ce..52d852894ce 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixpkgs/nixos/modules/virtualisation/libvirtd.nix
diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixpkgs/nixos/modules/virtualisation/lxc-container.nix
index d4936484018..d4936484018 100644
--- a/nixos/modules/virtualisation/lxc-container.nix
+++ b/nixpkgs/nixos/modules/virtualisation/lxc-container.nix
diff --git a/nixos/modules/virtualisation/lxc.nix b/nixpkgs/nixos/modules/virtualisation/lxc.nix
index f484d5ee59a..f484d5ee59a 100644
--- a/nixos/modules/virtualisation/lxc.nix
+++ b/nixpkgs/nixos/modules/virtualisation/lxc.nix
diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixpkgs/nixos/modules/virtualisation/lxcfs.nix
index b2457403463..b2457403463 100644
--- a/nixos/modules/virtualisation/lxcfs.nix
+++ b/nixpkgs/nixos/modules/virtualisation/lxcfs.nix
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixpkgs/nixos/modules/virtualisation/lxd.nix
index de48d3a780e..de48d3a780e 100644
--- a/nixos/modules/virtualisation/lxd.nix
+++ b/nixpkgs/nixos/modules/virtualisation/lxd.nix
diff --git a/nixos/modules/virtualisation/openstack-config.nix b/nixpkgs/nixos/modules/virtualisation/openstack-config.nix
index c2da5d0d230..c2da5d0d230 100644
--- a/nixos/modules/virtualisation/openstack-config.nix
+++ b/nixpkgs/nixos/modules/virtualisation/openstack-config.nix
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixpkgs/nixos/modules/virtualisation/openvswitch.nix
index 6b8ad83661f..6b8ad83661f 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixpkgs/nixos/modules/virtualisation/openvswitch.nix
diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix
index 828419fb4b9..828419fb4b9 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix
diff --git a/nixos/modules/virtualisation/qemu-guest-agent.nix b/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix
index 665224e35d8..665224e35d8 100644
--- a/nixos/modules/virtualisation/qemu-guest-agent.nix
+++ b/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix
index 31d332e9f07..31d332e9f07 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix
diff --git a/nixos/modules/virtualisation/railcar.nix b/nixpkgs/nixos/modules/virtualisation/railcar.nix
index 12da1c75fc3..12da1c75fc3 100644
--- a/nixos/modules/virtualisation/railcar.nix
+++ b/nixpkgs/nixos/modules/virtualisation/railcar.nix
diff --git a/nixos/modules/virtualisation/rkt.nix b/nixpkgs/nixos/modules/virtualisation/rkt.nix
index fd662b52df5..fd662b52df5 100644
--- a/nixos/modules/virtualisation/rkt.nix
+++ b/nixpkgs/nixos/modules/virtualisation/rkt.nix
diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix
index 834b994e92d..834b994e92d 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix
index ddb0a7bda4f..ddb0a7bda4f 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix
index ab65523592d..ab65523592d 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix
diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix
index 962a9059ea4..962a9059ea4 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix
diff --git a/nixos/modules/virtualisation/xe-guest-utilities.nix b/nixpkgs/nixos/modules/virtualisation/xe-guest-utilities.nix
index 675cf929737..675cf929737 100644
--- a/nixos/modules/virtualisation/xe-guest-utilities.nix
+++ b/nixpkgs/nixos/modules/virtualisation/xe-guest-utilities.nix
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix
index 7f0af9901b9..7f0af9901b9 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix
diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixpkgs/nixos/modules/virtualisation/xen-domU.nix
index c00b984c2ce..c00b984c2ce 100644
--- a/nixos/modules/virtualisation/xen-domU.nix
+++ b/nixpkgs/nixos/modules/virtualisation/xen-domU.nix
diff --git a/nixos/release-combined.nix b/nixpkgs/nixos/release-combined.nix
index b46731863ca..b46731863ca 100644
--- a/nixos/release-combined.nix
+++ b/nixpkgs/nixos/release-combined.nix
diff --git a/nixos/release-small.nix b/nixpkgs/nixos/release-small.nix
index 74c16e990f3..74c16e990f3 100644
--- a/nixos/release-small.nix
+++ b/nixpkgs/nixos/release-small.nix
diff --git a/nixos/release.nix b/nixpkgs/nixos/release.nix
index 512ba714397..512ba714397 100644
--- a/nixos/release.nix
+++ b/nixpkgs/nixos/release.nix
diff --git a/nixos/tests/3proxy.nix b/nixpkgs/nixos/tests/3proxy.nix
index 3e2061d7e42..3e2061d7e42 100644
--- a/nixos/tests/3proxy.nix
+++ b/nixpkgs/nixos/tests/3proxy.nix
diff --git a/nixos/tests/acme.nix b/nixpkgs/nixos/tests/acme.nix
index 6bd315ff1ea..6bd315ff1ea 100644
--- a/nixos/tests/acme.nix
+++ b/nixpkgs/nixos/tests/acme.nix
diff --git a/nixos/tests/all-tests.nix b/nixpkgs/nixos/tests/all-tests.nix
index 6bace8ffe6d..6bace8ffe6d 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixpkgs/nixos/tests/all-tests.nix
diff --git a/nixos/tests/ammonite.nix b/nixpkgs/nixos/tests/ammonite.nix
index 1955e42be5f..1955e42be5f 100644
--- a/nixos/tests/ammonite.nix
+++ b/nixpkgs/nixos/tests/ammonite.nix
diff --git a/nixos/tests/atd.nix b/nixpkgs/nixos/tests/atd.nix
index c3abe5c253d..c3abe5c253d 100644
--- a/nixos/tests/atd.nix
+++ b/nixpkgs/nixos/tests/atd.nix
diff --git a/nixos/tests/automysqlbackup.nix b/nixpkgs/nixos/tests/automysqlbackup.nix
index 224b93862fb..224b93862fb 100644
--- a/nixos/tests/automysqlbackup.nix
+++ b/nixpkgs/nixos/tests/automysqlbackup.nix
diff --git a/nixos/tests/avahi.nix b/nixpkgs/nixos/tests/avahi.nix
index fe027c14d5a..fe027c14d5a 100644
--- a/nixos/tests/avahi.nix
+++ b/nixpkgs/nixos/tests/avahi.nix
diff --git a/nixos/tests/babeld.nix b/nixpkgs/nixos/tests/babeld.nix
index fafa788ba57..fafa788ba57 100644
--- a/nixos/tests/babeld.nix
+++ b/nixpkgs/nixos/tests/babeld.nix
diff --git a/nixos/tests/bcachefs.nix b/nixpkgs/nixos/tests/bcachefs.nix
index 0541e580322..0541e580322 100644
--- a/nixos/tests/bcachefs.nix
+++ b/nixpkgs/nixos/tests/bcachefs.nix
diff --git a/nixos/tests/beanstalkd.nix b/nixpkgs/nixos/tests/beanstalkd.nix
index 4f4a454fb47..4f4a454fb47 100644
--- a/nixos/tests/beanstalkd.nix
+++ b/nixpkgs/nixos/tests/beanstalkd.nix
diff --git a/nixos/tests/bees.nix b/nixpkgs/nixos/tests/bees.nix
index 6e6a9c3446b..6e6a9c3446b 100644
--- a/nixos/tests/bees.nix
+++ b/nixpkgs/nixos/tests/bees.nix
diff --git a/nixos/tests/bind.nix b/nixpkgs/nixos/tests/bind.nix
index 09917b15a8e..09917b15a8e 100644
--- a/nixos/tests/bind.nix
+++ b/nixpkgs/nixos/tests/bind.nix
diff --git a/nixos/tests/bittorrent.nix b/nixpkgs/nixos/tests/bittorrent.nix
index 0a97d5556a2..0a97d5556a2 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixpkgs/nixos/tests/bittorrent.nix
diff --git a/nixos/tests/boot-stage1.nix b/nixpkgs/nixos/tests/boot-stage1.nix
index cfb2ccb8285..cfb2ccb8285 100644
--- a/nixos/tests/boot-stage1.nix
+++ b/nixpkgs/nixos/tests/boot-stage1.nix
diff --git a/nixos/tests/boot.nix b/nixpkgs/nixos/tests/boot.nix
index c5040f3b31f..c5040f3b31f 100644
--- a/nixos/tests/boot.nix
+++ b/nixpkgs/nixos/tests/boot.nix
diff --git a/nixos/tests/borgbackup.nix b/nixpkgs/nixos/tests/borgbackup.nix
index d97471e293e..d97471e293e 100644
--- a/nixos/tests/borgbackup.nix
+++ b/nixpkgs/nixos/tests/borgbackup.nix
diff --git a/nixos/tests/buildbot.nix b/nixpkgs/nixos/tests/buildbot.nix
index f5c8c4863b6..f5c8c4863b6 100644
--- a/nixos/tests/buildbot.nix
+++ b/nixpkgs/nixos/tests/buildbot.nix
diff --git a/nixos/tests/buildkite-agent.nix b/nixpkgs/nixos/tests/buildkite-agent.nix
index 3c824c9aedf..3c824c9aedf 100644
--- a/nixos/tests/buildkite-agent.nix
+++ b/nixpkgs/nixos/tests/buildkite-agent.nix
diff --git a/nixos/tests/caddy.nix b/nixpkgs/nixos/tests/caddy.nix
index fc10df0c79b..fc10df0c79b 100644
--- a/nixos/tests/caddy.nix
+++ b/nixpkgs/nixos/tests/caddy.nix
diff --git a/nixos/tests/cadvisor.nix b/nixpkgs/nixos/tests/cadvisor.nix
index 60c04f14780..60c04f14780 100644
--- a/nixos/tests/cadvisor.nix
+++ b/nixpkgs/nixos/tests/cadvisor.nix
diff --git a/nixos/tests/cassandra.nix b/nixpkgs/nixos/tests/cassandra.nix
index 05607956a9d..05607956a9d 100644
--- a/nixos/tests/cassandra.nix
+++ b/nixpkgs/nixos/tests/cassandra.nix
diff --git a/nixos/tests/ceph-multi-node.nix b/nixpkgs/nixos/tests/ceph-multi-node.nix
index 90dd747525d..90dd747525d 100644
--- a/nixos/tests/ceph-multi-node.nix
+++ b/nixpkgs/nixos/tests/ceph-multi-node.nix
diff --git a/nixos/tests/ceph-single-node.nix b/nixpkgs/nixos/tests/ceph-single-node.nix
index 1a027e17836..1a027e17836 100644
--- a/nixos/tests/ceph-single-node.nix
+++ b/nixpkgs/nixos/tests/ceph-single-node.nix
diff --git a/nixos/tests/certmgr.nix b/nixpkgs/nixos/tests/certmgr.nix
index ef32f54400e..ef32f54400e 100644
--- a/nixos/tests/certmgr.nix
+++ b/nixpkgs/nixos/tests/certmgr.nix
diff --git a/nixos/tests/cfssl.nix b/nixpkgs/nixos/tests/cfssl.nix
index e291fc285fb..e291fc285fb 100644
--- a/nixos/tests/cfssl.nix
+++ b/nixpkgs/nixos/tests/cfssl.nix
diff --git a/nixos/tests/chromium.nix b/nixpkgs/nixos/tests/chromium.nix
index 3844255bd8a..3844255bd8a 100644
--- a/nixos/tests/chromium.nix
+++ b/nixpkgs/nixos/tests/chromium.nix
diff --git a/nixos/tests/cjdns.nix b/nixpkgs/nixos/tests/cjdns.nix
index d72236d415d..d72236d415d 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixpkgs/nixos/tests/cjdns.nix
diff --git a/nixos/tests/clickhouse.nix b/nixpkgs/nixos/tests/clickhouse.nix
index 2d8a7cf7aa9..2d8a7cf7aa9 100644
--- a/nixos/tests/clickhouse.nix
+++ b/nixpkgs/nixos/tests/clickhouse.nix
diff --git a/nixos/tests/cloud-init.nix b/nixpkgs/nixos/tests/cloud-init.nix
index aafa6e24e84..aafa6e24e84 100644
--- a/nixos/tests/cloud-init.nix
+++ b/nixpkgs/nixos/tests/cloud-init.nix
diff --git a/nixos/tests/cockroachdb.nix b/nixpkgs/nixos/tests/cockroachdb.nix
index 496283fddc7..496283fddc7 100644
--- a/nixos/tests/cockroachdb.nix
+++ b/nixpkgs/nixos/tests/cockroachdb.nix
diff --git a/nixos/tests/codimd.nix b/nixpkgs/nixos/tests/codimd.nix
index b1acbf4a832..b1acbf4a832 100644
--- a/nixos/tests/codimd.nix
+++ b/nixpkgs/nixos/tests/codimd.nix
diff --git a/nixos/tests/common/auto.nix b/nixpkgs/nixos/tests/common/auto.nix
index 2c21a8d5167..2c21a8d5167 100644
--- a/nixos/tests/common/auto.nix
+++ b/nixpkgs/nixos/tests/common/auto.nix
diff --git a/nixos/tests/common/ec2.nix b/nixpkgs/nixos/tests/common/ec2.nix
index ba087bb6009..ba087bb6009 100644
--- a/nixos/tests/common/ec2.nix
+++ b/nixpkgs/nixos/tests/common/ec2.nix
diff --git a/nixos/tests/common/letsencrypt/common.nix b/nixpkgs/nixos/tests/common/letsencrypt/common.nix
index c530de817bf..c530de817bf 100644
--- a/nixos/tests/common/letsencrypt/common.nix
+++ b/nixpkgs/nixos/tests/common/letsencrypt/common.nix
diff --git a/nixos/tests/common/letsencrypt/default.nix b/nixpkgs/nixos/tests/common/letsencrypt/default.nix
index 110a2520971..110a2520971 100644
--- a/nixos/tests/common/letsencrypt/default.nix
+++ b/nixpkgs/nixos/tests/common/letsencrypt/default.nix
diff --git a/nixos/tests/common/letsencrypt/mkcerts.nix b/nixpkgs/nixos/tests/common/letsencrypt/mkcerts.nix
index e7ac2bae46b..e7ac2bae46b 100644
--- a/nixos/tests/common/letsencrypt/mkcerts.nix
+++ b/nixpkgs/nixos/tests/common/letsencrypt/mkcerts.nix
diff --git a/nixos/tests/common/letsencrypt/mkcerts.sh b/nixpkgs/nixos/tests/common/letsencrypt/mkcerts.sh
index cc7f8ca650d..cc7f8ca650d 100755
--- a/nixos/tests/common/letsencrypt/mkcerts.sh
+++ b/nixpkgs/nixos/tests/common/letsencrypt/mkcerts.sh
diff --git a/nixos/tests/common/letsencrypt/snakeoil-certs.nix b/nixpkgs/nixos/tests/common/letsencrypt/snakeoil-certs.nix
index ca4f71ae688..ca4f71ae688 100644
--- a/nixos/tests/common/letsencrypt/snakeoil-certs.nix
+++ b/nixpkgs/nixos/tests/common/letsencrypt/snakeoil-certs.nix
diff --git a/nixos/tests/common/resolver.nix b/nixpkgs/nixos/tests/common/resolver.nix
index 6be8d1d18e6..6be8d1d18e6 100644
--- a/nixos/tests/common/resolver.nix
+++ b/nixpkgs/nixos/tests/common/resolver.nix
diff --git a/nixos/tests/common/user-account.nix b/nixpkgs/nixos/tests/common/user-account.nix
index a57ee2d59ae..a57ee2d59ae 100644
--- a/nixos/tests/common/user-account.nix
+++ b/nixpkgs/nixos/tests/common/user-account.nix
diff --git a/nixos/tests/common/webroot/news-rss.xml b/nixpkgs/nixos/tests/common/webroot/news-rss.xml
index b8099bf0364..b8099bf0364 100644
--- a/nixos/tests/common/webroot/news-rss.xml
+++ b/nixpkgs/nixos/tests/common/webroot/news-rss.xml
diff --git a/nixos/tests/common/x11.nix b/nixpkgs/nixos/tests/common/x11.nix
index 0d76a0e972f..0d76a0e972f 100644
--- a/nixos/tests/common/x11.nix
+++ b/nixpkgs/nixos/tests/common/x11.nix
diff --git a/nixos/tests/consul.nix b/nixpkgs/nixos/tests/consul.nix
index 6600dae4770..6600dae4770 100644
--- a/nixos/tests/consul.nix
+++ b/nixpkgs/nixos/tests/consul.nix
diff --git a/nixos/tests/containers-bridge.nix b/nixpkgs/nixos/tests/containers-bridge.nix
index 2c8e8fa5370..2c8e8fa5370 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixpkgs/nixos/tests/containers-bridge.nix
diff --git a/nixos/tests/containers-ephemeral.nix b/nixpkgs/nixos/tests/containers-ephemeral.nix
index 692554ac0ba..692554ac0ba 100644
--- a/nixos/tests/containers-ephemeral.nix
+++ b/nixpkgs/nixos/tests/containers-ephemeral.nix
diff --git a/nixos/tests/containers-extra_veth.nix b/nixpkgs/nixos/tests/containers-extra_veth.nix
index 7d30b3f76cd..7d30b3f76cd 100644
--- a/nixos/tests/containers-extra_veth.nix
+++ b/nixpkgs/nixos/tests/containers-extra_veth.nix
diff --git a/nixos/tests/containers-hosts.nix b/nixpkgs/nixos/tests/containers-hosts.nix
index d6fb4a761ee..d6fb4a761ee 100644
--- a/nixos/tests/containers-hosts.nix
+++ b/nixpkgs/nixos/tests/containers-hosts.nix
diff --git a/nixos/tests/containers-imperative.nix b/nixpkgs/nixos/tests/containers-imperative.nix
index 61df74042cb..61df74042cb 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixpkgs/nixos/tests/containers-imperative.nix
diff --git a/nixos/tests/containers-ip.nix b/nixpkgs/nixos/tests/containers-ip.nix
index 8583a08c625..8583a08c625 100644
--- a/nixos/tests/containers-ip.nix
+++ b/nixpkgs/nixos/tests/containers-ip.nix
diff --git a/nixos/tests/containers-macvlans.nix b/nixpkgs/nixos/tests/containers-macvlans.nix
index 0e8f67bc76f..0e8f67bc76f 100644
--- a/nixos/tests/containers-macvlans.nix
+++ b/nixpkgs/nixos/tests/containers-macvlans.nix
diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixpkgs/nixos/tests/containers-physical_interfaces.nix
index e800751a23c..e800751a23c 100644
--- a/nixos/tests/containers-physical_interfaces.nix
+++ b/nixpkgs/nixos/tests/containers-physical_interfaces.nix
diff --git a/nixos/tests/containers-portforward.nix b/nixpkgs/nixos/tests/containers-portforward.nix
index fc90e151bd9..fc90e151bd9 100644
--- a/nixos/tests/containers-portforward.nix
+++ b/nixpkgs/nixos/tests/containers-portforward.nix
diff --git a/nixos/tests/containers-reloadable.nix b/nixpkgs/nixos/tests/containers-reloadable.nix
index 35aff91e85b..35aff91e85b 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixpkgs/nixos/tests/containers-reloadable.nix
diff --git a/nixos/tests/containers-restart_networking.nix b/nixpkgs/nixos/tests/containers-restart_networking.nix
index b50dadd13e4..b50dadd13e4 100644
--- a/nixos/tests/containers-restart_networking.nix
+++ b/nixpkgs/nixos/tests/containers-restart_networking.nix
diff --git a/nixos/tests/containers-tmpfs.nix b/nixpkgs/nixos/tests/containers-tmpfs.nix
index 171e8f01c7b..171e8f01c7b 100644
--- a/nixos/tests/containers-tmpfs.nix
+++ b/nixpkgs/nixos/tests/containers-tmpfs.nix
diff --git a/nixos/tests/corerad.nix b/nixpkgs/nixos/tests/corerad.nix
index 950c9abc899..950c9abc899 100644
--- a/nixos/tests/corerad.nix
+++ b/nixpkgs/nixos/tests/corerad.nix
diff --git a/nixos/tests/couchdb.nix b/nixpkgs/nixos/tests/couchdb.nix
index 10e95701acd..10e95701acd 100644
--- a/nixos/tests/couchdb.nix
+++ b/nixpkgs/nixos/tests/couchdb.nix
diff --git a/nixos/tests/deluge.nix b/nixpkgs/nixos/tests/deluge.nix
index 37689c3d913..37689c3d913 100644
--- a/nixos/tests/deluge.nix
+++ b/nixpkgs/nixos/tests/deluge.nix
diff --git a/nixos/tests/dhparams.nix b/nixpkgs/nixos/tests/dhparams.nix
index a0de2911777..a0de2911777 100644
--- a/nixos/tests/dhparams.nix
+++ b/nixpkgs/nixos/tests/dhparams.nix
diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixpkgs/nixos/tests/dnscrypt-proxy.nix
index 98153d5c904..98153d5c904 100644
--- a/nixos/tests/dnscrypt-proxy.nix
+++ b/nixpkgs/nixos/tests/dnscrypt-proxy.nix
diff --git a/nixos/tests/docker-containers.nix b/nixpkgs/nixos/tests/docker-containers.nix
index 9be9bfa80ce..9be9bfa80ce 100644
--- a/nixos/tests/docker-containers.nix
+++ b/nixpkgs/nixos/tests/docker-containers.nix
diff --git a/nixos/tests/docker-edge.nix b/nixpkgs/nixos/tests/docker-edge.nix
index 96de885a554..96de885a554 100644
--- a/nixos/tests/docker-edge.nix
+++ b/nixpkgs/nixos/tests/docker-edge.nix
diff --git a/nixos/tests/docker-preloader.nix b/nixpkgs/nixos/tests/docker-preloader.nix
index eeedec9a392..eeedec9a392 100644
--- a/nixos/tests/docker-preloader.nix
+++ b/nixpkgs/nixos/tests/docker-preloader.nix
diff --git a/nixos/tests/docker-registry.nix b/nixpkgs/nixos/tests/docker-registry.nix
index 2928fd8141a..2928fd8141a 100644
--- a/nixos/tests/docker-registry.nix
+++ b/nixpkgs/nixos/tests/docker-registry.nix
diff --git a/nixos/tests/docker-tools-overlay.nix b/nixpkgs/nixos/tests/docker-tools-overlay.nix
index 1a0e0ea6775..1a0e0ea6775 100644
--- a/nixos/tests/docker-tools-overlay.nix
+++ b/nixpkgs/nixos/tests/docker-tools-overlay.nix
diff --git a/nixos/tests/docker-tools.nix b/nixpkgs/nixos/tests/docker-tools.nix
index 07fac533680..07fac533680 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixpkgs/nixos/tests/docker-tools.nix
diff --git a/nixos/tests/docker.nix b/nixpkgs/nixos/tests/docker.nix
index 8fda7c1395e..8fda7c1395e 100644
--- a/nixos/tests/docker.nix
+++ b/nixpkgs/nixos/tests/docker.nix
diff --git a/nixos/tests/documize.nix b/nixpkgs/nixos/tests/documize.nix
index 3be20a780d3..3be20a780d3 100644
--- a/nixos/tests/documize.nix
+++ b/nixpkgs/nixos/tests/documize.nix
diff --git a/nixos/tests/dokuwiki.nix b/nixpkgs/nixos/tests/dokuwiki.nix
index 38bde10f47e..38bde10f47e 100644
--- a/nixos/tests/dokuwiki.nix
+++ b/nixpkgs/nixos/tests/dokuwiki.nix
diff --git a/nixos/tests/dovecot.nix b/nixpkgs/nixos/tests/dovecot.nix
index c19850f418b..c19850f418b 100644
--- a/nixos/tests/dovecot.nix
+++ b/nixpkgs/nixos/tests/dovecot.nix
diff --git a/nixos/tests/ec2.nix b/nixpkgs/nixos/tests/ec2.nix
index 6aeeb17ba31..6aeeb17ba31 100644
--- a/nixos/tests/ec2.nix
+++ b/nixpkgs/nixos/tests/ec2.nix
diff --git a/nixos/tests/ecryptfs.nix b/nixpkgs/nixos/tests/ecryptfs.nix
index ef7bd13eb92..ef7bd13eb92 100644
--- a/nixos/tests/ecryptfs.nix
+++ b/nixpkgs/nixos/tests/ecryptfs.nix
diff --git a/nixos/tests/elk.nix b/nixpkgs/nixos/tests/elk.nix
index d3dc6dde135..d3dc6dde135 100644
--- a/nixos/tests/elk.nix
+++ b/nixpkgs/nixos/tests/elk.nix
diff --git a/nixos/tests/emacs-daemon.nix b/nixpkgs/nixos/tests/emacs-daemon.nix
index b89d9b1bde6..b89d9b1bde6 100644
--- a/nixos/tests/emacs-daemon.nix
+++ b/nixpkgs/nixos/tests/emacs-daemon.nix
diff --git a/nixos/tests/env.nix b/nixpkgs/nixos/tests/env.nix
index e603338e489..e603338e489 100644
--- a/nixos/tests/env.nix
+++ b/nixpkgs/nixos/tests/env.nix
diff --git a/nixos/tests/etcd-cluster.nix b/nixpkgs/nixos/tests/etcd-cluster.nix
index 19c5d915823..19c5d915823 100644
--- a/nixos/tests/etcd-cluster.nix
+++ b/nixpkgs/nixos/tests/etcd-cluster.nix
diff --git a/nixos/tests/etcd.nix b/nixpkgs/nixos/tests/etcd.nix
index 84272434384..84272434384 100644
--- a/nixos/tests/etcd.nix
+++ b/nixpkgs/nixos/tests/etcd.nix
diff --git a/nixos/tests/fancontrol.nix b/nixpkgs/nixos/tests/fancontrol.nix
index 356cd57ffa1..356cd57ffa1 100644
--- a/nixos/tests/fancontrol.nix
+++ b/nixpkgs/nixos/tests/fancontrol.nix
diff --git a/nixos/tests/ferm.nix b/nixpkgs/nixos/tests/ferm.nix
index a73c9ce739c..a73c9ce739c 100644
--- a/nixos/tests/ferm.nix
+++ b/nixpkgs/nixos/tests/ferm.nix
diff --git a/nixos/tests/firefox.nix b/nixpkgs/nixos/tests/firefox.nix
index 56ddabbae77..56ddabbae77 100644
--- a/nixos/tests/firefox.nix
+++ b/nixpkgs/nixos/tests/firefox.nix
diff --git a/nixos/tests/firewall.nix b/nixpkgs/nixos/tests/firewall.nix
index 09a1fef852e..09a1fef852e 100644
--- a/nixos/tests/firewall.nix
+++ b/nixpkgs/nixos/tests/firewall.nix
diff --git a/nixos/tests/fish.nix b/nixpkgs/nixos/tests/fish.nix
index 68fba428439..68fba428439 100644
--- a/nixos/tests/fish.nix
+++ b/nixpkgs/nixos/tests/fish.nix
diff --git a/nixos/tests/flannel.nix b/nixpkgs/nixos/tests/flannel.nix
index 9991c5eaa32..9991c5eaa32 100644
--- a/nixos/tests/flannel.nix
+++ b/nixpkgs/nixos/tests/flannel.nix
diff --git a/nixos/tests/fluentd.nix b/nixpkgs/nixos/tests/fluentd.nix
index 918f2f87db1..918f2f87db1 100644
--- a/nixos/tests/fluentd.nix
+++ b/nixpkgs/nixos/tests/fluentd.nix
diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixpkgs/nixos/tests/fontconfig-default-fonts.nix
index 68c6ac9e9c8..68c6ac9e9c8 100644
--- a/nixos/tests/fontconfig-default-fonts.nix
+++ b/nixpkgs/nixos/tests/fontconfig-default-fonts.nix
diff --git a/nixos/tests/freeswitch.nix b/nixpkgs/nixos/tests/freeswitch.nix
index 349d0e7bc6f..349d0e7bc6f 100644
--- a/nixos/tests/freeswitch.nix
+++ b/nixpkgs/nixos/tests/freeswitch.nix
diff --git a/nixos/tests/fsck.nix b/nixpkgs/nixos/tests/fsck.nix
index e522419fde2..e522419fde2 100644
--- a/nixos/tests/fsck.nix
+++ b/nixpkgs/nixos/tests/fsck.nix
diff --git a/nixos/tests/gitea.nix b/nixpkgs/nixos/tests/gitea.nix
index aaed2486421..aaed2486421 100644
--- a/nixos/tests/gitea.nix
+++ b/nixpkgs/nixos/tests/gitea.nix
diff --git a/nixos/tests/gitlab.nix b/nixpkgs/nixos/tests/gitlab.nix
index 7e4e8bcef92..7e4e8bcef92 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixpkgs/nixos/tests/gitlab.nix
diff --git a/nixos/tests/gitolite-fcgiwrap.nix b/nixpkgs/nixos/tests/gitolite-fcgiwrap.nix
index 414b7d6fe7e..414b7d6fe7e 100644
--- a/nixos/tests/gitolite-fcgiwrap.nix
+++ b/nixpkgs/nixos/tests/gitolite-fcgiwrap.nix
diff --git a/nixos/tests/gitolite.nix b/nixpkgs/nixos/tests/gitolite.nix
index a928645bd80..a928645bd80 100644
--- a/nixos/tests/gitolite.nix
+++ b/nixpkgs/nixos/tests/gitolite.nix
diff --git a/nixos/tests/glusterfs.nix b/nixpkgs/nixos/tests/glusterfs.nix
index 8f9cb8973d5..8f9cb8973d5 100644
--- a/nixos/tests/glusterfs.nix
+++ b/nixpkgs/nixos/tests/glusterfs.nix
diff --git a/nixos/tests/gnome3-xorg.nix b/nixpkgs/nixos/tests/gnome3-xorg.nix
index f793bb922ad..f793bb922ad 100644
--- a/nixos/tests/gnome3-xorg.nix
+++ b/nixpkgs/nixos/tests/gnome3-xorg.nix
diff --git a/nixos/tests/gnome3.nix b/nixpkgs/nixos/tests/gnome3.nix
index 486c146d8dc..486c146d8dc 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixpkgs/nixos/tests/gnome3.nix
diff --git a/nixos/tests/gocd-agent.nix b/nixpkgs/nixos/tests/gocd-agent.nix
index 5b630a40736..5b630a40736 100644
--- a/nixos/tests/gocd-agent.nix
+++ b/nixpkgs/nixos/tests/gocd-agent.nix
diff --git a/nixos/tests/gocd-server.nix b/nixpkgs/nixos/tests/gocd-server.nix
index 20faf85a1cc..20faf85a1cc 100644
--- a/nixos/tests/gocd-server.nix
+++ b/nixpkgs/nixos/tests/gocd-server.nix
diff --git a/nixos/tests/google-oslogin/default.nix b/nixpkgs/nixos/tests/google-oslogin/default.nix
index 1977e92e987..1977e92e987 100644
--- a/nixos/tests/google-oslogin/default.nix
+++ b/nixpkgs/nixos/tests/google-oslogin/default.nix
diff --git a/nixos/tests/google-oslogin/server.nix b/nixpkgs/nixos/tests/google-oslogin/server.nix
index fdb7141da31..fdb7141da31 100644
--- a/nixos/tests/google-oslogin/server.nix
+++ b/nixpkgs/nixos/tests/google-oslogin/server.nix
diff --git a/nixos/tests/google-oslogin/server.py b/nixpkgs/nixos/tests/google-oslogin/server.py
index bfc527cb97d..bfc527cb97d 100644
--- a/nixos/tests/google-oslogin/server.py
+++ b/nixpkgs/nixos/tests/google-oslogin/server.py
diff --git a/nixos/tests/gotify-server.nix b/nixpkgs/nixos/tests/gotify-server.nix
index c6e00686aed..c6e00686aed 100644
--- a/nixos/tests/gotify-server.nix
+++ b/nixpkgs/nixos/tests/gotify-server.nix
diff --git a/nixos/tests/grafana.nix b/nixpkgs/nixos/tests/grafana.nix
index 4b453ece7f1..4b453ece7f1 100644
--- a/nixos/tests/grafana.nix
+++ b/nixpkgs/nixos/tests/grafana.nix
diff --git a/nixos/tests/graphite.nix b/nixpkgs/nixos/tests/graphite.nix
index ba3c73bb878..ba3c73bb878 100644
--- a/nixos/tests/graphite.nix
+++ b/nixpkgs/nixos/tests/graphite.nix
diff --git a/nixos/tests/graylog.nix b/nixpkgs/nixos/tests/graylog.nix
index 2d22012fa7c..2d22012fa7c 100644
--- a/nixos/tests/graylog.nix
+++ b/nixpkgs/nixos/tests/graylog.nix
diff --git a/nixos/tests/gvisor.nix b/nixpkgs/nixos/tests/gvisor.nix
index 4d68a1d8a5f..4d68a1d8a5f 100644
--- a/nixos/tests/gvisor.nix
+++ b/nixpkgs/nixos/tests/gvisor.nix
diff --git a/nixos/tests/hadoop/hdfs.nix b/nixpkgs/nixos/tests/hadoop/hdfs.nix
index 85aaab34b15..85aaab34b15 100644
--- a/nixos/tests/hadoop/hdfs.nix
+++ b/nixpkgs/nixos/tests/hadoop/hdfs.nix
diff --git a/nixos/tests/hadoop/yarn.nix b/nixpkgs/nixos/tests/hadoop/yarn.nix
index 2264ecaff15..2264ecaff15 100644
--- a/nixos/tests/hadoop/yarn.nix
+++ b/nixpkgs/nixos/tests/hadoop/yarn.nix
diff --git a/nixos/tests/haka.nix b/nixpkgs/nixos/tests/haka.nix
index 3ca19cb0971..3ca19cb0971 100644
--- a/nixos/tests/haka.nix
+++ b/nixpkgs/nixos/tests/haka.nix
diff --git a/nixos/tests/handbrake.nix b/nixpkgs/nixos/tests/handbrake.nix
index e5fb6b269b1..e5fb6b269b1 100644
--- a/nixos/tests/handbrake.nix
+++ b/nixpkgs/nixos/tests/handbrake.nix
diff --git a/nixos/tests/haproxy.nix b/nixpkgs/nixos/tests/haproxy.nix
index 79f34b07faf..79f34b07faf 100644
--- a/nixos/tests/haproxy.nix
+++ b/nixpkgs/nixos/tests/haproxy.nix
diff --git a/nixos/tests/hardened.nix b/nixpkgs/nixos/tests/hardened.nix
index cbf76f9e558..cbf76f9e558 100644
--- a/nixos/tests/hardened.nix
+++ b/nixpkgs/nixos/tests/hardened.nix
diff --git a/nixos/tests/hibernate.nix b/nixpkgs/nixos/tests/hibernate.nix
index 8251c6e7ef8..8251c6e7ef8 100644
--- a/nixos/tests/hibernate.nix
+++ b/nixpkgs/nixos/tests/hibernate.nix
diff --git a/nixos/tests/hitch/default.nix b/nixpkgs/nixos/tests/hitch/default.nix
index 904d12619d7..904d12619d7 100644
--- a/nixos/tests/hitch/default.nix
+++ b/nixpkgs/nixos/tests/hitch/default.nix
diff --git a/nixos/tests/hitch/example.pem b/nixpkgs/nixos/tests/hitch/example.pem
index fde6f3cbd19..fde6f3cbd19 100644
--- a/nixos/tests/hitch/example.pem
+++ b/nixpkgs/nixos/tests/hitch/example.pem
diff --git a/nixos/tests/hitch/example/index.txt b/nixpkgs/nixos/tests/hitch/example/index.txt
index 0478b1c2635..0478b1c2635 100644
--- a/nixos/tests/hitch/example/index.txt
+++ b/nixpkgs/nixos/tests/hitch/example/index.txt
diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixpkgs/nixos/tests/hocker-fetchdocker/default.nix
index 4f30f01e403..4f30f01e403 100644
--- a/nixos/tests/hocker-fetchdocker/default.nix
+++ b/nixpkgs/nixos/tests/hocker-fetchdocker/default.nix
diff --git a/nixos/tests/hocker-fetchdocker/hello-world-container.nix b/nixpkgs/nixos/tests/hocker-fetchdocker/hello-world-container.nix
index a127875264e..a127875264e 100644
--- a/nixos/tests/hocker-fetchdocker/hello-world-container.nix
+++ b/nixpkgs/nixos/tests/hocker-fetchdocker/hello-world-container.nix
diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixpkgs/nixos/tests/hocker-fetchdocker/machine.nix
index 885adebe149..885adebe149 100644
--- a/nixos/tests/hocker-fetchdocker/machine.nix
+++ b/nixpkgs/nixos/tests/hocker-fetchdocker/machine.nix
diff --git a/nixos/tests/home-assistant.nix b/nixpkgs/nixos/tests/home-assistant.nix
index 80dca43f1f3..80dca43f1f3 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixpkgs/nixos/tests/home-assistant.nix
diff --git a/nixos/tests/hound.nix b/nixpkgs/nixos/tests/hound.nix
index 27c65abdf27..27c65abdf27 100644
--- a/nixos/tests/hound.nix
+++ b/nixpkgs/nixos/tests/hound.nix
diff --git a/nixos/tests/hydra/create-trivial-project.sh b/nixpkgs/nixos/tests/hydra/create-trivial-project.sh
index 5aae2d5bf90..5aae2d5bf90 100755
--- a/nixos/tests/hydra/create-trivial-project.sh
+++ b/nixpkgs/nixos/tests/hydra/create-trivial-project.sh
diff --git a/nixos/tests/hydra/default.nix b/nixpkgs/nixos/tests/hydra/default.nix
index 1c0ed3369b1..1c0ed3369b1 100644
--- a/nixos/tests/hydra/default.nix
+++ b/nixpkgs/nixos/tests/hydra/default.nix
diff --git a/nixos/tests/i3wm.nix b/nixpkgs/nixos/tests/i3wm.nix
index b527aa706ad..b527aa706ad 100644
--- a/nixos/tests/i3wm.nix
+++ b/nixpkgs/nixos/tests/i3wm.nix
diff --git a/nixos/tests/icingaweb2.nix b/nixpkgs/nixos/tests/icingaweb2.nix
index 2f65604539c..2f65604539c 100644
--- a/nixos/tests/icingaweb2.nix
+++ b/nixpkgs/nixos/tests/icingaweb2.nix
diff --git a/nixos/tests/iftop.nix b/nixpkgs/nixos/tests/iftop.nix
index 8a161027c2a..8a161027c2a 100644
--- a/nixos/tests/iftop.nix
+++ b/nixpkgs/nixos/tests/iftop.nix
diff --git a/nixos/tests/ihatemoney.nix b/nixpkgs/nixos/tests/ihatemoney.nix
index 14db17fe5e6..14db17fe5e6 100644
--- a/nixos/tests/ihatemoney.nix
+++ b/nixpkgs/nixos/tests/ihatemoney.nix
diff --git a/nixos/tests/incron.nix b/nixpkgs/nixos/tests/incron.nix
index b22ee4c9a03..b22ee4c9a03 100644
--- a/nixos/tests/incron.nix
+++ b/nixpkgs/nixos/tests/incron.nix
diff --git a/nixos/tests/influxdb.nix b/nixpkgs/nixos/tests/influxdb.nix
index 04ef8046101..04ef8046101 100644
--- a/nixos/tests/influxdb.nix
+++ b/nixpkgs/nixos/tests/influxdb.nix
diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixpkgs/nixos/tests/initrd-network-ssh/default.nix
index 73d9f938e22..73d9f938e22 100644
--- a/nixos/tests/initrd-network-ssh/default.nix
+++ b/nixpkgs/nixos/tests/initrd-network-ssh/default.nix
diff --git a/nixos/tests/initrd-network-ssh/dropbear.priv b/nixpkgs/nixos/tests/initrd-network-ssh/dropbear.priv
index af340535f0a..af340535f0a 100644
--- a/nixos/tests/initrd-network-ssh/dropbear.priv
+++ b/nixpkgs/nixos/tests/initrd-network-ssh/dropbear.priv
diff --git a/nixos/tests/initrd-network-ssh/dropbear.pub b/nixpkgs/nixos/tests/initrd-network-ssh/dropbear.pub
index 385c625522a..385c625522a 100644
--- a/nixos/tests/initrd-network-ssh/dropbear.pub
+++ b/nixpkgs/nixos/tests/initrd-network-ssh/dropbear.pub
diff --git a/nixos/tests/initrd-network-ssh/generate-keys.nix b/nixpkgs/nixos/tests/initrd-network-ssh/generate-keys.nix
index 0183e12d7a8..0183e12d7a8 100644
--- a/nixos/tests/initrd-network-ssh/generate-keys.nix
+++ b/nixpkgs/nixos/tests/initrd-network-ssh/generate-keys.nix
diff --git a/nixos/tests/initrd-network-ssh/openssh.priv b/nixpkgs/nixos/tests/initrd-network-ssh/openssh.priv
index 816d65435fd..816d65435fd 100644
--- a/nixos/tests/initrd-network-ssh/openssh.priv
+++ b/nixpkgs/nixos/tests/initrd-network-ssh/openssh.priv
diff --git a/nixos/tests/initrd-network-ssh/openssh.pub b/nixpkgs/nixos/tests/initrd-network-ssh/openssh.pub
index 5b72b8085f2..5b72b8085f2 100644
--- a/nixos/tests/initrd-network-ssh/openssh.pub
+++ b/nixpkgs/nixos/tests/initrd-network-ssh/openssh.pub
diff --git a/nixos/tests/initrd-network.nix b/nixpkgs/nixos/tests/initrd-network.nix
index 4796ff9b7c8..4796ff9b7c8 100644
--- a/nixos/tests/initrd-network.nix
+++ b/nixpkgs/nixos/tests/initrd-network.nix
diff --git a/nixos/tests/installed-tests/colord.nix b/nixpkgs/nixos/tests/installed-tests/colord.nix
index 77e6b917fe6..77e6b917fe6 100644
--- a/nixos/tests/installed-tests/colord.nix
+++ b/nixpkgs/nixos/tests/installed-tests/colord.nix
diff --git a/nixos/tests/installed-tests/default.nix b/nixpkgs/nixos/tests/installed-tests/default.nix
index 8e997ee4aeb..8e997ee4aeb 100644
--- a/nixos/tests/installed-tests/default.nix
+++ b/nixpkgs/nixos/tests/installed-tests/default.nix
diff --git a/nixos/tests/installed-tests/flatpak-builder.nix b/nixpkgs/nixos/tests/installed-tests/flatpak-builder.nix
index 31b9f2b258f..31b9f2b258f 100644
--- a/nixos/tests/installed-tests/flatpak-builder.nix
+++ b/nixpkgs/nixos/tests/installed-tests/flatpak-builder.nix
diff --git a/nixos/tests/installed-tests/flatpak.nix b/nixpkgs/nixos/tests/installed-tests/flatpak.nix
index 091c9932662..091c9932662 100644
--- a/nixos/tests/installed-tests/flatpak.nix
+++ b/nixpkgs/nixos/tests/installed-tests/flatpak.nix
diff --git a/nixos/tests/installed-tests/fwupd.nix b/nixpkgs/nixos/tests/installed-tests/fwupd.nix
index b9f761e9958..b9f761e9958 100644
--- a/nixos/tests/installed-tests/fwupd.nix
+++ b/nixpkgs/nixos/tests/installed-tests/fwupd.nix
diff --git a/nixos/tests/installed-tests/gcab.nix b/nixpkgs/nixos/tests/installed-tests/gcab.nix
index b24cc2e0126..b24cc2e0126 100644
--- a/nixos/tests/installed-tests/gcab.nix
+++ b/nixpkgs/nixos/tests/installed-tests/gcab.nix
diff --git a/nixos/tests/installed-tests/gdk-pixbuf.nix b/nixpkgs/nixos/tests/installed-tests/gdk-pixbuf.nix
index 3d0011a427a..3d0011a427a 100644
--- a/nixos/tests/installed-tests/gdk-pixbuf.nix
+++ b/nixpkgs/nixos/tests/installed-tests/gdk-pixbuf.nix
diff --git a/nixos/tests/installed-tests/gjs.nix b/nixpkgs/nixos/tests/installed-tests/gjs.nix
index 1656e9de171..1656e9de171 100644
--- a/nixos/tests/installed-tests/gjs.nix
+++ b/nixpkgs/nixos/tests/installed-tests/gjs.nix
diff --git a/nixos/tests/installed-tests/glib-networking.nix b/nixpkgs/nixos/tests/installed-tests/glib-networking.nix
index b58d4df21fc..b58d4df21fc 100644
--- a/nixos/tests/installed-tests/glib-networking.nix
+++ b/nixpkgs/nixos/tests/installed-tests/glib-networking.nix
diff --git a/nixos/tests/installed-tests/gnome-photos.nix b/nixpkgs/nixos/tests/installed-tests/gnome-photos.nix
index 05e7ccb65ad..05e7ccb65ad 100644
--- a/nixos/tests/installed-tests/gnome-photos.nix
+++ b/nixpkgs/nixos/tests/installed-tests/gnome-photos.nix
diff --git a/nixos/tests/installed-tests/graphene.nix b/nixpkgs/nixos/tests/installed-tests/graphene.nix
index e43339abd88..e43339abd88 100644
--- a/nixos/tests/installed-tests/graphene.nix
+++ b/nixpkgs/nixos/tests/installed-tests/graphene.nix
diff --git a/nixos/tests/installed-tests/ibus.nix b/nixpkgs/nixos/tests/installed-tests/ibus.nix
index af54b612b50..af54b612b50 100644
--- a/nixos/tests/installed-tests/ibus.nix
+++ b/nixpkgs/nixos/tests/installed-tests/ibus.nix
diff --git a/nixos/tests/installed-tests/libgdata.nix b/nixpkgs/nixos/tests/installed-tests/libgdata.nix
index f11a7bc1bc5..f11a7bc1bc5 100644
--- a/nixos/tests/installed-tests/libgdata.nix
+++ b/nixpkgs/nixos/tests/installed-tests/libgdata.nix
diff --git a/nixos/tests/installed-tests/libxmlb.nix b/nixpkgs/nixos/tests/installed-tests/libxmlb.nix
index af2bbe9c35e..af2bbe9c35e 100644
--- a/nixos/tests/installed-tests/libxmlb.nix
+++ b/nixpkgs/nixos/tests/installed-tests/libxmlb.nix
diff --git a/nixos/tests/installed-tests/ostree.nix b/nixpkgs/nixos/tests/installed-tests/ostree.nix
index eef7cace54c..eef7cace54c 100644
--- a/nixos/tests/installed-tests/ostree.nix
+++ b/nixpkgs/nixos/tests/installed-tests/ostree.nix
diff --git a/nixos/tests/installed-tests/xdg-desktop-portal.nix b/nixpkgs/nixos/tests/installed-tests/xdg-desktop-portal.nix
index b16008ff4ad..b16008ff4ad 100644
--- a/nixos/tests/installed-tests/xdg-desktop-portal.nix
+++ b/nixpkgs/nixos/tests/installed-tests/xdg-desktop-portal.nix
diff --git a/nixos/tests/installer.nix b/nixpkgs/nixos/tests/installer.nix
index eb1f4f192dd..eb1f4f192dd 100644
--- a/nixos/tests/installer.nix
+++ b/nixpkgs/nixos/tests/installer.nix
diff --git a/nixos/tests/ipfs.nix b/nixpkgs/nixos/tests/ipfs.nix
index 3cff7e99ff8..3cff7e99ff8 100644
--- a/nixos/tests/ipfs.nix
+++ b/nixpkgs/nixos/tests/ipfs.nix
diff --git a/nixos/tests/ipv6.nix b/nixpkgs/nixos/tests/ipv6.nix
index ba464b57447..ba464b57447 100644
--- a/nixos/tests/ipv6.nix
+++ b/nixpkgs/nixos/tests/ipv6.nix
diff --git a/nixos/tests/jackett.nix b/nixpkgs/nixos/tests/jackett.nix
index 0a706c99b99..0a706c99b99 100644
--- a/nixos/tests/jackett.nix
+++ b/nixpkgs/nixos/tests/jackett.nix
diff --git a/nixos/tests/jellyfin.nix b/nixpkgs/nixos/tests/jellyfin.nix
index 65360624d48..65360624d48 100644
--- a/nixos/tests/jellyfin.nix
+++ b/nixpkgs/nixos/tests/jellyfin.nix
diff --git a/nixos/tests/jenkins.nix b/nixpkgs/nixos/tests/jenkins.nix
index cd64ff51287..cd64ff51287 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixpkgs/nixos/tests/jenkins.nix
diff --git a/nixos/tests/kafka.nix b/nixpkgs/nixos/tests/kafka.nix
index f3de24e873b..f3de24e873b 100644
--- a/nixos/tests/kafka.nix
+++ b/nixpkgs/nixos/tests/kafka.nix
diff --git a/nixos/tests/keepalived.nix b/nixpkgs/nixos/tests/keepalived.nix
index d0bf9d46520..d0bf9d46520 100644
--- a/nixos/tests/keepalived.nix
+++ b/nixpkgs/nixos/tests/keepalived.nix
diff --git a/nixos/tests/kerberos/default.nix b/nixpkgs/nixos/tests/kerberos/default.nix
index f2f1a438918..f2f1a438918 100644
--- a/nixos/tests/kerberos/default.nix
+++ b/nixpkgs/nixos/tests/kerberos/default.nix
diff --git a/nixos/tests/kerberos/heimdal.nix b/nixpkgs/nixos/tests/kerberos/heimdal.nix
index 8abae667d04..8abae667d04 100644
--- a/nixos/tests/kerberos/heimdal.nix
+++ b/nixpkgs/nixos/tests/kerberos/heimdal.nix
diff --git a/nixos/tests/kerberos/mit.nix b/nixpkgs/nixos/tests/kerberos/mit.nix
index 93b4020d499..93b4020d499 100644
--- a/nixos/tests/kerberos/mit.nix
+++ b/nixpkgs/nixos/tests/kerberos/mit.nix
diff --git a/nixos/tests/kernel-latest.nix b/nixpkgs/nixos/tests/kernel-latest.nix
index f09d0926d22..f09d0926d22 100644
--- a/nixos/tests/kernel-latest.nix
+++ b/nixpkgs/nixos/tests/kernel-latest.nix
diff --git a/nixos/tests/kernel-lts.nix b/nixpkgs/nixos/tests/kernel-lts.nix
index bad706d63c0..bad706d63c0 100644
--- a/nixos/tests/kernel-lts.nix
+++ b/nixpkgs/nixos/tests/kernel-lts.nix
diff --git a/nixos/tests/kernel-testing.nix b/nixpkgs/nixos/tests/kernel-testing.nix
index b7e10ebd5bd..b7e10ebd5bd 100644
--- a/nixos/tests/kernel-testing.nix
+++ b/nixpkgs/nixos/tests/kernel-testing.nix
diff --git a/nixos/tests/kexec.nix b/nixpkgs/nixos/tests/kexec.nix
index ec0cd9796b0..ec0cd9796b0 100644
--- a/nixos/tests/kexec.nix
+++ b/nixpkgs/nixos/tests/kexec.nix
diff --git a/nixos/tests/keymap.nix b/nixpkgs/nixos/tests/keymap.nix
index 2b4c1ab7b05..2b4c1ab7b05 100644
--- a/nixos/tests/keymap.nix
+++ b/nixpkgs/nixos/tests/keymap.nix
diff --git a/nixos/tests/knot.nix b/nixpkgs/nixos/tests/knot.nix
index 0588cf86ac0..0588cf86ac0 100644
--- a/nixos/tests/knot.nix
+++ b/nixpkgs/nixos/tests/knot.nix
diff --git a/nixos/tests/krb5/default.nix b/nixpkgs/nixos/tests/krb5/default.nix
index dd5b2f37202..dd5b2f37202 100644
--- a/nixos/tests/krb5/default.nix
+++ b/nixpkgs/nixos/tests/krb5/default.nix
diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixpkgs/nixos/tests/krb5/deprecated-config.nix
index 7d7926309c9..7d7926309c9 100644
--- a/nixos/tests/krb5/deprecated-config.nix
+++ b/nixpkgs/nixos/tests/krb5/deprecated-config.nix
diff --git a/nixos/tests/krb5/example-config.nix b/nixpkgs/nixos/tests/krb5/example-config.nix
index f01cf6988ee..f01cf6988ee 100644
--- a/nixos/tests/krb5/example-config.nix
+++ b/nixpkgs/nixos/tests/krb5/example-config.nix
diff --git a/nixos/tests/kubernetes/base.nix b/nixpkgs/nixos/tests/kubernetes/base.nix
index adb73650689..adb73650689 100644
--- a/nixos/tests/kubernetes/base.nix
+++ b/nixpkgs/nixos/tests/kubernetes/base.nix
diff --git a/nixos/tests/kubernetes/default.nix b/nixpkgs/nixos/tests/kubernetes/default.nix
index a801759bf58..a801759bf58 100644
--- a/nixos/tests/kubernetes/default.nix
+++ b/nixpkgs/nixos/tests/kubernetes/default.nix
diff --git a/nixos/tests/kubernetes/dns.nix b/nixpkgs/nixos/tests/kubernetes/dns.nix
index 46bcb01a526..46bcb01a526 100644
--- a/nixos/tests/kubernetes/dns.nix
+++ b/nixpkgs/nixos/tests/kubernetes/dns.nix
diff --git a/nixos/tests/kubernetes/e2e.nix b/nixpkgs/nixos/tests/kubernetes/e2e.nix
index 175d8413045..175d8413045 100644
--- a/nixos/tests/kubernetes/e2e.nix
+++ b/nixpkgs/nixos/tests/kubernetes/e2e.nix
diff --git a/nixos/tests/kubernetes/rbac.nix b/nixpkgs/nixos/tests/kubernetes/rbac.nix
index 3ce7adcd0d7..3ce7adcd0d7 100644
--- a/nixos/tests/kubernetes/rbac.nix
+++ b/nixpkgs/nixos/tests/kubernetes/rbac.nix
diff --git a/nixos/tests/ldap.nix b/nixpkgs/nixos/tests/ldap.nix
index 74b002fc00e..74b002fc00e 100644
--- a/nixos/tests/ldap.nix
+++ b/nixpkgs/nixos/tests/ldap.nix
diff --git a/nixos/tests/leaps.nix b/nixpkgs/nixos/tests/leaps.nix
index 65b475d734e..65b475d734e 100644
--- a/nixos/tests/leaps.nix
+++ b/nixpkgs/nixos/tests/leaps.nix
diff --git a/nixos/tests/lidarr.nix b/nixpkgs/nixos/tests/lidarr.nix
index d3f83e5d914..d3f83e5d914 100644
--- a/nixos/tests/lidarr.nix
+++ b/nixpkgs/nixos/tests/lidarr.nix
diff --git a/nixos/tests/lightdm.nix b/nixpkgs/nixos/tests/lightdm.nix
index 46c2ed7ccc5..46c2ed7ccc5 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixpkgs/nixos/tests/lightdm.nix
diff --git a/nixos/tests/limesurvey.nix b/nixpkgs/nixos/tests/limesurvey.nix
index 7228fcb8331..7228fcb8331 100644
--- a/nixos/tests/limesurvey.nix
+++ b/nixpkgs/nixos/tests/limesurvey.nix
diff --git a/nixos/tests/login.nix b/nixpkgs/nixos/tests/login.nix
index d36c1a91be4..d36c1a91be4 100644
--- a/nixos/tests/login.nix
+++ b/nixpkgs/nixos/tests/login.nix
diff --git a/nixos/tests/loki.nix b/nixpkgs/nixos/tests/loki.nix
index dbf1e8a650f..dbf1e8a650f 100644
--- a/nixos/tests/loki.nix
+++ b/nixpkgs/nixos/tests/loki.nix
diff --git a/nixos/tests/lorri/builder.sh b/nixpkgs/nixos/tests/lorri/builder.sh
index b586b2bf798..b586b2bf798 100644
--- a/nixos/tests/lorri/builder.sh
+++ b/nixpkgs/nixos/tests/lorri/builder.sh
diff --git a/nixos/tests/lorri/default.nix b/nixpkgs/nixos/tests/lorri/default.nix
index 53074385a65..53074385a65 100644
--- a/nixos/tests/lorri/default.nix
+++ b/nixpkgs/nixos/tests/lorri/default.nix
diff --git a/nixos/tests/lorri/fake-shell.nix b/nixpkgs/nixos/tests/lorri/fake-shell.nix
index 9de9d247e54..9de9d247e54 100644
--- a/nixos/tests/lorri/fake-shell.nix
+++ b/nixpkgs/nixos/tests/lorri/fake-shell.nix
diff --git a/nixos/tests/magnetico.nix b/nixpkgs/nixos/tests/magnetico.nix
index 6770d32358e..6770d32358e 100644
--- a/nixos/tests/magnetico.nix
+++ b/nixpkgs/nixos/tests/magnetico.nix
diff --git a/nixos/tests/mailcatcher.nix b/nixpkgs/nixos/tests/mailcatcher.nix
index 2ef38544fe0..2ef38544fe0 100644
--- a/nixos/tests/mailcatcher.nix
+++ b/nixpkgs/nixos/tests/mailcatcher.nix
diff --git a/nixos/tests/make-test-python.nix b/nixpkgs/nixos/tests/make-test-python.nix
index 89897fe7e61..89897fe7e61 100644
--- a/nixos/tests/make-test-python.nix
+++ b/nixpkgs/nixos/tests/make-test-python.nix
diff --git a/nixos/tests/make-test.nix b/nixpkgs/nixos/tests/make-test.nix
index cee5da93454..cee5da93454 100644
--- a/nixos/tests/make-test.nix
+++ b/nixpkgs/nixos/tests/make-test.nix
diff --git a/nixos/tests/mathics.nix b/nixpkgs/nixos/tests/mathics.nix
index fcbeeb18a72..fcbeeb18a72 100644
--- a/nixos/tests/mathics.nix
+++ b/nixpkgs/nixos/tests/mathics.nix
diff --git a/nixos/tests/matomo.nix b/nixpkgs/nixos/tests/matomo.nix
index 2bea237c8bd..2bea237c8bd 100644
--- a/nixos/tests/matomo.nix
+++ b/nixpkgs/nixos/tests/matomo.nix
diff --git a/nixos/tests/matrix-synapse.nix b/nixpkgs/nixos/tests/matrix-synapse.nix
index fca53009083..fca53009083 100644
--- a/nixos/tests/matrix-synapse.nix
+++ b/nixpkgs/nixos/tests/matrix-synapse.nix
diff --git a/nixos/tests/mediawiki.nix b/nixpkgs/nixos/tests/mediawiki.nix
index 9468c1de8cc..9468c1de8cc 100644
--- a/nixos/tests/mediawiki.nix
+++ b/nixpkgs/nixos/tests/mediawiki.nix
diff --git a/nixos/tests/memcached.nix b/nixpkgs/nixos/tests/memcached.nix
index 31f5627d25c..31f5627d25c 100644
--- a/nixos/tests/memcached.nix
+++ b/nixpkgs/nixos/tests/memcached.nix
diff --git a/nixos/tests/mesos.nix b/nixpkgs/nixos/tests/mesos.nix
index 2e6dc0eda06..2e6dc0eda06 100644
--- a/nixos/tests/mesos.nix
+++ b/nixpkgs/nixos/tests/mesos.nix
diff --git a/nixos/tests/mesos_test.py b/nixpkgs/nixos/tests/mesos_test.py
index be8bb32e49a..be8bb32e49a 100644
--- a/nixos/tests/mesos_test.py
+++ b/nixpkgs/nixos/tests/mesos_test.py
diff --git a/nixos/tests/metabase.nix b/nixpkgs/nixos/tests/metabase.nix
index 1450a4e9086..1450a4e9086 100644
--- a/nixos/tests/metabase.nix
+++ b/nixpkgs/nixos/tests/metabase.nix
diff --git a/nixos/tests/minidlna.nix b/nixpkgs/nixos/tests/minidlna.nix
index d852c7f60bc..d852c7f60bc 100644
--- a/nixos/tests/minidlna.nix
+++ b/nixpkgs/nixos/tests/minidlna.nix
diff --git a/nixos/tests/miniflux.nix b/nixpkgs/nixos/tests/miniflux.nix
index 7d83d061a9d..7d83d061a9d 100644
--- a/nixos/tests/miniflux.nix
+++ b/nixpkgs/nixos/tests/miniflux.nix
diff --git a/nixos/tests/minio.nix b/nixpkgs/nixos/tests/minio.nix
index 3b061974267..3b061974267 100644
--- a/nixos/tests/minio.nix
+++ b/nixpkgs/nixos/tests/minio.nix
diff --git a/nixos/tests/misc.nix b/nixpkgs/nixos/tests/misc.nix
index ca28bc31cf1..ca28bc31cf1 100644
--- a/nixos/tests/misc.nix
+++ b/nixpkgs/nixos/tests/misc.nix
diff --git a/nixos/tests/moinmoin.nix b/nixpkgs/nixos/tests/moinmoin.nix
index ac327498eba..ac327498eba 100644
--- a/nixos/tests/moinmoin.nix
+++ b/nixpkgs/nixos/tests/moinmoin.nix
diff --git a/nixos/tests/mongodb.nix b/nixpkgs/nixos/tests/mongodb.nix
index 9ebf84eed23..9ebf84eed23 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixpkgs/nixos/tests/mongodb.nix
diff --git a/nixos/tests/moodle.nix b/nixpkgs/nixos/tests/moodle.nix
index 56aa62596c0..56aa62596c0 100644
--- a/nixos/tests/moodle.nix
+++ b/nixpkgs/nixos/tests/moodle.nix
diff --git a/nixos/tests/morty.nix b/nixpkgs/nixos/tests/morty.nix
index 64c5a27665d..64c5a27665d 100644
--- a/nixos/tests/morty.nix
+++ b/nixpkgs/nixos/tests/morty.nix
diff --git a/nixos/tests/mosquitto.nix b/nixpkgs/nixos/tests/mosquitto.nix
index 1f2fdf4237f..1f2fdf4237f 100644
--- a/nixos/tests/mosquitto.nix
+++ b/nixpkgs/nixos/tests/mosquitto.nix
diff --git a/nixos/tests/mpd.nix b/nixpkgs/nixos/tests/mpd.nix
index 895b7e2014c..895b7e2014c 100644
--- a/nixos/tests/mpd.nix
+++ b/nixpkgs/nixos/tests/mpd.nix
diff --git a/nixos/tests/mpich-example.c b/nixpkgs/nixos/tests/mpich-example.c
index c48e3c45b72..c48e3c45b72 100644
--- a/nixos/tests/mpich-example.c
+++ b/nixpkgs/nixos/tests/mpich-example.c
diff --git a/nixos/tests/mumble.nix b/nixpkgs/nixos/tests/mumble.nix
index e9b6d14c6a1..e9b6d14c6a1 100644
--- a/nixos/tests/mumble.nix
+++ b/nixpkgs/nixos/tests/mumble.nix
diff --git a/nixos/tests/munin.nix b/nixpkgs/nixos/tests/munin.nix
index 7b674db7768..7b674db7768 100644
--- a/nixos/tests/munin.nix
+++ b/nixpkgs/nixos/tests/munin.nix
diff --git a/nixos/tests/mutable-users.nix b/nixpkgs/nixos/tests/mutable-users.nix
index 49c7f78b82e..49c7f78b82e 100644
--- a/nixos/tests/mutable-users.nix
+++ b/nixpkgs/nixos/tests/mutable-users.nix
diff --git a/nixos/tests/mxisd.nix b/nixpkgs/nixos/tests/mxisd.nix
index b2b60db4d82..b2b60db4d82 100644
--- a/nixos/tests/mxisd.nix
+++ b/nixpkgs/nixos/tests/mxisd.nix
diff --git a/nixos/tests/mysql-backup.nix b/nixpkgs/nixos/tests/mysql-backup.nix
index a0595e4d553..a0595e4d553 100644
--- a/nixos/tests/mysql-backup.nix
+++ b/nixpkgs/nixos/tests/mysql-backup.nix
diff --git a/nixos/tests/mysql-replication.nix b/nixpkgs/nixos/tests/mysql-replication.nix
index a2654f041ad..a2654f041ad 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixpkgs/nixos/tests/mysql-replication.nix
diff --git a/nixos/tests/mysql.nix b/nixpkgs/nixos/tests/mysql.nix
index 924bac84e26..924bac84e26 100644
--- a/nixos/tests/mysql.nix
+++ b/nixpkgs/nixos/tests/mysql.nix
diff --git a/nixos/tests/nagios.nix b/nixpkgs/nixos/tests/nagios.nix
index 6f5d4447287..6f5d4447287 100644
--- a/nixos/tests/nagios.nix
+++ b/nixpkgs/nixos/tests/nagios.nix
diff --git a/nixos/tests/nat.nix b/nixpkgs/nixos/tests/nat.nix
index 0d1f7aaedfa..0d1f7aaedfa 100644
--- a/nixos/tests/nat.nix
+++ b/nixpkgs/nixos/tests/nat.nix
diff --git a/nixos/tests/ndppd.nix b/nixpkgs/nixos/tests/ndppd.nix
index b67b26a7934..b67b26a7934 100644
--- a/nixos/tests/ndppd.nix
+++ b/nixpkgs/nixos/tests/ndppd.nix
diff --git a/nixos/tests/neo4j.nix b/nixpkgs/nixos/tests/neo4j.nix
index 32ee7f501b8..32ee7f501b8 100644
--- a/nixos/tests/neo4j.nix
+++ b/nixpkgs/nixos/tests/neo4j.nix
diff --git a/nixos/tests/nesting.nix b/nixpkgs/nixos/tests/nesting.nix
index 6388b67a6e4..6388b67a6e4 100644
--- a/nixos/tests/nesting.nix
+++ b/nixpkgs/nixos/tests/nesting.nix
diff --git a/nixos/tests/netdata.nix b/nixpkgs/nixos/tests/netdata.nix
index 4ddc96e8bc2..4ddc96e8bc2 100644
--- a/nixos/tests/netdata.nix
+++ b/nixpkgs/nixos/tests/netdata.nix
diff --git a/nixos/tests/networking-proxy.nix b/nixpkgs/nixos/tests/networking-proxy.nix
index bae9c66ed61..bae9c66ed61 100644
--- a/nixos/tests/networking-proxy.nix
+++ b/nixpkgs/nixos/tests/networking-proxy.nix
diff --git a/nixos/tests/networking.nix b/nixpkgs/nixos/tests/networking.nix
index 9448a104073..9448a104073 100644
--- a/nixos/tests/networking.nix
+++ b/nixpkgs/nixos/tests/networking.nix
diff --git a/nixos/tests/nextcloud/basic.nix b/nixpkgs/nixos/tests/nextcloud/basic.nix
index 75862feb202..75862feb202 100644
--- a/nixos/tests/nextcloud/basic.nix
+++ b/nixpkgs/nixos/tests/nextcloud/basic.nix
diff --git a/nixos/tests/nextcloud/default.nix b/nixpkgs/nixos/tests/nextcloud/default.nix
index e4c7a70606c..e4c7a70606c 100644
--- a/nixos/tests/nextcloud/default.nix
+++ b/nixpkgs/nixos/tests/nextcloud/default.nix
diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixpkgs/nixos/tests/nextcloud/with-mysql-and-memcached.nix
index b9ba5888187..b9ba5888187 100644
--- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix
+++ b/nixpkgs/nixos/tests/nextcloud/with-mysql-and-memcached.nix
diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixpkgs/nixos/tests/nextcloud/with-postgresql-and-redis.nix
index 324853350af..324853350af 100644
--- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix
+++ b/nixpkgs/nixos/tests/nextcloud/with-postgresql-and-redis.nix
diff --git a/nixos/tests/nexus.nix b/nixpkgs/nixos/tests/nexus.nix
index 1ec5c40476a..1ec5c40476a 100644
--- a/nixos/tests/nexus.nix
+++ b/nixpkgs/nixos/tests/nexus.nix
diff --git a/nixos/tests/nfs/default.nix b/nixpkgs/nixos/tests/nfs/default.nix
index 6bc803c91b4..6bc803c91b4 100644
--- a/nixos/tests/nfs/default.nix
+++ b/nixpkgs/nixos/tests/nfs/default.nix
diff --git a/nixos/tests/nfs/kerberos.nix b/nixpkgs/nixos/tests/nfs/kerberos.nix
index 1f2d0d453ea..1f2d0d453ea 100644
--- a/nixos/tests/nfs/kerberos.nix
+++ b/nixpkgs/nixos/tests/nfs/kerberos.nix
diff --git a/nixos/tests/nfs/simple.nix b/nixpkgs/nixos/tests/nfs/simple.nix
index a1a09ee0f45..a1a09ee0f45 100644
--- a/nixos/tests/nfs/simple.nix
+++ b/nixpkgs/nixos/tests/nfs/simple.nix
diff --git a/nixos/tests/nghttpx.nix b/nixpkgs/nixos/tests/nghttpx.nix
index d83c1c4cae6..d83c1c4cae6 100644
--- a/nixos/tests/nghttpx.nix
+++ b/nixpkgs/nixos/tests/nghttpx.nix
diff --git a/nixos/tests/nginx-etag.nix b/nixpkgs/nixos/tests/nginx-etag.nix
index e357309d166..e357309d166 100644
--- a/nixos/tests/nginx-etag.nix
+++ b/nixpkgs/nixos/tests/nginx-etag.nix
diff --git a/nixos/tests/nginx-sso.nix b/nixpkgs/nixos/tests/nginx-sso.nix
index 8834fc31c38..8834fc31c38 100644
--- a/nixos/tests/nginx-sso.nix
+++ b/nixpkgs/nixos/tests/nginx-sso.nix
diff --git a/nixos/tests/nginx.nix b/nixpkgs/nixos/tests/nginx.nix
index 7358800a676..7358800a676 100644
--- a/nixos/tests/nginx.nix
+++ b/nixpkgs/nixos/tests/nginx.nix
diff --git a/nixos/tests/nix-ssh-serve.nix b/nixpkgs/nixos/tests/nix-ssh-serve.nix
index 03f83542c7c..03f83542c7c 100644
--- a/nixos/tests/nix-ssh-serve.nix
+++ b/nixpkgs/nixos/tests/nix-ssh-serve.nix
diff --git a/nixos/tests/nixos-generate-config.nix b/nixpkgs/nixos/tests/nixos-generate-config.nix
index 6c83ccecc70..6c83ccecc70 100644
--- a/nixos/tests/nixos-generate-config.nix
+++ b/nixpkgs/nixos/tests/nixos-generate-config.nix
diff --git a/nixos/tests/novacomd.nix b/nixpkgs/nixos/tests/novacomd.nix
index 940210dee23..940210dee23 100644
--- a/nixos/tests/novacomd.nix
+++ b/nixpkgs/nixos/tests/novacomd.nix
diff --git a/nixos/tests/nsd.nix b/nixpkgs/nixos/tests/nsd.nix
index c3c91e71b5c..c3c91e71b5c 100644
--- a/nixos/tests/nsd.nix
+++ b/nixpkgs/nixos/tests/nsd.nix
diff --git a/nixos/tests/nzbget.nix b/nixpkgs/nixos/tests/nzbget.nix
index 12d8ed6ea8d..12d8ed6ea8d 100644
--- a/nixos/tests/nzbget.nix
+++ b/nixpkgs/nixos/tests/nzbget.nix
diff --git a/nixos/tests/openarena.nix b/nixpkgs/nixos/tests/openarena.nix
index b315426532b..b315426532b 100644
--- a/nixos/tests/openarena.nix
+++ b/nixpkgs/nixos/tests/openarena.nix
diff --git a/nixos/tests/openldap.nix b/nixpkgs/nixos/tests/openldap.nix
index f8321a2c522..f8321a2c522 100644
--- a/nixos/tests/openldap.nix
+++ b/nixpkgs/nixos/tests/openldap.nix
diff --git a/nixos/tests/opensmtpd.nix b/nixpkgs/nixos/tests/opensmtpd.nix
index e6f52db1d98..e6f52db1d98 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixpkgs/nixos/tests/opensmtpd.nix
diff --git a/nixos/tests/openssh.nix b/nixpkgs/nixos/tests/openssh.nix
index e9692b50327..e9692b50327 100644
--- a/nixos/tests/openssh.nix
+++ b/nixpkgs/nixos/tests/openssh.nix
diff --git a/nixos/tests/openstack-image.nix b/nixpkgs/nixos/tests/openstack-image.nix
index 8a21dd1b599..8a21dd1b599 100644
--- a/nixos/tests/openstack-image.nix
+++ b/nixpkgs/nixos/tests/openstack-image.nix
diff --git a/nixos/tests/orangefs.nix b/nixpkgs/nixos/tests/orangefs.nix
index 46d7a6a72f8..46d7a6a72f8 100644
--- a/nixos/tests/orangefs.nix
+++ b/nixpkgs/nixos/tests/orangefs.nix
diff --git a/nixos/tests/os-prober.nix b/nixpkgs/nixos/tests/os-prober.nix
index 5407a62339f..5407a62339f 100644
--- a/nixos/tests/os-prober.nix
+++ b/nixpkgs/nixos/tests/os-prober.nix
diff --git a/nixos/tests/osrm-backend.nix b/nixpkgs/nixos/tests/osrm-backend.nix
index db67a5a589f..db67a5a589f 100644
--- a/nixos/tests/osrm-backend.nix
+++ b/nixpkgs/nixos/tests/osrm-backend.nix
diff --git a/nixos/tests/overlayfs.nix b/nixpkgs/nixos/tests/overlayfs.nix
index 33794deb9ed..33794deb9ed 100644
--- a/nixos/tests/overlayfs.nix
+++ b/nixpkgs/nixos/tests/overlayfs.nix
diff --git a/nixos/tests/packagekit.nix b/nixpkgs/nixos/tests/packagekit.nix
index 7e93ad35e80..7e93ad35e80 100644
--- a/nixos/tests/packagekit.nix
+++ b/nixpkgs/nixos/tests/packagekit.nix
diff --git a/nixos/tests/pam-oath-login.nix b/nixpkgs/nixos/tests/pam-oath-login.nix
index 6d48199eda9..6d48199eda9 100644
--- a/nixos/tests/pam-oath-login.nix
+++ b/nixpkgs/nixos/tests/pam-oath-login.nix
diff --git a/nixos/tests/pam-u2f.nix b/nixpkgs/nixos/tests/pam-u2f.nix
index f492baa9e13..f492baa9e13 100644
--- a/nixos/tests/pam-u2f.nix
+++ b/nixpkgs/nixos/tests/pam-u2f.nix
diff --git a/nixos/tests/pantheon.nix b/nixpkgs/nixos/tests/pantheon.nix
index c0434f20754..c0434f20754 100644
--- a/nixos/tests/pantheon.nix
+++ b/nixpkgs/nixos/tests/pantheon.nix
diff --git a/nixos/tests/paperless.nix b/nixpkgs/nixos/tests/paperless.nix
index 355e7041d3f..355e7041d3f 100644
--- a/nixos/tests/paperless.nix
+++ b/nixpkgs/nixos/tests/paperless.nix
diff --git a/nixos/tests/partition.nix b/nixpkgs/nixos/tests/partition.nix
index 01a08995950..01a08995950 100644
--- a/nixos/tests/partition.nix
+++ b/nixpkgs/nixos/tests/partition.nix
diff --git a/nixos/tests/pdns-recursor.nix b/nixpkgs/nixos/tests/pdns-recursor.nix
index de1b60e0b1c..de1b60e0b1c 100644
--- a/nixos/tests/pdns-recursor.nix
+++ b/nixpkgs/nixos/tests/pdns-recursor.nix
diff --git a/nixos/tests/peerflix.nix b/nixpkgs/nixos/tests/peerflix.nix
index 37628604d49..37628604d49 100644
--- a/nixos/tests/peerflix.nix
+++ b/nixpkgs/nixos/tests/peerflix.nix
diff --git a/nixos/tests/pgjwt.nix b/nixpkgs/nixos/tests/pgjwt.nix
index 4793a3e3150..4793a3e3150 100644
--- a/nixos/tests/pgjwt.nix
+++ b/nixpkgs/nixos/tests/pgjwt.nix
diff --git a/nixos/tests/pgmanage.nix b/nixpkgs/nixos/tests/pgmanage.nix
index 4f5dbed24a9..4f5dbed24a9 100644
--- a/nixos/tests/pgmanage.nix
+++ b/nixpkgs/nixos/tests/pgmanage.nix
diff --git a/nixos/tests/php-pcre.nix b/nixpkgs/nixos/tests/php-pcre.nix
index d5c22e0582a..d5c22e0582a 100644
--- a/nixos/tests/php-pcre.nix
+++ b/nixpkgs/nixos/tests/php-pcre.nix
diff --git a/nixos/tests/plasma5.nix b/nixpkgs/nixos/tests/plasma5.nix
index 2eccfdf47f5..2eccfdf47f5 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixpkgs/nixos/tests/plasma5.nix
diff --git a/nixos/tests/plotinus.nix b/nixpkgs/nixos/tests/plotinus.nix
index 609afe7b214..609afe7b214 100644
--- a/nixos/tests/plotinus.nix
+++ b/nixpkgs/nixos/tests/plotinus.nix
diff --git a/nixos/tests/postgis.nix b/nixpkgs/nixos/tests/postgis.nix
index 84bbb0bc8ec..84bbb0bc8ec 100644
--- a/nixos/tests/postgis.nix
+++ b/nixpkgs/nixos/tests/postgis.nix
diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixpkgs/nixos/tests/postgresql-wal-receiver.nix
index 791b041ba95..791b041ba95 100644
--- a/nixos/tests/postgresql-wal-receiver.nix
+++ b/nixpkgs/nixos/tests/postgresql-wal-receiver.nix
diff --git a/nixos/tests/postgresql.nix b/nixpkgs/nixos/tests/postgresql.nix
index 3201e22555e..3201e22555e 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixpkgs/nixos/tests/postgresql.nix
diff --git a/nixos/tests/powerdns.nix b/nixpkgs/nixos/tests/powerdns.nix
index 75d71315e64..75d71315e64 100644
--- a/nixos/tests/powerdns.nix
+++ b/nixpkgs/nixos/tests/powerdns.nix
diff --git a/nixos/tests/pppd.nix b/nixpkgs/nixos/tests/pppd.nix
index bda0aa75bb5..bda0aa75bb5 100644
--- a/nixos/tests/pppd.nix
+++ b/nixpkgs/nixos/tests/pppd.nix
diff --git a/nixos/tests/predictable-interface-names.nix b/nixpkgs/nixos/tests/predictable-interface-names.nix
index 83883477a5c..83883477a5c 100644
--- a/nixos/tests/predictable-interface-names.nix
+++ b/nixpkgs/nixos/tests/predictable-interface-names.nix
diff --git a/nixos/tests/printing.nix b/nixpkgs/nixos/tests/printing.nix
index 4d0df289cf7..4d0df289cf7 100644
--- a/nixos/tests/printing.nix
+++ b/nixpkgs/nixos/tests/printing.nix
diff --git a/nixos/tests/prometheus-exporters.nix b/nixpkgs/nixos/tests/prometheus-exporters.nix
index 563f2472647..563f2472647 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixpkgs/nixos/tests/prometheus-exporters.nix
diff --git a/nixos/tests/prometheus.nix b/nixpkgs/nixos/tests/prometheus.nix
index 8bfd0c131e6..8bfd0c131e6 100644
--- a/nixos/tests/prometheus.nix
+++ b/nixpkgs/nixos/tests/prometheus.nix
diff --git a/nixos/tests/proxy.nix b/nixpkgs/nixos/tests/proxy.nix
index 6a14a9af59a..6a14a9af59a 100644
--- a/nixos/tests/proxy.nix
+++ b/nixpkgs/nixos/tests/proxy.nix
diff --git a/nixos/tests/quagga.nix b/nixpkgs/nixos/tests/quagga.nix
index 04590aa0eb3..04590aa0eb3 100644
--- a/nixos/tests/quagga.nix
+++ b/nixpkgs/nixos/tests/quagga.nix
diff --git a/nixos/tests/rabbitmq.nix b/nixpkgs/nixos/tests/rabbitmq.nix
index 8e7f34d06e3..8e7f34d06e3 100644
--- a/nixos/tests/rabbitmq.nix
+++ b/nixpkgs/nixos/tests/rabbitmq.nix
diff --git a/nixos/tests/radarr.nix b/nixpkgs/nixos/tests/radarr.nix
index ed90025ac42..ed90025ac42 100644
--- a/nixos/tests/radarr.nix
+++ b/nixpkgs/nixos/tests/radarr.nix
diff --git a/nixos/tests/radicale.nix b/nixpkgs/nixos/tests/radicale.nix
index c81e78a8f99..c81e78a8f99 100644
--- a/nixos/tests/radicale.nix
+++ b/nixpkgs/nixos/tests/radicale.nix
diff --git a/nixos/tests/redis.nix b/nixpkgs/nixos/tests/redis.nix
index 529965d7acd..529965d7acd 100644
--- a/nixos/tests/redis.nix
+++ b/nixpkgs/nixos/tests/redis.nix
diff --git a/nixos/tests/redmine.nix b/nixpkgs/nixos/tests/redmine.nix
index f0f4cbf6a21..f0f4cbf6a21 100644
--- a/nixos/tests/redmine.nix
+++ b/nixpkgs/nixos/tests/redmine.nix
diff --git a/nixos/tests/resolv.nix b/nixpkgs/nixos/tests/resolv.nix
index b506f87451e..b506f87451e 100644
--- a/nixos/tests/resolv.nix
+++ b/nixpkgs/nixos/tests/resolv.nix
diff --git a/nixos/tests/riak.nix b/nixpkgs/nixos/tests/riak.nix
index 6915779e7e9..6915779e7e9 100644
--- a/nixos/tests/riak.nix
+++ b/nixpkgs/nixos/tests/riak.nix
diff --git a/nixos/tests/roundcube.nix b/nixpkgs/nixos/tests/roundcube.nix
index 1897b53e283..1897b53e283 100644
--- a/nixos/tests/roundcube.nix
+++ b/nixpkgs/nixos/tests/roundcube.nix
diff --git a/nixos/tests/rspamd.nix b/nixpkgs/nixos/tests/rspamd.nix
index bf3f0de6204..bf3f0de6204 100644
--- a/nixos/tests/rspamd.nix
+++ b/nixpkgs/nixos/tests/rspamd.nix
diff --git a/nixos/tests/rss2email.nix b/nixpkgs/nixos/tests/rss2email.nix
index d62207a417b..d62207a417b 100644
--- a/nixos/tests/rss2email.nix
+++ b/nixpkgs/nixos/tests/rss2email.nix
diff --git a/nixos/tests/rsyslogd.nix b/nixpkgs/nixos/tests/rsyslogd.nix
index f17e61814c5..f17e61814c5 100644
--- a/nixos/tests/rsyslogd.nix
+++ b/nixpkgs/nixos/tests/rsyslogd.nix
diff --git a/nixos/tests/run-in-machine.nix b/nixpkgs/nixos/tests/run-in-machine.nix
index 339a4b9a740..339a4b9a740 100644
--- a/nixos/tests/run-in-machine.nix
+++ b/nixpkgs/nixos/tests/run-in-machine.nix
diff --git a/nixos/tests/rxe.nix b/nixpkgs/nixos/tests/rxe.nix
index 194a2e3d2b9..194a2e3d2b9 100644
--- a/nixos/tests/rxe.nix
+++ b/nixpkgs/nixos/tests/rxe.nix
diff --git a/nixos/tests/samba.nix b/nixpkgs/nixos/tests/samba.nix
index 142269752b3..142269752b3 100644
--- a/nixos/tests/samba.nix
+++ b/nixpkgs/nixos/tests/samba.nix
diff --git a/nixos/tests/sddm.nix b/nixpkgs/nixos/tests/sddm.nix
index a145705250f..a145705250f 100644
--- a/nixos/tests/sddm.nix
+++ b/nixpkgs/nixos/tests/sddm.nix
diff --git a/nixos/tests/shiori.nix b/nixpkgs/nixos/tests/shiori.nix
index a5771262c6f..a5771262c6f 100644
--- a/nixos/tests/shiori.nix
+++ b/nixpkgs/nixos/tests/shiori.nix
diff --git a/nixos/tests/signal-desktop.nix b/nixpkgs/nixos/tests/signal-desktop.nix
index ae141fe116d..ae141fe116d 100644
--- a/nixos/tests/signal-desktop.nix
+++ b/nixpkgs/nixos/tests/signal-desktop.nix
diff --git a/nixos/tests/simple.nix b/nixpkgs/nixos/tests/simple.nix
index 3810a2cd3a5..3810a2cd3a5 100644
--- a/nixos/tests/simple.nix
+++ b/nixpkgs/nixos/tests/simple.nix
diff --git a/nixos/tests/slurm.nix b/nixpkgs/nixos/tests/slurm.nix
index d0e62d15437..d0e62d15437 100644
--- a/nixos/tests/slurm.nix
+++ b/nixpkgs/nixos/tests/slurm.nix
diff --git a/nixos/tests/smokeping.nix b/nixpkgs/nixos/tests/smokeping.nix
index 4f8f0fcc9fe..4f8f0fcc9fe 100644
--- a/nixos/tests/smokeping.nix
+++ b/nixpkgs/nixos/tests/smokeping.nix
diff --git a/nixos/tests/snapper.nix b/nixpkgs/nixos/tests/snapper.nix
index 018102d7f64..018102d7f64 100644
--- a/nixos/tests/snapper.nix
+++ b/nixpkgs/nixos/tests/snapper.nix
diff --git a/nixos/tests/solr.nix b/nixpkgs/nixos/tests/solr.nix
index 23e1a960fb3..23e1a960fb3 100644
--- a/nixos/tests/solr.nix
+++ b/nixpkgs/nixos/tests/solr.nix
diff --git a/nixos/tests/sonarr.nix b/nixpkgs/nixos/tests/sonarr.nix
index 764a4d05b38..764a4d05b38 100644
--- a/nixos/tests/sonarr.nix
+++ b/nixpkgs/nixos/tests/sonarr.nix
diff --git a/nixos/tests/spacecookie.nix b/nixpkgs/nixos/tests/spacecookie.nix
index 6eff32a2e75..6eff32a2e75 100644
--- a/nixos/tests/spacecookie.nix
+++ b/nixpkgs/nixos/tests/spacecookie.nix
diff --git a/nixos/tests/spike.nix b/nixpkgs/nixos/tests/spike.nix
index 47763e75ffa..47763e75ffa 100644
--- a/nixos/tests/spike.nix
+++ b/nixpkgs/nixos/tests/spike.nix
diff --git a/nixos/tests/ssh-keys.nix b/nixpkgs/nixos/tests/ssh-keys.nix
index 07d422196ef..07d422196ef 100644
--- a/nixos/tests/ssh-keys.nix
+++ b/nixpkgs/nixos/tests/ssh-keys.nix
diff --git a/nixos/tests/strongswan-swanctl.nix b/nixpkgs/nixos/tests/strongswan-swanctl.nix
index 152c0d61c54..152c0d61c54 100644
--- a/nixos/tests/strongswan-swanctl.nix
+++ b/nixpkgs/nixos/tests/strongswan-swanctl.nix
diff --git a/nixos/tests/sudo.nix b/nixpkgs/nixos/tests/sudo.nix
index 5bbec3d5726..5bbec3d5726 100644
--- a/nixos/tests/sudo.nix
+++ b/nixpkgs/nixos/tests/sudo.nix
diff --git a/nixos/tests/switch-test.nix b/nixpkgs/nixos/tests/switch-test.nix
index 7076bd77b77..7076bd77b77 100644
--- a/nixos/tests/switch-test.nix
+++ b/nixpkgs/nixos/tests/switch-test.nix
diff --git a/nixos/tests/syncthing-init.nix b/nixpkgs/nixos/tests/syncthing-init.nix
index 9c8e0a3d087..9c8e0a3d087 100644
--- a/nixos/tests/syncthing-init.nix
+++ b/nixpkgs/nixos/tests/syncthing-init.nix
diff --git a/nixos/tests/syncthing-relay.nix b/nixpkgs/nixos/tests/syncthing-relay.nix
index cd72ef1cbe1..cd72ef1cbe1 100644
--- a/nixos/tests/syncthing-relay.nix
+++ b/nixpkgs/nixos/tests/syncthing-relay.nix
diff --git a/nixos/tests/systemd-analyze.nix b/nixpkgs/nixos/tests/systemd-analyze.nix
index a78ba08cd55..a78ba08cd55 100644
--- a/nixos/tests/systemd-analyze.nix
+++ b/nixpkgs/nixos/tests/systemd-analyze.nix
diff --git a/nixos/tests/systemd-confinement.nix b/nixpkgs/nixos/tests/systemd-confinement.nix
index b7b10fb36aa..b7b10fb36aa 100644
--- a/nixos/tests/systemd-confinement.nix
+++ b/nixpkgs/nixos/tests/systemd-confinement.nix
diff --git a/nixos/tests/systemd-networkd-wireguard.nix b/nixpkgs/nixos/tests/systemd-networkd-wireguard.nix
index be5c0da981d..be5c0da981d 100644
--- a/nixos/tests/systemd-networkd-wireguard.nix
+++ b/nixpkgs/nixos/tests/systemd-networkd-wireguard.nix
diff --git a/nixos/tests/systemd-nspawn.nix b/nixpkgs/nixos/tests/systemd-nspawn.nix
index 5bf55060d2e..5bf55060d2e 100644
--- a/nixos/tests/systemd-nspawn.nix
+++ b/nixpkgs/nixos/tests/systemd-nspawn.nix
diff --git a/nixos/tests/systemd-timesyncd.nix b/nixpkgs/nixos/tests/systemd-timesyncd.nix
index ad5b9a47383..ad5b9a47383 100644
--- a/nixos/tests/systemd-timesyncd.nix
+++ b/nixpkgs/nixos/tests/systemd-timesyncd.nix
diff --git a/nixos/tests/systemd.nix b/nixpkgs/nixos/tests/systemd.nix
index 8028145939b..8028145939b 100644
--- a/nixos/tests/systemd.nix
+++ b/nixpkgs/nixos/tests/systemd.nix
diff --git a/nixos/tests/taskserver.nix b/nixpkgs/nixos/tests/taskserver.nix
index ab9b589f859..ab9b589f859 100644
--- a/nixos/tests/taskserver.nix
+++ b/nixpkgs/nixos/tests/taskserver.nix
diff --git a/nixos/tests/telegraf.nix b/nixpkgs/nixos/tests/telegraf.nix
index 73f741b1135..73f741b1135 100644
--- a/nixos/tests/telegraf.nix
+++ b/nixpkgs/nixos/tests/telegraf.nix
diff --git a/nixos/tests/testdb.sql b/nixpkgs/nixos/tests/testdb.sql
index 3c68c49ae82..3c68c49ae82 100644
--- a/nixos/tests/testdb.sql
+++ b/nixpkgs/nixos/tests/testdb.sql
diff --git a/nixos/tests/tiddlywiki.nix b/nixpkgs/nixos/tests/tiddlywiki.nix
index cf45578b0f9..cf45578b0f9 100644
--- a/nixos/tests/tiddlywiki.nix
+++ b/nixpkgs/nixos/tests/tiddlywiki.nix
diff --git a/nixos/tests/timezone.nix b/nixpkgs/nixos/tests/timezone.nix
index 7fc9a5058ee..7fc9a5058ee 100644
--- a/nixos/tests/timezone.nix
+++ b/nixpkgs/nixos/tests/timezone.nix
diff --git a/nixos/tests/tinydns.nix b/nixpkgs/nixos/tests/tinydns.nix
index c7740d5ade3..c7740d5ade3 100644
--- a/nixos/tests/tinydns.nix
+++ b/nixpkgs/nixos/tests/tinydns.nix
diff --git a/nixos/tests/tor.nix b/nixpkgs/nixos/tests/tor.nix
index ad07231557c..ad07231557c 100644
--- a/nixos/tests/tor.nix
+++ b/nixpkgs/nixos/tests/tor.nix
diff --git a/nixos/tests/trac.nix b/nixpkgs/nixos/tests/trac.nix
index 7953f8d41f7..7953f8d41f7 100644
--- a/nixos/tests/trac.nix
+++ b/nixpkgs/nixos/tests/trac.nix
diff --git a/nixos/tests/transmission.nix b/nixpkgs/nixos/tests/transmission.nix
index f4f2186be1f..f4f2186be1f 100644
--- a/nixos/tests/transmission.nix
+++ b/nixpkgs/nixos/tests/transmission.nix
diff --git a/nixos/tests/trezord.nix b/nixpkgs/nixos/tests/trezord.nix
index 8d908a52249..8d908a52249 100644
--- a/nixos/tests/trezord.nix
+++ b/nixpkgs/nixos/tests/trezord.nix
diff --git a/nixos/tests/trickster.nix b/nixpkgs/nixos/tests/trickster.nix
index e2ca00980d5..e2ca00980d5 100644
--- a/nixos/tests/trickster.nix
+++ b/nixpkgs/nixos/tests/trickster.nix
diff --git a/nixos/tests/trilium-server.nix b/nixpkgs/nixos/tests/trilium-server.nix
index 6346575b33d..6346575b33d 100644
--- a/nixos/tests/trilium-server.nix
+++ b/nixpkgs/nixos/tests/trilium-server.nix
diff --git a/nixos/tests/udisks2.nix b/nixpkgs/nixos/tests/udisks2.nix
index 0cbfa0c4c7b..0cbfa0c4c7b 100644
--- a/nixos/tests/udisks2.nix
+++ b/nixpkgs/nixos/tests/udisks2.nix
diff --git a/nixos/tests/upnp.nix b/nixpkgs/nixos/tests/upnp.nix
index a7d837ea070..a7d837ea070 100644
--- a/nixos/tests/upnp.nix
+++ b/nixpkgs/nixos/tests/upnp.nix
diff --git a/nixos/tests/uwsgi.nix b/nixpkgs/nixos/tests/uwsgi.nix
index 78a87147f55..78a87147f55 100644
--- a/nixos/tests/uwsgi.nix
+++ b/nixpkgs/nixos/tests/uwsgi.nix
diff --git a/nixos/tests/vault.nix b/nixpkgs/nixos/tests/vault.nix
index ac8cf0703da..ac8cf0703da 100644
--- a/nixos/tests/vault.nix
+++ b/nixpkgs/nixos/tests/vault.nix
diff --git a/nixos/tests/victoriametrics.nix b/nixpkgs/nixos/tests/victoriametrics.nix
index 73ef8b72861..73ef8b72861 100644
--- a/nixos/tests/victoriametrics.nix
+++ b/nixpkgs/nixos/tests/victoriametrics.nix
diff --git a/nixos/tests/virtualbox.nix b/nixpkgs/nixos/tests/virtualbox.nix
index f03dc1cc413..f03dc1cc413 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixpkgs/nixos/tests/virtualbox.nix
diff --git a/nixos/tests/wireguard/default.nix b/nixpkgs/nixos/tests/wireguard/default.nix
index 8206823a918..8206823a918 100644
--- a/nixos/tests/wireguard/default.nix
+++ b/nixpkgs/nixos/tests/wireguard/default.nix
diff --git a/nixos/tests/wireguard/generated.nix b/nixpkgs/nixos/tests/wireguard/generated.nix
index a29afd2d466..a29afd2d466 100644
--- a/nixos/tests/wireguard/generated.nix
+++ b/nixpkgs/nixos/tests/wireguard/generated.nix
diff --git a/nixos/tests/wireguard/namespaces.nix b/nixpkgs/nixos/tests/wireguard/namespaces.nix
index c8a4e3bb52a..c8a4e3bb52a 100644
--- a/nixos/tests/wireguard/namespaces.nix
+++ b/nixpkgs/nixos/tests/wireguard/namespaces.nix
diff --git a/nixos/tests/wireguard/snakeoil-keys.nix b/nixpkgs/nixos/tests/wireguard/snakeoil-keys.nix
index 55ad582d405..55ad582d405 100644
--- a/nixos/tests/wireguard/snakeoil-keys.nix
+++ b/nixpkgs/nixos/tests/wireguard/snakeoil-keys.nix
diff --git a/nixos/tests/wordpress.nix b/nixpkgs/nixos/tests/wordpress.nix
index b7449859f7e..b7449859f7e 100644
--- a/nixos/tests/wordpress.nix
+++ b/nixpkgs/nixos/tests/wordpress.nix
diff --git a/nixos/tests/xandikos.nix b/nixpkgs/nixos/tests/xandikos.nix
index 0fded20ff1a..0fded20ff1a 100644
--- a/nixos/tests/xandikos.nix
+++ b/nixpkgs/nixos/tests/xandikos.nix
diff --git a/nixos/tests/xautolock.nix b/nixpkgs/nixos/tests/xautolock.nix
index 4a8d3f4cebf..4a8d3f4cebf 100644
--- a/nixos/tests/xautolock.nix
+++ b/nixpkgs/nixos/tests/xautolock.nix
diff --git a/nixos/tests/xfce.nix b/nixpkgs/nixos/tests/xfce.nix
index 99065669661..99065669661 100644
--- a/nixos/tests/xfce.nix
+++ b/nixpkgs/nixos/tests/xfce.nix
diff --git a/nixos/tests/xmonad.nix b/nixpkgs/nixos/tests/xmonad.nix
index 56baae8b9d3..56baae8b9d3 100644
--- a/nixos/tests/xmonad.nix
+++ b/nixpkgs/nixos/tests/xmonad.nix
diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixpkgs/nixos/tests/xmpp/ejabberd.nix
index 1518aaacc8a..1518aaacc8a 100644
--- a/nixos/tests/xmpp/ejabberd.nix
+++ b/nixpkgs/nixos/tests/xmpp/ejabberd.nix
diff --git a/nixos/tests/xmpp/prosody-mysql.nix b/nixpkgs/nixos/tests/xmpp/prosody-mysql.nix
index 0507227021b..0507227021b 100644
--- a/nixos/tests/xmpp/prosody-mysql.nix
+++ b/nixpkgs/nixos/tests/xmpp/prosody-mysql.nix
diff --git a/nixos/tests/xmpp/prosody.nix b/nixpkgs/nixos/tests/xmpp/prosody.nix
index 9d1374bff6b..9d1374bff6b 100644
--- a/nixos/tests/xmpp/prosody.nix
+++ b/nixpkgs/nixos/tests/xmpp/prosody.nix
diff --git a/nixos/tests/xmpp/xmpp-sendmessage.nix b/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix
index 2a075a01813..2a075a01813 100644
--- a/nixos/tests/xmpp/xmpp-sendmessage.nix
+++ b/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix
diff --git a/nixos/tests/xrdp.nix b/nixpkgs/nixos/tests/xrdp.nix
index 6d7f2b9249f..6d7f2b9249f 100644
--- a/nixos/tests/xrdp.nix
+++ b/nixpkgs/nixos/tests/xrdp.nix
diff --git a/nixos/tests/xss-lock.nix b/nixpkgs/nixos/tests/xss-lock.nix
index b77bbbbb3c4..b77bbbbb3c4 100644
--- a/nixos/tests/xss-lock.nix
+++ b/nixpkgs/nixos/tests/xss-lock.nix
diff --git a/nixos/tests/yabar.nix b/nixpkgs/nixos/tests/yabar.nix
index b374ef29680..b374ef29680 100644
--- a/nixos/tests/yabar.nix
+++ b/nixpkgs/nixos/tests/yabar.nix
diff --git a/nixos/tests/yggdrasil.nix b/nixpkgs/nixos/tests/yggdrasil.nix
index 468fcf67127..468fcf67127 100644
--- a/nixos/tests/yggdrasil.nix
+++ b/nixpkgs/nixos/tests/yggdrasil.nix
diff --git a/nixos/tests/zfs.nix b/nixpkgs/nixos/tests/zfs.nix
index 8f844aca416..8f844aca416 100644
--- a/nixos/tests/zfs.nix
+++ b/nixpkgs/nixos/tests/zfs.nix
diff --git a/nixos/tests/zookeeper.nix b/nixpkgs/nixos/tests/zookeeper.nix
index 42cf20b39c5..42cf20b39c5 100644
--- a/nixos/tests/zookeeper.nix
+++ b/nixpkgs/nixos/tests/zookeeper.nix
diff --git a/nixos/tests/zsh-history.nix b/nixpkgs/nixos/tests/zsh-history.nix
index 4380ec9adfd..4380ec9adfd 100644
--- a/nixos/tests/zsh-history.nix
+++ b/nixpkgs/nixos/tests/zsh-history.nix
diff --git a/pkgs/applications/accessibility/contrast/default.nix b/nixpkgs/pkgs/applications/accessibility/contrast/default.nix
index 3e03cf2da73..3e03cf2da73 100644
--- a/pkgs/applications/accessibility/contrast/default.nix
+++ b/nixpkgs/pkgs/applications/accessibility/contrast/default.nix
diff --git a/pkgs/applications/accessibility/dasher/default.nix b/nixpkgs/pkgs/applications/accessibility/dasher/default.nix
index 9e8084e7a87..9e8084e7a87 100644
--- a/pkgs/applications/accessibility/dasher/default.nix
+++ b/nixpkgs/pkgs/applications/accessibility/dasher/default.nix
diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix
index e4fd66679a7..e4fd66679a7 100644
--- a/pkgs/applications/accessibility/mousetweaks/default.nix
+++ b/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix
diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/nixpkgs/pkgs/applications/audio/AMB-plugins/default.nix
index d9a05e0bf66..d9a05e0bf66 100644
--- a/pkgs/applications/audio/AMB-plugins/default.nix
+++ b/nixpkgs/pkgs/applications/audio/AMB-plugins/default.nix
diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/nixpkgs/pkgs/applications/audio/FIL-plugins/default.nix
index cf383c1dd49..cf383c1dd49 100644
--- a/pkgs/applications/audio/FIL-plugins/default.nix
+++ b/nixpkgs/pkgs/applications/audio/FIL-plugins/default.nix
diff --git a/pkgs/applications/audio/MMA/default.nix b/nixpkgs/pkgs/applications/audio/MMA/default.nix
index 42f8af99e6f..42f8af99e6f 100644
--- a/pkgs/applications/audio/MMA/default.nix
+++ b/nixpkgs/pkgs/applications/audio/MMA/default.nix
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix
index 28331720048..28331720048 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix
diff --git a/pkgs/applications/audio/aacgain/default.nix b/nixpkgs/pkgs/applications/audio/aacgain/default.nix
index 5892351225d..5892351225d 100644
--- a/pkgs/applications/audio/aacgain/default.nix
+++ b/nixpkgs/pkgs/applications/audio/aacgain/default.nix
diff --git a/pkgs/applications/audio/abcde/default.nix b/nixpkgs/pkgs/applications/audio/abcde/default.nix
index adb38d4bbba..adb38d4bbba 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/nixpkgs/pkgs/applications/audio/abcde/default.nix
diff --git a/pkgs/applications/audio/adlplug/default.nix b/nixpkgs/pkgs/applications/audio/adlplug/default.nix
index bc626cbad11..bc626cbad11 100644
--- a/pkgs/applications/audio/adlplug/default.nix
+++ b/nixpkgs/pkgs/applications/audio/adlplug/default.nix
diff --git a/pkgs/applications/audio/aeolus/default.nix b/nixpkgs/pkgs/applications/audio/aeolus/default.nix
index ee9932a7aa3..ee9932a7aa3 100644
--- a/pkgs/applications/audio/aeolus/default.nix
+++ b/nixpkgs/pkgs/applications/audio/aeolus/default.nix
diff --git a/pkgs/applications/audio/airwave/default.nix b/nixpkgs/pkgs/applications/audio/airwave/default.nix
index 1d91ad4d2be..1d91ad4d2be 100644
--- a/pkgs/applications/audio/airwave/default.nix
+++ b/nixpkgs/pkgs/applications/audio/airwave/default.nix
diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/nixpkgs/pkgs/applications/audio/aj-snapshot/default.nix
index 5c379b57ad6..5c379b57ad6 100644
--- a/pkgs/applications/audio/aj-snapshot/default.nix
+++ b/nixpkgs/pkgs/applications/audio/aj-snapshot/default.nix
diff --git a/pkgs/applications/audio/amarok/default.nix b/nixpkgs/pkgs/applications/audio/amarok/default.nix
index cd951701e77..cd951701e77 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/nixpkgs/pkgs/applications/audio/amarok/default.nix
diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/nixpkgs/pkgs/applications/audio/ams-lv2/default.nix
index 34f5667bfca..34f5667bfca 100644
--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ams-lv2/default.nix
diff --git a/pkgs/applications/audio/ardour/default.nix b/nixpkgs/pkgs/applications/audio/ardour/default.nix
index 30a4e052d77..30a4e052d77 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ardour/default.nix
diff --git a/pkgs/applications/audio/ario/default.nix b/nixpkgs/pkgs/applications/audio/ario/default.nix
index 4b48f5f1eea..4b48f5f1eea 100644
--- a/pkgs/applications/audio/ario/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ario/default.nix
diff --git a/pkgs/applications/audio/artyFX/default.nix b/nixpkgs/pkgs/applications/audio/artyFX/default.nix
index 4b76ebdf605..4b76ebdf605 100644
--- a/pkgs/applications/audio/artyFX/default.nix
+++ b/nixpkgs/pkgs/applications/audio/artyFX/default.nix
diff --git a/pkgs/applications/audio/asunder/default.nix b/nixpkgs/pkgs/applications/audio/asunder/default.nix
index 5a0b6797a24..5a0b6797a24 100644
--- a/pkgs/applications/audio/asunder/default.nix
+++ b/nixpkgs/pkgs/applications/audio/asunder/default.nix
diff --git a/pkgs/applications/audio/audacious/default.nix b/nixpkgs/pkgs/applications/audio/audacious/default.nix
index 12e8237d485..12e8237d485 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/nixpkgs/pkgs/applications/audio/audacious/default.nix
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/nixpkgs/pkgs/applications/audio/audacious/qt-5.nix
index baf7b108e50..baf7b108e50 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/nixpkgs/pkgs/applications/audio/audacious/qt-5.nix
diff --git a/pkgs/applications/audio/audacity/default.nix b/nixpkgs/pkgs/applications/audio/audacity/default.nix
index 57e0c52e640..57e0c52e640 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/nixpkgs/pkgs/applications/audio/audacity/default.nix
diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/nixpkgs/pkgs/applications/audio/audio-recorder/default.nix
index 534b87e9fa7..534b87e9fa7 100644
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/nixpkgs/pkgs/applications/audio/audio-recorder/default.nix
diff --git a/pkgs/applications/audio/aumix/default.nix b/nixpkgs/pkgs/applications/audio/aumix/default.nix
index db5f081c4ed..db5f081c4ed 100644
--- a/pkgs/applications/audio/aumix/default.nix
+++ b/nixpkgs/pkgs/applications/audio/aumix/default.nix
diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/nixpkgs/pkgs/applications/audio/avldrums-lv2/default.nix
index d71718c32a8..d71718c32a8 100644
--- a/pkgs/applications/audio/avldrums-lv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/avldrums-lv2/default.nix
diff --git a/pkgs/applications/audio/axoloti/default.nix b/nixpkgs/pkgs/applications/audio/axoloti/default.nix
index fb9b3c9513f..fb9b3c9513f 100644
--- a/pkgs/applications/audio/axoloti/default.nix
+++ b/nixpkgs/pkgs/applications/audio/axoloti/default.nix
diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/nixpkgs/pkgs/applications/audio/axoloti/dfu-util.nix
index e9fa6daecfe..e9fa6daecfe 100644
--- a/pkgs/applications/audio/axoloti/dfu-util.nix
+++ b/nixpkgs/pkgs/applications/audio/axoloti/dfu-util.nix
diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/nixpkgs/pkgs/applications/audio/axoloti/libusb1.nix
index 1a6ebd346cc..1a6ebd346cc 100644
--- a/pkgs/applications/audio/axoloti/libusb1.nix
+++ b/nixpkgs/pkgs/applications/audio/axoloti/libusb1.nix
diff --git a/pkgs/applications/audio/baudline/default.nix b/nixpkgs/pkgs/applications/audio/baudline/default.nix
index c35df95b24c..c35df95b24c 100644
--- a/pkgs/applications/audio/baudline/default.nix
+++ b/nixpkgs/pkgs/applications/audio/baudline/default.nix
diff --git a/pkgs/applications/audio/beast/default.nix b/nixpkgs/pkgs/applications/audio/beast/default.nix
index 29cecb16999..29cecb16999 100644
--- a/pkgs/applications/audio/beast/default.nix
+++ b/nixpkgs/pkgs/applications/audio/beast/default.nix
diff --git a/pkgs/applications/audio/beast/patch.patch b/nixpkgs/pkgs/applications/audio/beast/patch.patch
index 9d9f82cf4b4..9d9f82cf4b4 100644
--- a/pkgs/applications/audio/beast/patch.patch
+++ b/nixpkgs/pkgs/applications/audio/beast/patch.patch
diff --git a/pkgs/applications/audio/bitmeter/default.nix b/nixpkgs/pkgs/applications/audio/bitmeter/default.nix
index 6f471f3a028..6f471f3a028 100644
--- a/pkgs/applications/audio/bitmeter/default.nix
+++ b/nixpkgs/pkgs/applications/audio/bitmeter/default.nix
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
index 83586847190..83586847190 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
+++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix
index 345750e9e2a..345750e9e2a 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix
+++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index 64ee40e038c..64ee40e038c 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
diff --git a/pkgs/applications/audio/bristol/default.nix b/nixpkgs/pkgs/applications/audio/bristol/default.nix
index 504900d6595..504900d6595 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/nixpkgs/pkgs/applications/audio/bristol/default.nix
diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix
index 2dee463aeee..2dee463aeee 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix
diff --git a/pkgs/applications/audio/bsequencer/default.nix b/nixpkgs/pkgs/applications/audio/bsequencer/default.nix
index b91554f5716..b91554f5716 100644
--- a/pkgs/applications/audio/bsequencer/default.nix
+++ b/nixpkgs/pkgs/applications/audio/bsequencer/default.nix
diff --git a/pkgs/applications/audio/bshapr/default.nix b/nixpkgs/pkgs/applications/audio/bshapr/default.nix
index 88a671495c3..88a671495c3 100644
--- a/pkgs/applications/audio/bshapr/default.nix
+++ b/nixpkgs/pkgs/applications/audio/bshapr/default.nix
diff --git a/pkgs/applications/audio/bslizr/default.nix b/nixpkgs/pkgs/applications/audio/bslizr/default.nix
index 97a9d60ec27..97a9d60ec27 100644
--- a/pkgs/applications/audio/bslizr/default.nix
+++ b/nixpkgs/pkgs/applications/audio/bslizr/default.nix
diff --git a/pkgs/applications/audio/cadence/default.nix b/nixpkgs/pkgs/applications/audio/cadence/default.nix
index 52f5a6540e8..52f5a6540e8 100644
--- a/pkgs/applications/audio/cadence/default.nix
+++ b/nixpkgs/pkgs/applications/audio/cadence/default.nix
diff --git a/pkgs/applications/audio/calf/default.nix b/nixpkgs/pkgs/applications/audio/calf/default.nix
index 0106e8b4584..0106e8b4584 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/nixpkgs/pkgs/applications/audio/calf/default.nix
diff --git a/pkgs/applications/audio/cantata/default.nix b/nixpkgs/pkgs/applications/audio/cantata/default.nix
index 876889416da..876889416da 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/nixpkgs/pkgs/applications/audio/cantata/default.nix
diff --git a/pkgs/applications/audio/caps/default.nix b/nixpkgs/pkgs/applications/audio/caps/default.nix
index eabbf866837..eabbf866837 100644
--- a/pkgs/applications/audio/caps/default.nix
+++ b/nixpkgs/pkgs/applications/audio/caps/default.nix
diff --git a/pkgs/applications/audio/carla/default.nix b/nixpkgs/pkgs/applications/audio/carla/default.nix
index 98a4ddd29d6..98a4ddd29d6 100644
--- a/pkgs/applications/audio/carla/default.nix
+++ b/nixpkgs/pkgs/applications/audio/carla/default.nix
diff --git a/pkgs/applications/audio/caudec/default.nix b/nixpkgs/pkgs/applications/audio/caudec/default.nix
index 1ab39311258..1ab39311258 100644
--- a/pkgs/applications/audio/caudec/default.nix
+++ b/nixpkgs/pkgs/applications/audio/caudec/default.nix
diff --git a/pkgs/applications/audio/cava/default.nix b/nixpkgs/pkgs/applications/audio/cava/default.nix
index 5c5c262056e..5c5c262056e 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/nixpkgs/pkgs/applications/audio/cava/default.nix
diff --git a/pkgs/applications/audio/cd-discid/default.nix b/nixpkgs/pkgs/applications/audio/cd-discid/default.nix
index 864e04d88f3..864e04d88f3 100644
--- a/pkgs/applications/audio/cd-discid/default.nix
+++ b/nixpkgs/pkgs/applications/audio/cd-discid/default.nix
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/nixpkgs/pkgs/applications/audio/cdparanoia/default.nix
index 4e517ee636e..4e517ee636e 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/nixpkgs/pkgs/applications/audio/cdparanoia/default.nix
diff --git a/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch b/nixpkgs/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch
index 3e9cbe2bd8c..3e9cbe2bd8c 100644
--- a/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch
+++ b/nixpkgs/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch
diff --git a/pkgs/applications/audio/cdparanoia/utils.patch b/nixpkgs/pkgs/applications/audio/cdparanoia/utils.patch
index 338e5303dcd..338e5303dcd 100644
--- a/pkgs/applications/audio/cdparanoia/utils.patch
+++ b/nixpkgs/pkgs/applications/audio/cdparanoia/utils.patch
diff --git a/pkgs/applications/audio/chuck/darwin-limits.patch b/nixpkgs/pkgs/applications/audio/chuck/darwin-limits.patch
index dc98a172691..dc98a172691 100644
--- a/pkgs/applications/audio/chuck/darwin-limits.patch
+++ b/nixpkgs/pkgs/applications/audio/chuck/darwin-limits.patch
diff --git a/pkgs/applications/audio/chuck/default.nix b/nixpkgs/pkgs/applications/audio/chuck/default.nix
index 04b31ae2c0b..04b31ae2c0b 100644
--- a/pkgs/applications/audio/chuck/default.nix
+++ b/nixpkgs/pkgs/applications/audio/chuck/default.nix
diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch b/nixpkgs/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch
index 226536a13ba..226536a13ba 100644
--- a/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch
+++ b/nixpkgs/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch
diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch b/nixpkgs/pkgs/applications/audio/clementine/clementine-spotify-blob.patch
index 344fc31d70d..344fc31d70d 100644
--- a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch
+++ b/nixpkgs/pkgs/applications/audio/clementine/clementine-spotify-blob.patch
diff --git a/pkgs/applications/audio/clementine/default.nix b/nixpkgs/pkgs/applications/audio/clementine/default.nix
index 3fdf98da325..3fdf98da325 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/nixpkgs/pkgs/applications/audio/clementine/default.nix
diff --git a/pkgs/applications/audio/clerk/default.nix b/nixpkgs/pkgs/applications/audio/clerk/default.nix
index 4da2228c6c1..4da2228c6c1 100644
--- a/pkgs/applications/audio/clerk/default.nix
+++ b/nixpkgs/pkgs/applications/audio/clerk/default.nix
diff --git a/pkgs/applications/audio/cmus/default.nix b/nixpkgs/pkgs/applications/audio/cmus/default.nix
index 023e35bd787..023e35bd787 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/nixpkgs/pkgs/applications/audio/cmus/default.nix
diff --git a/pkgs/applications/audio/cmus/option-debugging.patch b/nixpkgs/pkgs/applications/audio/cmus/option-debugging.patch
index 84115e1480e..84115e1480e 100644
--- a/pkgs/applications/audio/cmus/option-debugging.patch
+++ b/nixpkgs/pkgs/applications/audio/cmus/option-debugging.patch
diff --git a/pkgs/applications/audio/cmusfm/default.nix b/nixpkgs/pkgs/applications/audio/cmusfm/default.nix
index 54f1050da46..54f1050da46 100644
--- a/pkgs/applications/audio/cmusfm/default.nix
+++ b/nixpkgs/pkgs/applications/audio/cmusfm/default.nix
diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix
index 865bc130db9..865bc130db9 100644
--- a/pkgs/applications/audio/cozy-audiobooks/default.nix
+++ b/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix
diff --git a/pkgs/applications/audio/crip/default.nix b/nixpkgs/pkgs/applications/audio/crip/default.nix
index f7bf919c221..f7bf919c221 100644
--- a/pkgs/applications/audio/crip/default.nix
+++ b/nixpkgs/pkgs/applications/audio/crip/default.nix
diff --git a/pkgs/applications/audio/csa/default.nix b/nixpkgs/pkgs/applications/audio/csa/default.nix
index 0b8afada020..0b8afada020 100644
--- a/pkgs/applications/audio/csa/default.nix
+++ b/nixpkgs/pkgs/applications/audio/csa/default.nix
diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix
index 5cc8d71383b..5cc8d71383b 100644
--- a/pkgs/applications/audio/csound/csound-manual/default.nix
+++ b/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix
diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix
index d16d9331821..d16d9331821 100644
--- a/pkgs/applications/audio/csound/csound-qt/default.nix
+++ b/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix
diff --git a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch b/nixpkgs/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch
index 4cbab8a128f..4cbab8a128f 100644
--- a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch
+++ b/nixpkgs/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch
diff --git a/pkgs/applications/audio/csound/default.nix b/nixpkgs/pkgs/applications/audio/csound/default.nix
index 758448c2fb3..758448c2fb3 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/nixpkgs/pkgs/applications/audio/csound/default.nix
diff --git a/pkgs/applications/audio/curseradio/default.nix b/nixpkgs/pkgs/applications/audio/curseradio/default.nix
index 1dd5f9ee5eb..1dd5f9ee5eb 100644
--- a/pkgs/applications/audio/curseradio/default.nix
+++ b/nixpkgs/pkgs/applications/audio/curseradio/default.nix
diff --git a/pkgs/applications/audio/curseradio/mpv.patch b/nixpkgs/pkgs/applications/audio/curseradio/mpv.patch
index d085dc79109..d085dc79109 100644
--- a/pkgs/applications/audio/curseradio/mpv.patch
+++ b/nixpkgs/pkgs/applications/audio/curseradio/mpv.patch
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/nixpkgs/pkgs/applications/audio/deadbeef/default.nix
index a6ca5b3639d..a6ca5b3639d 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/nixpkgs/pkgs/applications/audio/deadbeef/default.nix
diff --git a/pkgs/applications/audio/deadbeef/fix-wildmidi.patch b/nixpkgs/pkgs/applications/audio/deadbeef/fix-wildmidi.patch
index c37308459bb..c37308459bb 100644
--- a/pkgs/applications/audio/deadbeef/fix-wildmidi.patch
+++ b/nixpkgs/pkgs/applications/audio/deadbeef/fix-wildmidi.patch
diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
index b26360f0c46..b26360f0c46 100644
--- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
+++ b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/infobar.nix
index 8a81101983f..8a81101983f 100644
--- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix
+++ b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/infobar.nix
diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
index 699f9d86f68..699f9d86f68 100644
--- a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
+++ b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
index 5b27f3c3f32..5b27f3c3f32 100644
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/nixpkgs/pkgs/applications/audio/deadbeef/wrapper.nix
index cd45ef5926b..cd45ef5926b 100644
--- a/pkgs/applications/audio/deadbeef/wrapper.nix
+++ b/nixpkgs/pkgs/applications/audio/deadbeef/wrapper.nix
diff --git a/pkgs/applications/audio/denemo/default.nix b/nixpkgs/pkgs/applications/audio/denemo/default.nix
index f3adec4fece..f3adec4fece 100644
--- a/pkgs/applications/audio/denemo/default.nix
+++ b/nixpkgs/pkgs/applications/audio/denemo/default.nix
diff --git a/pkgs/applications/audio/dfasma/default.nix b/nixpkgs/pkgs/applications/audio/dfasma/default.nix
index 1785ca60060..1785ca60060 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/nixpkgs/pkgs/applications/audio/dfasma/default.nix
diff --git a/pkgs/applications/audio/dirt/default.nix b/nixpkgs/pkgs/applications/audio/dirt/default.nix
index 1fcdda40896..1fcdda40896 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/nixpkgs/pkgs/applications/audio/dirt/default.nix
diff --git a/pkgs/applications/audio/distrho/default.nix b/nixpkgs/pkgs/applications/audio/distrho/default.nix
index 53d5330fb74..53d5330fb74 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/nixpkgs/pkgs/applications/audio/distrho/default.nix
diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix
index ea0ce8cb5f3..ea0ce8cb5f3 100644
--- a/pkgs/applications/audio/dr14_tmeter/default.nix
+++ b/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix
diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix
index da915f3fc3e..da915f3fc3e 100644
--- a/pkgs/applications/audio/dragonfly-reverb/default.nix
+++ b/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix
index 2581f223c91..2581f223c91 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/nixpkgs/pkgs/applications/audio/drumkv1/default.nix
index b926ff09d22..b926ff09d22 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/nixpkgs/pkgs/applications/audio/drumkv1/default.nix
diff --git a/pkgs/applications/audio/easytag/default.nix b/nixpkgs/pkgs/applications/audio/easytag/default.nix
index 4c2b97e727f..4c2b97e727f 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/nixpkgs/pkgs/applications/audio/easytag/default.nix
diff --git a/pkgs/applications/audio/ecasound/default.nix b/nixpkgs/pkgs/applications/audio/ecasound/default.nix
index c17f6b745b3..c17f6b745b3 100644
--- a/pkgs/applications/audio/ecasound/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ecasound/default.nix
diff --git a/pkgs/applications/audio/eflite/default.nix b/nixpkgs/pkgs/applications/audio/eflite/default.nix
index 2338c0ed376..2338c0ed376 100644
--- a/pkgs/applications/audio/eflite/default.nix
+++ b/nixpkgs/pkgs/applications/audio/eflite/default.nix
diff --git a/pkgs/applications/audio/eflite/format.patch b/nixpkgs/pkgs/applications/audio/eflite/format.patch
index d1a81aac480..d1a81aac480 100644
--- a/pkgs/applications/audio/eflite/format.patch
+++ b/nixpkgs/pkgs/applications/audio/eflite/format.patch
diff --git a/pkgs/applications/audio/ekho/default.nix b/nixpkgs/pkgs/applications/audio/ekho/default.nix
index 0e2c950051a..0e2c950051a 100644
--- a/pkgs/applications/audio/ekho/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ekho/default.nix
diff --git a/pkgs/applications/audio/elisa/default.nix b/nixpkgs/pkgs/applications/audio/elisa/default.nix
index fdfca08c0b0..fdfca08c0b0 100644
--- a/pkgs/applications/audio/elisa/default.nix
+++ b/nixpkgs/pkgs/applications/audio/elisa/default.nix
diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/nixpkgs/pkgs/applications/audio/ensemble-chorus/default.nix
index 5940203d04d..5940203d04d 100644
--- a/pkgs/applications/audio/ensemble-chorus/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ensemble-chorus/default.nix
diff --git a/pkgs/applications/audio/eq10q/default.nix b/nixpkgs/pkgs/applications/audio/eq10q/default.nix
index b4ad1505320..b4ad1505320 100644
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/nixpkgs/pkgs/applications/audio/eq10q/default.nix
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix
index 32cec811d00..32cec811d00 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix
diff --git a/pkgs/applications/audio/espeak/default.nix b/nixpkgs/pkgs/applications/audio/espeak/default.nix
index 6b5101b50b5..6b5101b50b5 100644
--- a/pkgs/applications/audio/espeak/default.nix
+++ b/nixpkgs/pkgs/applications/audio/espeak/default.nix
diff --git a/pkgs/applications/audio/espeak/edit.nix b/nixpkgs/pkgs/applications/audio/espeak/edit.nix
index 8d7db50fd32..8d7db50fd32 100644
--- a/pkgs/applications/audio/espeak/edit.nix
+++ b/nixpkgs/pkgs/applications/audio/espeak/edit.nix
diff --git a/pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch b/nixpkgs/pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch
index e5c761a11b3..e5c761a11b3 100644
--- a/pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch
+++ b/nixpkgs/pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch
diff --git a/pkgs/applications/audio/espeak/espeakedit-configurable-sox-path.patch b/nixpkgs/pkgs/applications/audio/espeak/espeakedit-configurable-sox-path.patch
index 1c5dfc21941..1c5dfc21941 100644
--- a/pkgs/applications/audio/espeak/espeakedit-configurable-sox-path.patch
+++ b/nixpkgs/pkgs/applications/audio/espeak/espeakedit-configurable-sox-path.patch
diff --git a/pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch b/nixpkgs/pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch
index 9f8a65d2b0c..9f8a65d2b0c 100644
--- a/pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch
+++ b/nixpkgs/pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch
diff --git a/pkgs/applications/audio/espeak/espeakedit-gcc6.patch b/nixpkgs/pkgs/applications/audio/espeak/espeakedit-gcc6.patch
index 1e0cb20bbf7..1e0cb20bbf7 100644
--- a/pkgs/applications/audio/espeak/espeakedit-gcc6.patch
+++ b/nixpkgs/pkgs/applications/audio/espeak/espeakedit-gcc6.patch
diff --git a/pkgs/applications/audio/espeak/gcc6.patch b/nixpkgs/pkgs/applications/audio/espeak/gcc6.patch
index 58036ecbe50..58036ecbe50 100644
--- a/pkgs/applications/audio/espeak/gcc6.patch
+++ b/nixpkgs/pkgs/applications/audio/espeak/gcc6.patch
diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/nixpkgs/pkgs/applications/audio/eteroj.lv2/default.nix
index bbfe1ad5623..bbfe1ad5623 100644
--- a/pkgs/applications/audio/eteroj.lv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/eteroj.lv2/default.nix
diff --git a/pkgs/applications/audio/faust/faust1.nix b/nixpkgs/pkgs/applications/audio/faust/faust1.nix
index 687608b4352..687608b4352 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faust1.nix
diff --git a/pkgs/applications/audio/faust/faust2.nix b/nixpkgs/pkgs/applications/audio/faust/faust2.nix
index 21cd3fbdb25..21cd3fbdb25 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faust2.nix
diff --git a/pkgs/applications/audio/faust/faust2alqt.nix b/nixpkgs/pkgs/applications/audio/faust/faust2alqt.nix
index 8ac26e488b3..8ac26e488b3 100644
--- a/pkgs/applications/audio/faust/faust2alqt.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faust2alqt.nix
diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/nixpkgs/pkgs/applications/audio/faust/faust2alsa.nix
index 6af5af9bbaf..6af5af9bbaf 100644
--- a/pkgs/applications/audio/faust/faust2alsa.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faust2alsa.nix
diff --git a/pkgs/applications/audio/faust/faust2csound.nix b/nixpkgs/pkgs/applications/audio/faust/faust2csound.nix
index eb5e5831cdd..eb5e5831cdd 100644
--- a/pkgs/applications/audio/faust/faust2csound.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faust2csound.nix
diff --git a/pkgs/applications/audio/faust/faust2firefox.nix b/nixpkgs/pkgs/applications/audio/faust/faust2firefox.nix
index b2cc6f46457..b2cc6f46457 100644
--- a/pkgs/applications/audio/faust/faust2firefox.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faust2firefox.nix
diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix
index 7762ca39369..7762ca39369 100644
--- a/pkgs/applications/audio/faust/faust2jack.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix
diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix
index 5a015e5ca31..5a015e5ca31 100644
--- a/pkgs/applications/audio/faust/faust2jaqt.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix
diff --git a/pkgs/applications/audio/faust/faust2ladspa.nix b/nixpkgs/pkgs/applications/audio/faust/faust2ladspa.nix
index 67de98cab9a..67de98cab9a 100644
--- a/pkgs/applications/audio/faust/faust2ladspa.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faust2ladspa.nix
diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/nixpkgs/pkgs/applications/audio/faust/faust2lv2.nix
index 3472ce5047e..3472ce5047e 100644
--- a/pkgs/applications/audio/faust/faust2lv2.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faust2lv2.nix
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/nixpkgs/pkgs/applications/audio/faust/faustlive.nix
index 3b6ca9e4053..3b6ca9e4053 100644
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faustlive.nix
diff --git a/pkgs/applications/audio/flac/default.nix b/nixpkgs/pkgs/applications/audio/flac/default.nix
index df3aa987c3f..df3aa987c3f 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/nixpkgs/pkgs/applications/audio/flac/default.nix
diff --git a/pkgs/applications/audio/flac123/default.nix b/nixpkgs/pkgs/applications/audio/flac123/default.nix
index 19ed2352355..19ed2352355 100644
--- a/pkgs/applications/audio/flac123/default.nix
+++ b/nixpkgs/pkgs/applications/audio/flac123/default.nix
diff --git a/pkgs/applications/audio/flacon/default.nix b/nixpkgs/pkgs/applications/audio/flacon/default.nix
index eb39309a254..eb39309a254 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/nixpkgs/pkgs/applications/audio/flacon/default.nix
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix
index 8e2895bf847..8e2895bf847 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix
diff --git a/pkgs/applications/audio/fmit/default.nix b/nixpkgs/pkgs/applications/audio/fmit/default.nix
index ee45217e490..ee45217e490 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/nixpkgs/pkgs/applications/audio/fmit/default.nix
diff --git a/pkgs/applications/audio/fmsynth/default.nix b/nixpkgs/pkgs/applications/audio/fmsynth/default.nix
index 248967e06e6..248967e06e6 100644
--- a/pkgs/applications/audio/fmsynth/default.nix
+++ b/nixpkgs/pkgs/applications/audio/fmsynth/default.nix
diff --git a/pkgs/applications/audio/fomp/default.nix b/nixpkgs/pkgs/applications/audio/fomp/default.nix
index a92d331baad..a92d331baad 100644
--- a/pkgs/applications/audio/fomp/default.nix
+++ b/nixpkgs/pkgs/applications/audio/fomp/default.nix
diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix
index e514032f44e..e514032f44e 100644
--- a/pkgs/applications/audio/foo-yc20/default.nix
+++ b/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/nixpkgs/pkgs/applications/audio/freewheeling/default.nix
index 34494871f29..34494871f29 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/nixpkgs/pkgs/applications/audio/freewheeling/default.nix
diff --git a/pkgs/applications/audio/friture/default.nix b/nixpkgs/pkgs/applications/audio/friture/default.nix
index eae4b651685..eae4b651685 100644
--- a/pkgs/applications/audio/friture/default.nix
+++ b/nixpkgs/pkgs/applications/audio/friture/default.nix
diff --git a/pkgs/applications/audio/friture/factorial.patch b/nixpkgs/pkgs/applications/audio/friture/factorial.patch
index de053802932..de053802932 100644
--- a/pkgs/applications/audio/friture/factorial.patch
+++ b/nixpkgs/pkgs/applications/audio/friture/factorial.patch
diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/nixpkgs/pkgs/applications/audio/game-music-emu/default.nix
index d95b3eea596..d95b3eea596 100644
--- a/pkgs/applications/audio/game-music-emu/default.nix
+++ b/nixpkgs/pkgs/applications/audio/game-music-emu/default.nix
diff --git a/pkgs/applications/audio/gbsplay/default.nix b/nixpkgs/pkgs/applications/audio/gbsplay/default.nix
index 9ff9b8dc114..9ff9b8dc114 100644
--- a/pkgs/applications/audio/gbsplay/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gbsplay/default.nix
diff --git a/pkgs/applications/audio/giada/default.nix b/nixpkgs/pkgs/applications/audio/giada/default.nix
index eff1d6411a1..eff1d6411a1 100644
--- a/pkgs/applications/audio/giada/default.nix
+++ b/nixpkgs/pkgs/applications/audio/giada/default.nix
diff --git a/pkgs/applications/audio/gigedit/default.nix b/nixpkgs/pkgs/applications/audio/gigedit/default.nix
index b8ec2d7116f..b8ec2d7116f 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gigedit/default.nix
diff --git a/pkgs/applications/audio/gjay/default.nix b/nixpkgs/pkgs/applications/audio/gjay/default.nix
index 42285ba4bf8..42285ba4bf8 100644
--- a/pkgs/applications/audio/gjay/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gjay/default.nix
diff --git a/pkgs/applications/audio/gmpc/default.nix b/nixpkgs/pkgs/applications/audio/gmpc/default.nix
index cae35b62519..cae35b62519 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gmpc/default.nix
diff --git a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch b/nixpkgs/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch
index ad4fdc02ef3..ad4fdc02ef3 100644
--- a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch
+++ b/nixpkgs/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch
diff --git a/pkgs/applications/audio/gmu/default.nix b/nixpkgs/pkgs/applications/audio/gmu/default.nix
index 8446855d190..8446855d190 100644
--- a/pkgs/applications/audio/gmu/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gmu/default.nix
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
index 7a44ebe6769..7a44ebe6769 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/nixpkgs/pkgs/applications/audio/google-musicmanager/default.nix
index b4fe78dcbfc..b4fe78dcbfc 100644
--- a/pkgs/applications/audio/google-musicmanager/default.nix
+++ b/nixpkgs/pkgs/applications/audio/google-musicmanager/default.nix
diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index b51b72f1c8a..b51b72f1c8a 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix
diff --git a/pkgs/applications/audio/gpodder/default.nix b/nixpkgs/pkgs/applications/audio/gpodder/default.nix
index 1d6bc33cc55..1d6bc33cc55 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gpodder/default.nix
diff --git a/pkgs/applications/audio/gpodder/disable-autoupdate.patch b/nixpkgs/pkgs/applications/audio/gpodder/disable-autoupdate.patch
index 8f77518d03e..8f77518d03e 100644
--- a/pkgs/applications/audio/gpodder/disable-autoupdate.patch
+++ b/nixpkgs/pkgs/applications/audio/gpodder/disable-autoupdate.patch
diff --git a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch b/nixpkgs/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
index 3a6296baaa6..3a6296baaa6 100644
--- a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
+++ b/nixpkgs/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
diff --git a/pkgs/applications/audio/gradio/default.nix b/nixpkgs/pkgs/applications/audio/gradio/default.nix
index 487b0a730d8..487b0a730d8 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gradio/default.nix
diff --git a/pkgs/applications/audio/greg/default.nix b/nixpkgs/pkgs/applications/audio/greg/default.nix
index e027680f5fe..e027680f5fe 100644
--- a/pkgs/applications/audio/greg/default.nix
+++ b/nixpkgs/pkgs/applications/audio/greg/default.nix
diff --git a/pkgs/applications/audio/gtklick/default.nix b/nixpkgs/pkgs/applications/audio/gtklick/default.nix
index b653ae5ca58..b653ae5ca58 100644
--- a/pkgs/applications/audio/gtklick/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gtklick/default.nix
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/nixpkgs/pkgs/applications/audio/gtkpod/default.nix
index fd3632ee155..fd3632ee155 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gtkpod/default.nix
diff --git a/pkgs/applications/audio/guitarix/default.nix b/nixpkgs/pkgs/applications/audio/guitarix/default.nix
index ca552882ba4..ca552882ba4 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/nixpkgs/pkgs/applications/audio/guitarix/default.nix
diff --git a/pkgs/applications/audio/gxmatcheq-lv2/default.nix b/nixpkgs/pkgs/applications/audio/gxmatcheq-lv2/default.nix
index 1d5579d74c0..1d5579d74c0 100644
--- a/pkgs/applications/audio/gxmatcheq-lv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gxmatcheq-lv2/default.nix
diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix
index 1f4323eb9d5..1f4323eb9d5 100644
--- a/pkgs/applications/audio/gxplugins-lv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix
diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix
index bfd211316a7..bfd211316a7 100644
--- a/pkgs/applications/audio/helio-workstation/default.nix
+++ b/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix
diff --git a/pkgs/applications/audio/helm/default.nix b/nixpkgs/pkgs/applications/audio/helm/default.nix
index 428490e119a..428490e119a 100644
--- a/pkgs/applications/audio/helm/default.nix
+++ b/nixpkgs/pkgs/applications/audio/helm/default.nix
diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix
index 19aac1bd1e9..19aac1bd1e9 100644
--- a/pkgs/applications/audio/hybridreverb2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/nixpkgs/pkgs/applications/audio/hydrogen/default.nix
index 50093f8a61d..50093f8a61d 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/nixpkgs/pkgs/applications/audio/hydrogen/default.nix
diff --git a/pkgs/applications/audio/i-score/default.nix b/nixpkgs/pkgs/applications/audio/i-score/default.nix
index f3928499413..f3928499413 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/nixpkgs/pkgs/applications/audio/i-score/default.nix
diff --git a/pkgs/applications/audio/iannix/default.nix b/nixpkgs/pkgs/applications/audio/iannix/default.nix
index a893390d74e..a893390d74e 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/nixpkgs/pkgs/applications/audio/iannix/default.nix
diff --git a/pkgs/applications/audio/id3v2/default.nix b/nixpkgs/pkgs/applications/audio/id3v2/default.nix
index 0fdb3b2a4a1..0fdb3b2a4a1 100644
--- a/pkgs/applications/audio/id3v2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/id3v2/default.nix
diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/nixpkgs/pkgs/applications/audio/infamousPlugins/default.nix
index 341c4181842..341c4181842 100644
--- a/pkgs/applications/audio/infamousPlugins/default.nix
+++ b/nixpkgs/pkgs/applications/audio/infamousPlugins/default.nix
diff --git a/pkgs/applications/audio/ingen/default.nix b/nixpkgs/pkgs/applications/audio/ingen/default.nix
index 9d3fb6aae40..9d3fb6aae40 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ingen/default.nix
diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/nixpkgs/pkgs/applications/audio/ir.lv2/default.nix
index 9d3656a81f9..9d3656a81f9 100644
--- a/pkgs/applications/audio/ir.lv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ir.lv2/default.nix
diff --git a/pkgs/applications/audio/jaaa/default.nix b/nixpkgs/pkgs/applications/audio/jaaa/default.nix
index 92b2f8ac515..92b2f8ac515 100644
--- a/pkgs/applications/audio/jaaa/default.nix
+++ b/nixpkgs/pkgs/applications/audio/jaaa/default.nix
diff --git a/pkgs/applications/audio/jack-capture/default.nix b/nixpkgs/pkgs/applications/audio/jack-capture/default.nix
index c62ccc4fc88..c62ccc4fc88 100644
--- a/pkgs/applications/audio/jack-capture/default.nix
+++ b/nixpkgs/pkgs/applications/audio/jack-capture/default.nix
diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/nixpkgs/pkgs/applications/audio/jack-oscrolloscope/default.nix
index 5bad5453504..5bad5453504 100644
--- a/pkgs/applications/audio/jack-oscrolloscope/default.nix
+++ b/nixpkgs/pkgs/applications/audio/jack-oscrolloscope/default.nix
diff --git a/pkgs/applications/audio/jack-rack/default.nix b/nixpkgs/pkgs/applications/audio/jack-rack/default.nix
index 41b40223b87..41b40223b87 100644
--- a/pkgs/applications/audio/jack-rack/default.nix
+++ b/nixpkgs/pkgs/applications/audio/jack-rack/default.nix
diff --git a/pkgs/applications/audio/jackmeter/default.nix b/nixpkgs/pkgs/applications/audio/jackmeter/default.nix
index e44dfddd37b..e44dfddd37b 100644
--- a/pkgs/applications/audio/jackmeter/default.nix
+++ b/nixpkgs/pkgs/applications/audio/jackmeter/default.nix
diff --git a/pkgs/applications/audio/jackmix/default.nix b/nixpkgs/pkgs/applications/audio/jackmix/default.nix
index fe7c83dd56f..fe7c83dd56f 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/nixpkgs/pkgs/applications/audio/jackmix/default.nix
diff --git a/pkgs/applications/audio/jackmix/no_error.patch b/nixpkgs/pkgs/applications/audio/jackmix/no_error.patch
index d1a714ded9c..d1a714ded9c 100644
--- a/pkgs/applications/audio/jackmix/no_error.patch
+++ b/nixpkgs/pkgs/applications/audio/jackmix/no_error.patch
diff --git a/pkgs/applications/audio/jalv/default.nix b/nixpkgs/pkgs/applications/audio/jalv/default.nix
index 51ec102dbfd..51ec102dbfd 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/nixpkgs/pkgs/applications/audio/jalv/default.nix
diff --git a/pkgs/applications/audio/jamin/default.nix b/nixpkgs/pkgs/applications/audio/jamin/default.nix
index 818630585cf..818630585cf 100644
--- a/pkgs/applications/audio/jamin/default.nix
+++ b/nixpkgs/pkgs/applications/audio/jamin/default.nix
diff --git a/pkgs/applications/audio/japa/default.nix b/nixpkgs/pkgs/applications/audio/japa/default.nix
index a9eb15aabf3..a9eb15aabf3 100644
--- a/pkgs/applications/audio/japa/default.nix
+++ b/nixpkgs/pkgs/applications/audio/japa/default.nix
diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix
index 4bb1d63a1e7..4bb1d63a1e7 100644
--- a/pkgs/applications/audio/keyfinder-cli/default.nix
+++ b/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/nixpkgs/pkgs/applications/audio/keyfinder/default.nix
index d47fc3b6190..d47fc3b6190 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/nixpkgs/pkgs/applications/audio/keyfinder/default.nix
diff --git a/pkgs/applications/audio/kid3/default.nix b/nixpkgs/pkgs/applications/audio/kid3/default.nix
index 5571b12f3ef..5571b12f3ef 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/nixpkgs/pkgs/applications/audio/kid3/default.nix
diff --git a/pkgs/applications/audio/klick/default.nix b/nixpkgs/pkgs/applications/audio/klick/default.nix
index f33245d8f1c..f33245d8f1c 100644
--- a/pkgs/applications/audio/klick/default.nix
+++ b/nixpkgs/pkgs/applications/audio/klick/default.nix
diff --git a/pkgs/applications/audio/klystrack/default.nix b/nixpkgs/pkgs/applications/audio/klystrack/default.nix
index 5e8dc060c28..5e8dc060c28 100644
--- a/pkgs/applications/audio/klystrack/default.nix
+++ b/nixpkgs/pkgs/applications/audio/klystrack/default.nix
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/nixpkgs/pkgs/applications/audio/ladspa-plugins/default.nix
index 44186abc3c4..44186abc3c4 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ladspa-plugins/default.nix
diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/nixpkgs/pkgs/applications/audio/ladspa-sdk/default.nix
index a7779ee8aee..a7779ee8aee 100644
--- a/pkgs/applications/audio/ladspa-sdk/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ladspa-sdk/default.nix
diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/nixpkgs/pkgs/applications/audio/ladspa-sdk/ladspah.nix
index 3fad5de1de5..3fad5de1de5 100644
--- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix
+++ b/nixpkgs/pkgs/applications/audio/ladspa-sdk/ladspah.nix
diff --git a/pkgs/applications/audio/lash/default.nix b/nixpkgs/pkgs/applications/audio/lash/default.nix
index 0dbe60b6a61..0dbe60b6a61 100644
--- a/pkgs/applications/audio/lash/default.nix
+++ b/nixpkgs/pkgs/applications/audio/lash/default.nix
diff --git a/pkgs/applications/audio/lash/gcc-47.patch b/nixpkgs/pkgs/applications/audio/lash/gcc-47.patch
index 774add431fa..774add431fa 100644
--- a/pkgs/applications/audio/lash/gcc-47.patch
+++ b/nixpkgs/pkgs/applications/audio/lash/gcc-47.patch
diff --git a/pkgs/applications/audio/lash/socket.patch b/nixpkgs/pkgs/applications/audio/lash/socket.patch
index c2825921444..c2825921444 100644
--- a/pkgs/applications/audio/lash/socket.patch
+++ b/nixpkgs/pkgs/applications/audio/lash/socket.patch
diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/nixpkgs/pkgs/applications/audio/lastfmsubmitd/default.nix
index 3135a00334c..3135a00334c 100644
--- a/pkgs/applications/audio/lastfmsubmitd/default.nix
+++ b/nixpkgs/pkgs/applications/audio/lastfmsubmitd/default.nix
diff --git a/pkgs/applications/audio/lingot/default.nix b/nixpkgs/pkgs/applications/audio/lingot/default.nix
index d2ec92e0654..d2ec92e0654 100644
--- a/pkgs/applications/audio/lingot/default.nix
+++ b/nixpkgs/pkgs/applications/audio/lingot/default.nix
diff --git a/pkgs/applications/audio/linuxband/default.nix b/nixpkgs/pkgs/applications/audio/linuxband/default.nix
index b5a99150cb2..b5a99150cb2 100644
--- a/pkgs/applications/audio/linuxband/default.nix
+++ b/nixpkgs/pkgs/applications/audio/linuxband/default.nix
diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/nixpkgs/pkgs/applications/audio/linuxsampler/default.nix
index f13f10d15e8..f13f10d15e8 100644
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/nixpkgs/pkgs/applications/audio/linuxsampler/default.nix
diff --git a/pkgs/applications/audio/lmms/default.nix b/nixpkgs/pkgs/applications/audio/lmms/default.nix
index 99503fc3942..99503fc3942 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/nixpkgs/pkgs/applications/audio/lmms/default.nix
diff --git a/pkgs/applications/audio/lollypop/default.nix b/nixpkgs/pkgs/applications/audio/lollypop/default.nix
index 2d2062696d7..2d2062696d7 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/nixpkgs/pkgs/applications/audio/lollypop/default.nix
diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix
index b146fcecc8e..b146fcecc8e 100644
--- a/pkgs/applications/audio/lsp-plugins/default.nix
+++ b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix
diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/nixpkgs/pkgs/applications/audio/ltc-tools/default.nix
index c986e3af288..c986e3af288 100644
--- a/pkgs/applications/audio/ltc-tools/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ltc-tools/default.nix
diff --git a/pkgs/applications/audio/luppp/build-install.patch b/nixpkgs/pkgs/applications/audio/luppp/build-install.patch
index 4dae65438cb..4dae65438cb 100644
--- a/pkgs/applications/audio/luppp/build-install.patch
+++ b/nixpkgs/pkgs/applications/audio/luppp/build-install.patch
diff --git a/pkgs/applications/audio/luppp/default.nix b/nixpkgs/pkgs/applications/audio/luppp/default.nix
index fdba836a6ae..fdba836a6ae 100644
--- a/pkgs/applications/audio/luppp/default.nix
+++ b/nixpkgs/pkgs/applications/audio/luppp/default.nix
diff --git a/pkgs/applications/audio/lv2bm/default.nix b/nixpkgs/pkgs/applications/audio/lv2bm/default.nix
index f1eddb62624..f1eddb62624 100644
--- a/pkgs/applications/audio/lv2bm/default.nix
+++ b/nixpkgs/pkgs/applications/audio/lv2bm/default.nix
diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
index 6488d1bd65e..6488d1bd65e 100644
--- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
+++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
index c5728b6e8b7..c5728b6e8b7 100644
--- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
+++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
index 331e58c4bd2..331e58c4bd2 100644
--- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
+++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
index 046ee70e990..046ee70e990 100644
--- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
+++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
index aa7da17dafd..aa7da17dafd 100644
--- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
+++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
index ae05866e57d..ae05866e57d 100644
--- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
+++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index 718bbdaf49e..718bbdaf49e 100644
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
index fece392ab1c..fece392ab1c 100644
--- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
+++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
index 356e95bf97c..356e95bf97c 100644
--- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
+++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
index 292cd3dfd86..292cd3dfd86 100644
--- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
+++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix
index 6c4170cf0fb..6c4170cf0fb 100644
--- a/pkgs/applications/audio/mda-lv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix
diff --git a/pkgs/applications/audio/meterbridge/buf_rect.patch b/nixpkgs/pkgs/applications/audio/meterbridge/buf_rect.patch
index f108b80c101..f108b80c101 100644
--- a/pkgs/applications/audio/meterbridge/buf_rect.patch
+++ b/nixpkgs/pkgs/applications/audio/meterbridge/buf_rect.patch
diff --git a/pkgs/applications/audio/meterbridge/default.nix b/nixpkgs/pkgs/applications/audio/meterbridge/default.nix
index 4d2fa0e15b4..4d2fa0e15b4 100644
--- a/pkgs/applications/audio/meterbridge/default.nix
+++ b/nixpkgs/pkgs/applications/audio/meterbridge/default.nix
diff --git a/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch b/nixpkgs/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch
index a738cd0b82a..a738cd0b82a 100644
--- a/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch
+++ b/nixpkgs/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch
diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/nixpkgs/pkgs/applications/audio/meters_lv2/default.nix
index 12383dcbbda..12383dcbbda 100644
--- a/pkgs/applications/audio/meters_lv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/meters_lv2/default.nix
diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/nixpkgs/pkgs/applications/audio/mhwaveedit/default.nix
index e4d6c0293df..e4d6c0293df 100644
--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mhwaveedit/default.nix
diff --git a/pkgs/applications/audio/mi2ly/default.nix b/nixpkgs/pkgs/applications/audio/mi2ly/default.nix
index 58c1690a9bb..58c1690a9bb 100644
--- a/pkgs/applications/audio/mi2ly/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mi2ly/default.nix
diff --git a/pkgs/applications/audio/mi2ly/default.upstream b/nixpkgs/pkgs/applications/audio/mi2ly/default.upstream
index 0b2607989aa..0b2607989aa 100644
--- a/pkgs/applications/audio/mi2ly/default.upstream
+++ b/nixpkgs/pkgs/applications/audio/mi2ly/default.upstream
diff --git a/pkgs/applications/audio/mid2key/default.nix b/nixpkgs/pkgs/applications/audio/mid2key/default.nix
index 3c5660724d3..3c5660724d3 100644
--- a/pkgs/applications/audio/mid2key/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mid2key/default.nix
diff --git a/pkgs/applications/audio/midas/generic.nix b/nixpkgs/pkgs/applications/audio/midas/generic.nix
index 293d1b0b6c8..293d1b0b6c8 100644
--- a/pkgs/applications/audio/midas/generic.nix
+++ b/nixpkgs/pkgs/applications/audio/midas/generic.nix
diff --git a/pkgs/applications/audio/midas/m32edit.nix b/nixpkgs/pkgs/applications/audio/midas/m32edit.nix
index c8a751c235b..c8a751c235b 100644
--- a/pkgs/applications/audio/midas/m32edit.nix
+++ b/nixpkgs/pkgs/applications/audio/midas/m32edit.nix
diff --git a/pkgs/applications/audio/midas/x32edit.nix b/nixpkgs/pkgs/applications/audio/midas/x32edit.nix
index 4aacfcc89a3..4aacfcc89a3 100644
--- a/pkgs/applications/audio/midas/x32edit.nix
+++ b/nixpkgs/pkgs/applications/audio/midas/x32edit.nix
diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix
index 48052fc4ec8..48052fc4ec8 100644
--- a/pkgs/applications/audio/midisheetmusic/default.nix
+++ b/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix
diff --git a/pkgs/applications/audio/mikmod/default.nix b/nixpkgs/pkgs/applications/audio/mikmod/default.nix
index 42fa8b7621a..42fa8b7621a 100644
--- a/pkgs/applications/audio/mikmod/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mikmod/default.nix
diff --git a/pkgs/applications/audio/milkytracker/default.nix b/nixpkgs/pkgs/applications/audio/milkytracker/default.nix
index 7f86e2c2071..7f86e2c2071 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/nixpkgs/pkgs/applications/audio/milkytracker/default.nix
diff --git a/pkgs/applications/audio/mimic/default.nix b/nixpkgs/pkgs/applications/audio/mimic/default.nix
index e91b2c9360d..e91b2c9360d 100644
--- a/pkgs/applications/audio/mimic/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mimic/default.nix
diff --git a/pkgs/applications/audio/mimms/default.nix b/nixpkgs/pkgs/applications/audio/mimms/default.nix
index 2d301a8b6a9..2d301a8b6a9 100644
--- a/pkgs/applications/audio/mimms/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mimms/default.nix
diff --git a/pkgs/applications/audio/mixxx/default.nix b/nixpkgs/pkgs/applications/audio/mixxx/default.nix
index 82db91dcb07..82db91dcb07 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mixxx/default.nix
diff --git a/pkgs/applications/audio/moc/default.nix b/nixpkgs/pkgs/applications/audio/moc/default.nix
index 5615f4cace3..5615f4cace3 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/nixpkgs/pkgs/applications/audio/moc/default.nix
diff --git a/pkgs/applications/audio/moc/moc-ffmpeg4.patch b/nixpkgs/pkgs/applications/audio/moc/moc-ffmpeg4.patch
index 7499f9c539b..7499f9c539b 100644
--- a/pkgs/applications/audio/moc/moc-ffmpeg4.patch
+++ b/nixpkgs/pkgs/applications/audio/moc/moc-ffmpeg4.patch
diff --git a/pkgs/applications/audio/moc/pulseaudio.patch b/nixpkgs/pkgs/applications/audio/moc/pulseaudio.patch
index 37d81dddf2b..37d81dddf2b 100644
--- a/pkgs/applications/audio/moc/pulseaudio.patch
+++ b/nixpkgs/pkgs/applications/audio/moc/pulseaudio.patch
diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/nixpkgs/pkgs/applications/audio/mod-distortion/default.nix
index c20f04ec947..c20f04ec947 100644
--- a/pkgs/applications/audio/mod-distortion/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mod-distortion/default.nix
diff --git a/pkgs/applications/audio/monkeys-audio/buildfix.diff b/nixpkgs/pkgs/applications/audio/monkeys-audio/buildfix.diff
index 9684e5bf8e4..9684e5bf8e4 100644
--- a/pkgs/applications/audio/monkeys-audio/buildfix.diff
+++ b/nixpkgs/pkgs/applications/audio/monkeys-audio/buildfix.diff
diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix
index 58bb4d3e327..58bb4d3e327 100644
--- a/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix
diff --git a/pkgs/applications/audio/mopidy/default.nix b/nixpkgs/pkgs/applications/audio/mopidy/default.nix
index 2df54fa7fb4..2df54fa7fb4 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/default.nix
diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix
index 8c173140efd..8c173140efd 100644
--- a/pkgs/applications/audio/mopidy/gmusic.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix
index 88cdde2ceb2..88cdde2ceb2 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix
diff --git a/pkgs/applications/audio/mopidy/local-images.nix b/nixpkgs/pkgs/applications/audio/mopidy/local-images.nix
index 2ffc736572b..2ffc736572b 100644
--- a/pkgs/applications/audio/mopidy/local-images.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/local-images.nix
diff --git a/pkgs/applications/audio/mopidy/local-sqlite.nix b/nixpkgs/pkgs/applications/audio/mopidy/local-sqlite.nix
index 6d0cc370ff3..6d0cc370ff3 100644
--- a/pkgs/applications/audio/mopidy/local-sqlite.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/local-sqlite.nix
diff --git a/pkgs/applications/audio/mopidy/moped.nix b/nixpkgs/pkgs/applications/audio/mopidy/moped.nix
index d41fb12ae8d..d41fb12ae8d 100644
--- a/pkgs/applications/audio/mopidy/moped.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/moped.nix
diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/nixpkgs/pkgs/applications/audio/mopidy/mopify.nix
index b657f69e26e..b657f69e26e 100644
--- a/pkgs/applications/audio/mopidy/mopify.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/mopify.nix
diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix
index b0abefd7a1f..b0abefd7a1f 100644
--- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix
diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/nixpkgs/pkgs/applications/audio/mopidy/soundcloud.nix
index 8002feb0f90..8002feb0f90 100644
--- a/pkgs/applications/audio/mopidy/soundcloud.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/soundcloud.nix
diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/nixpkgs/pkgs/applications/audio/mopidy/spotify-tunigo.nix
index 4b75af5ed57..4b75af5ed57 100644
--- a/pkgs/applications/audio/mopidy/spotify-tunigo.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/spotify-tunigo.nix
diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix
index 483852455aa..483852455aa 100644
--- a/pkgs/applications/audio/mopidy/spotify.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix
diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix
index b8e22a41cab..b8e22a41cab 100644
--- a/pkgs/applications/audio/mopidy/youtube.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix
diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix
index 727133be78d..727133be78d 100644
--- a/pkgs/applications/audio/mp3blaster/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix
diff --git a/pkgs/applications/audio/mp3gain/default.nix b/nixpkgs/pkgs/applications/audio/mp3gain/default.nix
index 233aebfa147..233aebfa147 100644
--- a/pkgs/applications/audio/mp3gain/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mp3gain/default.nix
diff --git a/pkgs/applications/audio/mp3info/default.nix b/nixpkgs/pkgs/applications/audio/mp3info/default.nix
index 6700f21fc8c..6700f21fc8c 100644
--- a/pkgs/applications/audio/mp3info/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mp3info/default.nix
diff --git a/pkgs/applications/audio/mp3splt/default.nix b/nixpkgs/pkgs/applications/audio/mp3splt/default.nix
index f067c5af6df..f067c5af6df 100644
--- a/pkgs/applications/audio/mp3splt/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mp3splt/default.nix
diff --git a/pkgs/applications/audio/mp3val/default.nix b/nixpkgs/pkgs/applications/audio/mp3val/default.nix
index 6c35779f6c4..6c35779f6c4 100644
--- a/pkgs/applications/audio/mp3val/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mp3val/default.nix
diff --git a/pkgs/applications/audio/mpc/default.nix b/nixpkgs/pkgs/applications/audio/mpc/default.nix
index 1e8d73ce560..1e8d73ce560 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mpc/default.nix
diff --git a/pkgs/applications/audio/mpc123/default.nix b/nixpkgs/pkgs/applications/audio/mpc123/default.nix
index f024e5a6a1d..f024e5a6a1d 100644
--- a/pkgs/applications/audio/mpc123/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mpc123/default.nix
diff --git a/pkgs/applications/audio/mpc123/use-gcc.patch b/nixpkgs/pkgs/applications/audio/mpc123/use-gcc.patch
index ca4cf84591c..ca4cf84591c 100644
--- a/pkgs/applications/audio/mpc123/use-gcc.patch
+++ b/nixpkgs/pkgs/applications/audio/mpc123/use-gcc.patch
diff --git a/pkgs/applications/audio/mpg123/default.nix b/nixpkgs/pkgs/applications/audio/mpg123/default.nix
index 6c4b9a43176..6c4b9a43176 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mpg123/default.nix
diff --git a/pkgs/applications/audio/mpg321/default.nix b/nixpkgs/pkgs/applications/audio/mpg321/default.nix
index 08fe9b4f9af..08fe9b4f9af 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mpg321/default.nix
diff --git a/pkgs/applications/audio/munt/default.nix b/nixpkgs/pkgs/applications/audio/munt/default.nix
index c9a1e9bea80..c9a1e9bea80 100644
--- a/pkgs/applications/audio/munt/default.nix
+++ b/nixpkgs/pkgs/applications/audio/munt/default.nix
diff --git a/pkgs/applications/audio/muse/default.nix b/nixpkgs/pkgs/applications/audio/muse/default.nix
index f1fad05bece..f1fad05bece 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/nixpkgs/pkgs/applications/audio/muse/default.nix
diff --git a/pkgs/applications/audio/musescore/darwin.nix b/nixpkgs/pkgs/applications/audio/musescore/darwin.nix
index 8b08aed62b8..8b08aed62b8 100644
--- a/pkgs/applications/audio/musescore/darwin.nix
+++ b/nixpkgs/pkgs/applications/audio/musescore/darwin.nix
diff --git a/pkgs/applications/audio/musescore/default.nix b/nixpkgs/pkgs/applications/audio/musescore/default.nix
index 5368fcb6165..5368fcb6165 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/nixpkgs/pkgs/applications/audio/musescore/default.nix
diff --git a/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch b/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
index 53a0c90ce46..53a0c90ce46 100644
--- a/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
+++ b/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
diff --git a/pkgs/applications/audio/musly/default.nix b/nixpkgs/pkgs/applications/audio/musly/default.nix
index e7a9e22c2d6..e7a9e22c2d6 100644
--- a/pkgs/applications/audio/musly/default.nix
+++ b/nixpkgs/pkgs/applications/audio/musly/default.nix
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/nixpkgs/pkgs/applications/audio/ncmpc/default.nix
index c95177cd382..c95177cd382 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ncmpc/default.nix
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix
index 2ba36b4a50d..2ba36b4a50d 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix
diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix
index 53ed9b3297c..53ed9b3297c 100644
--- a/pkgs/applications/audio/ncpamixer/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix
diff --git a/pkgs/applications/audio/ncspot/default.nix b/nixpkgs/pkgs/applications/audio/ncspot/default.nix
index 136f6fc1427..136f6fc1427 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ncspot/default.nix
diff --git a/pkgs/applications/audio/netease-cloud-music/default.nix b/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix
index 76dcba304a3..76dcba304a3 100644
--- a/pkgs/applications/audio/netease-cloud-music/default.nix
+++ b/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix
diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/nixpkgs/pkgs/applications/audio/noise-repellent/default.nix
index bc5b35396e2..bc5b35396e2 100644
--- a/pkgs/applications/audio/noise-repellent/default.nix
+++ b/nixpkgs/pkgs/applications/audio/noise-repellent/default.nix
diff --git a/pkgs/applications/audio/non/default.nix b/nixpkgs/pkgs/applications/audio/non/default.nix
index 5f8c82b98d0..5f8c82b98d0 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/nixpkgs/pkgs/applications/audio/non/default.nix
diff --git a/pkgs/applications/audio/normalize/default.nix b/nixpkgs/pkgs/applications/audio/normalize/default.nix
index 490ecc967bb..490ecc967bb 100644
--- a/pkgs/applications/audio/normalize/default.nix
+++ b/nixpkgs/pkgs/applications/audio/normalize/default.nix
diff --git a/pkgs/applications/audio/nova-filters/default.nix b/nixpkgs/pkgs/applications/audio/nova-filters/default.nix
index 0bb970500bd..0bb970500bd 100644
--- a/pkgs/applications/audio/nova-filters/default.nix
+++ b/nixpkgs/pkgs/applications/audio/nova-filters/default.nix
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/nixpkgs/pkgs/applications/audio/openmpt123/default.nix
index 24ac52e7e31..24ac52e7e31 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/nixpkgs/pkgs/applications/audio/openmpt123/default.nix
diff --git a/pkgs/applications/audio/opus-tools/default.nix b/nixpkgs/pkgs/applications/audio/opus-tools/default.nix
index 69fa75d85f4..69fa75d85f4 100644
--- a/pkgs/applications/audio/opus-tools/default.nix
+++ b/nixpkgs/pkgs/applications/audio/opus-tools/default.nix
diff --git a/pkgs/applications/audio/opusfile/default.nix b/nixpkgs/pkgs/applications/audio/opusfile/default.nix
index 25636863793..25636863793 100644
--- a/pkgs/applications/audio/opusfile/default.nix
+++ b/nixpkgs/pkgs/applications/audio/opusfile/default.nix
diff --git a/pkgs/applications/audio/opusfile/include-multistream.patch b/nixpkgs/pkgs/applications/audio/opusfile/include-multistream.patch
index 7c6dd847596..7c6dd847596 100644
--- a/pkgs/applications/audio/opusfile/include-multistream.patch
+++ b/nixpkgs/pkgs/applications/audio/opusfile/include-multistream.patch
diff --git a/pkgs/applications/audio/osmid/default.nix b/nixpkgs/pkgs/applications/audio/osmid/default.nix
index 7e49b872a6a..7e49b872a6a 100644
--- a/pkgs/applications/audio/osmid/default.nix
+++ b/nixpkgs/pkgs/applications/audio/osmid/default.nix
diff --git a/pkgs/applications/audio/padthv1/default.nix b/nixpkgs/pkgs/applications/audio/padthv1/default.nix
index 6d97a2da739..6d97a2da739 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/nixpkgs/pkgs/applications/audio/padthv1/default.nix
diff --git a/pkgs/applications/audio/pamix/default.nix b/nixpkgs/pkgs/applications/audio/pamix/default.nix
index 2507f08e9e5..2507f08e9e5 100644
--- a/pkgs/applications/audio/pamix/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pamix/default.nix
diff --git a/pkgs/applications/audio/pamixer/default.nix b/nixpkgs/pkgs/applications/audio/pamixer/default.nix
index 7c452096785..7c452096785 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pamixer/default.nix
diff --git a/pkgs/applications/audio/paprefs/default.nix b/nixpkgs/pkgs/applications/audio/paprefs/default.nix
index 9c59b5466c7..9c59b5466c7 100644
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/nixpkgs/pkgs/applications/audio/paprefs/default.nix
diff --git a/pkgs/applications/audio/parlatype/default.nix b/nixpkgs/pkgs/applications/audio/parlatype/default.nix
index fb5fe47f4f2..fb5fe47f4f2 100644
--- a/pkgs/applications/audio/parlatype/default.nix
+++ b/nixpkgs/pkgs/applications/audio/parlatype/default.nix
diff --git a/pkgs/applications/audio/patchage/default.nix b/nixpkgs/pkgs/applications/audio/patchage/default.nix
index e7c4cab9af1..e7c4cab9af1 100644
--- a/pkgs/applications/audio/patchage/default.nix
+++ b/nixpkgs/pkgs/applications/audio/patchage/default.nix
diff --git a/pkgs/applications/audio/paulstretch/default.nix b/nixpkgs/pkgs/applications/audio/paulstretch/default.nix
index b9a3f39affb..b9a3f39affb 100644
--- a/pkgs/applications/audio/paulstretch/default.nix
+++ b/nixpkgs/pkgs/applications/audio/paulstretch/default.nix
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix
index d07cf8a476b..d07cf8a476b 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix
diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/cyclone/default.nix
index 6440f6e787f..6440f6e787f 100644
--- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pd-plugins/cyclone/default.nix
diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
index 6c7a4b03ef5..6c7a4b03ef5 100644
--- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/maxlib/default.nix
index 21ba375200b..21ba375200b 100644
--- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pd-plugins/maxlib/default.nix
diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
index 028a4667cb2..028a4667cb2 100644
--- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/puremapping/default.nix
index c214d3fcf40..c214d3fcf40 100644
--- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pd-plugins/puremapping/default.nix
diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/timbreid/default.nix
index fa9660fbbf6..fa9660fbbf6 100644
--- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pd-plugins/timbreid/default.nix
diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/zexy/default.nix
index cc307417c06..cc307417c06 100644
--- a/pkgs/applications/audio/pd-plugins/zexy/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pd-plugins/zexy/default.nix
diff --git a/pkgs/applications/audio/petrifoo/default.nix b/nixpkgs/pkgs/applications/audio/petrifoo/default.nix
index 8bbeffb1f7a..8bbeffb1f7a 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/nixpkgs/pkgs/applications/audio/petrifoo/default.nix
diff --git a/pkgs/applications/audio/pianobar/default.nix b/nixpkgs/pkgs/applications/audio/pianobar/default.nix
index 811952f845f..811952f845f 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pianobar/default.nix
diff --git a/pkgs/applications/audio/pianobooster/default.nix b/nixpkgs/pkgs/applications/audio/pianobooster/default.nix
index f2130fe5559..f2130fe5559 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pianobooster/default.nix
diff --git a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch b/nixpkgs/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch
index 2b1b28c5a84..2b1b28c5a84 100644
--- a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch
+++ b/nixpkgs/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch
diff --git a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch b/nixpkgs/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch
index 8cdd8738e2b..8cdd8738e2b 100644
--- a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch
+++ b/nixpkgs/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch
diff --git a/pkgs/applications/audio/picard/default.nix b/nixpkgs/pkgs/applications/audio/picard/default.nix
index b40ab6d4f7a..b40ab6d4f7a 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/nixpkgs/pkgs/applications/audio/picard/default.nix
diff --git a/pkgs/applications/audio/pithos/default.nix b/nixpkgs/pkgs/applications/audio/pithos/default.nix
index 20a6e928cef..20a6e928cef 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pithos/default.nix
diff --git a/pkgs/applications/audio/playbar2/default.nix b/nixpkgs/pkgs/applications/audio/playbar2/default.nix
index 8c21dc8f2ad..8c21dc8f2ad 100644
--- a/pkgs/applications/audio/playbar2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/playbar2/default.nix
diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix
index f444ad6cb32..f444ad6cb32 100644
--- a/pkgs/applications/audio/plugin-torture/default.nix
+++ b/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix
diff --git a/pkgs/applications/audio/pmidi/default.nix b/nixpkgs/pkgs/applications/audio/pmidi/default.nix
index f9b3fbae213..f9b3fbae213 100644
--- a/pkgs/applications/audio/pmidi/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pmidi/default.nix
diff --git a/pkgs/applications/audio/ponymix/default.nix b/nixpkgs/pkgs/applications/audio/ponymix/default.nix
index 6d168ec5661..6d168ec5661 100644
--- a/pkgs/applications/audio/ponymix/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ponymix/default.nix
diff --git a/pkgs/applications/audio/praat/default.nix b/nixpkgs/pkgs/applications/audio/praat/default.nix
index 9414f4211d7..9414f4211d7 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/nixpkgs/pkgs/applications/audio/praat/default.nix
diff --git a/pkgs/applications/audio/projectm/default.nix b/nixpkgs/pkgs/applications/audio/projectm/default.nix
index 347774010ae..347774010ae 100644
--- a/pkgs/applications/audio/projectm/default.nix
+++ b/nixpkgs/pkgs/applications/audio/projectm/default.nix
diff --git a/pkgs/applications/audio/puddletag/default.nix b/nixpkgs/pkgs/applications/audio/puddletag/default.nix
index 3a6cd298557..3a6cd298557 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/nixpkgs/pkgs/applications/audio/puddletag/default.nix
diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix
index 6b7d242e1f6..6b7d242e1f6 100644
--- a/pkgs/applications/audio/pulseaudio-ctl/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix
diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix
index a9f56cca001..a9f56cca001 100644
--- a/pkgs/applications/audio/pulseaudio-dlna/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix
diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
index 328bd8b0b04..328bd8b0b04 100644
--- a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
+++ b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index b8082c12c64..b8082c12c64 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch
index c94c5dd61f2..c94c5dd61f2 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch
+++ b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
index 3c498fe8af1..3c498fe8af1 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
+++ b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
index 31e19154862..31e19154862 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
diff --git a/pkgs/applications/audio/puredata/default.nix b/nixpkgs/pkgs/applications/audio/puredata/default.nix
index 5886a465409..5886a465409 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/nixpkgs/pkgs/applications/audio/puredata/default.nix
diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/nixpkgs/pkgs/applications/audio/puredata/wrapper.nix
index 80968e2700b..80968e2700b 100644
--- a/pkgs/applications/audio/puredata/wrapper.nix
+++ b/nixpkgs/pkgs/applications/audio/puredata/wrapper.nix
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/nixpkgs/pkgs/applications/audio/qjackctl/default.nix
index 753f6fe8206..753f6fe8206 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/nixpkgs/pkgs/applications/audio/qjackctl/default.nix
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/nixpkgs/pkgs/applications/audio/qmidinet/default.nix
index 2b79818543f..2b79818543f 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/nixpkgs/pkgs/applications/audio/qmidinet/default.nix
diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/nixpkgs/pkgs/applications/audio/qmidiroute/default.nix
index 2a83d98b6ea..2a83d98b6ea 100644
--- a/pkgs/applications/audio/qmidiroute/default.nix
+++ b/nixpkgs/pkgs/applications/audio/qmidiroute/default.nix
diff --git a/pkgs/applications/audio/qmmp/default.nix b/nixpkgs/pkgs/applications/audio/qmmp/default.nix
index a941ea485b7..a941ea485b7 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/nixpkgs/pkgs/applications/audio/qmmp/default.nix
diff --git a/pkgs/applications/audio/qsampler/default.nix b/nixpkgs/pkgs/applications/audio/qsampler/default.nix
index 33411002c23..33411002c23 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/nixpkgs/pkgs/applications/audio/qsampler/default.nix
diff --git a/pkgs/applications/audio/qsynth/default.nix b/nixpkgs/pkgs/applications/audio/qsynth/default.nix
index 29f5704c730..29f5704c730 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/nixpkgs/pkgs/applications/audio/qsynth/default.nix
diff --git a/pkgs/applications/audio/qtractor/default.nix b/nixpkgs/pkgs/applications/audio/qtractor/default.nix
index 4076692e7fe..4076692e7fe 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/nixpkgs/pkgs/applications/audio/qtractor/default.nix
diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/nixpkgs/pkgs/applications/audio/qtscrobbler/default.nix
index 68e8e6402ac..68e8e6402ac 100644
--- a/pkgs/applications/audio/qtscrobbler/default.nix
+++ b/nixpkgs/pkgs/applications/audio/qtscrobbler/default.nix
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/nixpkgs/pkgs/applications/audio/quodlibet/default.nix
index 597cf68f4d0..597cf68f4d0 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/nixpkgs/pkgs/applications/audio/quodlibet/default.nix
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix
index a64e407b39b..a64e407b39b 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix
diff --git a/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch b/nixpkgs/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch
index 3aee9751656..3aee9751656 100644
--- a/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch
+++ b/nixpkgs/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch
diff --git a/pkgs/applications/audio/rakarrack/default.nix b/nixpkgs/pkgs/applications/audio/rakarrack/default.nix
index 36302458a75..36302458a75 100644
--- a/pkgs/applications/audio/rakarrack/default.nix
+++ b/nixpkgs/pkgs/applications/audio/rakarrack/default.nix
diff --git a/pkgs/applications/audio/rakarrack/fltk-path.patch b/nixpkgs/pkgs/applications/audio/rakarrack/fltk-path.patch
index 8f042bd3a66..8f042bd3a66 100644
--- a/pkgs/applications/audio/rakarrack/fltk-path.patch
+++ b/nixpkgs/pkgs/applications/audio/rakarrack/fltk-path.patch
diff --git a/pkgs/applications/audio/reaper/default.nix b/nixpkgs/pkgs/applications/audio/reaper/default.nix
index 236c42b5293..236c42b5293 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/nixpkgs/pkgs/applications/audio/reaper/default.nix
diff --git a/pkgs/applications/audio/redoflacs/default.nix b/nixpkgs/pkgs/applications/audio/redoflacs/default.nix
index e32fd42af32..e32fd42af32 100644
--- a/pkgs/applications/audio/redoflacs/default.nix
+++ b/nixpkgs/pkgs/applications/audio/redoflacs/default.nix
diff --git a/pkgs/applications/audio/renoise/default.nix b/nixpkgs/pkgs/applications/audio/renoise/default.nix
index 2fb1943e0e5..2fb1943e0e5 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/nixpkgs/pkgs/applications/audio/renoise/default.nix
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/nixpkgs/pkgs/applications/audio/rhvoice/default.nix
index e3eb750496b..e3eb750496b 100644
--- a/pkgs/applications/audio/rhvoice/default.nix
+++ b/nixpkgs/pkgs/applications/audio/rhvoice/default.nix
diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/nixpkgs/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
index ed180c92deb..ed180c92deb 100644
--- a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
+++ b/nixpkgs/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix
index 24b342a26a9..24b342a26a9 100644
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix
diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/nixpkgs/pkgs/applications/audio/rkrlv2/default.nix
index 0ff23102e75..0ff23102e75 100644
--- a/pkgs/applications/audio/rkrlv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/rkrlv2/default.nix
diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/nixpkgs/pkgs/applications/audio/rofi-mpd/default.nix
index 97c737675ad..97c737675ad 100644
--- a/pkgs/applications/audio/rofi-mpd/default.nix
+++ b/nixpkgs/pkgs/applications/audio/rofi-mpd/default.nix
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/nixpkgs/pkgs/applications/audio/rosegarden/default.nix
index 8d8e3e1b6c0..8d8e3e1b6c0 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/nixpkgs/pkgs/applications/audio/rosegarden/default.nix
diff --git a/pkgs/applications/audio/rubyripper/default.nix b/nixpkgs/pkgs/applications/audio/rubyripper/default.nix
index 82aa86f795b..82aa86f795b 100644
--- a/pkgs/applications/audio/rubyripper/default.nix
+++ b/nixpkgs/pkgs/applications/audio/rubyripper/default.nix
diff --git a/pkgs/applications/audio/samplv1/default.nix b/nixpkgs/pkgs/applications/audio/samplv1/default.nix
index 4874969b633..4874969b633 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/nixpkgs/pkgs/applications/audio/samplv1/default.nix
diff --git a/pkgs/applications/audio/sayonara/default.nix b/nixpkgs/pkgs/applications/audio/sayonara/default.nix
index c4258174500..c4258174500 100644
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sayonara/default.nix
diff --git a/pkgs/applications/audio/schismtracker/default.nix b/nixpkgs/pkgs/applications/audio/schismtracker/default.nix
index f902b2dd41b..f902b2dd41b 100644
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/nixpkgs/pkgs/applications/audio/schismtracker/default.nix
diff --git a/pkgs/applications/audio/seq24/default.nix b/nixpkgs/pkgs/applications/audio/seq24/default.nix
index 9bab024f021..9bab024f021 100644
--- a/pkgs/applications/audio/seq24/default.nix
+++ b/nixpkgs/pkgs/applications/audio/seq24/default.nix
diff --git a/pkgs/applications/audio/seq24/mutex_no_nameclash.patch b/nixpkgs/pkgs/applications/audio/seq24/mutex_no_nameclash.patch
index dd82b1b0e09..dd82b1b0e09 100644
--- a/pkgs/applications/audio/seq24/mutex_no_nameclash.patch
+++ b/nixpkgs/pkgs/applications/audio/seq24/mutex_no_nameclash.patch
diff --git a/pkgs/applications/audio/setbfree/default.nix b/nixpkgs/pkgs/applications/audio/setbfree/default.nix
index a7500f8c6a5..a7500f8c6a5 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/nixpkgs/pkgs/applications/audio/setbfree/default.nix
diff --git a/pkgs/applications/audio/sfizz/default.nix b/nixpkgs/pkgs/applications/audio/sfizz/default.nix
index d785d378065..d785d378065 100644
--- a/pkgs/applications/audio/sfizz/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sfizz/default.nix
diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix
index 615a8a8c660..615a8a8c660 100644
--- a/pkgs/applications/audio/sfxr-qt/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix
diff --git a/pkgs/applications/audio/sfxr/default.nix b/nixpkgs/pkgs/applications/audio/sfxr/default.nix
index fbd0f3c5def..fbd0f3c5def 100644
--- a/pkgs/applications/audio/sfxr/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sfxr/default.nix
diff --git a/pkgs/applications/audio/shntool/default.nix b/nixpkgs/pkgs/applications/audio/shntool/default.nix
index e3bfc60a40a..e3bfc60a40a 100644
--- a/pkgs/applications/audio/shntool/default.nix
+++ b/nixpkgs/pkgs/applications/audio/shntool/default.nix
diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix
index aff8c173d9f..aff8c173d9f 100644
--- a/pkgs/applications/audio/sidplayfp/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix
diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/nixpkgs/pkgs/applications/audio/sisco.lv2/default.nix
index f95655f5e9a..f95655f5e9a 100644
--- a/pkgs/applications/audio/sisco.lv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sisco.lv2/default.nix
diff --git a/pkgs/applications/audio/snapcast/default.nix b/nixpkgs/pkgs/applications/audio/snapcast/default.nix
index 21a36cecbe5..21a36cecbe5 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/nixpkgs/pkgs/applications/audio/snapcast/default.nix
diff --git a/pkgs/applications/audio/snd/default.nix b/nixpkgs/pkgs/applications/audio/snd/default.nix
index 2ba9d4f50c3..2ba9d4f50c3 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/nixpkgs/pkgs/applications/audio/snd/default.nix
diff --git a/pkgs/applications/audio/sndpeek/default.nix b/nixpkgs/pkgs/applications/audio/sndpeek/default.nix
index 376aadc7385..376aadc7385 100644
--- a/pkgs/applications/audio/sndpeek/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sndpeek/default.nix
diff --git a/pkgs/applications/audio/sndpeek/pthread.patch b/nixpkgs/pkgs/applications/audio/sndpeek/pthread.patch
index b2f1d37da6b..b2f1d37da6b 100644
--- a/pkgs/applications/audio/sndpeek/pthread.patch
+++ b/nixpkgs/pkgs/applications/audio/sndpeek/pthread.patch
diff --git a/pkgs/applications/audio/sonata/default.nix b/nixpkgs/pkgs/applications/audio/sonata/default.nix
index b9293fe2729..b9293fe2729 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sonata/default.nix
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix
index ac72a26b0ee..ac72a26b0ee 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix
index 6164c1cfe93..6164c1cfe93 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix
index 768b40a1138..768b40a1138 100644
--- a/pkgs/applications/audio/sooperlooper/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix
diff --git a/pkgs/applications/audio/sorcer/default.nix b/nixpkgs/pkgs/applications/audio/sorcer/default.nix
index 5d8ae0928c9..5d8ae0928c9 100644
--- a/pkgs/applications/audio/sorcer/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sorcer/default.nix
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix
index 7f22a03c1bb..7f22a03c1bb 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix
diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix
index df5806b50b9..df5806b50b9 100644
--- a/pkgs/applications/audio/soundkonverter/default.nix
+++ b/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix
diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix
index 5b5f01eef5c..5b5f01eef5c 100644
--- a/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix
diff --git a/pkgs/applications/audio/spectmorph/default.nix b/nixpkgs/pkgs/applications/audio/spectmorph/default.nix
index 7544a3520c7..7544a3520c7 100644
--- a/pkgs/applications/audio/spectmorph/default.nix
+++ b/nixpkgs/pkgs/applications/audio/spectmorph/default.nix
diff --git a/pkgs/applications/audio/spectrojack/default.nix b/nixpkgs/pkgs/applications/audio/spectrojack/default.nix
index 4c1682b1e0b..4c1682b1e0b 100644
--- a/pkgs/applications/audio/spectrojack/default.nix
+++ b/nixpkgs/pkgs/applications/audio/spectrojack/default.nix
diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix
index 6598d24fb07..6598d24fb07 100644
--- a/pkgs/applications/audio/speech-denoiser/default.nix
+++ b/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix
diff --git a/pkgs/applications/audio/spek/default.nix b/nixpkgs/pkgs/applications/audio/spek/default.nix
index f4922e388c4..f4922e388c4 100644
--- a/pkgs/applications/audio/spek/default.nix
+++ b/nixpkgs/pkgs/applications/audio/spek/default.nix
diff --git a/pkgs/applications/audio/split2flac/default.nix b/nixpkgs/pkgs/applications/audio/split2flac/default.nix
index 3c9565df919..3c9565df919 100644
--- a/pkgs/applications/audio/split2flac/default.nix
+++ b/nixpkgs/pkgs/applications/audio/split2flac/default.nix
diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix
index 6f8fc541ad7..6f8fc541ad7 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix
diff --git a/pkgs/applications/audio/spotify/default.nix b/nixpkgs/pkgs/applications/audio/spotify/default.nix
index b763e6e6122..b763e6e6122 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/nixpkgs/pkgs/applications/audio/spotify/default.nix
diff --git a/pkgs/applications/audio/spotify/update.sh b/nixpkgs/pkgs/applications/audio/spotify/update.sh
index a8836214f2f..a8836214f2f 100755
--- a/pkgs/applications/audio/spotify/update.sh
+++ b/nixpkgs/pkgs/applications/audio/spotify/update.sh
diff --git a/pkgs/applications/audio/spotifyd/default.nix b/nixpkgs/pkgs/applications/audio/spotifyd/default.nix
index 30cedfa8bb8..30cedfa8bb8 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/nixpkgs/pkgs/applications/audio/spotifyd/default.nix
diff --git a/pkgs/applications/audio/spotifywm/default.nix b/nixpkgs/pkgs/applications/audio/spotifywm/default.nix
index 2380c8e5d9e..2380c8e5d9e 100644
--- a/pkgs/applications/audio/spotifywm/default.nix
+++ b/nixpkgs/pkgs/applications/audio/spotifywm/default.nix
diff --git a/pkgs/applications/audio/squeezelite/default.nix b/nixpkgs/pkgs/applications/audio/squeezelite/default.nix
index 3184f89ced9..3184f89ced9 100644
--- a/pkgs/applications/audio/squeezelite/default.nix
+++ b/nixpkgs/pkgs/applications/audio/squeezelite/default.nix
diff --git a/pkgs/applications/audio/squishyball/default.nix b/nixpkgs/pkgs/applications/audio/squishyball/default.nix
index 496ce779ffb..496ce779ffb 100644
--- a/pkgs/applications/audio/squishyball/default.nix
+++ b/nixpkgs/pkgs/applications/audio/squishyball/default.nix
diff --git a/pkgs/applications/audio/squishyball/gnu-screen.patch b/nixpkgs/pkgs/applications/audio/squishyball/gnu-screen.patch
index addc30d604c..addc30d604c 100644
--- a/pkgs/applications/audio/squishyball/gnu-screen.patch
+++ b/nixpkgs/pkgs/applications/audio/squishyball/gnu-screen.patch
diff --git a/pkgs/applications/audio/ssrc/default.nix b/nixpkgs/pkgs/applications/audio/ssrc/default.nix
index 1247bbc19f9..1247bbc19f9 100644
--- a/pkgs/applications/audio/ssrc/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ssrc/default.nix
diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/nixpkgs/pkgs/applications/audio/stone-phaser/default.nix
index 6e64ebc7fb3..6e64ebc7fb3 100644
--- a/pkgs/applications/audio/stone-phaser/default.nix
+++ b/nixpkgs/pkgs/applications/audio/stone-phaser/default.nix
diff --git a/pkgs/applications/audio/strawberry/default.nix b/nixpkgs/pkgs/applications/audio/strawberry/default.nix
index ad5685f71b0..ad5685f71b0 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/nixpkgs/pkgs/applications/audio/strawberry/default.nix
diff --git a/pkgs/applications/audio/streamripper/default.nix b/nixpkgs/pkgs/applications/audio/streamripper/default.nix
index efa87a2f72c..efa87a2f72c 100644
--- a/pkgs/applications/audio/streamripper/default.nix
+++ b/nixpkgs/pkgs/applications/audio/streamripper/default.nix
diff --git a/pkgs/applications/audio/string-machine/default.nix b/nixpkgs/pkgs/applications/audio/string-machine/default.nix
index 67053baa35f..67053baa35f 100644
--- a/pkgs/applications/audio/string-machine/default.nix
+++ b/nixpkgs/pkgs/applications/audio/string-machine/default.nix
diff --git a/pkgs/applications/audio/sunvox/default.nix b/nixpkgs/pkgs/applications/audio/sunvox/default.nix
index 1a3d1a96c85..1a3d1a96c85 100644
--- a/pkgs/applications/audio/sunvox/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sunvox/default.nix
diff --git a/pkgs/applications/audio/svox/default.nix b/nixpkgs/pkgs/applications/audio/svox/default.nix
index 3e9fe4725af..3e9fe4725af 100644
--- a/pkgs/applications/audio/svox/default.nix
+++ b/nixpkgs/pkgs/applications/audio/svox/default.nix
diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/nixpkgs/pkgs/applications/audio/swh-lv2/default.nix
index b59752d7cc3..b59752d7cc3 100644
--- a/pkgs/applications/audio/swh-lv2/default.nix
+++ b/nixpkgs/pkgs/applications/audio/swh-lv2/default.nix
diff --git a/pkgs/applications/audio/synthv1/default.nix b/nixpkgs/pkgs/applications/audio/synthv1/default.nix
index 349c7acc3db..349c7acc3db 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/nixpkgs/pkgs/applications/audio/synthv1/default.nix
diff --git a/pkgs/applications/audio/tambura/default.nix b/nixpkgs/pkgs/applications/audio/tambura/default.nix
index 030bb2c01a7..030bb2c01a7 100644
--- a/pkgs/applications/audio/tambura/default.nix
+++ b/nixpkgs/pkgs/applications/audio/tambura/default.nix
diff --git a/pkgs/applications/audio/tetraproc/default.nix b/nixpkgs/pkgs/applications/audio/tetraproc/default.nix
index 40362fdd496..40362fdd496 100644
--- a/pkgs/applications/audio/tetraproc/default.nix
+++ b/nixpkgs/pkgs/applications/audio/tetraproc/default.nix
diff --git a/pkgs/applications/audio/timemachine/default.nix b/nixpkgs/pkgs/applications/audio/timemachine/default.nix
index 3564f875c9b..3564f875c9b 100644
--- a/pkgs/applications/audio/timemachine/default.nix
+++ b/nixpkgs/pkgs/applications/audio/timemachine/default.nix
diff --git a/pkgs/applications/audio/transcode/default.nix b/nixpkgs/pkgs/applications/audio/transcode/default.nix
index d7d5b65375e..d7d5b65375e 100644
--- a/pkgs/applications/audio/transcode/default.nix
+++ b/nixpkgs/pkgs/applications/audio/transcode/default.nix
diff --git a/pkgs/applications/audio/transcribe/default.nix b/nixpkgs/pkgs/applications/audio/transcribe/default.nix
index 8eb846ac9c5..8eb846ac9c5 100644
--- a/pkgs/applications/audio/transcribe/default.nix
+++ b/nixpkgs/pkgs/applications/audio/transcribe/default.nix
diff --git a/pkgs/applications/audio/traverso/default.nix b/nixpkgs/pkgs/applications/audio/traverso/default.nix
index 9188003ce66..9188003ce66 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/nixpkgs/pkgs/applications/audio/traverso/default.nix
diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile b/nixpkgs/pkgs/applications/audio/tree-from-tags/Gemfile
index 24f308f3f42..24f308f3f42 100644
--- a/pkgs/applications/audio/tree-from-tags/Gemfile
+++ b/nixpkgs/pkgs/applications/audio/tree-from-tags/Gemfile
diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile.lock b/nixpkgs/pkgs/applications/audio/tree-from-tags/Gemfile.lock
index 2ef77caa6f6..2ef77caa6f6 100644
--- a/pkgs/applications/audio/tree-from-tags/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/audio/tree-from-tags/Gemfile.lock
diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/nixpkgs/pkgs/applications/audio/tree-from-tags/default.nix
index 521133cb08f..521133cb08f 100644
--- a/pkgs/applications/audio/tree-from-tags/default.nix
+++ b/nixpkgs/pkgs/applications/audio/tree-from-tags/default.nix
diff --git a/pkgs/applications/audio/tree-from-tags/gemset.nix b/nixpkgs/pkgs/applications/audio/tree-from-tags/gemset.nix
index 20e10e9d93b..20e10e9d93b 100644
--- a/pkgs/applications/audio/tree-from-tags/gemset.nix
+++ b/nixpkgs/pkgs/applications/audio/tree-from-tags/gemset.nix
diff --git a/pkgs/applications/audio/uade123/default.nix b/nixpkgs/pkgs/applications/audio/uade123/default.nix
index 844eea11f51..844eea11f51 100644
--- a/pkgs/applications/audio/uade123/default.nix
+++ b/nixpkgs/pkgs/applications/audio/uade123/default.nix
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix
index 21aa27fa5bc..21aa27fa5bc 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix
diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/nixpkgs/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
index d310d57835e..d310d57835e 100644
--- a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
+++ b/nixpkgs/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
diff --git a/pkgs/applications/audio/vimpc/default.nix b/nixpkgs/pkgs/applications/audio/vimpc/default.nix
index 7f02ea9cefe..7f02ea9cefe 100644
--- a/pkgs/applications/audio/vimpc/default.nix
+++ b/nixpkgs/pkgs/applications/audio/vimpc/default.nix
diff --git a/pkgs/applications/audio/vkeybd/default.nix b/nixpkgs/pkgs/applications/audio/vkeybd/default.nix
index 3f77a657472..3f77a657472 100644
--- a/pkgs/applications/audio/vkeybd/default.nix
+++ b/nixpkgs/pkgs/applications/audio/vkeybd/default.nix
diff --git a/pkgs/applications/audio/vmpk/default.nix b/nixpkgs/pkgs/applications/audio/vmpk/default.nix
index 2bc40a78af4..2bc40a78af4 100644
--- a/pkgs/applications/audio/vmpk/default.nix
+++ b/nixpkgs/pkgs/applications/audio/vmpk/default.nix
diff --git a/pkgs/applications/audio/vocal/default.nix b/nixpkgs/pkgs/applications/audio/vocal/default.nix
index c928962c983..c928962c983 100644
--- a/pkgs/applications/audio/vocal/default.nix
+++ b/nixpkgs/pkgs/applications/audio/vocal/default.nix
diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix
index f815ac02e6e..f815ac02e6e 100644
--- a/pkgs/applications/audio/vorbis-tools/default.nix
+++ b/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix
diff --git a/pkgs/applications/audio/waon/default.nix b/nixpkgs/pkgs/applications/audio/waon/default.nix
index b27fdbffb7d..b27fdbffb7d 100644
--- a/pkgs/applications/audio/waon/default.nix
+++ b/nixpkgs/pkgs/applications/audio/waon/default.nix
diff --git a/pkgs/applications/audio/wavegain/default.nix b/nixpkgs/pkgs/applications/audio/wavegain/default.nix
index 5f56fb7297f..5f56fb7297f 100644
--- a/pkgs/applications/audio/wavegain/default.nix
+++ b/nixpkgs/pkgs/applications/audio/wavegain/default.nix
diff --git a/pkgs/applications/audio/whipper/default.nix b/nixpkgs/pkgs/applications/audio/whipper/default.nix
index ff278d4d7f2..ff278d4d7f2 100644
--- a/pkgs/applications/audio/whipper/default.nix
+++ b/nixpkgs/pkgs/applications/audio/whipper/default.nix
diff --git a/pkgs/applications/audio/whipper/paths.patch b/nixpkgs/pkgs/applications/audio/whipper/paths.patch
index 14b5384330d..14b5384330d 100644
--- a/pkgs/applications/audio/whipper/paths.patch
+++ b/nixpkgs/pkgs/applications/audio/whipper/paths.patch
diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/nixpkgs/pkgs/applications/audio/wolf-shaper/default.nix
index 13bf1d674c7..13bf1d674c7 100644
--- a/pkgs/applications/audio/wolf-shaper/default.nix
+++ b/nixpkgs/pkgs/applications/audio/wolf-shaper/default.nix
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix
index f4087506daa..f4087506daa 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix
diff --git a/pkgs/applications/audio/xmp/default.nix b/nixpkgs/pkgs/applications/audio/xmp/default.nix
index d234f6b6b8c..d234f6b6b8c 100644
--- a/pkgs/applications/audio/xmp/default.nix
+++ b/nixpkgs/pkgs/applications/audio/xmp/default.nix
diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/nixpkgs/pkgs/applications/audio/xsynth-dssi/default.nix
index c0803ffa418..c0803ffa418 100644
--- a/pkgs/applications/audio/xsynth-dssi/default.nix
+++ b/nixpkgs/pkgs/applications/audio/xsynth-dssi/default.nix
diff --git a/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations b/nixpkgs/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations
index f575af5ecd3..f575af5ecd3 100644
--- a/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations
+++ b/nixpkgs/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations
diff --git a/pkgs/applications/audio/yasr/20_maxpathlen b/nixpkgs/pkgs/applications/audio/yasr/20_maxpathlen
index 386c6cbf22b..386c6cbf22b 100644
--- a/pkgs/applications/audio/yasr/20_maxpathlen
+++ b/nixpkgs/pkgs/applications/audio/yasr/20_maxpathlen
diff --git a/pkgs/applications/audio/yasr/30_conf b/nixpkgs/pkgs/applications/audio/yasr/30_conf
index 98e959f55f3..98e959f55f3 100644
--- a/pkgs/applications/audio/yasr/30_conf
+++ b/nixpkgs/pkgs/applications/audio/yasr/30_conf
diff --git a/pkgs/applications/audio/yasr/40_dectalk_extended_chars b/nixpkgs/pkgs/applications/audio/yasr/40_dectalk_extended_chars
index cc1f0af8606..cc1f0af8606 100644
--- a/pkgs/applications/audio/yasr/40_dectalk_extended_chars
+++ b/nixpkgs/pkgs/applications/audio/yasr/40_dectalk_extended_chars
diff --git a/pkgs/applications/audio/yasr/default.nix b/nixpkgs/pkgs/applications/audio/yasr/default.nix
index c8902f1dda4..c8902f1dda4 100644
--- a/pkgs/applications/audio/yasr/default.nix
+++ b/nixpkgs/pkgs/applications/audio/yasr/default.nix
diff --git a/pkgs/applications/audio/ympd/default.nix b/nixpkgs/pkgs/applications/audio/ympd/default.nix
index 7976f747717..7976f747717 100644
--- a/pkgs/applications/audio/ympd/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ympd/default.nix
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/nixpkgs/pkgs/applications/audio/yoshimi/default.nix
index 0cd512e5093..0cd512e5093 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/nixpkgs/pkgs/applications/audio/yoshimi/default.nix
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix
index a8236b4b60f..a8236b4b60f 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix
diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/nixpkgs/pkgs/applications/audio/zita-njbridge/default.nix
index 1ec6946cf38..1ec6946cf38 100644
--- a/pkgs/applications/audio/zita-njbridge/default.nix
+++ b/nixpkgs/pkgs/applications/audio/zita-njbridge/default.nix
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix
index e22bf9ed653..e22bf9ed653 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix
diff --git a/pkgs/applications/backup/areca/default.nix b/nixpkgs/pkgs/applications/backup/areca/default.nix
index d02aa4b8444..d02aa4b8444 100644
--- a/pkgs/applications/backup/areca/default.nix
+++ b/nixpkgs/pkgs/applications/backup/areca/default.nix
diff --git a/pkgs/applications/backup/areca/fix-javah-bug.diff b/nixpkgs/pkgs/applications/backup/areca/fix-javah-bug.diff
index 5d5feaf9b94..5d5feaf9b94 100644
--- a/pkgs/applications/backup/areca/fix-javah-bug.diff
+++ b/nixpkgs/pkgs/applications/backup/areca/fix-javah-bug.diff
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/nixpkgs/pkgs/applications/backup/deja-dup/default.nix
index d283dc7107d..d283dc7107d 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/nixpkgs/pkgs/applications/backup/deja-dup/default.nix
diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/nixpkgs/pkgs/applications/backup/deja-dup/fix-paths.patch
index 26126fdc9d5..26126fdc9d5 100644
--- a/pkgs/applications/backup/deja-dup/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/backup/deja-dup/fix-paths.patch
diff --git a/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch b/nixpkgs/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch
index f74dbf73543..f74dbf73543 100644
--- a/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch
+++ b/nixpkgs/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch
diff --git a/pkgs/applications/backup/vdmfec/default.nix b/nixpkgs/pkgs/applications/backup/vdmfec/default.nix
index 1366bb484a9..1366bb484a9 100644
--- a/pkgs/applications/backup/vdmfec/default.nix
+++ b/nixpkgs/pkgs/applications/backup/vdmfec/default.nix
diff --git a/pkgs/applications/blockchains/aeon/default.nix b/nixpkgs/pkgs/applications/blockchains/aeon/default.nix
index db9e68ae905..db9e68ae905 100644
--- a/pkgs/applications/blockchains/aeon/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/aeon/default.nix
diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix
index 85d6dcbdbe6..85d6dcbdbe6 100644
--- a/pkgs/applications/blockchains/bitcoin-abc.nix
+++ b/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix
diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/nixpkgs/pkgs/applications/blockchains/bitcoin-classic.nix
index ddce5c3f715..ddce5c3f715 100644
--- a/pkgs/applications/blockchains/bitcoin-classic.nix
+++ b/nixpkgs/pkgs/applications/blockchains/bitcoin-classic.nix
diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/nixpkgs/pkgs/applications/blockchains/bitcoin-gold.nix
index 7205e882c31..7205e882c31 100644
--- a/pkgs/applications/blockchains/bitcoin-gold.nix
+++ b/nixpkgs/pkgs/applications/blockchains/bitcoin-gold.nix
diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix
index c0d51e66db3..c0d51e66db3 100644
--- a/pkgs/applications/blockchains/bitcoin-unlimited.nix
+++ b/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix
diff --git a/pkgs/applications/blockchains/bitcoin.nix b/nixpkgs/pkgs/applications/blockchains/bitcoin.nix
index c1143f898e2..c1143f898e2 100644
--- a/pkgs/applications/blockchains/bitcoin.nix
+++ b/nixpkgs/pkgs/applications/blockchains/bitcoin.nix
diff --git a/pkgs/applications/blockchains/btc1.nix b/nixpkgs/pkgs/applications/blockchains/btc1.nix
index 3241148aee1..3241148aee1 100644
--- a/pkgs/applications/blockchains/btc1.nix
+++ b/nixpkgs/pkgs/applications/blockchains/btc1.nix
diff --git a/pkgs/applications/blockchains/clightning.nix b/nixpkgs/pkgs/applications/blockchains/clightning.nix
index f6c9fee7a1c..f6c9fee7a1c 100644
--- a/pkgs/applications/blockchains/clightning.nix
+++ b/nixpkgs/pkgs/applications/blockchains/clightning.nix
diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/nixpkgs/pkgs/applications/blockchains/cryptop/default.nix
index 01c47b320de..01c47b320de 100644
--- a/pkgs/applications/blockchains/cryptop/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/cryptop/default.nix
diff --git a/pkgs/applications/blockchains/dashpay.nix b/nixpkgs/pkgs/applications/blockchains/dashpay.nix
index 03dcd6cb54e..03dcd6cb54e 100644
--- a/pkgs/applications/blockchains/dashpay.nix
+++ b/nixpkgs/pkgs/applications/blockchains/dashpay.nix
diff --git a/pkgs/applications/blockchains/dcrd.nix b/nixpkgs/pkgs/applications/blockchains/dcrd.nix
index 16d39e85da1..16d39e85da1 100644
--- a/pkgs/applications/blockchains/dcrd.nix
+++ b/nixpkgs/pkgs/applications/blockchains/dcrd.nix
diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/nixpkgs/pkgs/applications/blockchains/dcrwallet.nix
index 163ed2615d3..163ed2615d3 100644
--- a/pkgs/applications/blockchains/dcrwallet.nix
+++ b/nixpkgs/pkgs/applications/blockchains/dcrwallet.nix
diff --git a/pkgs/applications/blockchains/dero.nix b/nixpkgs/pkgs/applications/blockchains/dero.nix
index 8aa693d2871..8aa693d2871 100644
--- a/pkgs/applications/blockchains/dero.nix
+++ b/nixpkgs/pkgs/applications/blockchains/dero.nix
diff --git a/pkgs/applications/blockchains/digibyte.nix b/nixpkgs/pkgs/applications/blockchains/digibyte.nix
index 0d0fc081a11..0d0fc081a11 100644
--- a/pkgs/applications/blockchains/digibyte.nix
+++ b/nixpkgs/pkgs/applications/blockchains/digibyte.nix
diff --git a/pkgs/applications/blockchains/dogecoin.nix b/nixpkgs/pkgs/applications/blockchains/dogecoin.nix
index 02744e50647..02744e50647 100644
--- a/pkgs/applications/blockchains/dogecoin.nix
+++ b/nixpkgs/pkgs/applications/blockchains/dogecoin.nix
diff --git a/pkgs/applications/blockchains/ethabi.nix b/nixpkgs/pkgs/applications/blockchains/ethabi.nix
index 5bc81a6daf6..5bc81a6daf6 100644
--- a/pkgs/applications/blockchains/ethabi.nix
+++ b/nixpkgs/pkgs/applications/blockchains/ethabi.nix
diff --git a/pkgs/applications/blockchains/exodus/default.nix b/nixpkgs/pkgs/applications/blockchains/exodus/default.nix
index bc354a5213e..bc354a5213e 100644
--- a/pkgs/applications/blockchains/exodus/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/exodus/default.nix
diff --git a/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch b/nixpkgs/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch
index c49bbc43251..c49bbc43251 100644
--- a/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch
+++ b/nixpkgs/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch
diff --git a/pkgs/applications/blockchains/freicoin.nix b/nixpkgs/pkgs/applications/blockchains/freicoin.nix
index 6cf84f76f91..6cf84f76f91 100644
--- a/pkgs/applications/blockchains/freicoin.nix
+++ b/nixpkgs/pkgs/applications/blockchains/freicoin.nix
diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
index f7f0aaf603e..f7f0aaf603e 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 64562fc445a..64562fc445a 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
diff --git a/pkgs/applications/blockchains/litecoin.nix b/nixpkgs/pkgs/applications/blockchains/litecoin.nix
index 47077266541..47077266541 100644
--- a/pkgs/applications/blockchains/litecoin.nix
+++ b/nixpkgs/pkgs/applications/blockchains/litecoin.nix
diff --git a/pkgs/applications/blockchains/lnd.nix b/nixpkgs/pkgs/applications/blockchains/lnd.nix
index fd18b3fa399..fd18b3fa399 100644
--- a/pkgs/applications/blockchains/lnd.nix
+++ b/nixpkgs/pkgs/applications/blockchains/lnd.nix
diff --git a/pkgs/applications/blockchains/masari.nix b/nixpkgs/pkgs/applications/blockchains/masari.nix
index dfa005abb6e..dfa005abb6e 100644
--- a/pkgs/applications/blockchains/masari.nix
+++ b/nixpkgs/pkgs/applications/blockchains/masari.nix
diff --git a/pkgs/applications/blockchains/mist.nix b/nixpkgs/pkgs/applications/blockchains/mist.nix
index 2990b44c7f4..2990b44c7f4 100644
--- a/pkgs/applications/blockchains/mist.nix
+++ b/nixpkgs/pkgs/applications/blockchains/mist.nix
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
index 0311169deb2..0311169deb2 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
diff --git a/pkgs/applications/blockchains/monero-gui/move-log-file.patch b/nixpkgs/pkgs/applications/blockchains/monero-gui/move-log-file.patch
index e540f1960d6..e540f1960d6 100644
--- a/pkgs/applications/blockchains/monero-gui/move-log-file.patch
+++ b/nixpkgs/pkgs/applications/blockchains/monero-gui/move-log-file.patch
diff --git a/pkgs/applications/blockchains/monero/default.nix b/nixpkgs/pkgs/applications/blockchains/monero/default.nix
index 7eb4238679e..7eb4238679e 100644
--- a/pkgs/applications/blockchains/monero/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/monero/default.nix
diff --git a/pkgs/applications/blockchains/namecoin.nix b/nixpkgs/pkgs/applications/blockchains/namecoin.nix
index 4b8dc5525dc..4b8dc5525dc 100644
--- a/pkgs/applications/blockchains/namecoin.nix
+++ b/nixpkgs/pkgs/applications/blockchains/namecoin.nix
diff --git a/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch b/nixpkgs/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch
index 5bbec1d39be..5bbec1d39be 100644
--- a/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch
+++ b/nixpkgs/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch
diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix
index 2b7ae5d9c6e..2b7ae5d9c6e 100644
--- a/pkgs/applications/blockchains/nano-wallet/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix
diff --git a/pkgs/applications/blockchains/parity-ui/default.nix b/nixpkgs/pkgs/applications/blockchains/parity-ui/default.nix
index 0615aed2ca0..0615aed2ca0 100644
--- a/pkgs/applications/blockchains/parity-ui/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/parity-ui/default.nix
diff --git a/pkgs/applications/blockchains/parity-ui/env.nix b/nixpkgs/pkgs/applications/blockchains/parity-ui/env.nix
index a878bbf2e3e..a878bbf2e3e 100644
--- a/pkgs/applications/blockchains/parity-ui/env.nix
+++ b/nixpkgs/pkgs/applications/blockchains/parity-ui/env.nix
diff --git a/pkgs/applications/blockchains/parity/beta.nix b/nixpkgs/pkgs/applications/blockchains/parity/beta.nix
index ffa509d2320..ffa509d2320 100644
--- a/pkgs/applications/blockchains/parity/beta.nix
+++ b/nixpkgs/pkgs/applications/blockchains/parity/beta.nix
diff --git a/pkgs/applications/blockchains/parity/default.nix b/nixpkgs/pkgs/applications/blockchains/parity/default.nix
index 1b5870b429b..1b5870b429b 100644
--- a/pkgs/applications/blockchains/parity/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/parity/default.nix
diff --git a/pkgs/applications/blockchains/parity/parity.nix b/nixpkgs/pkgs/applications/blockchains/parity/parity.nix
index 7f28d97bf81..7f28d97bf81 100644
--- a/pkgs/applications/blockchains/parity/parity.nix
+++ b/nixpkgs/pkgs/applications/blockchains/parity/parity.nix
diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/nixpkgs/pkgs/applications/blockchains/particl/particl-core.nix
index 613d57cd9c8..613d57cd9c8 100644
--- a/pkgs/applications/blockchains/particl/particl-core.nix
+++ b/nixpkgs/pkgs/applications/blockchains/particl/particl-core.nix
diff --git a/pkgs/applications/blockchains/pivx.nix b/nixpkgs/pkgs/applications/blockchains/pivx.nix
index cda342290a2..cda342290a2 100644
--- a/pkgs/applications/blockchains/pivx.nix
+++ b/nixpkgs/pkgs/applications/blockchains/pivx.nix
diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix
index b50b14258cc..b50b14258cc 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix
diff --git a/pkgs/applications/blockchains/stellar-core-dirty-version.patch b/nixpkgs/pkgs/applications/blockchains/stellar-core-dirty-version.patch
index 57d66ce5919..57d66ce5919 100644
--- a/pkgs/applications/blockchains/stellar-core-dirty-version.patch
+++ b/nixpkgs/pkgs/applications/blockchains/stellar-core-dirty-version.patch
diff --git a/pkgs/applications/blockchains/stellar-core.nix b/nixpkgs/pkgs/applications/blockchains/stellar-core.nix
index 4c3f9fe0760..4c3f9fe0760 100644
--- a/pkgs/applications/blockchains/stellar-core.nix
+++ b/nixpkgs/pkgs/applications/blockchains/stellar-core.nix
diff --git a/pkgs/applications/blockchains/sumokoin.nix b/nixpkgs/pkgs/applications/blockchains/sumokoin.nix
index ad65da057ae..ad65da057ae 100644
--- a/pkgs/applications/blockchains/sumokoin.nix
+++ b/nixpkgs/pkgs/applications/blockchains/sumokoin.nix
diff --git a/pkgs/applications/blockchains/vertcoin.nix b/nixpkgs/pkgs/applications/blockchains/vertcoin.nix
index 1b8b0376331..1b8b0376331 100644
--- a/pkgs/applications/blockchains/vertcoin.nix
+++ b/nixpkgs/pkgs/applications/blockchains/vertcoin.nix
diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix
index 6b9630fa6b7..6b9630fa6b7 100644
--- a/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix
diff --git a/pkgs/applications/blockchains/wownero.nix b/nixpkgs/pkgs/applications/blockchains/wownero.nix
index eb813a36125..eb813a36125 100644
--- a/pkgs/applications/blockchains/wownero.nix
+++ b/nixpkgs/pkgs/applications/blockchains/wownero.nix
diff --git a/pkgs/applications/blockchains/zcash/default.nix b/nixpkgs/pkgs/applications/blockchains/zcash/default.nix
index f6114b3c213..f6114b3c213 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/zcash/default.nix
diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix
index 31703f8fb2a..31703f8fb2a 100644
--- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix
+++ b/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
index 3128f125cd9..3128f125cd9 100644
--- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
+++ b/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch b/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch
index ab3ad2b10e4..ab3ad2b10e4 100644
--- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch
diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
index b5b26d7cc43..b5b26d7cc43 100644
--- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
+++ b/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix
index c251af74b21..c251af74b21 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix
diff --git a/pkgs/applications/display-managers/lightdm/fix-paths.patch b/nixpkgs/pkgs/applications/display-managers/lightdm/fix-paths.patch
index 4498bc4d1a3..4498bc4d1a3 100644
--- a/pkgs/applications/display-managers/lightdm/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/display-managers/lightdm/fix-paths.patch
diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
index be586bdac9b..be586bdac9b 100644
--- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
+++ b/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
diff --git a/pkgs/applications/display-managers/ly/default.nix b/nixpkgs/pkgs/applications/display-managers/ly/default.nix
index 2f0a770bc71..2f0a770bc71 100644
--- a/pkgs/applications/display-managers/ly/default.nix
+++ b/nixpkgs/pkgs/applications/display-managers/ly/default.nix
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/nixpkgs/pkgs/applications/display-managers/sddm/default.nix
index 735e83a0842..735e83a0842 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/nixpkgs/pkgs/applications/display-managers/sddm/default.nix
diff --git a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch b/nixpkgs/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
index aac09dfe876..aac09dfe876 100644
--- a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
+++ b/nixpkgs/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
diff --git a/pkgs/applications/editors/aewan/default.nix b/nixpkgs/pkgs/applications/editors/aewan/default.nix
index 1bd73bebe03..1bd73bebe03 100644
--- a/pkgs/applications/editors/aewan/default.nix
+++ b/nixpkgs/pkgs/applications/editors/aewan/default.nix
diff --git a/pkgs/applications/editors/amp/default.nix b/nixpkgs/pkgs/applications/editors/amp/default.nix
index 31d0806df8a..31d0806df8a 100644
--- a/pkgs/applications/editors/amp/default.nix
+++ b/nixpkgs/pkgs/applications/editors/amp/default.nix
diff --git a/pkgs/applications/editors/android-studio/common.nix b/nixpkgs/pkgs/applications/editors/android-studio/common.nix
index bd1685f7cdb..bd1685f7cdb 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/nixpkgs/pkgs/applications/editors/android-studio/common.nix
diff --git a/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix
index 60d00b7fbc7..60d00b7fbc7 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix
diff --git a/pkgs/applications/editors/aseprite/default.nix b/nixpkgs/pkgs/applications/editors/aseprite/default.nix
index 170fde7b9ca..170fde7b9ca 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/nixpkgs/pkgs/applications/editors/aseprite/default.nix
diff --git a/pkgs/applications/editors/aseprite/skia-deps.nix b/nixpkgs/pkgs/applications/editors/aseprite/skia-deps.nix
index e5655ca8315..e5655ca8315 100644
--- a/pkgs/applications/editors/aseprite/skia-deps.nix
+++ b/nixpkgs/pkgs/applications/editors/aseprite/skia-deps.nix
diff --git a/pkgs/applications/editors/aseprite/skia-make-deps.sh b/nixpkgs/pkgs/applications/editors/aseprite/skia-make-deps.sh
index 5e12c4f5c85..5e12c4f5c85 100755
--- a/pkgs/applications/editors/aseprite/skia-make-deps.sh
+++ b/nixpkgs/pkgs/applications/editors/aseprite/skia-make-deps.sh
diff --git a/pkgs/applications/editors/aseprite/skia.nix b/nixpkgs/pkgs/applications/editors/aseprite/skia.nix
index 8bf2adf484e..8bf2adf484e 100644
--- a/pkgs/applications/editors/aseprite/skia.nix
+++ b/nixpkgs/pkgs/applications/editors/aseprite/skia.nix
diff --git a/pkgs/applications/editors/atom/default.nix b/nixpkgs/pkgs/applications/editors/atom/default.nix
index 0a7e362e75a..0a7e362e75a 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/nixpkgs/pkgs/applications/editors/atom/default.nix
diff --git a/pkgs/applications/editors/atom/env.nix b/nixpkgs/pkgs/applications/editors/atom/env.nix
index cf783053679..cf783053679 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/nixpkgs/pkgs/applications/editors/atom/env.nix
diff --git a/pkgs/applications/editors/bluefish/default.nix b/nixpkgs/pkgs/applications/editors/bluefish/default.nix
index f78f7fbf914..f78f7fbf914 100644
--- a/pkgs/applications/editors/bluefish/default.nix
+++ b/nixpkgs/pkgs/applications/editors/bluefish/default.nix
diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix
index a12ccd257f8..a12ccd257f8 100644
--- a/pkgs/applications/editors/bonzomatic/default.nix
+++ b/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix
diff --git a/pkgs/applications/editors/brackets/default.nix b/nixpkgs/pkgs/applications/editors/brackets/default.nix
index 439b721632d..439b721632d 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/nixpkgs/pkgs/applications/editors/brackets/default.nix
diff --git a/pkgs/applications/editors/bvi/default.nix b/nixpkgs/pkgs/applications/editors/bvi/default.nix
index 2e79b80d610..2e79b80d610 100644
--- a/pkgs/applications/editors/bvi/default.nix
+++ b/nixpkgs/pkgs/applications/editors/bvi/default.nix
diff --git a/pkgs/applications/editors/bviplus/default.nix b/nixpkgs/pkgs/applications/editors/bviplus/default.nix
index 5fab7fe9da6..5fab7fe9da6 100644
--- a/pkgs/applications/editors/bviplus/default.nix
+++ b/nixpkgs/pkgs/applications/editors/bviplus/default.nix
diff --git a/pkgs/applications/editors/codeblocks/default.nix b/nixpkgs/pkgs/applications/editors/codeblocks/default.nix
index cbed08f317f..cbed08f317f 100644
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/nixpkgs/pkgs/applications/editors/codeblocks/default.nix
diff --git a/pkgs/applications/editors/codeblocks/writable-projects.patch b/nixpkgs/pkgs/applications/editors/codeblocks/writable-projects.patch
index 3b6364a52a1..3b6364a52a1 100644
--- a/pkgs/applications/editors/codeblocks/writable-projects.patch
+++ b/nixpkgs/pkgs/applications/editors/codeblocks/writable-projects.patch
diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix
index 65ec4393912..65ec4393912 100644
--- a/pkgs/applications/editors/deadpixi-sam/default.nix
+++ b/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix
diff --git a/pkgs/applications/editors/dhex/default.nix b/nixpkgs/pkgs/applications/editors/dhex/default.nix
index efb3a2f9ffa..efb3a2f9ffa 100644
--- a/pkgs/applications/editors/dhex/default.nix
+++ b/nixpkgs/pkgs/applications/editors/dhex/default.nix
diff --git a/pkgs/applications/editors/dit/default.nix b/nixpkgs/pkgs/applications/editors/dit/default.nix
index 2f83b0b8d99..2f83b0b8d99 100644
--- a/pkgs/applications/editors/dit/default.nix
+++ b/nixpkgs/pkgs/applications/editors/dit/default.nix
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix
index 6ae9eb078e2..6ae9eb078e2 100644
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix
diff --git a/pkgs/applications/editors/eclipse/default.nix b/nixpkgs/pkgs/applications/editors/eclipse/default.nix
index 4b3a7e11f3b..4b3a7e11f3b 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/nixpkgs/pkgs/applications/editors/eclipse/default.nix
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix
index 87c32c30e19..87c32c30e19 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix
diff --git a/pkgs/applications/editors/ed/default.nix b/nixpkgs/pkgs/applications/editors/ed/default.nix
index 90a7eeffb04..90a7eeffb04 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/nixpkgs/pkgs/applications/editors/ed/default.nix
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/nixpkgs/pkgs/applications/editors/edbrowse/default.nix
index c43640b6524..c43640b6524 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/nixpkgs/pkgs/applications/editors/edbrowse/default.nix
diff --git a/pkgs/applications/editors/edit/default.nix b/nixpkgs/pkgs/applications/editors/edit/default.nix
index 27c13c0cb39..27c13c0cb39 100644
--- a/pkgs/applications/editors/edit/default.nix
+++ b/nixpkgs/pkgs/applications/editors/edit/default.nix
diff --git a/pkgs/applications/editors/elvis/default.nix b/nixpkgs/pkgs/applications/editors/elvis/default.nix
index 4b7e4c8a3ca..4b7e4c8a3ca 100644
--- a/pkgs/applications/editors/elvis/default.nix
+++ b/nixpkgs/pkgs/applications/editors/elvis/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cedet/default.nix
index 5fbe095c4f3..5fbe095c4f3 100644
--- a/pkgs/applications/editors/emacs-modes/cedet/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/cedet/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/cedille/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cedille/default.nix
index 3af53cda492..3af53cda492 100644
--- a/pkgs/applications/editors/emacs-modes/cedille/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/cedille/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
index 33f2ad79ea0..33f2ad79ea0 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 9d4fb66f732..9d4fb66f732 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index a6d657199b9..a6d657199b9 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix
diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs2nix.nix
index cedc56e97ce..cedc56e97ce 100644
--- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs2nix.nix
diff --git a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix
index 077e72f5576..077e72f5576 100644
--- a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix
index ad22faf3dff..ad22faf3dff 100644
--- a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
index fdb28f44719..fdb28f44719 100644
--- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/header2/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/header2/default.nix
index 171d8c6b16a..171d8c6b16a 100644
--- a/pkgs/applications/editors/emacs-modes/header2/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/header2/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/helm-words/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/helm-words/default.nix
index c6e1c5a50f4..c6e1c5a50f4 100644
--- a/pkgs/applications/editors/emacs-modes/helm-words/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/helm-words/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/hexrgb/default.nix
index 8b9ebcd6026..8b9ebcd6026 100644
--- a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/hexrgb/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/hol_light/default.nix
index 255b30d60ed..255b30d60ed 100644
--- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/hol_light/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/hsc3/default.nix
index 75b72516a3c..75b72516a3c 100644
--- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/hsc3/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/icicles/default.nix
index 27dcd1063bf..27dcd1063bf 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/icicles/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
index eaa0f2c2a5b..eaa0f2c2a5b 100644
--- a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/lib-requires/default.nix
index 84dae10127e..84dae10127e 100644
--- a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/lib-requires/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/libgenerated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/libgenerated.nix
index 57bccc60818..57bccc60818 100644
--- a/pkgs/applications/editors/emacs-modes/libgenerated.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/libgenerated.nix
diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix
index c3c21b40a65..c3c21b40a65 100644
--- a/pkgs/applications/editors/emacs-modes/manual-packages.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 5c9456b76a6..5c9456b76a6 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/ocaml/default.nix
index becc2dc5dc9..becc2dc5dc9 100644
--- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/ocaml/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix
index 302f5adcfb1..302f5adcfb1 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix
diff --git a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
index 4d8f40074bd..4d8f40074bd 100644
--- a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/org-packages.nix
index 1f37cf624f9..1f37cf624f9 100644
--- a/pkgs/applications/editors/emacs-modes/org-packages.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/org-packages.nix
diff --git a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
index 9f251f54d6a..9f251f54d6a 100644
--- a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/pod-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/pod-mode/default.nix
index 198adefc016..198adefc016 100644
--- a/pkgs/applications/editors/emacs-modes/pod-mode/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/pod-mode/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix
index 337a1585b1b..337a1585b1b 100644
--- a/pkgs/applications/editors/emacs-modes/prolog/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/railgun/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/railgun/default.nix
index ba716e1dd13..ba716e1dd13 100644
--- a/pkgs/applications/editors/emacs-modes/railgun/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/railgun/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index 66d5f65953b..66d5f65953b 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
index 54e5a89dd9f..54e5a89dd9f 100644
--- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
index 165e0c13c8f..165e0c13c8f 100644
--- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
index fcb37e7ebad..fcb37e7ebad 100644
--- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix
index bcd947983a3..bcd947983a3 100644
--- a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
index 820919b5321..820919b5321 100644
--- a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/tramp/default.nix
index 3b746c293d8..3b746c293d8 100644
--- a/pkgs/applications/editors/emacs-modes/tramp/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/tramp/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/update-elpa b/nixpkgs/pkgs/applications/editors/emacs-modes/update-elpa
index ba2964b2ead..ba2964b2ead 100755
--- a/pkgs/applications/editors/emacs-modes/update-elpa
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/update-elpa
diff --git a/pkgs/applications/editors/emacs-modes/update-from-overlay b/nixpkgs/pkgs/applications/editors/emacs-modes/update-from-overlay
index 26d2482e7ae..26d2482e7ae 100755
--- a/pkgs/applications/editors/emacs-modes/update-from-overlay
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/update-from-overlay
diff --git a/pkgs/applications/editors/emacs-modes/update-melpa b/nixpkgs/pkgs/applications/editors/emacs-modes/update-melpa
index 5c636416a5e..5c636416a5e 100755
--- a/pkgs/applications/editors/emacs-modes/update-melpa
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/update-melpa
diff --git a/pkgs/applications/editors/emacs-modes/update-melpa.el b/nixpkgs/pkgs/applications/editors/emacs-modes/update-melpa.el
index b315777620e..b315777620e 100644
--- a/pkgs/applications/editors/emacs-modes/update-melpa.el
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/update-melpa.el
diff --git a/pkgs/applications/editors/emacs-modes/update-org b/nixpkgs/pkgs/applications/editors/emacs-modes/update-org
index 2119a167228..2119a167228 100755
--- a/pkgs/applications/editors/emacs-modes/update-org
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/update-org
diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix
index 518ee67e451..518ee67e451 100644
--- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix
diff --git a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix
index 209a99245ec..209a99245ec 100644
--- a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix
index 9403a51df53..9403a51df53 100644
--- a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix
diff --git a/pkgs/applications/editors/emacs/25.nix b/nixpkgs/pkgs/applications/editors/emacs/25.nix
index e4643102f0e..e4643102f0e 100644
--- a/pkgs/applications/editors/emacs/25.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs/25.nix
diff --git a/pkgs/applications/editors/emacs/at-fdcwd.patch b/nixpkgs/pkgs/applications/editors/emacs/at-fdcwd.patch
index 2d8099b7373..2d8099b7373 100644
--- a/pkgs/applications/editors/emacs/at-fdcwd.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs/at-fdcwd.patch
diff --git a/pkgs/applications/editors/emacs/clean-env.patch b/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch
index 88befda899a..88befda899a 100644
--- a/pkgs/applications/editors/emacs/clean-env.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch
diff --git a/pkgs/applications/editors/emacs/default.nix b/nixpkgs/pkgs/applications/editors/emacs/default.nix
index 98653517b5e..98653517b5e 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs/default.nix
diff --git a/pkgs/applications/editors/emacs/macport.nix b/nixpkgs/pkgs/applications/editors/emacs/macport.nix
index e9307c7e80b..e9307c7e80b 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs/macport.nix
diff --git a/pkgs/applications/editors/emacs/site-start.el b/nixpkgs/pkgs/applications/editors/emacs/site-start.el
index de4708b8890..de4708b8890 100644
--- a/pkgs/applications/editors/emacs/site-start.el
+++ b/nixpkgs/pkgs/applications/editors/emacs/site-start.el
diff --git a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch b/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
index 5d16194fd20..5d16194fd20 100644
--- a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
diff --git a/pkgs/applications/editors/featherpad/default.nix b/nixpkgs/pkgs/applications/editors/featherpad/default.nix
index e48fba1551e..e48fba1551e 100644
--- a/pkgs/applications/editors/featherpad/default.nix
+++ b/nixpkgs/pkgs/applications/editors/featherpad/default.nix
diff --git a/pkgs/applications/editors/flpsed/default.nix b/nixpkgs/pkgs/applications/editors/flpsed/default.nix
index cbff8e606f2..cbff8e606f2 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/nixpkgs/pkgs/applications/editors/flpsed/default.nix
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/nixpkgs/pkgs/applications/editors/focuswriter/default.nix
index ccda1b4d4cb..ccda1b4d4cb 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/nixpkgs/pkgs/applications/editors/focuswriter/default.nix
diff --git a/pkgs/applications/editors/fte/default.nix b/nixpkgs/pkgs/applications/editors/fte/default.nix
index ab149131b80..ab149131b80 100644
--- a/pkgs/applications/editors/fte/default.nix
+++ b/nixpkgs/pkgs/applications/editors/fte/default.nix
diff --git a/pkgs/applications/editors/geany/default.nix b/nixpkgs/pkgs/applications/editors/geany/default.nix
index d3cc3624419..d3cc3624419 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/nixpkgs/pkgs/applications/editors/geany/default.nix
diff --git a/pkgs/applications/editors/geany/with-vte.nix b/nixpkgs/pkgs/applications/editors/geany/with-vte.nix
index ece5c95f05a..ece5c95f05a 100644
--- a/pkgs/applications/editors/geany/with-vte.nix
+++ b/nixpkgs/pkgs/applications/editors/geany/with-vte.nix
diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix
index 1e07902365d..1e07902365d 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix
diff --git a/pkgs/applications/editors/glow/default.nix b/nixpkgs/pkgs/applications/editors/glow/default.nix
index 928291940cf..928291940cf 100644
--- a/pkgs/applications/editors/glow/default.nix
+++ b/nixpkgs/pkgs/applications/editors/glow/default.nix
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix
index bda0552e752..bda0552e752 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix
diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix
index cfd3a428990..cfd3a428990 100644
--- a/pkgs/applications/editors/gnome-latex/default.nix
+++ b/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix
diff --git a/pkgs/applications/editors/gobby/default.nix b/nixpkgs/pkgs/applications/editors/gobby/default.nix
index f194227932d..f194227932d 100644
--- a/pkgs/applications/editors/gobby/default.nix
+++ b/nixpkgs/pkgs/applications/editors/gobby/default.nix
diff --git a/pkgs/applications/editors/hecate/default.nix b/nixpkgs/pkgs/applications/editors/hecate/default.nix
index de57fb09215..de57fb09215 100644
--- a/pkgs/applications/editors/hecate/default.nix
+++ b/nixpkgs/pkgs/applications/editors/hecate/default.nix
diff --git a/pkgs/applications/editors/hecate/deps.nix b/nixpkgs/pkgs/applications/editors/hecate/deps.nix
index c9d94934a44..c9d94934a44 100644
--- a/pkgs/applications/editors/hecate/deps.nix
+++ b/nixpkgs/pkgs/applications/editors/hecate/deps.nix
diff --git a/pkgs/applications/editors/heme/default.nix b/nixpkgs/pkgs/applications/editors/heme/default.nix
index 4e67fc304b1..4e67fc304b1 100644
--- a/pkgs/applications/editors/heme/default.nix
+++ b/nixpkgs/pkgs/applications/editors/heme/default.nix
diff --git a/pkgs/applications/editors/hexcurse/default.nix b/nixpkgs/pkgs/applications/editors/hexcurse/default.nix
index c87694321f3..c87694321f3 100644
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/nixpkgs/pkgs/applications/editors/hexcurse/default.nix
diff --git a/pkgs/applications/editors/hexdino/default.nix b/nixpkgs/pkgs/applications/editors/hexdino/default.nix
index eee5a696555..eee5a696555 100644
--- a/pkgs/applications/editors/hexdino/default.nix
+++ b/nixpkgs/pkgs/applications/editors/hexdino/default.nix
diff --git a/pkgs/applications/editors/hexedit/default.nix b/nixpkgs/pkgs/applications/editors/hexedit/default.nix
index 09191b38e1b..09191b38e1b 100644
--- a/pkgs/applications/editors/hexedit/default.nix
+++ b/nixpkgs/pkgs/applications/editors/hexedit/default.nix
diff --git a/pkgs/applications/editors/howl/default.nix b/nixpkgs/pkgs/applications/editors/howl/default.nix
index 5e5f2f8563c..5e5f2f8563c 100644
--- a/pkgs/applications/editors/howl/default.nix
+++ b/nixpkgs/pkgs/applications/editors/howl/default.nix
diff --git a/pkgs/applications/editors/ht/default.nix b/nixpkgs/pkgs/applications/editors/ht/default.nix
index fc1fe969bdc..fc1fe969bdc 100644
--- a/pkgs/applications/editors/ht/default.nix
+++ b/nixpkgs/pkgs/applications/editors/ht/default.nix
diff --git a/pkgs/applications/editors/ht/gcc7.patch b/nixpkgs/pkgs/applications/editors/ht/gcc7.patch
index a90deaac698..a90deaac698 100644
--- a/pkgs/applications/editors/ht/gcc7.patch
+++ b/nixpkgs/pkgs/applications/editors/ht/gcc7.patch
diff --git a/pkgs/applications/editors/jedit/build.xml.patch b/nixpkgs/pkgs/applications/editors/jedit/build.xml.patch
index 2f630f18ab7..2f630f18ab7 100644
--- a/pkgs/applications/editors/jedit/build.xml.patch
+++ b/nixpkgs/pkgs/applications/editors/jedit/build.xml.patch
diff --git a/pkgs/applications/editors/jedit/default.nix b/nixpkgs/pkgs/applications/editors/jedit/default.nix
index 21a6a847518..21a6a847518 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/nixpkgs/pkgs/applications/editors/jedit/default.nix
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/nixpkgs/pkgs/applications/editors/jetbrains/common.nix
index bca85c01016..bca85c01016 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/nixpkgs/pkgs/applications/editors/jetbrains/common.nix
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
index 83dff4a4f29..83dff4a4f29 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
diff --git a/pkgs/applications/editors/jetbrains/update.pl b/nixpkgs/pkgs/applications/editors/jetbrains/update.pl
index b4a96228db4..b4a96228db4 100755
--- a/pkgs/applications/editors/jetbrains/update.pl
+++ b/nixpkgs/pkgs/applications/editors/jetbrains/update.pl
diff --git a/pkgs/applications/editors/joe/default.nix b/nixpkgs/pkgs/applications/editors/joe/default.nix
index 6f5839b3d06..6f5839b3d06 100644
--- a/pkgs/applications/editors/joe/default.nix
+++ b/nixpkgs/pkgs/applications/editors/joe/default.nix
diff --git a/pkgs/applications/editors/jucipp/default.nix b/nixpkgs/pkgs/applications/editors/jucipp/default.nix
index 2682c1e789b..2682c1e789b 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/nixpkgs/pkgs/applications/editors/jucipp/default.nix
diff --git a/pkgs/applications/editors/jupp/default.nix b/nixpkgs/pkgs/applications/editors/jupp/default.nix
index 4a44b35a0fa..4a44b35a0fa 100644
--- a/pkgs/applications/editors/jupp/default.nix
+++ b/nixpkgs/pkgs/applications/editors/jupp/default.nix
diff --git a/pkgs/applications/editors/jupyter/default.nix b/nixpkgs/pkgs/applications/editors/jupyter/default.nix
index 2bca120c1de..2bca120c1de 100644
--- a/pkgs/applications/editors/jupyter/default.nix
+++ b/nixpkgs/pkgs/applications/editors/jupyter/default.nix
diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/nixpkgs/pkgs/applications/editors/jupyter/kernel.nix
index 43cea9fcae9..43cea9fcae9 100644
--- a/pkgs/applications/editors/jupyter/kernel.nix
+++ b/nixpkgs/pkgs/applications/editors/jupyter/kernel.nix
diff --git a/pkgs/applications/editors/kakoune/default.nix b/nixpkgs/pkgs/applications/editors/kakoune/default.nix
index 8cb70af40e0..8cb70af40e0 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/default.nix
diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix
index 4e92887bccb..4e92887bccb 100644
--- a/pkgs/applications/editors/kakoune/plugins/default.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix
index 408cba45fbe..408cba45fbe 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix
index 512f1f09207..512f1f09207 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
index eaf20aeadf8..eaf20aeadf8 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
index dd0faf63453..dd0faf63453 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix
index 7abef930531..7abef930531 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
index d328e47f7e1..d328e47f7e1 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
index 7658ba0f7ad..7658ba0f7ad 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix
index b4cc823880e..b4cc823880e 100644
--- a/pkgs/applications/editors/kakoune/wrapper.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix
diff --git a/pkgs/applications/editors/kakoune/wrapper.sh b/nixpkgs/pkgs/applications/editors/kakoune/wrapper.sh
index 48a971a10c6..48a971a10c6 100644
--- a/pkgs/applications/editors/kakoune/wrapper.sh
+++ b/nixpkgs/pkgs/applications/editors/kakoune/wrapper.sh
diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix
index 35efe76cfb2..35efe76cfb2 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-php.nix
+++ b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix
diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix
index 0f15a63be7a..0f15a63be7a 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-python.nix
+++ b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
index 0ed4fe0aaad..0ed4fe0aaad 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
+++ b/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix
index ed5017a0487..ed5017a0487 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix
diff --git a/pkgs/applications/editors/kdevelop5/wrapper.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/wrapper.nix
index 86d3de9eb39..86d3de9eb39 100644
--- a/pkgs/applications/editors/kdevelop5/wrapper.nix
+++ b/nixpkgs/pkgs/applications/editors/kdevelop5/wrapper.nix
diff --git a/pkgs/applications/editors/kile/default.nix b/nixpkgs/pkgs/applications/editors/kile/default.nix
index 494ad686ee3..494ad686ee3 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/nixpkgs/pkgs/applications/editors/kile/default.nix
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/nixpkgs/pkgs/applications/editors/kodestudio/default.nix
index 9d0d91f4be5..9d0d91f4be5 100644
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ b/nixpkgs/pkgs/applications/editors/kodestudio/default.nix
diff --git a/pkgs/applications/editors/leafpad/default.nix b/nixpkgs/pkgs/applications/editors/leafpad/default.nix
index 508d2329edc..508d2329edc 100644
--- a/pkgs/applications/editors/leafpad/default.nix
+++ b/nixpkgs/pkgs/applications/editors/leafpad/default.nix
diff --git a/pkgs/applications/editors/leo-editor/default.nix b/nixpkgs/pkgs/applications/editors/leo-editor/default.nix
index bd433436eb0..bd433436eb0 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/nixpkgs/pkgs/applications/editors/leo-editor/default.nix
diff --git a/pkgs/applications/editors/lighttable/default.nix b/nixpkgs/pkgs/applications/editors/lighttable/default.nix
index 90e8c73e075..90e8c73e075 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/nixpkgs/pkgs/applications/editors/lighttable/default.nix
diff --git a/pkgs/applications/editors/manuskript/default.nix b/nixpkgs/pkgs/applications/editors/manuskript/default.nix
index 811284491dd..811284491dd 100644
--- a/pkgs/applications/editors/manuskript/default.nix
+++ b/nixpkgs/pkgs/applications/editors/manuskript/default.nix
diff --git a/pkgs/applications/editors/mg/default.nix b/nixpkgs/pkgs/applications/editors/mg/default.nix
index de1a5ce7879..de1a5ce7879 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/nixpkgs/pkgs/applications/editors/mg/default.nix
diff --git a/pkgs/applications/editors/micro/default.nix b/nixpkgs/pkgs/applications/editors/micro/default.nix
index e6b93f20c48..e6b93f20c48 100644
--- a/pkgs/applications/editors/micro/default.nix
+++ b/nixpkgs/pkgs/applications/editors/micro/default.nix
diff --git a/pkgs/applications/editors/mindforger/build.patch b/nixpkgs/pkgs/applications/editors/mindforger/build.patch
index e2745cbce2d..e2745cbce2d 100644
--- a/pkgs/applications/editors/mindforger/build.patch
+++ b/nixpkgs/pkgs/applications/editors/mindforger/build.patch
diff --git a/pkgs/applications/editors/mindforger/default.nix b/nixpkgs/pkgs/applications/editors/mindforger/default.nix
index 9cfcf95e78b..9cfcf95e78b 100644
--- a/pkgs/applications/editors/mindforger/default.nix
+++ b/nixpkgs/pkgs/applications/editors/mindforger/default.nix
diff --git a/pkgs/applications/editors/mle/default.nix b/nixpkgs/pkgs/applications/editors/mle/default.nix
index 2c36be1c21b..2c36be1c21b 100644
--- a/pkgs/applications/editors/mle/default.nix
+++ b/nixpkgs/pkgs/applications/editors/mle/default.nix
diff --git a/pkgs/applications/editors/moe/default.nix b/nixpkgs/pkgs/applications/editors/moe/default.nix
index 4e960524b94..4e960524b94 100644
--- a/pkgs/applications/editors/moe/default.nix
+++ b/nixpkgs/pkgs/applications/editors/moe/default.nix
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/nixpkgs/pkgs/applications/editors/monodevelop/default.nix
index 3a21eec07f4..3a21eec07f4 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/nixpkgs/pkgs/applications/editors/monodevelop/default.nix
diff --git a/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch b/nixpkgs/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch
index 969aad33ec0..969aad33ec0 100644
--- a/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch
+++ b/nixpkgs/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch
diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix
index 8522ecf9c78..8522ecf9c78 100644
--- a/pkgs/applications/editors/music/tuxguitar/default.nix
+++ b/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix
diff --git a/pkgs/applications/editors/nano/default.nix b/nixpkgs/pkgs/applications/editors/nano/default.nix
index 4197792d736..4197792d736 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/nixpkgs/pkgs/applications/editors/nano/default.nix
diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix
index eab37fba19a..eab37fba19a 100644
--- a/pkgs/applications/editors/nano/nanorc/default.nix
+++ b/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix
diff --git a/pkgs/applications/editors/ne/default.nix b/nixpkgs/pkgs/applications/editors/ne/default.nix
index 3c96ba91165..3c96ba91165 100644
--- a/pkgs/applications/editors/ne/default.nix
+++ b/nixpkgs/pkgs/applications/editors/ne/default.nix
diff --git a/pkgs/applications/editors/nedit/default.nix b/nixpkgs/pkgs/applications/editors/nedit/default.nix
index e1d1fa3070a..e1d1fa3070a 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/nixpkgs/pkgs/applications/editors/nedit/default.nix
diff --git a/pkgs/applications/editors/neovim/default.nix b/nixpkgs/pkgs/applications/editors/neovim/default.nix
index 2fff5cdce85..2fff5cdce85 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/nixpkgs/pkgs/applications/editors/neovim/default.nix
diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix
index 764d7004940..764d7004940 100644
--- a/pkgs/applications/editors/neovim/gnvim/default.nix
+++ b/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix
diff --git a/pkgs/applications/editors/neovim/gnvim/wrapper.nix b/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix
index e16fe8a8adc..e16fe8a8adc 100644
--- a/pkgs/applications/editors/neovim/gnvim/wrapper.nix
+++ b/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix
diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix
index aae37b5a262..aae37b5a262 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix
diff --git a/pkgs/applications/editors/neovim/qt.nix b/nixpkgs/pkgs/applications/editors/neovim/qt.nix
index 8fe93d37c7e..8fe93d37c7e 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/nixpkgs/pkgs/applications/editors/neovim/qt.nix
diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile b/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/Gemfile
index eebecf2906f..eebecf2906f 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile
+++ b/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/Gemfile
diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
index 6a3f581c4e8..6a3f581c4e8 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
index 28a53cc590f..28a53cc590f 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
+++ b/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
diff --git a/pkgs/applications/editors/neovim/system_rplugin_manifest.patch b/nixpkgs/pkgs/applications/editors/neovim/system_rplugin_manifest.patch
index f634d3ec056..f634d3ec056 100644
--- a/pkgs/applications/editors/neovim/system_rplugin_manifest.patch
+++ b/nixpkgs/pkgs/applications/editors/neovim/system_rplugin_manifest.patch
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix
index c0b97667757..c0b97667757 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix
diff --git a/pkgs/applications/editors/netbeans/default.nix b/nixpkgs/pkgs/applications/editors/netbeans/default.nix
index 38b92151b29..38b92151b29 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/nixpkgs/pkgs/applications/editors/netbeans/default.nix
diff --git a/pkgs/applications/editors/notepadqq/default.nix b/nixpkgs/pkgs/applications/editors/notepadqq/default.nix
index efda2c58360..efda2c58360 100644
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ b/nixpkgs/pkgs/applications/editors/notepadqq/default.nix
diff --git a/pkgs/applications/editors/nvi/default.nix b/nixpkgs/pkgs/applications/editors/nvi/default.nix
index a7a6b35a24a..a7a6b35a24a 100644
--- a/pkgs/applications/editors/nvi/default.nix
+++ b/nixpkgs/pkgs/applications/editors/nvi/default.nix
diff --git a/pkgs/applications/editors/nvpy/default.nix b/nixpkgs/pkgs/applications/editors/nvpy/default.nix
index 567f4752035..567f4752035 100644
--- a/pkgs/applications/editors/nvpy/default.nix
+++ b/nixpkgs/pkgs/applications/editors/nvpy/default.nix
diff --git a/pkgs/applications/editors/okteta/default.nix b/nixpkgs/pkgs/applications/editors/okteta/default.nix
index 5c7ddfb34d4..5c7ddfb34d4 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/nixpkgs/pkgs/applications/editors/okteta/default.nix
diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix
index 6a6ea80ca45..6a6ea80ca45 100644
--- a/pkgs/applications/editors/quartus-prime/default.nix
+++ b/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix
diff --git a/pkgs/applications/editors/quartus-prime/vsim.patch b/nixpkgs/pkgs/applications/editors/quartus-prime/vsim.patch
index 36dc41b7ef1..36dc41b7ef1 100644
--- a/pkgs/applications/editors/quartus-prime/vsim.patch
+++ b/nixpkgs/pkgs/applications/editors/quartus-prime/vsim.patch
diff --git a/pkgs/applications/editors/quilter/default.nix b/nixpkgs/pkgs/applications/editors/quilter/default.nix
index ceb119a5f0a..ceb119a5f0a 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/nixpkgs/pkgs/applications/editors/quilter/default.nix
diff --git a/pkgs/applications/editors/rednotebook/default.nix b/nixpkgs/pkgs/applications/editors/rednotebook/default.nix
index 622c4a680f5..622c4a680f5 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/nixpkgs/pkgs/applications/editors/rednotebook/default.nix
diff --git a/pkgs/applications/editors/retext/default.nix b/nixpkgs/pkgs/applications/editors/retext/default.nix
index e9742389261..e9742389261 100644
--- a/pkgs/applications/editors/retext/default.nix
+++ b/nixpkgs/pkgs/applications/editors/retext/default.nix
diff --git a/pkgs/applications/editors/rstudio/clang-location.patch b/nixpkgs/pkgs/applications/editors/rstudio/clang-location.patch
index 402abdd8563..402abdd8563 100644
--- a/pkgs/applications/editors/rstudio/clang-location.patch
+++ b/nixpkgs/pkgs/applications/editors/rstudio/clang-location.patch
diff --git a/pkgs/applications/editors/rstudio/default.nix b/nixpkgs/pkgs/applications/editors/rstudio/default.nix
index 933644cc471..933644cc471 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/nixpkgs/pkgs/applications/editors/rstudio/default.nix
diff --git a/pkgs/applications/editors/rstudio/r-location.patch b/nixpkgs/pkgs/applications/editors/rstudio/r-location.patch
index 24cb6a24697..24cb6a24697 100644
--- a/pkgs/applications/editors/rstudio/r-location.patch
+++ b/nixpkgs/pkgs/applications/editors/rstudio/r-location.patch
diff --git a/pkgs/applications/editors/scite/default.nix b/nixpkgs/pkgs/applications/editors/scite/default.nix
index 78dd0d09541..78dd0d09541 100644
--- a/pkgs/applications/editors/scite/default.nix
+++ b/nixpkgs/pkgs/applications/editors/scite/default.nix
diff --git a/pkgs/applications/editors/sigil/default.nix b/nixpkgs/pkgs/applications/editors/sigil/default.nix
index ac171f60ead..ac171f60ead 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/nixpkgs/pkgs/applications/editors/sigil/default.nix
diff --git a/pkgs/applications/editors/standardnotes/default.nix b/nixpkgs/pkgs/applications/editors/standardnotes/default.nix
index 5a13d91aef2..5a13d91aef2 100644
--- a/pkgs/applications/editors/standardnotes/default.nix
+++ b/nixpkgs/pkgs/applications/editors/standardnotes/default.nix
diff --git a/pkgs/applications/editors/sublime/2/default.nix b/nixpkgs/pkgs/applications/editors/sublime/2/default.nix
index 24639f3bfd4..24639f3bfd4 100644
--- a/pkgs/applications/editors/sublime/2/default.nix
+++ b/nixpkgs/pkgs/applications/editors/sublime/2/default.nix
diff --git a/pkgs/applications/editors/sublime/3/common.nix b/nixpkgs/pkgs/applications/editors/sublime/3/common.nix
index 8e52237d949..8e52237d949 100644
--- a/pkgs/applications/editors/sublime/3/common.nix
+++ b/nixpkgs/pkgs/applications/editors/sublime/3/common.nix
diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix
index d72966e0440..d72966e0440 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix
diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix
index 6714f917315..6714f917315 100644
--- a/pkgs/applications/editors/supertux-editor/default.nix
+++ b/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix
diff --git a/pkgs/applications/editors/tecoc/default.nix b/nixpkgs/pkgs/applications/editors/tecoc/default.nix
index 48af4a99dad..48af4a99dad 100644
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/nixpkgs/pkgs/applications/editors/tecoc/default.nix
diff --git a/pkgs/applications/editors/texmacs/common.nix b/nixpkgs/pkgs/applications/editors/texmacs/common.nix
index ec2498aa69b..ec2498aa69b 100644
--- a/pkgs/applications/editors/texmacs/common.nix
+++ b/nixpkgs/pkgs/applications/editors/texmacs/common.nix
diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix
index 5d5843890e1..5d5843890e1 100644
--- a/pkgs/applications/editors/texmacs/darwin.nix
+++ b/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix
diff --git a/pkgs/applications/editors/texmacs/darwin.patch b/nixpkgs/pkgs/applications/editors/texmacs/darwin.patch
index 2cb33fbbef3..2cb33fbbef3 100644
--- a/pkgs/applications/editors/texmacs/darwin.patch
+++ b/nixpkgs/pkgs/applications/editors/texmacs/darwin.patch
diff --git a/pkgs/applications/editors/texmacs/default.nix b/nixpkgs/pkgs/applications/editors/texmacs/default.nix
index 91e2427a6c8..91e2427a6c8 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/nixpkgs/pkgs/applications/editors/texmacs/default.nix
diff --git a/pkgs/applications/editors/texmaker/default.nix b/nixpkgs/pkgs/applications/editors/texmaker/default.nix
index c45025dd80c..c45025dd80c 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/nixpkgs/pkgs/applications/editors/texmaker/default.nix
diff --git a/pkgs/applications/editors/texstudio/default.nix b/nixpkgs/pkgs/applications/editors/texstudio/default.nix
index 372d9508174..372d9508174 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/nixpkgs/pkgs/applications/editors/texstudio/default.nix
diff --git a/pkgs/applications/editors/textadept/default.nix b/nixpkgs/pkgs/applications/editors/textadept/default.nix
index 85006e51b66..85006e51b66 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/nixpkgs/pkgs/applications/editors/textadept/default.nix
diff --git a/pkgs/applications/editors/textadept/deps.nix b/nixpkgs/pkgs/applications/editors/textadept/deps.nix
index 80306191ff1..80306191ff1 100644
--- a/pkgs/applications/editors/textadept/deps.nix
+++ b/nixpkgs/pkgs/applications/editors/textadept/deps.nix
diff --git a/pkgs/applications/editors/texworks/default.nix b/nixpkgs/pkgs/applications/editors/texworks/default.nix
index 8042363f73c..8042363f73c 100644
--- a/pkgs/applications/editors/texworks/default.nix
+++ b/nixpkgs/pkgs/applications/editors/texworks/default.nix
diff --git a/pkgs/applications/editors/thonny/default.nix b/nixpkgs/pkgs/applications/editors/thonny/default.nix
index 26b7ab5a0fb..26b7ab5a0fb 100644
--- a/pkgs/applications/editors/thonny/default.nix
+++ b/nixpkgs/pkgs/applications/editors/thonny/default.nix
diff --git a/pkgs/applications/editors/tiled/default.nix b/nixpkgs/pkgs/applications/editors/tiled/default.nix
index aa6fc0a7d24..aa6fc0a7d24 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/nixpkgs/pkgs/applications/editors/tiled/default.nix
diff --git a/pkgs/applications/editors/tweak/default.nix b/nixpkgs/pkgs/applications/editors/tweak/default.nix
index 6bfce921d0f..6bfce921d0f 100644
--- a/pkgs/applications/editors/tweak/default.nix
+++ b/nixpkgs/pkgs/applications/editors/tweak/default.nix
diff --git a/pkgs/applications/editors/typora/default.nix b/nixpkgs/pkgs/applications/editors/typora/default.nix
index 09baf383f97..09baf383f97 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/nixpkgs/pkgs/applications/editors/typora/default.nix
diff --git a/pkgs/applications/editors/uberwriter/default.nix b/nixpkgs/pkgs/applications/editors/uberwriter/default.nix
index 48ebc79e705..48ebc79e705 100644
--- a/pkgs/applications/editors/uberwriter/default.nix
+++ b/nixpkgs/pkgs/applications/editors/uberwriter/default.nix
diff --git a/pkgs/applications/editors/uemacs/default.nix b/nixpkgs/pkgs/applications/editors/uemacs/default.nix
index 0a2df6b6d4b..0a2df6b6d4b 100644
--- a/pkgs/applications/editors/uemacs/default.nix
+++ b/nixpkgs/pkgs/applications/editors/uemacs/default.nix
diff --git a/pkgs/applications/editors/vbindiff/default.nix b/nixpkgs/pkgs/applications/editors/vbindiff/default.nix
index d1aa59569e6..d1aa59569e6 100644
--- a/pkgs/applications/editors/vbindiff/default.nix
+++ b/nixpkgs/pkgs/applications/editors/vbindiff/default.nix
diff --git a/pkgs/applications/editors/vim/cflags-prune.diff b/nixpkgs/pkgs/applications/editors/vim/cflags-prune.diff
index 6bec4fec09e..6bec4fec09e 100644
--- a/pkgs/applications/editors/vim/cflags-prune.diff
+++ b/nixpkgs/pkgs/applications/editors/vim/cflags-prune.diff
diff --git a/pkgs/applications/editors/vim/common.nix b/nixpkgs/pkgs/applications/editors/vim/common.nix
index 485f1d0dca3..485f1d0dca3 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/nixpkgs/pkgs/applications/editors/vim/common.nix
diff --git a/pkgs/applications/editors/vim/configurable.nix b/nixpkgs/pkgs/applications/editors/vim/configurable.nix
index bb3d571e6f8..bb3d571e6f8 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/nixpkgs/pkgs/applications/editors/vim/configurable.nix
diff --git a/pkgs/applications/editors/vim/default.nix b/nixpkgs/pkgs/applications/editors/vim/default.nix
index ae4e9ac8a9c..ae4e9ac8a9c 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/nixpkgs/pkgs/applications/editors/vim/default.nix
diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/nixpkgs/pkgs/applications/editors/vim/ft-nix-support.patch
index 274d855731f..274d855731f 100644
--- a/pkgs/applications/editors/vim/ft-nix-support.patch
+++ b/nixpkgs/pkgs/applications/editors/vim/ft-nix-support.patch
diff --git a/pkgs/applications/editors/vim/macvim-sparkle.patch b/nixpkgs/pkgs/applications/editors/vim/macvim-sparkle.patch
index e0ba5145b3e..e0ba5145b3e 100644
--- a/pkgs/applications/editors/vim/macvim-sparkle.patch
+++ b/nixpkgs/pkgs/applications/editors/vim/macvim-sparkle.patch
diff --git a/pkgs/applications/editors/vim/macvim.nix b/nixpkgs/pkgs/applications/editors/vim/macvim.nix
index ede12f50fec..ede12f50fec 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/nixpkgs/pkgs/applications/editors/vim/macvim.nix
diff --git a/pkgs/applications/editors/vim/macvim.patch b/nixpkgs/pkgs/applications/editors/vim/macvim.patch
index 9d5dbded26a..9d5dbded26a 100644
--- a/pkgs/applications/editors/vim/macvim.patch
+++ b/nixpkgs/pkgs/applications/editors/vim/macvim.patch
diff --git a/pkgs/applications/editors/vim/qvim.nix b/nixpkgs/pkgs/applications/editors/vim/qvim.nix
index 81948918a11..81948918a11 100644
--- a/pkgs/applications/editors/vim/qvim.nix
+++ b/nixpkgs/pkgs/applications/editors/vim/qvim.nix
diff --git a/pkgs/applications/editors/vis/default.nix b/nixpkgs/pkgs/applications/editors/vis/default.nix
index 1bda6958206..1bda6958206 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/nixpkgs/pkgs/applications/editors/vis/default.nix
diff --git a/pkgs/applications/editors/vscode/generic.nix b/nixpkgs/pkgs/applications/editors/vscode/generic.nix
index bdcf786f61d..bdcf786f61d 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/nixpkgs/pkgs/applications/editors/vscode/generic.nix
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
index 663c64ac5de..663c64ac5de 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
index e7bdacc1390..e7bdacc1390 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix
index 074e6b8b12d..074e6b8b12d 100644
--- a/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix
diff --git a/pkgs/applications/editors/wily/default.nix b/nixpkgs/pkgs/applications/editors/wily/default.nix
index aab3aecd7d6..aab3aecd7d6 100644
--- a/pkgs/applications/editors/wily/default.nix
+++ b/nixpkgs/pkgs/applications/editors/wily/default.nix
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix
index 4725d8143b4..4725d8143b4 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix
diff --git a/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch b/nixpkgs/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch
index 75722c9c7c5..75722c9c7c5 100644
--- a/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch
+++ b/nixpkgs/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch
diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix
index eeda097db25..eeda097db25 100644
--- a/pkgs/applications/editors/xmlcopyeditor/default.nix
+++ b/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix
diff --git a/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch b/nixpkgs/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch
index 253b9ce49ba..253b9ce49ba 100644
--- a/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch
+++ b/nixpkgs/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch
diff --git a/pkgs/applications/editors/yi/wrapper.nix b/nixpkgs/pkgs/applications/editors/yi/wrapper.nix
index 243690bc263..243690bc263 100644
--- a/pkgs/applications/editors/yi/wrapper.nix
+++ b/nixpkgs/pkgs/applications/editors/yi/wrapper.nix
diff --git a/pkgs/applications/editors/zile/default.nix b/nixpkgs/pkgs/applications/editors/zile/default.nix
index ae3871bb87a..ae3871bb87a 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/nixpkgs/pkgs/applications/editors/zile/default.nix
diff --git a/pkgs/applications/gis/grass/default.nix b/nixpkgs/pkgs/applications/gis/grass/default.nix
index 8734fabfdcf..8734fabfdcf 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/nixpkgs/pkgs/applications/gis/grass/default.nix
diff --git a/pkgs/applications/gis/grass/no_symbolic_links.patch b/nixpkgs/pkgs/applications/gis/grass/no_symbolic_links.patch
index ef09b97b703..ef09b97b703 100644
--- a/pkgs/applications/gis/grass/no_symbolic_links.patch
+++ b/nixpkgs/pkgs/applications/gis/grass/no_symbolic_links.patch
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix
index 21d16282edc..21d16282edc 100644
--- a/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix
diff --git a/pkgs/applications/gis/qgis/default.nix b/nixpkgs/pkgs/applications/gis/qgis/default.nix
index f272fd04dd0..f272fd04dd0 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/nixpkgs/pkgs/applications/gis/qgis/default.nix
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix
index de436088fa7..de436088fa7 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix
diff --git a/pkgs/applications/gis/saga/clang_patch.patch b/nixpkgs/pkgs/applications/gis/saga/clang_patch.patch
index e6af8d13051..e6af8d13051 100644
--- a/pkgs/applications/gis/saga/clang_patch.patch
+++ b/nixpkgs/pkgs/applications/gis/saga/clang_patch.patch
diff --git a/pkgs/applications/gis/saga/default.nix b/nixpkgs/pkgs/applications/gis/saga/default.nix
index 90e7af9944d..90e7af9944d 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/nixpkgs/pkgs/applications/gis/saga/default.nix
diff --git a/pkgs/applications/gis/saga/finite.patch b/nixpkgs/pkgs/applications/gis/saga/finite.patch
index 7f60743534b..7f60743534b 100644
--- a/pkgs/applications/gis/saga/finite.patch
+++ b/nixpkgs/pkgs/applications/gis/saga/finite.patch
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix
index 84d7f3ddb49..84d7f3ddb49 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix
index 31eebf7d0a9..31eebf7d0a9 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix
index 9cfccc7425b..9cfccc7425b 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix
diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/nixpkgs/pkgs/applications/graphics/PythonMagick/default.nix
index e35a0190d8b..e35a0190d8b 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/PythonMagick/default.nix
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix
index 87bddf9099e..87bddf9099e 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix
diff --git a/pkgs/applications/graphics/akira/default.nix b/nixpkgs/pkgs/applications/graphics/akira/default.nix
index adbc1eac379..adbc1eac379 100644
--- a/pkgs/applications/graphics/akira/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/akira/default.nix
diff --git a/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch b/nixpkgs/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch
index 3c35900c04f..3c35900c04f 100644
--- a/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch
+++ b/nixpkgs/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch
diff --git a/pkgs/applications/graphics/alchemy/default.nix b/nixpkgs/pkgs/applications/graphics/alchemy/default.nix
index 5132d5950aa..5132d5950aa 100644
--- a/pkgs/applications/graphics/alchemy/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/alchemy/default.nix
diff --git a/pkgs/applications/graphics/animbar/default.nix b/nixpkgs/pkgs/applications/graphics/animbar/default.nix
index c4f1b4218d0..c4f1b4218d0 100644
--- a/pkgs/applications/graphics/animbar/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/animbar/default.nix
diff --git a/pkgs/applications/graphics/antimony/default.nix b/nixpkgs/pkgs/applications/graphics/antimony/default.nix
index 5966d6427ed..5966d6427ed 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/antimony/default.nix
diff --git a/pkgs/applications/graphics/antimony/paths-fix.patch b/nixpkgs/pkgs/applications/graphics/antimony/paths-fix.patch
index 9235dd6cdce..9235dd6cdce 100644
--- a/pkgs/applications/graphics/antimony/paths-fix.patch
+++ b/nixpkgs/pkgs/applications/graphics/antimony/paths-fix.patch
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/nixpkgs/pkgs/applications/graphics/apitrace/default.nix
index 5ce36f4f10e..5ce36f4f10e 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/apitrace/default.nix
diff --git a/pkgs/applications/graphics/apngasm/2.nix b/nixpkgs/pkgs/applications/graphics/apngasm/2.nix
index 166bc135c19..166bc135c19 100644
--- a/pkgs/applications/graphics/apngasm/2.nix
+++ b/nixpkgs/pkgs/applications/graphics/apngasm/2.nix
diff --git a/pkgs/applications/graphics/apngasm/default.nix b/nixpkgs/pkgs/applications/graphics/apngasm/default.nix
index 8d50696efcb..8d50696efcb 100644
--- a/pkgs/applications/graphics/apngasm/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/apngasm/default.nix
diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/nixpkgs/pkgs/applications/graphics/autopanosiftc/default.nix
index c64604975ab..c64604975ab 100644
--- a/pkgs/applications/graphics/autopanosiftc/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/autopanosiftc/default.nix
diff --git a/pkgs/applications/graphics/autotrace/autofig.nix b/nixpkgs/pkgs/applications/graphics/autotrace/autofig.nix
index 0f53965786b..0f53965786b 100644
--- a/pkgs/applications/graphics/autotrace/autofig.nix
+++ b/nixpkgs/pkgs/applications/graphics/autotrace/autofig.nix
diff --git a/pkgs/applications/graphics/autotrace/default.nix b/nixpkgs/pkgs/applications/graphics/autotrace/default.nix
index 57e95dfef10..57e95dfef10 100644
--- a/pkgs/applications/graphics/autotrace/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/autotrace/default.nix
diff --git a/pkgs/applications/graphics/avocode/default.nix b/nixpkgs/pkgs/applications/graphics/avocode/default.nix
index f15804038e7..f15804038e7 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/avocode/default.nix
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix
index b827a12f81c..b827a12f81c 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix
diff --git a/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch b/nixpkgs/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch
index b3f8e68dd1a..b3f8e68dd1a 100644
--- a/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch
+++ b/nixpkgs/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch
diff --git a/pkgs/applications/graphics/azpainter/default.nix b/nixpkgs/pkgs/applications/graphics/azpainter/default.nix
index 2f636764e1f..2f636764e1f 100644
--- a/pkgs/applications/graphics/azpainter/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/azpainter/default.nix
diff --git a/pkgs/applications/graphics/batik/builder.sh b/nixpkgs/pkgs/applications/graphics/batik/builder.sh
index c6cf64bf370..c6cf64bf370 100755
--- a/pkgs/applications/graphics/batik/builder.sh
+++ b/nixpkgs/pkgs/applications/graphics/batik/builder.sh
diff --git a/pkgs/applications/graphics/batik/default.nix b/nixpkgs/pkgs/applications/graphics/batik/default.nix
index 51156dea4a1..51156dea4a1 100644
--- a/pkgs/applications/graphics/batik/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/batik/default.nix
diff --git a/pkgs/applications/graphics/c3d/default.nix b/nixpkgs/pkgs/applications/graphics/c3d/default.nix
index ad86e66204b..ad86e66204b 100644
--- a/pkgs/applications/graphics/c3d/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/c3d/default.nix
diff --git a/pkgs/applications/graphics/comical/default.nix b/nixpkgs/pkgs/applications/graphics/comical/default.nix
index 2796a5535a0..2796a5535a0 100644
--- a/pkgs/applications/graphics/comical/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/comical/default.nix
diff --git a/pkgs/applications/graphics/comical/wxgtk-2.8.patch b/nixpkgs/pkgs/applications/graphics/comical/wxgtk-2.8.patch
index db7626074a0..db7626074a0 100644
--- a/pkgs/applications/graphics/comical/wxgtk-2.8.patch
+++ b/nixpkgs/pkgs/applications/graphics/comical/wxgtk-2.8.patch
diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix
index 32d079d85ff..32d079d85ff 100644
--- a/pkgs/applications/graphics/cq-editor/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix
diff --git a/pkgs/applications/graphics/darktable/default.nix b/nixpkgs/pkgs/applications/graphics/darktable/default.nix
index 53e04dc7f78..53e04dc7f78 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/darktable/default.nix
diff --git a/pkgs/applications/graphics/deskew/default.nix b/nixpkgs/pkgs/applications/graphics/deskew/default.nix
index c35aaa044ae..c35aaa044ae 100644
--- a/pkgs/applications/graphics/deskew/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/deskew/default.nix
diff --git a/pkgs/applications/graphics/dia/default.nix b/nixpkgs/pkgs/applications/graphics/dia/default.nix
index 3984cfc17ca..3984cfc17ca 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/dia/default.nix
diff --git a/pkgs/applications/graphics/digikam/default.nix b/nixpkgs/pkgs/applications/graphics/digikam/default.nix
index e6e24e0e56f..e6e24e0e56f 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/digikam/default.nix
diff --git a/pkgs/applications/graphics/displaycal/default.nix b/nixpkgs/pkgs/applications/graphics/displaycal/default.nix
index 7a4db535b2b..7a4db535b2b 100644
--- a/pkgs/applications/graphics/displaycal/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/displaycal/default.nix
diff --git a/pkgs/applications/graphics/djview/default.nix b/nixpkgs/pkgs/applications/graphics/djview/default.nix
index 4d09f2ad5fe..4d09f2ad5fe 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/djview/default.nix
diff --git a/pkgs/applications/graphics/dosage/default.nix b/nixpkgs/pkgs/applications/graphics/dosage/default.nix
index e26886b070e..e26886b070e 100644
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/dosage/default.nix
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/nixpkgs/pkgs/applications/graphics/draftsight/default.nix
index 144c723da20..144c723da20 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/draftsight/default.nix
diff --git a/pkgs/applications/graphics/drawio/default.nix b/nixpkgs/pkgs/applications/graphics/drawio/default.nix
index c81ad47db84..c81ad47db84 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/drawio/default.nix
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix
index e64e384a9a7..e64e384a9a7 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix
diff --git a/pkgs/applications/graphics/epeg/default.nix b/nixpkgs/pkgs/applications/graphics/epeg/default.nix
index 3b7bdfb8efc..3b7bdfb8efc 100644
--- a/pkgs/applications/graphics/epeg/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/epeg/default.nix
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/nixpkgs/pkgs/applications/graphics/exrdisplay/default.nix
index d8b08faf239..d8b08faf239 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/exrdisplay/default.nix
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/nixpkgs/pkgs/applications/graphics/exrtools/default.nix
index c8928540bb6..c8928540bb6 100644
--- a/pkgs/applications/graphics/exrtools/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/exrtools/default.nix
diff --git a/pkgs/applications/graphics/fbida/default.nix b/nixpkgs/pkgs/applications/graphics/fbida/default.nix
index 3e64783df31..3e64783df31 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/fbida/default.nix
diff --git a/pkgs/applications/graphics/feh/default.nix b/nixpkgs/pkgs/applications/graphics/feh/default.nix
index 1eb99a9a7e4..1eb99a9a7e4 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/feh/default.nix
diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix
index c364badc174..c364badc174 100644
--- a/pkgs/applications/graphics/fig2dev/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix
diff --git a/pkgs/applications/graphics/fluxus/default.nix b/nixpkgs/pkgs/applications/graphics/fluxus/default.nix
index a8094071101..a8094071101 100644
--- a/pkgs/applications/graphics/fluxus/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/fluxus/default.nix
diff --git a/pkgs/applications/graphics/fluxus/fix-build.patch b/nixpkgs/pkgs/applications/graphics/fluxus/fix-build.patch
index 7810dd59e35..7810dd59e35 100644
--- a/pkgs/applications/graphics/fluxus/fix-build.patch
+++ b/nixpkgs/pkgs/applications/graphics/fluxus/fix-build.patch
diff --git a/pkgs/applications/graphics/fondo/default.nix b/nixpkgs/pkgs/applications/graphics/fondo/default.nix
index 7b186312301..7b186312301 100644
--- a/pkgs/applications/graphics/fondo/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/fondo/default.nix
diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix
index 3b866297603..3b866297603 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix
diff --git a/pkgs/applications/graphics/freecad/default.nix b/nixpkgs/pkgs/applications/graphics/freecad/default.nix
index eb087c42ce0..eb087c42ce0 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/freecad/default.nix
diff --git a/pkgs/applications/graphics/freepv/default.nix b/nixpkgs/pkgs/applications/graphics/freepv/default.nix
index 57321220fb1..57321220fb1 100644
--- a/pkgs/applications/graphics/freepv/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/freepv/default.nix
diff --git a/pkgs/applications/graphics/fstl/default.nix b/nixpkgs/pkgs/applications/graphics/fstl/default.nix
index 1d712a63fbd..1d712a63fbd 100644
--- a/pkgs/applications/graphics/fstl/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/fstl/default.nix
diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix
index f729c9c2bba..f729c9c2bba 100644
--- a/pkgs/applications/graphics/gcolor2/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix
diff --git a/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch b/nixpkgs/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch
index cd06a8315f9..cd06a8315f9 100644
--- a/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch
+++ b/nixpkgs/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix
index 67be3ba6782..67be3ba6782 100644
--- a/pkgs/applications/graphics/gcolor3/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/nixpkgs/pkgs/applications/graphics/geeqie/default.nix
index 4275c6f0dcf..4275c6f0dcf 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/geeqie/default.nix
diff --git a/pkgs/applications/graphics/gimp/default.nix b/nixpkgs/pkgs/applications/graphics/gimp/default.nix
index 2b3b992d24b..2b3b992d24b 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gimp/default.nix
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix
index 0a06c42b5fc..0a06c42b5fc 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix
diff --git a/pkgs/applications/graphics/gimp/plugins/patches/focusblur-glib.patch b/nixpkgs/pkgs/applications/graphics/gimp/plugins/patches/focusblur-glib.patch
index b1079ab3660..b1079ab3660 100644
--- a/pkgs/applications/graphics/gimp/plugins/patches/focusblur-glib.patch
+++ b/nixpkgs/pkgs/applications/graphics/gimp/plugins/patches/focusblur-glib.patch
diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/nixpkgs/pkgs/applications/graphics/gimp/remove-cc-reference.patch
index 0d6a87000cc..0d6a87000cc 100644
--- a/pkgs/applications/graphics/gimp/remove-cc-reference.patch
+++ b/nixpkgs/pkgs/applications/graphics/gimp/remove-cc-reference.patch
diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix
index 841728d3a29..841728d3a29 100644
--- a/pkgs/applications/graphics/gimp/wrapper.nix
+++ b/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix
diff --git a/pkgs/applications/graphics/glabels/default.nix b/nixpkgs/pkgs/applications/graphics/glabels/default.nix
index fef296f45be..fef296f45be 100644
--- a/pkgs/applications/graphics/glabels/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/glabels/default.nix
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix
index 0eb4f21e53c..0eb4f21e53c 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix
diff --git a/pkgs/applications/graphics/gnome-photos/installed-tests-path.patch b/nixpkgs/pkgs/applications/graphics/gnome-photos/installed-tests-path.patch
index 218108328dd..218108328dd 100644
--- a/pkgs/applications/graphics/gnome-photos/installed-tests-path.patch
+++ b/nixpkgs/pkgs/applications/graphics/gnome-photos/installed-tests-path.patch
diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix
index 5b6dd42e09e..5b6dd42e09e 100644
--- a/pkgs/applications/graphics/gnuclad/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix
diff --git a/pkgs/applications/graphics/gocr/default.nix b/nixpkgs/pkgs/applications/graphics/gocr/default.nix
index f5fa8ca9221..f5fa8ca9221 100644
--- a/pkgs/applications/graphics/gocr/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gocr/default.nix
diff --git a/pkgs/applications/graphics/goxel/default.nix b/nixpkgs/pkgs/applications/graphics/goxel/default.nix
index 84fdb60c31e..84fdb60c31e 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/goxel/default.nix
diff --git a/pkgs/applications/graphics/goxel/disable-imgui_ini.patch b/nixpkgs/pkgs/applications/graphics/goxel/disable-imgui_ini.patch
index 9427d45487d..9427d45487d 100644
--- a/pkgs/applications/graphics/goxel/disable-imgui_ini.patch
+++ b/nixpkgs/pkgs/applications/graphics/goxel/disable-imgui_ini.patch
diff --git a/pkgs/applications/graphics/gpicview/default.nix b/nixpkgs/pkgs/applications/graphics/gpicview/default.nix
index 86867cd1cca..86867cd1cca 100644
--- a/pkgs/applications/graphics/gpicview/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gpicview/default.nix
diff --git a/pkgs/applications/graphics/gqview/default.nix b/nixpkgs/pkgs/applications/graphics/gqview/default.nix
index d82238f925b..d82238f925b 100644
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gqview/default.nix
diff --git a/pkgs/applications/graphics/grafx2/default.nix b/nixpkgs/pkgs/applications/graphics/grafx2/default.nix
index 039bb1917d3..039bb1917d3 100644
--- a/pkgs/applications/graphics/grafx2/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/grafx2/default.nix
diff --git a/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch b/nixpkgs/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch
index 91eacecbf8c..91eacecbf8c 100644
--- a/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch
+++ b/nixpkgs/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch
diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/nixpkgs/pkgs/applications/graphics/graphicsmagick/compat.nix
index 9517aa78ee4..9517aa78ee4 100644
--- a/pkgs/applications/graphics/graphicsmagick/compat.nix
+++ b/nixpkgs/pkgs/applications/graphics/graphicsmagick/compat.nix
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix
index 403a5285e15..403a5285e15 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix
diff --git a/pkgs/applications/graphics/graphicsmagick/disable-popen.patch b/nixpkgs/pkgs/applications/graphics/graphicsmagick/disable-popen.patch
index 2cdb1f7e90f..2cdb1f7e90f 100644
--- a/pkgs/applications/graphics/graphicsmagick/disable-popen.patch
+++ b/nixpkgs/pkgs/applications/graphics/graphicsmagick/disable-popen.patch
diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix
index 76bb0bc1317..76bb0bc1317 100644
--- a/pkgs/applications/graphics/gscan2pdf/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/nixpkgs/pkgs/applications/graphics/gthumb/default.nix
index b51db1e945f..b51db1e945f 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gthumb/default.nix
diff --git a/pkgs/applications/graphics/guetzli/default.nix b/nixpkgs/pkgs/applications/graphics/guetzli/default.nix
index d7b96425968..d7b96425968 100644
--- a/pkgs/applications/graphics/guetzli/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/guetzli/default.nix
diff --git a/pkgs/applications/graphics/hugin/default.nix b/nixpkgs/pkgs/applications/graphics/hugin/default.nix
index 8f7800a7323..8f7800a7323 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/hugin/default.nix
diff --git a/pkgs/applications/graphics/ideogram/default.nix b/nixpkgs/pkgs/applications/graphics/ideogram/default.nix
index ba5ee230ce4..ba5ee230ce4 100644
--- a/pkgs/applications/graphics/ideogram/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/ideogram/default.nix
diff --git a/pkgs/applications/graphics/image_optim/Gemfile b/nixpkgs/pkgs/applications/graphics/image_optim/Gemfile
index d6a0f13a4c1..d6a0f13a4c1 100644
--- a/pkgs/applications/graphics/image_optim/Gemfile
+++ b/nixpkgs/pkgs/applications/graphics/image_optim/Gemfile
diff --git a/pkgs/applications/graphics/image_optim/Gemfile.lock b/nixpkgs/pkgs/applications/graphics/image_optim/Gemfile.lock
index 20c9772ce46..20c9772ce46 100644
--- a/pkgs/applications/graphics/image_optim/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/graphics/image_optim/Gemfile.lock
diff --git a/pkgs/applications/graphics/image_optim/default.nix b/nixpkgs/pkgs/applications/graphics/image_optim/default.nix
index 385f9825e46..385f9825e46 100644
--- a/pkgs/applications/graphics/image_optim/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/image_optim/default.nix
diff --git a/pkgs/applications/graphics/image_optim/gemset.nix b/nixpkgs/pkgs/applications/graphics/image_optim/gemset.nix
index 6c9ec2de745..6c9ec2de745 100644
--- a/pkgs/applications/graphics/image_optim/gemset.nix
+++ b/nixpkgs/pkgs/applications/graphics/image_optim/gemset.nix
diff --git a/pkgs/applications/graphics/imagej/default.nix b/nixpkgs/pkgs/applications/graphics/imagej/default.nix
index 6472712bcb4..6472712bcb4 100644
--- a/pkgs/applications/graphics/imagej/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/imagej/default.nix
diff --git a/pkgs/applications/graphics/imgcat/default.nix b/nixpkgs/pkgs/applications/graphics/imgcat/default.nix
index 1fa3ec8ccc6..1fa3ec8ccc6 100644
--- a/pkgs/applications/graphics/imgcat/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/imgcat/default.nix
diff --git a/pkgs/applications/graphics/imgp/default.nix b/nixpkgs/pkgs/applications/graphics/imgp/default.nix
index 80420202c05..80420202c05 100644
--- a/pkgs/applications/graphics/imgp/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/imgp/default.nix
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix
index 8ca4d71bb56..8ca4d71bb56 100644
--- a/pkgs/applications/graphics/imlibsetroot/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix
diff --git a/pkgs/applications/graphics/imv/default.nix b/nixpkgs/pkgs/applications/graphics/imv/default.nix
index 26a6cabf784..26a6cabf784 100644
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/imv/default.nix
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/nixpkgs/pkgs/applications/graphics/inkscape/default.nix
index 3996b94ba14..3996b94ba14 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/inkscape/default.nix
diff --git a/pkgs/applications/graphics/ipe/default.nix b/nixpkgs/pkgs/applications/graphics/ipe/default.nix
index 0cb09ecb643..0cb09ecb643 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/ipe/default.nix
diff --git a/pkgs/applications/graphics/jbrout/default.nix b/nixpkgs/pkgs/applications/graphics/jbrout/default.nix
index 4eb7518cc10..4eb7518cc10 100644
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/jbrout/default.nix
diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix
index 97c15d2eec0..97c15d2eec0 100644
--- a/pkgs/applications/graphics/jpeg-archive/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix
diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/nixpkgs/pkgs/applications/graphics/jpeginfo/default.nix
index e15aedd77e1..e15aedd77e1 100644
--- a/pkgs/applications/graphics/jpeginfo/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/jpeginfo/default.nix
diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix
index cc1ca3a0ff2..cc1ca3a0ff2 100644
--- a/pkgs/applications/graphics/jpegoptim/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix
diff --git a/pkgs/applications/graphics/jpegrescan/default.nix b/nixpkgs/pkgs/applications/graphics/jpegrescan/default.nix
index 1c65c7da3a2..1c65c7da3a2 100644
--- a/pkgs/applications/graphics/jpegrescan/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/jpegrescan/default.nix
diff --git a/pkgs/applications/graphics/k3d/default.nix b/nixpkgs/pkgs/applications/graphics/k3d/default.nix
index 31085cd8023..31085cd8023 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/k3d/default.nix
diff --git a/pkgs/applications/graphics/kcc/default.nix b/nixpkgs/pkgs/applications/graphics/kcc/default.nix
index da358918972..da358918972 100644
--- a/pkgs/applications/graphics/kcc/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/kcc/default.nix
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix
index 9b96b30c62b..9b96b30c62b 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix
diff --git a/pkgs/applications/graphics/kodelife/default.nix b/nixpkgs/pkgs/applications/graphics/kodelife/default.nix
index 0b4e49dc2b5..0b4e49dc2b5 100644
--- a/pkgs/applications/graphics/kodelife/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/kodelife/default.nix
diff --git a/pkgs/applications/graphics/krita/default.nix b/nixpkgs/pkgs/applications/graphics/krita/default.nix
index 3cc4834d756..3cc4834d756 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/krita/default.nix
diff --git a/pkgs/applications/graphics/krop/default.nix b/nixpkgs/pkgs/applications/graphics/krop/default.nix
index 401e5f6fc57..401e5f6fc57 100644
--- a/pkgs/applications/graphics/krop/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/krop/default.nix
diff --git a/pkgs/applications/graphics/ktikz/default.nix b/nixpkgs/pkgs/applications/graphics/ktikz/default.nix
index 4ddc2074f2f..4ddc2074f2f 100644
--- a/pkgs/applications/graphics/ktikz/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/ktikz/default.nix
diff --git a/pkgs/applications/graphics/leocad/default.nix b/nixpkgs/pkgs/applications/graphics/leocad/default.nix
index 201a4fe113e..201a4fe113e 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/leocad/default.nix
diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix
index 94899c937a8..94899c937a8 100644
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix
diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix
index 0a3368ec2ab..0a3368ec2ab 100644
--- a/pkgs/applications/graphics/mandelbulber/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix
diff --git a/pkgs/applications/graphics/meh/default.nix b/nixpkgs/pkgs/applications/graphics/meh/default.nix
index 7ad8c388a20..7ad8c388a20 100644
--- a/pkgs/applications/graphics/meh/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/meh/default.nix
diff --git a/pkgs/applications/graphics/meme/default.nix b/nixpkgs/pkgs/applications/graphics/meme/default.nix
index 5f8a0bb6eed..5f8a0bb6eed 100644
--- a/pkgs/applications/graphics/meme/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/meme/default.nix
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/nixpkgs/pkgs/applications/graphics/meshlab/default.nix
index 9733f1e2efa..9733f1e2efa 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/meshlab/default.nix
diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix
index d629c776194..d629c776194 100644
--- a/pkgs/applications/graphics/minidjvu/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix
diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix
index 63cc4a3a8d3..63cc4a3a8d3 100644
--- a/pkgs/applications/graphics/mozjpeg/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix
diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/nixpkgs/pkgs/applications/graphics/mtpaint/default.nix
index 7274bdacd9d..7274bdacd9d 100644
--- a/pkgs/applications/graphics/mtpaint/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/mtpaint/default.nix
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/nixpkgs/pkgs/applications/graphics/mypaint/default.nix
index 1acaf4850eb..1acaf4850eb 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/mypaint/default.nix
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/nixpkgs/pkgs/applications/graphics/nomacs/default.nix
index 48a79e8844e..48a79e8844e 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/nomacs/default.nix
diff --git a/pkgs/applications/graphics/nomacs/nomacs-iostream.patch b/nixpkgs/pkgs/applications/graphics/nomacs/nomacs-iostream.patch
index 53224e0260e..53224e0260e 100644
--- a/pkgs/applications/graphics/nomacs/nomacs-iostream.patch
+++ b/nixpkgs/pkgs/applications/graphics/nomacs/nomacs-iostream.patch
diff --git a/pkgs/applications/graphics/ocrad/default.nix b/nixpkgs/pkgs/applications/graphics/ocrad/default.nix
index 80f59268111..80f59268111 100644
--- a/pkgs/applications/graphics/ocrad/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/ocrad/default.nix
diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/nixpkgs/pkgs/applications/graphics/openimageio/2.x.nix
index 9c4a8b22939..9c4a8b22939 100644
--- a/pkgs/applications/graphics/openimageio/2.x.nix
+++ b/nixpkgs/pkgs/applications/graphics/openimageio/2.x.nix
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/nixpkgs/pkgs/applications/graphics/openimageio/default.nix
index 23cad7e859d..23cad7e859d 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/openimageio/default.nix
diff --git a/pkgs/applications/graphics/openscad/default.nix b/nixpkgs/pkgs/applications/graphics/openscad/default.nix
index 2c95f6d403f..2c95f6d403f 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/openscad/default.nix
diff --git a/pkgs/applications/graphics/panotools/default.nix b/nixpkgs/pkgs/applications/graphics/panotools/default.nix
index 719aca5096a..719aca5096a 100644
--- a/pkgs/applications/graphics/panotools/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/panotools/default.nix
diff --git a/pkgs/applications/graphics/paraview/default.nix b/nixpkgs/pkgs/applications/graphics/paraview/default.nix
index d0351e98ee0..d0351e98ee0 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/paraview/default.nix
diff --git a/pkgs/applications/graphics/pbrt/default.nix b/nixpkgs/pkgs/applications/graphics/pbrt/default.nix
index 78f6d8bcbaf..78f6d8bcbaf 100644
--- a/pkgs/applications/graphics/pbrt/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/pbrt/default.nix
diff --git a/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch b/nixpkgs/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch
index 2993922a1ec..2993922a1ec 100644
--- a/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch
+++ b/nixpkgs/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch
diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix
index f31506ce733..f31506ce733 100644
--- a/pkgs/applications/graphics/pdfcpu/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix
diff --git a/pkgs/applications/graphics/pencil/default.nix b/nixpkgs/pkgs/applications/graphics/pencil/default.nix
index edd923822ea..edd923822ea 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/pencil/default.nix
diff --git a/pkgs/applications/graphics/photivo/default.nix b/nixpkgs/pkgs/applications/graphics/photivo/default.nix
index 09b5bd37839..09b5bd37839 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/photivo/default.nix
diff --git a/pkgs/applications/graphics/photivo/gcc6.patch b/nixpkgs/pkgs/applications/graphics/photivo/gcc6.patch
index e2eb795fc8e..e2eb795fc8e 100644
--- a/pkgs/applications/graphics/photivo/gcc6.patch
+++ b/nixpkgs/pkgs/applications/graphics/photivo/gcc6.patch
diff --git a/pkgs/applications/graphics/photoflow/default.nix b/nixpkgs/pkgs/applications/graphics/photoflow/default.nix
index 78d16e69226..78d16e69226 100644
--- a/pkgs/applications/graphics/photoflow/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/photoflow/default.nix
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/nixpkgs/pkgs/applications/graphics/photoqt/default.nix
index 14c49d30004..14c49d30004 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/photoqt/default.nix
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/nixpkgs/pkgs/applications/graphics/phototonic/default.nix
index 5e7fb5cf7a0..5e7fb5cf7a0 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/phototonic/default.nix
diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix
index e34d5a87a47..e34d5a87a47 100644
--- a/pkgs/applications/graphics/pick-colour-picker/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix
diff --git a/pkgs/applications/graphics/pinta/default.nix b/nixpkgs/pkgs/applications/graphics/pinta/default.nix
index 14090376684..14090376684 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/pinta/default.nix
diff --git a/pkgs/applications/graphics/potrace/default.nix b/nixpkgs/pkgs/applications/graphics/potrace/default.nix
index 35ab27bcbf6..35ab27bcbf6 100644
--- a/pkgs/applications/graphics/potrace/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/potrace/default.nix
diff --git a/pkgs/applications/graphics/pqiv/default.nix b/nixpkgs/pkgs/applications/graphics/pqiv/default.nix
index 7639a2a9c76..7639a2a9c76 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/pqiv/default.nix
diff --git a/pkgs/applications/graphics/processing/default.nix b/nixpkgs/pkgs/applications/graphics/processing/default.nix
index 9972ea75709..9972ea75709 100644
--- a/pkgs/applications/graphics/processing/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/processing/default.nix
diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix
index 4d416a7c106..4d416a7c106 100644
--- a/pkgs/applications/graphics/qcomicbook/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix
diff --git a/pkgs/applications/graphics/qiv/default.nix b/nixpkgs/pkgs/applications/graphics/qiv/default.nix
index 750217d9918..750217d9918 100644
--- a/pkgs/applications/graphics/qiv/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/qiv/default.nix
diff --git a/pkgs/applications/graphics/qiv/default.upstream b/nixpkgs/pkgs/applications/graphics/qiv/default.upstream
index e6c7ef2408e..e6c7ef2408e 100644
--- a/pkgs/applications/graphics/qiv/default.upstream
+++ b/nixpkgs/pkgs/applications/graphics/qiv/default.upstream
diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/nixpkgs/pkgs/applications/graphics/qscreenshot/default.nix
index fafc76a76ff..fafc76a76ff 100644
--- a/pkgs/applications/graphics/qscreenshot/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/qscreenshot/default.nix
diff --git a/pkgs/applications/graphics/qview/default.nix b/nixpkgs/pkgs/applications/graphics/qview/default.nix
index 8df6ce4f80b..8df6ce4f80b 100644
--- a/pkgs/applications/graphics/qview/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/qview/default.nix
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/nixpkgs/pkgs/applications/graphics/rapcad/default.nix
index 7e9547c1067..7e9547c1067 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/rapcad/default.nix
diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index ed8ef35a7e5..ed8ef35a7e5 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix
index bda16446524..bda16446524 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix
index 843801011f7..843801011f7 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix
diff --git a/pkgs/applications/graphics/runwayml/default.nix b/nixpkgs/pkgs/applications/graphics/runwayml/default.nix
index c3f747837e0..c3f747837e0 100644
--- a/pkgs/applications/graphics/runwayml/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/runwayml/default.nix
diff --git a/pkgs/applications/graphics/rx/default.nix b/nixpkgs/pkgs/applications/graphics/rx/default.nix
index 3093fa107d6..3093fa107d6 100644
--- a/pkgs/applications/graphics/rx/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/rx/default.nix
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix
index b431cf51b01..b431cf51b01 100644
--- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/preload.c b/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/preload.c
index 01616277093..01616277093 100644
--- a/pkgs/applications/graphics/sane/backends/brscan4/preload.c
+++ b/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/preload.c
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
index da136a7f9e1..da136a7f9e1 100644
--- a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
+++ b/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix
index 6aba42d33e6..6aba42d33e6 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix
diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/dsseries/default.nix
index d4165be3784..d4165be3784 100644
--- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/sane/backends/dsseries/default.nix
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix
index d3e8b417017..d3e8b417017 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix
diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/git.nix
index 2edd739068d..2edd739068d 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/nixpkgs/pkgs/applications/graphics/sane/backends/git.nix
diff --git a/pkgs/applications/graphics/sane/config.nix b/nixpkgs/pkgs/applications/graphics/sane/config.nix
index c0a0206ddd1..c0a0206ddd1 100644
--- a/pkgs/applications/graphics/sane/config.nix
+++ b/nixpkgs/pkgs/applications/graphics/sane/config.nix
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/nixpkgs/pkgs/applications/graphics/sane/frontends.nix
index b00f8f6c58d..b00f8f6c58d 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/nixpkgs/pkgs/applications/graphics/sane/frontends.nix
diff --git a/pkgs/applications/graphics/sane/xsane.nix b/nixpkgs/pkgs/applications/graphics/sane/xsane.nix
index 09b431fdb11..09b431fdb11 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/nixpkgs/pkgs/applications/graphics/sane/xsane.nix
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix
index 63f16f688ac..63f16f688ac 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix
diff --git a/pkgs/applications/graphics/scantailor/default.nix b/nixpkgs/pkgs/applications/graphics/scantailor/default.nix
index 14efe48f30d..14efe48f30d 100644
--- a/pkgs/applications/graphics/scantailor/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/scantailor/default.nix
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/nixpkgs/pkgs/applications/graphics/screencloud/default.nix
index 88bbbd9d864..88bbbd9d864 100644
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/screencloud/default.nix
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
index 79bc743fbf0..79bc743fbf0 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
diff --git a/pkgs/applications/graphics/shutter/default.nix b/nixpkgs/pkgs/applications/graphics/shutter/default.nix
index dd41ee4c3f8..dd41ee4c3f8 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/shutter/default.nix
diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix
index 314b4007aad..314b4007aad 100644
--- a/pkgs/applications/graphics/smartdeblur/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/nixpkgs/pkgs/applications/graphics/solvespace/default.nix
index 7046caad295..7046caad295 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/solvespace/default.nix
diff --git a/pkgs/applications/graphics/swingsane/default.nix b/nixpkgs/pkgs/applications/graphics/swingsane/default.nix
index f56646e5aed..f56646e5aed 100644
--- a/pkgs/applications/graphics/swingsane/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/swingsane/default.nix
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/nixpkgs/pkgs/applications/graphics/sxiv/default.nix
index f5429958328..f5429958328 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/sxiv/default.nix
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix
index 188f7cb2934..188f7cb2934 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix
diff --git a/pkgs/applications/graphics/tesseract/default.nix b/nixpkgs/pkgs/applications/graphics/tesseract/default.nix
index 840c87de216..840c87de216 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/tesseract/default.nix
diff --git a/pkgs/applications/graphics/tesseract/fetch-language-hashes b/nixpkgs/pkgs/applications/graphics/tesseract/fetch-language-hashes
index c431f1d97c2..c431f1d97c2 100755
--- a/pkgs/applications/graphics/tesseract/fetch-language-hashes
+++ b/nixpkgs/pkgs/applications/graphics/tesseract/fetch-language-hashes
diff --git a/pkgs/applications/graphics/tesseract/languages.nix b/nixpkgs/pkgs/applications/graphics/tesseract/languages.nix
index 08512a5cdd9..08512a5cdd9 100644
--- a/pkgs/applications/graphics/tesseract/languages.nix
+++ b/nixpkgs/pkgs/applications/graphics/tesseract/languages.nix
diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix
index 157c0b9742b..157c0b9742b 100644
--- a/pkgs/applications/graphics/tesseract/tesseract3.nix
+++ b/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix
diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix
index 95896337720..95896337720 100644
--- a/pkgs/applications/graphics/tesseract/tesseract4.nix
+++ b/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix
diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix
index 365d68a9ee7..365d68a9ee7 100644
--- a/pkgs/applications/graphics/tesseract/wrapper.nix
+++ b/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix
diff --git a/pkgs/applications/graphics/tev/default.nix b/nixpkgs/pkgs/applications/graphics/tev/default.nix
index 47da0b749df..47da0b749df 100644
--- a/pkgs/applications/graphics/tev/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/tev/default.nix
diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix
index 8355545e8dd..8355545e8dd 100644
--- a/pkgs/applications/graphics/timelapse-deflicker/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix
diff --git a/pkgs/applications/graphics/ufraw/default.nix b/nixpkgs/pkgs/applications/graphics/ufraw/default.nix
index 131d83f0d58..131d83f0d58 100644
--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/ufraw/default.nix
diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix
index 09abfc60a52..09abfc60a52 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/nixpkgs/pkgs/applications/graphics/viewnior/default.nix
index a80e89e72bc..a80e89e72bc 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/viewnior/default.nix
diff --git a/pkgs/applications/graphics/vimiv/default.nix b/nixpkgs/pkgs/applications/graphics/vimiv/default.nix
index fab85052df3..fab85052df3 100644
--- a/pkgs/applications/graphics/vimiv/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/vimiv/default.nix
diff --git a/pkgs/applications/graphics/wings/default.nix b/nixpkgs/pkgs/applications/graphics/wings/default.nix
index 8d6eca7ef32..8d6eca7ef32 100644
--- a/pkgs/applications/graphics/wings/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/wings/default.nix
diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix
index 0f1020b0b07..0f1020b0b07 100644
--- a/pkgs/applications/graphics/write_stylus/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix
diff --git a/pkgs/applications/graphics/xaos/default.nix b/nixpkgs/pkgs/applications/graphics/xaos/default.nix
index e80362c386b..e80362c386b 100644
--- a/pkgs/applications/graphics/xaos/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/xaos/default.nix
diff --git a/pkgs/applications/graphics/xara/debian-patches.nix b/nixpkgs/pkgs/applications/graphics/xara/debian-patches.nix
index dd306146186..dd306146186 100644
--- a/pkgs/applications/graphics/xara/debian-patches.nix
+++ b/nixpkgs/pkgs/applications/graphics/xara/debian-patches.nix
diff --git a/pkgs/applications/graphics/xara/debian-patches.txt b/nixpkgs/pkgs/applications/graphics/xara/debian-patches.txt
index 5c95d401a32..5c95d401a32 100644
--- a/pkgs/applications/graphics/xara/debian-patches.txt
+++ b/nixpkgs/pkgs/applications/graphics/xara/debian-patches.txt
diff --git a/pkgs/applications/graphics/xara/default.nix b/nixpkgs/pkgs/applications/graphics/xara/default.nix
index 56388a8a255..56388a8a255 100644
--- a/pkgs/applications/graphics/xara/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/xara/default.nix
diff --git a/pkgs/applications/graphics/xfig/default.nix b/nixpkgs/pkgs/applications/graphics/xfig/default.nix
index fe5a1370332..fe5a1370332 100644
--- a/pkgs/applications/graphics/xfig/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/xfig/default.nix
diff --git a/pkgs/applications/graphics/xfractint/default.nix b/nixpkgs/pkgs/applications/graphics/xfractint/default.nix
index ae4765fc9e7..ae4765fc9e7 100644
--- a/pkgs/applications/graphics/xfractint/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/xfractint/default.nix
diff --git a/pkgs/applications/graphics/xournal/default.nix b/nixpkgs/pkgs/applications/graphics/xournal/default.nix
index 6d10a7cae23..6d10a7cae23 100644
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/xournal/default.nix
diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix
index 76f8e03fa13..76f8e03fa13 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix
diff --git a/pkgs/applications/graphics/xzgv/default.nix b/nixpkgs/pkgs/applications/graphics/xzgv/default.nix
index de3f3a78988..de3f3a78988 100644
--- a/pkgs/applications/graphics/xzgv/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/xzgv/default.nix
diff --git a/pkgs/applications/graphics/yacreader/default.nix b/nixpkgs/pkgs/applications/graphics/yacreader/default.nix
index 9162e0bdef1..9162e0bdef1 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/yacreader/default.nix
diff --git a/pkgs/applications/graphics/yed/default.nix b/nixpkgs/pkgs/applications/graphics/yed/default.nix
index 96515a13724..96515a13724 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/yed/default.nix
diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/nixpkgs/pkgs/applications/graphics/yeetgif/default.nix
index 157ef3753e0..157ef3753e0 100644
--- a/pkgs/applications/graphics/yeetgif/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/yeetgif/default.nix
diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix
index db07b9e1db4..db07b9e1db4 100644
--- a/pkgs/applications/graphics/zgrviewer/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix
diff --git a/pkgs/applications/graphics/zgv/default.nix b/nixpkgs/pkgs/applications/graphics/zgv/default.nix
index 7b14d7750c3..7b14d7750c3 100644
--- a/pkgs/applications/graphics/zgv/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/zgv/default.nix
diff --git a/pkgs/applications/graphics/zgv/switch.patch b/nixpkgs/pkgs/applications/graphics/zgv/switch.patch
index 0b5ad092d72..0b5ad092d72 100644
--- a/pkgs/applications/graphics/zgv/switch.patch
+++ b/nixpkgs/pkgs/applications/graphics/zgv/switch.patch
diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix
index 121e93d3f5c..121e93d3f5c 100644
--- a/pkgs/applications/kde/akonadi-calendar.nix
+++ b/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix
diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix
index b09058b60be..b09058b60be 100644
--- a/pkgs/applications/kde/akonadi-contacts.nix
+++ b/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix
diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/nixpkgs/pkgs/applications/kde/akonadi-import-wizard.nix
index cc1acbc6dd0..cc1acbc6dd0 100644
--- a/pkgs/applications/kde/akonadi-import-wizard.nix
+++ b/nixpkgs/pkgs/applications/kde/akonadi-import-wizard.nix
diff --git a/pkgs/applications/kde/akonadi-mime.nix b/nixpkgs/pkgs/applications/kde/akonadi-mime.nix
index 0ed958b4e77..0ed958b4e77 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/nixpkgs/pkgs/applications/kde/akonadi-mime.nix
diff --git a/pkgs/applications/kde/akonadi-notes.nix b/nixpkgs/pkgs/applications/kde/akonadi-notes.nix
index 72c4d799239..72c4d799239 100644
--- a/pkgs/applications/kde/akonadi-notes.nix
+++ b/nixpkgs/pkgs/applications/kde/akonadi-notes.nix
diff --git a/pkgs/applications/kde/akonadi-search.nix b/nixpkgs/pkgs/applications/kde/akonadi-search.nix
index 23ee6b1b9cc..23ee6b1b9cc 100644
--- a/pkgs/applications/kde/akonadi-search.nix
+++ b/nixpkgs/pkgs/applications/kde/akonadi-search.nix
diff --git a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/nixpkgs/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
index c3964c5c05b..c3964c5c05b 100644
--- a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
+++ b/nixpkgs/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch
index ba6bbedeeae..ba6bbedeeae 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch
diff --git a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch b/nixpkgs/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
index e299a6991f0..e299a6991f0 100644
--- a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
+++ b/nixpkgs/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
diff --git a/pkgs/applications/kde/akonadi/default.nix b/nixpkgs/pkgs/applications/kde/akonadi/default.nix
index b9a96394a67..b9a96394a67 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/nixpkgs/pkgs/applications/kde/akonadi/default.nix
diff --git a/pkgs/applications/kde/akonadi/series b/nixpkgs/pkgs/applications/kde/akonadi/series
index f828d503cc7..f828d503cc7 100644
--- a/pkgs/applications/kde/akonadi/series
+++ b/nixpkgs/pkgs/applications/kde/akonadi/series
diff --git a/pkgs/applications/kde/akonadiconsole.nix b/nixpkgs/pkgs/applications/kde/akonadiconsole.nix
index a02400847bb..a02400847bb 100644
--- a/pkgs/applications/kde/akonadiconsole.nix
+++ b/nixpkgs/pkgs/applications/kde/akonadiconsole.nix
diff --git a/pkgs/applications/kde/akregator.nix b/nixpkgs/pkgs/applications/kde/akregator.nix
index 98d53bc8083..98d53bc8083 100644
--- a/pkgs/applications/kde/akregator.nix
+++ b/nixpkgs/pkgs/applications/kde/akregator.nix
diff --git a/pkgs/applications/kde/ark/default.nix b/nixpkgs/pkgs/applications/kde/ark/default.nix
index 76cc423f546..76cc423f546 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/nixpkgs/pkgs/applications/kde/ark/default.nix
diff --git a/pkgs/applications/kde/baloo-widgets.nix b/nixpkgs/pkgs/applications/kde/baloo-widgets.nix
index 3479b6600fc..3479b6600fc 100644
--- a/pkgs/applications/kde/baloo-widgets.nix
+++ b/nixpkgs/pkgs/applications/kde/baloo-widgets.nix
diff --git a/pkgs/applications/kde/calendarsupport.nix b/nixpkgs/pkgs/applications/kde/calendarsupport.nix
index 485397ec4aa..485397ec4aa 100644
--- a/pkgs/applications/kde/calendarsupport.nix
+++ b/nixpkgs/pkgs/applications/kde/calendarsupport.nix
diff --git a/pkgs/applications/kde/default.nix b/nixpkgs/pkgs/applications/kde/default.nix
index 3c45b05e9e8..3c45b05e9e8 100644
--- a/pkgs/applications/kde/default.nix
+++ b/nixpkgs/pkgs/applications/kde/default.nix
diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/nixpkgs/pkgs/applications/kde/dolphin-plugins.nix
index 5580952f40a..5580952f40a 100644
--- a/pkgs/applications/kde/dolphin-plugins.nix
+++ b/nixpkgs/pkgs/applications/kde/dolphin-plugins.nix
diff --git a/pkgs/applications/kde/dolphin.nix b/nixpkgs/pkgs/applications/kde/dolphin.nix
index 76d4e989e8c..76d4e989e8c 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/nixpkgs/pkgs/applications/kde/dolphin.nix
diff --git a/pkgs/applications/kde/dragon.nix b/nixpkgs/pkgs/applications/kde/dragon.nix
index 9dd55ec4b9c..9dd55ec4b9c 100644
--- a/pkgs/applications/kde/dragon.nix
+++ b/nixpkgs/pkgs/applications/kde/dragon.nix
diff --git a/pkgs/applications/kde/eventviews.nix b/nixpkgs/pkgs/applications/kde/eventviews.nix
index 495491f6d3c..495491f6d3c 100644
--- a/pkgs/applications/kde/eventviews.nix
+++ b/nixpkgs/pkgs/applications/kde/eventviews.nix
diff --git a/pkgs/applications/kde/fetch.sh b/nixpkgs/pkgs/applications/kde/fetch.sh
index a335b0ef8e8..a335b0ef8e8 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/nixpkgs/pkgs/applications/kde/fetch.sh
diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix
index aa03425f36a..aa03425f36a 100644
--- a/pkgs/applications/kde/ffmpegthumbs.nix
+++ b/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix
diff --git a/pkgs/applications/kde/filelight.nix b/nixpkgs/pkgs/applications/kde/filelight.nix
index a3be5be7f0a..a3be5be7f0a 100644
--- a/pkgs/applications/kde/filelight.nix
+++ b/nixpkgs/pkgs/applications/kde/filelight.nix
diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix
index bb8a97e8341..bb8a97e8341 100644
--- a/pkgs/applications/kde/grantleetheme/default.nix
+++ b/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix
diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/nixpkgs/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
index ebb81248475..ebb81248475 100644
--- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
+++ b/nixpkgs/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
diff --git a/pkgs/applications/kde/grantleetheme/series b/nixpkgs/pkgs/applications/kde/grantleetheme/series
index 9095599ea56..9095599ea56 100644
--- a/pkgs/applications/kde/grantleetheme/series
+++ b/nixpkgs/pkgs/applications/kde/grantleetheme/series
diff --git a/pkgs/applications/kde/gwenview.nix b/nixpkgs/pkgs/applications/kde/gwenview.nix
index 3d03d1dea3e..3d03d1dea3e 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/nixpkgs/pkgs/applications/kde/gwenview.nix
diff --git a/pkgs/applications/kde/incidenceeditor.nix b/nixpkgs/pkgs/applications/kde/incidenceeditor.nix
index 8224b98253b..8224b98253b 100644
--- a/pkgs/applications/kde/incidenceeditor.nix
+++ b/nixpkgs/pkgs/applications/kde/incidenceeditor.nix
diff --git a/pkgs/applications/kde/k3b.nix b/nixpkgs/pkgs/applications/kde/k3b.nix
index 9b16485cfa7..9b16485cfa7 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/nixpkgs/pkgs/applications/kde/k3b.nix
diff --git a/pkgs/applications/kde/kaddressbook.nix b/nixpkgs/pkgs/applications/kde/kaddressbook.nix
index b4b0450e78b..b4b0450e78b 100644
--- a/pkgs/applications/kde/kaddressbook.nix
+++ b/nixpkgs/pkgs/applications/kde/kaddressbook.nix
diff --git a/pkgs/applications/kde/kalarm.nix b/nixpkgs/pkgs/applications/kde/kalarm.nix
index a1dec1179cc..a1dec1179cc 100644
--- a/pkgs/applications/kde/kalarm.nix
+++ b/nixpkgs/pkgs/applications/kde/kalarm.nix
diff --git a/pkgs/applications/kde/kalarmcal.nix b/nixpkgs/pkgs/applications/kde/kalarmcal.nix
index 356c1e4812d..356c1e4812d 100644
--- a/pkgs/applications/kde/kalarmcal.nix
+++ b/nixpkgs/pkgs/applications/kde/kalarmcal.nix
diff --git a/pkgs/applications/kde/kate.nix b/nixpkgs/pkgs/applications/kde/kate.nix
index f01a57a55d4..f01a57a55d4 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/nixpkgs/pkgs/applications/kde/kate.nix
diff --git a/pkgs/applications/kde/kcachegrind.nix b/nixpkgs/pkgs/applications/kde/kcachegrind.nix
index 16fc6c51777..16fc6c51777 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/nixpkgs/pkgs/applications/kde/kcachegrind.nix
diff --git a/pkgs/applications/kde/kcalc.nix b/nixpkgs/pkgs/applications/kde/kcalc.nix
index 4e2a308b17f..4e2a308b17f 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/nixpkgs/pkgs/applications/kde/kcalc.nix
diff --git a/pkgs/applications/kde/kcalcore.nix b/nixpkgs/pkgs/applications/kde/kcalcore.nix
index 4ac9c9b925a..4ac9c9b925a 100644
--- a/pkgs/applications/kde/kcalcore.nix
+++ b/nixpkgs/pkgs/applications/kde/kcalcore.nix
diff --git a/pkgs/applications/kde/kcalutils.nix b/nixpkgs/pkgs/applications/kde/kcalutils.nix
index 2e389ec4ac7..2e389ec4ac7 100644
--- a/pkgs/applications/kde/kcalutils.nix
+++ b/nixpkgs/pkgs/applications/kde/kcalutils.nix
diff --git a/pkgs/applications/kde/kcharselect.nix b/nixpkgs/pkgs/applications/kde/kcharselect.nix
index 4af712b1d5a..4af712b1d5a 100644
--- a/pkgs/applications/kde/kcharselect.nix
+++ b/nixpkgs/pkgs/applications/kde/kcharselect.nix
diff --git a/pkgs/applications/kde/kcolorchooser.nix b/nixpkgs/pkgs/applications/kde/kcolorchooser.nix
index 45b32fbe832..45b32fbe832 100644
--- a/pkgs/applications/kde/kcolorchooser.nix
+++ b/nixpkgs/pkgs/applications/kde/kcolorchooser.nix
diff --git a/pkgs/applications/kde/kcontacts.nix b/nixpkgs/pkgs/applications/kde/kcontacts.nix
index 12b3198a26b..12b3198a26b 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/nixpkgs/pkgs/applications/kde/kcontacts.nix
diff --git a/pkgs/applications/kde/kdav.nix b/nixpkgs/pkgs/applications/kde/kdav.nix
index 800c92511de..800c92511de 100644
--- a/pkgs/applications/kde/kdav.nix
+++ b/nixpkgs/pkgs/applications/kde/kdav.nix
diff --git a/pkgs/applications/kde/kdebugsettings.nix b/nixpkgs/pkgs/applications/kde/kdebugsettings.nix
index a58e1b25a2e..a58e1b25a2e 100644
--- a/pkgs/applications/kde/kdebugsettings.nix
+++ b/nixpkgs/pkgs/applications/kde/kdebugsettings.nix
diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/nixpkgs/pkgs/applications/kde/kdegraphics-mobipocket.nix
index e5f5b88ec44..e5f5b88ec44 100644
--- a/pkgs/applications/kde/kdegraphics-mobipocket.nix
+++ b/nixpkgs/pkgs/applications/kde/kdegraphics-mobipocket.nix
diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers.nix
index 6ae45057f19..6ae45057f19 100644
--- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix
+++ b/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers.nix
diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix
index d251eb74f27..d251eb74f27 100644
--- a/pkgs/applications/kde/kdenetwork-filesharing.nix
+++ b/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix
diff --git a/pkgs/applications/kde/kdenlive.nix b/nixpkgs/pkgs/applications/kde/kdenlive.nix
index b7c691e9594..b7c691e9594 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/nixpkgs/pkgs/applications/kde/kdenlive.nix
diff --git a/pkgs/applications/kde/kdepim-addons.nix b/nixpkgs/pkgs/applications/kde/kdepim-addons.nix
index e47aae89e60..e47aae89e60 100644
--- a/pkgs/applications/kde/kdepim-addons.nix
+++ b/nixpkgs/pkgs/applications/kde/kdepim-addons.nix
diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/default.nix
index 6189e8706db..6189e8706db 100644
--- a/pkgs/applications/kde/kdepim-apps-libs/default.nix
+++ b/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/default.nix
diff --git a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch b/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
index 02c369cc4ee..02c369cc4ee 100644
--- a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
+++ b/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
diff --git a/pkgs/applications/kde/kdepim-apps-libs/series b/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/series
index 1e8a52b55e9..1e8a52b55e9 100644
--- a/pkgs/applications/kde/kdepim-apps-libs/series
+++ b/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/series
diff --git a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch b/nixpkgs/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch
index 46722ff5fba..46722ff5fba 100644
--- a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch
+++ b/nixpkgs/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch
diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/nixpkgs/pkgs/applications/kde/kdepim-runtime/default.nix
index 6d7bd0daa96..6d7bd0daa96 100644
--- a/pkgs/applications/kde/kdepim-runtime/default.nix
+++ b/nixpkgs/pkgs/applications/kde/kdepim-runtime/default.nix
diff --git a/pkgs/applications/kde/kdepim-runtime/series b/nixpkgs/pkgs/applications/kde/kdepim-runtime/series
index cc3e104775f..cc3e104775f 100644
--- a/pkgs/applications/kde/kdepim-runtime/series
+++ b/nixpkgs/pkgs/applications/kde/kdepim-runtime/series
diff --git a/pkgs/applications/kde/kdf.nix b/nixpkgs/pkgs/applications/kde/kdf.nix
index eef94fd5eb2..eef94fd5eb2 100644
--- a/pkgs/applications/kde/kdf.nix
+++ b/nixpkgs/pkgs/applications/kde/kdf.nix
diff --git a/pkgs/applications/kde/kdialog.nix b/nixpkgs/pkgs/applications/kde/kdialog.nix
index df301af0cba..df301af0cba 100644
--- a/pkgs/applications/kde/kdialog.nix
+++ b/nixpkgs/pkgs/applications/kde/kdialog.nix
diff --git a/pkgs/applications/kde/keditbookmarks.nix b/nixpkgs/pkgs/applications/kde/keditbookmarks.nix
index 57741c03ad5..57741c03ad5 100644
--- a/pkgs/applications/kde/keditbookmarks.nix
+++ b/nixpkgs/pkgs/applications/kde/keditbookmarks.nix
diff --git a/pkgs/applications/kde/kfind.nix b/nixpkgs/pkgs/applications/kde/kfind.nix
index 10932b38032..10932b38032 100644
--- a/pkgs/applications/kde/kfind.nix
+++ b/nixpkgs/pkgs/applications/kde/kfind.nix
diff --git a/pkgs/applications/kde/kgeography.nix b/nixpkgs/pkgs/applications/kde/kgeography.nix
index c96c198cca9..c96c198cca9 100644
--- a/pkgs/applications/kde/kgeography.nix
+++ b/nixpkgs/pkgs/applications/kde/kgeography.nix
diff --git a/pkgs/applications/kde/kget.nix b/nixpkgs/pkgs/applications/kde/kget.nix
index 6a50f1d08d1..6a50f1d08d1 100644
--- a/pkgs/applications/kde/kget.nix
+++ b/nixpkgs/pkgs/applications/kde/kget.nix
diff --git a/pkgs/applications/kde/kgpg.nix b/nixpkgs/pkgs/applications/kde/kgpg.nix
index 944cff47e0d..944cff47e0d 100644
--- a/pkgs/applications/kde/kgpg.nix
+++ b/nixpkgs/pkgs/applications/kde/kgpg.nix
diff --git a/pkgs/applications/kde/khelpcenter.nix b/nixpkgs/pkgs/applications/kde/khelpcenter.nix
index 69b629bbeb9..69b629bbeb9 100644
--- a/pkgs/applications/kde/khelpcenter.nix
+++ b/nixpkgs/pkgs/applications/kde/khelpcenter.nix
diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/nixpkgs/pkgs/applications/kde/kidentitymanagement.nix
index 92fcc238779..92fcc238779 100644
--- a/pkgs/applications/kde/kidentitymanagement.nix
+++ b/nixpkgs/pkgs/applications/kde/kidentitymanagement.nix
diff --git a/pkgs/applications/kde/kig.nix b/nixpkgs/pkgs/applications/kde/kig.nix
index 7b858907795..7b858907795 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/nixpkgs/pkgs/applications/kde/kig.nix
diff --git a/pkgs/applications/kde/kimap.nix b/nixpkgs/pkgs/applications/kde/kimap.nix
index 9e42c571058..9e42c571058 100644
--- a/pkgs/applications/kde/kimap.nix
+++ b/nixpkgs/pkgs/applications/kde/kimap.nix
diff --git a/pkgs/applications/kde/kio-extras.nix b/nixpkgs/pkgs/applications/kde/kio-extras.nix
index a7aa817576f..a7aa817576f 100644
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/nixpkgs/pkgs/applications/kde/kio-extras.nix
diff --git a/pkgs/applications/kde/kipi-plugins.nix b/nixpkgs/pkgs/applications/kde/kipi-plugins.nix
index 5fb953acbd6..5fb953acbd6 100644
--- a/pkgs/applications/kde/kipi-plugins.nix
+++ b/nixpkgs/pkgs/applications/kde/kipi-plugins.nix
diff --git a/pkgs/applications/kde/kitinerary.nix b/nixpkgs/pkgs/applications/kde/kitinerary.nix
index ce66de251dc..ce66de251dc 100644
--- a/pkgs/applications/kde/kitinerary.nix
+++ b/nixpkgs/pkgs/applications/kde/kitinerary.nix
diff --git a/pkgs/applications/kde/kldap.nix b/nixpkgs/pkgs/applications/kde/kldap.nix
index 14a8aea5e67..14a8aea5e67 100644
--- a/pkgs/applications/kde/kldap.nix
+++ b/nixpkgs/pkgs/applications/kde/kldap.nix
diff --git a/pkgs/applications/kde/kleopatra.nix b/nixpkgs/pkgs/applications/kde/kleopatra.nix
index c15c6eb78d6..c15c6eb78d6 100644
--- a/pkgs/applications/kde/kleopatra.nix
+++ b/nixpkgs/pkgs/applications/kde/kleopatra.nix
diff --git a/pkgs/applications/kde/kmahjongg.nix b/nixpkgs/pkgs/applications/kde/kmahjongg.nix
index b51d0d147e2..b51d0d147e2 100644
--- a/pkgs/applications/kde/kmahjongg.nix
+++ b/nixpkgs/pkgs/applications/kde/kmahjongg.nix
diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/nixpkgs/pkgs/applications/kde/kmail-account-wizard.nix
index f380315cce9..f380315cce9 100644
--- a/pkgs/applications/kde/kmail-account-wizard.nix
+++ b/nixpkgs/pkgs/applications/kde/kmail-account-wizard.nix
diff --git a/pkgs/applications/kde/kmail.nix b/nixpkgs/pkgs/applications/kde/kmail.nix
index ab24f15a14b..ab24f15a14b 100644
--- a/pkgs/applications/kde/kmail.nix
+++ b/nixpkgs/pkgs/applications/kde/kmail.nix
diff --git a/pkgs/applications/kde/kmail.patch b/nixpkgs/pkgs/applications/kde/kmail.patch
index 71a23be2d83..71a23be2d83 100644
--- a/pkgs/applications/kde/kmail.patch
+++ b/nixpkgs/pkgs/applications/kde/kmail.patch
diff --git a/pkgs/applications/kde/kmailtransport.nix b/nixpkgs/pkgs/applications/kde/kmailtransport.nix
index d5832db570c..d5832db570c 100644
--- a/pkgs/applications/kde/kmailtransport.nix
+++ b/nixpkgs/pkgs/applications/kde/kmailtransport.nix
diff --git a/pkgs/applications/kde/kmbox.nix b/nixpkgs/pkgs/applications/kde/kmbox.nix
index c1348edf3f6..c1348edf3f6 100644
--- a/pkgs/applications/kde/kmbox.nix
+++ b/nixpkgs/pkgs/applications/kde/kmbox.nix
diff --git a/pkgs/applications/kde/kmime.nix b/nixpkgs/pkgs/applications/kde/kmime.nix
index 4523a69fc1b..4523a69fc1b 100644
--- a/pkgs/applications/kde/kmime.nix
+++ b/nixpkgs/pkgs/applications/kde/kmime.nix
diff --git a/pkgs/applications/kde/kmix.nix b/nixpkgs/pkgs/applications/kde/kmix.nix
index 8010c57d927..8010c57d927 100644
--- a/pkgs/applications/kde/kmix.nix
+++ b/nixpkgs/pkgs/applications/kde/kmix.nix
diff --git a/pkgs/applications/kde/kmplot.nix b/nixpkgs/pkgs/applications/kde/kmplot.nix
index c0c00f21340..c0c00f21340 100644
--- a/pkgs/applications/kde/kmplot.nix
+++ b/nixpkgs/pkgs/applications/kde/kmplot.nix
diff --git a/pkgs/applications/kde/knotes.nix b/nixpkgs/pkgs/applications/kde/knotes.nix
index 2dc2f48c149..2dc2f48c149 100644
--- a/pkgs/applications/kde/knotes.nix
+++ b/nixpkgs/pkgs/applications/kde/knotes.nix
diff --git a/pkgs/applications/kde/kolf.nix b/nixpkgs/pkgs/applications/kde/kolf.nix
index f9fa31b665b..f9fa31b665b 100644
--- a/pkgs/applications/kde/kolf.nix
+++ b/nixpkgs/pkgs/applications/kde/kolf.nix
diff --git a/pkgs/applications/kde/kolourpaint.nix b/nixpkgs/pkgs/applications/kde/kolourpaint.nix
index 4501324a871..4501324a871 100644
--- a/pkgs/applications/kde/kolourpaint.nix
+++ b/nixpkgs/pkgs/applications/kde/kolourpaint.nix
diff --git a/pkgs/applications/kde/kompare.nix b/nixpkgs/pkgs/applications/kde/kompare.nix
index bbaad3a02f8..bbaad3a02f8 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/nixpkgs/pkgs/applications/kde/kompare.nix
diff --git a/pkgs/applications/kde/konqueror.nix b/nixpkgs/pkgs/applications/kde/konqueror.nix
index e6442fea2f9..e6442fea2f9 100644
--- a/pkgs/applications/kde/konqueror.nix
+++ b/nixpkgs/pkgs/applications/kde/konqueror.nix
diff --git a/pkgs/applications/kde/konquest.nix b/nixpkgs/pkgs/applications/kde/konquest.nix
index cfef018de6c..cfef018de6c 100644
--- a/pkgs/applications/kde/konquest.nix
+++ b/nixpkgs/pkgs/applications/kde/konquest.nix
diff --git a/pkgs/applications/kde/konsole.nix b/nixpkgs/pkgs/applications/kde/konsole.nix
index 1be5b0b4a89..1be5b0b4a89 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/nixpkgs/pkgs/applications/kde/konsole.nix
diff --git a/pkgs/applications/kde/kontact.nix b/nixpkgs/pkgs/applications/kde/kontact.nix
index 978baa925e5..978baa925e5 100644
--- a/pkgs/applications/kde/kontact.nix
+++ b/nixpkgs/pkgs/applications/kde/kontact.nix
diff --git a/pkgs/applications/kde/kontactinterface.nix b/nixpkgs/pkgs/applications/kde/kontactinterface.nix
index f2df628f301..f2df628f301 100644
--- a/pkgs/applications/kde/kontactinterface.nix
+++ b/nixpkgs/pkgs/applications/kde/kontactinterface.nix
diff --git a/pkgs/applications/kde/korganizer.nix b/nixpkgs/pkgs/applications/kde/korganizer.nix
index 2f37a1bac0f..2f37a1bac0f 100644
--- a/pkgs/applications/kde/korganizer.nix
+++ b/nixpkgs/pkgs/applications/kde/korganizer.nix
diff --git a/pkgs/applications/kde/kpat.nix b/nixpkgs/pkgs/applications/kde/kpat.nix
index 9ee57353237..9ee57353237 100644
--- a/pkgs/applications/kde/kpat.nix
+++ b/nixpkgs/pkgs/applications/kde/kpat.nix
diff --git a/pkgs/applications/kde/kpimtextedit.nix b/nixpkgs/pkgs/applications/kde/kpimtextedit.nix
index 4ede854d546..4ede854d546 100644
--- a/pkgs/applications/kde/kpimtextedit.nix
+++ b/nixpkgs/pkgs/applications/kde/kpimtextedit.nix
diff --git a/pkgs/applications/kde/kpkpass.nix b/nixpkgs/pkgs/applications/kde/kpkpass.nix
index e9505a72e85..e9505a72e85 100644
--- a/pkgs/applications/kde/kpkpass.nix
+++ b/nixpkgs/pkgs/applications/kde/kpkpass.nix
diff --git a/pkgs/applications/kde/kqtquickcharts.nix b/nixpkgs/pkgs/applications/kde/kqtquickcharts.nix
index 2b3dc5313d9..2b3dc5313d9 100644
--- a/pkgs/applications/kde/kqtquickcharts.nix
+++ b/nixpkgs/pkgs/applications/kde/kqtquickcharts.nix
diff --git a/pkgs/applications/kde/krdc.nix b/nixpkgs/pkgs/applications/kde/krdc.nix
index 89ac92bb474..89ac92bb474 100644
--- a/pkgs/applications/kde/krdc.nix
+++ b/nixpkgs/pkgs/applications/kde/krdc.nix
diff --git a/pkgs/applications/kde/krfb.nix b/nixpkgs/pkgs/applications/kde/krfb.nix
index d2b96bf6100..d2b96bf6100 100644
--- a/pkgs/applications/kde/krfb.nix
+++ b/nixpkgs/pkgs/applications/kde/krfb.nix
diff --git a/pkgs/applications/kde/kruler.nix b/nixpkgs/pkgs/applications/kde/kruler.nix
index 2018245cfcb..2018245cfcb 100644
--- a/pkgs/applications/kde/kruler.nix
+++ b/nixpkgs/pkgs/applications/kde/kruler.nix
diff --git a/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch b/nixpkgs/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
index 74e83761eb7..74e83761eb7 100644
--- a/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
+++ b/nixpkgs/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
diff --git a/pkgs/applications/kde/ksmtp/default.nix b/nixpkgs/pkgs/applications/kde/ksmtp/default.nix
index 6a5f51a17bf..6a5f51a17bf 100644
--- a/pkgs/applications/kde/ksmtp/default.nix
+++ b/nixpkgs/pkgs/applications/kde/ksmtp/default.nix
diff --git a/pkgs/applications/kde/ksudoku.nix b/nixpkgs/pkgs/applications/kde/ksudoku.nix
index 3641c1b3332..3641c1b3332 100644
--- a/pkgs/applications/kde/ksudoku.nix
+++ b/nixpkgs/pkgs/applications/kde/ksudoku.nix
diff --git a/pkgs/applications/kde/ksystemlog.nix b/nixpkgs/pkgs/applications/kde/ksystemlog.nix
index bec92d55966..bec92d55966 100644
--- a/pkgs/applications/kde/ksystemlog.nix
+++ b/nixpkgs/pkgs/applications/kde/ksystemlog.nix
diff --git a/pkgs/applications/kde/ktnef.nix b/nixpkgs/pkgs/applications/kde/ktnef.nix
index 61f8672e47d..61f8672e47d 100644
--- a/pkgs/applications/kde/ktnef.nix
+++ b/nixpkgs/pkgs/applications/kde/ktnef.nix
diff --git a/pkgs/applications/kde/ktouch.nix b/nixpkgs/pkgs/applications/kde/ktouch.nix
index 7e300ea7157..7e300ea7157 100644
--- a/pkgs/applications/kde/ktouch.nix
+++ b/nixpkgs/pkgs/applications/kde/ktouch.nix
diff --git a/pkgs/applications/kde/kwalletmanager.nix b/nixpkgs/pkgs/applications/kde/kwalletmanager.nix
index e39e7e5157d..e39e7e5157d 100644
--- a/pkgs/applications/kde/kwalletmanager.nix
+++ b/nixpkgs/pkgs/applications/kde/kwalletmanager.nix
diff --git a/pkgs/applications/kde/libgravatar.nix b/nixpkgs/pkgs/applications/kde/libgravatar.nix
index 69a1b9e99cb..69a1b9e99cb 100644
--- a/pkgs/applications/kde/libgravatar.nix
+++ b/nixpkgs/pkgs/applications/kde/libgravatar.nix
diff --git a/pkgs/applications/kde/libkcddb.nix b/nixpkgs/pkgs/applications/kde/libkcddb.nix
index 3fd48605654..3fd48605654 100644
--- a/pkgs/applications/kde/libkcddb.nix
+++ b/nixpkgs/pkgs/applications/kde/libkcddb.nix
diff --git a/pkgs/applications/kde/libkdcraw.nix b/nixpkgs/pkgs/applications/kde/libkdcraw.nix
index 70e3cb0e195..70e3cb0e195 100644
--- a/pkgs/applications/kde/libkdcraw.nix
+++ b/nixpkgs/pkgs/applications/kde/libkdcraw.nix
diff --git a/pkgs/applications/kde/libkdegames.nix b/nixpkgs/pkgs/applications/kde/libkdegames.nix
index 494b193b832..494b193b832 100644
--- a/pkgs/applications/kde/libkdegames.nix
+++ b/nixpkgs/pkgs/applications/kde/libkdegames.nix
diff --git a/pkgs/applications/kde/libkdepim.nix b/nixpkgs/pkgs/applications/kde/libkdepim.nix
index 92716e40a34..92716e40a34 100644
--- a/pkgs/applications/kde/libkdepim.nix
+++ b/nixpkgs/pkgs/applications/kde/libkdepim.nix
diff --git a/pkgs/applications/kde/libkexiv2.nix b/nixpkgs/pkgs/applications/kde/libkexiv2.nix
index 8c8d244d6f6..8c8d244d6f6 100644
--- a/pkgs/applications/kde/libkexiv2.nix
+++ b/nixpkgs/pkgs/applications/kde/libkexiv2.nix
diff --git a/pkgs/applications/kde/libkgapi.nix b/nixpkgs/pkgs/applications/kde/libkgapi.nix
index 9d2d41c41d7..9d2d41c41d7 100644
--- a/pkgs/applications/kde/libkgapi.nix
+++ b/nixpkgs/pkgs/applications/kde/libkgapi.nix
diff --git a/pkgs/applications/kde/libkipi.nix b/nixpkgs/pkgs/applications/kde/libkipi.nix
index c70d8407fc7..c70d8407fc7 100644
--- a/pkgs/applications/kde/libkipi.nix
+++ b/nixpkgs/pkgs/applications/kde/libkipi.nix
diff --git a/pkgs/applications/kde/libkleo.nix b/nixpkgs/pkgs/applications/kde/libkleo.nix
index 0958a0e605f..0958a0e605f 100644
--- a/pkgs/applications/kde/libkleo.nix
+++ b/nixpkgs/pkgs/applications/kde/libkleo.nix
diff --git a/pkgs/applications/kde/libkmahjongg.nix b/nixpkgs/pkgs/applications/kde/libkmahjongg.nix
index 4b7b8538290..4b7b8538290 100644
--- a/pkgs/applications/kde/libkmahjongg.nix
+++ b/nixpkgs/pkgs/applications/kde/libkmahjongg.nix
diff --git a/pkgs/applications/kde/libkomparediff2.nix b/nixpkgs/pkgs/applications/kde/libkomparediff2.nix
index cae2aec5668..cae2aec5668 100644
--- a/pkgs/applications/kde/libkomparediff2.nix
+++ b/nixpkgs/pkgs/applications/kde/libkomparediff2.nix
diff --git a/pkgs/applications/kde/libksane.nix b/nixpkgs/pkgs/applications/kde/libksane.nix
index f92f21de7fb..f92f21de7fb 100644
--- a/pkgs/applications/kde/libksane.nix
+++ b/nixpkgs/pkgs/applications/kde/libksane.nix
diff --git a/pkgs/applications/kde/libksieve.nix b/nixpkgs/pkgs/applications/kde/libksieve.nix
index dd33f759c31..dd33f759c31 100644
--- a/pkgs/applications/kde/libksieve.nix
+++ b/nixpkgs/pkgs/applications/kde/libksieve.nix
diff --git a/pkgs/applications/kde/mailcommon.nix b/nixpkgs/pkgs/applications/kde/mailcommon.nix
index 44edea8f55e..44edea8f55e 100644
--- a/pkgs/applications/kde/mailcommon.nix
+++ b/nixpkgs/pkgs/applications/kde/mailcommon.nix
diff --git a/pkgs/applications/kde/mailimporter.nix b/nixpkgs/pkgs/applications/kde/mailimporter.nix
index f002ff0f340..f002ff0f340 100644
--- a/pkgs/applications/kde/mailimporter.nix
+++ b/nixpkgs/pkgs/applications/kde/mailimporter.nix
diff --git a/pkgs/applications/kde/marble.nix b/nixpkgs/pkgs/applications/kde/marble.nix
index b02e29e3351..b02e29e3351 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/nixpkgs/pkgs/applications/kde/marble.nix
diff --git a/pkgs/applications/kde/mbox-importer.nix b/nixpkgs/pkgs/applications/kde/mbox-importer.nix
index 0704003353a..0704003353a 100644
--- a/pkgs/applications/kde/mbox-importer.nix
+++ b/nixpkgs/pkgs/applications/kde/mbox-importer.nix
diff --git a/pkgs/applications/kde/messagelib.nix b/nixpkgs/pkgs/applications/kde/messagelib.nix
index 23920a081c0..23920a081c0 100644
--- a/pkgs/applications/kde/messagelib.nix
+++ b/nixpkgs/pkgs/applications/kde/messagelib.nix
diff --git a/pkgs/applications/kde/minuet.nix b/nixpkgs/pkgs/applications/kde/minuet.nix
index cd98d56b86d..cd98d56b86d 100644
--- a/pkgs/applications/kde/minuet.nix
+++ b/nixpkgs/pkgs/applications/kde/minuet.nix
diff --git a/pkgs/applications/kde/mlt-path.patch b/nixpkgs/pkgs/applications/kde/mlt-path.patch
index 9bfb66c1a83..9bfb66c1a83 100644
--- a/pkgs/applications/kde/mlt-path.patch
+++ b/nixpkgs/pkgs/applications/kde/mlt-path.patch
diff --git a/pkgs/applications/kde/okular.nix b/nixpkgs/pkgs/applications/kde/okular.nix
index 377fbe3339a..377fbe3339a 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/nixpkgs/pkgs/applications/kde/okular.nix
diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/nixpkgs/pkgs/applications/kde/pim-data-exporter.nix
index 82cdf19df94..82cdf19df94 100644
--- a/pkgs/applications/kde/pim-data-exporter.nix
+++ b/nixpkgs/pkgs/applications/kde/pim-data-exporter.nix
diff --git a/pkgs/applications/kde/pim-sieve-editor.nix b/nixpkgs/pkgs/applications/kde/pim-sieve-editor.nix
index c83df2e0e49..c83df2e0e49 100644
--- a/pkgs/applications/kde/pim-sieve-editor.nix
+++ b/nixpkgs/pkgs/applications/kde/pim-sieve-editor.nix
diff --git a/pkgs/applications/kde/pimcommon.nix b/nixpkgs/pkgs/applications/kde/pimcommon.nix
index cd9ff2528fa..cd9ff2528fa 100644
--- a/pkgs/applications/kde/pimcommon.nix
+++ b/nixpkgs/pkgs/applications/kde/pimcommon.nix
diff --git a/pkgs/applications/kde/print-manager.nix b/nixpkgs/pkgs/applications/kde/print-manager.nix
index f0501ffadee..f0501ffadee 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/nixpkgs/pkgs/applications/kde/print-manager.nix
diff --git a/pkgs/applications/kde/rocs.nix b/nixpkgs/pkgs/applications/kde/rocs.nix
index feae7ca81de..feae7ca81de 100644
--- a/pkgs/applications/kde/rocs.nix
+++ b/nixpkgs/pkgs/applications/kde/rocs.nix
diff --git a/pkgs/applications/kde/spectacle.nix b/nixpkgs/pkgs/applications/kde/spectacle.nix
index 2d46b3cdaab..2d46b3cdaab 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/nixpkgs/pkgs/applications/kde/spectacle.nix
diff --git a/pkgs/applications/kde/srcs.nix b/nixpkgs/pkgs/applications/kde/srcs.nix
index 8d199a291c4..8d199a291c4 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/nixpkgs/pkgs/applications/kde/srcs.nix
diff --git a/pkgs/applications/kde/yakuake.nix b/nixpkgs/pkgs/applications/kde/yakuake.nix
index 6f9c8df3001..6f9c8df3001 100644
--- a/pkgs/applications/kde/yakuake.nix
+++ b/nixpkgs/pkgs/applications/kde/yakuake.nix
diff --git a/pkgs/applications/misc/1password/default.nix b/nixpkgs/pkgs/applications/misc/1password/default.nix
index 1c409c232a8..1c409c232a8 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/nixpkgs/pkgs/applications/misc/1password/default.nix
diff --git a/pkgs/applications/misc/abook/default.nix b/nixpkgs/pkgs/applications/misc/abook/default.nix
index f87bd4c11ec..f87bd4c11ec 100644
--- a/pkgs/applications/misc/abook/default.nix
+++ b/nixpkgs/pkgs/applications/misc/abook/default.nix
diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/nixpkgs/pkgs/applications/misc/adobe-reader/builder.sh
index 41281385c99..41281385c99 100644
--- a/pkgs/applications/misc/adobe-reader/builder.sh
+++ b/nixpkgs/pkgs/applications/misc/adobe-reader/builder.sh
diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/nixpkgs/pkgs/applications/misc/adobe-reader/default.nix
index d1e4856e052..d1e4856e052 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/nixpkgs/pkgs/applications/misc/adobe-reader/default.nix
diff --git a/pkgs/applications/misc/airtame/default.nix b/nixpkgs/pkgs/applications/misc/airtame/default.nix
index 465c72d73f5..465c72d73f5 100644
--- a/pkgs/applications/misc/airtame/default.nix
+++ b/nixpkgs/pkgs/applications/misc/airtame/default.nix
diff --git a/pkgs/applications/misc/alacritty/default.nix b/nixpkgs/pkgs/applications/misc/alacritty/default.nix
index 7d4f0614d8b..7d4f0614d8b 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/nixpkgs/pkgs/applications/misc/alacritty/default.nix
diff --git a/pkgs/applications/misc/albert/default.nix b/nixpkgs/pkgs/applications/misc/albert/default.nix
index 6fc5f951465..6fc5f951465 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/nixpkgs/pkgs/applications/misc/albert/default.nix
diff --git a/pkgs/applications/misc/almanah/default.nix b/nixpkgs/pkgs/applications/misc/almanah/default.nix
index 06321d9d621..06321d9d621 100644
--- a/pkgs/applications/misc/almanah/default.nix
+++ b/nixpkgs/pkgs/applications/misc/almanah/default.nix
diff --git a/pkgs/applications/misc/aminal/default.nix b/nixpkgs/pkgs/applications/misc/aminal/default.nix
index 8c5aded5ed9..8c5aded5ed9 100644
--- a/pkgs/applications/misc/aminal/default.nix
+++ b/nixpkgs/pkgs/applications/misc/aminal/default.nix
diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix
index 8108b9e4ddb..8108b9e4ddb 100644
--- a/pkgs/applications/misc/antfs-cli/default.nix
+++ b/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix
diff --git a/pkgs/applications/misc/ape/apeclex.nix b/nixpkgs/pkgs/applications/misc/ape/apeclex.nix
index 710ddfec994..710ddfec994 100644
--- a/pkgs/applications/misc/ape/apeclex.nix
+++ b/nixpkgs/pkgs/applications/misc/ape/apeclex.nix
diff --git a/pkgs/applications/misc/ape/clex.nix b/nixpkgs/pkgs/applications/misc/ape/clex.nix
index c680ffe9678..c680ffe9678 100644
--- a/pkgs/applications/misc/ape/clex.nix
+++ b/nixpkgs/pkgs/applications/misc/ape/clex.nix
diff --git a/pkgs/applications/misc/ape/default.nix b/nixpkgs/pkgs/applications/misc/ape/default.nix
index 0d8ebccb3d0..0d8ebccb3d0 100644
--- a/pkgs/applications/misc/ape/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ape/default.nix
diff --git a/pkgs/applications/misc/appeditor/default.nix b/nixpkgs/pkgs/applications/misc/appeditor/default.nix
index cda75ac4c05..cda75ac4c05 100644
--- a/pkgs/applications/misc/appeditor/default.nix
+++ b/nixpkgs/pkgs/applications/misc/appeditor/default.nix
diff --git a/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch b/nixpkgs/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch
index f6c0b4cfd28..f6c0b4cfd28 100644
--- a/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch
+++ b/nixpkgs/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch
diff --git a/pkgs/applications/misc/apvlv/default.nix b/nixpkgs/pkgs/applications/misc/apvlv/default.nix
index b5af1af91f3..b5af1af91f3 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/nixpkgs/pkgs/applications/misc/apvlv/default.nix
diff --git a/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch b/nixpkgs/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch
index d2a7831dca6..d2a7831dca6 100644
--- a/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch
+++ b/nixpkgs/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch
diff --git a/pkgs/applications/misc/archiver/default.nix b/nixpkgs/pkgs/applications/misc/archiver/default.nix
index 03f534e1a4d..03f534e1a4d 100644
--- a/pkgs/applications/misc/archiver/default.nix
+++ b/nixpkgs/pkgs/applications/misc/archiver/default.nix
diff --git a/pkgs/applications/misc/artha/default.nix b/nixpkgs/pkgs/applications/misc/artha/default.nix
index b03d2aa208b..b03d2aa208b 100644
--- a/pkgs/applications/misc/artha/default.nix
+++ b/nixpkgs/pkgs/applications/misc/artha/default.nix
diff --git a/pkgs/applications/misc/artha/gio-underlink.patch b/nixpkgs/pkgs/applications/misc/artha/gio-underlink.patch
index 08d9c478736..08d9c478736 100644
--- a/pkgs/applications/misc/artha/gio-underlink.patch
+++ b/nixpkgs/pkgs/applications/misc/artha/gio-underlink.patch
diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix
index 0e524ede091..0e524ede091 100644
--- a/pkgs/applications/misc/asciiquarium/default.nix
+++ b/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix
diff --git a/pkgs/applications/misc/audio/sox/default.nix b/nixpkgs/pkgs/applications/misc/audio/sox/default.nix
index 622e7169fae..622e7169fae 100644
--- a/pkgs/applications/misc/audio/sox/default.nix
+++ b/nixpkgs/pkgs/applications/misc/audio/sox/default.nix
diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix
index 20a754ba98a..20a754ba98a 100644
--- a/pkgs/applications/misc/audio/soxr/default.nix
+++ b/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix
diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix
index 0add5ed78cc..0add5ed78cc 100644
--- a/pkgs/applications/misc/audio/wavesurfer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix
diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/nixpkgs/pkgs/applications/misc/audio/wavrsocvt/default.nix
index 09b75e27d46..09b75e27d46 100644
--- a/pkgs/applications/misc/audio/wavrsocvt/default.nix
+++ b/nixpkgs/pkgs/applications/misc/audio/wavrsocvt/default.nix
diff --git a/pkgs/applications/misc/autospotting/default.nix b/nixpkgs/pkgs/applications/misc/autospotting/default.nix
index b00686fb24f..b00686fb24f 100644
--- a/pkgs/applications/misc/autospotting/default.nix
+++ b/nixpkgs/pkgs/applications/misc/autospotting/default.nix
diff --git a/pkgs/applications/misc/autospotting/deps.nix b/nixpkgs/pkgs/applications/misc/autospotting/deps.nix
index ea744ed6648..ea744ed6648 100644
--- a/pkgs/applications/misc/autospotting/deps.nix
+++ b/nixpkgs/pkgs/applications/misc/autospotting/deps.nix
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/nixpkgs/pkgs/applications/misc/avrdudess/default.nix
index 165bee76b69..165bee76b69 100644
--- a/pkgs/applications/misc/avrdudess/default.nix
+++ b/nixpkgs/pkgs/applications/misc/avrdudess/default.nix
diff --git a/pkgs/applications/misc/barrier/default.nix b/nixpkgs/pkgs/applications/misc/barrier/default.nix
index 10e46176c6e..10e46176c6e 100644
--- a/pkgs/applications/misc/barrier/default.nix
+++ b/nixpkgs/pkgs/applications/misc/barrier/default.nix
diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix
index 0976e7625bc..0976e7625bc 100644
--- a/pkgs/applications/misc/bashSnippets/default.nix
+++ b/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix
diff --git a/pkgs/applications/misc/bb/default.nix b/nixpkgs/pkgs/applications/misc/bb/default.nix
index 06df1df9f76..06df1df9f76 100644
--- a/pkgs/applications/misc/bb/default.nix
+++ b/nixpkgs/pkgs/applications/misc/bb/default.nix
diff --git a/pkgs/applications/misc/bemenu/default.nix b/nixpkgs/pkgs/applications/misc/bemenu/default.nix
index 665198b3d1f..665198b3d1f 100644
--- a/pkgs/applications/misc/bemenu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/bemenu/default.nix
diff --git a/pkgs/applications/misc/bibletime/default.nix b/nixpkgs/pkgs/applications/misc/bibletime/default.nix
index d0af940ac92..d0af940ac92 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/nixpkgs/pkgs/applications/misc/bibletime/default.nix
diff --git a/pkgs/applications/misc/bicon/default.nix b/nixpkgs/pkgs/applications/misc/bicon/default.nix
index 22eb3e3d859..22eb3e3d859 100644
--- a/pkgs/applications/misc/bicon/default.nix
+++ b/nixpkgs/pkgs/applications/misc/bicon/default.nix
diff --git a/pkgs/applications/misc/birdtray/default.nix b/nixpkgs/pkgs/applications/misc/birdtray/default.nix
index 39ecaa995d1..39ecaa995d1 100644
--- a/pkgs/applications/misc/birdtray/default.nix
+++ b/nixpkgs/pkgs/applications/misc/birdtray/default.nix
diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/nixpkgs/pkgs/applications/misc/bitcoinarmory/default.nix
index 090cb2f519e..090cb2f519e 100644
--- a/pkgs/applications/misc/bitcoinarmory/default.nix
+++ b/nixpkgs/pkgs/applications/misc/bitcoinarmory/default.nix
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/nixpkgs/pkgs/applications/misc/bleachbit/default.nix
index 225a5c5fc37..225a5c5fc37 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/nixpkgs/pkgs/applications/misc/bleachbit/default.nix
diff --git a/pkgs/applications/misc/blender/darwin.patch b/nixpkgs/pkgs/applications/misc/blender/darwin.patch
index 43b96466df2..43b96466df2 100644
--- a/pkgs/applications/misc/blender/darwin.patch
+++ b/nixpkgs/pkgs/applications/misc/blender/darwin.patch
diff --git a/pkgs/applications/misc/blender/default.nix b/nixpkgs/pkgs/applications/misc/blender/default.nix
index 83f2bf63642..83f2bf63642 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/nixpkgs/pkgs/applications/misc/blender/default.nix
diff --git a/pkgs/applications/misc/blender/fix-include.patch b/nixpkgs/pkgs/applications/misc/blender/fix-include.patch
index 44e2147d073..44e2147d073 100644
--- a/pkgs/applications/misc/blender/fix-include.patch
+++ b/nixpkgs/pkgs/applications/misc/blender/fix-include.patch
diff --git a/pkgs/applications/misc/blugon/default.nix b/nixpkgs/pkgs/applications/misc/blugon/default.nix
index e6f956cc091..e6f956cc091 100644
--- a/pkgs/applications/misc/blugon/default.nix
+++ b/nixpkgs/pkgs/applications/misc/blugon/default.nix
diff --git a/pkgs/applications/misc/brewtarget/default.nix b/nixpkgs/pkgs/applications/misc/brewtarget/default.nix
index 11824503450..11824503450 100644
--- a/pkgs/applications/misc/brewtarget/default.nix
+++ b/nixpkgs/pkgs/applications/misc/brewtarget/default.nix
diff --git a/pkgs/applications/misc/buku/default.nix b/nixpkgs/pkgs/applications/misc/buku/default.nix
index 98f6e2895d1..98f6e2895d1 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/nixpkgs/pkgs/applications/misc/buku/default.nix
diff --git a/pkgs/applications/misc/calcurse/default.nix b/nixpkgs/pkgs/applications/misc/calcurse/default.nix
index 8f8934cb084..8f8934cb084 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/nixpkgs/pkgs/applications/misc/calcurse/default.nix
diff --git a/pkgs/applications/misc/calibre/default.nix b/nixpkgs/pkgs/applications/misc/calibre/default.nix
index fd86f21dff0..fd86f21dff0 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/nixpkgs/pkgs/applications/misc/calibre/default.nix
diff --git a/pkgs/applications/misc/calibre/disable_plugins.patch b/nixpkgs/pkgs/applications/misc/calibre/disable_plugins.patch
index 9ef1dd04251..9ef1dd04251 100644
--- a/pkgs/applications/misc/calibre/disable_plugins.patch
+++ b/nixpkgs/pkgs/applications/misc/calibre/disable_plugins.patch
diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/nixpkgs/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
index 5164b80a0be..5164b80a0be 100644
--- a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
+++ b/nixpkgs/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/nixpkgs/pkgs/applications/misc/calibre/no_updates_dialog.patch
index faaaf2c1994..faaaf2c1994 100644
--- a/pkgs/applications/misc/calibre/no_updates_dialog.patch
+++ b/nixpkgs/pkgs/applications/misc/calibre/no_updates_dialog.patch
diff --git a/pkgs/applications/misc/candle/default.nix b/nixpkgs/pkgs/applications/misc/candle/default.nix
index 77cabc409c7..77cabc409c7 100644
--- a/pkgs/applications/misc/candle/default.nix
+++ b/nixpkgs/pkgs/applications/misc/candle/default.nix
diff --git a/pkgs/applications/misc/cardpeek/default.nix b/nixpkgs/pkgs/applications/misc/cardpeek/default.nix
index 40dbfea9801..40dbfea9801 100644
--- a/pkgs/applications/misc/cardpeek/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cardpeek/default.nix
diff --git a/pkgs/applications/misc/cataract/build.nix b/nixpkgs/pkgs/applications/misc/cataract/build.nix
index 1c33a92987c..1c33a92987c 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/nixpkgs/pkgs/applications/misc/cataract/build.nix
diff --git a/pkgs/applications/misc/cataract/default.nix b/nixpkgs/pkgs/applications/misc/cataract/default.nix
index 3a9f2028922..3a9f2028922 100644
--- a/pkgs/applications/misc/cataract/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cataract/default.nix
diff --git a/pkgs/applications/misc/cataract/unstable.nix b/nixpkgs/pkgs/applications/misc/cataract/unstable.nix
index 397aed355a9..397aed355a9 100644
--- a/pkgs/applications/misc/cataract/unstable.nix
+++ b/nixpkgs/pkgs/applications/misc/cataract/unstable.nix
diff --git a/pkgs/applications/misc/catclock/default.nix b/nixpkgs/pkgs/applications/misc/catclock/default.nix
index 09c36f9eb2f..09c36f9eb2f 100644
--- a/pkgs/applications/misc/catclock/default.nix
+++ b/nixpkgs/pkgs/applications/misc/catclock/default.nix
diff --git a/pkgs/applications/misc/cbatticon/default.nix b/nixpkgs/pkgs/applications/misc/cbatticon/default.nix
index ac2948c2d6e..ac2948c2d6e 100644
--- a/pkgs/applications/misc/cbatticon/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cbatticon/default.nix
diff --git a/pkgs/applications/misc/cgminer/default.nix b/nixpkgs/pkgs/applications/misc/cgminer/default.nix
index c05c7423d9a..c05c7423d9a 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cgminer/default.nix
diff --git a/pkgs/applications/misc/cheat/default.nix b/nixpkgs/pkgs/applications/misc/cheat/default.nix
index a86c1e8bc05..a86c1e8bc05 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cheat/default.nix
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/nixpkgs/pkgs/applications/misc/cherrytree/default.nix
index e06ee14a2d3..e06ee14a2d3 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cherrytree/default.nix
diff --git a/pkgs/applications/misc/cherrytree/subprocess.patch b/nixpkgs/pkgs/applications/misc/cherrytree/subprocess.patch
index 1f80cde03b7..1f80cde03b7 100644
--- a/pkgs/applications/misc/cherrytree/subprocess.patch
+++ b/nixpkgs/pkgs/applications/misc/cherrytree/subprocess.patch
diff --git a/pkgs/applications/misc/cipher/default.nix b/nixpkgs/pkgs/applications/misc/cipher/default.nix
index cdcfcc00481..cdcfcc00481 100644
--- a/pkgs/applications/misc/cipher/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cipher/default.nix
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix
index 4986661e2f6..4986661e2f6 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix
diff --git a/pkgs/applications/misc/clight/clightd.nix b/nixpkgs/pkgs/applications/misc/clight/clightd.nix
index f9c08d1f00a..f9c08d1f00a 100644
--- a/pkgs/applications/misc/clight/clightd.nix
+++ b/nixpkgs/pkgs/applications/misc/clight/clightd.nix
diff --git a/pkgs/applications/misc/clight/default.nix b/nixpkgs/pkgs/applications/misc/clight/default.nix
index a2e45256269..a2e45256269 100644
--- a/pkgs/applications/misc/clight/default.nix
+++ b/nixpkgs/pkgs/applications/misc/clight/default.nix
diff --git a/pkgs/applications/misc/clipit/default.nix b/nixpkgs/pkgs/applications/misc/clipit/default.nix
index 129516a4498..129516a4498 100644
--- a/pkgs/applications/misc/clipit/default.nix
+++ b/nixpkgs/pkgs/applications/misc/clipit/default.nix
diff --git a/pkgs/applications/misc/clipmenu/default.nix b/nixpkgs/pkgs/applications/misc/clipmenu/default.nix
index 7577c0a3db9..7577c0a3db9 100644
--- a/pkgs/applications/misc/clipmenu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/clipmenu/default.nix
diff --git a/pkgs/applications/misc/cmatrix/default.nix b/nixpkgs/pkgs/applications/misc/cmatrix/default.nix
index 9f86ec94f18..9f86ec94f18 100644
--- a/pkgs/applications/misc/cmatrix/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cmatrix/default.nix
diff --git a/pkgs/applications/misc/cointop/default.nix b/nixpkgs/pkgs/applications/misc/cointop/default.nix
index 29700774219..29700774219 100644
--- a/pkgs/applications/misc/cointop/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cointop/default.nix
diff --git a/pkgs/applications/misc/colort/default.nix b/nixpkgs/pkgs/applications/misc/colort/default.nix
index 554c7d8c78b..554c7d8c78b 100644
--- a/pkgs/applications/misc/colort/default.nix
+++ b/nixpkgs/pkgs/applications/misc/colort/default.nix
diff --git a/pkgs/applications/misc/confclerk/default.nix b/nixpkgs/pkgs/applications/misc/confclerk/default.nix
index b07e0fb8c52..b07e0fb8c52 100644
--- a/pkgs/applications/misc/confclerk/default.nix
+++ b/nixpkgs/pkgs/applications/misc/confclerk/default.nix
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix
index c9dcc97d5cd..c9dcc97d5cd 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix
diff --git a/pkgs/applications/misc/copyq/default.nix b/nixpkgs/pkgs/applications/misc/copyq/default.nix
index 58a85f8f6e9..58a85f8f6e9 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/nixpkgs/pkgs/applications/misc/copyq/default.nix
diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix
index c09457d2c65..c09457d2c65 100644
--- a/pkgs/applications/misc/coursera-dl/default.nix
+++ b/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix
diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/nixpkgs/pkgs/applications/misc/cpp-ethereum/default.nix
index dae25f6b817..dae25f6b817 100644
--- a/pkgs/applications/misc/cpp-ethereum/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cpp-ethereum/default.nix
diff --git a/pkgs/applications/misc/crumbs/default.nix b/nixpkgs/pkgs/applications/misc/crumbs/default.nix
index 2d612c16fef..2d612c16fef 100644
--- a/pkgs/applications/misc/crumbs/default.nix
+++ b/nixpkgs/pkgs/applications/misc/crumbs/default.nix
diff --git a/pkgs/applications/misc/ctodo/default.nix b/nixpkgs/pkgs/applications/misc/ctodo/default.nix
index 72918a40733..72918a40733 100644
--- a/pkgs/applications/misc/ctodo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ctodo/default.nix
diff --git a/pkgs/applications/misc/cum/default.nix b/nixpkgs/pkgs/applications/misc/cum/default.nix
index 2675a5f4fc5..2675a5f4fc5 100644
--- a/pkgs/applications/misc/cum/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cum/default.nix
diff --git a/pkgs/applications/misc/cura/default.nix b/nixpkgs/pkgs/applications/misc/cura/default.nix
index 7187b8c0099..7187b8c0099 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cura/default.nix
diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/curaengine.nix
index aad9b9bee89..aad9b9bee89 100644
--- a/pkgs/applications/misc/cura/lulzbot/curaengine.nix
+++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/curaengine.nix
diff --git a/pkgs/applications/misc/cura/lulzbot/default.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/default.nix
index c67fcb74047..c67fcb74047 100644
--- a/pkgs/applications/misc/cura/lulzbot/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/default.nix
diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix
index 733aa27da85..733aa27da85 100644
--- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix
+++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix
diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
index e6c277959e0..e6c277959e0 100644
--- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
+++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix
index acffc741d57..acffc741d57 100644
--- a/pkgs/applications/misc/cura/lulzbot/uranium.nix
+++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix
diff --git a/pkgs/applications/misc/cura/numpy-cast.patch b/nixpkgs/pkgs/applications/misc/cura/numpy-cast.patch
index efb14182b3e..efb14182b3e 100644
--- a/pkgs/applications/misc/cura/numpy-cast.patch
+++ b/nixpkgs/pkgs/applications/misc/cura/numpy-cast.patch
diff --git a/pkgs/applications/misc/cura/plugins.nix b/nixpkgs/pkgs/applications/misc/cura/plugins.nix
index 35d6c97fa0b..35d6c97fa0b 100644
--- a/pkgs/applications/misc/cura/plugins.nix
+++ b/nixpkgs/pkgs/applications/misc/cura/plugins.nix
diff --git a/pkgs/applications/misc/cura/stable.nix b/nixpkgs/pkgs/applications/misc/cura/stable.nix
index 1972042f805..1972042f805 100644
--- a/pkgs/applications/misc/cura/stable.nix
+++ b/nixpkgs/pkgs/applications/misc/cura/stable.nix
diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix
index a367efaaef3..a367efaaef3 100644
--- a/pkgs/applications/misc/curabydagoma/default.nix
+++ b/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix
diff --git a/pkgs/applications/misc/curaengine/default.nix b/nixpkgs/pkgs/applications/misc/curaengine/default.nix
index 6594deb84a5..6594deb84a5 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/nixpkgs/pkgs/applications/misc/curaengine/default.nix
diff --git a/pkgs/applications/misc/curaengine/stable.nix b/nixpkgs/pkgs/applications/misc/curaengine/stable.nix
index 41f110e9ee1..41f110e9ee1 100644
--- a/pkgs/applications/misc/curaengine/stable.nix
+++ b/nixpkgs/pkgs/applications/misc/curaengine/stable.nix
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix
index f6236a301db..f6236a301db 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix
diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/nixpkgs/pkgs/applications/misc/dbvisualizer/default.nix
index fbeb965df38..fbeb965df38 100644
--- a/pkgs/applications/misc/dbvisualizer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dbvisualizer/default.nix
diff --git a/pkgs/applications/misc/ddgr/default.nix b/nixpkgs/pkgs/applications/misc/ddgr/default.nix
index 7d211b26a42..7d211b26a42 100644
--- a/pkgs/applications/misc/ddgr/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ddgr/default.nix
diff --git a/pkgs/applications/misc/deco/default.nix b/nixpkgs/pkgs/applications/misc/deco/default.nix
index a1fdabd8ccb..a1fdabd8ccb 100644
--- a/pkgs/applications/misc/deco/default.nix
+++ b/nixpkgs/pkgs/applications/misc/deco/default.nix
diff --git a/pkgs/applications/misc/devilspie2/default.nix b/nixpkgs/pkgs/applications/misc/devilspie2/default.nix
index 5699396a084..5699396a084 100644
--- a/pkgs/applications/misc/devilspie2/default.nix
+++ b/nixpkgs/pkgs/applications/misc/devilspie2/default.nix
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix
index 1bfb6bbfeaf..1bfb6bbfeaf 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix
index 83116da4df0..83116da4df0 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/nixpkgs/pkgs/applications/misc/diffpdf/default.nix
index 957d3ee72bb..957d3ee72bb 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/diffpdf/default.nix
diff --git a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch b/nixpkgs/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch
index 9535ea2c6b0..9535ea2c6b0 100644
--- a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch
+++ b/nixpkgs/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix
index a6ae4530655..a6ae4530655 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix
diff --git a/pkgs/applications/misc/ding/default.nix b/nixpkgs/pkgs/applications/misc/ding/default.nix
index e76f95b6a50..e76f95b6a50 100644
--- a/pkgs/applications/misc/ding/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ding/default.nix
diff --git a/pkgs/applications/misc/ding/dict.patch b/nixpkgs/pkgs/applications/misc/ding/dict.patch
index 70ecea10550..70ecea10550 100644
--- a/pkgs/applications/misc/ding/dict.patch
+++ b/nixpkgs/pkgs/applications/misc/ding/dict.patch
diff --git a/pkgs/applications/misc/direwolf/default.nix b/nixpkgs/pkgs/applications/misc/direwolf/default.nix
index 8f7dbd2d2ed..8f7dbd2d2ed 100644
--- a/pkgs/applications/misc/direwolf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/direwolf/default.nix
diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch b/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch
index 89ff3759451..89ff3759451 100644
--- a/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch
+++ b/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch
diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch b/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch
index ef1905338fb..ef1905338fb 100644
--- a/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch
+++ b/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch
diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch b/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch
index 6094be88338..6094be88338 100644
--- a/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch
+++ b/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch
diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch b/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch
index 01108f9ee73..01108f9ee73 100644
--- a/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch
+++ b/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch
diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch b/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch
index 132fed79488..132fed79488 100644
--- a/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch
+++ b/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/nixpkgs/pkgs/applications/misc/djvulibre/default.nix
index afb7b6cf139..afb7b6cf139 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/nixpkgs/pkgs/applications/misc/djvulibre/default.nix
diff --git a/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch b/nixpkgs/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch
index 609b41cd9db..609b41cd9db 100644
--- a/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch
+++ b/nixpkgs/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch
diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix
index 1c3b4133867..1c3b4133867 100644
--- a/pkgs/applications/misc/dmensamenu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix
diff --git a/pkgs/applications/misc/dmensamenu/dmenu-path.patch b/nixpkgs/pkgs/applications/misc/dmensamenu/dmenu-path.patch
index 1508e5142d2..1508e5142d2 100644
--- a/pkgs/applications/misc/dmensamenu/dmenu-path.patch
+++ b/nixpkgs/pkgs/applications/misc/dmensamenu/dmenu-path.patch
diff --git a/pkgs/applications/misc/dmenu/default.nix b/nixpkgs/pkgs/applications/misc/dmenu/default.nix
index 8d13ac42e1f..8d13ac42e1f 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dmenu/default.nix
diff --git a/pkgs/applications/misc/dmenu/xim.patch b/nixpkgs/pkgs/applications/misc/dmenu/xim.patch
index f77d48324da..f77d48324da 100644
--- a/pkgs/applications/misc/dmenu/xim.patch
+++ b/nixpkgs/pkgs/applications/misc/dmenu/xim.patch
diff --git a/pkgs/applications/misc/dockbarx/default.nix b/nixpkgs/pkgs/applications/misc/dockbarx/default.nix
index 3888c4ce0a0..3888c4ce0a0 100644
--- a/pkgs/applications/misc/dockbarx/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dockbarx/default.nix
diff --git a/pkgs/applications/misc/doing/Gemfile b/nixpkgs/pkgs/applications/misc/doing/Gemfile
index 2706a85e9d8..2706a85e9d8 100644
--- a/pkgs/applications/misc/doing/Gemfile
+++ b/nixpkgs/pkgs/applications/misc/doing/Gemfile
diff --git a/pkgs/applications/misc/doing/Gemfile.lock b/nixpkgs/pkgs/applications/misc/doing/Gemfile.lock
index 4d266827415..4d266827415 100644
--- a/pkgs/applications/misc/doing/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/misc/doing/Gemfile.lock
diff --git a/pkgs/applications/misc/doing/default.nix b/nixpkgs/pkgs/applications/misc/doing/default.nix
index d72a5b84826..d72a5b84826 100644
--- a/pkgs/applications/misc/doing/default.nix
+++ b/nixpkgs/pkgs/applications/misc/doing/default.nix
diff --git a/pkgs/applications/misc/doing/gemset.nix b/nixpkgs/pkgs/applications/misc/doing/gemset.nix
index b30a124bb58..b30a124bb58 100644
--- a/pkgs/applications/misc/doing/gemset.nix
+++ b/nixpkgs/pkgs/applications/misc/doing/gemset.nix
diff --git a/pkgs/applications/misc/doomseeker/default.nix b/nixpkgs/pkgs/applications/misc/doomseeker/default.nix
index fbe21dd9a5b..fbe21dd9a5b 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/nixpkgs/pkgs/applications/misc/doomseeker/default.nix
diff --git a/pkgs/applications/misc/doomseeker/fix_paths.patch b/nixpkgs/pkgs/applications/misc/doomseeker/fix_paths.patch
index 08654c2384c..08654c2384c 100644
--- a/pkgs/applications/misc/doomseeker/fix_paths.patch
+++ b/nixpkgs/pkgs/applications/misc/doomseeker/fix_paths.patch
diff --git a/pkgs/applications/misc/doomseeker/qt_build_fix.patch b/nixpkgs/pkgs/applications/misc/doomseeker/qt_build_fix.patch
index e21b53b3cc5..e21b53b3cc5 100644
--- a/pkgs/applications/misc/doomseeker/qt_build_fix.patch
+++ b/nixpkgs/pkgs/applications/misc/doomseeker/qt_build_fix.patch
diff --git a/pkgs/applications/misc/dotfiles/default.nix b/nixpkgs/pkgs/applications/misc/dotfiles/default.nix
index 5150f13fb80..5150f13fb80 100644
--- a/pkgs/applications/misc/dotfiles/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dotfiles/default.nix
diff --git a/pkgs/applications/misc/dozenal/default.nix b/nixpkgs/pkgs/applications/misc/dozenal/default.nix
index 226bdea0301..226bdea0301 100644
--- a/pkgs/applications/misc/dozenal/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dozenal/default.nix
diff --git a/pkgs/applications/misc/dozenal/lua-header.patch b/nixpkgs/pkgs/applications/misc/dozenal/lua-header.patch
index 45b76e159a1..45b76e159a1 100644
--- a/pkgs/applications/misc/dozenal/lua-header.patch
+++ b/nixpkgs/pkgs/applications/misc/dozenal/lua-header.patch
diff --git a/pkgs/applications/misc/dunst/default.nix b/nixpkgs/pkgs/applications/misc/dunst/default.nix
index 7da2ae421d7..7da2ae421d7 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dunst/default.nix
diff --git a/pkgs/applications/misc/dupeguru/default.nix b/nixpkgs/pkgs/applications/misc/dupeguru/default.nix
index 0e7155f374d..0e7155f374d 100644
--- a/pkgs/applications/misc/dupeguru/default.nix
+++ b/nixpkgs/pkgs/applications/misc/dupeguru/default.nix
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/nixpkgs/pkgs/applications/misc/eaglemode/default.nix
index 5d99cbaa988..5d99cbaa988 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/nixpkgs/pkgs/applications/misc/eaglemode/default.nix
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/nixpkgs/pkgs/applications/misc/electron-cash/default.nix
index e6cfca5667e..e6cfca5667e 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/nixpkgs/pkgs/applications/misc/electron-cash/default.nix
diff --git a/pkgs/applications/misc/electrum/dash.nix b/nixpkgs/pkgs/applications/misc/electrum/dash.nix
index fc5192bb5e4..fc5192bb5e4 100644
--- a/pkgs/applications/misc/electrum/dash.nix
+++ b/nixpkgs/pkgs/applications/misc/electrum/dash.nix
diff --git a/pkgs/applications/misc/electrum/default.nix b/nixpkgs/pkgs/applications/misc/electrum/default.nix
index df95b26b9c5..df95b26b9c5 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/nixpkgs/pkgs/applications/misc/electrum/default.nix
diff --git a/pkgs/applications/misc/electrum/ltc.nix b/nixpkgs/pkgs/applications/misc/electrum/ltc.nix
index 88f44c6cc85..88f44c6cc85 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/nixpkgs/pkgs/applications/misc/electrum/ltc.nix
diff --git a/pkgs/applications/misc/electrum/update.nix b/nixpkgs/pkgs/applications/misc/electrum/update.nix
index 247fabe3891..247fabe3891 100644
--- a/pkgs/applications/misc/electrum/update.nix
+++ b/nixpkgs/pkgs/applications/misc/electrum/update.nix
diff --git a/pkgs/applications/misc/elogind/default.nix b/nixpkgs/pkgs/applications/misc/elogind/default.nix
index 9565e7213dc..9565e7213dc 100644
--- a/pkgs/applications/misc/elogind/default.nix
+++ b/nixpkgs/pkgs/applications/misc/elogind/default.nix
diff --git a/pkgs/applications/misc/emem/default.nix b/nixpkgs/pkgs/applications/misc/emem/default.nix
index 62358d41cc5..62358d41cc5 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/nixpkgs/pkgs/applications/misc/emem/default.nix
diff --git a/pkgs/applications/misc/epdfview/default.nix b/nixpkgs/pkgs/applications/misc/epdfview/default.nix
index de922bb3990..de922bb3990 100644
--- a/pkgs/applications/misc/epdfview/default.nix
+++ b/nixpkgs/pkgs/applications/misc/epdfview/default.nix
diff --git a/pkgs/applications/misc/epr/default.nix b/nixpkgs/pkgs/applications/misc/epr/default.nix
index f67c15f0a99..f67c15f0a99 100644
--- a/pkgs/applications/misc/epr/default.nix
+++ b/nixpkgs/pkgs/applications/misc/epr/default.nix
diff --git a/pkgs/applications/misc/et/default.nix b/nixpkgs/pkgs/applications/misc/et/default.nix
index 2cf8813aac4..2cf8813aac4 100644
--- a/pkgs/applications/misc/et/default.nix
+++ b/nixpkgs/pkgs/applications/misc/et/default.nix
diff --git a/pkgs/applications/misc/eterm/default.nix b/nixpkgs/pkgs/applications/misc/eterm/default.nix
index 56cac7ca918..56cac7ca918 100644
--- a/pkgs/applications/misc/eterm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/eterm/default.nix
diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix
index e9d1317390e..e9d1317390e 100644
--- a/pkgs/applications/misc/eureka-editor/default.nix
+++ b/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix
diff --git a/pkgs/applications/misc/evilvte/default.nix b/nixpkgs/pkgs/applications/misc/evilvte/default.nix
index 984ade077a8..984ade077a8 100644
--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/nixpkgs/pkgs/applications/misc/evilvte/default.nix
diff --git a/pkgs/applications/misc/evtest-qt/default.nix b/nixpkgs/pkgs/applications/misc/evtest-qt/default.nix
index 86f2d007092..86f2d007092 100644
--- a/pkgs/applications/misc/evtest-qt/default.nix
+++ b/nixpkgs/pkgs/applications/misc/evtest-qt/default.nix
diff --git a/pkgs/applications/misc/evtest/default.nix b/nixpkgs/pkgs/applications/misc/evtest/default.nix
index d6d20367b06..d6d20367b06 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/nixpkgs/pkgs/applications/misc/evtest/default.nix
diff --git a/pkgs/applications/misc/exercism/default.nix b/nixpkgs/pkgs/applications/misc/exercism/default.nix
index a071761599a..a071761599a 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/nixpkgs/pkgs/applications/misc/exercism/default.nix
diff --git a/pkgs/applications/misc/extract_url/default.nix b/nixpkgs/pkgs/applications/misc/extract_url/default.nix
index f96d3f0f57c..f96d3f0f57c 100644
--- a/pkgs/applications/misc/extract_url/default.nix
+++ b/nixpkgs/pkgs/applications/misc/extract_url/default.nix
diff --git a/pkgs/applications/misc/far2l/default.nix b/nixpkgs/pkgs/applications/misc/far2l/default.nix
index 51e9c4371b5..51e9c4371b5 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/nixpkgs/pkgs/applications/misc/far2l/default.nix
diff --git a/pkgs/applications/misc/fbreader/default.nix b/nixpkgs/pkgs/applications/misc/fbreader/default.nix
index 857ef9ac27b..857ef9ac27b 100644
--- a/pkgs/applications/misc/fbreader/default.nix
+++ b/nixpkgs/pkgs/applications/misc/fbreader/default.nix
diff --git a/pkgs/applications/misc/fbreader/typecheck.patch b/nixpkgs/pkgs/applications/misc/fbreader/typecheck.patch
index cbac290e69c..cbac290e69c 100644
--- a/pkgs/applications/misc/fbreader/typecheck.patch
+++ b/nixpkgs/pkgs/applications/misc/fbreader/typecheck.patch
diff --git a/pkgs/applications/misc/fehlstart/default.nix b/nixpkgs/pkgs/applications/misc/fehlstart/default.nix
index db78f2ec920..db78f2ec920 100644
--- a/pkgs/applications/misc/fehlstart/default.nix
+++ b/nixpkgs/pkgs/applications/misc/fehlstart/default.nix
diff --git a/pkgs/applications/misc/fehlstart/use-nix-profiles.patch b/nixpkgs/pkgs/applications/misc/fehlstart/use-nix-profiles.patch
index 0c06e53f981..0c06e53f981 100644
--- a/pkgs/applications/misc/fehlstart/use-nix-profiles.patch
+++ b/nixpkgs/pkgs/applications/misc/fehlstart/use-nix-profiles.patch
diff --git a/pkgs/applications/misc/fetchmail/default.nix b/nixpkgs/pkgs/applications/misc/fetchmail/default.nix
index 6c4ecf6fa39..6c4ecf6fa39 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/nixpkgs/pkgs/applications/misc/fetchmail/default.nix
diff --git a/pkgs/applications/misc/fff/default.nix b/nixpkgs/pkgs/applications/misc/fff/default.nix
index e87c86f1b4b..e87c86f1b4b 100644
--- a/pkgs/applications/misc/fff/default.nix
+++ b/nixpkgs/pkgs/applications/misc/fff/default.nix
diff --git a/pkgs/applications/misc/filet/default.nix b/nixpkgs/pkgs/applications/misc/filet/default.nix
index edee9ab33e9..edee9ab33e9 100644
--- a/pkgs/applications/misc/filet/default.nix
+++ b/nixpkgs/pkgs/applications/misc/filet/default.nix
diff --git a/pkgs/applications/misc/firestarter/default.nix b/nixpkgs/pkgs/applications/misc/firestarter/default.nix
index 82bcf5a4aa0..82bcf5a4aa0 100644
--- a/pkgs/applications/misc/firestarter/default.nix
+++ b/nixpkgs/pkgs/applications/misc/firestarter/default.nix
diff --git a/pkgs/applications/misc/flamerobin/default.nix b/nixpkgs/pkgs/applications/misc/flamerobin/default.nix
index 06cf3c06ffa..06cf3c06ffa 100644
--- a/pkgs/applications/misc/flamerobin/default.nix
+++ b/nixpkgs/pkgs/applications/misc/flamerobin/default.nix
diff --git a/pkgs/applications/misc/fme/default.nix b/nixpkgs/pkgs/applications/misc/fme/default.nix
index 2ca059820ef..2ca059820ef 100644
--- a/pkgs/applications/misc/fme/default.nix
+++ b/nixpkgs/pkgs/applications/misc/fme/default.nix
diff --git a/pkgs/applications/misc/font-manager/default.nix b/nixpkgs/pkgs/applications/misc/font-manager/default.nix
index afa0a06d33f..afa0a06d33f 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/nixpkgs/pkgs/applications/misc/font-manager/default.nix
diff --git a/pkgs/applications/misc/formatter/default.nix b/nixpkgs/pkgs/applications/misc/formatter/default.nix
index b777c3b72e7..b777c3b72e7 100644
--- a/pkgs/applications/misc/formatter/default.nix
+++ b/nixpkgs/pkgs/applications/misc/formatter/default.nix
diff --git a/pkgs/applications/misc/formatter/fix-paths.patch b/nixpkgs/pkgs/applications/misc/formatter/fix-paths.patch
index 67c1d2b43cc..67c1d2b43cc 100644
--- a/pkgs/applications/misc/formatter/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/misc/formatter/fix-paths.patch
diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix
index dc3f1922c21..dc3f1922c21 100644
--- a/pkgs/applications/misc/foxtrotgps/default.nix
+++ b/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix
diff --git a/pkgs/applications/misc/freemind/default.nix b/nixpkgs/pkgs/applications/misc/freemind/default.nix
index aee3937689b..aee3937689b 100644
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/nixpkgs/pkgs/applications/misc/freemind/default.nix
diff --git a/pkgs/applications/misc/fsv/default.nix b/nixpkgs/pkgs/applications/misc/fsv/default.nix
index bbc78efe5cd..bbc78efe5cd 100644
--- a/pkgs/applications/misc/fsv/default.nix
+++ b/nixpkgs/pkgs/applications/misc/fsv/default.nix
diff --git a/pkgs/applications/misc/gImageReader/default.nix b/nixpkgs/pkgs/applications/misc/gImageReader/default.nix
index 67d4bd65a9f..67d4bd65a9f 100644
--- a/pkgs/applications/misc/gImageReader/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gImageReader/default.nix
diff --git a/pkgs/applications/misc/galculator/default.nix b/nixpkgs/pkgs/applications/misc/galculator/default.nix
index ecf8ae9da8d..ecf8ae9da8d 100644
--- a/pkgs/applications/misc/galculator/default.nix
+++ b/nixpkgs/pkgs/applications/misc/galculator/default.nix
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix
index d578479787b..d578479787b 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix
diff --git a/pkgs/applications/misc/gammu/bashcomp-dir.patch b/nixpkgs/pkgs/applications/misc/gammu/bashcomp-dir.patch
index d41aa432cf3..d41aa432cf3 100644
--- a/pkgs/applications/misc/gammu/bashcomp-dir.patch
+++ b/nixpkgs/pkgs/applications/misc/gammu/bashcomp-dir.patch
diff --git a/pkgs/applications/misc/gammu/default.nix b/nixpkgs/pkgs/applications/misc/gammu/default.nix
index fb6902634da..fb6902634da 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gammu/default.nix
diff --git a/pkgs/applications/misc/gammu/systemd.patch b/nixpkgs/pkgs/applications/misc/gammu/systemd.patch
index 22b49a5a2ff..22b49a5a2ff 100644
--- a/pkgs/applications/misc/gammu/systemd.patch
+++ b/nixpkgs/pkgs/applications/misc/gammu/systemd.patch
diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix
index 96d3d34046e..96d3d34046e 100644
--- a/pkgs/applications/misc/ganttproject-bin/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix
diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/nixpkgs/pkgs/applications/misc/garmin-plugin/default.nix
index b97b079ab66..b97b079ab66 100644
--- a/pkgs/applications/misc/garmin-plugin/default.nix
+++ b/nixpkgs/pkgs/applications/misc/garmin-plugin/default.nix
diff --git a/pkgs/applications/misc/gcal/default.nix b/nixpkgs/pkgs/applications/misc/gcal/default.nix
index f5eb6e188b7..f5eb6e188b7 100644
--- a/pkgs/applications/misc/gcal/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gcal/default.nix
diff --git a/pkgs/applications/misc/gcalcli/default.nix b/nixpkgs/pkgs/applications/misc/gcalcli/default.nix
index 8381f182e5d..8381f182e5d 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gcalcli/default.nix
diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix
index 57060179473..57060179473 100644
--- a/pkgs/applications/misc/geoipupdate/default.nix
+++ b/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix
diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix
index 5db328072e4..5db328072e4 100644
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix
diff --git a/pkgs/applications/misc/getxbook/default.nix b/nixpkgs/pkgs/applications/misc/getxbook/default.nix
index aa901a7ba51..aa901a7ba51 100644
--- a/pkgs/applications/misc/getxbook/default.nix
+++ b/nixpkgs/pkgs/applications/misc/getxbook/default.nix
diff --git a/pkgs/applications/misc/girara/default.nix b/nixpkgs/pkgs/applications/misc/girara/default.nix
index 45bca7d3fbf..45bca7d3fbf 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/nixpkgs/pkgs/applications/misc/girara/default.nix
diff --git a/pkgs/applications/misc/gkrellm/default.nix b/nixpkgs/pkgs/applications/misc/gkrellm/default.nix
index f44cdd0bad7..f44cdd0bad7 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gkrellm/default.nix
diff --git a/pkgs/applications/misc/gksu/default.nix b/nixpkgs/pkgs/applications/misc/gksu/default.nix
index 4a806cbb183..4a806cbb183 100644
--- a/pkgs/applications/misc/gksu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gksu/default.nix
diff --git a/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch b/nixpkgs/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch
index fd711a321ac..fd711a321ac 100644
--- a/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch
+++ b/nixpkgs/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch
diff --git a/pkgs/applications/misc/glava/default.nix b/nixpkgs/pkgs/applications/misc/glava/default.nix
index 519df42c789..519df42c789 100644
--- a/pkgs/applications/misc/glava/default.nix
+++ b/nixpkgs/pkgs/applications/misc/glava/default.nix
diff --git a/pkgs/applications/misc/glom/default.nix b/nixpkgs/pkgs/applications/misc/glom/default.nix
index b8f13d01424..b8f13d01424 100644
--- a/pkgs/applications/misc/glom/default.nix
+++ b/nixpkgs/pkgs/applications/misc/glom/default.nix
diff --git a/pkgs/applications/misc/gmrun/default.nix b/nixpkgs/pkgs/applications/misc/gmrun/default.nix
index 50dda9510b9..50dda9510b9 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gmrun/default.nix
diff --git a/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch b/nixpkgs/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch
index 12d5370961c..12d5370961c 100644
--- a/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch
+++ b/nixpkgs/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch
diff --git a/pkgs/applications/misc/gmrun/gcc43.patch b/nixpkgs/pkgs/applications/misc/gmrun/gcc43.patch
index 60e4338e893..60e4338e893 100644
--- a/pkgs/applications/misc/gmrun/gcc43.patch
+++ b/nixpkgs/pkgs/applications/misc/gmrun/gcc43.patch
diff --git a/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch b/nixpkgs/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch
index b5cd41a3c5b..b5cd41a3c5b 100644
--- a/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch
+++ b/nixpkgs/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch
diff --git a/pkgs/applications/misc/gmtp/default.nix b/nixpkgs/pkgs/applications/misc/gmtp/default.nix
index c8bbcf2aa7f..c8bbcf2aa7f 100644
--- a/pkgs/applications/misc/gmtp/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gmtp/default.nix
diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/nixpkgs/pkgs/applications/misc/gnome-firmware-updater/default.nix
index f05c5fd210c..f05c5fd210c 100644
--- a/pkgs/applications/misc/gnome-firmware-updater/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gnome-firmware-updater/default.nix
diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/nixpkgs/pkgs/applications/misc/gnome-multi-writer/default.nix
index 11bfbaaacd0..11bfbaaacd0 100644
--- a/pkgs/applications/misc/gnome-multi-writer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gnome-multi-writer/default.nix
diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/nixpkgs/pkgs/applications/misc/gnome-recipes/default.nix
index 01f5af339ff..01f5af339ff 100644
--- a/pkgs/applications/misc/gnome-recipes/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gnome-recipes/default.nix
diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix
index 7484998ab20..7484998ab20 100644
--- a/pkgs/applications/misc/gnome-usage/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix
diff --git a/pkgs/applications/misc/go-jira/default.nix b/nixpkgs/pkgs/applications/misc/go-jira/default.nix
index f8da250dbc7..f8da250dbc7 100644
--- a/pkgs/applications/misc/go-jira/default.nix
+++ b/nixpkgs/pkgs/applications/misc/go-jira/default.nix
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix
index 3dffc5c77c2..3dffc5c77c2 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix
diff --git a/pkgs/applications/misc/goldendict/default.nix b/nixpkgs/pkgs/applications/misc/goldendict/default.nix
index e917cc024d5..e917cc024d5 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/nixpkgs/pkgs/applications/misc/goldendict/default.nix
diff --git a/pkgs/applications/misc/gollum/Gemfile b/nixpkgs/pkgs/applications/misc/gollum/Gemfile
index 525f54838b7..525f54838b7 100644
--- a/pkgs/applications/misc/gollum/Gemfile
+++ b/nixpkgs/pkgs/applications/misc/gollum/Gemfile
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock
index 8ecb546df70..8ecb546df70 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock
diff --git a/pkgs/applications/misc/gollum/default.nix b/nixpkgs/pkgs/applications/misc/gollum/default.nix
index 251e84f04c3..251e84f04c3 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gollum/default.nix
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/nixpkgs/pkgs/applications/misc/gollum/gemset.nix
index 61e0db781b8..61e0db781b8 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/nixpkgs/pkgs/applications/misc/gollum/gemset.nix
diff --git a/pkgs/applications/misc/googleearth/default.nix b/nixpkgs/pkgs/applications/misc/googleearth/default.nix
index 181273752ea..181273752ea 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/nixpkgs/pkgs/applications/misc/googleearth/default.nix
diff --git a/pkgs/applications/misc/googler/default.nix b/nixpkgs/pkgs/applications/misc/googler/default.nix
index 3e4c9828ede..3e4c9828ede 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/nixpkgs/pkgs/applications/misc/googler/default.nix
diff --git a/pkgs/applications/misc/gosmore/default.nix b/nixpkgs/pkgs/applications/misc/gosmore/default.nix
index 41cdf267f5d..41cdf267f5d 100644
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gosmore/default.nix
diff --git a/pkgs/applications/misc/gosmore/pointer_int_comparison.patch b/nixpkgs/pkgs/applications/misc/gosmore/pointer_int_comparison.patch
index 4a715b6d859..4a715b6d859 100644
--- a/pkgs/applications/misc/gosmore/pointer_int_comparison.patch
+++ b/nixpkgs/pkgs/applications/misc/gosmore/pointer_int_comparison.patch
diff --git a/pkgs/applications/misc/gpa/default.nix b/nixpkgs/pkgs/applications/misc/gpa/default.nix
index a4889014412..a4889014412 100644
--- a/pkgs/applications/misc/gpa/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gpa/default.nix
diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/nixpkgs/pkgs/applications/misc/gpg-mdp/default.nix
index 9954ff660ad..9954ff660ad 100644
--- a/pkgs/applications/misc/gpg-mdp/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gpg-mdp/default.nix
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/nixpkgs/pkgs/applications/misc/gphoto2/default.nix
index d06970e8d07..d06970e8d07 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gphoto2/default.nix
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/nixpkgs/pkgs/applications/misc/gphoto2/gphotofs.nix
index c1c2a44bd7f..c1c2a44bd7f 100644
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/nixpkgs/pkgs/applications/misc/gphoto2/gphotofs.nix
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix
index 9d244ca18f3..9d244ca18f3 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix
diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix
index 07918d3d599..07918d3d599 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/nixpkgs/pkgs/applications/misc/gpsprune/default.nix
index 9c0dc48d42e..9c0dc48d42e 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gpsprune/default.nix
diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix
index 04ab062c1a1..04ab062c1a1 100644
--- a/pkgs/applications/misc/gpx-viewer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix
diff --git a/pkgs/applications/misc/gpx/default.nix b/nixpkgs/pkgs/applications/misc/gpx/default.nix
index a341a212a37..a341a212a37 100644
--- a/pkgs/applications/misc/gpx/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gpx/default.nix
diff --git a/pkgs/applications/misc/gpxlab/default.nix b/nixpkgs/pkgs/applications/misc/gpxlab/default.nix
index 3b432ff66b1..3b432ff66b1 100644
--- a/pkgs/applications/misc/gpxlab/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gpxlab/default.nix
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix
index d3d732f410f..d3d732f410f 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix
diff --git a/pkgs/applications/misc/gramps/default.nix b/nixpkgs/pkgs/applications/misc/gramps/default.nix
index 84be50ccb5e..84be50ccb5e 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gramps/default.nix
diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix
index d86db7adb9d..d86db7adb9d 100644
--- a/pkgs/applications/misc/green-pdfviewer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix
diff --git a/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch b/nixpkgs/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch
index cfcab32aac9..cfcab32aac9 100644
--- a/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch
+++ b/nixpkgs/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch
diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix
index 87e636b9c03..87e636b9c03 100644
--- a/pkgs/applications/misc/gremlin-console/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix
diff --git a/pkgs/applications/misc/grip/default.nix b/nixpkgs/pkgs/applications/misc/grip/default.nix
index 4416e1e62c2..4416e1e62c2 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/nixpkgs/pkgs/applications/misc/grip/default.nix
diff --git a/pkgs/applications/misc/grsync/default.nix b/nixpkgs/pkgs/applications/misc/grsync/default.nix
index 3e1bb31091f..3e1bb31091f 100644
--- a/pkgs/applications/misc/grsync/default.nix
+++ b/nixpkgs/pkgs/applications/misc/grsync/default.nix
diff --git a/pkgs/applications/misc/gsctl/default.nix b/nixpkgs/pkgs/applications/misc/gsctl/default.nix
index b84053b94ad..b84053b94ad 100644
--- a/pkgs/applications/misc/gsctl/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gsctl/default.nix
diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix
index ea78331e476..ea78331e476 100644
--- a/pkgs/applications/misc/gsimplecal/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix
diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix
index 9b8d6a7f976..9b8d6a7f976 100644
--- a/pkgs/applications/misc/gtk2fontsel/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix
diff --git a/pkgs/applications/misc/guake/default.nix b/nixpkgs/pkgs/applications/misc/guake/default.nix
index d403ddc8b26..d403ddc8b26 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/nixpkgs/pkgs/applications/misc/guake/default.nix
diff --git a/pkgs/applications/misc/gummi/default.nix b/nixpkgs/pkgs/applications/misc/gummi/default.nix
index d1daec28482..d1daec28482 100644
--- a/pkgs/applications/misc/gummi/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gummi/default.nix
diff --git a/pkgs/applications/misc/gv/default.nix b/nixpkgs/pkgs/applications/misc/gv/default.nix
index f94f8f5dd70..f94f8f5dd70 100644
--- a/pkgs/applications/misc/gv/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gv/default.nix
diff --git a/pkgs/applications/misc/gxmessage/default.nix b/nixpkgs/pkgs/applications/misc/gxmessage/default.nix
index ce0a6963ea9..ce0a6963ea9 100644
--- a/pkgs/applications/misc/gxmessage/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gxmessage/default.nix
diff --git a/pkgs/applications/misc/gxneur/default.nix b/nixpkgs/pkgs/applications/misc/gxneur/default.nix
index c44523a8b75..c44523a8b75 100644
--- a/pkgs/applications/misc/gxneur/default.nix
+++ b/nixpkgs/pkgs/applications/misc/gxneur/default.nix
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/nixpkgs/pkgs/applications/misc/haxor-news/default.nix
index 7353078600d..7353078600d 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/nixpkgs/pkgs/applications/misc/haxor-news/default.nix
diff --git a/pkgs/applications/misc/hdate/default.nix b/nixpkgs/pkgs/applications/misc/hdate/default.nix
index 989dfb886ec..989dfb886ec 100644
--- a/pkgs/applications/misc/hdate/default.nix
+++ b/nixpkgs/pkgs/applications/misc/hdate/default.nix
diff --git a/pkgs/applications/misc/heimer/default.nix b/nixpkgs/pkgs/applications/misc/heimer/default.nix
index 5f403c9b7b6..5f403c9b7b6 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/heimer/default.nix
diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix
index a5a9187ab0f..a5a9187ab0f 100644
--- a/pkgs/applications/misc/hello-unfree/default.nix
+++ b/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix
diff --git a/pkgs/applications/misc/hello/default.nix b/nixpkgs/pkgs/applications/misc/hello/default.nix
index 8bae8ce373c..8bae8ce373c 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/nixpkgs/pkgs/applications/misc/hello/default.nix
diff --git a/pkgs/applications/misc/hivemind/default.nix b/nixpkgs/pkgs/applications/misc/hivemind/default.nix
index b3fb84340f2..b3fb84340f2 100644
--- a/pkgs/applications/misc/hivemind/default.nix
+++ b/nixpkgs/pkgs/applications/misc/hivemind/default.nix
diff --git a/pkgs/applications/misc/houdini/default.nix b/nixpkgs/pkgs/applications/misc/houdini/default.nix
index ce35e91d927..ce35e91d927 100644
--- a/pkgs/applications/misc/houdini/default.nix
+++ b/nixpkgs/pkgs/applications/misc/houdini/default.nix
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/nixpkgs/pkgs/applications/misc/houdini/runtime.nix
index 279791561d9..279791561d9 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/nixpkgs/pkgs/applications/misc/houdini/runtime.nix
diff --git a/pkgs/applications/misc/hovercraft/default.nix b/nixpkgs/pkgs/applications/misc/hovercraft/default.nix
index ba23078bba9..ba23078bba9 100644
--- a/pkgs/applications/misc/hovercraft/default.nix
+++ b/nixpkgs/pkgs/applications/misc/hovercraft/default.nix
diff --git a/pkgs/applications/misc/hr/default.nix b/nixpkgs/pkgs/applications/misc/hr/default.nix
index 437c42b0331..437c42b0331 100644
--- a/pkgs/applications/misc/hr/default.nix
+++ b/nixpkgs/pkgs/applications/misc/hr/default.nix
diff --git a/pkgs/applications/misc/hstr/default.nix b/nixpkgs/pkgs/applications/misc/hstr/default.nix
index 31ecfccd584..31ecfccd584 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/nixpkgs/pkgs/applications/misc/hstr/default.nix
diff --git a/pkgs/applications/misc/hubstaff/default.nix b/nixpkgs/pkgs/applications/misc/hubstaff/default.nix
index b2997ece5d5..b2997ece5d5 100644
--- a/pkgs/applications/misc/hubstaff/default.nix
+++ b/nixpkgs/pkgs/applications/misc/hubstaff/default.nix
diff --git a/pkgs/applications/misc/hubstaff/revision.json b/nixpkgs/pkgs/applications/misc/hubstaff/revision.json
index 2fd29444dad..2fd29444dad 100644
--- a/pkgs/applications/misc/hubstaff/revision.json
+++ b/nixpkgs/pkgs/applications/misc/hubstaff/revision.json
diff --git a/pkgs/applications/misc/hubstaff/update.sh b/nixpkgs/pkgs/applications/misc/hubstaff/update.sh
index c4c1caf55db..c4c1caf55db 100755
--- a/pkgs/applications/misc/hubstaff/update.sh
+++ b/nixpkgs/pkgs/applications/misc/hubstaff/update.sh
diff --git a/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix
index a1015c880df..a1015c880df 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix
diff --git a/pkgs/applications/misc/hyper/default.nix b/nixpkgs/pkgs/applications/misc/hyper/default.nix
index f21675e60b2..f21675e60b2 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/nixpkgs/pkgs/applications/misc/hyper/default.nix
diff --git a/pkgs/applications/misc/icesl/default.nix b/nixpkgs/pkgs/applications/misc/icesl/default.nix
index 3ee4fd8259a..3ee4fd8259a 100644
--- a/pkgs/applications/misc/icesl/default.nix
+++ b/nixpkgs/pkgs/applications/misc/icesl/default.nix
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix
index 8b908f1f9cf..8b908f1f9cf 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix
diff --git a/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch b/nixpkgs/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
index c981857a248..c981857a248 100644
--- a/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
+++ b/nixpkgs/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
diff --git a/pkgs/applications/misc/img2pdf/default.nix b/nixpkgs/pkgs/applications/misc/img2pdf/default.nix
index 902e9268f72..902e9268f72 100644
--- a/pkgs/applications/misc/img2pdf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/img2pdf/default.nix
diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/nixpkgs/pkgs/applications/misc/ipmicfg/default.nix
index 7daa2704e22..7daa2704e22 100644
--- a/pkgs/applications/misc/ipmicfg/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ipmicfg/default.nix
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/nixpkgs/pkgs/applications/misc/ipmiview/default.nix
index e46df5d59e0..e46df5d59e0 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ipmiview/default.nix
diff --git a/pkgs/applications/misc/iterm2/default.nix b/nixpkgs/pkgs/applications/misc/iterm2/default.nix
index d63576d5cbd..d63576d5cbd 100644
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/nixpkgs/pkgs/applications/misc/iterm2/default.nix
diff --git a/pkgs/applications/misc/iterm2/disable_updates.patch b/nixpkgs/pkgs/applications/misc/iterm2/disable_updates.patch
index e717c58f30f..e717c58f30f 100644
--- a/pkgs/applications/misc/iterm2/disable_updates.patch
+++ b/nixpkgs/pkgs/applications/misc/iterm2/disable_updates.patch
diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix
index c20fa4ed9d9..c20fa4ed9d9 100644
--- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix
+++ b/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/nixpkgs/pkgs/applications/misc/jbidwatcher/default.nix
index c8951059d4c..c8951059d4c 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/nixpkgs/pkgs/applications/misc/jbidwatcher/default.nix
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile b/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile
index c4ba46e2ac6..c4ba46e2ac6 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile
+++ b/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index f7588990432..f7588990432 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix
index 7fd9abd82a3..7fd9abd82a3 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix
diff --git a/pkgs/applications/misc/jekyll/default.nix b/nixpkgs/pkgs/applications/misc/jekyll/default.nix
index 4d4dd248bc5..4d4dd248bc5 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/nixpkgs/pkgs/applications/misc/jekyll/default.nix
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile
index 8e7499bad61..8e7499bad61 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile
+++ b/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock
index 43a2d0cf2d0..43a2d0cf2d0 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix
index 2b1c03ce882..2b1c03ce882 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix
diff --git a/pkgs/applications/misc/jekyll/update.sh b/nixpkgs/pkgs/applications/misc/jekyll/update.sh
index 528f1062c73..528f1062c73 100755
--- a/pkgs/applications/misc/jekyll/update.sh
+++ b/nixpkgs/pkgs/applications/misc/jekyll/update.sh
diff --git a/pkgs/applications/misc/jgmenu/default.nix b/nixpkgs/pkgs/applications/misc/jgmenu/default.nix
index cbe26b817e2..cbe26b817e2 100644
--- a/pkgs/applications/misc/jgmenu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/jgmenu/default.nix
diff --git a/pkgs/applications/misc/jigdo/default.nix b/nixpkgs/pkgs/applications/misc/jigdo/default.nix
index 3561fcde839..3561fcde839 100644
--- a/pkgs/applications/misc/jigdo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/jigdo/default.nix
diff --git a/pkgs/applications/misc/jigdo/sizewidth.patch b/nixpkgs/pkgs/applications/misc/jigdo/sizewidth.patch
index 17b1749fcf7..17b1749fcf7 100644
--- a/pkgs/applications/misc/jigdo/sizewidth.patch
+++ b/nixpkgs/pkgs/applications/misc/jigdo/sizewidth.patch
diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix
index fd91a981e57..fd91a981e57 100644
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix
diff --git a/pkgs/applications/misc/josm/default.nix b/nixpkgs/pkgs/applications/misc/josm/default.nix
index ac46c48d407..ac46c48d407 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/josm/default.nix
diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix
index a5196811a6a..a5196811a6a 100644
--- a/pkgs/applications/misc/jotta-cli/default.nix
+++ b/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix
diff --git a/pkgs/applications/misc/jp2a/default.nix b/nixpkgs/pkgs/applications/misc/jp2a/default.nix
index 1aece5eb4e2..1aece5eb4e2 100644
--- a/pkgs/applications/misc/jp2a/default.nix
+++ b/nixpkgs/pkgs/applications/misc/jp2a/default.nix
diff --git a/pkgs/applications/misc/jrnl/default.nix b/nixpkgs/pkgs/applications/misc/jrnl/default.nix
index 3260f6a5069..3260f6a5069 100644
--- a/pkgs/applications/misc/jrnl/default.nix
+++ b/nixpkgs/pkgs/applications/misc/jrnl/default.nix
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix
index 69d78575e2a..69d78575e2a 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix
diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch b/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch
index 3a9eca30e75..3a9eca30e75 100644
--- a/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch
+++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch
diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
index cf7e4896b80..cf7e4896b80 100644
--- a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
+++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
diff --git a/pkgs/applications/misc/k2pdfopt/leptonica.patch b/nixpkgs/pkgs/applications/misc/k2pdfopt/leptonica.patch
index dfab99fd013..dfab99fd013 100644
--- a/pkgs/applications/misc/k2pdfopt/leptonica.patch
+++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/leptonica.patch
diff --git a/pkgs/applications/misc/k2pdfopt/mupdf.patch b/nixpkgs/pkgs/applications/misc/k2pdfopt/mupdf.patch
index 0c59a1d2016..0c59a1d2016 100644
--- a/pkgs/applications/misc/k2pdfopt/mupdf.patch
+++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/mupdf.patch
diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/nixpkgs/pkgs/applications/misc/k2pdfopt/tesseract.patch
index adfee9ae282..adfee9ae282 100644
--- a/pkgs/applications/misc/k2pdfopt/tesseract.patch
+++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/tesseract.patch
diff --git a/pkgs/applications/misc/kanboard/default.nix b/nixpkgs/pkgs/applications/misc/kanboard/default.nix
index d3cef00bbe8..d3cef00bbe8 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/nixpkgs/pkgs/applications/misc/kanboard/default.nix
diff --git a/pkgs/applications/misc/kdbplus/default.nix b/nixpkgs/pkgs/applications/misc/kdbplus/default.nix
index 4c4b461303f..4c4b461303f 100644
--- a/pkgs/applications/misc/kdbplus/default.nix
+++ b/nixpkgs/pkgs/applications/misc/kdbplus/default.nix
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/nixpkgs/pkgs/applications/misc/kdeconnect/default.nix
index e8bdcb37118..e8bdcb37118 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/nixpkgs/pkgs/applications/misc/kdeconnect/default.nix
diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/nixpkgs/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
index c3d26077443..c3d26077443 100644
--- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
+++ b/nixpkgs/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
index 76ea9df78c2..76ea9df78c2 100644
--- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
+++ b/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
index 562835159eb..562835159eb 100644
--- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
+++ b/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
diff --git a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix b/nixpkgs/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix
index e2b26eaee90..e2b26eaee90 100644
--- a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix
+++ b/nixpkgs/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix
diff --git a/pkgs/applications/misc/keepass/default.nix b/nixpkgs/pkgs/applications/misc/keepass/default.nix
index b954d2d3cdb..b954d2d3cdb 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/nixpkgs/pkgs/applications/misc/keepass/default.nix
diff --git a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh b/nixpkgs/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh
index 04485b146a0..04485b146a0 100755
--- a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh
+++ b/nixpkgs/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh
diff --git a/pkgs/applications/misc/keepass/fix-paths.patch b/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch
index 318f8a35898..318f8a35898 100644
--- a/pkgs/applications/misc/keepass/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch
diff --git a/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins-load.patch
index ca52e7ef191..ca52e7ef191 100644
--- a/pkgs/applications/misc/keepass/keepass-plugins-load.patch
+++ b/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins-load.patch
diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch
index cde6e7252bc..cde6e7252bc 100644
--- a/pkgs/applications/misc/keepass/keepass-plugins.patch
+++ b/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch
diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/nixpkgs/pkgs/applications/misc/keepassx/2.0.nix
index 36734a97516..36734a97516 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/nixpkgs/pkgs/applications/misc/keepassx/2.0.nix
diff --git a/pkgs/applications/misc/keepassx/community.nix b/nixpkgs/pkgs/applications/misc/keepassx/community.nix
index c6bcd56167c..c6bcd56167c 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/nixpkgs/pkgs/applications/misc/keepassx/community.nix
diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/nixpkgs/pkgs/applications/misc/keepassx/darwin.patch
index 6232d1118a7..6232d1118a7 100644
--- a/pkgs/applications/misc/keepassx/darwin.patch
+++ b/nixpkgs/pkgs/applications/misc/keepassx/darwin.patch
diff --git a/pkgs/applications/misc/keepassx/default.nix b/nixpkgs/pkgs/applications/misc/keepassx/default.nix
index 7adbcb86c50..7adbcb86c50 100644
--- a/pkgs/applications/misc/keepassx/default.nix
+++ b/nixpkgs/pkgs/applications/misc/keepassx/default.nix
diff --git a/pkgs/applications/misc/keepassx/random.patch b/nixpkgs/pkgs/applications/misc/keepassx/random.patch
index 0a0b26f6e8c..0a0b26f6e8c 100644
--- a/pkgs/applications/misc/keepassx/random.patch
+++ b/nixpkgs/pkgs/applications/misc/keepassx/random.patch
diff --git a/pkgs/applications/misc/khal/default.nix b/nixpkgs/pkgs/applications/misc/khal/default.nix
index c435eaefed5..c435eaefed5 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/nixpkgs/pkgs/applications/misc/khal/default.nix
diff --git a/pkgs/applications/misc/khal/skip-broken-test.patch b/nixpkgs/pkgs/applications/misc/khal/skip-broken-test.patch
index c3c982547ae..c3c982547ae 100644
--- a/pkgs/applications/misc/khal/skip-broken-test.patch
+++ b/nixpkgs/pkgs/applications/misc/khal/skip-broken-test.patch
diff --git a/pkgs/applications/misc/khard/default.nix b/nixpkgs/pkgs/applications/misc/khard/default.nix
index 1c6708c51c9..1c6708c51c9 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/nixpkgs/pkgs/applications/misc/khard/default.nix
diff --git a/pkgs/applications/misc/kitty/default.nix b/nixpkgs/pkgs/applications/misc/kitty/default.nix
index 188e902614f..188e902614f 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/nixpkgs/pkgs/applications/misc/kitty/default.nix
diff --git a/pkgs/applications/misc/kitty/fix-paths.patch b/nixpkgs/pkgs/applications/misc/kitty/fix-paths.patch
index 380f6d74914..380f6d74914 100644
--- a/pkgs/applications/misc/kitty/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/misc/kitty/fix-paths.patch
diff --git a/pkgs/applications/misc/kitty/library-paths.patch b/nixpkgs/pkgs/applications/misc/kitty/library-paths.patch
index 5f8daacc3c2..5f8daacc3c2 100644
--- a/pkgs/applications/misc/kitty/library-paths.patch
+++ b/nixpkgs/pkgs/applications/misc/kitty/library-paths.patch
diff --git a/pkgs/applications/misc/kitty/no-lto.patch b/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch
index 44d231cb07f..44d231cb07f 100644
--- a/pkgs/applications/misc/kitty/no-lto.patch
+++ b/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch
diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/nixpkgs/pkgs/applications/misc/kitty/no-werror.patch
index bc1b369d98d..bc1b369d98d 100644
--- a/pkgs/applications/misc/kitty/no-werror.patch
+++ b/nixpkgs/pkgs/applications/misc/kitty/no-werror.patch
diff --git a/pkgs/applications/misc/kitty/png2icns.patch b/nixpkgs/pkgs/applications/misc/kitty/png2icns.patch
index 68566e2a899..68566e2a899 100644
--- a/pkgs/applications/misc/kitty/png2icns.patch
+++ b/nixpkgs/pkgs/applications/misc/kitty/png2icns.patch
diff --git a/pkgs/applications/misc/kiwix/default.nix b/nixpkgs/pkgs/applications/misc/kiwix/default.nix
index 898186b714b..898186b714b 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/nixpkgs/pkgs/applications/misc/kiwix/default.nix
diff --git a/pkgs/applications/misc/kjv/default.nix b/nixpkgs/pkgs/applications/misc/kjv/default.nix
index 7868e74d010..7868e74d010 100644
--- a/pkgs/applications/misc/kjv/default.nix
+++ b/nixpkgs/pkgs/applications/misc/kjv/default.nix
diff --git a/pkgs/applications/misc/krename/default.nix b/nixpkgs/pkgs/applications/misc/krename/default.nix
index 8b6b7741c7d..8b6b7741c7d 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/nixpkgs/pkgs/applications/misc/krename/default.nix
diff --git a/pkgs/applications/misc/krusader/default.nix b/nixpkgs/pkgs/applications/misc/krusader/default.nix
index 15979def34b..15979def34b 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/nixpkgs/pkgs/applications/misc/krusader/default.nix
diff --git a/pkgs/applications/misc/kupfer/default.nix b/nixpkgs/pkgs/applications/misc/kupfer/default.nix
index c7f54990107..c7f54990107 100644
--- a/pkgs/applications/misc/kupfer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/kupfer/default.nix
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/nixpkgs/pkgs/applications/misc/latte-dock/default.nix
index d7d23853e11..d7d23853e11 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/nixpkgs/pkgs/applications/misc/latte-dock/default.nix
diff --git a/pkgs/applications/misc/lenmus/default.nix b/nixpkgs/pkgs/applications/misc/lenmus/default.nix
index 76abe7c9b4b..76abe7c9b4b 100644
--- a/pkgs/applications/misc/lenmus/default.nix
+++ b/nixpkgs/pkgs/applications/misc/lenmus/default.nix
diff --git a/pkgs/applications/misc/libosmocore/default.nix b/nixpkgs/pkgs/applications/misc/libosmocore/default.nix
index 846ce309842..846ce309842 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/nixpkgs/pkgs/applications/misc/libosmocore/default.nix
diff --git a/pkgs/applications/misc/librecad/default.nix b/nixpkgs/pkgs/applications/misc/librecad/default.nix
index 0df0f86ef45..0df0f86ef45 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/nixpkgs/pkgs/applications/misc/librecad/default.nix
diff --git a/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch b/nixpkgs/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
index 04701e5ab1e..04701e5ab1e 100644
--- a/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
+++ b/nixpkgs/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
diff --git a/pkgs/applications/misc/lifelines/default.nix b/nixpkgs/pkgs/applications/misc/lifelines/default.nix
index 7207dea9d52..7207dea9d52 100644
--- a/pkgs/applications/misc/lifelines/default.nix
+++ b/nixpkgs/pkgs/applications/misc/lifelines/default.nix
diff --git a/pkgs/applications/misc/lighthouse/default.nix b/nixpkgs/pkgs/applications/misc/lighthouse/default.nix
index 7b5b40d65a3..7b5b40d65a3 100644
--- a/pkgs/applications/misc/lighthouse/default.nix
+++ b/nixpkgs/pkgs/applications/misc/lighthouse/default.nix
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/nixpkgs/pkgs/applications/misc/lilyterm/default.nix
index e9dba4bcf46..e9dba4bcf46 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/lilyterm/default.nix
diff --git a/pkgs/applications/misc/llpp/default.nix b/nixpkgs/pkgs/applications/misc/llpp/default.nix
index 25f9b10b1e8..25f9b10b1e8 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/nixpkgs/pkgs/applications/misc/llpp/default.nix
diff --git a/pkgs/applications/misc/llpp/fix-build-bash.patch b/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch
index 13dbdb926c8..13dbdb926c8 100644
--- a/pkgs/applications/misc/llpp/fix-build-bash.patch
+++ b/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch
diff --git a/pkgs/applications/misc/loxodo/default.nix b/nixpkgs/pkgs/applications/misc/loxodo/default.nix
index 846df292eb1..846df292eb1 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/loxodo/default.nix
diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix
index 5dd5fa0f512..5dd5fa0f512 100644
--- a/pkgs/applications/misc/lsd2dsl/default.nix
+++ b/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix
diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix
index 61151cb1550..61151cb1550 100644
--- a/pkgs/applications/misc/ltwheelconf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix
diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/nixpkgs/pkgs/applications/misc/lutris/chrootenv.nix
index 5b9bb925a4e..5b9bb925a4e 100644
--- a/pkgs/applications/misc/lutris/chrootenv.nix
+++ b/nixpkgs/pkgs/applications/misc/lutris/chrootenv.nix
diff --git a/pkgs/applications/misc/lutris/default.nix b/nixpkgs/pkgs/applications/misc/lutris/default.nix
index c9ea146f063..c9ea146f063 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/nixpkgs/pkgs/applications/misc/lutris/default.nix
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/nixpkgs/pkgs/applications/misc/lxterminal/default.nix
index 0802a32d92b..0802a32d92b 100644
--- a/pkgs/applications/misc/lxterminal/default.nix
+++ b/nixpkgs/pkgs/applications/misc/lxterminal/default.nix
diff --git a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/nixpkgs/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch
index 598f506118f..598f506118f 100644
--- a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch
+++ b/nixpkgs/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch
diff --git a/pkgs/applications/misc/lyx/default.nix b/nixpkgs/pkgs/applications/misc/lyx/default.nix
index f7964e4e5c6..f7964e4e5c6 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/nixpkgs/pkgs/applications/misc/lyx/default.nix
diff --git a/pkgs/applications/misc/madonctl/default.nix b/nixpkgs/pkgs/applications/misc/madonctl/default.nix
index 9a134343d29..9a134343d29 100644
--- a/pkgs/applications/misc/madonctl/default.nix
+++ b/nixpkgs/pkgs/applications/misc/madonctl/default.nix
diff --git a/pkgs/applications/misc/madonctl/deps.nix b/nixpkgs/pkgs/applications/misc/madonctl/deps.nix
index 9f94bb09ce4..9f94bb09ce4 100644
--- a/pkgs/applications/misc/madonctl/deps.nix
+++ b/nixpkgs/pkgs/applications/misc/madonctl/deps.nix
diff --git a/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch b/nixpkgs/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch
index 80b9ebf4d57..80b9ebf4d57 100644
--- a/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch
+++ b/nixpkgs/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch
diff --git a/pkgs/applications/misc/makeself/default.nix b/nixpkgs/pkgs/applications/misc/makeself/default.nix
index f2585f78146..f2585f78146 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/nixpkgs/pkgs/applications/misc/makeself/default.nix
diff --git a/pkgs/applications/misc/mako/default.nix b/nixpkgs/pkgs/applications/misc/mako/default.nix
index f86effe989f..f86effe989f 100644
--- a/pkgs/applications/misc/mako/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mako/default.nix
diff --git a/pkgs/applications/misc/marktext/default.nix b/nixpkgs/pkgs/applications/misc/marktext/default.nix
index 5813fc15c0d..5813fc15c0d 100644
--- a/pkgs/applications/misc/marktext/default.nix
+++ b/nixpkgs/pkgs/applications/misc/marktext/default.nix
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix
index 5df4a1b8d93..5df4a1b8d93 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix
diff --git a/pkgs/applications/misc/mdp/default.nix b/nixpkgs/pkgs/applications/misc/mdp/default.nix
index 03f30d64fb2..03f30d64fb2 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mdp/default.nix
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix
index b84bc08ddb3..b84bc08ddb3 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/nixpkgs/pkgs/applications/misc/mediainfo/default.nix
index f084d17e389..f084d17e389 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mediainfo/default.nix
diff --git a/pkgs/applications/misc/megacmd/default.nix b/nixpkgs/pkgs/applications/misc/megacmd/default.nix
index 9fe810e4147..9fe810e4147 100644
--- a/pkgs/applications/misc/megacmd/default.nix
+++ b/nixpkgs/pkgs/applications/misc/megacmd/default.nix
diff --git a/pkgs/applications/misc/megasync/default.nix b/nixpkgs/pkgs/applications/misc/megasync/default.nix
index 6e51e3cda76..6e51e3cda76 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/nixpkgs/pkgs/applications/misc/megasync/default.nix
diff --git a/pkgs/applications/misc/megasync/install-megasync.patch b/nixpkgs/pkgs/applications/misc/megasync/install-megasync.patch
index 7d8748528e7..7d8748528e7 100644
--- a/pkgs/applications/misc/megasync/install-megasync.patch
+++ b/nixpkgs/pkgs/applications/misc/megasync/install-megasync.patch
diff --git a/pkgs/applications/misc/megasync/noinstall-distro-version.patch b/nixpkgs/pkgs/applications/misc/megasync/noinstall-distro-version.patch
index bbf100737bc..bbf100737bc 100644
--- a/pkgs/applications/misc/megasync/noinstall-distro-version.patch
+++ b/nixpkgs/pkgs/applications/misc/megasync/noinstall-distro-version.patch
diff --git a/pkgs/applications/misc/memo/default.nix b/nixpkgs/pkgs/applications/misc/memo/default.nix
index 3749f568aef..3749f568aef 100644
--- a/pkgs/applications/misc/memo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/memo/default.nix
diff --git a/pkgs/applications/misc/mencal/default.nix b/nixpkgs/pkgs/applications/misc/mencal/default.nix
index df0a4db7fc7..df0a4db7fc7 100644
--- a/pkgs/applications/misc/mencal/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mencal/default.nix
diff --git a/pkgs/applications/misc/menumaker/default.nix b/nixpkgs/pkgs/applications/misc/menumaker/default.nix
index e06f2a88ade..e06f2a88ade 100644
--- a/pkgs/applications/misc/menumaker/default.nix
+++ b/nixpkgs/pkgs/applications/misc/menumaker/default.nix
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/nixpkgs/pkgs/applications/misc/merkaartor/default.nix
index 08643577b49..08643577b49 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/nixpkgs/pkgs/applications/misc/merkaartor/default.nix
diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix
index a81aec9d036..a81aec9d036 100644
--- a/pkgs/applications/misc/metamorphose2/default.nix
+++ b/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix
diff --git a/pkgs/applications/misc/metar/default.nix b/nixpkgs/pkgs/applications/misc/metar/default.nix
index ca4f91533ec..ca4f91533ec 100644
--- a/pkgs/applications/misc/metar/default.nix
+++ b/nixpkgs/pkgs/applications/misc/metar/default.nix
diff --git a/pkgs/applications/misc/michabo/default.nix b/nixpkgs/pkgs/applications/misc/michabo/default.nix
index 015a326fdc9..015a326fdc9 100644
--- a/pkgs/applications/misc/michabo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/michabo/default.nix
diff --git a/pkgs/applications/misc/milu/default.nix b/nixpkgs/pkgs/applications/misc/milu/default.nix
index 2eee9ad40c1..2eee9ad40c1 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/milu/default.nix
diff --git a/pkgs/applications/misc/minder/default.nix b/nixpkgs/pkgs/applications/misc/minder/default.nix
index 7b6be997ffa..7b6be997ffa 100644
--- a/pkgs/applications/misc/minder/default.nix
+++ b/nixpkgs/pkgs/applications/misc/minder/default.nix
diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix
index eff93c8e99c..eff93c8e99c 100644
--- a/pkgs/applications/misc/minergate-cli/default.nix
+++ b/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix
diff --git a/pkgs/applications/misc/minergate/default.nix b/nixpkgs/pkgs/applications/misc/minergate/default.nix
index a8402d97593..a8402d97593 100644
--- a/pkgs/applications/misc/minergate/default.nix
+++ b/nixpkgs/pkgs/applications/misc/minergate/default.nix
diff --git a/pkgs/applications/misc/mkgmap/build.xml.patch b/nixpkgs/pkgs/applications/misc/mkgmap/build.xml.patch
index 6ec40786b24..6ec40786b24 100644
--- a/pkgs/applications/misc/mkgmap/build.xml.patch
+++ b/nixpkgs/pkgs/applications/misc/mkgmap/build.xml.patch
diff --git a/pkgs/applications/misc/mkgmap/default.nix b/nixpkgs/pkgs/applications/misc/mkgmap/default.nix
index 471ec1d4a76..471ec1d4a76 100644
--- a/pkgs/applications/misc/mkgmap/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mkgmap/default.nix
diff --git a/pkgs/applications/misc/mlterm/default.nix b/nixpkgs/pkgs/applications/misc/mlterm/default.nix
index b2012801e17..b2012801e17 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mlterm/default.nix
diff --git a/pkgs/applications/misc/moolticute/default.nix b/nixpkgs/pkgs/applications/misc/moolticute/default.nix
index e734e44a2e0..e734e44a2e0 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/nixpkgs/pkgs/applications/misc/moolticute/default.nix
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix
index 08f510a2840..08f510a2840 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix
diff --git a/pkgs/applications/misc/mop/default.nix b/nixpkgs/pkgs/applications/misc/mop/default.nix
index c0d41cda02d..c0d41cda02d 100644
--- a/pkgs/applications/misc/mop/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mop/default.nix
diff --git a/pkgs/applications/misc/mop/deps.nix b/nixpkgs/pkgs/applications/misc/mop/deps.nix
index 4081cd1ddaa..4081cd1ddaa 100644
--- a/pkgs/applications/misc/mop/deps.nix
+++ b/nixpkgs/pkgs/applications/misc/mop/deps.nix
diff --git a/pkgs/applications/misc/mpvc/default.nix b/nixpkgs/pkgs/applications/misc/mpvc/default.nix
index 35de284c0ba..35de284c0ba 100644
--- a/pkgs/applications/misc/mpvc/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mpvc/default.nix
diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/nixpkgs/pkgs/applications/misc/mqtt-bench/default.nix
index 0e8cc2ebcea..0e8cc2ebcea 100644
--- a/pkgs/applications/misc/mqtt-bench/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mqtt-bench/default.nix
diff --git a/pkgs/applications/misc/mqtt-bench/deps.nix b/nixpkgs/pkgs/applications/misc/mqtt-bench/deps.nix
index d93d3c46814..d93d3c46814 100644
--- a/pkgs/applications/misc/mqtt-bench/deps.nix
+++ b/nixpkgs/pkgs/applications/misc/mqtt-bench/deps.nix
diff --git a/pkgs/applications/misc/mrxvt/default.nix b/nixpkgs/pkgs/applications/misc/mrxvt/default.nix
index a6efb19b577..a6efb19b577 100644
--- a/pkgs/applications/misc/mrxvt/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mrxvt/default.nix
diff --git a/pkgs/applications/misc/mu-repo/default.nix b/nixpkgs/pkgs/applications/misc/mu-repo/default.nix
index ddee1939b02..ddee1939b02 100644
--- a/pkgs/applications/misc/mu-repo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mu-repo/default.nix
diff --git a/pkgs/applications/misc/mucommander/default.nix b/nixpkgs/pkgs/applications/misc/mucommander/default.nix
index 12a0720e447..12a0720e447 100644
--- a/pkgs/applications/misc/mucommander/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mucommander/default.nix
diff --git a/pkgs/applications/misc/multibootusb/default.nix b/nixpkgs/pkgs/applications/misc/multibootusb/default.nix
index ab8802a1b69..ab8802a1b69 100644
--- a/pkgs/applications/misc/multibootusb/default.nix
+++ b/nixpkgs/pkgs/applications/misc/multibootusb/default.nix
diff --git a/pkgs/applications/misc/mupdf/darwin.patch b/nixpkgs/pkgs/applications/misc/mupdf/darwin.patch
index be1b84b0012..be1b84b0012 100644
--- a/pkgs/applications/misc/mupdf/darwin.patch
+++ b/nixpkgs/pkgs/applications/misc/mupdf/darwin.patch
diff --git a/pkgs/applications/misc/mupdf/default.nix b/nixpkgs/pkgs/applications/misc/mupdf/default.nix
index 32c117c0173..32c117c0173 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mupdf/default.nix
diff --git a/pkgs/applications/misc/mupdf/default.upstream b/nixpkgs/pkgs/applications/misc/mupdf/default.upstream
index 852233633ca..852233633ca 100644
--- a/pkgs/applications/misc/mupdf/default.upstream
+++ b/nixpkgs/pkgs/applications/misc/mupdf/default.upstream
diff --git a/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch b/nixpkgs/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch
index 131a1bbbf6b..131a1bbbf6b 100644
--- a/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch
+++ b/nixpkgs/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch
diff --git a/pkgs/applications/misc/mwic/default.nix b/nixpkgs/pkgs/applications/misc/mwic/default.nix
index 249d9ff1d40..249d9ff1d40 100644
--- a/pkgs/applications/misc/mwic/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mwic/default.nix
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix
index 531f8d851f1..531f8d851f1 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix
diff --git a/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch b/nixpkgs/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch
index 0a5c31fd40a..0a5c31fd40a 100644
--- a/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch
+++ b/nixpkgs/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch
diff --git a/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch b/nixpkgs/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch
index dddf992e4c1..dddf992e4c1 100644
--- a/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch
+++ b/nixpkgs/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch
diff --git a/pkgs/applications/misc/mystem/default.nix b/nixpkgs/pkgs/applications/misc/mystem/default.nix
index 6a6c95b6572..6a6c95b6572 100644
--- a/pkgs/applications/misc/mystem/default.nix
+++ b/nixpkgs/pkgs/applications/misc/mystem/default.nix
diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/nixpkgs/pkgs/applications/misc/nanoblogger/default.nix
index b4d97c368ea..b4d97c368ea 100644
--- a/pkgs/applications/misc/nanoblogger/default.nix
+++ b/nixpkgs/pkgs/applications/misc/nanoblogger/default.nix
diff --git a/pkgs/applications/misc/navipowm/default.nix b/nixpkgs/pkgs/applications/misc/navipowm/default.nix
index 9a40e3bc105..9a40e3bc105 100644
--- a/pkgs/applications/misc/navipowm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/navipowm/default.nix
diff --git a/pkgs/applications/misc/navit/CMakeLists.txt.patch b/nixpkgs/pkgs/applications/misc/navit/CMakeLists.txt.patch
index 7f8a75f319b..7f8a75f319b 100644
--- a/pkgs/applications/misc/navit/CMakeLists.txt.patch
+++ b/nixpkgs/pkgs/applications/misc/navit/CMakeLists.txt.patch
diff --git a/pkgs/applications/misc/navit/default.nix b/nixpkgs/pkgs/applications/misc/navit/default.nix
index 2263dfc1fbc..2263dfc1fbc 100644
--- a/pkgs/applications/misc/navit/default.nix
+++ b/nixpkgs/pkgs/applications/misc/navit/default.nix
diff --git a/pkgs/applications/misc/neap/default.nix b/nixpkgs/pkgs/applications/misc/neap/default.nix
index 4104d35cf10..4104d35cf10 100644
--- a/pkgs/applications/misc/neap/default.nix
+++ b/nixpkgs/pkgs/applications/misc/neap/default.nix
diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/browser/default.nix
index c1ba5ba23b1..c1ba5ba23b1 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/browser/default.nix
diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/buildsystem/default.nix
index 0560b1d25b3..0560b1d25b3 100644
--- a/pkgs/applications/misc/netsurf/buildsystem/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/buildsystem/default.nix
diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libcss/default.nix
index ed0b7b12e98..ed0b7b12e98 100644
--- a/pkgs/applications/misc/netsurf/libcss/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libcss/default.nix
diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libdom/default.nix
index de92219e7f9..de92219e7f9 100644
--- a/pkgs/applications/misc/netsurf/libdom/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libdom/default.nix
diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libhubbub/default.nix
index 03ee66fc598..03ee66fc598 100644
--- a/pkgs/applications/misc/netsurf/libhubbub/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libhubbub/default.nix
diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libnsbmp/default.nix
index b0fb18c89b1..b0fb18c89b1 100644
--- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libnsbmp/default.nix
diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libnsfb/default.nix
index 29b0a7867db..29b0a7867db 100644
--- a/pkgs/applications/misc/netsurf/libnsfb/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libnsfb/default.nix
diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libnsgif/default.nix
index e826dee0d25..e826dee0d25 100644
--- a/pkgs/applications/misc/netsurf/libnsgif/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libnsgif/default.nix
diff --git a/pkgs/applications/misc/netsurf/libnslog/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libnslog/default.nix
index 497630c9aa6..497630c9aa6 100644
--- a/pkgs/applications/misc/netsurf/libnslog/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libnslog/default.nix
diff --git a/pkgs/applications/misc/netsurf/libnspsl/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libnspsl/default.nix
index f0abbdc049a..f0abbdc049a 100644
--- a/pkgs/applications/misc/netsurf/libnspsl/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libnspsl/default.nix
diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libnsutils/default.nix
index 3eaa882cb73..3eaa882cb73 100644
--- a/pkgs/applications/misc/netsurf/libnsutils/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libnsutils/default.nix
diff --git a/pkgs/applications/misc/netsurf/libparserutils/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libparserutils/default.nix
index ea9d7c9ea85..ea9d7c9ea85 100644
--- a/pkgs/applications/misc/netsurf/libparserutils/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libparserutils/default.nix
diff --git a/pkgs/applications/misc/netsurf/libsvgtiny/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libsvgtiny/default.nix
index 9a4f922c2b6..9a4f922c2b6 100644
--- a/pkgs/applications/misc/netsurf/libsvgtiny/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libsvgtiny/default.nix
diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libutf8proc/default.nix
index 2144ccd3303..2144ccd3303 100644
--- a/pkgs/applications/misc/netsurf/libutf8proc/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libutf8proc/default.nix
diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
index ad59b1be10e..ad59b1be10e 100644
--- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/nsgenbind/default.nix
index 88ac4f0c3eb..88ac4f0c3eb 100644
--- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix
+++ b/nixpkgs/pkgs/applications/misc/netsurf/nsgenbind/default.nix
diff --git a/pkgs/applications/misc/nix-tour/default.nix b/nixpkgs/pkgs/applications/misc/nix-tour/default.nix
index 31afed3061a..31afed3061a 100644
--- a/pkgs/applications/misc/nix-tour/default.nix
+++ b/nixpkgs/pkgs/applications/misc/nix-tour/default.nix
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/nixpkgs/pkgs/applications/misc/nixnote2/default.nix
index dec8b4ba0a7..dec8b4ba0a7 100644
--- a/pkgs/applications/misc/nixnote2/default.nix
+++ b/nixpkgs/pkgs/applications/misc/nixnote2/default.nix
diff --git a/pkgs/applications/misc/nnn/default.nix b/nixpkgs/pkgs/applications/misc/nnn/default.nix
index f2df8a09ff2..f2df8a09ff2 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/nixpkgs/pkgs/applications/misc/nnn/default.nix
diff --git a/pkgs/applications/misc/noice/default.nix b/nixpkgs/pkgs/applications/misc/noice/default.nix
index 6cc5dc9066d..6cc5dc9066d 100644
--- a/pkgs/applications/misc/noice/default.nix
+++ b/nixpkgs/pkgs/applications/misc/noice/default.nix
diff --git a/pkgs/applications/misc/notable/default.nix b/nixpkgs/pkgs/applications/misc/notable/default.nix
index 085dff7ce04..085dff7ce04 100644
--- a/pkgs/applications/misc/notable/default.nix
+++ b/nixpkgs/pkgs/applications/misc/notable/default.nix
diff --git a/pkgs/applications/misc/notejot/default.nix b/nixpkgs/pkgs/applications/misc/notejot/default.nix
index 1c02441474c..1c02441474c 100644
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/nixpkgs/pkgs/applications/misc/notejot/default.nix
diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/nixpkgs/pkgs/applications/misc/notify-osd-customizable/default.nix
index d75ec9ef2c2..d75ec9ef2c2 100644
--- a/pkgs/applications/misc/notify-osd-customizable/default.nix
+++ b/nixpkgs/pkgs/applications/misc/notify-osd-customizable/default.nix
diff --git a/pkgs/applications/misc/notify-osd/default.nix b/nixpkgs/pkgs/applications/misc/notify-osd/default.nix
index 484ff62e9e6..484ff62e9e6 100644
--- a/pkgs/applications/misc/notify-osd/default.nix
+++ b/nixpkgs/pkgs/applications/misc/notify-osd/default.nix
diff --git a/pkgs/applications/misc/nrsc5/default.nix b/nixpkgs/pkgs/applications/misc/nrsc5/default.nix
index 3ad83776842..3ad83776842 100644
--- a/pkgs/applications/misc/nrsc5/default.nix
+++ b/nixpkgs/pkgs/applications/misc/nrsc5/default.nix
diff --git a/pkgs/applications/misc/nut/default.nix b/nixpkgs/pkgs/applications/misc/nut/default.nix
index 8b0cab31588..8b0cab31588 100644
--- a/pkgs/applications/misc/nut/default.nix
+++ b/nixpkgs/pkgs/applications/misc/nut/default.nix
diff --git a/pkgs/applications/misc/ocropus/default.nix b/nixpkgs/pkgs/applications/misc/ocropus/default.nix
index a604349afb0..a604349afb0 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ocropus/default.nix
diff --git a/pkgs/applications/misc/octoprint/default.nix b/nixpkgs/pkgs/applications/misc/octoprint/default.nix
index 29a04627bef..29a04627bef 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/nixpkgs/pkgs/applications/misc/octoprint/default.nix
diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/nixpkgs/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
index 24c9c4a80f5..24c9c4a80f5 100644
--- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
+++ b/nixpkgs/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix
index ce800e8f18b..ce800e8f18b 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix
diff --git a/pkgs/applications/misc/ola/default.nix b/nixpkgs/pkgs/applications/misc/ola/default.nix
index b9529981c7c..b9529981c7c 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ola/default.nix
diff --git a/pkgs/applications/misc/omegat.nix b/nixpkgs/pkgs/applications/misc/omegat.nix
index 27d7ad8730b..27d7ad8730b 100644
--- a/pkgs/applications/misc/omegat.nix
+++ b/nixpkgs/pkgs/applications/misc/omegat.nix
diff --git a/pkgs/applications/misc/onboard/default.nix b/nixpkgs/pkgs/applications/misc/onboard/default.nix
index 1e578cde512..1e578cde512 100644
--- a/pkgs/applications/misc/onboard/default.nix
+++ b/nixpkgs/pkgs/applications/misc/onboard/default.nix
diff --git a/pkgs/applications/misc/onboard/fix-paths.patch b/nixpkgs/pkgs/applications/misc/onboard/fix-paths.patch
index 64acc9b138c..64acc9b138c 100644
--- a/pkgs/applications/misc/onboard/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/misc/onboard/fix-paths.patch
diff --git a/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch b/nixpkgs/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch
index 2463c8d5f5a..2463c8d5f5a 100644
--- a/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch
+++ b/nixpkgs/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch
diff --git a/pkgs/applications/misc/oneko/default.nix b/nixpkgs/pkgs/applications/misc/oneko/default.nix
index 1c5858b5677..1c5858b5677 100644
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/nixpkgs/pkgs/applications/misc/oneko/default.nix
diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix
index 8f7f74f7123..8f7f74f7123 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix
diff --git a/pkgs/applications/misc/openbox-menu/with-svg.patch b/nixpkgs/pkgs/applications/misc/openbox-menu/with-svg.patch
index dd6710f5cfc..dd6710f5cfc 100644
--- a/pkgs/applications/misc/openbox-menu/with-svg.patch
+++ b/nixpkgs/pkgs/applications/misc/openbox-menu/with-svg.patch
diff --git a/pkgs/applications/misc/openbrf/default.nix b/nixpkgs/pkgs/applications/misc/openbrf/default.nix
index e943263600c..e943263600c 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/openbrf/default.nix
diff --git a/pkgs/applications/misc/opencpn/default.nix b/nixpkgs/pkgs/applications/misc/opencpn/default.nix
index 375552aaa33..375552aaa33 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/nixpkgs/pkgs/applications/misc/opencpn/default.nix
diff --git a/pkgs/applications/misc/openjump/default.nix b/nixpkgs/pkgs/applications/misc/openjump/default.nix
index c98defee57a..c98defee57a 100644
--- a/pkgs/applications/misc/openjump/default.nix
+++ b/nixpkgs/pkgs/applications/misc/openjump/default.nix
diff --git a/pkgs/applications/misc/opentx/default.nix b/nixpkgs/pkgs/applications/misc/opentx/default.nix
index 370f88d7b47..370f88d7b47 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/nixpkgs/pkgs/applications/misc/opentx/default.nix
diff --git a/pkgs/applications/misc/orca/default.nix b/nixpkgs/pkgs/applications/misc/orca/default.nix
index 1dc6a9cfee5..1dc6a9cfee5 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/nixpkgs/pkgs/applications/misc/orca/default.nix
diff --git a/pkgs/applications/misc/orca/fix-paths.patch b/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch
index ffb56dbe239..ffb56dbe239 100644
--- a/pkgs/applications/misc/orca/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch
diff --git a/pkgs/applications/misc/orpie/default.nix b/nixpkgs/pkgs/applications/misc/orpie/default.nix
index e404da974c4..e404da974c4 100644
--- a/pkgs/applications/misc/orpie/default.nix
+++ b/nixpkgs/pkgs/applications/misc/orpie/default.nix
diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix
index e5838dc1bbe..e5838dc1bbe 100644
--- a/pkgs/applications/misc/osm2xmap/default.nix
+++ b/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix
diff --git a/pkgs/applications/misc/osmctools/default.nix b/nixpkgs/pkgs/applications/misc/osmctools/default.nix
index c03e57920da..c03e57920da 100644
--- a/pkgs/applications/misc/osmctools/default.nix
+++ b/nixpkgs/pkgs/applications/misc/osmctools/default.nix
diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix
index 82144e9689f..82144e9689f 100644
--- a/pkgs/applications/misc/osmium-tool/default.nix
+++ b/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix
diff --git a/pkgs/applications/misc/overmind/default.nix b/nixpkgs/pkgs/applications/misc/overmind/default.nix
index 7603a66cd36..7603a66cd36 100644
--- a/pkgs/applications/misc/overmind/default.nix
+++ b/nixpkgs/pkgs/applications/misc/overmind/default.nix
diff --git a/pkgs/applications/misc/pastel/default.nix b/nixpkgs/pkgs/applications/misc/pastel/default.nix
index 8499ad0880c..8499ad0880c 100644
--- a/pkgs/applications/misc/pastel/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pastel/default.nix
diff --git a/pkgs/applications/misc/pbpst/default.nix b/nixpkgs/pkgs/applications/misc/pbpst/default.nix
index c1fd6c5d7cb..c1fd6c5d7cb 100644
--- a/pkgs/applications/misc/pbpst/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pbpst/default.nix
diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix
index c6cd118aea8..c6cd118aea8 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix
index 17253173a5e..17253173a5e 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix
diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix
index 9756d9b42b0..9756d9b42b0 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix
diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix
index ed54ccbb0a1..ed54ccbb0a1 100644
--- a/pkgs/applications/misc/pdfarranger/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix
diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/nixpkgs/pkgs/applications/misc/pdfdiff/default.nix
index ee54904bfd6..ee54904bfd6 100644
--- a/pkgs/applications/misc/pdfdiff/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pdfdiff/default.nix
diff --git a/pkgs/applications/misc/pdfmod/default.nix b/nixpkgs/pkgs/applications/misc/pdfmod/default.nix
index 90107be64c7..90107be64c7 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pdfmod/default.nix
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/nixpkgs/pkgs/applications/misc/pdfpc/default.nix
index fa500989cac..fa500989cac 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pdfpc/default.nix
diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix
index 4b086c691cd..4b086c691cd 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix
diff --git a/pkgs/applications/misc/pell/default.nix b/nixpkgs/pkgs/applications/misc/pell/default.nix
index fc4e5229c9c..fc4e5229c9c 100644
--- a/pkgs/applications/misc/pell/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pell/default.nix
diff --git a/pkgs/applications/misc/perkeep/default.nix b/nixpkgs/pkgs/applications/misc/perkeep/default.nix
index ae81ef3c9f6..ae81ef3c9f6 100644
--- a/pkgs/applications/misc/perkeep/default.nix
+++ b/nixpkgs/pkgs/applications/misc/perkeep/default.nix
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/nixpkgs/pkgs/applications/misc/pgadmin/default.nix
index 86e10ae0943..86e10ae0943 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pgadmin/default.nix
diff --git a/pkgs/applications/misc/pgmanage/default.nix b/nixpkgs/pkgs/applications/misc/pgmanage/default.nix
index 241d5786468..241d5786468 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pgmanage/default.nix
diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix
index 83e45e25581..83e45e25581 100644
--- a/pkgs/applications/misc/pgmodeler/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix
diff --git a/pkgs/applications/misc/phwmon/default.nix b/nixpkgs/pkgs/applications/misc/phwmon/default.nix
index 6fb70f1c9a2..6fb70f1c9a2 100644
--- a/pkgs/applications/misc/phwmon/default.nix
+++ b/nixpkgs/pkgs/applications/misc/phwmon/default.nix
diff --git a/pkgs/applications/misc/pinfo/default.nix b/nixpkgs/pkgs/applications/misc/pinfo/default.nix
index 55093b21f95..55093b21f95 100644
--- a/pkgs/applications/misc/pinfo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pinfo/default.nix
diff --git a/pkgs/applications/misc/plank/default.nix b/nixpkgs/pkgs/applications/misc/plank/default.nix
index 0ae9e7379e7..0ae9e7379e7 100644
--- a/pkgs/applications/misc/plank/default.nix
+++ b/nixpkgs/pkgs/applications/misc/plank/default.nix
diff --git a/pkgs/applications/misc/plank/hide-in-pantheon.patch b/nixpkgs/pkgs/applications/misc/plank/hide-in-pantheon.patch
index ab8a4c72389..ab8a4c72389 100644
--- a/pkgs/applications/misc/plank/hide-in-pantheon.patch
+++ b/nixpkgs/pkgs/applications/misc/plank/hide-in-pantheon.patch
diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch b/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch
index b33a3e174bc..b33a3e174bc 100644
--- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch
+++ b/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch
diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
index 3ecace18f92..3ecace18f92 100644
--- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/nixpkgs/pkgs/applications/misc/playonlinux/default.nix
index 48188574ad4..48188574ad4 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/nixpkgs/pkgs/applications/misc/playonlinux/default.nix
diff --git a/pkgs/applications/misc/plover/default.nix b/nixpkgs/pkgs/applications/misc/plover/default.nix
index 8ecc4f974b4..8ecc4f974b4 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/nixpkgs/pkgs/applications/misc/plover/default.nix
diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix
index 8413f8c8f10..8413f8c8f10 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix
diff --git a/pkgs/applications/misc/polybar/default.nix b/nixpkgs/pkgs/applications/misc/polybar/default.nix
index e1045663a3b..e1045663a3b 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/nixpkgs/pkgs/applications/misc/polybar/default.nix
diff --git a/pkgs/applications/misc/posterazor/default.nix b/nixpkgs/pkgs/applications/misc/posterazor/default.nix
index 7209ee3e400..7209ee3e400 100644
--- a/pkgs/applications/misc/posterazor/default.nix
+++ b/nixpkgs/pkgs/applications/misc/posterazor/default.nix
diff --git a/pkgs/applications/misc/printrun/default.nix b/nixpkgs/pkgs/applications/misc/printrun/default.nix
index 34144e35bd5..34144e35bd5 100644
--- a/pkgs/applications/misc/printrun/default.nix
+++ b/nixpkgs/pkgs/applications/misc/printrun/default.nix
diff --git a/pkgs/applications/misc/procmail/CVE-2014-3618.patch b/nixpkgs/pkgs/applications/misc/procmail/CVE-2014-3618.patch
index e3aa5600e40..e3aa5600e40 100644
--- a/pkgs/applications/misc/procmail/CVE-2014-3618.patch
+++ b/nixpkgs/pkgs/applications/misc/procmail/CVE-2014-3618.patch
diff --git a/pkgs/applications/misc/procmail/default.nix b/nixpkgs/pkgs/applications/misc/procmail/default.nix
index cd3a46ab09b..cd3a46ab09b 100644
--- a/pkgs/applications/misc/procmail/default.nix
+++ b/nixpkgs/pkgs/applications/misc/procmail/default.nix
diff --git a/pkgs/applications/misc/projectlibre/default.nix b/nixpkgs/pkgs/applications/misc/projectlibre/default.nix
index 344c3d7168a..344c3d7168a 100644
--- a/pkgs/applications/misc/projectlibre/default.nix
+++ b/nixpkgs/pkgs/applications/misc/projectlibre/default.nix
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix
index caf4f270a15..caf4f270a15 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix
diff --git a/pkgs/applications/misc/pstree/default.nix b/nixpkgs/pkgs/applications/misc/pstree/default.nix
index 7aaa8a8c38d..7aaa8a8c38d 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pstree/default.nix
diff --git a/pkgs/applications/misc/pt/.bundle/config b/nixpkgs/pkgs/applications/misc/pt/.bundle/config
index 88cb2d52935..88cb2d52935 100644
--- a/pkgs/applications/misc/pt/.bundle/config
+++ b/nixpkgs/pkgs/applications/misc/pt/.bundle/config
diff --git a/pkgs/applications/misc/pt/Gemfile b/nixpkgs/pkgs/applications/misc/pt/Gemfile
index ed2136ea5b8..ed2136ea5b8 100644
--- a/pkgs/applications/misc/pt/Gemfile
+++ b/nixpkgs/pkgs/applications/misc/pt/Gemfile
diff --git a/pkgs/applications/misc/pt/Gemfile.lock b/nixpkgs/pkgs/applications/misc/pt/Gemfile.lock
index 501fae0ef0a..501fae0ef0a 100644
--- a/pkgs/applications/misc/pt/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/misc/pt/Gemfile.lock
diff --git a/pkgs/applications/misc/pt/default.nix b/nixpkgs/pkgs/applications/misc/pt/default.nix
index f5504721987..f5504721987 100644
--- a/pkgs/applications/misc/pt/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pt/default.nix
diff --git a/pkgs/applications/misc/pt/gemset.nix b/nixpkgs/pkgs/applications/misc/pt/gemset.nix
index f1f69c25214..f1f69c25214 100644
--- a/pkgs/applications/misc/pt/gemset.nix
+++ b/nixpkgs/pkgs/applications/misc/pt/gemset.nix
diff --git a/pkgs/applications/misc/ptask/default.nix b/nixpkgs/pkgs/applications/misc/ptask/default.nix
index 81e316eb0ee..81e316eb0ee 100644
--- a/pkgs/applications/misc/ptask/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ptask/default.nix
diff --git a/pkgs/applications/misc/ptask/json_c_is_error.patch b/nixpkgs/pkgs/applications/misc/ptask/json_c_is_error.patch
index 435c8b26e6f..435c8b26e6f 100644
--- a/pkgs/applications/misc/ptask/json_c_is_error.patch
+++ b/nixpkgs/pkgs/applications/misc/ptask/json_c_is_error.patch
diff --git a/pkgs/applications/misc/ptask/tw-version.patch b/nixpkgs/pkgs/applications/misc/ptask/tw-version.patch
index 995fffeda2f..995fffeda2f 100644
--- a/pkgs/applications/misc/ptask/tw-version.patch
+++ b/nixpkgs/pkgs/applications/misc/ptask/tw-version.patch
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/nixpkgs/pkgs/applications/misc/pwsafe/default.nix
index b1f4e5f9e42..b1f4e5f9e42 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pwsafe/default.nix
diff --git a/pkgs/applications/misc/pydf/default.nix b/nixpkgs/pkgs/applications/misc/pydf/default.nix
index bfbee1bea24..bfbee1bea24 100644
--- a/pkgs/applications/misc/pydf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pydf/default.nix
diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix
index 614e3ca8135..614e3ca8135 100644
--- a/pkgs/applications/misc/pyditz/cerberus.nix
+++ b/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix
diff --git a/pkgs/applications/misc/pyditz/default.nix b/nixpkgs/pkgs/applications/misc/pyditz/default.nix
index 60de2f9abdc..60de2f9abdc 100644
--- a/pkgs/applications/misc/pyditz/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pyditz/default.nix
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/nixpkgs/pkgs/applications/misc/pytrainer/default.nix
index 0375b99af48..0375b99af48 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/nixpkgs/pkgs/applications/misc/pytrainer/default.nix
diff --git a/pkgs/applications/misc/pytrainer/fix-paths.patch b/nixpkgs/pkgs/applications/misc/pytrainer/fix-paths.patch
index 7781f5aa4be..7781f5aa4be 100644
--- a/pkgs/applications/misc/pytrainer/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/misc/pytrainer/fix-paths.patch
diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix
index 97751127342..97751127342 100644
--- a/pkgs/applications/misc/qMasterPassword/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix
diff --git a/pkgs/applications/misc/qdirstat/default.nix b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix
index 21d4b003179..21d4b003179 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix
diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/nixpkgs/pkgs/applications/misc/qlandkartegt/default.nix
index aae38f7d0f1..aae38f7d0f1 100644
--- a/pkgs/applications/misc/qlandkartegt/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qlandkartegt/default.nix
diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/nixpkgs/pkgs/applications/misc/qlandkartegt/garmindev.nix
index a679a4f1112..a679a4f1112 100644
--- a/pkgs/applications/misc/qlandkartegt/garmindev.nix
+++ b/nixpkgs/pkgs/applications/misc/qlandkartegt/garmindev.nix
diff --git a/pkgs/applications/misc/qlcplus/default.nix b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix
index c0b844d121a..c0b844d121a 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/nixpkgs/pkgs/applications/misc/qmapshack/default.nix
index 21fbbf3253f..21fbbf3253f 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qmapshack/default.nix
diff --git a/pkgs/applications/misc/qmetro/default.nix b/nixpkgs/pkgs/applications/misc/qmetro/default.nix
index 49993f2f7ea..49993f2f7ea 100644
--- a/pkgs/applications/misc/qmetro/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qmetro/default.nix
diff --git a/pkgs/applications/misc/qolibri/default.nix b/nixpkgs/pkgs/applications/misc/qolibri/default.nix
index c96fbab4d81..c96fbab4d81 100644
--- a/pkgs/applications/misc/qolibri/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qolibri/default.nix
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/nixpkgs/pkgs/applications/misc/qpdfview/default.nix
index 4100ab3536b..4100ab3536b 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qpdfview/default.nix
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix
index 46b446b429b..46b446b429b 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix
diff --git a/pkgs/applications/misc/qsyncthingtray/qsyncthingtray-0.5.8-qt-5.6.3.patch b/nixpkgs/pkgs/applications/misc/qsyncthingtray/qsyncthingtray-0.5.8-qt-5.6.3.patch
index 424bbe17177..424bbe17177 100644
--- a/pkgs/applications/misc/qsyncthingtray/qsyncthingtray-0.5.8-qt-5.6.3.patch
+++ b/nixpkgs/pkgs/applications/misc/qsyncthingtray/qsyncthingtray-0.5.8-qt-5.6.3.patch
diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix
index 702cadfdaa9..702cadfdaa9 100644
--- a/pkgs/applications/misc/qt-box-editor/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix
diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix
index 21d51f17258..21d51f17258 100644
--- a/pkgs/applications/misc/qtbitcointrader/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix
diff --git a/pkgs/applications/misc/qtpass/default.nix b/nixpkgs/pkgs/applications/misc/qtpass/default.nix
index 6b68071d4d0..6b68071d4d0 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qtpass/default.nix
diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/nixpkgs/pkgs/applications/misc/quicksynergy/default.nix
index 948bcf33d37..948bcf33d37 100644
--- a/pkgs/applications/misc/quicksynergy/default.nix
+++ b/nixpkgs/pkgs/applications/misc/quicksynergy/default.nix
diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/nixpkgs/pkgs/applications/misc/raiseorlaunch/default.nix
index 6bbbc671bf8..6bbbc671bf8 100644
--- a/pkgs/applications/misc/raiseorlaunch/default.nix
+++ b/nixpkgs/pkgs/applications/misc/raiseorlaunch/default.nix
diff --git a/pkgs/applications/misc/ranger/default.nix b/nixpkgs/pkgs/applications/misc/ranger/default.nix
index 243913d0a09..243913d0a09 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ranger/default.nix
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix
index ac62ccc00cb..ac62ccc00cb 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix
diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/nixpkgs/pkgs/applications/misc/redshift-plasma-applet/default.nix
index 2eebe67c46d..2eebe67c46d 100644
--- a/pkgs/applications/misc/redshift-plasma-applet/default.nix
+++ b/nixpkgs/pkgs/applications/misc/redshift-plasma-applet/default.nix
diff --git a/pkgs/applications/misc/redshift/575.patch b/nixpkgs/pkgs/applications/misc/redshift/575.patch
index d731d8ec43a..d731d8ec43a 100644
--- a/pkgs/applications/misc/redshift/575.patch
+++ b/nixpkgs/pkgs/applications/misc/redshift/575.patch
diff --git a/pkgs/applications/misc/redshift/default.nix b/nixpkgs/pkgs/applications/misc/redshift/default.nix
index e9862041f4a..e9862041f4a 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/nixpkgs/pkgs/applications/misc/redshift/default.nix
diff --git a/pkgs/applications/misc/regextester/default.nix b/nixpkgs/pkgs/applications/misc/regextester/default.nix
index 816a158c031..816a158c031 100644
--- a/pkgs/applications/misc/regextester/default.nix
+++ b/nixpkgs/pkgs/applications/misc/regextester/default.nix
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/nixpkgs/pkgs/applications/misc/rescuetime/default.nix
index 13ae1f1ba7d..13ae1f1ba7d 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rescuetime/default.nix
diff --git a/pkgs/applications/misc/robo3t/default.nix b/nixpkgs/pkgs/applications/misc/robo3t/default.nix
index 00640be6c74..00640be6c74 100644
--- a/pkgs/applications/misc/robo3t/default.nix
+++ b/nixpkgs/pkgs/applications/misc/robo3t/default.nix
diff --git a/pkgs/applications/misc/robomongo/default.nix b/nixpkgs/pkgs/applications/misc/robomongo/default.nix
index 8df4e960c18..8df4e960c18 100644
--- a/pkgs/applications/misc/robomongo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/robomongo/default.nix
diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/nixpkgs/pkgs/applications/misc/rofi-menugen/default.nix
index 2255089ab7e..2255089ab7e 100644
--- a/pkgs/applications/misc/rofi-menugen/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rofi-menugen/default.nix
diff --git a/pkgs/applications/misc/rofi/default.nix b/nixpkgs/pkgs/applications/misc/rofi/default.nix
index d8e600f6019..d8e600f6019 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rofi/default.nix
diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix
index 1c7284a2db2..1c7284a2db2 100644
--- a/pkgs/applications/misc/rofi/wrapper.nix
+++ b/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix
diff --git a/pkgs/applications/misc/roxterm/default.nix b/nixpkgs/pkgs/applications/misc/roxterm/default.nix
index d02296f0e16..d02296f0e16 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/roxterm/default.nix
diff --git a/pkgs/applications/misc/rsclock/default.nix b/nixpkgs/pkgs/applications/misc/rsclock/default.nix
index 137ec920f75..137ec920f75 100644
--- a/pkgs/applications/misc/rsclock/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rsclock/default.nix
diff --git a/pkgs/applications/misc/rsibreak/default.nix b/nixpkgs/pkgs/applications/misc/rsibreak/default.nix
index 6ee9966401b..6ee9966401b 100644
--- a/pkgs/applications/misc/rsibreak/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rsibreak/default.nix
diff --git a/pkgs/applications/misc/rtv/default.nix b/nixpkgs/pkgs/applications/misc/rtv/default.nix
index 20211ecb53b..20211ecb53b 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rtv/default.nix
diff --git a/pkgs/applications/misc/rxvt/default.nix b/nixpkgs/pkgs/applications/misc/rxvt/default.nix
index acdd21a1c21..acdd21a1c21 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rxvt/default.nix
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
index a4e03fa347f..a4e03fa347f 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-bidi/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-bidi/default.nix
index 3e67e4ec085..3e67e4ec085 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-bidi/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-bidi/default.nix
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix
index 4f4319af6cb..4f4319af6cb 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix
index 13e005014f1..13e005014f1 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
index b976388ae2c..b976388ae2c 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
index 2982c02cce9..2982c02cce9 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix
index ba8ec3a6e72..ba8ec3a6e72 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix
index 2f2c2055803..2f2c2055803 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix
index 7c239a9b754..7c239a9b754 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix
diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch b/nixpkgs/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch
index c8d2acfbdc5..c8d2acfbdc5 100644
--- a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch
diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-9.06-font-width.patch b/nixpkgs/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-9.06-font-width.patch
index 636083218fa..636083218fa 100644
--- a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-9.06-font-width.patch
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-9.06-font-width.patch
diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch b/nixpkgs/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch
index 5e42e17c156..5e42e17c156 100644
--- a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch
diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode/wrapper.nix
index fd0860b3aae..fd0860b3aae 100644
--- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix
+++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode/wrapper.nix
diff --git a/pkgs/applications/misc/safeeyes/default.nix b/nixpkgs/pkgs/applications/misc/safeeyes/default.nix
index 125170d36c2..125170d36c2 100644
--- a/pkgs/applications/misc/safeeyes/default.nix
+++ b/nixpkgs/pkgs/applications/misc/safeeyes/default.nix
diff --git a/pkgs/applications/misc/sakura/default.nix b/nixpkgs/pkgs/applications/misc/sakura/default.nix
index f646b473915..f646b473915 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sakura/default.nix
diff --git a/pkgs/applications/misc/sampler/default.nix b/nixpkgs/pkgs/applications/misc/sampler/default.nix
index a04b0dcbba6..a04b0dcbba6 100644
--- a/pkgs/applications/misc/sampler/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sampler/default.nix
diff --git a/pkgs/applications/misc/sbagen/default.nix b/nixpkgs/pkgs/applications/misc/sbagen/default.nix
index 6f38ba5662b..6f38ba5662b 100644
--- a/pkgs/applications/misc/sbagen/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sbagen/default.nix
diff --git a/pkgs/applications/misc/sc-im/default.nix b/nixpkgs/pkgs/applications/misc/sc-im/default.nix
index c95eba48bdf..c95eba48bdf 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sc-im/default.nix
diff --git a/pkgs/applications/misc/sdcv/default.nix b/nixpkgs/pkgs/applications/misc/sdcv/default.nix
index 3cebcc0101f..3cebcc0101f 100644
--- a/pkgs/applications/misc/sdcv/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sdcv/default.nix
diff --git a/pkgs/applications/misc/sent/default.nix b/nixpkgs/pkgs/applications/misc/sent/default.nix
index 9bbae33b3e4..9bbae33b3e4 100644
--- a/pkgs/applications/misc/sent/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sent/default.nix
diff --git a/pkgs/applications/misc/sequeler/default.nix b/nixpkgs/pkgs/applications/misc/sequeler/default.nix
index 4199e198c53..4199e198c53 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sequeler/default.nix
diff --git a/pkgs/applications/misc/sequelpro/default.nix b/nixpkgs/pkgs/applications/misc/sequelpro/default.nix
index e81c0b99264..e81c0b99264 100644
--- a/pkgs/applications/misc/sequelpro/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sequelpro/default.nix
diff --git a/pkgs/applications/misc/sidequest/default.nix b/nixpkgs/pkgs/applications/misc/sidequest/default.nix
index 7059eeb2a0d..7059eeb2a0d 100644
--- a/pkgs/applications/misc/sidequest/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sidequest/default.nix
diff --git a/pkgs/applications/misc/sigal/default.nix b/nixpkgs/pkgs/applications/misc/sigal/default.nix
index 2b44b0398b5..2b44b0398b5 100644
--- a/pkgs/applications/misc/sigal/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sigal/default.nix
diff --git a/pkgs/applications/misc/simplenote/default.nix b/nixpkgs/pkgs/applications/misc/simplenote/default.nix
index b3ad833e3f2..b3ad833e3f2 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/nixpkgs/pkgs/applications/misc/simplenote/default.nix
diff --git a/pkgs/applications/misc/slade/default.nix b/nixpkgs/pkgs/applications/misc/slade/default.nix
index d2d5e9548a0..d2d5e9548a0 100644
--- a/pkgs/applications/misc/slade/default.nix
+++ b/nixpkgs/pkgs/applications/misc/slade/default.nix
diff --git a/pkgs/applications/misc/slade/git.nix b/nixpkgs/pkgs/applications/misc/slade/git.nix
index 9ee30d347b0..9ee30d347b0 100644
--- a/pkgs/applications/misc/slade/git.nix
+++ b/nixpkgs/pkgs/applications/misc/slade/git.nix
diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/nixpkgs/pkgs/applications/misc/sleepyhead/default.nix
index a3270929417..a3270929417 100644
--- a/pkgs/applications/misc/sleepyhead/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sleepyhead/default.nix
diff --git a/pkgs/applications/misc/slic3r/boost-compile-error.patch b/nixpkgs/pkgs/applications/misc/slic3r/boost-compile-error.patch
index 4dbdb85f743..4dbdb85f743 100644
--- a/pkgs/applications/misc/slic3r/boost-compile-error.patch
+++ b/nixpkgs/pkgs/applications/misc/slic3r/boost-compile-error.patch
diff --git a/pkgs/applications/misc/slic3r/default.nix b/nixpkgs/pkgs/applications/misc/slic3r/default.nix
index 1465b0ea052..1465b0ea052 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/nixpkgs/pkgs/applications/misc/slic3r/default.nix
diff --git a/pkgs/applications/misc/slmenu/default.nix b/nixpkgs/pkgs/applications/misc/slmenu/default.nix
index 55025621fc7..55025621fc7 100644
--- a/pkgs/applications/misc/slmenu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/slmenu/default.nix
diff --git a/pkgs/applications/misc/slstatus/default.nix b/nixpkgs/pkgs/applications/misc/slstatus/default.nix
index bfb3d010a3c..bfb3d010a3c 100644
--- a/pkgs/applications/misc/slstatus/default.nix
+++ b/nixpkgs/pkgs/applications/misc/slstatus/default.nix
diff --git a/pkgs/applications/misc/solaar/default.nix b/nixpkgs/pkgs/applications/misc/solaar/default.nix
index 722b0bc5077..722b0bc5077 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/nixpkgs/pkgs/applications/misc/solaar/default.nix
diff --git a/pkgs/applications/misc/spacefm/default.nix b/nixpkgs/pkgs/applications/misc/spacefm/default.nix
index 9550a8d4fd7..9550a8d4fd7 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/spacefm/default.nix
diff --git a/pkgs/applications/misc/speedread/default.nix b/nixpkgs/pkgs/applications/misc/speedread/default.nix
index 180b66fda8c..180b66fda8c 100644
--- a/pkgs/applications/misc/speedread/default.nix
+++ b/nixpkgs/pkgs/applications/misc/speedread/default.nix
diff --git a/pkgs/applications/misc/sqliteman/default.nix b/nixpkgs/pkgs/applications/misc/sqliteman/default.nix
index 103075024dd..103075024dd 100644
--- a/pkgs/applications/misc/sqliteman/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sqliteman/default.nix
diff --git a/pkgs/applications/misc/ssocr/default.nix b/nixpkgs/pkgs/applications/misc/ssocr/default.nix
index bb1655b4463..bb1655b4463 100644
--- a/pkgs/applications/misc/ssocr/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ssocr/default.nix
diff --git a/pkgs/applications/misc/st/default.nix b/nixpkgs/pkgs/applications/misc/st/default.nix
index 47d7279a47f..47d7279a47f 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/nixpkgs/pkgs/applications/misc/st/default.nix
diff --git a/pkgs/applications/misc/st/xst.nix b/nixpkgs/pkgs/applications/misc/st/xst.nix
index 9407243c6a2..9407243c6a2 100644
--- a/pkgs/applications/misc/st/xst.nix
+++ b/nixpkgs/pkgs/applications/misc/st/xst.nix
diff --git a/pkgs/applications/misc/stag/default.nix b/nixpkgs/pkgs/applications/misc/stag/default.nix
index ebb50e685da..ebb50e685da 100644
--- a/pkgs/applications/misc/stag/default.nix
+++ b/nixpkgs/pkgs/applications/misc/stag/default.nix
diff --git a/pkgs/applications/misc/stog/default.nix b/nixpkgs/pkgs/applications/misc/stog/default.nix
index 8c47de3afac..8c47de3afac 100644
--- a/pkgs/applications/misc/stog/default.nix
+++ b/nixpkgs/pkgs/applications/misc/stog/default.nix
diff --git a/pkgs/applications/misc/stog/install.patch b/nixpkgs/pkgs/applications/misc/stog/install.patch
index a2407d3079f..a2407d3079f 100644
--- a/pkgs/applications/misc/stog/install.patch
+++ b/nixpkgs/pkgs/applications/misc/stog/install.patch
diff --git a/pkgs/applications/misc/stretchly/default.nix b/nixpkgs/pkgs/applications/misc/stretchly/default.nix
index 75f3be85dad..75f3be85dad 100644
--- a/pkgs/applications/misc/stretchly/default.nix
+++ b/nixpkgs/pkgs/applications/misc/stretchly/default.nix
diff --git a/pkgs/applications/misc/stupidterm/default.nix b/nixpkgs/pkgs/applications/misc/stupidterm/default.nix
index b786b34e955..b786b34e955 100644
--- a/pkgs/applications/misc/stupidterm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/stupidterm/default.nix
diff --git a/pkgs/applications/misc/styx/default.nix b/nixpkgs/pkgs/applications/misc/styx/default.nix
index 340b59d5ff2..340b59d5ff2 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/nixpkgs/pkgs/applications/misc/styx/default.nix
diff --git a/pkgs/applications/misc/subsurface/default.nix b/nixpkgs/pkgs/applications/misc/subsurface/default.nix
index 960b7b9eeef..960b7b9eeef 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/nixpkgs/pkgs/applications/misc/subsurface/default.nix
diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/nixpkgs/pkgs/applications/misc/super_user_spark/default.nix
index 8102375479b..8102375479b 100644
--- a/pkgs/applications/misc/super_user_spark/default.nix
+++ b/nixpkgs/pkgs/applications/misc/super_user_spark/default.nix
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix
index 76a62d1762c..76a62d1762c 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix
index 1d3f1a41e16..1d3f1a41e16 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix
diff --git a/pkgs/applications/misc/synapse/default.nix b/nixpkgs/pkgs/applications/misc/synapse/default.nix
index c12f5b17679..c12f5b17679 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/nixpkgs/pkgs/applications/misc/synapse/default.nix
diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/nixpkgs/pkgs/applications/misc/syncthing-tray/default.nix
index a07fe0c7510..a07fe0c7510 100644
--- a/pkgs/applications/misc/syncthing-tray/default.nix
+++ b/nixpkgs/pkgs/applications/misc/syncthing-tray/default.nix
diff --git a/pkgs/applications/misc/syncthing-tray/deps.nix b/nixpkgs/pkgs/applications/misc/syncthing-tray/deps.nix
index 1103146ed1b..1103146ed1b 100644
--- a/pkgs/applications/misc/syncthing-tray/deps.nix
+++ b/nixpkgs/pkgs/applications/misc/syncthing-tray/deps.nix
diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix
index 907a2e046df..907a2e046df 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix
diff --git a/pkgs/applications/misc/synergy/default.nix b/nixpkgs/pkgs/applications/misc/synergy/default.nix
index 377d83e5962..377d83e5962 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/nixpkgs/pkgs/applications/misc/synergy/default.nix
diff --git a/pkgs/applications/misc/synergy/openssl-1.1.patch b/nixpkgs/pkgs/applications/misc/synergy/openssl-1.1.patch
index 56dc6112844..56dc6112844 100644
--- a/pkgs/applications/misc/synergy/openssl-1.1.patch
+++ b/nixpkgs/pkgs/applications/misc/synergy/openssl-1.1.patch
diff --git a/pkgs/applications/misc/synergy/respect_macos_arch.patch b/nixpkgs/pkgs/applications/misc/synergy/respect_macos_arch.patch
index 003d7d22421..003d7d22421 100644
--- a/pkgs/applications/misc/synergy/respect_macos_arch.patch
+++ b/nixpkgs/pkgs/applications/misc/synergy/respect_macos_arch.patch
diff --git a/pkgs/applications/misc/synergy/update_gtest_gmock.patch b/nixpkgs/pkgs/applications/misc/synergy/update_gtest_gmock.patch
index 87b53e78585..87b53e78585 100644
--- a/pkgs/applications/misc/synergy/update_gtest_gmock.patch
+++ b/nixpkgs/pkgs/applications/misc/synergy/update_gtest_gmock.patch
diff --git a/pkgs/applications/misc/tabula/default.nix b/nixpkgs/pkgs/applications/misc/tabula/default.nix
index fbb1832735b..fbb1832735b 100644
--- a/pkgs/applications/misc/tabula/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tabula/default.nix
diff --git a/pkgs/applications/misc/taizen/default.nix b/nixpkgs/pkgs/applications/misc/taizen/default.nix
index 8d58c888748..8d58c888748 100644
--- a/pkgs/applications/misc/taizen/default.nix
+++ b/nixpkgs/pkgs/applications/misc/taizen/default.nix
diff --git a/pkgs/applications/misc/taskell/default.nix b/nixpkgs/pkgs/applications/misc/taskell/default.nix
index 488e49c2181..488e49c2181 100644
--- a/pkgs/applications/misc/taskell/default.nix
+++ b/nixpkgs/pkgs/applications/misc/taskell/default.nix
diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/default.nix
index a0dc7b7c71e..a0dc7b7c71e 100644
--- a/pkgs/applications/misc/taskjuggler/2.x/default.nix
+++ b/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/default.nix
diff --git a/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch b/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
index f599e8a1730..f599e8a1730 100644
--- a/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
+++ b/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile b/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/Gemfile
index 77cbaeeed79..77cbaeeed79 100644
--- a/pkgs/applications/misc/taskjuggler/3.x/Gemfile
+++ b/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/Gemfile
diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
index d1642e76fa6..d1642e76fa6 100644
--- a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/default.nix
index 23252d0c480..23252d0c480 100644
--- a/pkgs/applications/misc/taskjuggler/3.x/default.nix
+++ b/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/default.nix
diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
index deeeac10694..deeeac10694 100644
--- a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
+++ b/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
diff --git a/pkgs/applications/misc/taskjuggler/Gemfile b/nixpkgs/pkgs/applications/misc/taskjuggler/Gemfile
index ab9f5a35464..ab9f5a35464 100644
--- a/pkgs/applications/misc/taskjuggler/Gemfile
+++ b/nixpkgs/pkgs/applications/misc/taskjuggler/Gemfile
diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/nixpkgs/pkgs/applications/misc/taskjuggler/Gemfile.lock
index dcc46e370e7..dcc46e370e7 100644
--- a/pkgs/applications/misc/taskjuggler/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/misc/taskjuggler/Gemfile.lock
diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/nixpkgs/pkgs/applications/misc/taskjuggler/default.nix
index 838cc199a6c..838cc199a6c 100644
--- a/pkgs/applications/misc/taskjuggler/default.nix
+++ b/nixpkgs/pkgs/applications/misc/taskjuggler/default.nix
diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/nixpkgs/pkgs/applications/misc/taskjuggler/gemset.nix
index fcf607de815..fcf607de815 100644
--- a/pkgs/applications/misc/taskjuggler/gemset.nix
+++ b/nixpkgs/pkgs/applications/misc/taskjuggler/gemset.nix
diff --git a/pkgs/applications/misc/tasknc/default.nix b/nixpkgs/pkgs/applications/misc/tasknc/default.nix
index 0450cb40a55..0450cb40a55 100644
--- a/pkgs/applications/misc/tasknc/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tasknc/default.nix
diff --git a/pkgs/applications/misc/taskopen/default.nix b/nixpkgs/pkgs/applications/misc/taskopen/default.nix
index 847092356d2..847092356d2 100644
--- a/pkgs/applications/misc/taskopen/default.nix
+++ b/nixpkgs/pkgs/applications/misc/taskopen/default.nix
diff --git a/pkgs/applications/misc/tasksh/default.nix b/nixpkgs/pkgs/applications/misc/tasksh/default.nix
index 931a27fbeff..931a27fbeff 100644
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tasksh/default.nix
diff --git a/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch b/nixpkgs/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch
index 8e5c0139e55..8e5c0139e55 100644
--- a/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch
+++ b/nixpkgs/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix
index ba919fbc626..ba919fbc626 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix
diff --git a/pkgs/applications/misc/tdrop/default.nix b/nixpkgs/pkgs/applications/misc/tdrop/default.nix
index 547eea4f2d2..547eea4f2d2 100644
--- a/pkgs/applications/misc/tdrop/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tdrop/default.nix
diff --git a/pkgs/applications/misc/teleprompter/default.nix b/nixpkgs/pkgs/applications/misc/teleprompter/default.nix
index 7cca3afa764..7cca3afa764 100644
--- a/pkgs/applications/misc/teleprompter/default.nix
+++ b/nixpkgs/pkgs/applications/misc/teleprompter/default.nix
diff --git a/pkgs/applications/misc/termdown/default.nix b/nixpkgs/pkgs/applications/misc/termdown/default.nix
index 94eacb1fe06..94eacb1fe06 100644
--- a/pkgs/applications/misc/termdown/default.nix
+++ b/nixpkgs/pkgs/applications/misc/termdown/default.nix
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix
index 00300e65abb..00300e65abb 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix
diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix
index ba898932f06..ba898932f06 100644
--- a/pkgs/applications/misc/terminal-parrot/default.nix
+++ b/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix
diff --git a/pkgs/applications/misc/terminator/default.nix b/nixpkgs/pkgs/applications/misc/terminator/default.nix
index d09c98b6709..d09c98b6709 100644
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/nixpkgs/pkgs/applications/misc/terminator/default.nix
diff --git a/pkgs/applications/misc/terminus/default.nix b/nixpkgs/pkgs/applications/misc/terminus/default.nix
index fce46d120de..fce46d120de 100644
--- a/pkgs/applications/misc/terminus/default.nix
+++ b/nixpkgs/pkgs/applications/misc/terminus/default.nix
diff --git a/pkgs/applications/misc/termite/add_errno_header.patch b/nixpkgs/pkgs/applications/misc/termite/add_errno_header.patch
index 81283f86a21..81283f86a21 100644
--- a/pkgs/applications/misc/termite/add_errno_header.patch
+++ b/nixpkgs/pkgs/applications/misc/termite/add_errno_header.patch
diff --git a/pkgs/applications/misc/termite/default.nix b/nixpkgs/pkgs/applications/misc/termite/default.nix
index 2a610edde03..2a610edde03 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/nixpkgs/pkgs/applications/misc/termite/default.nix
diff --git a/pkgs/applications/misc/termite/remove_ldflags_macos.patch b/nixpkgs/pkgs/applications/misc/termite/remove_ldflags_macos.patch
index f8c68518bb4..f8c68518bb4 100644
--- a/pkgs/applications/misc/termite/remove_ldflags_macos.patch
+++ b/nixpkgs/pkgs/applications/misc/termite/remove_ldflags_macos.patch
diff --git a/pkgs/applications/misc/termite/url_regexp_trailing.patch b/nixpkgs/pkgs/applications/misc/termite/url_regexp_trailing.patch
index 96deaa073d7..96deaa073d7 100644
--- a/pkgs/applications/misc/termite/url_regexp_trailing.patch
+++ b/nixpkgs/pkgs/applications/misc/termite/url_regexp_trailing.patch
diff --git a/pkgs/applications/misc/termite/wrapper.nix b/nixpkgs/pkgs/applications/misc/termite/wrapper.nix
index 379223d9076..379223d9076 100644
--- a/pkgs/applications/misc/termite/wrapper.nix
+++ b/nixpkgs/pkgs/applications/misc/termite/wrapper.nix
diff --git a/pkgs/applications/misc/termonad/default.nix b/nixpkgs/pkgs/applications/misc/termonad/default.nix
index 4388cbcfb44..4388cbcfb44 100644
--- a/pkgs/applications/misc/termonad/default.nix
+++ b/nixpkgs/pkgs/applications/misc/termonad/default.nix
diff --git a/pkgs/applications/misc/teseq/default.nix b/nixpkgs/pkgs/applications/misc/teseq/default.nix
index b1764591982..b1764591982 100644
--- a/pkgs/applications/misc/teseq/default.nix
+++ b/nixpkgs/pkgs/applications/misc/teseq/default.nix
diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix
index c057fde95d7..c057fde95d7 100644
--- a/pkgs/applications/misc/thinking-rock/default.nix
+++ b/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix
diff --git a/pkgs/applications/misc/tilda/default.nix b/nixpkgs/pkgs/applications/misc/tilda/default.nix
index 39f54156fef..39f54156fef 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tilda/default.nix
diff --git a/pkgs/applications/misc/tilix/default.nix b/nixpkgs/pkgs/applications/misc/tilix/default.nix
index 2fa193fc8e7..2fa193fc8e7 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tilix/default.nix
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/nixpkgs/pkgs/applications/misc/timewarrior/default.nix
index a8b86e71cb1..a8b86e71cb1 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/nixpkgs/pkgs/applications/misc/timewarrior/default.nix
diff --git a/pkgs/applications/misc/tint2/default.nix b/nixpkgs/pkgs/applications/misc/tint2/default.nix
index c85feff4360..c85feff4360 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tint2/default.nix
diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix
index 8d84ab59d47..8d84ab59d47 100644
--- a/pkgs/applications/misc/tippecanoe/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix
diff --git a/pkgs/applications/misc/tmatrix/default.nix b/nixpkgs/pkgs/applications/misc/tmatrix/default.nix
index c03918c4875..c03918c4875 100644
--- a/pkgs/applications/misc/tmatrix/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tmatrix/default.nix
diff --git a/pkgs/applications/misc/tnef/default.nix b/nixpkgs/pkgs/applications/misc/tnef/default.nix
index bbd3073a4d8..bbd3073a4d8 100644
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tnef/default.nix
diff --git a/pkgs/applications/misc/todiff/default.nix b/nixpkgs/pkgs/applications/misc/todiff/default.nix
index 93f233a4f92..93f233a4f92 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/nixpkgs/pkgs/applications/misc/todiff/default.nix
diff --git a/pkgs/applications/misc/todoist/default.nix b/nixpkgs/pkgs/applications/misc/todoist/default.nix
index 74b2b770215..74b2b770215 100644
--- a/pkgs/applications/misc/todoist/default.nix
+++ b/nixpkgs/pkgs/applications/misc/todoist/default.nix
diff --git a/pkgs/applications/misc/todolist/default.nix b/nixpkgs/pkgs/applications/misc/todolist/default.nix
index 669c06a9480..669c06a9480 100644
--- a/pkgs/applications/misc/todolist/default.nix
+++ b/nixpkgs/pkgs/applications/misc/todolist/default.nix
diff --git a/pkgs/applications/misc/toggldesktop/TogglDesktop.pro b/nixpkgs/pkgs/applications/misc/toggldesktop/TogglDesktop.pro
index e86156313d1..e86156313d1 100644
--- a/pkgs/applications/misc/toggldesktop/TogglDesktop.pro
+++ b/nixpkgs/pkgs/applications/misc/toggldesktop/TogglDesktop.pro
diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix
index bf22cb0181d..bf22cb0181d 100644
--- a/pkgs/applications/misc/toggldesktop/default.nix
+++ b/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix
diff --git a/pkgs/applications/misc/toggldesktop/libtoggl.pro b/nixpkgs/pkgs/applications/misc/toggldesktop/libtoggl.pro
index c8303440fe6..c8303440fe6 100644
--- a/pkgs/applications/misc/toggldesktop/libtoggl.pro
+++ b/nixpkgs/pkgs/applications/misc/toggldesktop/libtoggl.pro
diff --git a/pkgs/applications/misc/tomboy/default.nix b/nixpkgs/pkgs/applications/misc/tomboy/default.nix
index d8a6f86f104..d8a6f86f104 100644
--- a/pkgs/applications/misc/tomboy/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tomboy/default.nix
diff --git a/pkgs/applications/misc/toot/default.nix b/nixpkgs/pkgs/applications/misc/toot/default.nix
index bfae97027c4..bfae97027c4 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/nixpkgs/pkgs/applications/misc/toot/default.nix
diff --git a/pkgs/applications/misc/tootle/default.nix b/nixpkgs/pkgs/applications/misc/tootle/default.nix
index e619ab053e7..e619ab053e7 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tootle/default.nix
diff --git a/pkgs/applications/misc/topydo/default.nix b/nixpkgs/pkgs/applications/misc/topydo/default.nix
index eb3894c7b47..eb3894c7b47 100644
--- a/pkgs/applications/misc/topydo/default.nix
+++ b/nixpkgs/pkgs/applications/misc/topydo/default.nix
diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix
index b955711d003..b955711d003 100644
--- a/pkgs/applications/misc/tpmmanager/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix
diff --git a/pkgs/applications/misc/translate-shell/default.nix b/nixpkgs/pkgs/applications/misc/translate-shell/default.nix
index a2f6980abd9..a2f6980abd9 100644
--- a/pkgs/applications/misc/translate-shell/default.nix
+++ b/nixpkgs/pkgs/applications/misc/translate-shell/default.nix
diff --git a/pkgs/applications/misc/tthsum/default.nix b/nixpkgs/pkgs/applications/misc/tthsum/default.nix
index 76ac3f75b26..76ac3f75b26 100644
--- a/pkgs/applications/misc/tthsum/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tthsum/default.nix
diff --git a/pkgs/applications/misc/tuir/default.nix b/nixpkgs/pkgs/applications/misc/tuir/default.nix
index e479dc26f17..e479dc26f17 100644
--- a/pkgs/applications/misc/tuir/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tuir/default.nix
diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/nixpkgs/pkgs/applications/misc/tvbrowser/bin.nix
index 38865ca4f3d..38865ca4f3d 100644
--- a/pkgs/applications/misc/tvbrowser/bin.nix
+++ b/nixpkgs/pkgs/applications/misc/tvbrowser/bin.nix
diff --git a/pkgs/applications/misc/twmn/default.nix b/nixpkgs/pkgs/applications/misc/twmn/default.nix
index cd58219721c..cd58219721c 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/nixpkgs/pkgs/applications/misc/twmn/default.nix
diff --git a/pkgs/applications/misc/tzupdate/default.nix b/nixpkgs/pkgs/applications/misc/tzupdate/default.nix
index 5c2b1312faf..5c2b1312faf 100644
--- a/pkgs/applications/misc/tzupdate/default.nix
+++ b/nixpkgs/pkgs/applications/misc/tzupdate/default.nix
diff --git a/pkgs/applications/misc/udevil/default.nix b/nixpkgs/pkgs/applications/misc/udevil/default.nix
index 3cc4fcc1517..3cc4fcc1517 100644
--- a/pkgs/applications/misc/udevil/default.nix
+++ b/nixpkgs/pkgs/applications/misc/udevil/default.nix
diff --git a/pkgs/applications/misc/udevil/device-info-sys-stat.patch b/nixpkgs/pkgs/applications/misc/udevil/device-info-sys-stat.patch
index 554682108e3..554682108e3 100644
--- a/pkgs/applications/misc/udevil/device-info-sys-stat.patch
+++ b/nixpkgs/pkgs/applications/misc/udevil/device-info-sys-stat.patch
diff --git a/pkgs/applications/misc/udiskie/default.nix b/nixpkgs/pkgs/applications/misc/udiskie/default.nix
index 63892439fa0..63892439fa0 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/nixpkgs/pkgs/applications/misc/udiskie/default.nix
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix
index 9fa284aba43..9fa284aba43 100644
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix
diff --git a/pkgs/applications/misc/ulauncher/fix-path.patch b/nixpkgs/pkgs/applications/misc/ulauncher/fix-path.patch
index 2936df65194..2936df65194 100644
--- a/pkgs/applications/misc/ulauncher/fix-path.patch
+++ b/nixpkgs/pkgs/applications/misc/ulauncher/fix-path.patch
diff --git a/pkgs/applications/misc/urlscan/default.nix b/nixpkgs/pkgs/applications/misc/urlscan/default.nix
index 791075e4dd9..791075e4dd9 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/nixpkgs/pkgs/applications/misc/urlscan/default.nix
diff --git a/pkgs/applications/misc/urlview/default.nix b/nixpkgs/pkgs/applications/misc/urlview/default.nix
index ad29c8f94d8..ad29c8f94d8 100644
--- a/pkgs/applications/misc/urlview/default.nix
+++ b/nixpkgs/pkgs/applications/misc/urlview/default.nix
diff --git a/pkgs/applications/misc/usync/default.nix b/nixpkgs/pkgs/applications/misc/usync/default.nix
index 344c07d845b..344c07d845b 100644
--- a/pkgs/applications/misc/usync/default.nix
+++ b/nixpkgs/pkgs/applications/misc/usync/default.nix
diff --git a/pkgs/applications/misc/valentina/default.nix b/nixpkgs/pkgs/applications/misc/valentina/default.nix
index 5a12465c4c4..5a12465c4c4 100644
--- a/pkgs/applications/misc/valentina/default.nix
+++ b/nixpkgs/pkgs/applications/misc/valentina/default.nix
diff --git a/pkgs/applications/misc/variety/default.nix b/nixpkgs/pkgs/applications/misc/variety/default.nix
index 6d8da4a1007..6d8da4a1007 100644
--- a/pkgs/applications/misc/variety/default.nix
+++ b/nixpkgs/pkgs/applications/misc/variety/default.nix
diff --git a/pkgs/applications/misc/vcal/default.nix b/nixpkgs/pkgs/applications/misc/vcal/default.nix
index b25e7f76cef..b25e7f76cef 100644
--- a/pkgs/applications/misc/vcal/default.nix
+++ b/nixpkgs/pkgs/applications/misc/vcal/default.nix
diff --git a/pkgs/applications/misc/veracrypt/default.nix b/nixpkgs/pkgs/applications/misc/veracrypt/default.nix
index fe1de349cff..fe1de349cff 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/nixpkgs/pkgs/applications/misc/veracrypt/default.nix
diff --git a/pkgs/applications/misc/verbiste/default.nix b/nixpkgs/pkgs/applications/misc/verbiste/default.nix
index 680573fd304..680573fd304 100644
--- a/pkgs/applications/misc/verbiste/default.nix
+++ b/nixpkgs/pkgs/applications/misc/verbiste/default.nix
diff --git a/pkgs/applications/misc/vifm/default.nix b/nixpkgs/pkgs/applications/misc/vifm/default.nix
index f71e7a7a960..f71e7a7a960 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/vifm/default.nix
diff --git a/pkgs/applications/misc/viking/default.nix b/nixpkgs/pkgs/applications/misc/viking/default.nix
index c5ba35d9747..c5ba35d9747 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/nixpkgs/pkgs/applications/misc/viking/default.nix
diff --git a/pkgs/applications/misc/visidata/default.nix b/nixpkgs/pkgs/applications/misc/visidata/default.nix
index 64645e00bd8..64645e00bd8 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/nixpkgs/pkgs/applications/misc/visidata/default.nix
diff --git a/pkgs/applications/misc/vit/default.nix b/nixpkgs/pkgs/applications/misc/vit/default.nix
index cb71ec1524b..cb71ec1524b 100644
--- a/pkgs/applications/misc/vit/default.nix
+++ b/nixpkgs/pkgs/applications/misc/vit/default.nix
diff --git a/pkgs/applications/misc/volnoti/default.nix b/nixpkgs/pkgs/applications/misc/volnoti/default.nix
index 3561135ce61..3561135ce61 100644
--- a/pkgs/applications/misc/volnoti/default.nix
+++ b/nixpkgs/pkgs/applications/misc/volnoti/default.nix
diff --git a/pkgs/applications/misc/vp/default.nix b/nixpkgs/pkgs/applications/misc/vp/default.nix
index a59a25a144e..a59a25a144e 100644
--- a/pkgs/applications/misc/vp/default.nix
+++ b/nixpkgs/pkgs/applications/misc/vp/default.nix
diff --git a/pkgs/applications/misc/vue/default.nix b/nixpkgs/pkgs/applications/misc/vue/default.nix
index d6404ca6596..d6404ca6596 100644
--- a/pkgs/applications/misc/vue/default.nix
+++ b/nixpkgs/pkgs/applications/misc/vue/default.nix
diff --git a/pkgs/applications/misc/vym/default.nix b/nixpkgs/pkgs/applications/misc/vym/default.nix
index 3c6c4a87f98..3c6c4a87f98 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/nixpkgs/pkgs/applications/misc/vym/default.nix
diff --git a/pkgs/applications/misc/waybar/default.nix b/nixpkgs/pkgs/applications/misc/waybar/default.nix
index 212013fb655..212013fb655 100644
--- a/pkgs/applications/misc/waybar/default.nix
+++ b/nixpkgs/pkgs/applications/misc/waybar/default.nix
diff --git a/pkgs/applications/misc/wcalc/default.nix b/nixpkgs/pkgs/applications/misc/wcalc/default.nix
index ff770f516bc..ff770f516bc 100644
--- a/pkgs/applications/misc/wcalc/default.nix
+++ b/nixpkgs/pkgs/applications/misc/wcalc/default.nix
diff --git a/pkgs/applications/misc/weather/default.nix b/nixpkgs/pkgs/applications/misc/weather/default.nix
index 2748d576c69..2748d576c69 100644
--- a/pkgs/applications/misc/weather/default.nix
+++ b/nixpkgs/pkgs/applications/misc/weather/default.nix
diff --git a/pkgs/applications/misc/web-media-controller/default.nix b/nixpkgs/pkgs/applications/misc/web-media-controller/default.nix
index b2a3394f8ae..b2a3394f8ae 100644
--- a/pkgs/applications/misc/web-media-controller/default.nix
+++ b/nixpkgs/pkgs/applications/misc/web-media-controller/default.nix
diff --git a/pkgs/applications/misc/wego/default.nix b/nixpkgs/pkgs/applications/misc/wego/default.nix
index 567d299fd3a..567d299fd3a 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/nixpkgs/pkgs/applications/misc/wego/default.nix
diff --git a/pkgs/applications/misc/wego/deps.nix b/nixpkgs/pkgs/applications/misc/wego/deps.nix
index 74ab69a30e1..74ab69a30e1 100644
--- a/pkgs/applications/misc/wego/deps.nix
+++ b/nixpkgs/pkgs/applications/misc/wego/deps.nix
diff --git a/pkgs/applications/misc/wikicurses/default.nix b/nixpkgs/pkgs/applications/misc/wikicurses/default.nix
index d38383c30ec..d38383c30ec 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/nixpkgs/pkgs/applications/misc/wikicurses/default.nix
diff --git a/pkgs/applications/misc/with-shell/default.nix b/nixpkgs/pkgs/applications/misc/with-shell/default.nix
index 6a5f7c17b20..6a5f7c17b20 100644
--- a/pkgs/applications/misc/with-shell/default.nix
+++ b/nixpkgs/pkgs/applications/misc/with-shell/default.nix
diff --git a/pkgs/applications/misc/wmname/default.nix b/nixpkgs/pkgs/applications/misc/wmname/default.nix
index 68f6c4df159..68f6c4df159 100644
--- a/pkgs/applications/misc/wmname/default.nix
+++ b/nixpkgs/pkgs/applications/misc/wmname/default.nix
diff --git a/pkgs/applications/misc/wofi/default.nix b/nixpkgs/pkgs/applications/misc/wofi/default.nix
index 289c60b4402..289c60b4402 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/nixpkgs/pkgs/applications/misc/wofi/default.nix
diff --git a/pkgs/applications/misc/wordnet/default.nix b/nixpkgs/pkgs/applications/misc/wordnet/default.nix
index 5a1093b4779..5a1093b4779 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/nixpkgs/pkgs/applications/misc/wordnet/default.nix
diff --git a/pkgs/applications/misc/worker/default.nix b/nixpkgs/pkgs/applications/misc/worker/default.nix
index d4b34e2bb7f..d4b34e2bb7f 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/nixpkgs/pkgs/applications/misc/worker/default.nix
diff --git a/pkgs/applications/misc/workrave/default.nix b/nixpkgs/pkgs/applications/misc/workrave/default.nix
index 4fc06b5c1ad..4fc06b5c1ad 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/nixpkgs/pkgs/applications/misc/workrave/default.nix
diff --git a/pkgs/applications/misc/wtf/default.nix b/nixpkgs/pkgs/applications/misc/wtf/default.nix
index 3dee9844c0c..3dee9844c0c 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/wtf/default.nix
diff --git a/pkgs/applications/misc/xastir/default.nix b/nixpkgs/pkgs/applications/misc/xastir/default.nix
index 4086c0e094a..4086c0e094a 100644
--- a/pkgs/applications/misc/xastir/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xastir/default.nix
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/nixpkgs/pkgs/applications/misc/xautoclick/default.nix
index 295d721d3c5..295d721d3c5 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xautoclick/default.nix
diff --git a/pkgs/applications/misc/xca/default.nix b/nixpkgs/pkgs/applications/misc/xca/default.nix
index 8c5a2e3d2db..8c5a2e3d2db 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xca/default.nix
diff --git a/pkgs/applications/misc/xchm/default.nix b/nixpkgs/pkgs/applications/misc/xchm/default.nix
index fb1b59ed01f..fb1b59ed01f 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xchm/default.nix
diff --git a/pkgs/applications/misc/xcruiser/default.nix b/nixpkgs/pkgs/applications/misc/xcruiser/default.nix
index 8875c95fe57..8875c95fe57 100644
--- a/pkgs/applications/misc/xcruiser/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xcruiser/default.nix
diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix
index 56168b34859..56168b34859 100644
--- a/pkgs/applications/misc/xdgmenumaker/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix
diff --git a/pkgs/applications/misc/xfe/default.nix b/nixpkgs/pkgs/applications/misc/xfe/default.nix
index 444ab802673..444ab802673 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xfe/default.nix
diff --git a/pkgs/applications/misc/xfontsel/default.nix b/nixpkgs/pkgs/applications/misc/xfontsel/default.nix
index 5d2b70a80ee..5d2b70a80ee 100644
--- a/pkgs/applications/misc/xfontsel/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xfontsel/default.nix
diff --git a/pkgs/applications/misc/xiphos/default.nix b/nixpkgs/pkgs/applications/misc/xiphos/default.nix
index 2e81e9b05d3..2e81e9b05d3 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xiphos/default.nix
diff --git a/pkgs/applications/misc/xkbd/default.nix b/nixpkgs/pkgs/applications/misc/xkbd/default.nix
index d6709ecc1a6..d6709ecc1a6 100644
--- a/pkgs/applications/misc/xkbd/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xkbd/default.nix
diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/nixpkgs/pkgs/applications/misc/xkblayout-state/default.nix
index abc808477a3..abc808477a3 100644
--- a/pkgs/applications/misc/xkblayout-state/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xkblayout-state/default.nix
diff --git a/pkgs/applications/misc/xkbmon/default.nix b/nixpkgs/pkgs/applications/misc/xkbmon/default.nix
index dc618e4561e..dc618e4561e 100644
--- a/pkgs/applications/misc/xkbmon/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xkbmon/default.nix
diff --git a/pkgs/applications/misc/xmind/default.nix b/nixpkgs/pkgs/applications/misc/xmind/default.nix
index f65f5bc26e8..f65f5bc26e8 100644
--- a/pkgs/applications/misc/xmind/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xmind/default.nix
diff --git a/pkgs/applications/misc/xmind/java-env-config-fixes.patch b/nixpkgs/pkgs/applications/misc/xmind/java-env-config-fixes.patch
index f359a9c2ba4..f359a9c2ba4 100644
--- a/pkgs/applications/misc/xmind/java-env-config-fixes.patch
+++ b/nixpkgs/pkgs/applications/misc/xmind/java-env-config-fixes.patch
diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix
index b6f05ea3094..b6f05ea3094 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix
diff --git a/pkgs/applications/misc/xmrig/default.nix b/nixpkgs/pkgs/applications/misc/xmrig/default.nix
index 2f4c7828134..2f4c7828134 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xmrig/default.nix
diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix
index fc3070d1dcb..fc3070d1dcb 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix
diff --git a/pkgs/applications/misc/xneur/default.nix b/nixpkgs/pkgs/applications/misc/xneur/default.nix
index f3bbbf42d5b..f3bbbf42d5b 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xneur/default.nix
diff --git a/pkgs/applications/misc/xpad/default.nix b/nixpkgs/pkgs/applications/misc/xpad/default.nix
index 40f7ef9da08..40f7ef9da08 100644
--- a/pkgs/applications/misc/xpad/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xpad/default.nix
diff --git a/pkgs/applications/misc/xpdf/cmake_version.patch b/nixpkgs/pkgs/applications/misc/xpdf/cmake_version.patch
index 59a51f7506d..59a51f7506d 100644
--- a/pkgs/applications/misc/xpdf/cmake_version.patch
+++ b/nixpkgs/pkgs/applications/misc/xpdf/cmake_version.patch
diff --git a/pkgs/applications/misc/xpdf/default.nix b/nixpkgs/pkgs/applications/misc/xpdf/default.nix
index f5ec9b71503..f5ec9b71503 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xpdf/default.nix
diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix
index cf6f5f32ee2..cf6f5f32ee2 100644
--- a/pkgs/applications/misc/xpdf/libxpdf.nix
+++ b/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix
diff --git a/pkgs/applications/misc/xpdf/libxpdf.patch b/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.patch
index 606da76c729..606da76c729 100644
--- a/pkgs/applications/misc/xpdf/libxpdf.patch
+++ b/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.patch
diff --git a/pkgs/applications/misc/xpdf/xpdf-3.02-protection.patch b/nixpkgs/pkgs/applications/misc/xpdf/xpdf-3.02-protection.patch
index 598fc6dbd07..598fc6dbd07 100644
--- a/pkgs/applications/misc/xpdf/xpdf-3.02-protection.patch
+++ b/nixpkgs/pkgs/applications/misc/xpdf/xpdf-3.02-protection.patch
diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/nixpkgs/pkgs/applications/misc/xrandr-invert-colors/default.nix
index 41071012ae9..41071012ae9 100644
--- a/pkgs/applications/misc/xrandr-invert-colors/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xrandr-invert-colors/default.nix
diff --git a/pkgs/applications/misc/xrq/default.nix b/nixpkgs/pkgs/applications/misc/xrq/default.nix
index 244a2c43a15..244a2c43a15 100644
--- a/pkgs/applications/misc/xrq/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xrq/default.nix
diff --git a/pkgs/applications/misc/xscope/default.nix b/nixpkgs/pkgs/applications/misc/xscope/default.nix
index 517105d7e1f..517105d7e1f 100644
--- a/pkgs/applications/misc/xscope/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xscope/default.nix
diff --git a/pkgs/applications/misc/xsuspender/default.nix b/nixpkgs/pkgs/applications/misc/xsuspender/default.nix
index 55ecd358c6c..55ecd358c6c 100644
--- a/pkgs/applications/misc/xsuspender/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xsuspender/default.nix
diff --git a/pkgs/applications/misc/xsw/default.nix b/nixpkgs/pkgs/applications/misc/xsw/default.nix
index c7c10254c0c..c7c10254c0c 100644
--- a/pkgs/applications/misc/xsw/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xsw/default.nix
diff --git a/pkgs/applications/misc/xsw/parse.patch b/nixpkgs/pkgs/applications/misc/xsw/parse.patch
index 6db6c14c26a..6db6c14c26a 100644
--- a/pkgs/applications/misc/xsw/parse.patch
+++ b/nixpkgs/pkgs/applications/misc/xsw/parse.patch
diff --git a/pkgs/applications/misc/xteddy/default.nix b/nixpkgs/pkgs/applications/misc/xteddy/default.nix
index 856ddb8ff50..856ddb8ff50 100644
--- a/pkgs/applications/misc/xteddy/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xteddy/default.nix
diff --git a/pkgs/applications/misc/xterm/default.nix b/nixpkgs/pkgs/applications/misc/xterm/default.nix
index 8dcd533b522..8dcd533b522 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xterm/default.nix
diff --git a/pkgs/applications/misc/xterm/sixel-256.support.patch b/nixpkgs/pkgs/applications/misc/xterm/sixel-256.support.patch
index 480e67e89ca..480e67e89ca 100644
--- a/pkgs/applications/misc/xterm/sixel-256.support.patch
+++ b/nixpkgs/pkgs/applications/misc/xterm/sixel-256.support.patch
diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix
index 51575d62ed5..51575d62ed5 100644
--- a/pkgs/applications/misc/xtermcontrol/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix
diff --git a/pkgs/applications/misc/xxkb/default.nix b/nixpkgs/pkgs/applications/misc/xxkb/default.nix
index 612e4a557a7..612e4a557a7 100644
--- a/pkgs/applications/misc/xxkb/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xxkb/default.nix
diff --git a/pkgs/applications/misc/xygrib/default.nix b/nixpkgs/pkgs/applications/misc/xygrib/default.nix
index c7f449d97cd..c7f449d97cd 100644
--- a/pkgs/applications/misc/xygrib/default.nix
+++ b/nixpkgs/pkgs/applications/misc/xygrib/default.nix
diff --git a/pkgs/applications/misc/yaft/default.nix b/nixpkgs/pkgs/applications/misc/yaft/default.nix
index 2135c7fd617..2135c7fd617 100644
--- a/pkgs/applications/misc/yaft/default.nix
+++ b/nixpkgs/pkgs/applications/misc/yaft/default.nix
diff --git a/pkgs/applications/misc/yarssr/default.nix b/nixpkgs/pkgs/applications/misc/yarssr/default.nix
index f2da2957bd3..f2da2957bd3 100644
--- a/pkgs/applications/misc/yarssr/default.nix
+++ b/nixpkgs/pkgs/applications/misc/yarssr/default.nix
diff --git a/pkgs/applications/misc/yate/default.nix b/nixpkgs/pkgs/applications/misc/yate/default.nix
index 09a6cc4a3c0..09a6cc4a3c0 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/nixpkgs/pkgs/applications/misc/yate/default.nix
diff --git a/pkgs/applications/misc/yokadi/default.nix b/nixpkgs/pkgs/applications/misc/yokadi/default.nix
index 6b3a4f747f4..6b3a4f747f4 100644
--- a/pkgs/applications/misc/yokadi/default.nix
+++ b/nixpkgs/pkgs/applications/misc/yokadi/default.nix
diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix
index d7a019c1c41..d7a019c1c41 100644
--- a/pkgs/applications/misc/yubioath-desktop/default.nix
+++ b/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix
diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix
index 7c2c8fb31ca..7c2c8fb31ca 100644
--- a/pkgs/applications/misc/zathura/cb/default.nix
+++ b/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/nixpkgs/pkgs/applications/misc/zathura/core/default.nix
index 99729125b63..99729125b63 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/nixpkgs/pkgs/applications/misc/zathura/core/default.nix
diff --git a/pkgs/applications/misc/zathura/default.nix b/nixpkgs/pkgs/applications/misc/zathura/default.nix
index 1548b0581b6..1548b0581b6 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/nixpkgs/pkgs/applications/misc/zathura/default.nix
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix
index 54f68969d4f..54f68969d4f 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index d8c1364d395..d8c1364d395 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 5b38555eda1..5b38555eda1 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix
diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix
index 48d42b5e939..48d42b5e939 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix
diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix
index 6c8ad97d355..6c8ad97d355 100644
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix
diff --git a/pkgs/applications/misc/zk-shell/default.nix b/nixpkgs/pkgs/applications/misc/zk-shell/default.nix
index ec8deadf9f5..ec8deadf9f5 100644
--- a/pkgs/applications/misc/zk-shell/default.nix
+++ b/nixpkgs/pkgs/applications/misc/zk-shell/default.nix
diff --git a/pkgs/applications/misc/zola/cargo-lock.patch b/nixpkgs/pkgs/applications/misc/zola/cargo-lock.patch
index b9d97e3c328..b9d97e3c328 100644
--- a/pkgs/applications/misc/zola/cargo-lock.patch
+++ b/nixpkgs/pkgs/applications/misc/zola/cargo-lock.patch
diff --git a/pkgs/applications/misc/zola/default.nix b/nixpkgs/pkgs/applications/misc/zola/default.nix
index 178be491169..178be491169 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/nixpkgs/pkgs/applications/misc/zola/default.nix
diff --git a/pkgs/applications/misc/zscroll/default.nix b/nixpkgs/pkgs/applications/misc/zscroll/default.nix
index 18876cf355b..18876cf355b 100644
--- a/pkgs/applications/misc/zscroll/default.nix
+++ b/nixpkgs/pkgs/applications/misc/zscroll/default.nix
diff --git a/pkgs/applications/networking/3proxy/default.nix b/nixpkgs/pkgs/applications/networking/3proxy/default.nix
index a1e54b50228..a1e54b50228 100644
--- a/pkgs/applications/networking/3proxy/default.nix
+++ b/nixpkgs/pkgs/applications/networking/3proxy/default.nix
diff --git a/pkgs/applications/networking/Sylk/default.nix b/nixpkgs/pkgs/applications/networking/Sylk/default.nix
index d99a87954de..d99a87954de 100644
--- a/pkgs/applications/networking/Sylk/default.nix
+++ b/nixpkgs/pkgs/applications/networking/Sylk/default.nix
diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix
index 0c8136724ff..0c8136724ff 100644
--- a/pkgs/applications/networking/apache-directory-studio/default.nix
+++ b/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix
diff --git a/pkgs/applications/networking/brig/default.nix b/nixpkgs/pkgs/applications/networking/brig/default.nix
index 31eb4dd7378..31eb4dd7378 100644
--- a/pkgs/applications/networking/brig/default.nix
+++ b/nixpkgs/pkgs/applications/networking/brig/default.nix
diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix
index 57db827169e..57db827169e 100644
--- a/pkgs/applications/networking/browsers/arora/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
index ef0b8ec7619..ef0b8ec7619 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix
index 2b910fe0c5c..2b910fe0c5c 100644
--- a/pkgs/applications/networking/browsers/browsh/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix
diff --git a/pkgs/applications/networking/browsers/browsh/deps.nix b/nixpkgs/pkgs/applications/networking/browsers/browsh/deps.nix
index 9a6a898beb5..9a6a898beb5 100644
--- a/pkgs/applications/networking/browsers/browsh/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/browsh/deps.nix
diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/nixpkgs/pkgs/applications/networking/browsers/captive-browser/default.nix
index 88bd32da8f1..88bd32da8f1 100644
--- a/pkgs/applications/networking/browsers/captive-browser/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/captive-browser/default.nix
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
index ec69f3d233f..ec69f3d233f 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
index 31e69916196..31e69916196 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
index c3522e17379..c3522e17379 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
diff --git a/pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch
index 9f14a304eb3..9f14a304eb3 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch
diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
index da6a4c92b46..da6a4c92b46 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
diff --git a/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch
index 6b788f43d29..6b788f43d29 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch
diff --git a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch
index 07572cf7ee9..07572cf7ee9 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch
diff --git a/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch
index db9d6082756..db9d6082756 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch
diff --git a/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch
index 32f0ae2fb5e..32f0ae2fb5e 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix
index c4a09c8063d..c4a09c8063d 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix
diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix
index 6dff17c69dd..6dff17c69dd 100644
--- a/pkgs/applications/networking/browsers/chromium/update.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix
diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.sh
index ea67a62c107..ea67a62c107 100755
--- a/pkgs/applications/networking/browsers/chromium/update.sh
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.sh
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 73163c82ea7..73163c82ea7 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix
diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/nixpkgs/pkgs/applications/networking/browsers/conkeror/default.nix
index be1389c2121..be1389c2121 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/conkeror/default.nix
diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/nixpkgs/pkgs/applications/networking/browsers/dillo/default.nix
index 8d6c99d2468..8d6c99d2468 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/dillo/default.nix
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix
index da6a7bc4715..da6a7bc4715 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix
diff --git a/pkgs/applications/networking/browsers/elinks/gc-init.patch b/nixpkgs/pkgs/applications/networking/browsers/elinks/gc-init.patch
index de06f563d6e..de06f563d6e 100644
--- a/pkgs/applications/networking/browsers/elinks/gc-init.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/elinks/gc-init.patch
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix
index b9b183a03ff..b9b183a03ff 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix
diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix
index ce0617b8d3f..ce0617b8d3f 100644
--- a/pkgs/applications/networking/browsers/ephemeral/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix
diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix
index 6e21456a9a9..6e21456a9a9 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index d7d840de8d6..d7d840de8d6 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix
index c9dbe6ba4b9..c9dbe6ba4b9 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index f7a23816a20..f7a23816a20 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 0e339253ade..0e339253ade 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix
index d6593be8890..d6593be8890 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
index 740d05ba046..740d05ba046 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch
index 18d31356989..18d31356989 100644
--- a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch
diff --git a/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch
index 1c3c3294894..1c3c3294894 100644
--- a/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch
index 7d129dc78f9..7d129dc78f9 100644
--- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
index de278152f97..de278152f97 100644
--- a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
index 833b97ba86f..833b97ba86f 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/update.nix
index e12b552535d..e12b552535d 100644
--- a/pkgs/applications/networking/browsers/firefox/update.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/update.nix
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 4901d694f49..4901d694f49 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix
index 9f49925b267..9f49925b267 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix
index b09be81cc41..b09be81cc41 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix
diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix
index 0605eda7fc7..0605eda7fc7 100644
--- a/pkgs/applications/networking/browsers/luakit/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix
index 3f4f96d33ef..3f4f96d33ef 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix
index 1d1928d168b..1d1928d168b 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index e8841a0ab6f..e8841a0ab6f 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 5ecb6bfb076..5ecb6bfb076 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 353aff7e707..353aff7e707 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh
index fb36125b3a1..fb36125b3a1 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
index 101ae99d665..101ae99d665 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch
index b7d05ddd0ef..b7d05ddd0ef 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch
index 1128381238b..1128381238b 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch
index dcac4f17928..dcac4f17928 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 93f2ab2adfa..93f2ab2adfa 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
index 1e2c31d9527..1e2c31d9527 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
index fd956f62327..fd956f62327 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
index a5bfda9f26c..a5bfda9f26c 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index 10ae0eb1da6..10ae0eb1da6 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream
index 62831613a2e..62831613a2e 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream
diff --git a/pkgs/applications/networking/browsers/next/default.nix b/nixpkgs/pkgs/applications/networking/browsers/next/default.nix
index 4aabb84393f..4aabb84393f 100644
--- a/pkgs/applications/networking/browsers/next/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/next/default.nix
diff --git a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix b/nixpkgs/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix
index a71583ffbec..a71583ffbec 100644
--- a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix
index b92c3d58741..b92c3d58741 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix
diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/nixpkgs/pkgs/applications/networking/browsers/otter/default.nix
index d41f8440420..d41f8440420 100644
--- a/pkgs/applications/networking/browsers/otter/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/otter/default.nix
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix
index 76417d482b5..76417d482b5 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix
diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/nixpkgs/pkgs/applications/networking/browsers/qtchan/default.nix
index 9a4d61a50ae..9a4d61a50ae 100644
--- a/pkgs/applications/networking/browsers/qtchan/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/qtchan/default.nix
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 80945fbc2bd..80945fbc2bd 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix
diff --git a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch
index 985f916b32c..985f916b32c 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch
diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix
index 0437ab933bd..0437ab933bd 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index c925483147b..c925483147b 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
index 7356768f397..7356768f397 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix
index 0a72099e653..0a72099e653 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
index 6825d2af64f..6825d2af64f 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index 3207409a6ba..3207409a6ba 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update.sh
index 2e6c2853eb1..2e6c2853eb1 100755
--- a/pkgs/applications/networking/browsers/vivaldi/update.sh
+++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update.sh
diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix
index a21de1acad2..a21de1acad2 100644
--- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix
diff --git a/pkgs/applications/networking/browsers/w3m/RAND_egd.libressl.patch b/nixpkgs/pkgs/applications/networking/browsers/w3m/RAND_egd.libressl.patch
index 49dd417d1c3..49dd417d1c3 100644
--- a/pkgs/applications/networking/browsers/w3m/RAND_egd.libressl.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/w3m/RAND_egd.libressl.patch
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix
index 373fa43c72c..373fa43c72c 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix
diff --git a/pkgs/applications/networking/browsers/w3m/no-x11.patch b/nixpkgs/pkgs/applications/networking/browsers/w3m/no-x11.patch
index 0816c022926..0816c022926 100644
--- a/pkgs/applications/networking/browsers/w3m/no-x11.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/w3m/no-x11.patch
diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/nixpkgs/pkgs/applications/networking/browsers/webmacs/default.nix
index b86ba3c39f0..b86ba3c39f0 100644
--- a/pkgs/applications/networking/browsers/webmacs/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/webmacs/default.nix
diff --git a/pkgs/applications/networking/c14/default.nix b/nixpkgs/pkgs/applications/networking/c14/default.nix
index c000a37ff02..c000a37ff02 100644
--- a/pkgs/applications/networking/c14/default.nix
+++ b/nixpkgs/pkgs/applications/networking/c14/default.nix
diff --git a/pkgs/applications/networking/c14/deps.nix b/nixpkgs/pkgs/applications/networking/c14/deps.nix
index fe51488c706..fe51488c706 100644
--- a/pkgs/applications/networking/c14/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/c14/deps.nix
diff --git a/pkgs/applications/networking/calls/default.nix b/nixpkgs/pkgs/applications/networking/calls/default.nix
index d57775c3d8f..d57775c3d8f 100644
--- a/pkgs/applications/networking/calls/default.nix
+++ b/nixpkgs/pkgs/applications/networking/calls/default.nix
diff --git a/pkgs/applications/networking/cawbird/default.nix b/nixpkgs/pkgs/applications/networking/cawbird/default.nix
index af8b7241659..af8b7241659 100644
--- a/pkgs/applications/networking/cawbird/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cawbird/default.nix
diff --git a/pkgs/applications/networking/charles/default.nix b/nixpkgs/pkgs/applications/networking/charles/default.nix
index 4c1f7ea7749..4c1f7ea7749 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/nixpkgs/pkgs/applications/networking/charles/default.nix
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
index 6712dcd486b..6712dcd486b 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
diff --git a/pkgs/applications/networking/cloudflared/deps.nix b/nixpkgs/pkgs/applications/networking/cloudflared/deps.nix
index e5ca7be0070..e5ca7be0070 100644
--- a/pkgs/applications/networking/cloudflared/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cloudflared/deps.nix
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
index 9295e90794d..9295e90794d 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
diff --git a/pkgs/applications/networking/cluster/argo/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/argo/deps.nix
index b275cd21cf4..b275cd21cf4 100644
--- a/pkgs/applications/networking/cluster/argo/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/argo/deps.nix
diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix
index 67e91870f1a..67e91870f1a 100644
--- a/pkgs/applications/networking/cluster/atlantis/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix
diff --git a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix b/nixpkgs/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
index aac0dd10e15..aac0dd10e15 100644
--- a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/nixpkgs/pkgs/applications/networking/cluster/chronos/default.nix
index 78be19cd81e..78be19cd81e 100644
--- a/pkgs/applications/networking/cluster/chronos/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/chronos/default.nix
diff --git a/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh b/nixpkgs/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh
index 2e337076107..2e337076107 100644
--- a/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh
+++ b/nixpkgs/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh
diff --git a/pkgs/applications/networking/cluster/click/default.nix b/nixpkgs/pkgs/applications/networking/cluster/click/default.nix
index f4d6fce3545..f4d6fce3545 100644
--- a/pkgs/applications/networking/cluster/click/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/click/default.nix
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix
index 88dbd177da0..88dbd177da0 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix
diff --git a/pkgs/applications/networking/cluster/cni/plugins-deps.nix b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins-deps.nix
index a6bbd333be4..a6bbd333be4 100644
--- a/pkgs/applications/networking/cluster/cni/plugins-deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins-deps.nix
diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix
index 39c3b9f6507..39c3b9f6507 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix
index 115dc3835fc..115dc3835fc 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
index e321b2c1b0a..e321b2c1b0a 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix
index de122dd2a5a..de122dd2a5a 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
index eb2946cec77..eb2946cec77 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
index 1f1e59a56a4..1f1e59a56a4 100644
--- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix
index f8c73c65991..f8c73c65991 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix
diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix
index 16472b98fdd..16472b98fdd 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix
index 9bf801ee93d..9bf801ee93d 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix
index 5fc35e6a0af..5fc35e6a0af 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
index 45b6e9dcf33..45b6e9dcf33 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
index 6decad2f9fb..6decad2f9fb 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/nixpkgs/pkgs/applications/networking/cluster/heptio-ark/default.nix
index b9413577b10..b9413577b10 100644
--- a/pkgs/applications/networking/cluster/heptio-ark/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/heptio-ark/default.nix
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix
index 4de0c3fbd7b..4de0c3fbd7b 100644
--- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix
diff --git a/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch b/nixpkgs/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch
index 223d6c6c247..223d6c6c247 100644
--- a/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch
+++ b/nixpkgs/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch
diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix
index 88aa8777ee5..88aa8777ee5 100644
--- a/pkgs/applications/networking/cluster/jx/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix
diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix
index 6fbad55f807..6fbad55f807 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix
diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kanif/default.nix
index 52abc318990..52abc318990 100644
--- a/pkgs/applications/networking/cluster/kanif/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kanif/default.nix
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix
index 1a14e1ed273..1a14e1ed273 100644
--- a/pkgs/applications/networking/cluster/kompose/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix
diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kontemplate/default.nix
index 359b289dbbc..359b289dbbc 100644
--- a/pkgs/applications/networking/cluster/kontemplate/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kontemplate/default.nix
diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/kontemplate/deps.nix
index 7693968bd55..7693968bd55 100644
--- a/pkgs/applications/networking/cluster/kontemplate/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kontemplate/deps.nix
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix
index e3b82152e6f..e3b82152e6f 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix
diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix
index a3cb55ce329..a3cb55ce329 100644
--- a/pkgs/applications/networking/cluster/kube-router/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix
diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix
index 7058c009f2d..7058c009f2d 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix
index 69d013e3f03..69d013e3f03 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix
diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubectl/default.nix
index fed40523a9b..fed40523a9b 100644
--- a/pkgs/applications/networking/cluster/kubectl/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kubectl/default.nix
diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix
index 48540bffb53..48540bffb53 100644
--- a/pkgs/applications/networking/cluster/kubeless/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix
index a5e2b374326..a5e2b374326 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix
diff --git a/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh
index 22a459f5134..22a459f5134 100755
--- a/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh
+++ b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh
diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix
index db71b9b7e30..db71b9b7e30 100644
--- a/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix
diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix
index 779edad8de3..779edad8de3 100644
--- a/pkgs/applications/networking/cluster/kubetail/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix
index 84e9b889943..84e9b889943 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix
diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix
index 8c0265d1491..8c0265d1491 100644
--- a/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix
diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix
index def13e2b9d0..def13e2b9d0 100644
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/nixpkgs/pkgs/applications/networking/cluster/marathon/default.nix
index 72bd82be6c1..72bd82be6c1 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/marathon/default.nix
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/nixpkgs/pkgs/applications/networking/cluster/mesos/default.nix
index 1ad30335b94..1ad30335b94 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/mesos/default.nix
diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/nixpkgs/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
index cf7318ecb27..cf7318ecb27 100644
--- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
+++ b/nixpkgs/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/nixpkgs/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
index 1cf819870f4..1cf819870f4 100644
--- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
diff --git a/pkgs/applications/networking/cluster/mesos/nixos.patch b/nixpkgs/pkgs/applications/networking/cluster/mesos/nixos.patch
index a6fea024b08..a6fea024b08 100644
--- a/pkgs/applications/networking/cluster/mesos/nixos.patch
+++ b/nixpkgs/pkgs/applications/networking/cluster/mesos/nixos.patch
diff --git a/pkgs/applications/networking/cluster/mesos/rb36610.patch b/nixpkgs/pkgs/applications/networking/cluster/mesos/rb36610.patch
index bee578cc3e9..bee578cc3e9 100644
--- a/pkgs/applications/networking/cluster/mesos/rb36610.patch
+++ b/nixpkgs/pkgs/applications/networking/cluster/mesos/rb36610.patch
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix
index 5637e486ef1..5637e486ef1 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix
diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix
index 43e960d9403..43e960d9403 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix
index 6afbbf215a3..6afbbf215a3 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix
index 3b96ef4ea45..3b96ef4ea45 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix
diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix
index de0bb015852..de0bb015852 100644
--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix
diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/nixpkgs/pkgs/applications/networking/cluster/pig/default.nix
index 26c39f8cbe2..26c39f8cbe2 100644
--- a/pkgs/applications/networking/cluster/pig/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/pig/default.nix
diff --git a/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch b/nixpkgs/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch
index ae407727b9d..ae407727b9d 100644
--- a/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch
+++ b/nixpkgs/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch
diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/nixpkgs/pkgs/applications/networking/cluster/prow/default.nix
index 1c802802c09..1c802802c09 100644
--- a/pkgs/applications/networking/cluster/prow/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/prow/default.nix
diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix
index 9e578b9b333..9e578b9b333 100644
--- a/pkgs/applications/networking/cluster/qbec/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix
diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix
index 32dbced0a46..32dbced0a46 100644
--- a/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix
diff --git a/pkgs/applications/networking/cluster/spacegun/default.nix b/nixpkgs/pkgs/applications/networking/cluster/spacegun/default.nix
index 2180d8d3048..2180d8d3048 100644
--- a/pkgs/applications/networking/cluster/spacegun/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/spacegun/default.nix
diff --git a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh b/nixpkgs/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
index 293a72a1623..293a72a1623 100644
--- a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
+++ b/nixpkgs/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-composition.nix
index 6a5283528fc..6a5283528fc 100644
--- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-composition.nix
diff --git a/pkgs/applications/networking/cluster/spacegun/node-packages.nix b/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-packages.nix
index a69352a9c21..a69352a9c21 100644
--- a/pkgs/applications/networking/cluster/spacegun/node-packages.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-packages.nix
diff --git a/pkgs/applications/networking/cluster/spacegun/package.json b/nixpkgs/pkgs/applications/networking/cluster/spacegun/package.json
index 7d419edb74a..7d419edb74a 100644
--- a/pkgs/applications/networking/cluster/spacegun/package.json
+++ b/nixpkgs/pkgs/applications/networking/cluster/spacegun/package.json
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix
index b8d4b947e32..b8d4b947e32 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix
diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix
index 0835d268cd7..0835d268cd7 100644
--- a/pkgs/applications/networking/cluster/ssm-agent/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix
diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix
index 144d46043ff..144d46043ff 100644
--- a/pkgs/applications/networking/cluster/stern/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix
diff --git a/pkgs/applications/networking/cluster/stern/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/stern/deps.nix
index fff5cf8c0de..fff5cf8c0de 100644
--- a/pkgs/applications/networking/cluster/stern/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/stern/deps.nix
diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/nixpkgs/pkgs/applications/networking/cluster/taktuk/default.nix
index 3423163f590..3423163f590 100644
--- a/pkgs/applications/networking/cluster/taktuk/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/taktuk/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix
index 606cd0370aa..606cd0370aa 100644
--- a/pkgs/applications/networking/cluster/terraform-docs/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix
index 1bb8df88d01..1bb8df88d01 100644
--- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform-inventory/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/deps.nix
index 9f7b5e317fe..9f7b5e317fe 100644
--- a/pkgs/applications/networking/cluster/terraform-inventory/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/deps.nix
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile b/nixpkgs/pkgs/applications/networking/cluster/terraform-landscape/Gemfile
index c4f9a5511de..c4f9a5511de 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-landscape/Gemfile
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/nixpkgs/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
index b801fad546d..b801fad546d 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-landscape/default.nix
index 32f6680b2f8..32f6680b2f8 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-landscape/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
index aa3f5142aa5..aa3f5142aa5 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
index bb634a78e23..bb634a78e23 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix
index dc49f24afa5..dc49f24afa5 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix
diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix
index b78ab3f6dda..b78ab3f6dda 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 6298c25ba25..6298c25ba25 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
index 1aadbbc5ccd..1aadbbc5ccd 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
index 4571d368991..4571d368991 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix
index 3d4a3547502..3d4a3547502 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
index 06d7b8a9f07..06d7b8a9f07 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
index 23c4f4bfa8b..23c4f4bfa8b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.txt
index bdde6600678..bdde6600678 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.txt
diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all
index 893a6b1c7d7..893a6b1c7d7 100755
--- a/pkgs/applications/networking/cluster/terraform-providers/update-all
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
index 5c131948649..5c131948649 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform/provider-path.patch b/nixpkgs/pkgs/applications/networking/cluster/terraform/provider-path.patch
index 39a69e4a389..39a69e4a389 100644
--- a/pkgs/applications/networking/cluster/terraform/provider-path.patch
+++ b/nixpkgs/pkgs/applications/networking/cluster/terraform/provider-path.patch
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
index ddeb5851037..ddeb5851037 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/deps.nix
index 8432a8366b7..8432a8366b7 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/deps.nix
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
index 6cc7735efeb..6cc7735efeb 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
diff --git a/pkgs/applications/networking/compactor/default.nix b/nixpkgs/pkgs/applications/networking/compactor/default.nix
index 5d9a658972c..5d9a658972c 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/nixpkgs/pkgs/applications/networking/compactor/default.nix
diff --git a/pkgs/applications/networking/datovka/default.nix b/nixpkgs/pkgs/applications/networking/datovka/default.nix
index 12bad094fca..12bad094fca 100644
--- a/pkgs/applications/networking/datovka/default.nix
+++ b/nixpkgs/pkgs/applications/networking/datovka/default.nix
diff --git a/pkgs/applications/networking/davmail/default.nix b/nixpkgs/pkgs/applications/networking/davmail/default.nix
index a84de638066..a84de638066 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/nixpkgs/pkgs/applications/networking/davmail/default.nix
diff --git a/pkgs/applications/networking/drive/default.nix b/nixpkgs/pkgs/applications/networking/drive/default.nix
index 0967fd95dc0..0967fd95dc0 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/nixpkgs/pkgs/applications/networking/drive/default.nix
diff --git a/pkgs/applications/networking/drive/deps.nix b/nixpkgs/pkgs/applications/networking/drive/deps.nix
index ca132288bd6..ca132288bd6 100644
--- a/pkgs/applications/networking/drive/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/drive/deps.nix
diff --git a/pkgs/applications/networking/droopy/default.nix b/nixpkgs/pkgs/applications/networking/droopy/default.nix
index d71b863f881..d71b863f881 100644
--- a/pkgs/applications/networking/droopy/default.nix
+++ b/nixpkgs/pkgs/applications/networking/droopy/default.nix
diff --git a/pkgs/applications/networking/dropbox/cli.nix b/nixpkgs/pkgs/applications/networking/dropbox/cli.nix
index 9b3b99708df..9b3b99708df 100644
--- a/pkgs/applications/networking/dropbox/cli.nix
+++ b/nixpkgs/pkgs/applications/networking/dropbox/cli.nix
diff --git a/pkgs/applications/networking/dropbox/default.nix b/nixpkgs/pkgs/applications/networking/dropbox/default.nix
index 693a7018213..693a7018213 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/nixpkgs/pkgs/applications/networking/dropbox/default.nix
diff --git a/pkgs/applications/networking/dropbox/fix-cli-paths.patch b/nixpkgs/pkgs/applications/networking/dropbox/fix-cli-paths.patch
index 84cd8014e1e..84cd8014e1e 100644
--- a/pkgs/applications/networking/dropbox/fix-cli-paths.patch
+++ b/nixpkgs/pkgs/applications/networking/dropbox/fix-cli-paths.patch
diff --git a/pkgs/applications/networking/dsvpn/default.nix b/nixpkgs/pkgs/applications/networking/dsvpn/default.nix
index 04d3887bf4e..04d3887bf4e 100644
--- a/pkgs/applications/networking/dsvpn/default.nix
+++ b/nixpkgs/pkgs/applications/networking/dsvpn/default.nix
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index 640421bef8f..640421bef8f 100644
--- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix
diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/nixpkgs/pkgs/applications/networking/enhanced-ctorrent/default.nix
index 59b48df1cd0..59b48df1cd0 100644
--- a/pkgs/applications/networking/enhanced-ctorrent/default.nix
+++ b/nixpkgs/pkgs/applications/networking/enhanced-ctorrent/default.nix
diff --git a/pkgs/applications/networking/errbot/default.nix b/nixpkgs/pkgs/applications/networking/errbot/default.nix
index 402017e129d..402017e129d 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/nixpkgs/pkgs/applications/networking/errbot/default.nix
diff --git a/pkgs/applications/networking/esniper/default.nix b/nixpkgs/pkgs/applications/networking/esniper/default.nix
index 9de87ee178d..9de87ee178d 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/nixpkgs/pkgs/applications/networking/esniper/default.nix
diff --git a/pkgs/applications/networking/esniper/find-ca-bundle.patch b/nixpkgs/pkgs/applications/networking/esniper/find-ca-bundle.patch
index e4df272a0c9..e4df272a0c9 100644
--- a/pkgs/applications/networking/esniper/find-ca-bundle.patch
+++ b/nixpkgs/pkgs/applications/networking/esniper/find-ca-bundle.patch
diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index 36b4732ca2e..36b4732ca2e 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/nixpkgs/pkgs/applications/networking/feedreaders/canto-curses/default.nix
diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
index e700c5634ad..e700c5634ad 100644
--- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/castget/default.nix
index 33f8d8ca238..33f8d8ca238 100644
--- a/pkgs/applications/networking/feedreaders/castget/default.nix
+++ b/nixpkgs/pkgs/applications/networking/feedreaders/castget/default.nix
diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix
index c336d2d0bba..c336d2d0bba 100644
--- a/pkgs/applications/networking/feedreaders/feedreader/default.nix
+++ b/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix
index e01e4c4fc44..e01e4c4fc44 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 7304fd2f654..7304fd2f654 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix
diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix
index 07f3f3fde0a..07f3f3fde0a 100644
--- a/pkgs/applications/networking/feedreaders/rss2email/default.nix
+++ b/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix
diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix
index 2bb592bfb42..2bb592bfb42 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix
index 3e7909c91c0..3e7909c91c0 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix
diff --git a/pkgs/applications/networking/firehol/default.nix b/nixpkgs/pkgs/applications/networking/firehol/default.nix
index ab2ca160152..ab2ca160152 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/nixpkgs/pkgs/applications/networking/firehol/default.nix
diff --git a/pkgs/applications/networking/firehol/iprange.nix b/nixpkgs/pkgs/applications/networking/firehol/iprange.nix
index 194dfc25eba..194dfc25eba 100644
--- a/pkgs/applications/networking/firehol/iprange.nix
+++ b/nixpkgs/pkgs/applications/networking/firehol/iprange.nix
diff --git a/pkgs/applications/networking/flent/default.nix b/nixpkgs/pkgs/applications/networking/flent/default.nix
index 19f813e5c75..19f813e5c75 100644
--- a/pkgs/applications/networking/flent/default.nix
+++ b/nixpkgs/pkgs/applications/networking/flent/default.nix
diff --git a/pkgs/applications/networking/flent/http-getter.nix b/nixpkgs/pkgs/applications/networking/flent/http-getter.nix
index 2bebf4b0960..2bebf4b0960 100644
--- a/pkgs/applications/networking/flent/http-getter.nix
+++ b/nixpkgs/pkgs/applications/networking/flent/http-getter.nix
diff --git a/pkgs/applications/networking/flexget/default.nix b/nixpkgs/pkgs/applications/networking/flexget/default.nix
index 8c381df122d..8c381df122d 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/nixpkgs/pkgs/applications/networking/flexget/default.nix
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix
index 8bb38230d5c..8bb38230d5c 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix
diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/nixpkgs/pkgs/applications/networking/ftp/taxi/default.nix
index cb40c347e1c..cb40c347e1c 100644
--- a/pkgs/applications/networking/ftp/taxi/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ftp/taxi/default.nix
diff --git a/pkgs/applications/networking/gdrive/default.nix b/nixpkgs/pkgs/applications/networking/gdrive/default.nix
index 4a4c93128df..4a4c93128df 100644
--- a/pkgs/applications/networking/gdrive/default.nix
+++ b/nixpkgs/pkgs/applications/networking/gdrive/default.nix
diff --git a/pkgs/applications/networking/gmailieer/default.nix b/nixpkgs/pkgs/applications/networking/gmailieer/default.nix
index a20728e2199..a20728e2199 100644
--- a/pkgs/applications/networking/gmailieer/default.nix
+++ b/nixpkgs/pkgs/applications/networking/gmailieer/default.nix
diff --git a/pkgs/applications/networking/gns3/default.nix b/nixpkgs/pkgs/applications/networking/gns3/default.nix
index 2dae8377055..2dae8377055 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/nixpkgs/pkgs/applications/networking/gns3/default.nix
diff --git a/pkgs/applications/networking/gns3/gui.nix b/nixpkgs/pkgs/applications/networking/gns3/gui.nix
index 2d462d5c11d..2d462d5c11d 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/nixpkgs/pkgs/applications/networking/gns3/gui.nix
diff --git a/pkgs/applications/networking/gns3/server.nix b/nixpkgs/pkgs/applications/networking/gns3/server.nix
index beeac9d0293..beeac9d0293 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/nixpkgs/pkgs/applications/networking/gns3/server.nix
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index 830eae1fc28..830eae1fc28 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
diff --git a/pkgs/applications/networking/gopher/gopher/default.nix b/nixpkgs/pkgs/applications/networking/gopher/gopher/default.nix
index f90e35ca7e2..f90e35ca7e2 100644
--- a/pkgs/applications/networking/gopher/gopher/default.nix
+++ b/nixpkgs/pkgs/applications/networking/gopher/gopher/default.nix
diff --git a/pkgs/applications/networking/gopher/gopherclient/default.nix b/nixpkgs/pkgs/applications/networking/gopher/gopherclient/default.nix
index 45d9235afc9..45d9235afc9 100644
--- a/pkgs/applications/networking/gopher/gopherclient/default.nix
+++ b/nixpkgs/pkgs/applications/networking/gopher/gopherclient/default.nix
diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/nixpkgs/pkgs/applications/networking/hpmyroom/default.nix
index b0f21f6f7e0..b0f21f6f7e0 100644
--- a/pkgs/applications/networking/hpmyroom/default.nix
+++ b/nixpkgs/pkgs/applications/networking/hpmyroom/default.nix
diff --git a/pkgs/applications/networking/hydroxide/default.nix b/nixpkgs/pkgs/applications/networking/hydroxide/default.nix
index 75c1cdaece9..75c1cdaece9 100644
--- a/pkgs/applications/networking/hydroxide/default.nix
+++ b/nixpkgs/pkgs/applications/networking/hydroxide/default.nix
diff --git a/pkgs/applications/networking/ids/daq/default.nix b/nixpkgs/pkgs/applications/networking/ids/daq/default.nix
index 9af105ad52e..9af105ad52e 100644
--- a/pkgs/applications/networking/ids/daq/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ids/daq/default.nix
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/nixpkgs/pkgs/applications/networking/ids/snort/default.nix
index 88df3857ec1..88df3857ec1 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ids/snort/default.nix
diff --git a/pkgs/applications/networking/ids/suricata/bpf_stubs_workaround.patch b/nixpkgs/pkgs/applications/networking/ids/suricata/bpf_stubs_workaround.patch
index d4e8c95fea2..d4e8c95fea2 100644
--- a/pkgs/applications/networking/ids/suricata/bpf_stubs_workaround.patch
+++ b/nixpkgs/pkgs/applications/networking/ids/suricata/bpf_stubs_workaround.patch
diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix
index d0829fd73a9..d0829fd73a9 100644
--- a/pkgs/applications/networking/ids/suricata/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
index 947abc39c21..947abc39c21 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
diff --git a/pkgs/applications/networking/ike/default.nix b/nixpkgs/pkgs/applications/networking/ike/default.nix
index 0b0491ffb86..0b0491ffb86 100644
--- a/pkgs/applications/networking/ike/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ike/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
index 716989c7b56..716989c7b56 100644
--- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/amsn/default.nix
index 6ff51445718..6ff51445718 100644
--- a/pkgs/applications/networking/instant-messengers/amsn/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/amsn/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix
index a3497df1716..a3497df1716 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
index 5094a13119f..5094a13119f 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
index 84067dc5f19..84067dc5f19 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix
index ecd76977eb2..ecd76977eb2 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
index 798dab2b646..798dab2b646 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 917610216ae..917610216ae 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix
index 4e05e7cae97..4e05e7cae97 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix
index b6e13fe403d..b6e13fe403d 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch
index 0df8bc84ff3..0df8bc84ff3 100644
--- a/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch
diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index 21b21e25349..21b21e25349 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix
index daffb539676..daffb539676 100644
--- a/pkgs/applications/networking/instant-messengers/centerim/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
index 787d66826ef..787d66826ef 100644
--- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix
index 3186009db58..3186009db58 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
index 8928814e967..8928814e967 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix
index 6e4a914ecb0..6e4a914ecb0 100644
--- a/pkgs/applications/networking/instant-messengers/discord/base.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
index 70b36c66387..70b36c66387 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 052a626531b..052a626531b 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix
index 605550beb50..605550beb50 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix
index e24ac2e1831..e24ac2e1831 100644
--- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 1fd8c47a99c..1fd8c47a99c 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix
index 57b745057dc..57b745057dc 100644
--- a/pkgs/applications/networking/instant-messengers/gitter/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index 5e6e2f9b8d8..5e6e2f9b8d8 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gtmess/default.nix
index 3e16a58f54b..3e16a58f54b 100644
--- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gtmess/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index 47854683e0e..47854683e0e 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix
index 169ddf65b29..169ddf65b29 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index 7e01f97fe0d..7e01f97fe0d 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
index e477bdfe2fd..e477bdfe2fd 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix
index b155f312964..b155f312964 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
index e03bdd9909e..e03bdd9909e 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix
index 633219626b6..633219626b6 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix
index 670556bf271..670556bf271 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix
diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix
index 012ad195a71..012ad195a71 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix
diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/package.json
index fc03d636ad2..fc03d636ad2 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-recorder/package.json
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/package.json
diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
index 54b7ef2bd99..54b7ef2bd99 100644
--- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
index dbfc87b8e8d..dbfc87b8e8d 100644
--- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index f4111123711..f4111123711 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
index 216af305b4a..216af305b4a 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
index 63f9a63849b..63f9a63849b 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index 7d2037d16a7..7d2037d16a7 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
index 88ea97be1ca..88ea97be1ca 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/mikutter.desktop b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/mikutter.desktop
index 092f5f35cbf..092f5f35cbf 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/mikutter.desktop
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/mikutter.desktop
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/plugin/gtk/Gemfile b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/plugin/gtk/Gemfile
index 3306c29e3cb..3306c29e3cb 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/plugin/gtk/Gemfile
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/plugin/gtk/Gemfile
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/plugin/image_file_cache/Gemfile b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/plugin/image_file_cache/Gemfile
index f86005fef07..f86005fef07 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/plugin/image_file_cache/Gemfile
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/plugin/image_file_cache/Gemfile
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/plugin/photo_support/Gemfile b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/plugin/photo_support/Gemfile
index 66016eee9c4..66016eee9c4 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/plugin/photo_support/Gemfile
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/plugin/photo_support/Gemfile
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/plugin/uitranslator/Gemfile b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/plugin/uitranslator/Gemfile
index 14ebffd4e0a..14ebffd4e0a 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/plugin/uitranslator/Gemfile
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/plugin/uitranslator/Gemfile
diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix
index 7122a509215..7122a509215 100644
--- a/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix
index f214f722143..f214f722143 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix
index 3b3b0c2fd66..3b3b0c2fd66 100644
--- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
index 079fc7d57fb..079fc7d57fb 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
index 45214944309..45214944309 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
index 9f5c246ede6..9f5c246ede6 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
index bfd4b1abd5e..bfd4b1abd5e 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
index 3555e5a7197..3555e5a7197 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
index 6d527f3a7e4..6d527f3a7e4 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix
index ff065e7e2ce..ff065e7e2ce 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
index c418b2e992a..c418b2e992a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
index 7302ba89a71..7302ba89a71 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
index 6695f8cb69b..6695f8cb69b 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
index cff1bcc56b9..cff1bcc56b9 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
index 5d2292b50ad..5d2292b50ad 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
index e488ae73be0..e488ae73be0 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
index e9a0812e925..e9a0812e925 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
index 8022d32a081..8022d32a081 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix
index 10973345dec..10973345dec 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
index edb4ca3c349..edb4ca3c349 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
index 83904531753..83904531753 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index 3d1a6ac534c..3d1a6ac534c 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
index 6657ff96b11..6657ff96b11 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
index c38ff8f454e..c38ff8f454e 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
index 41f205514e7..41f205514e7 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix
index 8f86256069c..8f86256069c 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/add-search-path.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/add-search-path.patch
index b0758777186..b0758777186 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/add-search-path.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/add-search-path.patch
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 71168e1a692..71168e1a692 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch
index 049d404a8d5..049d404a8d5 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
index 095f838fe98..095f838fe98 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix
index 31c9fb4e7c3..31c9fb4e7c3 100644
--- a/pkgs/applications/networking/instant-messengers/poezio/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pond/default.nix
index 1d70c9641f8..1d70c9641f8 100644
--- a/pkgs/applications/networking/instant-messengers/pond/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pond/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pond/deps.nix
index 55850f0a89c..55850f0a89c 100644
--- a/pkgs/applications/networking/instant-messengers/pond/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pond/deps.nix
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 8281e3b606a..8281e3b606a 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
index 796ec6b0a61..796ec6b0a61 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
index 9ef4e7bebe5..9ef4e7bebe5 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 010c06e0c2a..010c06e0c2a 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix
index 19438c4d037..19438c4d037 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch
index 7d5711a6f2b..7d5711a6f2b 100644
--- a/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch
diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
index 111f4e728e7..111f4e728e7 100644
--- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix
index a78e5d1c2d1..a78e5d1c2d1 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 757551c7074..757551c7074 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 1a11e8c0443..1a11e8c0443 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/bare.nix
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix
index f588c31c183..f588c31c183 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix
index 047890a932c..047890a932c 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix
diff --git a/pkgs/applications/networking/instant-messengers/rambox/isDev.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/isDev.patch
index b918144c766..b918144c766 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/isDev.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/isDev.patch
diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix
index 8b1f4d4c0e9..8b1f4d4c0e9 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
index 30b12963b33..30b12963b33 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
index 4be8edaf9b8..4be8edaf9b8 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile
index 0ff6f0a30d5..0ff6f0a30d5 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile
diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix
index 3768ecd137f..3768ecd137f 100644
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index 96ce9c32a7d..96ce9c32a7d 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index 97c00924d6c..97c00924d6c 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/notestsapps.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/notestsapps.patch
index 842060935b0..842060935b0 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/notestsapps.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/notestsapps.patch
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
index d4298a3d32f..d4298a3d32f 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index c49934b96f7..c49934b96f7 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
index b76848c2b81..b76848c2b81 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 9b6f591bd42..9b6f591bd42 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index ada903701e2..ada903701e2 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
diff --git a/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
index f516e4a76f0..f516e4a76f0 100755
--- a/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
index 13c7281aea7..13c7281aea7 100644
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix
index 1a681118245..1a681118245 100644
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix
diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
index 54959383f08..54959383f08 100644
--- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index 8471f43c6dd..8471f43c6dd 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 4358ed8f201..4358ed8f201 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/silc-client/default.nix
index 1219440bf83..1219440bf83 100644
--- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/silc-client/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix
index cdc176be65b..cdc176be65b 100644
--- a/pkgs/applications/networking/instant-messengers/sky/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
index 8b8ce8fd7bb..8b8ce8fd7bb 100644
--- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
index 8093f91feb3..8093f91feb3 100644
--- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 500f8f3fe87..500f8f3fe87 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index 6271e338a96..6271e338a96 100644
--- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
index 903d8e60d6d..903d8e60d6d 100644
--- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
index e501d3bcdbf..e501d3bcdbf 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh
index 6a15298c4e7..6a15298c4e7 100755
--- a/pkgs/applications/networking/instant-messengers/slack/update.sh
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh
diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix
index 23659e8a6c9..23659e8a6c9 100644
--- a/pkgs/applications/networking/instant-messengers/spectral/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix
index 7a9ab4d127c..7a9ab4d127c 100644
--- a/pkgs/applications/networking/instant-messengers/stride/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix
index d47b7d00af9..d47b7d00af9 100644
--- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch
index 911e7570427..911e7570427 100644
--- a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/scons.patch
index c63b05d7acb..c63b05d7acb 100644
--- a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/scons.patch
diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix
index ef7e3717f72..ef7e3717f72 100644
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index c2a9f4be90a..c2a9f4be90a 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index 9c57ac829af..9c57ac829af 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
index 862659fde8d..862659fde8d 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index f4ade076726..f4ade076726 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index a0cc73da46d..a0cc73da46d 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
index 769e639314e..769e639314e 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
index f3d1e6cfd75..f3d1e6cfd75 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index af0ca1589e5..af0ca1589e5 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index ef842275a5d..ef842275a5d 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index 6513c6324a6..6513c6324a6 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix
index 11845ecfb26..11845ecfb26 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix
index edfec97edf8..edfec97edf8 100644
--- a/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 540aa3fcea4..540aa3fcea4 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix
index 780dab79e99..780dab79e99 100644
--- a/pkgs/applications/networking/instant-messengers/turses/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/twinkle/default.nix
index 0378f50a9c0..0378f50a9c0 100644
--- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/twinkle/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix
index 5ef0d916242..5ef0d916242 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index 923ce373753..923ce373753 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix
index acdec1dc99c..acdec1dc99c 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
index 165e3e959e0..165e3e959e0 100644
--- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index ceb9b4a1140..ceb9b4a1140 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index c04851d586b..c04851d586b 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
index 4047eba1fbb..4047eba1fbb 100644
--- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix
index caa41024fc6..caa41024fc6 100644
--- a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index cc19bbd7156..cc19bbd7156 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
index 6214d4e2625..6214d4e2625 100755
--- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix
index 33392af766c..33392af766c 100644
--- a/pkgs/applications/networking/instant-messengers/zulip/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix
diff --git a/pkgs/applications/networking/insync/default.nix b/nixpkgs/pkgs/applications/networking/insync/default.nix
index 3a2b32f0117..3a2b32f0117 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/nixpkgs/pkgs/applications/networking/insync/default.nix
diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix
index 76cc393f26a..76cc393f26a 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix
diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix
index dc646f9471e..dc646f9471e 100644
--- a/pkgs/applications/networking/ipfs-migrator/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix
diff --git a/pkgs/applications/networking/ipfs-migrator/deps.nix b/nixpkgs/pkgs/applications/networking/ipfs-migrator/deps.nix
index 1ad1c383c8c..1ad1c383c8c 100644
--- a/pkgs/applications/networking/ipfs-migrator/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/ipfs-migrator/deps.nix
diff --git a/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch b/nixpkgs/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch
index a933a7b5358..a933a7b5358 100644
--- a/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch
+++ b/nixpkgs/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch
diff --git a/pkgs/applications/networking/ipfs/default.nix b/nixpkgs/pkgs/applications/networking/ipfs/default.nix
index db325cf1387..db325cf1387 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ipfs/default.nix
diff --git a/pkgs/applications/networking/ipget/default.nix b/nixpkgs/pkgs/applications/networking/ipget/default.nix
index 9f206a8f48f..9f206a8f48f 100644
--- a/pkgs/applications/networking/ipget/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ipget/default.nix
diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/nixpkgs/pkgs/applications/networking/iptraf-ng/default.nix
index cdece4eb644..cdece4eb644 100644
--- a/pkgs/applications/networking/iptraf-ng/default.nix
+++ b/nixpkgs/pkgs/applications/networking/iptraf-ng/default.nix
diff --git a/pkgs/applications/networking/iptraf/default.nix b/nixpkgs/pkgs/applications/networking/iptraf/default.nix
index d2d9a67fb4d..d2d9a67fb4d 100644
--- a/pkgs/applications/networking/iptraf/default.nix
+++ b/nixpkgs/pkgs/applications/networking/iptraf/default.nix
diff --git a/pkgs/applications/networking/irc/bip/default.nix b/nixpkgs/pkgs/applications/networking/irc/bip/default.nix
index 43ec0910cc2..43ec0910cc2 100644
--- a/pkgs/applications/networking/irc/bip/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/bip/default.nix
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/nixpkgs/pkgs/applications/networking/irc/communi/default.nix
index 8278f90d321..8278f90d321 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/communi/default.nix
diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix
index 0cf06a1f452..0cf06a1f452 100644
--- a/pkgs/applications/networking/irc/epic5/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix
diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix
index 2d12386bafa..2d12386bafa 100644
--- a/pkgs/applications/networking/irc/glowing-bear/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix
index 263cf23c17f..263cf23c17f 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix
diff --git a/pkgs/applications/networking/irc/ii/default.nix b/nixpkgs/pkgs/applications/networking/irc/ii/default.nix
index 4807f3419d1..4807f3419d1 100644
--- a/pkgs/applications/networking/irc/ii/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/ii/default.nix
diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/nixpkgs/pkgs/applications/networking/irc/irccloud/default.nix
index 93ab9f828f6..93ab9f828f6 100644
--- a/pkgs/applications/networking/irc/irccloud/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/irccloud/default.nix
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix
index 1751812d67e..1751812d67e 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix
diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix
index aefc48d4a3e..aefc48d4a3e 100644
--- a/pkgs/applications/networking/irc/irssi/fish/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/nixpkgs/pkgs/applications/networking/irc/konversation/default.nix
index 6a58241b89a..6a58241b89a 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/konversation/default.nix
diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/nixpkgs/pkgs/applications/networking/irc/kvirc/default.nix
index 6fd66096b5b..6fd66096b5b 100644
--- a/pkgs/applications/networking/irc/kvirc/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/kvirc/default.nix
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix
index f78053bdc37..f78053bdc37 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix
diff --git a/pkgs/applications/networking/irc/qweechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/qweechat/default.nix
index acf030222a1..acf030222a1 100644
--- a/pkgs/applications/networking/irc/qweechat/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/qweechat/default.nix
diff --git a/pkgs/applications/networking/irc/sic/default.nix b/nixpkgs/pkgs/applications/networking/irc/sic/default.nix
index 40914295597..40914295597 100644
--- a/pkgs/applications/networking/irc/sic/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/sic/default.nix
diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix
index 7967bdcc9c4..7967bdcc9c4 100644
--- a/pkgs/applications/networking/irc/tiny/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
index 13ac80677ee..13ac80677ee 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix
index 0880a32af92..0880a32af92 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
index f3d96a1b5c6..f3d96a1b5c6 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch
index af2dd36b41c..af2dd36b41c 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
index 17e07f91c03..17e07f91c03 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
index ea5052f37a3..ea5052f37a3 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch
index d9945c2993b..d9945c2993b 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
index ff6a7d94741..ff6a7d94741 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
index 9682aa3169a..9682aa3169a 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/libpath.patch b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/libpath.patch
index a7b77ed9b60..a7b77ed9b60 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/libpath.patch
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/libpath.patch
diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/wrapper.nix
index 5c06bb8517a..5c06bb8517a 100644
--- a/pkgs/applications/networking/irc/weechat/wrapper.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/weechat/wrapper.nix
diff --git a/pkgs/applications/networking/irc/wraith/configure.patch b/nixpkgs/pkgs/applications/networking/irc/wraith/configure.patch
index e5fa2feb201..e5fa2feb201 100644
--- a/pkgs/applications/networking/irc/wraith/configure.patch
+++ b/nixpkgs/pkgs/applications/networking/irc/wraith/configure.patch
diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix
index 996ab72d6f5..996ab72d6f5 100644
--- a/pkgs/applications/networking/irc/wraith/default.nix
+++ b/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix
diff --git a/pkgs/applications/networking/irc/wraith/dlopen.patch b/nixpkgs/pkgs/applications/networking/irc/wraith/dlopen.patch
index bfc854ef9e9..bfc854ef9e9 100644
--- a/pkgs/applications/networking/irc/wraith/dlopen.patch
+++ b/nixpkgs/pkgs/applications/networking/irc/wraith/dlopen.patch
diff --git a/pkgs/applications/networking/jmeter/default.nix b/nixpkgs/pkgs/applications/networking/jmeter/default.nix
index 3f626a6ac48..3f626a6ac48 100644
--- a/pkgs/applications/networking/jmeter/default.nix
+++ b/nixpkgs/pkgs/applications/networking/jmeter/default.nix
diff --git a/pkgs/applications/networking/jnetmap/default.nix b/nixpkgs/pkgs/applications/networking/jnetmap/default.nix
index e2a8a2d56bd..e2a8a2d56bd 100644
--- a/pkgs/applications/networking/jnetmap/default.nix
+++ b/nixpkgs/pkgs/applications/networking/jnetmap/default.nix
diff --git a/pkgs/applications/networking/libcoap/default.nix b/nixpkgs/pkgs/applications/networking/libcoap/default.nix
index d3a3dd6e29a..d3a3dd6e29a 100644
--- a/pkgs/applications/networking/libcoap/default.nix
+++ b/nixpkgs/pkgs/applications/networking/libcoap/default.nix
diff --git a/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch b/nixpkgs/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch
index 46224ede33d..46224ede33d 100644
--- a/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch
+++ b/nixpkgs/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch
diff --git a/pkgs/applications/networking/linssid/default.nix b/nixpkgs/pkgs/applications/networking/linssid/default.nix
index daddf6adf7e..daddf6adf7e 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/nixpkgs/pkgs/applications/networking/linssid/default.nix
diff --git a/pkgs/applications/networking/maestral/default.nix b/nixpkgs/pkgs/applications/networking/maestral/default.nix
index 708957bdf01..708957bdf01 100644
--- a/pkgs/applications/networking/maestral/default.nix
+++ b/nixpkgs/pkgs/applications/networking/maestral/default.nix
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix
index 6915cfd7982..6915cfd7982 100644
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix
diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
index ed670d61a7b..ed670d61a7b 100644
--- a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix
index 54b3e10b5e2..54b3e10b5e2 100644
--- a/pkgs/applications/networking/mailreaders/afew/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix
diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix
index cfaa7dcd4af..cfaa7dcd4af 100644
--- a/pkgs/applications/networking/mailreaders/alpine/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix
index 7d62aa43888..7d62aa43888 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix
diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix
index e7c9d50cb9b..e7c9d50cb9b 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index f62ab292d66..f62ab292d66 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/mime.patch b/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/mime.patch
index 2ff4269c332..2ff4269c332 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/mime.patch
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/mime.patch
diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix
index 49f0ac53365..49f0ac53365 100644
--- a/pkgs/applications/networking/mailreaders/hasmail/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix
index 38e4bf5d710..38e4bf5d710 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix
index 189ac1e6aae..189ac1e6aae 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix
diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/lumail/default.nix
index 44b97fb3793..44b97fb3793 100644
--- a/pkgs/applications/networking/mailreaders/lumail/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/lumail/default.nix
diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix
index ffa3e92d390..ffa3e92d390 100644
--- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix
diff --git a/pkgs/applications/networking/mailreaders/mailcheck/mailcheck-Makefile.patch b/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/mailcheck-Makefile.patch
index 46b3bff4f7a..46b3bff4f7a 100644
--- a/pkgs/applications/networking/mailreaders/mailcheck/mailcheck-Makefile.patch
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/mailcheck-Makefile.patch
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 4cbaee4488b..4cbaee4488b 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 89231939bfb..89231939bfb 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix
diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix
index ba8f272203b..ba8f272203b 100644
--- a/pkgs/applications/networking/mailreaders/mblaze/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix
diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
index 2fb30e5ae6a..2fb30e5ae6a 100644
--- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/msgviewer/default.nix
index fc8c167e984..fc8c167e984 100644
--- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/msgviewer/default.nix
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix
index b7bf5eb329c..b7bf5eb329c 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 274d9d4718e..274d9d4718e 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix
diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notbit/default.nix
index 370c4f83887..370c4f83887 100644
--- a/pkgs/applications/networking/mailreaders/notbit/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/notbit/default.nix
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
index 86aef501134..86aef501134 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
index d9eae3c9c50..d9eae3c9c50 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 64faee641f0..64faee641f0 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix
diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index a0dbf98f276..a0dbf98f276 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
index 7382b97ba81..7382b97ba81 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 8e1f6720120..8e1f6720120 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index f46e355cd57..f46e355cd57 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 13f201eaea1..13f201eaea1 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 2011c35f1a7..2011c35f1a7 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
index fe3a93ebda7..fe3a93ebda7 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix
index f383018e253..f383018e253 100644
--- a/pkgs/applications/networking/mailreaders/trojita/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix
diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix
index bfd177cda7a..bfd177cda7a 100644
--- a/pkgs/applications/networking/modem-manager-gui/default.nix
+++ b/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix
diff --git a/pkgs/applications/networking/mpop/default.nix b/nixpkgs/pkgs/applications/networking/mpop/default.nix
index dce1934febf..dce1934febf 100644
--- a/pkgs/applications/networking/mpop/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mpop/default.nix
diff --git a/pkgs/applications/networking/msmtp/default.nix b/nixpkgs/pkgs/applications/networking/msmtp/default.nix
index 486b34ecb30..486b34ecb30 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/nixpkgs/pkgs/applications/networking/msmtp/default.nix
diff --git a/pkgs/applications/networking/msmtp/paths.patch b/nixpkgs/pkgs/applications/networking/msmtp/paths.patch
index 707163bff0c..707163bff0c 100644
--- a/pkgs/applications/networking/msmtp/paths.patch
+++ b/nixpkgs/pkgs/applications/networking/msmtp/paths.patch
diff --git a/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix
new file mode 100644
index 00000000000..c1adcc7867d
--- /dev/null
+++ b/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -0,0 +1,94 @@
+{ stdenv, makeWrapper, fetchurl, dpkg
+, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
+, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3
+, xorg, autoPatchelfHook, systemd, libnotify, iproute
+}:
+
+let deps = [
+    alsaLib
+    atk
+    cairo
+    cups
+    dbus
+    expat
+    fontconfig
+    freetype
+    gdk-pixbuf
+    glib
+    gnome2.GConf
+    pango
+    gtk3
+    libnotify
+    xorg.libX11
+    xorg.libXScrnSaver
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libxcb
+    nspr
+    nss
+    systemd
+  ];
+
+in
+
+stdenv.mkDerivation rec {
+  pname = "mullvad-vpn";
+  version = "2019.10";
+
+  src = fetchurl {
+    url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
+    sha256 = "0nckbhfpf4r5l5h22jcv93b5i9y2sc8lhcaffsg2ld804h5ygbbq";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+    makeWrapper
+  ];
+
+  buildInputs = deps;
+
+  dontBuild = true;
+  dontConfigure = true;
+
+  unpackPhase = "dpkg-deb -x $src .";
+
+  runtimeDependencies = [ systemd.lib libnotify ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/mullvad $out/bin
+
+    mv usr/share/* $out/share
+    mv usr/bin/* $out/bin
+    mv opt/Mullvad\ VPN/* $out/share/mullvad
+
+    sed -i 's|\/opt\/Mullvad.*VPN|'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop
+
+    wrapProgram $out/share/mullvad/resources/mullvad-daemon \
+        --suffix PATH : ${iproute}/bin
+
+    ln -s $out/share/mullvad/mullvad-vpn $out/bin/mullvad-vpn
+    ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mullvad/mullvadvpn-app";
+    description = "Client for Mullvad VPN";
+    changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md";
+    license = licenses.gpl3;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers ;[ filalex77 xfix ];
+  };
+
+}
diff --git a/pkgs/applications/networking/mumble/default.nix b/nixpkgs/pkgs/applications/networking/mumble/default.nix
index 86ef850e291..86ef850e291 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mumble/default.nix
diff --git a/pkgs/applications/networking/mumble/mumble-jack-support.patch b/nixpkgs/pkgs/applications/networking/mumble/mumble-jack-support.patch
index 7c18a33193d..7c18a33193d 100644
--- a/pkgs/applications/networking/mumble/mumble-jack-support.patch
+++ b/nixpkgs/pkgs/applications/networking/mumble/mumble-jack-support.patch
diff --git a/pkgs/applications/networking/mumble/overlay.nix b/nixpkgs/pkgs/applications/networking/mumble/overlay.nix
index babb3812bb9..babb3812bb9 100644
--- a/pkgs/applications/networking/mumble/overlay.nix
+++ b/nixpkgs/pkgs/applications/networking/mumble/overlay.nix
diff --git a/pkgs/applications/networking/ndppd/default.nix b/nixpkgs/pkgs/applications/networking/ndppd/default.nix
index 42950f23a84..42950f23a84 100644
--- a/pkgs/applications/networking/ndppd/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ndppd/default.nix
diff --git a/pkgs/applications/networking/netperf/default.nix b/nixpkgs/pkgs/applications/networking/netperf/default.nix
index c2a84971bc2..c2a84971bc2 100644
--- a/pkgs/applications/networking/netperf/default.nix
+++ b/nixpkgs/pkgs/applications/networking/netperf/default.nix
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix
index 6352922e33e..6352922e33e 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix
index f50d9516167..f50d9516167 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/nixpkgs/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 2333d47d820..2333d47d820 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/nixpkgs/pkgs/applications/networking/newsreaders/quiterss/default.nix
diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/nixpkgs/pkgs/applications/networking/newsreaders/slrn/default.nix
index e8fff0deddf..e8fff0deddf 100644
--- a/pkgs/applications/networking/newsreaders/slrn/default.nix
+++ b/nixpkgs/pkgs/applications/networking/newsreaders/slrn/default.nix
diff --git a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch b/nixpkgs/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
index ab7cb9bffa4..ab7cb9bffa4 100644
--- a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
+++ b/nixpkgs/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix
index c362de2daa3..c362de2daa3 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix
diff --git a/pkgs/applications/networking/nload/default.nix b/nixpkgs/pkgs/applications/networking/nload/default.nix
index 16cc0e3d50a..16cc0e3d50a 100644
--- a/pkgs/applications/networking/nload/default.nix
+++ b/nixpkgs/pkgs/applications/networking/nload/default.nix
diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix
index 96bdc0b1dfa..96bdc0b1dfa 100644
--- a/pkgs/applications/networking/nntp-proxy/default.nix
+++ b/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix
diff --git a/pkgs/applications/networking/offrss/default.nix b/nixpkgs/pkgs/applications/networking/offrss/default.nix
index d91bfbae501..d91bfbae501 100644
--- a/pkgs/applications/networking/offrss/default.nix
+++ b/nixpkgs/pkgs/applications/networking/offrss/default.nix
diff --git a/pkgs/applications/networking/omping/default.nix b/nixpkgs/pkgs/applications/networking/omping/default.nix
index dc52d767438..dc52d767438 100644
--- a/pkgs/applications/networking/omping/default.nix
+++ b/nixpkgs/pkgs/applications/networking/omping/default.nix
diff --git a/pkgs/applications/networking/ostinato/default.nix b/nixpkgs/pkgs/applications/networking/ostinato/default.nix
index 3f48601d96f..3f48601d96f 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ostinato/default.nix
diff --git a/pkgs/applications/networking/ostinato/drone_ini.patch b/nixpkgs/pkgs/applications/networking/ostinato/drone_ini.patch
index 5818f4e94c3..5818f4e94c3 100644
--- a/pkgs/applications/networking/ostinato/drone_ini.patch
+++ b/nixpkgs/pkgs/applications/networking/ostinato/drone_ini.patch
diff --git a/pkgs/applications/networking/owamp/default.nix b/nixpkgs/pkgs/applications/networking/owamp/default.nix
index 4dad5f4d6bd..4dad5f4d6bd 100644
--- a/pkgs/applications/networking/owamp/default.nix
+++ b/nixpkgs/pkgs/applications/networking/owamp/default.nix
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix
index 998944838e8..998944838e8 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix
index 63218f1c2ff..63218f1c2ff 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index 2692e5360ce..2692e5360ce 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix
index 24435288488..24435288488 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix
diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/nixpkgs/pkgs/applications/networking/p2p/freenet/freenetWrapper
index f3106265801..f3106265801 100755
--- a/pkgs/applications/networking/p2p/freenet/freenetWrapper
+++ b/nixpkgs/pkgs/applications/networking/p2p/freenet/freenetWrapper
diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/nixpkgs/pkgs/applications/networking/p2p/frostwire/default.nix
index 0449540eaff..0449540eaff 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/frostwire/default.nix
diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
index d4fbb2ceb59..d4fbb2ceb59 100644
--- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix
index e4b306453a4..e4b306453a4 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix
diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/nixpkgs/pkgs/applications/networking/p2p/gnunet/git.nix
index e8f209239bf..e8f209239bf 100644
--- a/pkgs/applications/networking/p2p/gnunet/git.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/gnunet/git.nix
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/nixpkgs/pkgs/applications/networking/p2p/ktorrent/default.nix
index e38378d09b3..e38378d09b3 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/ktorrent/default.nix
diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix
index 94720f35504..94720f35504 100644
--- a/pkgs/applications/networking/p2p/magnetico/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix
diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix
index 0ead4b7e3ec..0ead4b7e3ec 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix
diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix
index b28074a2fd6..b28074a2fd6 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix
diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix
index 46c482818f8..46c482818f8 100644
--- a/pkgs/applications/networking/p2p/opentracker/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 8ab83c8a4ba..8ab83c8a4ba 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix
index f10714031ff..f10714031ff 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix
diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix
index b52320c9681..b52320c9681 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix
diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix
index 80b8251f2a3..80b8251f2a3 100644
--- a/pkgs/applications/networking/p2p/stig/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix
diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix
index f3c7f8ccf18..f3c7f8ccf18 100644
--- a/pkgs/applications/networking/p2p/synapse-bt/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix
index 72003f41721..72003f41721 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix
diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix
index 01da8a63374..01da8a63374 100644
--- a/pkgs/applications/networking/p2p/torrential/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix
diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix
index 51d591995b7..51d591995b7 100644
--- a/pkgs/applications/networking/p2p/transgui/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix
diff --git a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
index e05ca43eb50..e05ca43eb50 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 68babaddd1b..68babaddd1b 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix
index 25996953e11..25996953e11 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix
index 683507f8b19..683507f8b19 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix
index 30491470392..30491470392 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix
diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix
index b1d3c73129a..b1d3c73129a 100644
--- a/pkgs/applications/networking/p2p/vuze/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix
diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix
index ce5a99b1e5f..ce5a99b1e5f 100644
--- a/pkgs/applications/networking/p2p/zeronet/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix
diff --git a/pkgs/applications/networking/ping/default.nix b/nixpkgs/pkgs/applications/networking/ping/default.nix
index 925618bbe99..925618bbe99 100644
--- a/pkgs/applications/networking/ping/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ping/default.nix
diff --git a/pkgs/applications/networking/pjsip/default.nix b/nixpkgs/pkgs/applications/networking/pjsip/default.nix
index c9df5d3fbe3..c9df5d3fbe3 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/nixpkgs/pkgs/applications/networking/pjsip/default.nix
diff --git a/pkgs/applications/networking/pjsip/fix-aarch64.patch b/nixpkgs/pkgs/applications/networking/pjsip/fix-aarch64.patch
index f4aabf7a9bb..f4aabf7a9bb 100644
--- a/pkgs/applications/networking/pjsip/fix-aarch64.patch
+++ b/nixpkgs/pkgs/applications/networking/pjsip/fix-aarch64.patch
diff --git a/pkgs/applications/networking/protocol/default.nix b/nixpkgs/pkgs/applications/networking/protocol/default.nix
index 8785d2449b3..8785d2449b3 100644
--- a/pkgs/applications/networking/protocol/default.nix
+++ b/nixpkgs/pkgs/applications/networking/protocol/default.nix
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix
index 7acf821dfcf..7acf821dfcf 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix
diff --git a/pkgs/applications/networking/protonvpn-cli-ng/default.nix b/nixpkgs/pkgs/applications/networking/protonvpn-cli-ng/default.nix
index 03d1a665273..03d1a665273 100644
--- a/pkgs/applications/networking/protonvpn-cli-ng/default.nix
+++ b/nixpkgs/pkgs/applications/networking/protonvpn-cli-ng/default.nix
diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/nixpkgs/pkgs/applications/networking/protonvpn-cli/default.nix
index f426a7c3a58..f426a7c3a58 100644
--- a/pkgs/applications/networking/protonvpn-cli/default.nix
+++ b/nixpkgs/pkgs/applications/networking/protonvpn-cli/default.nix
diff --git a/pkgs/applications/networking/ps2client/default.nix b/nixpkgs/pkgs/applications/networking/ps2client/default.nix
index d75f92cb25c..d75f92cb25c 100644
--- a/pkgs/applications/networking/ps2client/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ps2client/default.nix
diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/nixpkgs/pkgs/applications/networking/pyload/beautifulsoup.nix
index 66470bf8f31..66470bf8f31 100644
--- a/pkgs/applications/networking/pyload/beautifulsoup.nix
+++ b/nixpkgs/pkgs/applications/networking/pyload/beautifulsoup.nix
diff --git a/pkgs/applications/networking/pyload/default.nix b/nixpkgs/pkgs/applications/networking/pyload/default.nix
index 3df21d414e0..3df21d414e0 100644
--- a/pkgs/applications/networking/pyload/default.nix
+++ b/nixpkgs/pkgs/applications/networking/pyload/default.nix
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix
index 573752b5b53..573752b5b53 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix
diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix
index f6ec85f3c2c..f6ec85f3c2c 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix
diff --git a/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix
index ea475ae6dbc..ea475ae6dbc 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix
index 5963c6b6c95..5963c6b6c95 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix
diff --git a/pkgs/applications/networking/remote/putty/default.nix b/nixpkgs/pkgs/applications/networking/remote/putty/default.nix
index 49182ec182f..49182ec182f 100644
--- a/pkgs/applications/networking/remote/putty/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/putty/default.nix
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix
index 9c9abe55daa..9c9abe55daa 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix
index de221fce389..de221fce389 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix
index 68a454745c7..68a454745c7 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix
diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix
index d253e766284..d253e766284 100644
--- a/pkgs/applications/networking/remote/waypipe/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix
index 13bcbf9b57e..13bcbf9b57e 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix
diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix
index f69d2326217..f69d2326217 100644
--- a/pkgs/applications/networking/remote/x2goserver/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix
index 5d33f186df7..5d33f186df7 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix
index 14d418cd2bf..14d418cd2bf 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/nixpkgs/pkgs/applications/networking/seafile-client/default.nix
index 1b96e9fb663..1b96e9fb663 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/nixpkgs/pkgs/applications/networking/seafile-client/default.nix
diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix
index dc578dccd19..dc578dccd19 100644
--- a/pkgs/applications/networking/sieve-connect/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix
diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/nixpkgs/pkgs/applications/networking/siproxd/cheaders.patch
index 69a3e328737..69a3e328737 100644
--- a/pkgs/applications/networking/siproxd/cheaders.patch
+++ b/nixpkgs/pkgs/applications/networking/siproxd/cheaders.patch
diff --git a/pkgs/applications/networking/siproxd/default.nix b/nixpkgs/pkgs/applications/networking/siproxd/default.nix
index cd697f107b3..cd697f107b3 100644
--- a/pkgs/applications/networking/siproxd/default.nix
+++ b/nixpkgs/pkgs/applications/networking/siproxd/default.nix
diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/etherape/default.nix
index 81c48cff4a0..81c48cff4a0 100644
--- a/pkgs/applications/networking/sniffers/etherape/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sniffers/etherape/default.nix
diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix
index dbff491fa80..dbff491fa80 100644
--- a/pkgs/applications/networking/sniffers/ettercap/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix
diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix
index 0005a5d230d..0005a5d230d 100644
--- a/pkgs/applications/networking/sniffers/kismet/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix
diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix
index 5c536b8aec2..5c536b8aec2 100644
--- a/pkgs/applications/networking/sniffers/sngrep/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix
index 2da36be90de..2da36be90de 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix
diff --git a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
index 549da5436e6..549da5436e6 100644
--- a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
+++ b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
diff --git a/pkgs/applications/networking/sniproxy/default.nix b/nixpkgs/pkgs/applications/networking/sniproxy/default.nix
index 301802d322b..301802d322b 100644
--- a/pkgs/applications/networking/sniproxy/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sniproxy/default.nix
diff --git a/pkgs/applications/networking/soapui/default.nix b/nixpkgs/pkgs/applications/networking/soapui/default.nix
index 9de525d9324..9de525d9324 100644
--- a/pkgs/applications/networking/soapui/default.nix
+++ b/nixpkgs/pkgs/applications/networking/soapui/default.nix
diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
index 158e6c5dad1..158e6c5dad1 100644
--- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
+++ b/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
diff --git a/pkgs/applications/networking/spideroak/default.nix b/nixpkgs/pkgs/applications/networking/spideroak/default.nix
index 11c8af368b9..11c8af368b9 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/nixpkgs/pkgs/applications/networking/spideroak/default.nix
diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/nixpkgs/pkgs/applications/networking/ssb/patchwork-classic/default.nix
index 74a02f47c3b..74a02f47c3b 100644
--- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ssb/patchwork-classic/default.nix
diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/nixpkgs/pkgs/applications/networking/ssb/patchwork/default.nix
index cf1159b83f8..cf1159b83f8 100644
--- a/pkgs/applications/networking/ssb/patchwork/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ssb/patchwork/default.nix
diff --git a/pkgs/applications/networking/station/default.nix b/nixpkgs/pkgs/applications/networking/station/default.nix
index afc89fe7802..afc89fe7802 100644
--- a/pkgs/applications/networking/station/default.nix
+++ b/nixpkgs/pkgs/applications/networking/station/default.nix
diff --git a/pkgs/applications/networking/super-productivity/default.nix b/nixpkgs/pkgs/applications/networking/super-productivity/default.nix
index c5ff090a807..c5ff090a807 100644
--- a/pkgs/applications/networking/super-productivity/default.nix
+++ b/nixpkgs/pkgs/applications/networking/super-productivity/default.nix
diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix
index 669ab4d1e3e..669ab4d1e3e 100644
--- a/pkgs/applications/networking/sync/acd_cli/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix
index 36c4dd46222..36c4dd46222 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix
diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix
index b72ddc8bae6..b72ddc8bae6 100644
--- a/pkgs/applications/networking/sync/backintime/qt4.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix
diff --git a/pkgs/applications/networking/sync/casync/default.nix b/nixpkgs/pkgs/applications/networking/sync/casync/default.nix
index 82a99bf2df1..82a99bf2df1 100644
--- a/pkgs/applications/networking/sync/casync/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/casync/default.nix
diff --git a/pkgs/applications/networking/sync/desync/default.nix b/nixpkgs/pkgs/applications/networking/sync/desync/default.nix
index d38f8b53dbb..d38f8b53dbb 100644
--- a/pkgs/applications/networking/sync/desync/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/desync/default.nix
diff --git a/pkgs/applications/networking/sync/desync/deps.nix b/nixpkgs/pkgs/applications/networking/sync/desync/deps.nix
index 7f5f3251d16..7f5f3251d16 100644
--- a/pkgs/applications/networking/sync/desync/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/desync/deps.nix
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix
index 832f7c63f27..832f7c63f27 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix
diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix
index 636761d2aaf..636761d2aaf 100644
--- a/pkgs/applications/networking/sync/onedrive/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix
diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix
index 00edcd411fd..00edcd411fd 100644
--- a/pkgs/applications/networking/sync/rclone/browser.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix
index 71421eaf1e7..71421eaf1e7 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix
diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/nixpkgs/pkgs/applications/networking/sync/rsync/base.nix
index fc4bc6c0671..fc4bc6c0671 100644
--- a/pkgs/applications/networking/sync/rsync/base.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/rsync/base.nix
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix
index 4045c1f0fc5..4045c1f0fc5 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix
index 19be478b0f1..19be478b0f1 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/nixpkgs/pkgs/applications/networking/sync/unison/default.nix
index cada3f93f55..cada3f93f55 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sync/unison/default.nix
diff --git a/pkgs/applications/networking/syncplay/default.nix b/nixpkgs/pkgs/applications/networking/syncplay/default.nix
index 920a1c97539..920a1c97539 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/nixpkgs/pkgs/applications/networking/syncplay/default.nix
diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix
index 9317ccab4ea..9317ccab4ea 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix
diff --git a/pkgs/applications/networking/syncthing-gtk/paths.patch b/nixpkgs/pkgs/applications/networking/syncthing-gtk/paths.patch
index 0ba5a4f2db8..0ba5a4f2db8 100644
--- a/pkgs/applications/networking/syncthing-gtk/paths.patch
+++ b/nixpkgs/pkgs/applications/networking/syncthing-gtk/paths.patch
diff --git a/pkgs/applications/networking/syncthing/add-stcli-target.patch b/nixpkgs/pkgs/applications/networking/syncthing/add-stcli-target.patch
index 07b5e334b2c..07b5e334b2c 100644
--- a/pkgs/applications/networking/syncthing/add-stcli-target.patch
+++ b/nixpkgs/pkgs/applications/networking/syncthing/add-stcli-target.patch
diff --git a/pkgs/applications/networking/syncthing/default.nix b/nixpkgs/pkgs/applications/networking/syncthing/default.nix
index 8a110c63929..8a110c63929 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/nixpkgs/pkgs/applications/networking/syncthing/default.nix
diff --git a/pkgs/applications/networking/tcpkali/default.nix b/nixpkgs/pkgs/applications/networking/tcpkali/default.nix
index a7142542238..a7142542238 100644
--- a/pkgs/applications/networking/tcpkali/default.nix
+++ b/nixpkgs/pkgs/applications/networking/tcpkali/default.nix
diff --git a/pkgs/applications/networking/testssl/default.nix b/nixpkgs/pkgs/applications/networking/testssl/default.nix
index e518502d6f3..e518502d6f3 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/nixpkgs/pkgs/applications/networking/testssl/default.nix
diff --git a/pkgs/applications/networking/trebleshot/default.nix b/nixpkgs/pkgs/applications/networking/trebleshot/default.nix
index 1b049ff2dc7..1b049ff2dc7 100644
--- a/pkgs/applications/networking/trebleshot/default.nix
+++ b/nixpkgs/pkgs/applications/networking/trebleshot/default.nix
diff --git a/pkgs/applications/networking/tsung/default.nix b/nixpkgs/pkgs/applications/networking/tsung/default.nix
index 6f5a3f3ec16..6f5a3f3ec16 100644
--- a/pkgs/applications/networking/tsung/default.nix
+++ b/nixpkgs/pkgs/applications/networking/tsung/default.nix
diff --git a/pkgs/applications/networking/umurmur/default.nix b/nixpkgs/pkgs/applications/networking/umurmur/default.nix
index 1a19c8c96b3..1a19c8c96b3 100644
--- a/pkgs/applications/networking/umurmur/default.nix
+++ b/nixpkgs/pkgs/applications/networking/umurmur/default.nix
diff --git a/pkgs/applications/networking/vnstat/default.nix b/nixpkgs/pkgs/applications/networking/vnstat/default.nix
index acda73b0f09..acda73b0f09 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/nixpkgs/pkgs/applications/networking/vnstat/default.nix
diff --git a/pkgs/applications/networking/wayback_machine_downloader/Gemfile b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/Gemfile
index e519efbf570..e519efbf570 100644
--- a/pkgs/applications/networking/wayback_machine_downloader/Gemfile
+++ b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/Gemfile
diff --git a/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock
index 86e064347b6..86e064347b6 100644
--- a/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock
diff --git a/pkgs/applications/networking/wayback_machine_downloader/default.nix b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/default.nix
index 49471ebf7e3..49471ebf7e3 100644
--- a/pkgs/applications/networking/wayback_machine_downloader/default.nix
+++ b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/default.nix
diff --git a/pkgs/applications/networking/wayback_machine_downloader/gemset.nix b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/gemset.nix
index 615570f1f09..615570f1f09 100644
--- a/pkgs/applications/networking/wayback_machine_downloader/gemset.nix
+++ b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/gemset.nix
diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix
index 64fef08ceef..64fef08ceef 100644
--- a/pkgs/applications/networking/weather/meteo/default.nix
+++ b/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix
diff --git a/pkgs/applications/networking/websocketd/default.nix b/nixpkgs/pkgs/applications/networking/websocketd/default.nix
index 4160e70b9c4..4160e70b9c4 100644
--- a/pkgs/applications/networking/websocketd/default.nix
+++ b/nixpkgs/pkgs/applications/networking/websocketd/default.nix
diff --git a/pkgs/applications/networking/znc/default.nix b/nixpkgs/pkgs/applications/networking/znc/default.nix
index bf36a6f2bbb..bf36a6f2bbb 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/nixpkgs/pkgs/applications/networking/znc/default.nix
diff --git a/pkgs/applications/networking/znc/modules.nix b/nixpkgs/pkgs/applications/networking/znc/modules.nix
index 5e7bdd09b03..5e7bdd09b03 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/nixpkgs/pkgs/applications/networking/znc/modules.nix
diff --git a/pkgs/applications/office/abiword/default.nix b/nixpkgs/pkgs/applications/office/abiword/default.nix
index a2b14443c1a..a2b14443c1a 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/nixpkgs/pkgs/applications/office/abiword/default.nix
diff --git a/pkgs/applications/office/aesop/default.nix b/nixpkgs/pkgs/applications/office/aesop/default.nix
index d5a10f43c55..d5a10f43c55 100644
--- a/pkgs/applications/office/aesop/default.nix
+++ b/nixpkgs/pkgs/applications/office/aesop/default.nix
diff --git a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch b/nixpkgs/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch
index ebf2f0900d9..ebf2f0900d9 100644
--- a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch
+++ b/nixpkgs/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch
diff --git a/pkgs/applications/office/antiword/default.nix b/nixpkgs/pkgs/applications/office/antiword/default.nix
index e6c939b277e..e6c939b277e 100644
--- a/pkgs/applications/office/antiword/default.nix
+++ b/nixpkgs/pkgs/applications/office/antiword/default.nix
diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix
index 021eadb6476..021eadb6476 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix
diff --git a/pkgs/applications/office/atlassian-cli/wrapper.sh b/nixpkgs/pkgs/applications/office/atlassian-cli/wrapper.sh
index 80b60dbc468..80b60dbc468 100755
--- a/pkgs/applications/office/atlassian-cli/wrapper.sh
+++ b/nixpkgs/pkgs/applications/office/atlassian-cli/wrapper.sh
diff --git a/pkgs/applications/office/autokey/default.nix b/nixpkgs/pkgs/applications/office/autokey/default.nix
index 31e74ccf23a..31e74ccf23a 100644
--- a/pkgs/applications/office/autokey/default.nix
+++ b/nixpkgs/pkgs/applications/office/autokey/default.nix
diff --git a/pkgs/applications/office/autokey/remove-requires-dbus-python.patch b/nixpkgs/pkgs/applications/office/autokey/remove-requires-dbus-python.patch
index 73372e43529..73372e43529 100644
--- a/pkgs/applications/office/autokey/remove-requires-dbus-python.patch
+++ b/nixpkgs/pkgs/applications/office/autokey/remove-requires-dbus-python.patch
diff --git a/pkgs/applications/office/beancount/bean-add.nix b/nixpkgs/pkgs/applications/office/beancount/bean-add.nix
index aefd696ae4e..aefd696ae4e 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/nixpkgs/pkgs/applications/office/beancount/bean-add.nix
diff --git a/pkgs/applications/office/bookworm/default.nix b/nixpkgs/pkgs/applications/office/bookworm/default.nix
index be6fe172e29..be6fe172e29 100644
--- a/pkgs/applications/office/bookworm/default.nix
+++ b/nixpkgs/pkgs/applications/office/bookworm/default.nix
diff --git a/pkgs/applications/office/calligra/default.nix b/nixpkgs/pkgs/applications/office/calligra/default.nix
index 4855fbc63c3..4855fbc63c3 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/nixpkgs/pkgs/applications/office/calligra/default.nix
diff --git a/pkgs/applications/office/calligra/qt5_11.patch b/nixpkgs/pkgs/applications/office/calligra/qt5_11.patch
index 66ff8c6eedc..66ff8c6eedc 100644
--- a/pkgs/applications/office/calligra/qt5_11.patch
+++ b/nixpkgs/pkgs/applications/office/calligra/qt5_11.patch
diff --git a/pkgs/applications/office/cb2bib/default.nix b/nixpkgs/pkgs/applications/office/cb2bib/default.nix
index 0043648146f..0043648146f 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/nixpkgs/pkgs/applications/office/cb2bib/default.nix
diff --git a/pkgs/applications/office/csv2odf/default.nix b/nixpkgs/pkgs/applications/office/csv2odf/default.nix
index 7bab06ed4ab..7bab06ed4ab 100644
--- a/pkgs/applications/office/csv2odf/default.nix
+++ b/nixpkgs/pkgs/applications/office/csv2odf/default.nix
diff --git a/pkgs/applications/office/docear/default.nix b/nixpkgs/pkgs/applications/office/docear/default.nix
index fb9578c909d..fb9578c909d 100644
--- a/pkgs/applications/office/docear/default.nix
+++ b/nixpkgs/pkgs/applications/office/docear/default.nix
diff --git a/pkgs/applications/office/envelope/default.nix b/nixpkgs/pkgs/applications/office/envelope/default.nix
index bb85ae2e12b..bb85ae2e12b 100644
--- a/pkgs/applications/office/envelope/default.nix
+++ b/nixpkgs/pkgs/applications/office/envelope/default.nix
diff --git a/pkgs/applications/office/fava/default.nix b/nixpkgs/pkgs/applications/office/fava/default.nix
index 6693d35dbd1..6693d35dbd1 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/nixpkgs/pkgs/applications/office/fava/default.nix
diff --git a/pkgs/applications/office/flexibee/default.nix b/nixpkgs/pkgs/applications/office/flexibee/default.nix
index c215b9ef637..c215b9ef637 100644
--- a/pkgs/applications/office/flexibee/default.nix
+++ b/nixpkgs/pkgs/applications/office/flexibee/default.nix
diff --git a/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch b/nixpkgs/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch
index 5e0ae68e17c..5e0ae68e17c 100644
--- a/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch
+++ b/nixpkgs/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch
diff --git a/pkgs/applications/office/gnucash/default.nix b/nixpkgs/pkgs/applications/office/gnucash/default.nix
index 476b1128b94..476b1128b94 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/nixpkgs/pkgs/applications/office/gnucash/default.nix
diff --git a/pkgs/applications/office/gnumeric/default.nix b/nixpkgs/pkgs/applications/office/gnumeric/default.nix
index 710a66c25d8..710a66c25d8 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/nixpkgs/pkgs/applications/office/gnumeric/default.nix
diff --git a/pkgs/applications/office/grisbi/default.nix b/nixpkgs/pkgs/applications/office/grisbi/default.nix
index cb8cf76b998..cb8cf76b998 100644
--- a/pkgs/applications/office/grisbi/default.nix
+++ b/nixpkgs/pkgs/applications/office/grisbi/default.nix
diff --git a/pkgs/applications/office/homebank/default.nix b/nixpkgs/pkgs/applications/office/homebank/default.nix
index 683cddde5ec..683cddde5ec 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/nixpkgs/pkgs/applications/office/homebank/default.nix
diff --git a/pkgs/applications/office/ib/controller/default.nix b/nixpkgs/pkgs/applications/office/ib/controller/default.nix
index 372414c1a76..372414c1a76 100644
--- a/pkgs/applications/office/ib/controller/default.nix
+++ b/nixpkgs/pkgs/applications/office/ib/controller/default.nix
diff --git a/pkgs/applications/office/ib/tws/default.nix b/nixpkgs/pkgs/applications/office/ib/tws/default.nix
index a88f1af02c6..a88f1af02c6 100644
--- a/pkgs/applications/office/ib/tws/default.nix
+++ b/nixpkgs/pkgs/applications/office/ib/tws/default.nix
diff --git a/pkgs/applications/office/impressive/default.nix b/nixpkgs/pkgs/applications/office/impressive/default.nix
index a8c318d690a..a8c318d690a 100644
--- a/pkgs/applications/office/impressive/default.nix
+++ b/nixpkgs/pkgs/applications/office/impressive/default.nix
diff --git a/pkgs/applications/office/jabref/default.nix b/nixpkgs/pkgs/applications/office/jabref/default.nix
index d0a7757e49d..d0a7757e49d 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/nixpkgs/pkgs/applications/office/jabref/default.nix
diff --git a/pkgs/applications/office/jameica/default.nix b/nixpkgs/pkgs/applications/office/jameica/default.nix
index 7b4feed1733..7b4feed1733 100644
--- a/pkgs/applications/office/jameica/default.nix
+++ b/nixpkgs/pkgs/applications/office/jameica/default.nix
diff --git a/pkgs/applications/office/keepnote/default.nix b/nixpkgs/pkgs/applications/office/keepnote/default.nix
index 2e0b3f3fed7..2e0b3f3fed7 100644
--- a/pkgs/applications/office/keepnote/default.nix
+++ b/nixpkgs/pkgs/applications/office/keepnote/default.nix
diff --git a/pkgs/applications/office/kexi/default.nix b/nixpkgs/pkgs/applications/office/kexi/default.nix
index 8db7068f7cf..8db7068f7cf 100644
--- a/pkgs/applications/office/kexi/default.nix
+++ b/nixpkgs/pkgs/applications/office/kexi/default.nix
diff --git a/pkgs/applications/office/kmymoney/default.nix b/nixpkgs/pkgs/applications/office/kmymoney/default.nix
index 275cd826a69..275cd826a69 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/nixpkgs/pkgs/applications/office/kmymoney/default.nix
diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix
index 62ac6a80382..62ac6a80382 100644
--- a/pkgs/applications/office/ledger-autosync/default.nix
+++ b/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix
diff --git a/pkgs/applications/office/ledger-web/Gemfile b/nixpkgs/pkgs/applications/office/ledger-web/Gemfile
index 77e8024da3a..77e8024da3a 100644
--- a/pkgs/applications/office/ledger-web/Gemfile
+++ b/nixpkgs/pkgs/applications/office/ledger-web/Gemfile
diff --git a/pkgs/applications/office/ledger-web/Gemfile.lock b/nixpkgs/pkgs/applications/office/ledger-web/Gemfile.lock
index f18460420c5..f18460420c5 100644
--- a/pkgs/applications/office/ledger-web/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/office/ledger-web/Gemfile.lock
diff --git a/pkgs/applications/office/ledger-web/default.nix b/nixpkgs/pkgs/applications/office/ledger-web/default.nix
index 0a8f68bc096..0a8f68bc096 100644
--- a/pkgs/applications/office/ledger-web/default.nix
+++ b/nixpkgs/pkgs/applications/office/ledger-web/default.nix
diff --git a/pkgs/applications/office/ledger-web/gemset.nix b/nixpkgs/pkgs/applications/office/ledger-web/gemset.nix
index 71a959c0a86..71a959c0a86 100644
--- a/pkgs/applications/office/ledger-web/gemset.nix
+++ b/nixpkgs/pkgs/applications/office/ledger-web/gemset.nix
diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/nixpkgs/pkgs/applications/office/ledger/2.6.3.nix
index 60fff1d0131..60fff1d0131 100644
--- a/pkgs/applications/office/ledger/2.6.3.nix
+++ b/nixpkgs/pkgs/applications/office/ledger/2.6.3.nix
diff --git a/pkgs/applications/office/ledger/default.nix b/nixpkgs/pkgs/applications/office/ledger/default.nix
index 99e09a8f36f..99e09a8f36f 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/nixpkgs/pkgs/applications/office/ledger/default.nix
diff --git a/pkgs/applications/office/libreoffice/README.md b/nixpkgs/pkgs/applications/office/libreoffice/README.md
index a084572d217..a084572d217 100644
--- a/pkgs/applications/office/libreoffice/README.md
+++ b/nixpkgs/pkgs/applications/office/libreoffice/README.md
diff --git a/pkgs/applications/office/libreoffice/default.nix b/nixpkgs/pkgs/applications/office/libreoffice/default.nix
index c8bb58d2921..c8bb58d2921 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/default.nix
diff --git a/pkgs/applications/office/libreoffice/download-list-builder.sh b/nixpkgs/pkgs/applications/office/libreoffice/download-list-builder.sh
index c054e2c72cb..c054e2c72cb 100644
--- a/pkgs/applications/office/libreoffice/download-list-builder.sh
+++ b/nixpkgs/pkgs/applications/office/libreoffice/download-list-builder.sh
diff --git a/pkgs/applications/office/libreoffice/gen-shell.nix b/nixpkgs/pkgs/applications/office/libreoffice/gen-shell.nix
index 7429bb0cb38..7429bb0cb38 100644
--- a/pkgs/applications/office/libreoffice/gen-shell.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/gen-shell.nix
diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/nixpkgs/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
index 636f36cb383..636f36cb383 100755
--- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
+++ b/nixpkgs/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json
index 5b4363189f7..5b4363189f7 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json
+++ b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json
diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix
index 4df8ce1059b..4df8ce1059b 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/download.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix
diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix
index 464965121d9..464965121d9 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/override.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix
diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix
index 28bf127c398..28bf127c398 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix
diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix
index b5a721b5679..b5a721b5679 100644
--- a/pkgs/applications/office/libreoffice/src-still/download.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix
diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix
index 7192af01949..7192af01949 100644
--- a/pkgs/applications/office/libreoffice/src-still/override.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix
diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix
index a27087a1b05..a27087a1b05 100644
--- a/pkgs/applications/office/libreoffice/src-still/primary.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix
diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix
index 08b01a4a051..08b01a4a051 100644
--- a/pkgs/applications/office/libreoffice/wrapper.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix
diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh
index 62569734745..62569734745 100644
--- a/pkgs/applications/office/libreoffice/wrapper.sh
+++ b/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh
diff --git a/pkgs/applications/office/libreoffice/xdg-open-brief.patch b/nixpkgs/pkgs/applications/office/libreoffice/xdg-open-brief.patch
index 0a2f02e71fe..0a2f02e71fe 100644
--- a/pkgs/applications/office/libreoffice/xdg-open-brief.patch
+++ b/nixpkgs/pkgs/applications/office/libreoffice/xdg-open-brief.patch
diff --git a/pkgs/applications/office/marp/default.nix b/nixpkgs/pkgs/applications/office/marp/default.nix
index 7c054ba5204..7c054ba5204 100644
--- a/pkgs/applications/office/marp/default.nix
+++ b/nixpkgs/pkgs/applications/office/marp/default.nix
diff --git a/pkgs/applications/office/mendeley/default.nix b/nixpkgs/pkgs/applications/office/mendeley/default.nix
index 9fdeecfee36..9fdeecfee36 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/nixpkgs/pkgs/applications/office/mendeley/default.nix
diff --git a/pkgs/applications/office/mendeley/update.nix b/nixpkgs/pkgs/applications/office/mendeley/update.nix
index 56becea9959..56becea9959 100644
--- a/pkgs/applications/office/mendeley/update.nix
+++ b/nixpkgs/pkgs/applications/office/mendeley/update.nix
diff --git a/pkgs/applications/office/minetime/default.nix b/nixpkgs/pkgs/applications/office/minetime/default.nix
index 42802409e59..42802409e59 100644
--- a/pkgs/applications/office/minetime/default.nix
+++ b/nixpkgs/pkgs/applications/office/minetime/default.nix
diff --git a/pkgs/applications/office/mmex/default.nix b/nixpkgs/pkgs/applications/office/mmex/default.nix
index ed33d121a05..ed33d121a05 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/nixpkgs/pkgs/applications/office/mmex/default.nix
diff --git a/pkgs/applications/office/moneyplex/default.nix b/nixpkgs/pkgs/applications/office/moneyplex/default.nix
index 103288c03c6..103288c03c6 100644
--- a/pkgs/applications/office/moneyplex/default.nix
+++ b/nixpkgs/pkgs/applications/office/moneyplex/default.nix
diff --git a/pkgs/applications/office/mytetra/default.nix b/nixpkgs/pkgs/applications/office/mytetra/default.nix
index 050222451cf..050222451cf 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/nixpkgs/pkgs/applications/office/mytetra/default.nix
diff --git a/pkgs/applications/office/notes-up/default.nix b/nixpkgs/pkgs/applications/office/notes-up/default.nix
index 1d2e581f3c9..1d2e581f3c9 100644
--- a/pkgs/applications/office/notes-up/default.nix
+++ b/nixpkgs/pkgs/applications/office/notes-up/default.nix
diff --git a/pkgs/applications/office/osmo/default.nix b/nixpkgs/pkgs/applications/office/osmo/default.nix
index b1311428c61..b1311428c61 100644
--- a/pkgs/applications/office/osmo/default.nix
+++ b/nixpkgs/pkgs/applications/office/osmo/default.nix
diff --git a/pkgs/applications/office/paperless/default.nix b/nixpkgs/pkgs/applications/office/paperless/default.nix
index 1383986cf2e..1383986cf2e 100644
--- a/pkgs/applications/office/paperless/default.nix
+++ b/nixpkgs/pkgs/applications/office/paperless/default.nix
diff --git a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix
index 465da386247..465da386247 100644
--- a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix
+++ b/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix
diff --git a/pkgs/applications/office/paperless/python-modules/django-filter.nix b/nixpkgs/pkgs/applications/office/paperless/python-modules/django-filter.nix
index ffe94d10d5c..ffe94d10d5c 100644
--- a/pkgs/applications/office/paperless/python-modules/django-filter.nix
+++ b/nixpkgs/pkgs/applications/office/paperless/python-modules/django-filter.nix
diff --git a/pkgs/applications/office/paperless/withConfig.nix b/nixpkgs/pkgs/applications/office/paperless/withConfig.nix
index 652d1478c0c..652d1478c0c 100644
--- a/pkgs/applications/office/paperless/withConfig.nix
+++ b/nixpkgs/pkgs/applications/office/paperless/withConfig.nix
diff --git a/pkgs/applications/office/paperwork/backend.nix b/nixpkgs/pkgs/applications/office/paperwork/backend.nix
index 7f82780fbe9..7f82780fbe9 100644
--- a/pkgs/applications/office/paperwork/backend.nix
+++ b/nixpkgs/pkgs/applications/office/paperwork/backend.nix
diff --git a/pkgs/applications/office/paperwork/default.nix b/nixpkgs/pkgs/applications/office/paperwork/default.nix
index 3506ea8b551..3506ea8b551 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/nixpkgs/pkgs/applications/office/paperwork/default.nix
diff --git a/pkgs/applications/office/pinpoint/default.nix b/nixpkgs/pkgs/applications/office/pinpoint/default.nix
index 14756c3557f..14756c3557f 100644
--- a/pkgs/applications/office/pinpoint/default.nix
+++ b/nixpkgs/pkgs/applications/office/pinpoint/default.nix
diff --git a/pkgs/applications/office/planner/default.nix b/nixpkgs/pkgs/applications/office/planner/default.nix
index 6189132d0f9..6189132d0f9 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/nixpkgs/pkgs/applications/office/planner/default.nix
diff --git a/pkgs/applications/office/pympress/default.nix b/nixpkgs/pkgs/applications/office/pympress/default.nix
index b4307eb286e..b4307eb286e 100644
--- a/pkgs/applications/office/pympress/default.nix
+++ b/nixpkgs/pkgs/applications/office/pympress/default.nix
diff --git a/pkgs/applications/office/qnotero/default.nix b/nixpkgs/pkgs/applications/office/qnotero/default.nix
index b317838f672..b317838f672 100644
--- a/pkgs/applications/office/qnotero/default.nix
+++ b/nixpkgs/pkgs/applications/office/qnotero/default.nix
diff --git a/pkgs/applications/office/qownnotes/default.nix b/nixpkgs/pkgs/applications/office/qownnotes/default.nix
index 30569512129..30569512129 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/nixpkgs/pkgs/applications/office/qownnotes/default.nix
diff --git a/pkgs/applications/office/scribus/default.nix b/nixpkgs/pkgs/applications/office/scribus/default.nix
index d6b73b07f0e..d6b73b07f0e 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/nixpkgs/pkgs/applications/office/scribus/default.nix
diff --git a/pkgs/applications/office/scribus/unstable.nix b/nixpkgs/pkgs/applications/office/scribus/unstable.nix
index 2a602b094ba..2a602b094ba 100644
--- a/pkgs/applications/office/scribus/unstable.nix
+++ b/nixpkgs/pkgs/applications/office/scribus/unstable.nix
diff --git a/pkgs/applications/office/skanlite/default.nix b/nixpkgs/pkgs/applications/office/skanlite/default.nix
index d4c1df75709..d4c1df75709 100644
--- a/pkgs/applications/office/skanlite/default.nix
+++ b/nixpkgs/pkgs/applications/office/skanlite/default.nix
diff --git a/pkgs/applications/office/skrooge/default.nix b/nixpkgs/pkgs/applications/office/skrooge/default.nix
index 1db5ce16fe5..1db5ce16fe5 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/nixpkgs/pkgs/applications/office/skrooge/default.nix
diff --git a/pkgs/applications/office/softmaker/desktop_items.nix b/nixpkgs/pkgs/applications/office/softmaker/desktop_items.nix
index 6975da06456..6975da06456 100644
--- a/pkgs/applications/office/softmaker/desktop_items.nix
+++ b/nixpkgs/pkgs/applications/office/softmaker/desktop_items.nix
diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix
index ff54f8ff90f..ff54f8ff90f 100644
--- a/pkgs/applications/office/softmaker/freeoffice.nix
+++ b/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix
diff --git a/pkgs/applications/office/softmaker/generic.nix b/nixpkgs/pkgs/applications/office/softmaker/generic.nix
index 82ac2b58f68..82ac2b58f68 100644
--- a/pkgs/applications/office/softmaker/generic.nix
+++ b/nixpkgs/pkgs/applications/office/softmaker/generic.nix
diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix
index 73a7d9bd35b..73a7d9bd35b 100644
--- a/pkgs/applications/office/softmaker/softmaker_office.nix
+++ b/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix
diff --git a/pkgs/applications/office/spice-up/default.nix b/nixpkgs/pkgs/applications/office/spice-up/default.nix
index 07a3b26a1a8..07a3b26a1a8 100644
--- a/pkgs/applications/office/spice-up/default.nix
+++ b/nixpkgs/pkgs/applications/office/spice-up/default.nix
diff --git a/pkgs/applications/office/tagainijisho/default.nix b/nixpkgs/pkgs/applications/office/tagainijisho/default.nix
index 24542041cc8..24542041cc8 100644
--- a/pkgs/applications/office/tagainijisho/default.nix
+++ b/nixpkgs/pkgs/applications/office/tagainijisho/default.nix
diff --git a/pkgs/applications/office/timetable/default.nix b/nixpkgs/pkgs/applications/office/timetable/default.nix
index 1a63fdf0f3f..1a63fdf0f3f 100644
--- a/pkgs/applications/office/timetable/default.nix
+++ b/nixpkgs/pkgs/applications/office/timetable/default.nix
diff --git a/pkgs/applications/office/timetrap/Gemfile b/nixpkgs/pkgs/applications/office/timetrap/Gemfile
index 3ce845d11c1..3ce845d11c1 100644
--- a/pkgs/applications/office/timetrap/Gemfile
+++ b/nixpkgs/pkgs/applications/office/timetrap/Gemfile
diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/nixpkgs/pkgs/applications/office/timetrap/Gemfile.lock
index 9f2ea82cee0..9f2ea82cee0 100644
--- a/pkgs/applications/office/timetrap/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/office/timetrap/Gemfile.lock
diff --git a/pkgs/applications/office/timetrap/default.nix b/nixpkgs/pkgs/applications/office/timetrap/default.nix
index 6d094ecb5dc..6d094ecb5dc 100644
--- a/pkgs/applications/office/timetrap/default.nix
+++ b/nixpkgs/pkgs/applications/office/timetrap/default.nix
diff --git a/pkgs/applications/office/timetrap/gemset.nix b/nixpkgs/pkgs/applications/office/timetrap/gemset.nix
index 1ea489b92c3..1ea489b92c3 100644
--- a/pkgs/applications/office/timetrap/gemset.nix
+++ b/nixpkgs/pkgs/applications/office/timetrap/gemset.nix
diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/nixpkgs/pkgs/applications/office/todo.txt-cli/default.nix
index edb2c778a0a..edb2c778a0a 100644
--- a/pkgs/applications/office/todo.txt-cli/default.nix
+++ b/nixpkgs/pkgs/applications/office/todo.txt-cli/default.nix
diff --git a/pkgs/applications/office/todoman/default.nix b/nixpkgs/pkgs/applications/office/todoman/default.nix
index bfa162a54a2..bfa162a54a2 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/nixpkgs/pkgs/applications/office/todoman/default.nix
diff --git a/pkgs/applications/office/treesheets/default.nix b/nixpkgs/pkgs/applications/office/treesheets/default.nix
index 000fa7ff101..000fa7ff101 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/nixpkgs/pkgs/applications/office/treesheets/default.nix
diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/nixpkgs/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch
index 1a4350ca71a..1a4350ca71a 100644
--- a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch
+++ b/nixpkgs/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch
diff --git a/pkgs/applications/office/trilium/default.nix b/nixpkgs/pkgs/applications/office/trilium/default.nix
index 28548091f6e..28548091f6e 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/nixpkgs/pkgs/applications/office/trilium/default.nix
diff --git a/pkgs/applications/office/tryton/default.nix b/nixpkgs/pkgs/applications/office/tryton/default.nix
index b9f1465af17..b9f1465af17 100644
--- a/pkgs/applications/office/tryton/default.nix
+++ b/nixpkgs/pkgs/applications/office/tryton/default.nix
diff --git a/pkgs/applications/office/trytond/default.nix b/nixpkgs/pkgs/applications/office/trytond/default.nix
index dc63acd6db6..dc63acd6db6 100644
--- a/pkgs/applications/office/trytond/default.nix
+++ b/nixpkgs/pkgs/applications/office/trytond/default.nix
diff --git a/pkgs/applications/office/tudu/default.nix b/nixpkgs/pkgs/applications/office/tudu/default.nix
index a4734f45460..a4734f45460 100644
--- a/pkgs/applications/office/tudu/default.nix
+++ b/nixpkgs/pkgs/applications/office/tudu/default.nix
diff --git a/pkgs/applications/office/tusk/default.nix b/nixpkgs/pkgs/applications/office/tusk/default.nix
index d54f27f9bbf..d54f27f9bbf 100644
--- a/pkgs/applications/office/tusk/default.nix
+++ b/nixpkgs/pkgs/applications/office/tusk/default.nix
diff --git a/pkgs/applications/office/vnote/default.nix b/nixpkgs/pkgs/applications/office/vnote/default.nix
index 80b6ef6243c..80b6ef6243c 100644
--- a/pkgs/applications/office/vnote/default.nix
+++ b/nixpkgs/pkgs/applications/office/vnote/default.nix
diff --git a/pkgs/applications/office/watson/default.nix b/nixpkgs/pkgs/applications/office/watson/default.nix
index 7d79d79072a..7d79d79072a 100644
--- a/pkgs/applications/office/watson/default.nix
+++ b/nixpkgs/pkgs/applications/office/watson/default.nix
diff --git a/pkgs/applications/office/wordgrinder/default.nix b/nixpkgs/pkgs/applications/office/wordgrinder/default.nix
index 199f17afda7..199f17afda7 100644
--- a/pkgs/applications/office/wordgrinder/default.nix
+++ b/nixpkgs/pkgs/applications/office/wordgrinder/default.nix
diff --git a/pkgs/applications/office/wpsoffice/default.nix b/nixpkgs/pkgs/applications/office/wpsoffice/default.nix
index 7032632da88..7032632da88 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/nixpkgs/pkgs/applications/office/wpsoffice/default.nix
diff --git a/pkgs/applications/office/zanshin/default.nix b/nixpkgs/pkgs/applications/office/zanshin/default.nix
index b76e09d4d1d..b76e09d4d1d 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/nixpkgs/pkgs/applications/office/zanshin/default.nix
diff --git a/pkgs/applications/office/zim/default.nix b/nixpkgs/pkgs/applications/office/zim/default.nix
index 075552b1ec4..075552b1ec4 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/nixpkgs/pkgs/applications/office/zim/default.nix
diff --git a/pkgs/applications/office/zotero/default.nix b/nixpkgs/pkgs/applications/office/zotero/default.nix
index f24cc014cdd..f24cc014cdd 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/nixpkgs/pkgs/applications/office/zotero/default.nix
diff --git a/pkgs/applications/office/zotero/zotero.sh b/nixpkgs/pkgs/applications/office/zotero/zotero.sh
index 8941097fc42..8941097fc42 100644
--- a/pkgs/applications/office/zotero/zotero.sh
+++ b/nixpkgs/pkgs/applications/office/zotero/zotero.sh
diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
index e8241ede96c..e8241ede96c 100644
--- a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
+++ b/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
diff --git a/pkgs/applications/radio/airspy/default.nix b/nixpkgs/pkgs/applications/radio/airspy/default.nix
index 0a313c35a18..0a313c35a18 100644
--- a/pkgs/applications/radio/airspy/default.nix
+++ b/nixpkgs/pkgs/applications/radio/airspy/default.nix
diff --git a/pkgs/applications/radio/aldo/default.nix b/nixpkgs/pkgs/applications/radio/aldo/default.nix
index fc38f6be4cc..fc38f6be4cc 100644
--- a/pkgs/applications/radio/aldo/default.nix
+++ b/nixpkgs/pkgs/applications/radio/aldo/default.nix
diff --git a/pkgs/applications/radio/chirp/default.nix b/nixpkgs/pkgs/applications/radio/chirp/default.nix
index dcbf3522e39..dcbf3522e39 100644
--- a/pkgs/applications/radio/chirp/default.nix
+++ b/nixpkgs/pkgs/applications/radio/chirp/default.nix
diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix
index 14badd6c55c..14badd6c55c 100644
--- a/pkgs/applications/radio/cubicsdr/default.nix
+++ b/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix
diff --git a/pkgs/applications/radio/dablin/default.nix b/nixpkgs/pkgs/applications/radio/dablin/default.nix
index fba63362ab6..fba63362ab6 100644
--- a/pkgs/applications/radio/dablin/default.nix
+++ b/nixpkgs/pkgs/applications/radio/dablin/default.nix
diff --git a/pkgs/applications/radio/dabtools/default.nix b/nixpkgs/pkgs/applications/radio/dabtools/default.nix
index 401e207ba4f..401e207ba4f 100644
--- a/pkgs/applications/radio/dabtools/default.nix
+++ b/nixpkgs/pkgs/applications/radio/dabtools/default.nix
diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix
index 68b4cfe8af4..68b4cfe8af4 100644
--- a/pkgs/applications/radio/dmrconfig/default.nix
+++ b/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix
diff --git a/pkgs/applications/radio/dump1090/default.nix b/nixpkgs/pkgs/applications/radio/dump1090/default.nix
index 0a92bea44e8..0a92bea44e8 100644
--- a/pkgs/applications/radio/dump1090/default.nix
+++ b/nixpkgs/pkgs/applications/radio/dump1090/default.nix
diff --git a/pkgs/applications/radio/ebook2cw/configfile.patch b/nixpkgs/pkgs/applications/radio/ebook2cw/configfile.patch
index c7aafe5227a..c7aafe5227a 100644
--- a/pkgs/applications/radio/ebook2cw/configfile.patch
+++ b/nixpkgs/pkgs/applications/radio/ebook2cw/configfile.patch
diff --git a/pkgs/applications/radio/ebook2cw/default.nix b/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix
index 915d0ba84db..915d0ba84db 100644
--- a/pkgs/applications/radio/ebook2cw/default.nix
+++ b/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix
diff --git a/pkgs/applications/radio/fldigi/default.nix b/nixpkgs/pkgs/applications/radio/fldigi/default.nix
index 900f0ed7c04..900f0ed7c04 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/nixpkgs/pkgs/applications/radio/fldigi/default.nix
diff --git a/pkgs/applications/radio/fllog/default.nix b/nixpkgs/pkgs/applications/radio/fllog/default.nix
index 49149a2d82a..49149a2d82a 100644
--- a/pkgs/applications/radio/fllog/default.nix
+++ b/nixpkgs/pkgs/applications/radio/fllog/default.nix
diff --git a/pkgs/applications/radio/flmsg/default.nix b/nixpkgs/pkgs/applications/radio/flmsg/default.nix
index 39fbb0de06c..39fbb0de06c 100644
--- a/pkgs/applications/radio/flmsg/default.nix
+++ b/nixpkgs/pkgs/applications/radio/flmsg/default.nix
diff --git a/pkgs/applications/radio/flrig/default.nix b/nixpkgs/pkgs/applications/radio/flrig/default.nix
index 17d579cb45e..17d579cb45e 100644
--- a/pkgs/applications/radio/flrig/default.nix
+++ b/nixpkgs/pkgs/applications/radio/flrig/default.nix
diff --git a/pkgs/applications/radio/flwrap/default.nix b/nixpkgs/pkgs/applications/radio/flwrap/default.nix
index 6bdab0a925d..6bdab0a925d 100644
--- a/pkgs/applications/radio/flwrap/default.nix
+++ b/nixpkgs/pkgs/applications/radio/flwrap/default.nix
diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix
index ba37b7ecad2..ba37b7ecad2 100644
--- a/pkgs/applications/radio/gnss-sdr/default.nix
+++ b/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix
diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix
index c26d3e77c70..c26d3e77c70 100644
--- a/pkgs/applications/radio/gnuradio/ais.nix
+++ b/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/nixpkgs/pkgs/applications/radio/gnuradio/default.nix
index f5c89ae51ce..f5c89ae51ce 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/nixpkgs/pkgs/applications/radio/gnuradio/default.nix
diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix
index 27cdfc74aab..27cdfc74aab 100644
--- a/pkgs/applications/radio/gnuradio/gsm.nix
+++ b/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix
diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix
index ec1b802c659..ec1b802c659 100644
--- a/pkgs/applications/radio/gnuradio/limesdr.nix
+++ b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix
diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix
index 3026c81e8ef..3026c81e8ef 100644
--- a/pkgs/applications/radio/gnuradio/nacl.nix
+++ b/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix
diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix
index 017e2e1632c..017e2e1632c 100644
--- a/pkgs/applications/radio/gnuradio/osmosdr.nix
+++ b/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix
diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix
index e4a55fe5098..e4a55fe5098 100644
--- a/pkgs/applications/radio/gnuradio/rds.nix
+++ b/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix
diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix
index ffed3da0318..ffed3da0318 100644
--- a/pkgs/applications/radio/gnuradio/wrapper.nix
+++ b/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix
diff --git a/pkgs/applications/radio/gqrx/default.nix b/nixpkgs/pkgs/applications/radio/gqrx/default.nix
index 03acf9e1135..03acf9e1135 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/nixpkgs/pkgs/applications/radio/gqrx/default.nix
diff --git a/pkgs/applications/radio/hackrf/default.nix b/nixpkgs/pkgs/applications/radio/hackrf/default.nix
index 09b4c84c131..09b4c84c131 100644
--- a/pkgs/applications/radio/hackrf/default.nix
+++ b/nixpkgs/pkgs/applications/radio/hackrf/default.nix
diff --git a/pkgs/applications/radio/inspectrum/default.nix b/nixpkgs/pkgs/applications/radio/inspectrum/default.nix
index ef4bd6129a8..ef4bd6129a8 100644
--- a/pkgs/applications/radio/inspectrum/default.nix
+++ b/nixpkgs/pkgs/applications/radio/inspectrum/default.nix
diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix
index 3964a8c3737..3964a8c3737 100644
--- a/pkgs/applications/radio/kalibrate-hackrf/default.nix
+++ b/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix
diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix
index 879cd6e3aac..879cd6e3aac 100644
--- a/pkgs/applications/radio/kalibrate-rtl/default.nix
+++ b/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix
diff --git a/pkgs/applications/radio/limesuite/default.nix b/nixpkgs/pkgs/applications/radio/limesuite/default.nix
index aae062a87c7..aae062a87c7 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/nixpkgs/pkgs/applications/radio/limesuite/default.nix
diff --git a/pkgs/applications/radio/minimodem/default.nix b/nixpkgs/pkgs/applications/radio/minimodem/default.nix
index 55cd14cf70d..55cd14cf70d 100644
--- a/pkgs/applications/radio/minimodem/default.nix
+++ b/nixpkgs/pkgs/applications/radio/minimodem/default.nix
diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix
index c0f189686ac..c0f189686ac 100644
--- a/pkgs/applications/radio/multimon-ng/default.nix
+++ b/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix
diff --git a/pkgs/applications/radio/qradiolink/default.nix b/nixpkgs/pkgs/applications/radio/qradiolink/default.nix
index a00ec6c47eb..a00ec6c47eb 100644
--- a/pkgs/applications/radio/qradiolink/default.nix
+++ b/nixpkgs/pkgs/applications/radio/qradiolink/default.nix
diff --git a/pkgs/applications/radio/qsstv/default.nix b/nixpkgs/pkgs/applications/radio/qsstv/default.nix
index a4ef5a2a0d1..a4ef5a2a0d1 100644
--- a/pkgs/applications/radio/qsstv/default.nix
+++ b/nixpkgs/pkgs/applications/radio/qsstv/default.nix
diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix
index 4e9badaa6c5..4e9badaa6c5 100644
--- a/pkgs/applications/radio/rtl-sdr/default.nix
+++ b/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix
diff --git a/pkgs/applications/radio/rtl_433/default.nix b/nixpkgs/pkgs/applications/radio/rtl_433/default.nix
index 148ad35a1f0..148ad35a1f0 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/nixpkgs/pkgs/applications/radio/rtl_433/default.nix
diff --git a/pkgs/applications/radio/sdrangel/default.nix b/nixpkgs/pkgs/applications/radio/sdrangel/default.nix
index 7cb64f92f3f..7cb64f92f3f 100644
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/nixpkgs/pkgs/applications/radio/sdrangel/default.nix
diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix
index eacbe66e5e5..eacbe66e5e5 100644
--- a/pkgs/applications/radio/soapyairspy/default.nix
+++ b/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix
diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix
index 0bb05a204da..0bb05a204da 100644
--- a/pkgs/applications/radio/soapybladerf/default.nix
+++ b/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix
diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix
index 5ab4c3363f4..5ab4c3363f4 100644
--- a/pkgs/applications/radio/soapyhackrf/default.nix
+++ b/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix
diff --git a/pkgs/applications/radio/soapyremote/default.nix b/nixpkgs/pkgs/applications/radio/soapyremote/default.nix
index 2f73403a168..2f73403a168 100644
--- a/pkgs/applications/radio/soapyremote/default.nix
+++ b/nixpkgs/pkgs/applications/radio/soapyremote/default.nix
diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix
index 8bf473cb36a..8bf473cb36a 100644
--- a/pkgs/applications/radio/soapyrtlsdr/default.nix
+++ b/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix
diff --git a/pkgs/applications/radio/soapysdr/default.nix b/nixpkgs/pkgs/applications/radio/soapysdr/default.nix
index e072ec97b97..e072ec97b97 100644
--- a/pkgs/applications/radio/soapysdr/default.nix
+++ b/nixpkgs/pkgs/applications/radio/soapysdr/default.nix
diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix
index 9e910584158..9e910584158 100644
--- a/pkgs/applications/radio/soapyuhd/default.nix
+++ b/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix
diff --git a/pkgs/applications/radio/svxlink/default.nix b/nixpkgs/pkgs/applications/radio/svxlink/default.nix
index e06fcb5d3e6..e06fcb5d3e6 100644
--- a/pkgs/applications/radio/svxlink/default.nix
+++ b/nixpkgs/pkgs/applications/radio/svxlink/default.nix
diff --git a/pkgs/applications/radio/tlf/default.nix b/nixpkgs/pkgs/applications/radio/tlf/default.nix
index 530008702f1..530008702f1 100644
--- a/pkgs/applications/radio/tlf/default.nix
+++ b/nixpkgs/pkgs/applications/radio/tlf/default.nix
diff --git a/pkgs/applications/radio/tqsl/default.nix b/nixpkgs/pkgs/applications/radio/tqsl/default.nix
index 343b0bf8cba..343b0bf8cba 100644
--- a/pkgs/applications/radio/tqsl/default.nix
+++ b/nixpkgs/pkgs/applications/radio/tqsl/default.nix
diff --git a/pkgs/applications/radio/uhd/default.nix b/nixpkgs/pkgs/applications/radio/uhd/default.nix
index 76519062f59..76519062f59 100644
--- a/pkgs/applications/radio/uhd/default.nix
+++ b/nixpkgs/pkgs/applications/radio/uhd/default.nix
diff --git a/pkgs/applications/radio/uhd/neon.patch b/nixpkgs/pkgs/applications/radio/uhd/neon.patch
index 18ec59c1d64..18ec59c1d64 100644
--- a/pkgs/applications/radio/uhd/neon.patch
+++ b/nixpkgs/pkgs/applications/radio/uhd/neon.patch
diff --git a/pkgs/applications/radio/unixcw/default.nix b/nixpkgs/pkgs/applications/radio/unixcw/default.nix
index fe31fd133e7..fe31fd133e7 100644
--- a/pkgs/applications/radio/unixcw/default.nix
+++ b/nixpkgs/pkgs/applications/radio/unixcw/default.nix
diff --git a/pkgs/applications/radio/unixcw/remove-use-of-dlopen.patch b/nixpkgs/pkgs/applications/radio/unixcw/remove-use-of-dlopen.patch
index 0475c008ba2..0475c008ba2 100644
--- a/pkgs/applications/radio/unixcw/remove-use-of-dlopen.patch
+++ b/nixpkgs/pkgs/applications/radio/unixcw/remove-use-of-dlopen.patch
diff --git a/pkgs/applications/radio/urh/default.nix b/nixpkgs/pkgs/applications/radio/urh/default.nix
index 8ca42ab94ac..8ca42ab94ac 100644
--- a/pkgs/applications/radio/urh/default.nix
+++ b/nixpkgs/pkgs/applications/radio/urh/default.nix
diff --git a/pkgs/applications/radio/welle-io/default.nix b/nixpkgs/pkgs/applications/radio/welle-io/default.nix
index 66a033fef25..66a033fef25 100644
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/nixpkgs/pkgs/applications/radio/welle-io/default.nix
diff --git a/pkgs/applications/radio/wsjtx/default.nix b/nixpkgs/pkgs/applications/radio/wsjtx/default.nix
index 8e135dee568..8e135dee568 100644
--- a/pkgs/applications/radio/wsjtx/default.nix
+++ b/nixpkgs/pkgs/applications/radio/wsjtx/default.nix
diff --git a/pkgs/applications/radio/wsjtx/super.patch b/nixpkgs/pkgs/applications/radio/wsjtx/super.patch
index d903171ffc5..d903171ffc5 100644
--- a/pkgs/applications/radio/wsjtx/super.patch
+++ b/nixpkgs/pkgs/applications/radio/wsjtx/super.patch
diff --git a/pkgs/applications/radio/wsjtx/wsjtx.patch b/nixpkgs/pkgs/applications/radio/wsjtx/wsjtx.patch
index fd7c40fdc13..fd7c40fdc13 100644
--- a/pkgs/applications/radio/wsjtx/wsjtx.patch
+++ b/nixpkgs/pkgs/applications/radio/wsjtx/wsjtx.patch
diff --git a/pkgs/applications/radio/xlog/default.nix b/nixpkgs/pkgs/applications/radio/xlog/default.nix
index 2268cdf725d..2268cdf725d 100644
--- a/pkgs/applications/radio/xlog/default.nix
+++ b/nixpkgs/pkgs/applications/radio/xlog/default.nix
diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/nixpkgs/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
index 32d89866b5a..32d89866b5a 100644
--- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
+++ b/nixpkgs/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix
index e72354c8658..e72354c8658 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix
diff --git a/pkgs/applications/science/astronomy/gildas/aarch64.patch b/nixpkgs/pkgs/applications/science/astronomy/gildas/aarch64.patch
index 40696a03dec..40696a03dec 100644
--- a/pkgs/applications/science/astronomy/gildas/aarch64.patch
+++ b/nixpkgs/pkgs/applications/science/astronomy/gildas/aarch64.patch
diff --git a/pkgs/applications/science/astronomy/gildas/clang.patch b/nixpkgs/pkgs/applications/science/astronomy/gildas/clang.patch
index 4d6654a99ae..4d6654a99ae 100644
--- a/pkgs/applications/science/astronomy/gildas/clang.patch
+++ b/nixpkgs/pkgs/applications/science/astronomy/gildas/clang.patch
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix
index cc6af8a17c0..cc6af8a17c0 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix
diff --git a/pkgs/applications/science/astronomy/gildas/imager-py3.patch b/nixpkgs/pkgs/applications/science/astronomy/gildas/imager-py3.patch
index 71a129164ba..71a129164ba 100644
--- a/pkgs/applications/science/astronomy/gildas/imager-py3.patch
+++ b/nixpkgs/pkgs/applications/science/astronomy/gildas/imager-py3.patch
diff --git a/pkgs/applications/science/astronomy/gildas/wrapper.patch b/nixpkgs/pkgs/applications/science/astronomy/gildas/wrapper.patch
index 2e470a1e9cd..2e470a1e9cd 100644
--- a/pkgs/applications/science/astronomy/gildas/wrapper.patch
+++ b/nixpkgs/pkgs/applications/science/astronomy/gildas/wrapper.patch
diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix
index f36431beac1..f36431beac1 100644
--- a/pkgs/applications/science/astronomy/gpredict/default.nix
+++ b/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/nixpkgs/pkgs/applications/science/astronomy/gravit/default.nix
index 15f72938eff..15f72938eff 100644
--- a/pkgs/applications/science/astronomy/gravit/default.nix
+++ b/nixpkgs/pkgs/applications/science/astronomy/gravit/default.nix
diff --git a/pkgs/applications/science/astronomy/openspace/assets.patch b/nixpkgs/pkgs/applications/science/astronomy/openspace/assets.patch
index 38c17ad4593..38c17ad4593 100644
--- a/pkgs/applications/science/astronomy/openspace/assets.patch
+++ b/nixpkgs/pkgs/applications/science/astronomy/openspace/assets.patch
diff --git a/pkgs/applications/science/astronomy/openspace/config.patch b/nixpkgs/pkgs/applications/science/astronomy/openspace/config.patch
index 826edea0907..826edea0907 100644
--- a/pkgs/applications/science/astronomy/openspace/config.patch
+++ b/nixpkgs/pkgs/applications/science/astronomy/openspace/config.patch
diff --git a/pkgs/applications/science/astronomy/openspace/constexpr.patch b/nixpkgs/pkgs/applications/science/astronomy/openspace/constexpr.patch
index d9fc91d7c27..d9fc91d7c27 100644
--- a/pkgs/applications/science/astronomy/openspace/constexpr.patch
+++ b/nixpkgs/pkgs/applications/science/astronomy/openspace/constexpr.patch
diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/nixpkgs/pkgs/applications/science/astronomy/openspace/default.nix
index cfdd320d201..cfdd320d201 100644
--- a/pkgs/applications/science/astronomy/openspace/default.nix
+++ b/nixpkgs/pkgs/applications/science/astronomy/openspace/default.nix
diff --git a/pkgs/applications/science/astronomy/openspace/vrpn.patch b/nixpkgs/pkgs/applications/science/astronomy/openspace/vrpn.patch
index 9386d0257b7..9386d0257b7 100644
--- a/pkgs/applications/science/astronomy/openspace/vrpn.patch
+++ b/nixpkgs/pkgs/applications/science/astronomy/openspace/vrpn.patch
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix
index eca25774c59..eca25774c59 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix
diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix
index 752e25b4d8d..752e25b4d8d 100644
--- a/pkgs/applications/science/astronomy/xearth/default.nix
+++ b/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix
diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/nixpkgs/pkgs/applications/science/astronomy/xplanet/default.nix
index f306f9265ab..f306f9265ab 100644
--- a/pkgs/applications/science/astronomy/xplanet/default.nix
+++ b/nixpkgs/pkgs/applications/science/astronomy/xplanet/default.nix
diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix
index 978615fa459..978615fa459 100644
--- a/pkgs/applications/science/biology/EZminc/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix
diff --git a/pkgs/applications/science/biology/N3/default.nix b/nixpkgs/pkgs/applications/science/biology/N3/default.nix
index d2dbcf18533..d2dbcf18533 100644
--- a/pkgs/applications/science/biology/N3/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/N3/default.nix
diff --git a/pkgs/applications/science/biology/ants/default.nix b/nixpkgs/pkgs/applications/science/biology/ants/default.nix
index 6e1a2a3407e..6e1a2a3407e 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/ants/default.nix
diff --git a/pkgs/applications/science/biology/aragorn/default.nix b/nixpkgs/pkgs/applications/science/biology/aragorn/default.nix
index a5f0ebc18ab..a5f0ebc18ab 100644
--- a/pkgs/applications/science/biology/aragorn/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/aragorn/default.nix
diff --git a/pkgs/applications/science/biology/bayescan/default.nix b/nixpkgs/pkgs/applications/science/biology/bayescan/default.nix
index 4e216fbdbe6..4e216fbdbe6 100644
--- a/pkgs/applications/science/biology/bayescan/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/bayescan/default.nix
diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix
index 4a6a464de46..4a6a464de46 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix
diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix
index 9af2ec88c39..9af2ec88c39 100644
--- a/pkgs/applications/science/biology/bedtools/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix
diff --git a/pkgs/applications/science/biology/bftools/default.nix b/nixpkgs/pkgs/applications/science/biology/bftools/default.nix
index 29e8bca5262..29e8bca5262 100644
--- a/pkgs/applications/science/biology/bftools/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/bftools/default.nix
diff --git a/pkgs/applications/science/biology/blast/default.nix b/nixpkgs/pkgs/applications/science/biology/blast/default.nix
index ad737c6699d..ad737c6699d 100644
--- a/pkgs/applications/science/biology/blast/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/blast/default.nix
diff --git a/pkgs/applications/science/biology/blast/no_slash_bin.patch b/nixpkgs/pkgs/applications/science/biology/blast/no_slash_bin.patch
index 9b78ac57926..9b78ac57926 100644
--- a/pkgs/applications/science/biology/blast/no_slash_bin.patch
+++ b/nixpkgs/pkgs/applications/science/biology/blast/no_slash_bin.patch
diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix
index 962428d67cf..962428d67cf 100644
--- a/pkgs/applications/science/biology/bowtie2/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix
diff --git a/pkgs/applications/science/biology/bwa/default.nix b/nixpkgs/pkgs/applications/science/biology/bwa/default.nix
index 5e39320bf83..5e39320bf83 100644
--- a/pkgs/applications/science/biology/bwa/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/bwa/default.nix
diff --git a/pkgs/applications/science/biology/cd-hit/default.nix b/nixpkgs/pkgs/applications/science/biology/cd-hit/default.nix
index 1a41a28a19a..1a41a28a19a 100644
--- a/pkgs/applications/science/biology/cd-hit/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/cd-hit/default.nix
diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/nixpkgs/pkgs/applications/science/biology/clustal-omega/default.nix
index 00acc25028c..00acc25028c 100644
--- a/pkgs/applications/science/biology/clustal-omega/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/clustal-omega/default.nix
diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix
index 1ebfa2fca57..1ebfa2fca57 100644
--- a/pkgs/applications/science/biology/cmtk/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix
diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/nixpkgs/pkgs/applications/science/biology/conglomerate/default.nix
index 23182fcadc6..23182fcadc6 100644
--- a/pkgs/applications/science/biology/conglomerate/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/conglomerate/default.nix
diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix
index 7c328034a30..7c328034a30 100644
--- a/pkgs/applications/science/biology/dcm2niix/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix
diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/nixpkgs/pkgs/applications/science/biology/deeptools/default.nix
index 78a6f483337..78a6f483337 100644
--- a/pkgs/applications/science/biology/deeptools/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/deeptools/default.nix
diff --git a/pkgs/applications/science/biology/delly/default.nix b/nixpkgs/pkgs/applications/science/biology/delly/default.nix
index bfdf5a1bb17..bfdf5a1bb17 100644
--- a/pkgs/applications/science/biology/delly/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/delly/default.nix
diff --git a/pkgs/applications/science/biology/diamond/default.nix b/nixpkgs/pkgs/applications/science/biology/diamond/default.nix
index c1d20a11ca9..c1d20a11ca9 100644
--- a/pkgs/applications/science/biology/diamond/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/diamond/default.nix
diff --git a/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch b/nixpkgs/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch
index a16d475c556..a16d475c556 100644
--- a/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch
+++ b/nixpkgs/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch
diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/nixpkgs/pkgs/applications/science/biology/ecopcr/default.nix
index 9e1b16ff944..9e1b16ff944 100644
--- a/pkgs/applications/science/biology/ecopcr/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/ecopcr/default.nix
diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix
index e11f4ebf77c..e11f4ebf77c 100644
--- a/pkgs/applications/science/biology/eggnog-mapper/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix
diff --git a/pkgs/applications/science/biology/emboss/default.nix b/nixpkgs/pkgs/applications/science/biology/emboss/default.nix
index 2110a9bcfab..2110a9bcfab 100644
--- a/pkgs/applications/science/biology/emboss/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/emboss/default.nix
diff --git a/pkgs/applications/science/biology/est-sfs/default.nix b/nixpkgs/pkgs/applications/science/biology/est-sfs/default.nix
index dcc72523355..dcc72523355 100644
--- a/pkgs/applications/science/biology/est-sfs/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/est-sfs/default.nix
diff --git a/pkgs/applications/science/biology/exonerate/default.nix b/nixpkgs/pkgs/applications/science/biology/exonerate/default.nix
index 1dd6b44692a..1dd6b44692a 100644
--- a/pkgs/applications/science/biology/exonerate/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/exonerate/default.nix
diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/nixpkgs/pkgs/applications/science/biology/freebayes/default.nix
index 7d0a36e755f..7d0a36e755f 100644
--- a/pkgs/applications/science/biology/freebayes/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/freebayes/default.nix
diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/nixpkgs/pkgs/applications/science/biology/hisat2/default.nix
index 82485630114..82485630114 100644
--- a/pkgs/applications/science/biology/hisat2/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/hisat2/default.nix
diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/nixpkgs/pkgs/applications/science/biology/hmmer/default.nix
index 69ecb228697..69ecb228697 100644
--- a/pkgs/applications/science/biology/hmmer/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/hmmer/default.nix
diff --git a/pkgs/applications/science/biology/igv/default.nix b/nixpkgs/pkgs/applications/science/biology/igv/default.nix
index 04699a84b69..04699a84b69 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/igv/default.nix
diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/nixpkgs/pkgs/applications/science/biology/inormalize/default.nix
index 9e63b92b24e..9e63b92b24e 100644
--- a/pkgs/applications/science/biology/inormalize/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/inormalize/default.nix
diff --git a/pkgs/applications/science/biology/inormalize/lgmask-interp.patch b/nixpkgs/pkgs/applications/science/biology/inormalize/lgmask-interp.patch
index 953bce9a184..953bce9a184 100644
--- a/pkgs/applications/science/biology/inormalize/lgmask-interp.patch
+++ b/nixpkgs/pkgs/applications/science/biology/inormalize/lgmask-interp.patch
diff --git a/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch b/nixpkgs/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch
index 75dc46a799c..75dc46a799c 100644
--- a/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch
+++ b/nixpkgs/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch
diff --git a/pkgs/applications/science/biology/itsx/default.nix b/nixpkgs/pkgs/applications/science/biology/itsx/default.nix
index 1ba8cdf22ba..1ba8cdf22ba 100644
--- a/pkgs/applications/science/biology/itsx/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/itsx/default.nix
diff --git a/pkgs/applications/science/biology/iv/default.nix b/nixpkgs/pkgs/applications/science/biology/iv/default.nix
index 37abcf39621..37abcf39621 100644
--- a/pkgs/applications/science/biology/iv/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/iv/default.nix
diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/nixpkgs/pkgs/applications/science/biology/kallisto/default.nix
index 1a6555e0d63..1a6555e0d63 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/kallisto/default.nix
diff --git a/pkgs/applications/science/biology/kssd/default.nix b/nixpkgs/pkgs/applications/science/biology/kssd/default.nix
index ef8a0ce136f..ef8a0ce136f 100644
--- a/pkgs/applications/science/biology/kssd/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/kssd/default.nix
diff --git a/pkgs/applications/science/biology/last/default.nix b/nixpkgs/pkgs/applications/science/biology/last/default.nix
index c9e546dc2ce..c9e546dc2ce 100644
--- a/pkgs/applications/science/biology/last/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/last/default.nix
diff --git a/pkgs/applications/science/biology/macse/default.nix b/nixpkgs/pkgs/applications/science/biology/macse/default.nix
index 59938addbe8..59938addbe8 100644
--- a/pkgs/applications/science/biology/macse/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/macse/default.nix
diff --git a/pkgs/applications/science/biology/manta/default.nix b/nixpkgs/pkgs/applications/science/biology/manta/default.nix
index f0f0575e055..f0f0575e055 100644
--- a/pkgs/applications/science/biology/manta/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/manta/default.nix
diff --git a/pkgs/applications/science/biology/megahit/default.nix b/nixpkgs/pkgs/applications/science/biology/megahit/default.nix
index 86414980177..86414980177 100644
--- a/pkgs/applications/science/biology/megahit/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/megahit/default.nix
diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix
index d485666f393..d485666f393 100644
--- a/pkgs/applications/science/biology/messer-slim/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix
diff --git a/pkgs/applications/science/biology/migrate/default.nix b/nixpkgs/pkgs/applications/science/biology/migrate/default.nix
index d80e6e7b30d..d80e6e7b30d 100644
--- a/pkgs/applications/science/biology/migrate/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/migrate/default.nix
diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/nixpkgs/pkgs/applications/science/biology/minc-tools/default.nix
index 033f78609e9..033f78609e9 100644
--- a/pkgs/applications/science/biology/minc-tools/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/minc-tools/default.nix
diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/nixpkgs/pkgs/applications/science/biology/minc-widgets/default.nix
index 497c39a52a4..497c39a52a4 100644
--- a/pkgs/applications/science/biology/minc-widgets/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/minc-widgets/default.nix
diff --git a/pkgs/applications/science/biology/minia/default.nix b/nixpkgs/pkgs/applications/science/biology/minia/default.nix
index 2a80de733b0..2a80de733b0 100644
--- a/pkgs/applications/science/biology/minia/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/minia/default.nix
diff --git a/pkgs/applications/science/biology/minia/no-bundle.patch b/nixpkgs/pkgs/applications/science/biology/minia/no-bundle.patch
index 21d12c7f6f2..21d12c7f6f2 100644
--- a/pkgs/applications/science/biology/minia/no-bundle.patch
+++ b/nixpkgs/pkgs/applications/science/biology/minia/no-bundle.patch
diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix
index bff2bcf428b..bff2bcf428b 100644
--- a/pkgs/applications/science/biology/minimap2/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix
diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/nixpkgs/pkgs/applications/science/biology/mni_autoreg/default.nix
index ab22fb7232f..ab22fb7232f 100644
--- a/pkgs/applications/science/biology/mni_autoreg/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/mni_autoreg/default.nix
diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix
index 717b8c3ab2f..717b8c3ab2f 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix
diff --git a/pkgs/applications/science/biology/mrbayes/builder.sh b/nixpkgs/pkgs/applications/science/biology/mrbayes/builder.sh
index 5b3a54946fc..5b3a54946fc 100644
--- a/pkgs/applications/science/biology/mrbayes/builder.sh
+++ b/nixpkgs/pkgs/applications/science/biology/mrbayes/builder.sh
diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/nixpkgs/pkgs/applications/science/biology/mrbayes/default.nix
index 1dd92af58eb..1dd92af58eb 100644
--- a/pkgs/applications/science/biology/mrbayes/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/mrbayes/default.nix
diff --git a/pkgs/applications/science/biology/muscle/default.nix b/nixpkgs/pkgs/applications/science/biology/muscle/default.nix
index 9cbabc7ab37..9cbabc7ab37 100644
--- a/pkgs/applications/science/biology/muscle/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/muscle/default.nix
diff --git a/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch b/nixpkgs/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch
index 7f4b2129518..7f4b2129518 100644
--- a/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch
+++ b/nixpkgs/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch
diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/nixpkgs/pkgs/applications/science/biology/ncbi-tools/default.nix
index 1c24ef09254..1c24ef09254 100644
--- a/pkgs/applications/science/biology/ncbi-tools/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/ncbi-tools/default.nix
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/nixpkgs/pkgs/applications/science/biology/neuron/default.nix
index 4e6d3494c72..4e6d3494c72 100644
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/neuron/default.nix
diff --git a/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch b/nixpkgs/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch
index 923bffb1c33..923bffb1c33 100644
--- a/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch
+++ b/nixpkgs/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch
diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/nixpkgs/pkgs/applications/science/biology/niftyreg/default.nix
index 48bd1b21ecd..48bd1b21ecd 100644
--- a/pkgs/applications/science/biology/niftyreg/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/niftyreg/default.nix
diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/nixpkgs/pkgs/applications/science/biology/niftyseg/default.nix
index f70054e9771..f70054e9771 100644
--- a/pkgs/applications/science/biology/niftyseg/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/niftyseg/default.nix
diff --git a/pkgs/applications/science/biology/octopus/default.nix b/nixpkgs/pkgs/applications/science/biology/octopus/default.nix
index 9d81e08d729..9d81e08d729 100644
--- a/pkgs/applications/science/biology/octopus/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/octopus/default.nix
diff --git a/pkgs/applications/science/biology/paml/default.nix b/nixpkgs/pkgs/applications/science/biology/paml/default.nix
index 731e31c588f..731e31c588f 100644
--- a/pkgs/applications/science/biology/paml/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/paml/default.nix
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix
index 44247f294aa..44247f294aa 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix
diff --git a/pkgs/applications/science/biology/platypus/default.nix b/nixpkgs/pkgs/applications/science/biology/platypus/default.nix
index 6907c6e3ec8..6907c6e3ec8 100644
--- a/pkgs/applications/science/biology/platypus/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/platypus/default.nix
diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix
index 52f8f70b779..52f8f70b779 100644
--- a/pkgs/applications/science/biology/plink-ng/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix
diff --git a/pkgs/applications/science/biology/plink/default.nix b/nixpkgs/pkgs/applications/science/biology/plink/default.nix
index cc48a0cb13a..cc48a0cb13a 100644
--- a/pkgs/applications/science/biology/plink/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/plink/default.nix
diff --git a/pkgs/applications/science/biology/poretools/default.nix b/nixpkgs/pkgs/applications/science/biology/poretools/default.nix
index 4660a776ab2..4660a776ab2 100755
--- a/pkgs/applications/science/biology/poretools/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/poretools/default.nix
diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/nixpkgs/pkgs/applications/science/biology/prodigal/default.nix
index 653f4390488..653f4390488 100644
--- a/pkgs/applications/science/biology/prodigal/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/prodigal/default.nix
diff --git a/pkgs/applications/science/biology/raxml/default.nix b/nixpkgs/pkgs/applications/science/biology/raxml/default.nix
index d7ee54bfbcf..d7ee54bfbcf 100644
--- a/pkgs/applications/science/biology/raxml/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/raxml/default.nix
diff --git a/pkgs/applications/science/biology/samtools/default.nix b/nixpkgs/pkgs/applications/science/biology/samtools/default.nix
index f2c5e9f25be..f2c5e9f25be 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/samtools/default.nix
diff --git a/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch b/nixpkgs/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch
index a7782a1a026..a7782a1a026 100644
--- a/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch
+++ b/nixpkgs/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch
diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/nixpkgs/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
index 72d125ef8b6..72d125ef8b6 100644
--- a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
+++ b/nixpkgs/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
diff --git a/pkgs/applications/science/biology/seaview/default.nix b/nixpkgs/pkgs/applications/science/biology/seaview/default.nix
index fea8da41d70..fea8da41d70 100644
--- a/pkgs/applications/science/biology/seaview/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/seaview/default.nix
diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix
index d700ee50a9c..d700ee50a9c 100644
--- a/pkgs/applications/science/biology/snpeff/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix
diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/nixpkgs/pkgs/applications/science/biology/somatic-sniper/default.nix
index 1961c71f43b..1961c71f43b 100644
--- a/pkgs/applications/science/biology/somatic-sniper/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/somatic-sniper/default.nix
diff --git a/pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch b/nixpkgs/pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch
index 9af04c0a069..9af04c0a069 100644
--- a/pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch
+++ b/nixpkgs/pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch
diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix
index 4adce4461ed..4adce4461ed 100644
--- a/pkgs/applications/science/biology/sortmerna/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix
diff --git a/pkgs/applications/science/biology/spades/default.nix b/nixpkgs/pkgs/applications/science/biology/spades/default.nix
index a195f79010a..a195f79010a 100644
--- a/pkgs/applications/science/biology/spades/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/spades/default.nix
diff --git a/pkgs/applications/science/biology/stacks/default.nix b/nixpkgs/pkgs/applications/science/biology/stacks/default.nix
index e778c3bd52c..e778c3bd52c 100644
--- a/pkgs/applications/science/biology/stacks/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/stacks/default.nix
diff --git a/pkgs/applications/science/biology/star/default.nix b/nixpkgs/pkgs/applications/science/biology/star/default.nix
index 6f4211d0c0d..6f4211d0c0d 100644
--- a/pkgs/applications/science/biology/star/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/star/default.nix
diff --git a/pkgs/applications/science/biology/strelka/default.nix b/nixpkgs/pkgs/applications/science/biology/strelka/default.nix
index 184dcb48a0d..184dcb48a0d 100644
--- a/pkgs/applications/science/biology/strelka/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/strelka/default.nix
diff --git a/pkgs/applications/science/biology/sumatools/default.nix b/nixpkgs/pkgs/applications/science/biology/sumatools/default.nix
index 5230fcd2eb6..5230fcd2eb6 100644
--- a/pkgs/applications/science/biology/sumatools/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/sumatools/default.nix
diff --git a/pkgs/applications/science/biology/svaba/default.nix b/nixpkgs/pkgs/applications/science/biology/svaba/default.nix
index ae8dc95d6fe..ae8dc95d6fe 100644
--- a/pkgs/applications/science/biology/svaba/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/svaba/default.nix
diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix
index 9ff81944f6a..9ff81944f6a 100644
--- a/pkgs/applications/science/biology/tebreak/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix
diff --git a/pkgs/applications/science/biology/trimal/default.nix b/nixpkgs/pkgs/applications/science/biology/trimal/default.nix
index d4e8fee7bc3..d4e8fee7bc3 100755
--- a/pkgs/applications/science/biology/trimal/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/trimal/default.nix
diff --git a/pkgs/applications/science/biology/truvari/default.nix b/nixpkgs/pkgs/applications/science/biology/truvari/default.nix
index bee43da6719..bee43da6719 100644
--- a/pkgs/applications/science/biology/truvari/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/truvari/default.nix
diff --git a/pkgs/applications/science/biology/varscan/default.nix b/nixpkgs/pkgs/applications/science/biology/varscan/default.nix
index 697a444193b..697a444193b 100644
--- a/pkgs/applications/science/biology/varscan/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/varscan/default.nix
diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/nixpkgs/pkgs/applications/science/biology/vcftools/default.nix
index f6c9ad029c1..f6c9ad029c1 100755
--- a/pkgs/applications/science/biology/vcftools/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/vcftools/default.nix
diff --git a/pkgs/applications/science/biology/xenomapper/default.nix b/nixpkgs/pkgs/applications/science/biology/xenomapper/default.nix
index f5e538c7096..f5e538c7096 100644
--- a/pkgs/applications/science/biology/xenomapper/default.nix
+++ b/nixpkgs/pkgs/applications/science/biology/xenomapper/default.nix
diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/nixpkgs/pkgs/applications/science/chemistry/avogadro/default.nix
index 6aca678480d..6aca678480d 100644
--- a/pkgs/applications/science/chemistry/avogadro/default.nix
+++ b/nixpkgs/pkgs/applications/science/chemistry/avogadro/default.nix
diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix
index 12007c940b3..12007c940b3 100644
--- a/pkgs/applications/science/chemistry/gwyddion/default.nix
+++ b/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix
diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
index 2577b2a16e6..2577b2a16e6 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
diff --git a/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop b/nixpkgs/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop
index 90b8ed7d20a..90b8ed7d20a 100755
--- a/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop
+++ b/nixpkgs/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop
diff --git a/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop b/nixpkgs/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop
index d6e0343a78c..d6e0343a78c 100755
--- a/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop
+++ b/nixpkgs/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop
diff --git a/pkgs/applications/science/chemistry/marvin/MarvinView.desktop b/nixpkgs/pkgs/applications/science/chemistry/marvin/MarvinView.desktop
index 07a3c3c7cf3..07a3c3c7cf3 100755
--- a/pkgs/applications/science/chemistry/marvin/MarvinView.desktop
+++ b/nixpkgs/pkgs/applications/science/chemistry/marvin/MarvinView.desktop
diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix
index c3395a85148..c3395a85148 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix
index 87dae3b14d9..87dae3b14d9 100644
--- a/pkgs/applications/science/chemistry/molden/default.nix
+++ b/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix
diff --git a/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch b/nixpkgs/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch
index 75ce593ed29..75ce593ed29 100644
--- a/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch
+++ b/nixpkgs/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix
index d37f8d17336..d37f8d17336 100644
--- a/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix
diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix
index d73e86d2f57..d73e86d2f57 100644
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix
diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix
index e8b3b23ddd9..e8b3b23ddd9 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix
diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index ea80e9fd5ca..ea80e9fd5ca 100644
--- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix
diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix
index 9d7880f57df..9d7880f57df 100644
--- a/pkgs/applications/science/chemistry/siesta/default.nix
+++ b/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix
diff --git a/pkgs/applications/science/electronics/adms/default.nix b/nixpkgs/pkgs/applications/science/electronics/adms/default.nix
index 8b95e73b891..8b95e73b891 100644
--- a/pkgs/applications/science/electronics/adms/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/adms/default.nix
diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix
index c863fe6aea8..c863fe6aea8 100644
--- a/pkgs/applications/science/electronics/alliance/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix
diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/nixpkgs/pkgs/applications/science/electronics/archimedes/default.nix
index 016760bde02..016760bde02 100644
--- a/pkgs/applications/science/electronics/archimedes/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/archimedes/default.nix
diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/nixpkgs/pkgs/applications/science/electronics/bitscope/common.nix
index 9101f1fdbe5..9101f1fdbe5 100644
--- a/pkgs/applications/science/electronics/bitscope/common.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/bitscope/common.nix
diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/nixpkgs/pkgs/applications/science/electronics/bitscope/packages.nix
index 11e1ed524ed..11e1ed524ed 100644
--- a/pkgs/applications/science/electronics/bitscope/packages.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/bitscope/packages.nix
diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix
index ff41a498ae7..ff41a498ae7 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix
diff --git a/pkgs/applications/science/electronics/caneda/gcc6.patch b/nixpkgs/pkgs/applications/science/electronics/caneda/gcc6.patch
index 04c8f4502b2..04c8f4502b2 100644
--- a/pkgs/applications/science/electronics/caneda/gcc6.patch
+++ b/nixpkgs/pkgs/applications/science/electronics/caneda/gcc6.patch
diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix
index d188365db1d..d188365db1d 100644
--- a/pkgs/applications/science/electronics/dsview/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix
diff --git a/pkgs/applications/science/electronics/dsview/install.patch b/nixpkgs/pkgs/applications/science/electronics/dsview/install.patch
index e30a28d80fa..e30a28d80fa 100644
--- a/pkgs/applications/science/electronics/dsview/install.patch
+++ b/nixpkgs/pkgs/applications/science/electronics/dsview/install.patch
diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
index c2cfc69c50c..c2cfc69c50c 100644
--- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
index b7fe5140864..b7fe5140864 100644
--- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix
index db4c1e42fea..db4c1e42fea 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix
diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix
index a9528b05a31..a9528b05a31 100644
--- a/pkgs/applications/science/electronics/eagle/eagle7.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix
diff --git a/pkgs/applications/science/electronics/eagle/eagle7_fixer.c b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7_fixer.c
index da9da4dcbd3..da9da4dcbd3 100644
--- a/pkgs/applications/science/electronics/eagle/eagle7_fixer.c
+++ b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7_fixer.c
diff --git a/pkgs/applications/science/electronics/fped/default.nix b/nixpkgs/pkgs/applications/science/electronics/fped/default.nix
index 4eb666ada7c..4eb666ada7c 100644
--- a/pkgs/applications/science/electronics/fped/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/fped/default.nix
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix
index 127e9c05624..127e9c05624 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix
diff --git a/pkgs/applications/science/electronics/geda/default.nix b/nixpkgs/pkgs/applications/science/electronics/geda/default.nix
index 1aaa5496ff3..1aaa5496ff3 100644
--- a/pkgs/applications/science/electronics/geda/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/geda/default.nix
diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix
index fa5bdbbebdb..fa5bdbbebdb 100644
--- a/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix
index 75d69d3e499..75d69d3e499 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix
index 6bc66596229..6bc66596229 100644
--- a/pkgs/applications/science/electronics/kicad/base.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix
index 0b627dbb23a..0b627dbb23a 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix
diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix
index 53e190d2749..53e190d2749 100644
--- a/pkgs/applications/science/electronics/kicad/libraries.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix
diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh
index b4f744c47ef..b4f744c47ef 100755
--- a/pkgs/applications/science/electronics/kicad/update.sh
+++ b/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh
diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix
index ac273a1265c..ac273a1265c 100644
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix
index da10ca34b87..da10ca34b87 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix
index f044f1d88e7..f044f1d88e7 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix
diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/nixpkgs/pkgs/applications/science/electronics/pcb/default.nix
index ec47a37140f..ec47a37140f 100644
--- a/pkgs/applications/science/electronics/pcb/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/pcb/default.nix
diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix
index ae9afd95518..ae9afd95518 100644
--- a/pkgs/applications/science/electronics/pulseview/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix
diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/nixpkgs/pkgs/applications/science/electronics/qfsm/default.nix
index 6ca3f80cefd..6ca3f80cefd 100644
--- a/pkgs/applications/science/electronics/qfsm/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/qfsm/default.nix
diff --git a/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch b/nixpkgs/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch
index 965d67ac552..965d67ac552 100644
--- a/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch
+++ b/nixpkgs/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch
diff --git a/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch b/nixpkgs/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch
index 5cedc647639..5cedc647639 100644
--- a/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch
+++ b/nixpkgs/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch
diff --git a/pkgs/applications/science/electronics/qucs/cmakelists.patch b/nixpkgs/pkgs/applications/science/electronics/qucs/cmakelists.patch
index 27066f09c84..27066f09c84 100644
--- a/pkgs/applications/science/electronics/qucs/cmakelists.patch
+++ b/nixpkgs/pkgs/applications/science/electronics/qucs/cmakelists.patch
diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/nixpkgs/pkgs/applications/science/electronics/qucs/default.nix
index 1bfe6df5ff5..1bfe6df5ff5 100644
--- a/pkgs/applications/science/electronics/qucs/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/qucs/default.nix
diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix
index 2c346b0e74a..2c346b0e74a 100644
--- a/pkgs/applications/science/electronics/tkgate/1.x.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix
index c47d055a32b..c47d055a32b 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix
diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix
index b707db14160..b707db14160 100644
--- a/pkgs/applications/science/electronics/verilog/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix
diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/nixpkgs/pkgs/applications/science/electronics/xcircuit/default.nix
index 418144e6af7..418144e6af7 100644
--- a/pkgs/applications/science/electronics/xcircuit/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/xcircuit/default.nix
diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/nixpkgs/pkgs/applications/science/electronics/xoscope/default.nix
index 829caacb55c..829caacb55c 100644
--- a/pkgs/applications/science/electronics/xoscope/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/xoscope/default.nix
diff --git a/pkgs/applications/science/electronics/xoscope/gtkdepre.diff b/nixpkgs/pkgs/applications/science/electronics/xoscope/gtkdepre.diff
index 993df9cb550..993df9cb550 100644
--- a/pkgs/applications/science/electronics/xoscope/gtkdepre.diff
+++ b/nixpkgs/pkgs/applications/science/electronics/xoscope/gtkdepre.diff
diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/nixpkgs/pkgs/applications/science/geometry/drgeo/default.nix
index e8ae4d01a6d..e8ae4d01a6d 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/nixpkgs/pkgs/applications/science/geometry/drgeo/default.nix
diff --git a/pkgs/applications/science/geometry/drgeo/struct.patch b/nixpkgs/pkgs/applications/science/geometry/drgeo/struct.patch
index 7364cae5f58..7364cae5f58 100644
--- a/pkgs/applications/science/geometry/drgeo/struct.patch
+++ b/nixpkgs/pkgs/applications/science/geometry/drgeo/struct.patch
diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/nixpkgs/pkgs/applications/science/geometry/tetgen/1.4.nix
index 3a2dbf180ee..3a2dbf180ee 100644
--- a/pkgs/applications/science/geometry/tetgen/1.4.nix
+++ b/nixpkgs/pkgs/applications/science/geometry/tetgen/1.4.nix
diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/nixpkgs/pkgs/applications/science/geometry/tetgen/default.nix
index 7be0103304a..7be0103304a 100644
--- a/pkgs/applications/science/geometry/tetgen/default.nix
+++ b/nixpkgs/pkgs/applications/science/geometry/tetgen/default.nix
diff --git a/pkgs/applications/science/logic/abc/default.nix b/nixpkgs/pkgs/applications/science/logic/abc/default.nix
index c832d12627a..c832d12627a 100644
--- a/pkgs/applications/science/logic/abc/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/abc/default.nix
diff --git a/pkgs/applications/science/logic/abella/default.nix b/nixpkgs/pkgs/applications/science/logic/abella/default.nix
index 7078fd454a0..7078fd454a0 100644
--- a/pkgs/applications/science/logic/abella/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/abella/default.nix
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix
index 729aef4e21c..729aef4e21c 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix
diff --git a/pkgs/applications/science/logic/aiger/default.nix b/nixpkgs/pkgs/applications/science/logic/aiger/default.nix
index 0f65c9b7eae..0f65c9b7eae 100644
--- a/pkgs/applications/science/logic/aiger/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/aiger/default.nix
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix
index f83480cfbaf..f83480cfbaf 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix
diff --git a/pkgs/applications/science/logic/aspino/default.nix b/nixpkgs/pkgs/applications/science/logic/aspino/default.nix
index 82458d7c566..82458d7c566 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/aspino/default.nix
diff --git a/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch b/nixpkgs/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch
index a53142faba6..a53142faba6 100644
--- a/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch
+++ b/nixpkgs/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch
diff --git a/pkgs/applications/science/logic/avy/default.nix b/nixpkgs/pkgs/applications/science/logic/avy/default.nix
index b43e0c6fbf1..b43e0c6fbf1 100644
--- a/pkgs/applications/science/logic/avy/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/avy/default.nix
diff --git a/pkgs/applications/science/logic/avy/glucose-fenv.patch b/nixpkgs/pkgs/applications/science/logic/avy/glucose-fenv.patch
index dd19f7ec80e..dd19f7ec80e 100644
--- a/pkgs/applications/science/logic/avy/glucose-fenv.patch
+++ b/nixpkgs/pkgs/applications/science/logic/avy/glucose-fenv.patch
diff --git a/pkgs/applications/science/logic/avy/minisat-fenv.patch b/nixpkgs/pkgs/applications/science/logic/avy/minisat-fenv.patch
index 686d5a1c5b4..686d5a1c5b4 100644
--- a/pkgs/applications/science/logic/avy/minisat-fenv.patch
+++ b/nixpkgs/pkgs/applications/science/logic/avy/minisat-fenv.patch
diff --git a/pkgs/applications/science/logic/beluga/default.nix b/nixpkgs/pkgs/applications/science/logic/beluga/default.nix
index da0e9bf1c1d..da0e9bf1c1d 100644
--- a/pkgs/applications/science/logic/beluga/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/beluga/default.nix
diff --git a/pkgs/applications/science/logic/boolector/default.nix b/nixpkgs/pkgs/applications/science/logic/boolector/default.nix
index 4cf0b0f1ea1..4cf0b0f1ea1 100644
--- a/pkgs/applications/science/logic/boolector/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/boolector/default.nix
diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix
index 2aedfb1d07e..2aedfb1d07e 100644
--- a/pkgs/applications/science/logic/btor2tools/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix
diff --git a/pkgs/applications/science/logic/cedille/default.nix b/nixpkgs/pkgs/applications/science/logic/cedille/default.nix
index 4cef49788c0..4cef49788c0 100644
--- a/pkgs/applications/science/logic/cedille/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/cedille/default.nix
diff --git a/pkgs/applications/science/logic/celf/default.nix b/nixpkgs/pkgs/applications/science/logic/celf/default.nix
index 708270f772f..708270f772f 100644
--- a/pkgs/applications/science/logic/celf/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/celf/default.nix
diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix
index 0319069660e..0319069660e 100644
--- a/pkgs/applications/science/logic/clprover/clprover.nix
+++ b/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix
diff --git a/pkgs/applications/science/logic/coq/default.nix b/nixpkgs/pkgs/applications/science/logic/coq/default.nix
index ac001540e09..ac001540e09 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/coq/default.nix
diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix
index bebf81b030d..bebf81b030d 100644
--- a/pkgs/applications/science/logic/coq2html/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix
diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix
index b4c4cb7c047..b4c4cb7c047 100644
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix
diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix
index 6877060d36d..6877060d36d 100644
--- a/pkgs/applications/science/logic/cryptoverif/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix
diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/nixpkgs/pkgs/applications/science/logic/cubicle/default.nix
index d198de41f9b..d198de41f9b 100644
--- a/pkgs/applications/science/logic/cubicle/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/cubicle/default.nix
diff --git a/pkgs/applications/science/logic/cvc3/cvc3-2.4.1-gccv6-fix.patch b/nixpkgs/pkgs/applications/science/logic/cvc3/cvc3-2.4.1-gccv6-fix.patch
index 1fb3516b8c2..1fb3516b8c2 100644
--- a/pkgs/applications/science/logic/cvc3/cvc3-2.4.1-gccv6-fix.patch
+++ b/nixpkgs/pkgs/applications/science/logic/cvc3/cvc3-2.4.1-gccv6-fix.patch
diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix
index dfb04ad90e9..dfb04ad90e9 100644
--- a/pkgs/applications/science/logic/cvc3/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix
diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix
index c0c7a53ebd4..c0c7a53ebd4 100644
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix
diff --git a/pkgs/applications/science/logic/cvc4/minisat-fenv.patch b/nixpkgs/pkgs/applications/science/logic/cvc4/minisat-fenv.patch
index 686d5a1c5b4..686d5a1c5b4 100644
--- a/pkgs/applications/science/logic/cvc4/minisat-fenv.patch
+++ b/nixpkgs/pkgs/applications/science/logic/cvc4/minisat-fenv.patch
diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/nixpkgs/pkgs/applications/science/logic/drat-trim/default.nix
index 4c4ea0f14ce..4c4ea0f14ce 100644
--- a/pkgs/applications/science/logic/drat-trim/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/drat-trim/default.nix
diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix
index e1eb9a2dcc3..e1eb9a2dcc3 100644
--- a/pkgs/applications/science/logic/ekrhyper/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix
diff --git a/pkgs/applications/science/logic/ekrhyper/default.upstream b/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.upstream
index 310e93ea53f..310e93ea53f 100644
--- a/pkgs/applications/science/logic/ekrhyper/default.upstream
+++ b/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.upstream
diff --git a/pkgs/applications/science/logic/elan/default.nix b/nixpkgs/pkgs/applications/science/logic/elan/default.nix
index e9ef16b2392..e9ef16b2392 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/elan/default.nix
diff --git a/pkgs/applications/science/logic/eprover/default.nix b/nixpkgs/pkgs/applications/science/logic/eprover/default.nix
index 1b021f71607..1b021f71607 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/eprover/default.nix
diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/nixpkgs/pkgs/applications/science/logic/fast-downward/default.nix
index ed757e444b7..ed757e444b7 100644
--- a/pkgs/applications/science/logic/fast-downward/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/fast-downward/default.nix
diff --git a/pkgs/applications/science/logic/gappa/default.nix b/nixpkgs/pkgs/applications/science/logic/gappa/default.nix
index 7522eb4790e..7522eb4790e 100644
--- a/pkgs/applications/science/logic/gappa/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/gappa/default.nix
diff --git a/pkgs/applications/science/logic/glucose/default.nix b/nixpkgs/pkgs/applications/science/logic/glucose/default.nix
index 0a8fad484da..0a8fad484da 100644
--- a/pkgs/applications/science/logic/glucose/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/glucose/default.nix
diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/nixpkgs/pkgs/applications/science/logic/glucose/syrup.nix
index 816f8504a52..816f8504a52 100644
--- a/pkgs/applications/science/logic/glucose/syrup.nix
+++ b/nixpkgs/pkgs/applications/science/logic/glucose/syrup.nix
diff --git a/pkgs/applications/science/logic/hol/default.nix b/nixpkgs/pkgs/applications/science/logic/hol/default.nix
index d6a1eb6cbf7..d6a1eb6cbf7 100644
--- a/pkgs/applications/science/logic/hol/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/hol/default.nix
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix
index d799b52d115..d799b52d115 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix
diff --git a/pkgs/applications/science/logic/iprover/default.nix b/nixpkgs/pkgs/applications/science/logic/iprover/default.nix
index 85fe52239ad..85fe52239ad 100644
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/iprover/default.nix
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix
index 024f2f4e829..024f2f4e829 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix
diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/nixpkgs/pkgs/applications/science/logic/jonprl/default.nix
index e503836098f..e503836098f 100644
--- a/pkgs/applications/science/logic/jonprl/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/jonprl/default.nix
diff --git a/pkgs/applications/science/logic/lci/default.nix b/nixpkgs/pkgs/applications/science/logic/lci/default.nix
index 4775384a3dd..4775384a3dd 100644
--- a/pkgs/applications/science/logic/lci/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/lci/default.nix
diff --git a/pkgs/applications/science/logic/lean/default.nix b/nixpkgs/pkgs/applications/science/logic/lean/default.nix
index 9bf54a5f094..9bf54a5f094 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/lean/default.nix
diff --git a/pkgs/applications/science/logic/lean2/default.nix b/nixpkgs/pkgs/applications/science/logic/lean2/default.nix
index 612c9d6f92a..612c9d6f92a 100644
--- a/pkgs/applications/science/logic/lean2/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/lean2/default.nix
diff --git a/pkgs/applications/science/logic/leo2/default.nix b/nixpkgs/pkgs/applications/science/logic/leo2/default.nix
index b50848a1820..b50848a1820 100644
--- a/pkgs/applications/science/logic/leo2/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/leo2/default.nix
diff --git a/pkgs/applications/science/logic/leo2/default.upstream b/nixpkgs/pkgs/applications/science/logic/leo2/default.upstream
index 52b8ed1cdaa..52b8ed1cdaa 100644
--- a/pkgs/applications/science/logic/leo2/default.upstream
+++ b/nixpkgs/pkgs/applications/science/logic/leo2/default.upstream
diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/nixpkgs/pkgs/applications/science/logic/leo3/binary.nix
index dcea9c27acb..dcea9c27acb 100644
--- a/pkgs/applications/science/logic/leo3/binary.nix
+++ b/nixpkgs/pkgs/applications/science/logic/leo3/binary.nix
diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/nixpkgs/pkgs/applications/science/logic/lingeling/default.nix
index 94be89d4736..94be89d4736 100644
--- a/pkgs/applications/science/logic/lingeling/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/lingeling/default.nix
diff --git a/pkgs/applications/science/logic/logisim/default.nix b/nixpkgs/pkgs/applications/science/logic/logisim/default.nix
index d6a1207b5d6..d6a1207b5d6 100644
--- a/pkgs/applications/science/logic/logisim/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/logisim/default.nix
diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/nixpkgs/pkgs/applications/science/logic/ltl2ba/default.nix
index 02e9844115e..02e9844115e 100644
--- a/pkgs/applications/science/logic/ltl2ba/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/ltl2ba/default.nix
diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix
index a479e31e339..a479e31e339 100644
--- a/pkgs/applications/science/logic/mcrl2/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix
diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix
index ed1218c401b..ed1218c401b 100644
--- a/pkgs/applications/science/logic/metis-prover/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix
diff --git a/pkgs/applications/science/logic/minisat/default.nix b/nixpkgs/pkgs/applications/science/logic/minisat/default.nix
index 6b642832b83..6b642832b83 100644
--- a/pkgs/applications/science/logic/minisat/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/minisat/default.nix
diff --git a/pkgs/applications/science/logic/monosat/default.nix b/nixpkgs/pkgs/applications/science/logic/monosat/default.nix
index c0512b74488..c0512b74488 100644
--- a/pkgs/applications/science/logic/monosat/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/monosat/default.nix
diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/nixpkgs/pkgs/applications/science/logic/open-wbo/default.nix
index 32ce9fde0c3..32ce9fde0c3 100644
--- a/pkgs/applications/science/logic/open-wbo/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/open-wbo/default.nix
diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix
index 9e5ebe008b8..9e5ebe008b8 100644
--- a/pkgs/applications/science/logic/opensmt/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix
diff --git a/pkgs/applications/science/logic/ott/default.nix b/nixpkgs/pkgs/applications/science/logic/ott/default.nix
index fa7c3dd5e95..fa7c3dd5e95 100644
--- a/pkgs/applications/science/logic/ott/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/ott/default.nix
diff --git a/pkgs/applications/science/logic/otter/default.nix b/nixpkgs/pkgs/applications/science/logic/otter/default.nix
index a7eec20548c..a7eec20548c 100644
--- a/pkgs/applications/science/logic/otter/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/otter/default.nix
diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix
index d277e0e1521..d277e0e1521 100644
--- a/pkgs/applications/science/logic/petrinizer/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix
diff --git a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix
index ed10e9f3db1..ed10e9f3db1 100644
--- a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix
+++ b/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix
diff --git a/pkgs/applications/science/logic/petrinizer/z3.nix b/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix
index 4d868054c09..4d868054c09 100644
--- a/pkgs/applications/science/logic/petrinizer/z3.nix
+++ b/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix
diff --git a/pkgs/applications/science/logic/picosat/default.nix b/nixpkgs/pkgs/applications/science/logic/picosat/default.nix
index 547bd31e8b4..547bd31e8b4 100644
--- a/pkgs/applications/science/logic/picosat/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/picosat/default.nix
diff --git a/pkgs/applications/science/logic/poly/default.nix b/nixpkgs/pkgs/applications/science/logic/poly/default.nix
index c833b22e49b..c833b22e49b 100644
--- a/pkgs/applications/science/logic/poly/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/poly/default.nix
diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix
index 7c1ee8099e2..7c1ee8099e2 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix
diff --git a/pkgs/applications/science/logic/potassco/clingo.upstream b/nixpkgs/pkgs/applications/science/logic/potassco/clingo.upstream
index 062577d1451..062577d1451 100644
--- a/pkgs/applications/science/logic/potassco/clingo.upstream
+++ b/nixpkgs/pkgs/applications/science/logic/potassco/clingo.upstream
diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/nixpkgs/pkgs/applications/science/logic/prooftree/default.nix
index d4feb5c9e28..d4feb5c9e28 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/prooftree/default.nix
diff --git a/pkgs/applications/science/logic/prover9/default.nix b/nixpkgs/pkgs/applications/science/logic/prover9/default.nix
index 9528a5942a4..9528a5942a4 100644
--- a/pkgs/applications/science/logic/prover9/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/prover9/default.nix
diff --git a/pkgs/applications/science/logic/proverif/default.nix b/nixpkgs/pkgs/applications/science/logic/proverif/default.nix
index 931ad2fc4f3..931ad2fc4f3 100644
--- a/pkgs/applications/science/logic/proverif/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/proverif/default.nix
diff --git a/pkgs/applications/science/logic/redprl/default.nix b/nixpkgs/pkgs/applications/science/logic/redprl/default.nix
index 9da2647d113..9da2647d113 100644
--- a/pkgs/applications/science/logic/redprl/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/redprl/default.nix
diff --git a/pkgs/applications/science/logic/sad/default.nix b/nixpkgs/pkgs/applications/science/logic/sad/default.nix
index 8e94356f376..8e94356f376 100644
--- a/pkgs/applications/science/logic/sad/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/sad/default.nix
diff --git a/pkgs/applications/science/logic/sad/monoid.patch b/nixpkgs/pkgs/applications/science/logic/sad/monoid.patch
index da9c21bcae9..da9c21bcae9 100644
--- a/pkgs/applications/science/logic/sad/monoid.patch
+++ b/nixpkgs/pkgs/applications/science/logic/sad/monoid.patch
diff --git a/pkgs/applications/science/logic/sad/patch b/nixpkgs/pkgs/applications/science/logic/sad/patch
index a5b1d617708..a5b1d617708 100644
--- a/pkgs/applications/science/logic/sad/patch
+++ b/nixpkgs/pkgs/applications/science/logic/sad/patch
diff --git a/pkgs/applications/science/logic/satallax/default.nix b/nixpkgs/pkgs/applications/science/logic/satallax/default.nix
index 7249eb991d3..7249eb991d3 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/satallax/default.nix
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix
index 71b26f8023a..71b26f8023a 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix
diff --git a/pkgs/applications/science/logic/spass/default.nix b/nixpkgs/pkgs/applications/science/logic/spass/default.nix
index ece6f0b9f6a..ece6f0b9f6a 100644
--- a/pkgs/applications/science/logic/spass/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/spass/default.nix
diff --git a/pkgs/applications/science/logic/statverif/default.nix b/nixpkgs/pkgs/applications/science/logic/statverif/default.nix
index e0efb28819d..e0efb28819d 100644
--- a/pkgs/applications/science/logic/statverif/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/statverif/default.nix
diff --git a/pkgs/applications/science/logic/stp/default.nix b/nixpkgs/pkgs/applications/science/logic/stp/default.nix
index dd00eda1b57..dd00eda1b57 100644
--- a/pkgs/applications/science/logic/stp/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/stp/default.nix
diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix
index ddefcf1b3aa..ddefcf1b3aa 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix
index 9b87b8c899e..9b87b8c899e 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix
diff --git a/pkgs/applications/science/logic/tamarin-prover/sapic-native.patch b/nixpkgs/pkgs/applications/science/logic/tamarin-prover/sapic-native.patch
index 6ab7e4e7594..6ab7e4e7594 100644
--- a/pkgs/applications/science/logic/tamarin-prover/sapic-native.patch
+++ b/nixpkgs/pkgs/applications/science/logic/tamarin-prover/sapic-native.patch
diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix
index b1c72d7c5ee..b1c72d7c5ee 100644
--- a/pkgs/applications/science/logic/tlaplus/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix
diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix
index 7c8389688d9..7c8389688d9 100644
--- a/pkgs/applications/science/logic/tlaplus/tlaps.nix
+++ b/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix
diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix
index 91666e85d92..91666e85d92 100644
--- a/pkgs/applications/science/logic/tlaplus/toolbox.nix
+++ b/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/nixpkgs/pkgs/applications/science/logic/tptp/default.nix
index 4c63f8e72a3..4c63f8e72a3 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/tptp/default.nix
diff --git a/pkgs/applications/science/logic/twelf/default.nix b/nixpkgs/pkgs/applications/science/logic/twelf/default.nix
index 161da6e4b23..161da6e4b23 100644
--- a/pkgs/applications/science/logic/twelf/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/twelf/default.nix
diff --git a/pkgs/applications/science/logic/vampire/default.nix b/nixpkgs/pkgs/applications/science/logic/vampire/default.nix
index 42963fe5f9c..42963fe5f9c 100644
--- a/pkgs/applications/science/logic/vampire/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/vampire/default.nix
diff --git a/pkgs/applications/science/logic/verifast/default.nix b/nixpkgs/pkgs/applications/science/logic/verifast/default.nix
index 3e3e2670861..3e3e2670861 100644
--- a/pkgs/applications/science/logic/verifast/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/verifast/default.nix
diff --git a/pkgs/applications/science/logic/verit/default.nix b/nixpkgs/pkgs/applications/science/logic/verit/default.nix
index 2c68191b800..2c68191b800 100644
--- a/pkgs/applications/science/logic/verit/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/verit/default.nix
diff --git a/pkgs/applications/science/logic/why3/configure.patch b/nixpkgs/pkgs/applications/science/logic/why3/configure.patch
index 3eebf3cf165..3eebf3cf165 100644
--- a/pkgs/applications/science/logic/why3/configure.patch
+++ b/nixpkgs/pkgs/applications/science/logic/why3/configure.patch
diff --git a/pkgs/applications/science/logic/why3/default.nix b/nixpkgs/pkgs/applications/science/logic/why3/default.nix
index eeb3a6b6d36..eeb3a6b6d36 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/why3/default.nix
diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix
index 3528dbd3a64..3528dbd3a64 100644
--- a/pkgs/applications/science/logic/why3/with-provers.nix
+++ b/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix
diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
index 2f972c92b52..2f972c92b52 100644
--- a/pkgs/applications/science/logic/workcraft/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
diff --git a/pkgs/applications/science/logic/yices/default.nix b/nixpkgs/pkgs/applications/science/logic/yices/default.nix
index b8dd528a11c..b8dd528a11c 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/yices/default.nix
diff --git a/pkgs/applications/science/logic/z3/default.nix b/nixpkgs/pkgs/applications/science/logic/z3/default.nix
index 170a56b95b9..170a56b95b9 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/z3/default.nix
diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/nixpkgs/pkgs/applications/science/logic/z3/tptp.nix
index 34449542abb..34449542abb 100644
--- a/pkgs/applications/science/logic/z3/tptp.nix
+++ b/nixpkgs/pkgs/applications/science/logic/z3/tptp.nix
diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix
index 0de54572862..0de54572862 100644
--- a/pkgs/applications/science/machine-learning/fasttext/default.nix
+++ b/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix
diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix
index 4469e7f06e0..4469e7f06e0 100644
--- a/pkgs/applications/science/machine-learning/labelimg/default.nix
+++ b/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/sc2-headless/default.nix
index 7bcc915daec..7bcc915daec 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix
+++ b/nixpkgs/pkgs/applications/science/machine-learning/sc2-headless/default.nix
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/nixpkgs/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
index 6eec10e958c..6eec10e958c 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
+++ b/nixpkgs/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix
index be15bba979f..be15bba979f 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix
diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/streamlit/default.nix
index c7bdf0f12a4..c7bdf0f12a4 100644
--- a/pkgs/applications/science/machine-learning/streamlit/default.nix
+++ b/nixpkgs/pkgs/applications/science/machine-learning/streamlit/default.nix
diff --git a/pkgs/applications/science/machine-learning/torch/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/torch/default.nix
index bdeeaad189a..bdeeaad189a 100644
--- a/pkgs/applications/science/machine-learning/torch/default.nix
+++ b/nixpkgs/pkgs/applications/science/machine-learning/torch/default.nix
diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/nixpkgs/pkgs/applications/science/machine-learning/torch/torch-distro.nix
index 73272df9922..73272df9922 100644
--- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix
+++ b/nixpkgs/pkgs/applications/science/machine-learning/torch/torch-distro.nix
diff --git a/pkgs/applications/science/math/LiE/default.nix b/nixpkgs/pkgs/applications/science/math/LiE/default.nix
index d59ec57c1a8..d59ec57c1a8 100644
--- a/pkgs/applications/science/math/LiE/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/LiE/default.nix
diff --git a/pkgs/applications/science/math/R/default.nix b/nixpkgs/pkgs/applications/science/math/R/default.nix
index 517fc9d7b32..517fc9d7b32 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/R/default.nix
diff --git a/pkgs/applications/science/math/R/no-usr-local-search-paths.patch b/nixpkgs/pkgs/applications/science/math/R/no-usr-local-search-paths.patch
index 6c7f6d4ee02..6c7f6d4ee02 100644
--- a/pkgs/applications/science/math/R/no-usr-local-search-paths.patch
+++ b/nixpkgs/pkgs/applications/science/math/R/no-usr-local-search-paths.patch
diff --git a/pkgs/applications/science/math/R/setup-hook.sh b/nixpkgs/pkgs/applications/science/math/R/setup-hook.sh
index 6951e2a4b61..6951e2a4b61 100644
--- a/pkgs/applications/science/math/R/setup-hook.sh
+++ b/nixpkgs/pkgs/applications/science/math/R/setup-hook.sh
diff --git a/pkgs/applications/science/math/almonds/default.nix b/nixpkgs/pkgs/applications/science/math/almonds/default.nix
index b5d9632c551..b5d9632c551 100644
--- a/pkgs/applications/science/math/almonds/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/almonds/default.nix
diff --git a/pkgs/applications/science/math/bcal/default.nix b/nixpkgs/pkgs/applications/science/math/bcal/default.nix
index 74adcab4e70..74adcab4e70 100644
--- a/pkgs/applications/science/math/bcal/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/bcal/default.nix
diff --git a/pkgs/applications/science/math/bliss/default.nix b/nixpkgs/pkgs/applications/science/math/bliss/default.nix
index 37504fceb14..37504fceb14 100644
--- a/pkgs/applications/science/math/bliss/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/bliss/default.nix
diff --git a/pkgs/applications/science/math/caffe/darwin.patch b/nixpkgs/pkgs/applications/science/math/caffe/darwin.patch
index e8fa6a683f7..e8fa6a683f7 100644
--- a/pkgs/applications/science/math/caffe/darwin.patch
+++ b/nixpkgs/pkgs/applications/science/math/caffe/darwin.patch
diff --git a/pkgs/applications/science/math/caffe/default.nix b/nixpkgs/pkgs/applications/science/math/caffe/default.nix
index 5068abbf307..5068abbf307 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/caffe/default.nix
diff --git a/pkgs/applications/science/math/caffe/python.patch b/nixpkgs/pkgs/applications/science/math/caffe/python.patch
index dac5071aa08..dac5071aa08 100644
--- a/pkgs/applications/science/math/caffe/python.patch
+++ b/nixpkgs/pkgs/applications/science/math/caffe/python.patch
diff --git a/pkgs/applications/science/math/calc/default.nix b/nixpkgs/pkgs/applications/science/math/calc/default.nix
index 0d149eca3b6..0d149eca3b6 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/calc/default.nix
diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/nixpkgs/pkgs/applications/science/math/calculix/calculix.patch
index 311421f2ef5..311421f2ef5 100644
--- a/pkgs/applications/science/math/calculix/calculix.patch
+++ b/nixpkgs/pkgs/applications/science/math/calculix/calculix.patch
diff --git a/pkgs/applications/science/math/calculix/default.nix b/nixpkgs/pkgs/applications/science/math/calculix/default.nix
index 6f2d61cd80f..6f2d61cd80f 100644
--- a/pkgs/applications/science/math/calculix/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/calculix/default.nix
diff --git a/pkgs/applications/science/math/cbc/default.nix b/nixpkgs/pkgs/applications/science/math/cbc/default.nix
index e68ceb379b0..e68ceb379b0 100644
--- a/pkgs/applications/science/math/cbc/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/cbc/default.nix
diff --git a/pkgs/applications/science/math/clp/default.nix b/nixpkgs/pkgs/applications/science/math/clp/default.nix
index f91b091439f..f91b091439f 100644
--- a/pkgs/applications/science/math/clp/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/clp/default.nix
diff --git a/pkgs/applications/science/math/cntk/default.nix b/nixpkgs/pkgs/applications/science/math/cntk/default.nix
index ceb87b25ba8..ceb87b25ba8 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/cntk/default.nix
diff --git a/pkgs/applications/science/math/colpack/default.nix b/nixpkgs/pkgs/applications/science/math/colpack/default.nix
index 13a75ce4db2..13a75ce4db2 100644
--- a/pkgs/applications/science/math/colpack/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/colpack/default.nix
diff --git a/pkgs/applications/science/math/cplex/default.nix b/nixpkgs/pkgs/applications/science/math/cplex/default.nix
index ec13f5252f1..ec13f5252f1 100644
--- a/pkgs/applications/science/math/cplex/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/cplex/default.nix
diff --git a/pkgs/applications/science/math/csdp/default.nix b/nixpkgs/pkgs/applications/science/math/csdp/default.nix
index 9b402fe0ac9..9b402fe0ac9 100644
--- a/pkgs/applications/science/math/csdp/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/csdp/default.nix
diff --git a/pkgs/applications/science/math/ecm/default.nix b/nixpkgs/pkgs/applications/science/math/ecm/default.nix
index 7b768f7077e..7b768f7077e 100644
--- a/pkgs/applications/science/math/ecm/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/ecm/default.nix
diff --git a/pkgs/applications/science/math/eukleides/default.nix b/nixpkgs/pkgs/applications/science/math/eukleides/default.nix
index 6d1c778d1e0..6d1c778d1e0 100644
--- a/pkgs/applications/science/math/eukleides/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/eukleides/default.nix
diff --git a/pkgs/applications/science/math/form/default.nix b/nixpkgs/pkgs/applications/science/math/form/default.nix
index 0dbafebf2c0..0dbafebf2c0 100644
--- a/pkgs/applications/science/math/form/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/form/default.nix
diff --git a/pkgs/applications/science/math/fricas/default.nix b/nixpkgs/pkgs/applications/science/math/fricas/default.nix
index 7d1f738641a..7d1f738641a 100644
--- a/pkgs/applications/science/math/fricas/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/fricas/default.nix
diff --git a/pkgs/applications/science/math/gap/default.nix b/nixpkgs/pkgs/applications/science/math/gap/default.nix
index 7eb10d1f952..7eb10d1f952 100644
--- a/pkgs/applications/science/math/gap/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/gap/default.nix
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/nixpkgs/pkgs/applications/science/math/geogebra/default.nix
index a08c0ee3403..a08c0ee3403 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/geogebra/default.nix
diff --git a/pkgs/applications/science/math/getdp/default.nix b/nixpkgs/pkgs/applications/science/math/getdp/default.nix
index 3ccd89cf2c1..3ccd89cf2c1 100644
--- a/pkgs/applications/science/math/getdp/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/getdp/default.nix
diff --git a/pkgs/applications/science/math/gfan/default.nix b/nixpkgs/pkgs/applications/science/math/gfan/default.nix
index 33b003b2b56..33b003b2b56 100644
--- a/pkgs/applications/science/math/gfan/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/gfan/default.nix
diff --git a/pkgs/applications/science/math/giac/default.nix b/nixpkgs/pkgs/applications/science/math/giac/default.nix
index b3777528ecd..b3777528ecd 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/giac/default.nix
diff --git a/pkgs/applications/science/math/ginac/default.nix b/nixpkgs/pkgs/applications/science/math/ginac/default.nix
index 79f20f06b29..79f20f06b29 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/ginac/default.nix
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/nixpkgs/pkgs/applications/science/math/glsurf/default.nix
index c11110e4bc4..c11110e4bc4 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/glsurf/default.nix
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/nixpkgs/pkgs/applications/science/math/gmsh/default.nix
index 07ec466e000..07ec466e000 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/gmsh/default.nix
diff --git a/pkgs/applications/science/math/gurobi/default.nix b/nixpkgs/pkgs/applications/science/math/gurobi/default.nix
index 4ac7c411c2d..4ac7c411c2d 100644
--- a/pkgs/applications/science/math/gurobi/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/gurobi/default.nix
diff --git a/pkgs/applications/science/math/hmetis/default.nix b/nixpkgs/pkgs/applications/science/math/hmetis/default.nix
index 45a13d02889..45a13d02889 100644
--- a/pkgs/applications/science/math/hmetis/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/hmetis/default.nix
diff --git a/pkgs/applications/science/math/jags/default.nix b/nixpkgs/pkgs/applications/science/math/jags/default.nix
index 1d1fb96a473..1d1fb96a473 100644
--- a/pkgs/applications/science/math/jags/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/jags/default.nix
diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix
index f39c6a04d19..f39c6a04d19 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix
diff --git a/pkgs/applications/science/math/lp_solve/isnan.patch b/nixpkgs/pkgs/applications/science/math/lp_solve/isnan.patch
index bc1983d4423..bc1983d4423 100644
--- a/pkgs/applications/science/math/lp_solve/isnan.patch
+++ b/nixpkgs/pkgs/applications/science/math/lp_solve/isnan.patch
diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/nixpkgs/pkgs/applications/science/math/lrcalc/default.nix
index f407358d8f2..f407358d8f2 100644
--- a/pkgs/applications/science/math/lrcalc/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/lrcalc/default.nix
diff --git a/pkgs/applications/science/math/mathematica/10.nix b/nixpkgs/pkgs/applications/science/math/mathematica/10.nix
index 4204b139913..4204b139913 100644
--- a/pkgs/applications/science/math/mathematica/10.nix
+++ b/nixpkgs/pkgs/applications/science/math/mathematica/10.nix
diff --git a/pkgs/applications/science/math/mathematica/11.nix b/nixpkgs/pkgs/applications/science/math/mathematica/11.nix
index 521cb70099b..521cb70099b 100644
--- a/pkgs/applications/science/math/mathematica/11.nix
+++ b/nixpkgs/pkgs/applications/science/math/mathematica/11.nix
diff --git a/pkgs/applications/science/math/mathematica/9.nix b/nixpkgs/pkgs/applications/science/math/mathematica/9.nix
index aaa1c02ec0a..aaa1c02ec0a 100644
--- a/pkgs/applications/science/math/mathematica/9.nix
+++ b/nixpkgs/pkgs/applications/science/math/mathematica/9.nix
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/nixpkgs/pkgs/applications/science/math/mathematica/default.nix
index 7cd1b2eb99f..7cd1b2eb99f 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/mathematica/default.nix
diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix
index 51fb489be7e..51fb489be7e 100644
--- a/pkgs/applications/science/math/mathematica/l10ns.nix
+++ b/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix
diff --git a/pkgs/applications/science/math/maxima/5.41.nix b/nixpkgs/pkgs/applications/science/math/maxima/5.41.nix
index 583391d08dd..583391d08dd 100644
--- a/pkgs/applications/science/math/maxima/5.41.nix
+++ b/nixpkgs/pkgs/applications/science/math/maxima/5.41.nix
diff --git a/pkgs/applications/science/math/maxima/default.nix b/nixpkgs/pkgs/applications/science/math/maxima/default.nix
index 5843f38a74a..5843f38a74a 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/maxima/default.nix
diff --git a/pkgs/applications/science/math/maxima/known-ecl-failures.patch b/nixpkgs/pkgs/applications/science/math/maxima/known-ecl-failures.patch
index f1d612d993e..f1d612d993e 100644
--- a/pkgs/applications/science/math/maxima/known-ecl-failures.patch
+++ b/nixpkgs/pkgs/applications/science/math/maxima/known-ecl-failures.patch
diff --git a/pkgs/applications/science/math/msieve/default.nix b/nixpkgs/pkgs/applications/science/math/msieve/default.nix
index 643d990feb8..643d990feb8 100644
--- a/pkgs/applications/science/math/msieve/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/msieve/default.nix
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/nixpkgs/pkgs/applications/science/math/mxnet/default.nix
index bd4725ce73c..bd4725ce73c 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/mxnet/default.nix
diff --git a/pkgs/applications/science/math/nasc/default.nix b/nixpkgs/pkgs/applications/science/math/nasc/default.nix
index a4921785956..a4921785956 100644
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/nasc/default.nix
diff --git a/pkgs/applications/science/math/nauty/default.nix b/nixpkgs/pkgs/applications/science/math/nauty/default.nix
index 986610eea60..986610eea60 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/nauty/default.nix
diff --git a/pkgs/applications/science/math/nota/default.nix b/nixpkgs/pkgs/applications/science/math/nota/default.nix
index 897785ef6e8..897785ef6e8 100644
--- a/pkgs/applications/science/math/nota/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/nota/default.nix
diff --git a/pkgs/applications/science/math/palp/default.nix b/nixpkgs/pkgs/applications/science/math/palp/default.nix
index e9fd21b46d8..e9fd21b46d8 100644
--- a/pkgs/applications/science/math/palp/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/palp/default.nix
diff --git a/pkgs/applications/science/math/pari/default.nix b/nixpkgs/pkgs/applications/science/math/pari/default.nix
index 89ae354e7c7..89ae354e7c7 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/pari/default.nix
diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/nixpkgs/pkgs/applications/science/math/pari/gp2c.nix
index e743c8ae95b..e743c8ae95b 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/nixpkgs/pkgs/applications/science/math/pari/gp2c.nix
diff --git a/pkgs/applications/science/math/pcalc/default.nix b/nixpkgs/pkgs/applications/science/math/pcalc/default.nix
index 51c93f197e4..51c93f197e4 100644
--- a/pkgs/applications/science/math/pcalc/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/pcalc/default.nix
diff --git a/pkgs/applications/science/math/perseus/default.nix b/nixpkgs/pkgs/applications/science/math/perseus/default.nix
index 2d150d0c30e..2d150d0c30e 100644
--- a/pkgs/applications/science/math/perseus/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/perseus/default.nix
diff --git a/pkgs/applications/science/math/polymake/default.nix b/nixpkgs/pkgs/applications/science/math/polymake/default.nix
index d4f13f84f81..d4f13f84f81 100644
--- a/pkgs/applications/science/math/polymake/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/polymake/default.nix
diff --git a/pkgs/applications/science/math/pspp/default.nix b/nixpkgs/pkgs/applications/science/math/pspp/default.nix
index 3c263916a0e..3c263916a0e 100644
--- a/pkgs/applications/science/math/pspp/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/pspp/default.nix
diff --git a/pkgs/applications/science/math/pynac/default.nix b/nixpkgs/pkgs/applications/science/math/pynac/default.nix
index 4022383dbc7..4022383dbc7 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/pynac/default.nix
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix
index 8370685f00a..8370685f00a 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix
diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix
index 71d16fb626c..71d16fb626c 100644
--- a/pkgs/applications/science/math/ratpoints/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix
diff --git a/pkgs/applications/science/math/ries/default.nix b/nixpkgs/pkgs/applications/science/math/ries/default.nix
index b244ee75b30..b244ee75b30 100644
--- a/pkgs/applications/science/math/ries/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/ries/default.nix
diff --git a/pkgs/applications/science/math/ripser/default.nix b/nixpkgs/pkgs/applications/science/math/ripser/default.nix
index a42a5b710ce..a42a5b710ce 100644
--- a/pkgs/applications/science/math/ripser/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/ripser/default.nix
diff --git a/pkgs/applications/science/math/sage/README.md b/nixpkgs/pkgs/applications/science/math/sage/README.md
index 26e91fc6313..26e91fc6313 100644
--- a/pkgs/applications/science/math/sage/README.md
+++ b/nixpkgs/pkgs/applications/science/math/sage/README.md
diff --git a/pkgs/applications/science/math/sage/default.nix b/nixpkgs/pkgs/applications/science/math/sage/default.nix
index caf51c3da25..caf51c3da25 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/default.nix
diff --git a/pkgs/applications/science/math/sage/dist-tests.nix b/nixpkgs/pkgs/applications/science/math/sage/dist-tests.nix
index 24a86a8f37a..24a86a8f37a 100644
--- a/pkgs/applications/science/math/sage/dist-tests.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/dist-tests.nix
diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/nixpkgs/pkgs/applications/science/math/sage/env-locations.nix
index bda2d23b9e5..bda2d23b9e5 100644
--- a/pkgs/applications/science/math/sage/env-locations.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/env-locations.nix
diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/nixpkgs/pkgs/applications/science/math/sage/flask-oldsessions.nix
index 0899c93602b..0899c93602b 100644
--- a/pkgs/applications/science/math/sage/flask-oldsessions.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/flask-oldsessions.nix
diff --git a/pkgs/applications/science/math/sage/flask-openid.nix b/nixpkgs/pkgs/applications/science/math/sage/flask-openid.nix
index 9043fabd9b4..9043fabd9b4 100644
--- a/pkgs/applications/science/math/sage/flask-openid.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/flask-openid.nix
diff --git a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
index 8cd80281d0e..8cd80281d0e 100644
--- a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
+++ b/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
diff --git a/pkgs/applications/science/math/sage/patches/configurationpy-error-verbose.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/configurationpy-error-verbose.patch
index e687281ad1a..e687281ad1a 100644
--- a/pkgs/applications/science/math/sage/patches/configurationpy-error-verbose.patch
+++ b/nixpkgs/pkgs/applications/science/math/sage/patches/configurationpy-error-verbose.patch
diff --git a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch
index 3f844e1b1ef..3f844e1b1ef 100644
--- a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch
+++ b/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch
diff --git a/pkgs/applications/science/math/sage/patches/fix-ecl-race.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/fix-ecl-race.patch
index 6056416c3a2..6056416c3a2 100644
--- a/pkgs/applications/science/math/sage/patches/fix-ecl-race.patch
+++ b/nixpkgs/pkgs/applications/science/math/sage/patches/fix-ecl-race.patch
diff --git a/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
index 11ca7481961..11ca7481961 100644
--- a/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
+++ b/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
diff --git a/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch
index c5f95b498d5..c5f95b498d5 100644
--- a/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch
+++ b/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch
diff --git a/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch
index 49cdfd189b9..49cdfd189b9 100644
--- a/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch
+++ b/nixpkgs/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch
diff --git a/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch
index 1b64f39fe60..1b64f39fe60 100644
--- a/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch
+++ b/nixpkgs/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch
diff --git a/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch
index 9f502a66951..9f502a66951 100644
--- a/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch
+++ b/nixpkgs/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch
diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
index 56f09279622..56f09279622 100644
--- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
+++ b/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
diff --git a/pkgs/applications/science/math/sage/patches/sympow-cache.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/sympow-cache.patch
index 20020d610f8..20020d610f8 100644
--- a/pkgs/applications/science/math/sage/patches/sympow-cache.patch
+++ b/nixpkgs/pkgs/applications/science/math/sage/patches/sympow-cache.patch
diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/nixpkgs/pkgs/applications/science/math/sage/pybrial.nix
index 718414126ae..718414126ae 100644
--- a/pkgs/applications/science/math/sage/pybrial.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/pybrial.nix
diff --git a/pkgs/applications/science/math/sage/python-openid.nix b/nixpkgs/pkgs/applications/science/math/sage/python-openid.nix
index 1bfe02f50df..1bfe02f50df 100644
--- a/pkgs/applications/science/math/sage/python-openid.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/python-openid.nix
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix
index 68e0d134ace..68e0d134ace 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
index 4530cbf69f4..4530cbf69f4 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix
index 451edb8f085..451edb8f085 100644
--- a/pkgs/applications/science/math/sage/sage-tests.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix
index 524085e8c01..524085e8c01 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix
diff --git a/pkgs/applications/science/math/sage/sage.nix b/nixpkgs/pkgs/applications/science/math/sage/sage.nix
index 4fa8ae6270b..4fa8ae6270b 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/sage.nix
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix
index bf618fe64f4..bf618fe64f4 100644
--- a/pkgs/applications/science/math/sage/sagedoc.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix
index 69f7624078e..69f7624078e 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix
diff --git a/pkgs/applications/science/math/sage/sagenb.nix b/nixpkgs/pkgs/applications/science/math/sage/sagenb.nix
index 77b2168ad97..77b2168ad97 100644
--- a/pkgs/applications/science/math/sage/sagenb.nix
+++ b/nixpkgs/pkgs/applications/science/math/sage/sagenb.nix
diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix
index 8e85cece9b2..8e85cece9b2 100644
--- a/pkgs/applications/science/math/scilab-bin/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix
diff --git a/pkgs/applications/science/math/scilab/default.nix b/nixpkgs/pkgs/applications/science/math/scilab/default.nix
index 02f1f4e58a9..02f1f4e58a9 100644
--- a/pkgs/applications/science/math/scilab/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/scilab/default.nix
diff --git a/pkgs/applications/science/math/scotch/default.nix b/nixpkgs/pkgs/applications/science/math/scotch/default.nix
index 610f1ef05c0..610f1ef05c0 100644
--- a/pkgs/applications/science/math/scotch/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/scotch/default.nix
diff --git a/pkgs/applications/science/math/singular/default.nix b/nixpkgs/pkgs/applications/science/math/singular/default.nix
index fccd1489e11..fccd1489e11 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/singular/default.nix
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/nixpkgs/pkgs/applications/science/math/speedcrunch/default.nix
index 67561658eb2..67561658eb2 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/speedcrunch/default.nix
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/nixpkgs/pkgs/applications/science/math/symmetrica/default.nix
index 18daabb9e7e..18daabb9e7e 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/symmetrica/default.nix
diff --git a/pkgs/applications/science/math/weka/default.nix b/nixpkgs/pkgs/applications/science/math/weka/default.nix
index ec9ea0b8533..ec9ea0b8533 100644
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/weka/default.nix
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix
index 406d74c4cd3..406d74c4cd3 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix
diff --git a/pkgs/applications/science/math/yacas/default.nix b/nixpkgs/pkgs/applications/science/math/yacas/default.nix
index ed680b1b4cd..ed680b1b4cd 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/nixpkgs/pkgs/applications/science/math/yacas/default.nix
diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix
index e135534d1ac..e135534d1ac 100644
--- a/pkgs/applications/science/medicine/aliza/default.nix
+++ b/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix
diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/nixpkgs/pkgs/applications/science/medicine/dcmtk/default.nix
index 817ab578a82..817ab578a82 100644
--- a/pkgs/applications/science/medicine/dcmtk/default.nix
+++ b/nixpkgs/pkgs/applications/science/medicine/dcmtk/default.nix
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/nixpkgs/pkgs/applications/science/misc/boinc/default.nix
index 38b9b8ec66d..38b9b8ec66d 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/boinc/default.nix
diff --git a/pkgs/applications/science/misc/colmap/default.nix b/nixpkgs/pkgs/applications/science/misc/colmap/default.nix
index da118f6bca5..da118f6bca5 100644
--- a/pkgs/applications/science/misc/colmap/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/colmap/default.nix
diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix
index 8ed3deed804..8ed3deed804 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix
diff --git a/pkgs/applications/science/misc/fityk/default.nix b/nixpkgs/pkgs/applications/science/misc/fityk/default.nix
index 8d0336f5828..8d0336f5828 100644
--- a/pkgs/applications/science/misc/fityk/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/fityk/default.nix
diff --git a/pkgs/applications/science/misc/gephi/default.nix b/nixpkgs/pkgs/applications/science/misc/gephi/default.nix
index 577c8ecfa05..577c8ecfa05 100644
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/gephi/default.nix
diff --git a/pkgs/applications/science/misc/golly/beta.nix b/nixpkgs/pkgs/applications/science/misc/golly/beta.nix
index 36de6a1d4c5..36de6a1d4c5 100644
--- a/pkgs/applications/science/misc/golly/beta.nix
+++ b/nixpkgs/pkgs/applications/science/misc/golly/beta.nix
diff --git a/pkgs/applications/science/misc/golly/default.nix b/nixpkgs/pkgs/applications/science/misc/golly/default.nix
index 1478bb64318..1478bb64318 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/golly/default.nix
diff --git a/pkgs/applications/science/misc/golly/default.upstream b/nixpkgs/pkgs/applications/science/misc/golly/default.upstream
index e8ce81586a8..e8ce81586a8 100644
--- a/pkgs/applications/science/misc/golly/default.upstream
+++ b/nixpkgs/pkgs/applications/science/misc/golly/default.upstream
diff --git a/pkgs/applications/science/misc/gplates/boostfix.patch b/nixpkgs/pkgs/applications/science/misc/gplates/boostfix.patch
index e429600b709..e429600b709 100644
--- a/pkgs/applications/science/misc/gplates/boostfix.patch
+++ b/nixpkgs/pkgs/applications/science/misc/gplates/boostfix.patch
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/nixpkgs/pkgs/applications/science/misc/gplates/default.nix
index 9b510d432fb..9b510d432fb 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/gplates/default.nix
diff --git a/pkgs/applications/science/misc/megam/default.nix b/nixpkgs/pkgs/applications/science/misc/megam/default.nix
index 6cdc86d20eb..6cdc86d20eb 100644
--- a/pkgs/applications/science/misc/megam/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/megam/default.nix
diff --git a/pkgs/applications/science/misc/megam/ocaml-3.12.patch b/nixpkgs/pkgs/applications/science/misc/megam/ocaml-3.12.patch
index 8265acf6e4a..8265acf6e4a 100644
--- a/pkgs/applications/science/misc/megam/ocaml-3.12.patch
+++ b/nixpkgs/pkgs/applications/science/misc/megam/ocaml-3.12.patch
diff --git a/pkgs/applications/science/misc/megam/ocaml-includes.patch b/nixpkgs/pkgs/applications/science/misc/megam/ocaml-includes.patch
index b3a56643448..b3a56643448 100644
--- a/pkgs/applications/science/misc/megam/ocaml-includes.patch
+++ b/nixpkgs/pkgs/applications/science/misc/megam/ocaml-includes.patch
diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix
index 9b0279bd4d0..9b0279bd4d0 100644
--- a/pkgs/applications/science/misc/netlogo/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix
diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/nixpkgs/pkgs/applications/science/misc/openmodelica/default.nix
index ed4101bdb47..ed4101bdb47 100644
--- a/pkgs/applications/science/misc/openmodelica/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/openmodelica/default.nix
diff --git a/pkgs/applications/science/misc/openmodelica/fakegit.nix b/nixpkgs/pkgs/applications/science/misc/openmodelica/fakegit.nix
index de69626cd3e..de69626cd3e 100644
--- a/pkgs/applications/science/misc/openmodelica/fakegit.nix
+++ b/nixpkgs/pkgs/applications/science/misc/openmodelica/fakegit.nix
diff --git a/pkgs/applications/science/misc/openmodelica/src-libs-git.nix b/nixpkgs/pkgs/applications/science/misc/openmodelica/src-libs-git.nix
index aae5ab321fb..aae5ab321fb 100644
--- a/pkgs/applications/science/misc/openmodelica/src-libs-git.nix
+++ b/nixpkgs/pkgs/applications/science/misc/openmodelica/src-libs-git.nix
diff --git a/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix b/nixpkgs/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix
index 244da64fb4e..244da64fb4e 100644
--- a/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix
+++ b/nixpkgs/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix
diff --git a/pkgs/applications/science/misc/openmodelica/src-main.nix b/nixpkgs/pkgs/applications/science/misc/openmodelica/src-main.nix
index 99e82259bfe..99e82259bfe 100644
--- a/pkgs/applications/science/misc/openmodelica/src-main.nix
+++ b/nixpkgs/pkgs/applications/science/misc/openmodelica/src-main.nix
diff --git a/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh b/nixpkgs/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh
index 481a8979641..481a8979641 100755
--- a/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh
+++ b/nixpkgs/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh
diff --git a/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh b/nixpkgs/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh
index 972bc7d61f1..972bc7d61f1 100755
--- a/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh
+++ b/nixpkgs/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh
diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/nixpkgs/pkgs/applications/science/misc/openmvg/default.nix
index 121e953f43a..121e953f43a 100644
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/openmvg/default.nix
diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix
index bb067fbca7a..bb067fbca7a 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix
diff --git a/pkgs/applications/science/misc/rink/cargo-lock.patch b/nixpkgs/pkgs/applications/science/misc/rink/cargo-lock.patch
index 1fb3c2f4b56..1fb3c2f4b56 100644
--- a/pkgs/applications/science/misc/rink/cargo-lock.patch
+++ b/nixpkgs/pkgs/applications/science/misc/rink/cargo-lock.patch
diff --git a/pkgs/applications/science/misc/rink/default.nix b/nixpkgs/pkgs/applications/science/misc/rink/default.nix
index dad1d245b10..dad1d245b10 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/rink/default.nix
diff --git a/pkgs/applications/science/misc/root/5.nix b/nixpkgs/pkgs/applications/science/misc/root/5.nix
index 8422eb8752b..8422eb8752b 100644
--- a/pkgs/applications/science/misc/root/5.nix
+++ b/nixpkgs/pkgs/applications/science/misc/root/5.nix
diff --git a/pkgs/applications/science/misc/root/default.nix b/nixpkgs/pkgs/applications/science/misc/root/default.nix
index b901e40a194..b901e40a194 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/root/default.nix
diff --git a/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch b/nixpkgs/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch
index abd6222847e..abd6222847e 100644
--- a/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch
+++ b/nixpkgs/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch
diff --git a/pkgs/applications/science/misc/root/purify_include_paths_root5.patch b/nixpkgs/pkgs/applications/science/misc/root/purify_include_paths_root5.patch
index 6773603b8ad..6773603b8ad 100644
--- a/pkgs/applications/science/misc/root/purify_include_paths_root5.patch
+++ b/nixpkgs/pkgs/applications/science/misc/root/purify_include_paths_root5.patch
diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/nixpkgs/pkgs/applications/science/misc/root/setup-hook.sh
index b26cf9b779f..b26cf9b779f 100644
--- a/pkgs/applications/science/misc/root/setup-hook.sh
+++ b/nixpkgs/pkgs/applications/science/misc/root/setup-hook.sh
diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/nixpkgs/pkgs/applications/science/misc/root/sw_vers.patch
index 34af132c11f..34af132c11f 100644
--- a/pkgs/applications/science/misc/root/sw_vers.patch
+++ b/nixpkgs/pkgs/applications/science/misc/root/sw_vers.patch
diff --git a/pkgs/applications/science/misc/root/sw_vers_root5.patch b/nixpkgs/pkgs/applications/science/misc/root/sw_vers_root5.patch
index f044bed91f3..f044bed91f3 100644
--- a/pkgs/applications/science/misc/root/sw_vers_root5.patch
+++ b/nixpkgs/pkgs/applications/science/misc/root/sw_vers_root5.patch
diff --git a/pkgs/applications/science/misc/sasview/default.nix b/nixpkgs/pkgs/applications/science/misc/sasview/default.nix
index ed6fa3ae886..ed6fa3ae886 100644
--- a/pkgs/applications/science/misc/sasview/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/sasview/default.nix
diff --git a/pkgs/applications/science/misc/sasview/local_config.patch b/nixpkgs/pkgs/applications/science/misc/sasview/local_config.patch
index 5b6c3436494..5b6c3436494 100644
--- a/pkgs/applications/science/misc/sasview/local_config.patch
+++ b/nixpkgs/pkgs/applications/science/misc/sasview/local_config.patch
diff --git a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch b/nixpkgs/pkgs/applications/science/misc/sasview/pyparsing-fix.patch
index c3cd164a899..c3cd164a899 100644
--- a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch
+++ b/nixpkgs/pkgs/applications/science/misc/sasview/pyparsing-fix.patch
diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/nixpkgs/pkgs/applications/science/misc/sasview/xhtml2pdf.nix
index 8eff2057928..8eff2057928 100644
--- a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix
+++ b/nixpkgs/pkgs/applications/science/misc/sasview/xhtml2pdf.nix
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix
index 44b0f5d84b6..44b0f5d84b6 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix
diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix
index 13eae15ce7f..13eae15ce7f 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/nixpkgs/pkgs/applications/science/misc/tulip/default.nix
index 3f83f2f30a6..3f83f2f30a6 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/tulip/default.nix
diff --git a/pkgs/applications/science/misc/vite/default.nix b/nixpkgs/pkgs/applications/science/misc/vite/default.nix
index 3e7c7a42eb8..3e7c7a42eb8 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/nixpkgs/pkgs/applications/science/misc/vite/default.nix
diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
index b0ed5e94637..b0ed5e94637 100644
--- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
+++ b/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index 7536d071f6b..7536d071f6b 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix
index 234bbdab315..234bbdab315 100644
--- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix
+++ b/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix
diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/nixpkgs/pkgs/applications/science/physics/quantomatic/default.nix
index b22b9d412fd..b22b9d412fd 100644
--- a/pkgs/applications/science/physics/quantomatic/default.nix
+++ b/nixpkgs/pkgs/applications/science/physics/quantomatic/default.nix
diff --git a/pkgs/applications/science/physics/sacrifice/compat.patch b/nixpkgs/pkgs/applications/science/physics/sacrifice/compat.patch
index c66b91b7628..c66b91b7628 100644
--- a/pkgs/applications/science/physics/sacrifice/compat.patch
+++ b/nixpkgs/pkgs/applications/science/physics/sacrifice/compat.patch
diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix
index 80417f0fcc1..80417f0fcc1 100644
--- a/pkgs/applications/science/physics/sacrifice/default.nix
+++ b/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix
diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix
index 04115399c1a..04115399c1a 100644
--- a/pkgs/applications/science/physics/sherpa/default.nix
+++ b/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix
diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix
index 818bea7d0ff..818bea7d0ff 100644
--- a/pkgs/applications/science/physics/xfitter/default.nix
+++ b/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix
diff --git a/pkgs/applications/science/physics/xfitter/undefined_behavior.patch b/nixpkgs/pkgs/applications/science/physics/xfitter/undefined_behavior.patch
index 53278527a80..53278527a80 100644
--- a/pkgs/applications/science/physics/xfitter/undefined_behavior.patch
+++ b/nixpkgs/pkgs/applications/science/physics/xfitter/undefined_behavior.patch
diff --git a/pkgs/applications/science/programming/fdr/default.nix b/nixpkgs/pkgs/applications/science/programming/fdr/default.nix
index 2c0bb84c801..2c0bb84c801 100644
--- a/pkgs/applications/science/programming/fdr/default.nix
+++ b/nixpkgs/pkgs/applications/science/programming/fdr/default.nix
diff --git a/pkgs/applications/science/programming/groove/default.nix b/nixpkgs/pkgs/applications/science/programming/groove/default.nix
index e854f20d39a..e854f20d39a 100644
--- a/pkgs/applications/science/programming/groove/default.nix
+++ b/nixpkgs/pkgs/applications/science/programming/groove/default.nix
diff --git a/pkgs/applications/science/programming/plm/default.nix b/nixpkgs/pkgs/applications/science/programming/plm/default.nix
index ebfb6471c63..ebfb6471c63 100644
--- a/pkgs/applications/science/programming/plm/default.nix
+++ b/nixpkgs/pkgs/applications/science/programming/plm/default.nix
diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/nixpkgs/pkgs/applications/science/programming/scyther/cli.nix
index 6623f5def4c..6623f5def4c 100644
--- a/pkgs/applications/science/programming/scyther/cli.nix
+++ b/nixpkgs/pkgs/applications/science/programming/scyther/cli.nix
diff --git a/pkgs/applications/science/programming/scyther/default.nix b/nixpkgs/pkgs/applications/science/programming/scyther/default.nix
index b4daae1afc0..b4daae1afc0 100644
--- a/pkgs/applications/science/programming/scyther/default.nix
+++ b/nixpkgs/pkgs/applications/science/programming/scyther/default.nix
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix
index 0bc58c50335..0bc58c50335 100644
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ b/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix
diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix
index 31295114375..31295114375 100644
--- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix
+++ b/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix
diff --git a/pkgs/applications/science/robotics/gazebo/6.nix b/nixpkgs/pkgs/applications/science/robotics/gazebo/6.nix
index 80c52b49e47..80c52b49e47 100644
--- a/pkgs/applications/science/robotics/gazebo/6.nix
+++ b/nixpkgs/pkgs/applications/science/robotics/gazebo/6.nix
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix
index a3ebda463b9..a3ebda463b9 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix
diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix
index 0348d015309..0348d015309 100644
--- a/pkgs/applications/science/robotics/mavproxy/default.nix
+++ b/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index cbf7f4db8c4..cbf7f4db8c4 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix
diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/nixpkgs/pkgs/applications/science/robotics/sumorobot-manager/default.nix
index 68b91dafb73..68b91dafb73 100644
--- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix
+++ b/nixpkgs/pkgs/applications/science/robotics/sumorobot-manager/default.nix
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/nixpkgs/pkgs/applications/science/robotics/yarp/default.nix
index d14c0bb0fe8..d14c0bb0fe8 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/nixpkgs/pkgs/applications/science/robotics/yarp/default.nix
diff --git a/pkgs/applications/search/doodle/default.nix b/nixpkgs/pkgs/applications/search/doodle/default.nix
index 9d1da21492a..9d1da21492a 100644
--- a/pkgs/applications/search/doodle/default.nix
+++ b/nixpkgs/pkgs/applications/search/doodle/default.nix
diff --git a/pkgs/applications/search/grepcidr/default.nix b/nixpkgs/pkgs/applications/search/grepcidr/default.nix
index 06b2aee0392..06b2aee0392 100644
--- a/pkgs/applications/search/grepcidr/default.nix
+++ b/nixpkgs/pkgs/applications/search/grepcidr/default.nix
diff --git a/pkgs/applications/search/grepm/default.nix b/nixpkgs/pkgs/applications/search/grepm/default.nix
index bad8d35623c..bad8d35623c 100644
--- a/pkgs/applications/search/grepm/default.nix
+++ b/nixpkgs/pkgs/applications/search/grepm/default.nix
diff --git a/pkgs/applications/search/recoll/default.nix b/nixpkgs/pkgs/applications/search/recoll/default.nix
index 06f3733c8f7..06f3733c8f7 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/nixpkgs/pkgs/applications/search/recoll/default.nix
diff --git a/pkgs/applications/system/monitor/default.nix b/nixpkgs/pkgs/applications/system/monitor/default.nix
index 139a49d9505..139a49d9505 100644
--- a/pkgs/applications/system/monitor/default.nix
+++ b/nixpkgs/pkgs/applications/system/monitor/default.nix
diff --git a/pkgs/applications/version-management/arch/configure-tmpdir.patch b/nixpkgs/pkgs/applications/version-management/arch/configure-tmpdir.patch
index 2b39322ca22..2b39322ca22 100644
--- a/pkgs/applications/version-management/arch/configure-tmpdir.patch
+++ b/nixpkgs/pkgs/applications/version-management/arch/configure-tmpdir.patch
diff --git a/pkgs/applications/version-management/arch/default.nix b/nixpkgs/pkgs/applications/version-management/arch/default.nix
index bc62004065b..bc62004065b 100644
--- a/pkgs/applications/version-management/arch/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/arch/default.nix
diff --git a/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch b/nixpkgs/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch
index a34ab0c6eb1..a34ab0c6eb1 100644
--- a/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch
+++ b/nixpkgs/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch
diff --git a/pkgs/applications/version-management/bazaar/add_certificates.patch b/nixpkgs/pkgs/applications/version-management/bazaar/add_certificates.patch
index 18fac36daec..18fac36daec 100644
--- a/pkgs/applications/version-management/bazaar/add_certificates.patch
+++ b/nixpkgs/pkgs/applications/version-management/bazaar/add_certificates.patch
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/nixpkgs/pkgs/applications/version-management/bazaar/default.nix
index 097c1e86a89..097c1e86a89 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/bazaar/default.nix
diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/nixpkgs/pkgs/applications/version-management/bazaar/tools.nix
index 0dfa1988202..0dfa1988202 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/nixpkgs/pkgs/applications/version-management/bazaar/tools.nix
diff --git a/pkgs/applications/version-management/bcompare/default.nix b/nixpkgs/pkgs/applications/version-management/bcompare/default.nix
index d8a6ec05844..d8a6ec05844 100644
--- a/pkgs/applications/version-management/bcompare/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/bcompare/default.nix
diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/nixpkgs/pkgs/applications/version-management/bitkeeper/default.nix
index e092a604142..e092a604142 100644
--- a/pkgs/applications/version-management/bitkeeper/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/bitkeeper/default.nix
diff --git a/pkgs/applications/version-management/blackbox/default.nix b/nixpkgs/pkgs/applications/version-management/blackbox/default.nix
index 8c28a678962..8c28a678962 100644
--- a/pkgs/applications/version-management/blackbox/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/blackbox/default.nix
diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix
index 81b779f0206..81b779f0206 100644
--- a/pkgs/applications/version-management/cvs-fast-export/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix
diff --git a/pkgs/applications/version-management/cvs/CVE-2012-0804.patch b/nixpkgs/pkgs/applications/version-management/cvs/CVE-2012-0804.patch
index cd2b324729f..cd2b324729f 100644
--- a/pkgs/applications/version-management/cvs/CVE-2012-0804.patch
+++ b/nixpkgs/pkgs/applications/version-management/cvs/CVE-2012-0804.patch
diff --git a/pkgs/applications/version-management/cvs/CVE-2017-12836.patch b/nixpkgs/pkgs/applications/version-management/cvs/CVE-2017-12836.patch
index 95007942368..95007942368 100644
--- a/pkgs/applications/version-management/cvs/CVE-2017-12836.patch
+++ b/nixpkgs/pkgs/applications/version-management/cvs/CVE-2017-12836.patch
diff --git a/pkgs/applications/version-management/cvs/default.nix b/nixpkgs/pkgs/applications/version-management/cvs/default.nix
index 2063149dd78..2063149dd78 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/cvs/default.nix
diff --git a/pkgs/applications/version-management/cvs/getcwd-chroot.patch b/nixpkgs/pkgs/applications/version-management/cvs/getcwd-chroot.patch
index 3f827a1e698..3f827a1e698 100644
--- a/pkgs/applications/version-management/cvs/getcwd-chroot.patch
+++ b/nixpkgs/pkgs/applications/version-management/cvs/getcwd-chroot.patch
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix
index 4c818060d22..4c818060d22 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix
diff --git a/pkgs/applications/version-management/cvsps/default.nix b/nixpkgs/pkgs/applications/version-management/cvsps/default.nix
index 71130a2e283..71130a2e283 100644
--- a/pkgs/applications/version-management/cvsps/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/cvsps/default.nix
diff --git a/pkgs/applications/version-management/dvc/default.nix b/nixpkgs/pkgs/applications/version-management/dvc/default.nix
index fe10551771c..fe10551771c 100644
--- a/pkgs/applications/version-management/dvc/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/dvc/default.nix
diff --git a/pkgs/applications/version-management/dvc/dvc-daemon.patch b/nixpkgs/pkgs/applications/version-management/dvc/dvc-daemon.patch
index 5c2d363b17f..5c2d363b17f 100644
--- a/pkgs/applications/version-management/dvc/dvc-daemon.patch
+++ b/nixpkgs/pkgs/applications/version-management/dvc/dvc-daemon.patch
diff --git a/pkgs/applications/version-management/fossil/default.nix b/nixpkgs/pkgs/applications/version-management/fossil/default.nix
index 8a41221a267..8a41221a267 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/fossil/default.nix
diff --git a/pkgs/applications/version-management/gerrit/default.nix b/nixpkgs/pkgs/applications/version-management/gerrit/default.nix
index fe0c1a508d0..fe0c1a508d0 100644
--- a/pkgs/applications/version-management/gerrit/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gerrit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
index 0d772968416..0d772968416 100644
--- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile b/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile
index 8ed32515471..8ed32515471 100644
--- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock
index 61159eb3ee9..61159eb3ee9 100644
--- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
index fda89e33180..fda89e33180 100644
--- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix
index a7c1406665e..a7c1406665e 100644
--- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 20392655062..20392655062 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
index 454458cdec6..454458cdec6 100644
--- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix
index c6e046ea45b..c6e046ea45b 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix
index 96c2c8622f8..96c2c8622f8 100644
--- a/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index 96216e76fd3..96216e76fd3 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index c9fd33312d7..c9fd33312d7 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index 477b628c4d7..477b628c4d7 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
index 169315d1e2e..169315d1e2e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
index 3118eaab19b..3118eaab19b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
index 55a9dd18f72..55a9dd18f72 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix
index 479b3e7d637..479b3e7d637 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix
index 8dd44287b50..8dd44287b50 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
index 5d4d9b86d83..5d4d9b86d83 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix
index 08134195703..08134195703 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
index daa0af43879..daa0af43879 100644
--- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
index 32b9c8a980d..32b9c8a980d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index fa3970c4b15..fa3970c4b15 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index 5edf9a7b5a5..5edf9a7b5a5 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
index 418cf2e5866..418cf2e5866 100644
--- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 5d1a06e0397..5d1a06e0397 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index df0b1e78d27..df0b1e78d27 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 77fc0428115..77fc0428115 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index cfdcd80f38b..cfdcd80f38b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile
index 17373f02b44..17373f02b44 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock
index 0ac7907fe55..0ac7907fe55 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
index f4aa4878f62..f4aa4878f62 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix
index 49b4af4ef6d..49b4af4ef6d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
index 61852684387..61852684387 100644
--- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index 33b3d0bc167..33b3d0bc167 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
index 99be85e09b1..99be85e09b1 100644
--- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
index 528a96c9903..528a96c9903 100644
--- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index 6f8c4091a16..6f8c4091a16 100644
--- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
index a7abd1eeaf4..a7abd1eeaf4 100644
--- a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix
index 1cc3f365ea8..1cc3f365ea8 100644
--- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
index 9fb9d4de6e3..9fb9d4de6e3 100644
--- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
index 628c7dbac7f..628c7dbac7f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index ff0f702269c..ff0f702269c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index 28e63c4f166..28e63c4f166 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
index c0de46264d0..c0de46264d0 100644
--- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
index 8477dfac585..8477dfac585 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
index 1da8f2a4a5e..1da8f2a4a5e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-standup/default.nix
index c7488e84d5d..c7488e84d5d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-standup/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
index ae40e011f85..ae40e011f85 100644
--- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
index 54543bb4841..54543bb4841 100644
--- a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/zsh-completion.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subrepo/zsh-completion.patch
index dcba5ba6eea..dcba5ba6eea 100644
--- a/pkgs/applications/version-management/git-and-tools/git-subrepo/zsh-completion.patch
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subrepo/zsh-completion.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
index 07c63ea0119..07c63ea0119 100644
--- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
index 7fa15c66809..7fa15c66809 100644
--- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-test/default.nix
index e55799c2752..e55799c2752 100644
--- a/pkgs/applications/version-management/git-and-tools/git-test/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-test/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
index 3a72f38903e..3a72f38903e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix
index c9775f14081..c9775f14081 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
index f8f8ab86a9c..f8f8ab86a9c 100644
--- a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
index 9603d8e27c5..9603d8e27c5 100644
--- a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
index 721f2aa099c..721f2aa099c 100644
--- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
index 4b73d11744b..4b73d11744b 100644
--- a/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
index 71cdc694ac3..71cdc694ac3 100644
--- a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git/update.sh b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/update.sh
index a9fa18be155..a9fa18be155 100755
--- a/pkgs/applications/version-management/git-and-tools/git/update.sh
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/update.sh
diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
index 036f8b4114e..036f8b4114e 100644
--- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix
index 22bd0e66c15..22bd0e66c15 100644
--- a/pkgs/applications/version-management/git-and-tools/gita/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
index 57af13f597a..57af13f597a 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
index 9b77690868b..9b77690868b 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
index 211ad1eccd8..211ad1eccd8 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
index b6659b5f539..b6659b5f539 100644
--- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix
index e6b746233fe..e6b746233fe 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 1b67b933cb1..1b67b933cb1 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix
index 3e47631caf6..3e47631caf6 100644
--- a/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
index 04ba4c7c48f..04ba4c7c48f 100644
--- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
index 5c4ece7c9e5..5c4ece7c9e5 100644
--- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index 74fad30b8a9..74fad30b8a9 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index 3a354133e87..3a354133e87 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix
index ac11e7469e5..ac11e7469e5 100644
--- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index 45b427341a2..45b427341a2 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index 821ecf3e3d8..821ecf3e3d8 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix
index 42819043d58..42819043d58 100644
--- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/thicket/shards.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/shards.nix
index c8839651a26..c8839651a26 100644
--- a/pkgs/applications/version-management/git-and-tools/thicket/shards.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/shards.nix
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 424694d7262..424694d7262 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix
index 0da0cfa02b6..0da0cfa02b6 100644
--- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index 3b8affb57ed..3b8affb57ed 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch
index 925aadab3dd..925aadab3dd 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch
diff --git a/pkgs/applications/version-management/git-backup/default.nix b/nixpkgs/pkgs/applications/version-management/git-backup/default.nix
index 9d05fb83031..9d05fb83031 100644
--- a/pkgs/applications/version-management/git-backup/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-backup/default.nix
diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix
index ec03c5bed5b..ec03c5bed5b 100644
--- a/pkgs/applications/version-management/git-crecord/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix
diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix
index e3190667259..e3190667259 100644
--- a/pkgs/applications/version-management/git-lfs/1.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix
index f2d87fd69dd..f2d87fd69dd 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix
index d5abb6d004b..d5abb6d004b 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix
diff --git a/pkgs/applications/version-management/git-review/default.nix b/nixpkgs/pkgs/applications/version-management/git-review/default.nix
index c48f455a64a..c48f455a64a 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-review/default.nix
diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix
index 6d41098ee1a..6d41098ee1a 100644
--- a/pkgs/applications/version-management/git-sizer/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix
diff --git a/pkgs/applications/version-management/git-up/default.nix b/nixpkgs/pkgs/applications/version-management/git-up/default.nix
index 5812ff8c1d1..5812ff8c1d1 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-up/default.nix
diff --git a/pkgs/applications/version-management/gitea/default.nix b/nixpkgs/pkgs/applications/version-management/gitea/default.nix
index 2bd1f6434b7..2bd1f6434b7 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitea/default.nix
diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/nixpkgs/pkgs/applications/version-management/gitea/static-root-path.patch
index 7c36afdff84..7c36afdff84 100644
--- a/pkgs/applications/version-management/gitea/static-root-path.patch
+++ b/nixpkgs/pkgs/applications/version-management/gitea/static-root-path.patch
diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix
index 4467e9746ce..4467e9746ce 100644
--- a/pkgs/applications/version-management/gitinspector/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
index 2272e66faf5..2272e66faf5 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
diff --git a/pkgs/applications/version-management/gitlab/data.json b/nixpkgs/pkgs/applications/version-management/gitlab/data.json
index 3f1aef360ba..3f1aef360ba 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/data.json
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/default.nix
index 36859892e8c..36859892e8c 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/default.nix
diff --git a/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch b/nixpkgs/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch
index 9b95e668e04..9b95e668e04 100644
--- a/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index 841f6bfdefc..841f6bfdefc 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index 9d28a073096..9d28a073096 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix
index a4b4540e87a..a4b4540e87a 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/deps.nix
index 31210f2d606..31210f2d606 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/deps.nix
diff --git a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch
index 65e130078b7..65e130078b7 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index 638f6512c1a..638f6512c1a 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index 53dd1bb7ffb..53dd1bb7ffb 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
index b4105f18c10..b4105f18c10 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
index ee00070df2d..ee00070df2d 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 0e10cdc882d..0e10cdc882d 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
index c27c5bbf548..c27c5bbf548 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index 846bdeff48d..846bdeff48d 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
diff --git a/pkgs/applications/version-management/gitlab/reset_token.rake b/nixpkgs/pkgs/applications/version-management/gitlab/reset_token.rake
index 705b5830edf..705b5830edf 100644
--- a/pkgs/applications/version-management/gitlab/reset_token.rake
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/reset_token.rake
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 2c4a5f2e816..2c4a5f2e816 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index 57e428ca955..57e428ca955 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index 854178ffbe3..854178ffbe3 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
diff --git a/pkgs/applications/version-management/gitlab/update.py b/nixpkgs/pkgs/applications/version-management/gitlab/update.py
index dc2d1e29719..dc2d1e29719 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/update.py
diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix
index e77f18aff85..e77f18aff85 100644
--- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix
diff --git a/pkgs/applications/version-management/gitless/default.nix b/nixpkgs/pkgs/applications/version-management/gitless/default.nix
index fe1cce9ba84..fe1cce9ba84 100644
--- a/pkgs/applications/version-management/gitless/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitless/default.nix
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/nixpkgs/pkgs/applications/version-management/gitolite/default.nix
index 9f298e0129e..9f298e0129e 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitolite/default.nix
diff --git a/pkgs/applications/version-management/gitstats/default.nix b/nixpkgs/pkgs/applications/version-management/gitstats/default.nix
index 5d29c8fcb6c..5d29c8fcb6c 100644
--- a/pkgs/applications/version-management/gitstats/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gitstats/default.nix
diff --git a/pkgs/applications/version-management/gogs/default.nix b/nixpkgs/pkgs/applications/version-management/gogs/default.nix
index d06ae234ae9..d06ae234ae9 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gogs/default.nix
diff --git a/pkgs/applications/version-management/gogs/static-root-path.patch b/nixpkgs/pkgs/applications/version-management/gogs/static-root-path.patch
index 9eaa72a0c85..9eaa72a0c85 100644
--- a/pkgs/applications/version-management/gogs/static-root-path.patch
+++ b/nixpkgs/pkgs/applications/version-management/gogs/static-root-path.patch
diff --git a/pkgs/applications/version-management/gource/default.nix b/nixpkgs/pkgs/applications/version-management/gource/default.nix
index 2ce855d3a7f..2ce855d3a7f 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/gource/default.nix
diff --git a/pkgs/applications/version-management/guitone/default.nix b/nixpkgs/pkgs/applications/version-management/guitone/default.nix
index 92bc9f51cac..92bc9f51cac 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/guitone/default.nix
diff --git a/pkgs/applications/version-management/guitone/parallel-building.patch b/nixpkgs/pkgs/applications/version-management/guitone/parallel-building.patch
index f0e924cbfb8..f0e924cbfb8 100644
--- a/pkgs/applications/version-management/guitone/parallel-building.patch
+++ b/nixpkgs/pkgs/applications/version-management/guitone/parallel-building.patch
diff --git a/pkgs/applications/version-management/meld/default.nix b/nixpkgs/pkgs/applications/version-management/meld/default.nix
index 5342a0697ab..5342a0697ab 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/meld/default.nix
diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix
index b8fc767bd3a..b8fc767bd3a 100644
--- a/pkgs/applications/version-management/mercurial/4.9.nix
+++ b/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
index 792e647324a..792e647324a 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix
index c23feec6f43..c23feec6f43 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix
diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/nixpkgs/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
index 73acc3a6b36..73acc3a6b36 100644
--- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
+++ b/nixpkgs/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
diff --git a/pkgs/applications/version-management/monotone/default.nix b/nixpkgs/pkgs/applications/version-management/monotone/default.nix
index bf8e5652d99..bf8e5652d99 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/monotone/default.nix
diff --git a/pkgs/applications/version-management/monotone/default.upstream b/nixpkgs/pkgs/applications/version-management/monotone/default.upstream
index e0d01fb190c..e0d01fb190c 100644
--- a/pkgs/applications/version-management/monotone/default.upstream
+++ b/nixpkgs/pkgs/applications/version-management/monotone/default.upstream
diff --git a/pkgs/applications/version-management/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch b/nixpkgs/pkgs/applications/version-management/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
index 1ecda436c25..1ecda436c25 100644
--- a/pkgs/applications/version-management/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
+++ b/nixpkgs/pkgs/applications/version-management/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
diff --git a/pkgs/applications/version-management/mr/default.nix b/nixpkgs/pkgs/applications/version-management/mr/default.nix
index 66e63fcc375..66e63fcc375 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/mr/default.nix
diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix
index 797bc782496..797bc782496 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix
diff --git a/pkgs/applications/version-management/nitpick/default.nix b/nixpkgs/pkgs/applications/version-management/nitpick/default.nix
index db9afdc0a74..db9afdc0a74 100644
--- a/pkgs/applications/version-management/nitpick/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/nitpick/default.nix
diff --git a/pkgs/applications/version-management/p4v/default.nix b/nixpkgs/pkgs/applications/version-management/p4v/default.nix
index 317cbfde85b..317cbfde85b 100644
--- a/pkgs/applications/version-management/p4v/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/p4v/default.nix
diff --git a/pkgs/applications/version-management/peru/default.nix b/nixpkgs/pkgs/applications/version-management/peru/default.nix
index ea34617dc8b..ea34617dc8b 100644
--- a/pkgs/applications/version-management/peru/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/peru/default.nix
diff --git a/pkgs/applications/version-management/pijul/default.nix b/nixpkgs/pkgs/applications/version-management/pijul/default.nix
index 3c553918925..3c553918925 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/pijul/default.nix
diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix
index e9950c32549..e9950c32549 100644
--- a/pkgs/applications/version-management/rabbitvcs/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix
index 60486e20116..60486e20116 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix
diff --git a/pkgs/applications/version-management/rapidsvn/fix-build.patch b/nixpkgs/pkgs/applications/version-management/rapidsvn/fix-build.patch
index ca4bc394c2c..ca4bc394c2c 100644
--- a/pkgs/applications/version-management/rapidsvn/fix-build.patch
+++ b/nixpkgs/pkgs/applications/version-management/rapidsvn/fix-build.patch
diff --git a/pkgs/applications/version-management/rcs/default.nix b/nixpkgs/pkgs/applications/version-management/rcs/default.nix
index 3283a3c046a..3283a3c046a 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/rcs/default.nix
diff --git a/pkgs/applications/version-management/rcs/disable-t810.patch b/nixpkgs/pkgs/applications/version-management/rcs/disable-t810.patch
index 745f1868a36..745f1868a36 100644
--- a/pkgs/applications/version-management/rcs/disable-t810.patch
+++ b/nixpkgs/pkgs/applications/version-management/rcs/disable-t810.patch
diff --git a/pkgs/applications/version-management/redmine/Gemfile b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile
index b1c651695c7..b1c651695c7 100644
--- a/pkgs/applications/version-management/redmine/Gemfile
+++ b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile
diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock
index 806847a298e..806847a298e 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock
diff --git a/pkgs/applications/version-management/redmine/default.nix b/nixpkgs/pkgs/applications/version-management/redmine/default.nix
index a133a9a6a2a..a133a9a6a2a 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/redmine/default.nix
diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix
index e69cbb0e1c2..e69cbb0e1c2 100644
--- a/pkgs/applications/version-management/redmine/gemset.nix
+++ b/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix
diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix
index 8dd46405d31..8dd46405d31 100644
--- a/pkgs/applications/version-management/reposurgeon/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix
diff --git a/pkgs/applications/version-management/reposurgeon/fix-makefile.patch b/nixpkgs/pkgs/applications/version-management/reposurgeon/fix-makefile.patch
index 0a659c93406..0a659c93406 100644
--- a/pkgs/applications/version-management/reposurgeon/fix-makefile.patch
+++ b/nixpkgs/pkgs/applications/version-management/reposurgeon/fix-makefile.patch
diff --git a/pkgs/applications/version-management/sit/default.nix b/nixpkgs/pkgs/applications/version-management/sit/default.nix
index a225c23ceeb..a225c23ceeb 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/sit/default.nix
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix
index df55f20783f..df55f20783f 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix
diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix
index 76edc1b3e64..76edc1b3e64 100644
--- a/pkgs/applications/version-management/sourcehut/builds.nix
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix
diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix
index 67486bd28f3..67486bd28f3 100644
--- a/pkgs/applications/version-management/sourcehut/core.nix
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix
diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix
index 3fa5399c2b5..3fa5399c2b5 100644
--- a/pkgs/applications/version-management/sourcehut/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix
diff --git a/pkgs/applications/version-management/sourcehut/disable-npm-install.patch b/nixpkgs/pkgs/applications/version-management/sourcehut/disable-npm-install.patch
index 3a8d1c82b34..3a8d1c82b34 100644
--- a/pkgs/applications/version-management/sourcehut/disable-npm-install.patch
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/disable-npm-install.patch
diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix
index a61f35b9ee1..a61f35b9ee1 100644
--- a/pkgs/applications/version-management/sourcehut/dispatch.nix
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix
diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix
index b580e89c747..b580e89c747 100644
--- a/pkgs/applications/version-management/sourcehut/git.nix
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix
diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix
index fd5c3145db0..fd5c3145db0 100644
--- a/pkgs/applications/version-management/sourcehut/hg.nix
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix
diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix
index d050895ca23..d050895ca23 100644
--- a/pkgs/applications/version-management/sourcehut/lists.nix
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix
diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix
index df4e62a7ac2..df4e62a7ac2 100644
--- a/pkgs/applications/version-management/sourcehut/man.nix
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix
diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix
index a5458b0b864..a5458b0b864 100644
--- a/pkgs/applications/version-management/sourcehut/meta.nix
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix
diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix
index 4e397c649f9..4e397c649f9 100644
--- a/pkgs/applications/version-management/sourcehut/paste.nix
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix
diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix
index c5209cee46b..c5209cee46b 100644
--- a/pkgs/applications/version-management/sourcehut/scm.nix
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix
diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix
index a7703bd0729..a7703bd0729 100644
--- a/pkgs/applications/version-management/sourcehut/todo.nix
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix
diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh
index fdc0639c4c6..fdc0639c4c6 100755
--- a/pkgs/applications/version-management/sourcehut/update.sh
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh
diff --git a/pkgs/applications/version-management/sourcehut/use-srht-path.patch b/nixpkgs/pkgs/applications/version-management/sourcehut/use-srht-path.patch
index 43b494bf9d2..43b494bf9d2 100644
--- a/pkgs/applications/version-management/sourcehut/use-srht-path.patch
+++ b/nixpkgs/pkgs/applications/version-management/sourcehut/use-srht-path.patch
diff --git a/pkgs/applications/version-management/src/default.nix b/nixpkgs/pkgs/applications/version-management/src/default.nix
index 8ff384d84b7..8ff384d84b7 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/src/default.nix
diff --git a/pkgs/applications/version-management/srcml/default.nix b/nixpkgs/pkgs/applications/version-management/srcml/default.nix
index 693af89d978..693af89d978 100644
--- a/pkgs/applications/version-management/srcml/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/srcml/default.nix
diff --git a/pkgs/applications/version-management/srcml/gcc6.patch b/nixpkgs/pkgs/applications/version-management/srcml/gcc6.patch
index 7cd596d9ea7..7cd596d9ea7 100644
--- a/pkgs/applications/version-management/srcml/gcc6.patch
+++ b/nixpkgs/pkgs/applications/version-management/srcml/gcc6.patch
diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix
index c095aa49eaf..c095aa49eaf 100644
--- a/pkgs/applications/version-management/sublime-merge/common.nix
+++ b/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix
diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix
index 2734028866e..2734028866e 100644
--- a/pkgs/applications/version-management/sublime-merge/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix
diff --git a/pkgs/applications/version-management/subversion/apr-1.patch b/nixpkgs/pkgs/applications/version-management/subversion/apr-1.patch
index 240d94f3f97..240d94f3f97 100644
--- a/pkgs/applications/version-management/subversion/apr-1.patch
+++ b/nixpkgs/pkgs/applications/version-management/subversion/apr-1.patch
diff --git a/pkgs/applications/version-management/subversion/default.nix b/nixpkgs/pkgs/applications/version-management/subversion/default.nix
index dffe3fadd74..dffe3fadd74 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/subversion/default.nix
diff --git a/pkgs/applications/version-management/tailor/default.nix b/nixpkgs/pkgs/applications/version-management/tailor/default.nix
index c769ec0a66d..c769ec0a66d 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/tailor/default.nix
diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/nixpkgs/pkgs/applications/version-management/tkcvs/default.nix
index 48558c15dc1..48558c15dc1 100644
--- a/pkgs/applications/version-management/tkcvs/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/tkcvs/default.nix
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix
index 653db11ab5d..653db11ab5d 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix
diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix
index 2ad6b6f2f62..2ad6b6f2f62 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix
diff --git a/pkgs/applications/version-management/vcsh/default.nix b/nixpkgs/pkgs/applications/version-management/vcsh/default.nix
index 8a014a63393..8a014a63393 100644
--- a/pkgs/applications/version-management/vcsh/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/vcsh/default.nix
diff --git a/pkgs/applications/version-management/yadm/default.nix b/nixpkgs/pkgs/applications/version-management/yadm/default.nix
index f3ddf8059b2..f3ddf8059b2 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/yadm/default.nix
diff --git a/pkgs/applications/video/aegisub/default.nix b/nixpkgs/pkgs/applications/video/aegisub/default.nix
index 123308babea..123308babea 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/nixpkgs/pkgs/applications/video/aegisub/default.nix
diff --git a/pkgs/applications/video/avidemux/bootstrap_logging.patch b/nixpkgs/pkgs/applications/video/avidemux/bootstrap_logging.patch
index 8f45251d26c..8f45251d26c 100644
--- a/pkgs/applications/video/avidemux/bootstrap_logging.patch
+++ b/nixpkgs/pkgs/applications/video/avidemux/bootstrap_logging.patch
diff --git a/pkgs/applications/video/avidemux/default.nix b/nixpkgs/pkgs/applications/video/avidemux/default.nix
index 00bdb370aae..00bdb370aae 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/nixpkgs/pkgs/applications/video/avidemux/default.nix
diff --git a/pkgs/applications/video/avidemux/dynamic_install_dir.patch b/nixpkgs/pkgs/applications/video/avidemux/dynamic_install_dir.patch
index 803cde02ec2..803cde02ec2 100644
--- a/pkgs/applications/video/avidemux/dynamic_install_dir.patch
+++ b/nixpkgs/pkgs/applications/video/avidemux/dynamic_install_dir.patch
diff --git a/pkgs/applications/video/avxsynth/default.nix b/nixpkgs/pkgs/applications/video/avxsynth/default.nix
index f16f655b95d..f16f655b95d 100644
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/nixpkgs/pkgs/applications/video/avxsynth/default.nix
diff --git a/pkgs/applications/video/bino3d/default.nix b/nixpkgs/pkgs/applications/video/bino3d/default.nix
index 64b9613363c..64b9613363c 100644
--- a/pkgs/applications/video/bino3d/default.nix
+++ b/nixpkgs/pkgs/applications/video/bino3d/default.nix
diff --git a/pkgs/applications/video/bombono/default.nix b/nixpkgs/pkgs/applications/video/bombono/default.nix
index 1cba1d0e949..1cba1d0e949 100644
--- a/pkgs/applications/video/bombono/default.nix
+++ b/nixpkgs/pkgs/applications/video/bombono/default.nix
diff --git a/pkgs/applications/video/bomi/default.nix b/nixpkgs/pkgs/applications/video/bomi/default.nix
index a9d98a9a2a4..a9d98a9a2a4 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/nixpkgs/pkgs/applications/video/bomi/default.nix
diff --git a/pkgs/applications/video/byzanz/add-amflags.patch b/nixpkgs/pkgs/applications/video/byzanz/add-amflags.patch
index aeaa195798a..aeaa195798a 100644
--- a/pkgs/applications/video/byzanz/add-amflags.patch
+++ b/nixpkgs/pkgs/applications/video/byzanz/add-amflags.patch
diff --git a/pkgs/applications/video/byzanz/default.nix b/nixpkgs/pkgs/applications/video/byzanz/default.nix
index 10685a72f10..10685a72f10 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/nixpkgs/pkgs/applications/video/byzanz/default.nix
diff --git a/pkgs/applications/video/catt/default.nix b/nixpkgs/pkgs/applications/video/catt/default.nix
index 1f2b2535931..1f2b2535931 100644
--- a/pkgs/applications/video/catt/default.nix
+++ b/nixpkgs/pkgs/applications/video/catt/default.nix
diff --git a/pkgs/applications/video/ccextractor/default.nix b/nixpkgs/pkgs/applications/video/ccextractor/default.nix
index 91c47516521..91c47516521 100644
--- a/pkgs/applications/video/ccextractor/default.nix
+++ b/nixpkgs/pkgs/applications/video/ccextractor/default.nix
diff --git a/pkgs/applications/video/celluloid/default.nix b/nixpkgs/pkgs/applications/video/celluloid/default.nix
index 22fac11b018..22fac11b018 100644
--- a/pkgs/applications/video/celluloid/default.nix
+++ b/nixpkgs/pkgs/applications/video/celluloid/default.nix
diff --git a/pkgs/applications/video/cinelerra/default.nix b/nixpkgs/pkgs/applications/video/cinelerra/default.nix
index 36ad39bd37c..36ad39bd37c 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/nixpkgs/pkgs/applications/video/cinelerra/default.nix
diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/nixpkgs/pkgs/applications/video/clickshare-csc1/default.nix
index 53d257dd9d0..53d257dd9d0 100644
--- a/pkgs/applications/video/clickshare-csc1/default.nix
+++ b/nixpkgs/pkgs/applications/video/clickshare-csc1/default.nix
diff --git a/pkgs/applications/video/clipgrab/default.nix b/nixpkgs/pkgs/applications/video/clipgrab/default.nix
index ad175b24676..ad175b24676 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/nixpkgs/pkgs/applications/video/clipgrab/default.nix
diff --git a/pkgs/applications/video/coriander/default.nix b/nixpkgs/pkgs/applications/video/coriander/default.nix
index a2de52468f2..a2de52468f2 100644
--- a/pkgs/applications/video/coriander/default.nix
+++ b/nixpkgs/pkgs/applications/video/coriander/default.nix
diff --git a/pkgs/applications/video/devede/default.nix b/nixpkgs/pkgs/applications/video/devede/default.nix
index 388476cbf8e..388476cbf8e 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/nixpkgs/pkgs/applications/video/devede/default.nix
diff --git a/pkgs/applications/video/dvb-apps/default.nix b/nixpkgs/pkgs/applications/video/dvb-apps/default.nix
index a032ef654aa..a032ef654aa 100644
--- a/pkgs/applications/video/dvb-apps/default.nix
+++ b/nixpkgs/pkgs/applications/video/dvb-apps/default.nix
diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/nixpkgs/pkgs/applications/video/dvd-slideshow/default.nix
index 61894bd22f8..61894bd22f8 100644
--- a/pkgs/applications/video/dvd-slideshow/default.nix
+++ b/nixpkgs/pkgs/applications/video/dvd-slideshow/default.nix
diff --git a/pkgs/applications/video/dvdauthor/default.nix b/nixpkgs/pkgs/applications/video/dvdauthor/default.nix
index c15a892e698..c15a892e698 100644
--- a/pkgs/applications/video/dvdauthor/default.nix
+++ b/nixpkgs/pkgs/applications/video/dvdauthor/default.nix
diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch b/nixpkgs/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch
index 786f0c96855..786f0c96855 100644
--- a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch
+++ b/nixpkgs/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch
diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch b/nixpkgs/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch
index 5f77a68081a..5f77a68081a 100644
--- a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch
+++ b/nixpkgs/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch
diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch b/nixpkgs/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch
index 52b6cc44cd5..52b6cc44cd5 100644
--- a/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch
+++ b/nixpkgs/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch
diff --git a/pkgs/applications/video/dvdbackup/default.nix b/nixpkgs/pkgs/applications/video/dvdbackup/default.nix
index 54be20d5faf..54be20d5faf 100644
--- a/pkgs/applications/video/dvdbackup/default.nix
+++ b/nixpkgs/pkgs/applications/video/dvdbackup/default.nix
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/nixpkgs/pkgs/applications/video/dvdstyler/default.nix
index 495501e0c18..495501e0c18 100644
--- a/pkgs/applications/video/dvdstyler/default.nix
+++ b/nixpkgs/pkgs/applications/video/dvdstyler/default.nix
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix
index 3e26b4d68c2..3e26b4d68c2 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix
diff --git a/pkgs/applications/video/gnome-mplayer/fix-paths.patch b/nixpkgs/pkgs/applications/video/gnome-mplayer/fix-paths.patch
index ede4991c466..ede4991c466 100644
--- a/pkgs/applications/video/gnome-mplayer/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/video/gnome-mplayer/fix-paths.patch
diff --git a/pkgs/applications/video/gnomecast/default.nix b/nixpkgs/pkgs/applications/video/gnomecast/default.nix
index d840f43163c..d840f43163c 100644
--- a/pkgs/applications/video/gnomecast/default.nix
+++ b/nixpkgs/pkgs/applications/video/gnomecast/default.nix
diff --git a/pkgs/applications/video/gpac/default.nix b/nixpkgs/pkgs/applications/video/gpac/default.nix
index f81f394ed0b..f81f394ed0b 100644
--- a/pkgs/applications/video/gpac/default.nix
+++ b/nixpkgs/pkgs/applications/video/gpac/default.nix
diff --git a/pkgs/applications/video/handbrake/default.nix b/nixpkgs/pkgs/applications/video/handbrake/default.nix
index 59a8c2377ce..59a8c2377ce 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/nixpkgs/pkgs/applications/video/handbrake/default.nix
diff --git a/pkgs/applications/video/k9copy/default.nix b/nixpkgs/pkgs/applications/video/k9copy/default.nix
index 037331cad9e..037331cad9e 100644
--- a/pkgs/applications/video/k9copy/default.nix
+++ b/nixpkgs/pkgs/applications/video/k9copy/default.nix
diff --git a/pkgs/applications/video/k9copy/gcc6.patch b/nixpkgs/pkgs/applications/video/k9copy/gcc6.patch
index d0c9c2a8035..d0c9c2a8035 100644
--- a/pkgs/applications/video/k9copy/gcc6.patch
+++ b/nixpkgs/pkgs/applications/video/k9copy/gcc6.patch
diff --git a/pkgs/applications/video/kazam/default.nix b/nixpkgs/pkgs/applications/video/kazam/default.nix
index f38046cf8e1..f38046cf8e1 100644
--- a/pkgs/applications/video/kazam/default.nix
+++ b/nixpkgs/pkgs/applications/video/kazam/default.nix
diff --git a/pkgs/applications/video/kazam/fix-paths.patch b/nixpkgs/pkgs/applications/video/kazam/fix-paths.patch
index 43e360830ab..43e360830ab 100644
--- a/pkgs/applications/video/kazam/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/video/kazam/fix-paths.patch
diff --git a/pkgs/applications/video/kino/default.nix b/nixpkgs/pkgs/applications/video/kino/default.nix
index 2a0af3ed59e..2a0af3ed59e 100644
--- a/pkgs/applications/video/kino/default.nix
+++ b/nixpkgs/pkgs/applications/video/kino/default.nix
diff --git a/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch b/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch
index 65c5bc38276..65c5bc38276 100644
--- a/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch
+++ b/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch
diff --git a/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch b/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch
index f98cbda0bc4..f98cbda0bc4 100644
--- a/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch
+++ b/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch
diff --git a/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch b/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch
index d6a8953cf00..d6a8953cf00 100644
--- a/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch
+++ b/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch
diff --git a/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch b/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch
index 05ec7386709..05ec7386709 100644
--- a/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch
+++ b/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch
diff --git a/pkgs/applications/video/kmplayer/default.nix b/nixpkgs/pkgs/applications/video/kmplayer/default.nix
index 33ff1821640..33ff1821640 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/nixpkgs/pkgs/applications/video/kmplayer/default.nix
diff --git a/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch b/nixpkgs/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch
index 9b6652b0be5..9b6652b0be5 100644
--- a/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch
+++ b/nixpkgs/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch
diff --git a/pkgs/applications/video/kmplayer/no-docs.patch b/nixpkgs/pkgs/applications/video/kmplayer/no-docs.patch
index c93453f908c..c93453f908c 100644
--- a/pkgs/applications/video/kmplayer/no-docs.patch
+++ b/nixpkgs/pkgs/applications/video/kmplayer/no-docs.patch
diff --git a/pkgs/applications/video/kodi/default.nix b/nixpkgs/pkgs/applications/video/kodi/default.nix
index 4fae93aa1a1..4fae93aa1a1 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/nixpkgs/pkgs/applications/video/kodi/default.nix
diff --git a/pkgs/applications/video/kodi/plugins.nix b/nixpkgs/pkgs/applications/video/kodi/plugins.nix
index 41e5a7c5c75..41e5a7c5c75 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/nixpkgs/pkgs/applications/video/kodi/plugins.nix
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/nixpkgs/pkgs/applications/video/kodi/wrapper.nix
index 6a0b1cbdf73..6a0b1cbdf73 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/nixpkgs/pkgs/applications/video/kodi/wrapper.nix
diff --git a/pkgs/applications/video/kodi/yatp/dont-monkey.patch b/nixpkgs/pkgs/applications/video/kodi/yatp/dont-monkey.patch
index 62d5d0c0d4c..62d5d0c0d4c 100644
--- a/pkgs/applications/video/kodi/yatp/dont-monkey.patch
+++ b/nixpkgs/pkgs/applications/video/kodi/yatp/dont-monkey.patch
diff --git a/pkgs/applications/video/lightworks/default.nix b/nixpkgs/pkgs/applications/video/lightworks/default.nix
index 1ab7e2c991b..1ab7e2c991b 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/nixpkgs/pkgs/applications/video/lightworks/default.nix
diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix
index 0a422bb7f50..0a422bb7f50 100644
--- a/pkgs/applications/video/linuxstopmotion/default.nix
+++ b/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix
diff --git a/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch b/nixpkgs/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch
index caab48d0e2d..caab48d0e2d 100644
--- a/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch
+++ b/nixpkgs/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch
diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/nixpkgs/pkgs/applications/video/lxdvdrip/default.nix
index 8287a176ce6..8287a176ce6 100644
--- a/pkgs/applications/video/lxdvdrip/default.nix
+++ b/nixpkgs/pkgs/applications/video/lxdvdrip/default.nix
diff --git a/pkgs/applications/video/makemkv/default.nix b/nixpkgs/pkgs/applications/video/makemkv/default.nix
index ca202c5ce60..ca202c5ce60 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/nixpkgs/pkgs/applications/video/makemkv/default.nix
diff --git a/pkgs/applications/video/mapmap/default.nix b/nixpkgs/pkgs/applications/video/mapmap/default.nix
index c302ae1730f..c302ae1730f 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/nixpkgs/pkgs/applications/video/mapmap/default.nix
diff --git a/pkgs/applications/video/mediathekview/default.nix b/nixpkgs/pkgs/applications/video/mediathekview/default.nix
index 9554105f20c..9554105f20c 100644
--- a/pkgs/applications/video/mediathekview/default.nix
+++ b/nixpkgs/pkgs/applications/video/mediathekview/default.nix
diff --git a/pkgs/applications/video/minitube/default.nix b/nixpkgs/pkgs/applications/video/minitube/default.nix
index 635779187a8..635779187a8 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/nixpkgs/pkgs/applications/video/minitube/default.nix
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix
index d1efae4a924..d1efae4a924 100644
--- a/pkgs/applications/video/mjpg-streamer/default.nix
+++ b/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix
diff --git a/pkgs/applications/video/mkclean/default.nix b/nixpkgs/pkgs/applications/video/mkclean/default.nix
index 4a3cbc81b35..4a3cbc81b35 100644
--- a/pkgs/applications/video/mkclean/default.nix
+++ b/nixpkgs/pkgs/applications/video/mkclean/default.nix
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix
index 7ccf0e24762..7ccf0e24762 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix
diff --git a/pkgs/applications/video/motion/default.nix b/nixpkgs/pkgs/applications/video/motion/default.nix
index dafc6abdb0a..dafc6abdb0a 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/nixpkgs/pkgs/applications/video/motion/default.nix
diff --git a/pkgs/applications/video/mpc-qt/default.nix b/nixpkgs/pkgs/applications/video/mpc-qt/default.nix
index efa495a45af..efa495a45af 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/nixpkgs/pkgs/applications/video/mpc-qt/default.nix
diff --git a/pkgs/applications/video/mplayer/default.nix b/nixpkgs/pkgs/applications/video/mplayer/default.nix
index f5559e3fb6c..f5559e3fb6c 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/nixpkgs/pkgs/applications/video/mplayer/default.nix
diff --git a/pkgs/applications/video/mpv/default.nix b/nixpkgs/pkgs/applications/video/mpv/default.nix
index 6a8c3df0f35..6a8c3df0f35 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/nixpkgs/pkgs/applications/video/mpv/default.nix
diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix
index faa21326fc0..faa21326fc0 100644
--- a/pkgs/applications/video/mpv/scripts/convert.nix
+++ b/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix
diff --git a/pkgs/applications/video/mpv/scripts/convert.patch b/nixpkgs/pkgs/applications/video/mpv/scripts/convert.patch
index 82171210b41..82171210b41 100644
--- a/pkgs/applications/video/mpv/scripts/convert.patch
+++ b/nixpkgs/pkgs/applications/video/mpv/scripts/convert.patch
diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix
index e383823f2cc..e383823f2cc 100644
--- a/pkgs/applications/video/mpv/scripts/mpris.nix
+++ b/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix
diff --git a/pkgs/applications/video/mpv/wrapper.nix b/nixpkgs/pkgs/applications/video/mpv/wrapper.nix
index 624c06414fd..624c06414fd 100644
--- a/pkgs/applications/video/mpv/wrapper.nix
+++ b/nixpkgs/pkgs/applications/video/mpv/wrapper.nix
diff --git a/pkgs/applications/video/mythtv/default.nix b/nixpkgs/pkgs/applications/video/mythtv/default.nix
index 2c73d3e734c..2c73d3e734c 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/nixpkgs/pkgs/applications/video/mythtv/default.nix
diff --git a/pkgs/applications/video/mythtv/disable-os-detection.patch b/nixpkgs/pkgs/applications/video/mythtv/disable-os-detection.patch
index 5a35dc2d1dd..5a35dc2d1dd 100644
--- a/pkgs/applications/video/mythtv/disable-os-detection.patch
+++ b/nixpkgs/pkgs/applications/video/mythtv/disable-os-detection.patch
diff --git a/pkgs/applications/video/mythtv/exiv2.patch b/nixpkgs/pkgs/applications/video/mythtv/exiv2.patch
index 29bf1f5967b..29bf1f5967b 100644
--- a/pkgs/applications/video/mythtv/exiv2.patch
+++ b/nixpkgs/pkgs/applications/video/mythtv/exiv2.patch
diff --git a/pkgs/applications/video/natron/config.pri b/nixpkgs/pkgs/applications/video/natron/config.pri
index c0d236c6b97..c0d236c6b97 100644
--- a/pkgs/applications/video/natron/config.pri
+++ b/nixpkgs/pkgs/applications/video/natron/config.pri
diff --git a/pkgs/applications/video/natron/default.nix b/nixpkgs/pkgs/applications/video/natron/default.nix
index 4617d1d17dc..4617d1d17dc 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/nixpkgs/pkgs/applications/video/natron/default.nix
diff --git a/pkgs/applications/video/obs-studio/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/default.nix
index 380b3d49ca7..380b3d49ca7 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/nixpkgs/pkgs/applications/video/obs-studio/default.nix
diff --git a/pkgs/applications/video/obs-studio/fix-search-path.patch b/nixpkgs/pkgs/applications/video/obs-studio/fix-search-path.patch
index 4503447ff5d..4503447ff5d 100644
--- a/pkgs/applications/video/obs-studio/fix-search-path.patch
+++ b/nixpkgs/pkgs/applications/video/obs-studio/fix-search-path.patch
diff --git a/pkgs/applications/video/obs-studio/hardcode-ndi-path.patch b/nixpkgs/pkgs/applications/video/obs-studio/hardcode-ndi-path.patch
index caef96c381f..caef96c381f 100644
--- a/pkgs/applications/video/obs-studio/hardcode-ndi-path.patch
+++ b/nixpkgs/pkgs/applications/video/obs-studio/hardcode-ndi-path.patch
diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix
index 134e0cb8a9e..134e0cb8a9e 100644
--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ b/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix
diff --git a/pkgs/applications/video/obs-studio/obs-ndi.nix b/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix
index 452793f442e..452793f442e 100644
--- a/pkgs/applications/video/obs-studio/obs-ndi.nix
+++ b/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix
diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix
index 05b826c9cef..05b826c9cef 100644
--- a/pkgs/applications/video/obs-studio/wlrobs.nix
+++ b/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix
diff --git a/pkgs/applications/video/ogmtools/default.nix b/nixpkgs/pkgs/applications/video/ogmtools/default.nix
index 221f4fc0e5c..221f4fc0e5c 100644
--- a/pkgs/applications/video/ogmtools/default.nix
+++ b/nixpkgs/pkgs/applications/video/ogmtools/default.nix
diff --git a/pkgs/applications/video/olive-editor/default.nix b/nixpkgs/pkgs/applications/video/olive-editor/default.nix
index 1285422a2f9..1285422a2f9 100644
--- a/pkgs/applications/video/olive-editor/default.nix
+++ b/nixpkgs/pkgs/applications/video/olive-editor/default.nix
diff --git a/pkgs/applications/video/omxplayer/default.nix b/nixpkgs/pkgs/applications/video/omxplayer/default.nix
index 7a130bbdb41..7a130bbdb41 100644
--- a/pkgs/applications/video/omxplayer/default.nix
+++ b/nixpkgs/pkgs/applications/video/omxplayer/default.nix
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/nixpkgs/pkgs/applications/video/openshot-qt/default.nix
index 1c5359e5f0c..1c5359e5f0c 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/nixpkgs/pkgs/applications/video/openshot-qt/default.nix
diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index 9bf21116455..9bf21116455 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix
index 2ed4b8ce3e3..2ed4b8ce3e3 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix
diff --git a/pkgs/applications/video/p2pvc/default.nix b/nixpkgs/pkgs/applications/video/p2pvc/default.nix
index d9eef7f4cd8..d9eef7f4cd8 100644
--- a/pkgs/applications/video/p2pvc/default.nix
+++ b/nixpkgs/pkgs/applications/video/p2pvc/default.nix
diff --git a/pkgs/applications/video/peek/default.nix b/nixpkgs/pkgs/applications/video/peek/default.nix
index 4872b5ec2eb..4872b5ec2eb 100644
--- a/pkgs/applications/video/peek/default.nix
+++ b/nixpkgs/pkgs/applications/video/peek/default.nix
diff --git a/pkgs/applications/video/pitivi/default.nix b/nixpkgs/pkgs/applications/video/pitivi/default.nix
index bef9537b806..bef9537b806 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/nixpkgs/pkgs/applications/video/pitivi/default.nix
diff --git a/pkgs/applications/video/pitivi/prevent-closure-contamination.patch b/nixpkgs/pkgs/applications/video/pitivi/prevent-closure-contamination.patch
index 0025ecd0a4c..0025ecd0a4c 100644
--- a/pkgs/applications/video/pitivi/prevent-closure-contamination.patch
+++ b/nixpkgs/pkgs/applications/video/pitivi/prevent-closure-contamination.patch
diff --git a/pkgs/applications/video/plex-media-player/default.nix b/nixpkgs/pkgs/applications/video/plex-media-player/default.nix
index a4f9d6222aa..a4f9d6222aa 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/nixpkgs/pkgs/applications/video/plex-media-player/default.nix
diff --git a/pkgs/applications/video/pyca/default.nix b/nixpkgs/pkgs/applications/video/pyca/default.nix
index af9ef4c1cd5..af9ef4c1cd5 100644
--- a/pkgs/applications/video/pyca/default.nix
+++ b/nixpkgs/pkgs/applications/video/pyca/default.nix
diff --git a/pkgs/applications/video/qarte/default.nix b/nixpkgs/pkgs/applications/video/qarte/default.nix
index cd6416032da..cd6416032da 100644
--- a/pkgs/applications/video/qarte/default.nix
+++ b/nixpkgs/pkgs/applications/video/qarte/default.nix
diff --git a/pkgs/applications/video/qmediathekview/default.nix b/nixpkgs/pkgs/applications/video/qmediathekview/default.nix
index 16006668846..16006668846 100644
--- a/pkgs/applications/video/qmediathekview/default.nix
+++ b/nixpkgs/pkgs/applications/video/qmediathekview/default.nix
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/nixpkgs/pkgs/applications/video/qstopmotion/default.nix
index 327a2034265..327a2034265 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/nixpkgs/pkgs/applications/video/qstopmotion/default.nix
diff --git a/pkgs/applications/video/quvi/library.nix b/nixpkgs/pkgs/applications/video/quvi/library.nix
index 8f9e3131d8a..8f9e3131d8a 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/nixpkgs/pkgs/applications/video/quvi/library.nix
diff --git a/pkgs/applications/video/quvi/scripts.nix b/nixpkgs/pkgs/applications/video/quvi/scripts.nix
index e54fc0eae4b..e54fc0eae4b 100644
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/nixpkgs/pkgs/applications/video/quvi/scripts.nix
diff --git a/pkgs/applications/video/quvi/tool.nix b/nixpkgs/pkgs/applications/video/quvi/tool.nix
index 972e08bb61b..972e08bb61b 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/nixpkgs/pkgs/applications/video/quvi/tool.nix
diff --git a/pkgs/applications/video/screenkey/default.nix b/nixpkgs/pkgs/applications/video/screenkey/default.nix
index 56b1134b2b8..56b1134b2b8 100644
--- a/pkgs/applications/video/screenkey/default.nix
+++ b/nixpkgs/pkgs/applications/video/screenkey/default.nix
diff --git a/pkgs/applications/video/screenkey/paths.patch b/nixpkgs/pkgs/applications/video/screenkey/paths.patch
index 7e5ed47fc19..7e5ed47fc19 100644
--- a/pkgs/applications/video/screenkey/paths.patch
+++ b/nixpkgs/pkgs/applications/video/screenkey/paths.patch
diff --git a/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch b/nixpkgs/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch
index 475788ba3a4..475788ba3a4 100644
--- a/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch
+++ b/nixpkgs/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch
diff --git a/pkgs/applications/video/shotcut/default.nix b/nixpkgs/pkgs/applications/video/shotcut/default.nix
index 6926f7e8eae..6926f7e8eae 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/nixpkgs/pkgs/applications/video/shotcut/default.nix
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/nixpkgs/pkgs/applications/video/simplescreenrecorder/default.nix
index b06f0fcd962..b06f0fcd962 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/nixpkgs/pkgs/applications/video/simplescreenrecorder/default.nix
diff --git a/pkgs/applications/video/simplescreenrecorder/fix-paths.patch b/nixpkgs/pkgs/applications/video/simplescreenrecorder/fix-paths.patch
index ba02240ce1f..ba02240ce1f 100644
--- a/pkgs/applications/video/simplescreenrecorder/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/video/simplescreenrecorder/fix-paths.patch
diff --git a/pkgs/applications/video/smplayer/default.nix b/nixpkgs/pkgs/applications/video/smplayer/default.nix
index 65a7f358d6f..65a7f358d6f 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/nixpkgs/pkgs/applications/video/smplayer/default.nix
diff --git a/pkgs/applications/video/smtube/default.nix b/nixpkgs/pkgs/applications/video/smtube/default.nix
index 352569e5ab3..352569e5ab3 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/nixpkgs/pkgs/applications/video/smtube/default.nix
diff --git a/pkgs/applications/video/streamlink/default.nix b/nixpkgs/pkgs/applications/video/streamlink/default.nix
index cf10bd223a1..cf10bd223a1 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/nixpkgs/pkgs/applications/video/streamlink/default.nix
diff --git a/pkgs/applications/video/subdl/default.nix b/nixpkgs/pkgs/applications/video/subdl/default.nix
index 36a92f0f1af..36a92f0f1af 100644
--- a/pkgs/applications/video/subdl/default.nix
+++ b/nixpkgs/pkgs/applications/video/subdl/default.nix
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix
index f628c3b214e..f628c3b214e 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix
diff --git a/pkgs/applications/video/tivodecode/default.nix b/nixpkgs/pkgs/applications/video/tivodecode/default.nix
index bc6561a0bbd..bc6561a0bbd 100644
--- a/pkgs/applications/video/tivodecode/default.nix
+++ b/nixpkgs/pkgs/applications/video/tivodecode/default.nix
diff --git a/pkgs/applications/video/uvccapture/default.nix b/nixpkgs/pkgs/applications/video/uvccapture/default.nix
index f52ffa923d2..f52ffa923d2 100644
--- a/pkgs/applications/video/uvccapture/default.nix
+++ b/nixpkgs/pkgs/applications/video/uvccapture/default.nix
diff --git a/pkgs/applications/video/vdr/default.nix b/nixpkgs/pkgs/applications/video/vdr/default.nix
index bcffb8585b3..bcffb8585b3 100644
--- a/pkgs/applications/video/vdr/default.nix
+++ b/nixpkgs/pkgs/applications/video/vdr/default.nix
diff --git a/pkgs/applications/video/vdr/plugins.nix b/nixpkgs/pkgs/applications/video/vdr/plugins.nix
index 2ee196baccc..2ee196baccc 100644
--- a/pkgs/applications/video/vdr/plugins.nix
+++ b/nixpkgs/pkgs/applications/video/vdr/plugins.nix
diff --git a/pkgs/applications/video/vdr/wrapper.nix b/nixpkgs/pkgs/applications/video/vdr/wrapper.nix
index 50d3b9d65a8..50d3b9d65a8 100644
--- a/pkgs/applications/video/vdr/wrapper.nix
+++ b/nixpkgs/pkgs/applications/video/vdr/wrapper.nix
diff --git a/pkgs/applications/video/vdr/xineliboutput/default.nix b/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix
index 98fcd2b5d40..98fcd2b5d40 100644
--- a/pkgs/applications/video/vdr/xineliboutput/default.nix
+++ b/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix
diff --git a/pkgs/applications/video/vlc/default.nix b/nixpkgs/pkgs/applications/video/vlc/default.nix
index 2396a224d45..2396a224d45 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/nixpkgs/pkgs/applications/video/vlc/default.nix
diff --git a/pkgs/applications/video/vokoscreen/default.nix b/nixpkgs/pkgs/applications/video/vokoscreen/default.nix
index a38a9056c85..a38a9056c85 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/nixpkgs/pkgs/applications/video/vokoscreen/default.nix
diff --git a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch b/nixpkgs/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
index afcee3f9715..afcee3f9715 100644
--- a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
+++ b/nixpkgs/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
diff --git a/pkgs/applications/video/w_scan/default.nix b/nixpkgs/pkgs/applications/video/w_scan/default.nix
index 3c4f607c6af..3c4f607c6af 100644
--- a/pkgs/applications/video/w_scan/default.nix
+++ b/nixpkgs/pkgs/applications/video/w_scan/default.nix
diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix
index 8258f858309..8258f858309 100644
--- a/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix
diff --git a/pkgs/applications/video/wf-recorder/default.nix b/nixpkgs/pkgs/applications/video/wf-recorder/default.nix
index d52a4a6ab9b..d52a4a6ab9b 100644
--- a/pkgs/applications/video/wf-recorder/default.nix
+++ b/nixpkgs/pkgs/applications/video/wf-recorder/default.nix
diff --git a/pkgs/applications/video/wxcam/default.nix b/nixpkgs/pkgs/applications/video/wxcam/default.nix
index 176d9a87aed..176d9a87aed 100644
--- a/pkgs/applications/video/wxcam/default.nix
+++ b/nixpkgs/pkgs/applications/video/wxcam/default.nix
diff --git a/pkgs/applications/video/xawtv/default.nix b/nixpkgs/pkgs/applications/video/xawtv/default.nix
index 676c218776c..676c218776c 100644
--- a/pkgs/applications/video/xawtv/default.nix
+++ b/nixpkgs/pkgs/applications/video/xawtv/default.nix
diff --git a/pkgs/applications/video/xine-ui/default.nix b/nixpkgs/pkgs/applications/video/xine-ui/default.nix
index e92d7384591..e92d7384591 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/nixpkgs/pkgs/applications/video/xine-ui/default.nix
diff --git a/pkgs/applications/video/xscast/default.nix b/nixpkgs/pkgs/applications/video/xscast/default.nix
index 3c4c59a0ee8..3c4c59a0ee8 100644
--- a/pkgs/applications/video/xscast/default.nix
+++ b/nixpkgs/pkgs/applications/video/xscast/default.nix
diff --git a/pkgs/applications/video/xvidcap/default.nix b/nixpkgs/pkgs/applications/video/xvidcap/default.nix
index 6e07fbb105b..6e07fbb105b 100644
--- a/pkgs/applications/video/xvidcap/default.nix
+++ b/nixpkgs/pkgs/applications/video/xvidcap/default.nix
diff --git a/pkgs/applications/video/xvidcap/xlib.patch b/nixpkgs/pkgs/applications/video/xvidcap/xlib.patch
index eb97854386b..eb97854386b 100644
--- a/pkgs/applications/video/xvidcap/xlib.patch
+++ b/nixpkgs/pkgs/applications/video/xvidcap/xlib.patch
diff --git a/pkgs/applications/virtualization/8086tiny/builder.sh b/nixpkgs/pkgs/applications/virtualization/8086tiny/builder.sh
index 7cff2589abe..7cff2589abe 100644
--- a/pkgs/applications/virtualization/8086tiny/builder.sh
+++ b/nixpkgs/pkgs/applications/virtualization/8086tiny/builder.sh
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix
index e16fcb84b05..e16fcb84b05 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix
index e475c4ed78a..e475c4ed78a 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix
diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix
index 02fb256b38c..02fb256b38c 100644
--- a/pkgs/applications/virtualization/aqemu/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix
diff --git a/pkgs/applications/virtualization/arion/default.nix b/nixpkgs/pkgs/applications/virtualization/arion/default.nix
index f144ec97677..f144ec97677 100644
--- a/pkgs/applications/virtualization/arion/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/arion/default.nix
diff --git a/pkgs/applications/virtualization/bochs/bochs-2.6.10-glibc-2.26.patch b/nixpkgs/pkgs/applications/virtualization/bochs/bochs-2.6.10-glibc-2.26.patch
index e662913574d..e662913574d 100644
--- a/pkgs/applications/virtualization/bochs/bochs-2.6.10-glibc-2.26.patch
+++ b/nixpkgs/pkgs/applications/virtualization/bochs/bochs-2.6.10-glibc-2.26.patch
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/nixpkgs/pkgs/applications/virtualization/bochs/default.nix
index f6e202ac499..f6e202ac499 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/bochs/default.nix
diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix
index a0694b7efbe..a0694b7efbe 100644
--- a/pkgs/applications/virtualization/charliecloud/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/nixpkgs/pkgs/applications/virtualization/cntr/default.nix
index 698f6df0673..698f6df0673 100644
--- a/pkgs/applications/virtualization/cntr/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/cntr/default.nix
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix
index 802272c4b5d..802272c4b5d 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix
index 9e9e6657291..9e9e6657291 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
index f6e78f364c2..f6e78f364c2 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
diff --git a/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff b/nixpkgs/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff
index f1aa50ee102..f1aa50ee102 100644
--- a/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff
+++ b/nixpkgs/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix
index 5035b65f981..5035b65f981 100644
--- a/pkgs/applications/virtualization/crosvm/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix
diff --git a/pkgs/applications/virtualization/crosvm/update.py b/nixpkgs/pkgs/applications/virtualization/crosvm/update.py
index 280d6ec1811..280d6ec1811 100755
--- a/pkgs/applications/virtualization/crosvm/update.py
+++ b/nixpkgs/pkgs/applications/virtualization/crosvm/update.py
diff --git a/pkgs/applications/virtualization/crosvm/upstream-info.json b/nixpkgs/pkgs/applications/virtualization/crosvm/upstream-info.json
index 690eca38bff..690eca38bff 100644
--- a/pkgs/applications/virtualization/crosvm/upstream-info.json
+++ b/nixpkgs/pkgs/applications/virtualization/crosvm/upstream-info.json
diff --git a/pkgs/applications/virtualization/crun/default.nix b/nixpkgs/pkgs/applications/virtualization/crun/default.nix
index 6fc60780ba7..6fc60780ba7 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/crun/default.nix
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix
index 4bb03aa4ac3..4bb03aa4ac3 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix
diff --git a/pkgs/applications/virtualization/docker/default.nix b/nixpkgs/pkgs/applications/virtualization/docker/default.nix
index f6fc999269e..f6fc999269e 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/docker/default.nix
diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix
index a408d20f3ba..a408d20f3ba 100644
--- a/pkgs/applications/virtualization/docker/distribution.nix
+++ b/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix
diff --git a/pkgs/applications/virtualization/docker/gc.nix b/nixpkgs/pkgs/applications/virtualization/docker/gc.nix
index dcac628e367..dcac628e367 100644
--- a/pkgs/applications/virtualization/docker/gc.nix
+++ b/nixpkgs/pkgs/applications/virtualization/docker/gc.nix
diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/nixpkgs/pkgs/applications/virtualization/docker/proxy.nix
index 3b2e1f45ae6..3b2e1f45ae6 100644
--- a/pkgs/applications/virtualization/docker/proxy.nix
+++ b/nixpkgs/pkgs/applications/virtualization/docker/proxy.nix
diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/nixpkgs/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
index 069d5836a42..069d5836a42 100644
--- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/nixpkgs/pkgs/applications/virtualization/driver/win-qemu/default.nix
index 1fa3e76d18f..1fa3e76d18f 100644
--- a/pkgs/applications/virtualization/driver/win-qemu/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/driver/win-qemu/default.nix
diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/nixpkgs/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
index 39ca93d4e1a..39ca93d4e1a 100644
--- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/nixpkgs/pkgs/applications/virtualization/driver/win-spice/default.nix
index 2b2d8568a5b..2b2d8568a5b 100644
--- a/pkgs/applications/virtualization/driver/win-spice/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/driver/win-spice/default.nix
diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix
index 351353ceb96..351353ceb96 100644
--- a/pkgs/applications/virtualization/driver/win-virtio/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix
diff --git a/pkgs/applications/virtualization/dumb-init/default.nix b/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix
index c7be90222c2..c7be90222c2 100644
--- a/pkgs/applications/virtualization/dumb-init/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix
diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix
index 6f35257b50f..6f35257b50f 100644
--- a/pkgs/applications/virtualization/dynamips/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix
diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix
index 691c74301e3..691c74301e3 100644
--- a/pkgs/applications/virtualization/ecs-agent/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix
diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix
index 9fa06f5bf0b..9fa06f5bf0b 100644
--- a/pkgs/applications/virtualization/firecracker/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix
diff --git a/pkgs/applications/virtualization/firectl/default.nix b/nixpkgs/pkgs/applications/virtualization/firectl/default.nix
index 1f74318f2dd..1f74318f2dd 100644
--- a/pkgs/applications/virtualization/firectl/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/firectl/default.nix
diff --git a/pkgs/applications/virtualization/gvisor/containerd-shim.nix b/nixpkgs/pkgs/applications/virtualization/gvisor/containerd-shim.nix
index 0161a117def..0161a117def 100644
--- a/pkgs/applications/virtualization/gvisor/containerd-shim.nix
+++ b/nixpkgs/pkgs/applications/virtualization/gvisor/containerd-shim.nix
diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix
index 2d99fb3bf57..2d99fb3bf57 100644
--- a/pkgs/applications/virtualization/gvisor/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/nixpkgs/pkgs/applications/virtualization/lkl/default.nix
index cd6600387cd..cd6600387cd 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/lkl/default.nix
diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix
index 0f53a5c4f14..0f53a5c4f14 100644
--- a/pkgs/applications/virtualization/looking-glass-client/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix
diff --git a/pkgs/applications/virtualization/nvidia-docker/config.toml b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/config.toml
index bbd166995f3..bbd166995f3 100644
--- a/pkgs/applications/virtualization/nvidia-docker/config.toml
+++ b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/config.toml
diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix
index e11ca04f6b3..e11ca04f6b3 100644
--- a/pkgs/applications/virtualization/nvidia-docker/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix
diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch
index 043c1efade8..043c1efade8 100644
--- a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch
+++ b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch
diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
index 71c02ab4de5..71c02ab4de5 100644
--- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
+++ b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix
index 87ec2e52f13..87ec2e52f13 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix
diff --git a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
index 95b0951b585..95b0951b585 100644
--- a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
+++ b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix
index 31755f87f63..31755f87f63 100644
--- a/pkgs/applications/virtualization/podman-compose/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix
diff --git a/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix
index dbd05e38d3f..dbd05e38d3f 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix
diff --git a/pkgs/applications/virtualization/qboot/default.nix b/nixpkgs/pkgs/applications/virtualization/qboot/default.nix
index 0678591fc2a..0678591fc2a 100644
--- a/pkgs/applications/virtualization/qboot/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/qboot/default.nix
diff --git a/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch b/nixpkgs/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch
index 03e47a57863..03e47a57863 100644
--- a/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch
+++ b/nixpkgs/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
index 67aa36b7827..67aa36b7827 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
diff --git a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch b/nixpkgs/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch
index c2f051e2b94..c2f051e2b94 100644
--- a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch
+++ b/nixpkgs/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch
diff --git a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch b/nixpkgs/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
index 33c4ffff6fe..33c4ffff6fe 100644
--- a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
+++ b/nixpkgs/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/nixpkgs/pkgs/applications/virtualization/qemu/no-etc-install.patch
index 5bab930d06a..5bab930d06a 100644
--- a/pkgs/applications/virtualization/qemu/no-etc-install.patch
+++ b/nixpkgs/pkgs/applications/virtualization/qemu/no-etc-install.patch
diff --git a/pkgs/applications/virtualization/qemu/sigrtminmax.patch b/nixpkgs/pkgs/applications/virtualization/qemu/sigrtminmax.patch
index 41050447ac6..41050447ac6 100644
--- a/pkgs/applications/virtualization/qemu/sigrtminmax.patch
+++ b/nixpkgs/pkgs/applications/virtualization/qemu/sigrtminmax.patch
diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/nixpkgs/pkgs/applications/virtualization/qemu/utils.nix
index 430d7122179..430d7122179 100644
--- a/pkgs/applications/virtualization/qemu/utils.nix
+++ b/nixpkgs/pkgs/applications/virtualization/qemu/utils.nix
diff --git a/pkgs/applications/virtualization/railcar/cargo-lock.patch b/nixpkgs/pkgs/applications/virtualization/railcar/cargo-lock.patch
index bb9d5420f32..bb9d5420f32 100644
--- a/pkgs/applications/virtualization/railcar/cargo-lock.patch
+++ b/nixpkgs/pkgs/applications/virtualization/railcar/cargo-lock.patch
diff --git a/pkgs/applications/virtualization/railcar/default.nix b/nixpkgs/pkgs/applications/virtualization/railcar/default.nix
index bce25406142..bce25406142 100644
--- a/pkgs/applications/virtualization/railcar/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/railcar/default.nix
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix
index 58710365b6e..58710365b6e 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/nixpkgs/pkgs/applications/virtualization/rkt/default.nix
index fd0bd92faa6..fd0bd92faa6 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/rkt/default.nix
diff --git a/pkgs/applications/virtualization/runc/default.nix b/nixpkgs/pkgs/applications/virtualization/runc/default.nix
index e7713d45f2f..e7713d45f2f 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/runc/default.nix
diff --git a/pkgs/applications/virtualization/seabios/default.nix b/nixpkgs/pkgs/applications/virtualization/seabios/default.nix
index 32528627a3c..32528627a3c 100644
--- a/pkgs/applications/virtualization/seabios/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/seabios/default.nix
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix
index 60825063cab..60825063cab 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix
diff --git a/pkgs/applications/virtualization/singularity/deps.nix b/nixpkgs/pkgs/applications/virtualization/singularity/deps.nix
index fe51488c706..fe51488c706 100644
--- a/pkgs/applications/virtualization/singularity/deps.nix
+++ b/nixpkgs/pkgs/applications/virtualization/singularity/deps.nix
diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix
index 6f5cbeb7ed4..6f5cbeb7ed4 100644
--- a/pkgs/applications/virtualization/spice-vdagent/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix
diff --git a/pkgs/applications/virtualization/spike/default.nix b/nixpkgs/pkgs/applications/virtualization/spike/default.nix
index 4dbb7fbe4a5..4dbb7fbe4a5 100644
--- a/pkgs/applications/virtualization/spike/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/spike/default.nix
diff --git a/pkgs/applications/virtualization/tini/default.nix b/nixpkgs/pkgs/applications/virtualization/tini/default.nix
index fcc599b451f..fcc599b451f 100644
--- a/pkgs/applications/virtualization/tini/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/tini/default.nix
diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/nixpkgs/pkgs/applications/virtualization/tinyemu/default.nix
index 224f77ed32d..224f77ed32d 100644
--- a/pkgs/applications/virtualization/tinyemu/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/tinyemu/default.nix
diff --git a/pkgs/applications/virtualization/umoci/default.nix b/nixpkgs/pkgs/applications/virtualization/umoci/default.nix
index 245bb841af6..245bb841af6 100644
--- a/pkgs/applications/virtualization/umoci/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/umoci/default.nix
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix
index 99d20477a12..99d20477a12 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix
index 5b2b33d6adf..5b2b33d6adf 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix
diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix
index f32a2a6ce1c..f32a2a6ce1c 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix
index 3d058903200..3d058903200 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix
diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix
index f3004267ed7..f3004267ed7 100644
--- a/pkgs/applications/virtualization/virt-what/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix
index 6931e492e99..6931e492e99 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix
index 6c15b2ea2ce..6c15b2ea2ce 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix
index c935a40c540..c935a40c540 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 690b72f3eeb..690b72f3eeb 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/nixpkgs/pkgs/applications/virtualization/virtualbox/hardened.patch
index 398100f3f39..398100f3f39 100644
--- a/pkgs/applications/virtualization/virtualbox/hardened.patch
+++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/hardened.patch
diff --git a/pkgs/applications/virtualization/virtualbox/qt-env-vars.patch b/nixpkgs/pkgs/applications/virtualization/virtualbox/qt-env-vars.patch
index ad1d1fd11f8..ad1d1fd11f8 100644
--- a/pkgs/applications/virtualization/virtualbox/qt-env-vars.patch
+++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/qt-env-vars.patch
diff --git a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch b/nixpkgs/pkgs/applications/virtualization/virtualbox/qtx11extras.patch
index a3aa98b081d..a3aa98b081d 100644
--- a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch
+++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/qtx11extras.patch
diff --git a/pkgs/applications/virtualization/virtualbox/update.py b/nixpkgs/pkgs/applications/virtualization/virtualbox/update.py
index 6e8bfd5c825..6e8bfd5c825 100755
--- a/pkgs/applications/virtualization/virtualbox/update.py
+++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/update.py
diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix
index 464fe46b499..464fe46b499 100644
--- a/pkgs/applications/virtualization/vpcs/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix
diff --git a/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch b/nixpkgs/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch
index d94a39ccd64..d94a39ccd64 100644
--- a/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch
+++ b/nixpkgs/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
index 0d6b3632bc7..0d6b3632bc7 100644
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
diff --git a/pkgs/applications/virtualization/xen/0000-fix-install-python.patch b/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-install-python.patch
index 53821c0d9c5..53821c0d9c5 100644
--- a/pkgs/applications/virtualization/xen/0000-fix-install-python.patch
+++ b/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-install-python.patch
diff --git a/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch b/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch
index 072338b87ab..072338b87ab 100644
--- a/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch
+++ b/nixpkgs/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch
diff --git a/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch b/nixpkgs/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch
index 339972a2cde..339972a2cde 100644
--- a/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch
+++ b/nixpkgs/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch
diff --git a/pkgs/applications/virtualization/xen/0001-libxl-Spice-image-compression-setting-support-for-up.patch b/nixpkgs/pkgs/applications/virtualization/xen/0001-libxl-Spice-image-compression-setting-support-for-up.patch
index 67b7ac777b5..67b7ac777b5 100644
--- a/pkgs/applications/virtualization/xen/0001-libxl-Spice-image-compression-setting-support-for-up.patch
+++ b/nixpkgs/pkgs/applications/virtualization/xen/0001-libxl-Spice-image-compression-setting-support-for-up.patch
diff --git a/pkgs/applications/virtualization/xen/0002-libxl-Spice-streaming-video-setting-support-for-upst.patch b/nixpkgs/pkgs/applications/virtualization/xen/0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
index acf9cff9925..acf9cff9925 100644
--- a/pkgs/applications/virtualization/xen/0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
+++ b/nixpkgs/pkgs/applications/virtualization/xen/0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
diff --git a/pkgs/applications/virtualization/xen/0003-Add-qxl-vga-interface-support-for-upstream-qem.patch b/nixpkgs/pkgs/applications/virtualization/xen/0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
index 1771b662bc3..1771b662bc3 100644
--- a/pkgs/applications/virtualization/xen/0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
+++ b/nixpkgs/pkgs/applications/virtualization/xen/0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix
index f15a7ef0f9d..f15a7ef0f9d 100644
--- a/pkgs/applications/virtualization/xen/4.10.nix
+++ b/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/nixpkgs/pkgs/applications/virtualization/xen/4.8.nix
index 1d0e01fcb82..1d0e01fcb82 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/nixpkgs/pkgs/applications/virtualization/xen/4.8.nix
diff --git a/pkgs/applications/virtualization/xen/acpica-utils-20180427.patch b/nixpkgs/pkgs/applications/virtualization/xen/acpica-utils-20180427.patch
index aa4fd494082..aa4fd494082 100644
--- a/pkgs/applications/virtualization/xen/acpica-utils-20180427.patch
+++ b/nixpkgs/pkgs/applications/virtualization/xen/acpica-utils-20180427.patch
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/nixpkgs/pkgs/applications/virtualization/xen/generic.nix
index 5a8814fb9e2..5a8814fb9e2 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/nixpkgs/pkgs/applications/virtualization/xen/generic.nix
diff --git a/pkgs/applications/virtualization/xen/packages.nix b/nixpkgs/pkgs/applications/virtualization/xen/packages.nix
index e30006fbcc1..e30006fbcc1 100644
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/nixpkgs/pkgs/applications/virtualization/xen/packages.nix
diff --git a/pkgs/applications/virtualization/xen/qemu-gluster-6-compat.diff b/nixpkgs/pkgs/applications/virtualization/xen/qemu-gluster-6-compat.diff
index 7ec6ad3aba6..7ec6ad3aba6 100644
--- a/pkgs/applications/virtualization/xen/qemu-gluster-6-compat.diff
+++ b/nixpkgs/pkgs/applications/virtualization/xen/qemu-gluster-6-compat.diff
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/nixpkgs/pkgs/applications/virtualization/xen/xsa-patches.nix
index 26cdbc1f65f..26cdbc1f65f 100644
--- a/pkgs/applications/virtualization/xen/xsa-patches.nix
+++ b/nixpkgs/pkgs/applications/virtualization/xen/xsa-patches.nix
diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix
index e39877df829..e39877df829 100644
--- a/pkgs/applications/virtualization/xhyve/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/nixpkgs/pkgs/applications/window-managers/2bwm/default.nix
index cd1a3a4baf7..cd1a3a4baf7 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/2bwm/default.nix
diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/nixpkgs/pkgs/applications/window-managers/afterstep/default.nix
index 7e68de8393f..7e68de8393f 100644
--- a/pkgs/applications/window-managers/afterstep/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/afterstep/default.nix
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/nixpkgs/pkgs/applications/window-managers/awesome/default.nix
index 54244d4dc8d..54244d4dc8d 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/awesome/default.nix
diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/nixpkgs/pkgs/applications/window-managers/bevelbar/default.nix
index 40cebb572af..40cebb572af 100644
--- a/pkgs/applications/window-managers/bevelbar/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/bevelbar/default.nix
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/nixpkgs/pkgs/applications/window-managers/bspwm/default.nix
index e863a382470..e863a382470 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/bspwm/default.nix
diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/nixpkgs/pkgs/applications/window-managers/bspwm/unstable.nix
index eeadfa248d7..eeadfa248d7 100644
--- a/pkgs/applications/window-managers/bspwm/unstable.nix
+++ b/nixpkgs/pkgs/applications/window-managers/bspwm/unstable.nix
diff --git a/pkgs/applications/window-managers/btops/default.nix b/nixpkgs/pkgs/applications/window-managers/btops/default.nix
index cf90b1fad63..cf90b1fad63 100644
--- a/pkgs/applications/window-managers/btops/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/btops/default.nix
diff --git a/pkgs/applications/window-managers/btops/deps.nix b/nixpkgs/pkgs/applications/window-managers/btops/deps.nix
index a893d40e210..a893d40e210 100644
--- a/pkgs/applications/window-managers/btops/deps.nix
+++ b/nixpkgs/pkgs/applications/window-managers/btops/deps.nix
diff --git a/pkgs/applications/window-managers/cage/default.nix b/nixpkgs/pkgs/applications/window-managers/cage/default.nix
index fe5e9c4e2e3..fe5e9c4e2e3 100644
--- a/pkgs/applications/window-managers/cage/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/cage/default.nix
diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/nixpkgs/pkgs/applications/window-managers/clfswm/default.nix
index e2c39887a32..e2c39887a32 100644
--- a/pkgs/applications/window-managers/clfswm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/clfswm/default.nix
diff --git a/pkgs/applications/window-managers/clfswm/require-clx.patch b/nixpkgs/pkgs/applications/window-managers/clfswm/require-clx.patch
index ae2234461d2..ae2234461d2 100644
--- a/pkgs/applications/window-managers/clfswm/require-clx.patch
+++ b/nixpkgs/pkgs/applications/window-managers/clfswm/require-clx.patch
diff --git a/pkgs/applications/window-managers/cwm/default.nix b/nixpkgs/pkgs/applications/window-managers/cwm/default.nix
index 53489eca3a0..53489eca3a0 100644
--- a/pkgs/applications/window-managers/cwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/cwm/default.nix
diff --git a/pkgs/applications/window-managers/dwm/default.nix b/nixpkgs/pkgs/applications/window-managers/dwm/default.nix
index af2c9af900d..af2c9af900d 100644
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/dwm/default.nix
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix
index ecd792f74e7..ecd792f74e7 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix
diff --git a/pkgs/applications/window-managers/dwm/git.nix b/nixpkgs/pkgs/applications/window-managers/dwm/git.nix
index aaa32dd6b11..aaa32dd6b11 100644
--- a/pkgs/applications/window-managers/dwm/git.nix
+++ b/nixpkgs/pkgs/applications/window-managers/dwm/git.nix
diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/nixpkgs/pkgs/applications/window-managers/dzen2/default.nix
index 96dcfb93800..96dcfb93800 100644
--- a/pkgs/applications/window-managers/dzen2/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/dzen2/default.nix
diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/nixpkgs/pkgs/applications/window-managers/evilwm/default.nix
index 1907fbb68f9..1907fbb68f9 100644
--- a/pkgs/applications/window-managers/evilwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/evilwm/default.nix
diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix
index cf45dfa8640..cf45dfa8640 100644
--- a/pkgs/applications/window-managers/fbpanel/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix
diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/nixpkgs/pkgs/applications/window-managers/fluxbox/default.nix
index 404044fa3fa..404044fa3fa 100644
--- a/pkgs/applications/window-managers/fluxbox/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/fluxbox/default.nix
diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix
index cc503b2db4f..cc503b2db4f 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix
diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix
index ca64786475f..ca64786475f 100644
--- a/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix
diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/nixpkgs/pkgs/applications/window-managers/i3/blocks-gaps.nix
index acfd06235ac..acfd06235ac 100644
--- a/pkgs/applications/window-managers/i3/blocks-gaps.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/blocks-gaps.nix
diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix
index 8c3101f8eb9..8c3101f8eb9 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix
diff --git a/pkgs/applications/window-managers/i3/default.nix b/nixpkgs/pkgs/applications/window-managers/i3/default.nix
index 403d9939e13..403d9939e13 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/default.nix
diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/nixpkgs/pkgs/applications/window-managers/i3/easyfocus.nix
index 9ce5486557a..9ce5486557a 100644
--- a/pkgs/applications/window-managers/i3/easyfocus.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/easyfocus.nix
diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix
index e5c478987df..e5c478987df 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix
diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/nixpkgs/pkgs/applications/window-managers/i3/i3ipc-glib.nix
index 33aac1cf4b6..33aac1cf4b6 100644
--- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/i3ipc-glib.nix
diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix
index c7454981400..c7454981400 100644
--- a/pkgs/applications/window-managers/i3/layout-manager.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix
index 7895d8c124a..7895d8c124a 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix
diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix
index 4ca69ce31b4..4ca69ce31b4 100644
--- a/pkgs/applications/window-managers/i3/lock-fancy.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/nixpkgs/pkgs/applications/window-managers/i3/lock.nix
index 619345d1b96..619345d1b96 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/lock.nix
diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/nixpkgs/pkgs/applications/window-managers/i3/pystatus.nix
index 20ea0dd03cc..20ea0dd03cc 100644
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/pystatus.nix
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix
index 80750ab61be..80750ab61be 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix
diff --git a/pkgs/applications/window-managers/i3/status.nix b/nixpkgs/pkgs/applications/window-managers/i3/status.nix
index e963259b624..e963259b624 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/status.nix
diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/nixpkgs/pkgs/applications/window-managers/i3/wk-switch.nix
index 5b1cdbe05f5..5b1cdbe05f5 100644
--- a/pkgs/applications/window-managers/i3/wk-switch.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/wk-switch.nix
diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix
index b0012c587f6..b0012c587f6 100644
--- a/pkgs/applications/window-managers/i3/wmfocus.nix
+++ b/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/nixpkgs/pkgs/applications/window-managers/icewm/default.nix
index 58fa0d194e1..58fa0d194e1 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/icewm/default.nix
diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/nixpkgs/pkgs/applications/window-managers/ion-3/default.nix
index 073af3bfd05..073af3bfd05 100644
--- a/pkgs/applications/window-managers/ion-3/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/ion-3/default.nix
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/nixpkgs/pkgs/applications/window-managers/jwm/default.nix
index 3668b344be5..3668b344be5 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/jwm/default.nix
diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/nixpkgs/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
index db33b27ddd8..db33b27ddd8 100644
--- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
+++ b/nixpkgs/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix
index bcfcbe3c5f5..bcfcbe3c5f5 100644
--- a/pkgs/applications/window-managers/kbdd/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix
diff --git a/pkgs/applications/window-managers/larswm/default.nix b/nixpkgs/pkgs/applications/window-managers/larswm/default.nix
index f6f3132178c..f6f3132178c 100644
--- a/pkgs/applications/window-managers/larswm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/larswm/default.nix
diff --git a/pkgs/applications/window-managers/leftwm/cargo-lock.patch b/nixpkgs/pkgs/applications/window-managers/leftwm/cargo-lock.patch
index 54b7e47cc07..54b7e47cc07 100644
--- a/pkgs/applications/window-managers/leftwm/cargo-lock.patch
+++ b/nixpkgs/pkgs/applications/window-managers/leftwm/cargo-lock.patch
diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix
index 29e33bca914..29e33bca914 100644
--- a/pkgs/applications/window-managers/leftwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix
diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix
index 9d6e0f27f93..9d6e0f27f93 100644
--- a/pkgs/applications/window-managers/lemonbar/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix
diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/nixpkgs/pkgs/applications/window-managers/lemonbar/xft.nix
index ff34f1dfee7..ff34f1dfee7 100644
--- a/pkgs/applications/window-managers/lemonbar/xft.nix
+++ b/nixpkgs/pkgs/applications/window-managers/lemonbar/xft.nix
diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/nixpkgs/pkgs/applications/window-managers/matchbox/default.nix
index 3c537d6c931..3c537d6c931 100644
--- a/pkgs/applications/window-managers/matchbox/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/matchbox/default.nix
diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix
index 026ee2e1287..026ee2e1287 100644
--- a/pkgs/applications/window-managers/neocomp/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix
diff --git a/pkgs/applications/window-managers/notion/default.nix b/nixpkgs/pkgs/applications/window-managers/notion/default.nix
index 2b9e8237a04..2b9e8237a04 100644
--- a/pkgs/applications/window-managers/notion/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/notion/default.nix
diff --git a/pkgs/applications/window-managers/openbox/default.nix b/nixpkgs/pkgs/applications/window-managers/openbox/default.nix
index c8d526b6d28..c8d526b6d28 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/openbox/default.nix
diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/nixpkgs/pkgs/applications/window-managers/oroborus/default.nix
index d449fc91c0d..d449fc91c0d 100644
--- a/pkgs/applications/window-managers/oroborus/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/oroborus/default.nix
diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix
index 38255dce722..38255dce722 100644
--- a/pkgs/applications/window-managers/pekwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix
diff --git a/pkgs/applications/window-managers/picom/default.nix b/nixpkgs/pkgs/applications/window-managers/picom/default.nix
index ad5f73ab173..ad5f73ab173 100644
--- a/pkgs/applications/window-managers/picom/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/picom/default.nix
diff --git a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch b/nixpkgs/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
index 219d6dcbe20..219d6dcbe20 100644
--- a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
+++ b/nixpkgs/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/nixpkgs/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
index a01f14062f1..a01f14062f1 100644
--- a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
+++ b/nixpkgs/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
diff --git a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch b/nixpkgs/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
index 87fd1977379..87fd1977379 100644
--- a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
+++ b/nixpkgs/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/nixpkgs/pkgs/applications/window-managers/qtile/default.nix
index 6d0e6bdac45..6d0e6bdac45 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/qtile/default.nix
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/nixpkgs/pkgs/applications/window-managers/ratpoison/default.nix
index 11a69020ee6..11a69020ee6 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/ratpoison/default.nix
diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix
index f9bcb28e455..f9bcb28e455 100644
--- a/pkgs/applications/window-managers/sawfish/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix
diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix
index 1eb19e2de6f..1eb19e2de6f 100644
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix
diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/nixpkgs/pkgs/applications/window-managers/stalonetray/default.nix
index f0f724d6cf0..f0f724d6cf0 100644
--- a/pkgs/applications/window-managers/stalonetray/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/stalonetray/default.nix
diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix
index 00f4b95b3f2..00f4b95b3f2 100644
--- a/pkgs/applications/window-managers/stumpish/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix
diff --git a/pkgs/applications/window-managers/stumpish/paths.patch b/nixpkgs/pkgs/applications/window-managers/stumpish/paths.patch
index d1839203701..d1839203701 100644
--- a/pkgs/applications/window-managers/stumpish/paths.patch
+++ b/nixpkgs/pkgs/applications/window-managers/stumpish/paths.patch
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/nixpkgs/pkgs/applications/window-managers/stumpwm/default.nix
index 69b2e6ceb50..69b2e6ceb50 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/stumpwm/default.nix
diff --git a/pkgs/applications/window-managers/stumpwm/fix-module-path.patch b/nixpkgs/pkgs/applications/window-managers/stumpwm/fix-module-path.patch
index 79bfaad3dec..79bfaad3dec 100644
--- a/pkgs/applications/window-managers/stumpwm/fix-module-path.patch
+++ b/nixpkgs/pkgs/applications/window-managers/stumpwm/fix-module-path.patch
diff --git a/pkgs/applications/window-managers/sway/bg.nix b/nixpkgs/pkgs/applications/window-managers/sway/bg.nix
index 86301492c46..86301492c46 100644
--- a/pkgs/applications/window-managers/sway/bg.nix
+++ b/nixpkgs/pkgs/applications/window-managers/sway/bg.nix
diff --git a/pkgs/applications/window-managers/sway/default.nix b/nixpkgs/pkgs/applications/window-managers/sway/default.nix
index a020c10a348..a020c10a348 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/sway/default.nix
diff --git a/pkgs/applications/window-managers/sway/idle.nix b/nixpkgs/pkgs/applications/window-managers/sway/idle.nix
index 486ab79598d..486ab79598d 100644
--- a/pkgs/applications/window-managers/sway/idle.nix
+++ b/nixpkgs/pkgs/applications/window-managers/sway/idle.nix
diff --git a/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch b/nixpkgs/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch
index 26a3d40d66c..26a3d40d66c 100644
--- a/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch
+++ b/nixpkgs/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch
diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/nixpkgs/pkgs/applications/window-managers/sway/lock-fancy.nix
index aa2db698f74..aa2db698f74 100644
--- a/pkgs/applications/window-managers/sway/lock-fancy.nix
+++ b/nixpkgs/pkgs/applications/window-managers/sway/lock-fancy.nix
diff --git a/pkgs/applications/window-managers/sway/lock.nix b/nixpkgs/pkgs/applications/window-managers/sway/lock.nix
index dcff3a5c47f..dcff3a5c47f 100644
--- a/pkgs/applications/window-managers/sway/lock.nix
+++ b/nixpkgs/pkgs/applications/window-managers/sway/lock.nix
diff --git a/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch b/nixpkgs/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch
index 009c1295943..009c1295943 100644
--- a/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch
+++ b/nixpkgs/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch
diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix
index 7c59b8b7cde..7c59b8b7cde 100644
--- a/pkgs/applications/window-managers/sway/wrapper.nix
+++ b/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix
diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/nixpkgs/pkgs/applications/window-managers/sxhkd/default.nix
index 2404129b165..2404129b165 100644
--- a/pkgs/applications/window-managers/sxhkd/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/sxhkd/default.nix
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix
index c391532376e..c391532376e 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix
diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/nixpkgs/pkgs/applications/window-managers/taffybar/default.nix
index 681a5baec82..681a5baec82 100644
--- a/pkgs/applications/window-managers/taffybar/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/taffybar/default.nix
diff --git a/pkgs/applications/window-managers/trayer/default.nix b/nixpkgs/pkgs/applications/window-managers/trayer/default.nix
index 5705ae8256c..5705ae8256c 100644
--- a/pkgs/applications/window-managers/trayer/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/trayer/default.nix
diff --git a/pkgs/applications/window-managers/vwm/default.nix b/nixpkgs/pkgs/applications/window-managers/vwm/default.nix
index 3423b0e181d..3423b0e181d 100644
--- a/pkgs/applications/window-managers/vwm/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/vwm/default.nix
diff --git a/pkgs/applications/window-managers/weston/default.nix b/nixpkgs/pkgs/applications/window-managers/weston/default.nix
index 51da999aff0..51da999aff0 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/weston/default.nix
diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix
index d0a1de7f600..d0a1de7f600 100644
--- a/pkgs/applications/window-managers/windowlab/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix
index 8ad63999289..8ad63999289 100644
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
index e708682e303..e708682e303 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
+++ b/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix
index e2f17d11f64..e2f17d11f64 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix
+++ b/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
index 3e8b3f7f158..3e8b3f7f158 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
+++ b/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
index e5eb2fc559d..e5eb2fc559d 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
+++ b/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix
index 2013096d6fe..2013096d6fe 100644
--- a/pkgs/applications/window-managers/wmfs/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix
index 426fcfe8efc..426fcfe8efc 100644
--- a/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix
diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/nixpkgs/pkgs/applications/window-managers/wtftw/default.nix
index 36ca00b776b..36ca00b776b 100644
--- a/pkgs/applications/window-managers/wtftw/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/wtftw/default.nix
diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix
index f7ccda27389..f7ccda27389 100644
--- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix
diff --git a/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch b/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch
index 5e1fc7114dc..5e1fc7114dc 100644
--- a/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch
+++ b/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch
diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/nixpkgs/pkgs/applications/window-managers/xmonad/wrapper.nix
index f5c9f12a23f..f5c9f12a23f 100644
--- a/pkgs/applications/window-managers/xmonad/wrapper.nix
+++ b/nixpkgs/pkgs/applications/window-managers/xmonad/wrapper.nix
diff --git a/pkgs/applications/window-managers/yabar/build.nix b/nixpkgs/pkgs/applications/window-managers/yabar/build.nix
index f7867882d22..f7867882d22 100644
--- a/pkgs/applications/window-managers/yabar/build.nix
+++ b/nixpkgs/pkgs/applications/window-managers/yabar/build.nix
diff --git a/pkgs/applications/window-managers/yabar/default.nix b/nixpkgs/pkgs/applications/window-managers/yabar/default.nix
index a33a75676ee..a33a75676ee 100644
--- a/pkgs/applications/window-managers/yabar/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/yabar/default.nix
diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/nixpkgs/pkgs/applications/window-managers/yabar/unstable.nix
index 47c8f6c5e56..47c8f6c5e56 100644
--- a/pkgs/applications/window-managers/yabar/unstable.nix
+++ b/nixpkgs/pkgs/applications/window-managers/yabar/unstable.nix
diff --git a/pkgs/build-support/add-opengl-runpath/default.nix b/nixpkgs/pkgs/build-support/add-opengl-runpath/default.nix
index 5cab0937e07..5cab0937e07 100644
--- a/pkgs/build-support/add-opengl-runpath/default.nix
+++ b/nixpkgs/pkgs/build-support/add-opengl-runpath/default.nix
diff --git a/pkgs/build-support/add-opengl-runpath/setup-hook.sh b/nixpkgs/pkgs/build-support/add-opengl-runpath/setup-hook.sh
index e556e7ead2a..e556e7ead2a 100644
--- a/pkgs/build-support/add-opengl-runpath/setup-hook.sh
+++ b/nixpkgs/pkgs/build-support/add-opengl-runpath/setup-hook.sh
diff --git a/pkgs/build-support/agda/default.nix b/nixpkgs/pkgs/build-support/agda/default.nix
index 0d054eaa546..0d054eaa546 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/nixpkgs/pkgs/build-support/agda/default.nix
diff --git a/pkgs/build-support/appimage/default.nix b/nixpkgs/pkgs/build-support/appimage/default.nix
index c871df787b7..c871df787b7 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/nixpkgs/pkgs/build-support/appimage/default.nix
diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/nixpkgs/pkgs/build-support/bintools-wrapper/add-flags.sh
index e5c0556556c..e5c0556556c 100644
--- a/pkgs/build-support/bintools-wrapper/add-flags.sh
+++ b/nixpkgs/pkgs/build-support/bintools-wrapper/add-flags.sh
diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/nixpkgs/pkgs/build-support/bintools-wrapper/add-hardening.sh
index b7180870860..b7180870860 100644
--- a/pkgs/build-support/bintools-wrapper/add-hardening.sh
+++ b/nixpkgs/pkgs/build-support/bintools-wrapper/add-hardening.sh
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
index 84020505a63..84020505a63 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
diff --git a/pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh b/nixpkgs/pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh
index 5d81e34a047..5d81e34a047 100644
--- a/pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh
+++ b/nixpkgs/pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh
diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
index ed2f00a8974..ed2f00a8974 100644
--- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
+++ b/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
diff --git a/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash b/nixpkgs/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash
index 71b9471cbc8..71b9471cbc8 100644
--- a/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash
+++ b/nixpkgs/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/nixpkgs/pkgs/build-support/bintools-wrapper/setup-hook.sh
index a714bd151c9..a714bd151c9 100644
--- a/pkgs/build-support/bintools-wrapper/setup-hook.sh
+++ b/nixpkgs/pkgs/build-support/bintools-wrapper/setup-hook.sh
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/nixpkgs/pkgs/build-support/build-bazel-package/default.nix
index 8fa3cc55279..8fa3cc55279 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/nixpkgs/pkgs/build-support/build-bazel-package/default.nix
diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/nixpkgs/pkgs/build-support/build-dotnet-package/default.nix
index dae9ed888c7..dae9ed888c7 100644
--- a/pkgs/build-support/build-dotnet-package/default.nix
+++ b/nixpkgs/pkgs/build-support/build-dotnet-package/default.nix
diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
index dcb2e97aa93..dcb2e97aa93 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
+++ b/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
index 70a7a43bd39..70a7a43bd39 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
+++ b/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build b/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build
index 6d0770a0dc4..6d0770a0dc4 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build
+++ b/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/nixpkgs/pkgs/build-support/build-fhs-userenv/default.nix
index 707b256cd4b..707b256cd4b 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/nixpkgs/pkgs/build-support/build-fhs-userenv/default.nix
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix
index 8de43d5a919..8de43d5a919 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix
diff --git a/pkgs/build-support/build-maven.nix b/nixpkgs/pkgs/build-support/build-maven.nix
index f47e3ebc61c..f47e3ebc61c 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/nixpkgs/pkgs/build-support/build-maven.nix
diff --git a/pkgs/build-support/build-pecl.nix b/nixpkgs/pkgs/build-support/build-pecl.nix
index a1030e3b34f..a1030e3b34f 100644
--- a/pkgs/build-support/build-pecl.nix
+++ b/nixpkgs/pkgs/build-support/build-pecl.nix
diff --git a/pkgs/build-support/build-setupcfg/default.nix b/nixpkgs/pkgs/build-support/build-setupcfg/default.nix
index bc6482f0a88..bc6482f0a88 100644
--- a/pkgs/build-support/build-setupcfg/default.nix
+++ b/nixpkgs/pkgs/build-support/build-setupcfg/default.nix
diff --git a/pkgs/build-support/buildenv/builder.pl b/nixpkgs/pkgs/build-support/buildenv/builder.pl
index fc6ffce735c..fc6ffce735c 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/nixpkgs/pkgs/build-support/buildenv/builder.pl
diff --git a/pkgs/build-support/buildenv/default.nix b/nixpkgs/pkgs/build-support/buildenv/default.nix
index 7f2427777f9..7f2427777f9 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/nixpkgs/pkgs/build-support/buildenv/default.nix
diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh
index 1358b167f6e..1358b167f6e 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh
index fc40fe7408b..fc40fe7408b 100644
--- a/pkgs/build-support/cc-wrapper/add-hardening.sh
+++ b/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index ba3dfc96f5c..ba3dfc96f5c 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
index b078bf2fbbd..b078bf2fbbd 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/nixpkgs/pkgs/build-support/cc-wrapper/setup-hook.sh
index 5b13f268309..5b13f268309 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/nixpkgs/pkgs/build-support/cc-wrapper/setup-hook.sh
diff --git a/pkgs/build-support/closure-info.nix b/nixpkgs/pkgs/build-support/closure-info.nix
index 6b3ff6fd62b..6b3ff6fd62b 100644
--- a/pkgs/build-support/closure-info.nix
+++ b/nixpkgs/pkgs/build-support/closure-info.nix
diff --git a/pkgs/build-support/dhall-to-nix.nix b/nixpkgs/pkgs/build-support/dhall-to-nix.nix
index 3805656dfa0..3805656dfa0 100644
--- a/pkgs/build-support/dhall-to-nix.nix
+++ b/nixpkgs/pkgs/build-support/dhall-to-nix.nix
diff --git a/pkgs/build-support/docker-slim/default.nix b/nixpkgs/pkgs/build-support/docker-slim/default.nix
index 6004898f08e..6004898f08e 100644
--- a/pkgs/build-support/docker-slim/default.nix
+++ b/nixpkgs/pkgs/build-support/docker-slim/default.nix
diff --git a/pkgs/build-support/docker/default.nix b/nixpkgs/pkgs/build-support/docker/default.nix
index 509b7e2a7e1..509b7e2a7e1 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/nixpkgs/pkgs/build-support/docker/default.nix
diff --git a/pkgs/build-support/docker/detjson.py b/nixpkgs/pkgs/build-support/docker/detjson.py
index 439c2131387..439c2131387 100644
--- a/pkgs/build-support/docker/detjson.py
+++ b/nixpkgs/pkgs/build-support/docker/detjson.py
diff --git a/pkgs/build-support/docker/examples.nix b/nixpkgs/pkgs/build-support/docker/examples.nix
index a1f71d35793..a1f71d35793 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/nixpkgs/pkgs/build-support/docker/examples.nix
diff --git a/pkgs/build-support/docker/nix-prefetch-docker b/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker
index 839dc87487a..839dc87487a 100755
--- a/pkgs/build-support/docker/nix-prefetch-docker
+++ b/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker
diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker.nix
index c1d86adc6d8..c1d86adc6d8 100644
--- a/pkgs/build-support/docker/nix-prefetch-docker.nix
+++ b/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker.nix
diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh
index c808abab7a8..c808abab7a8 100755
--- a/pkgs/build-support/docker/store-path-to-layer.sh
+++ b/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh
diff --git a/pkgs/build-support/docker/tarsum.go b/nixpkgs/pkgs/build-support/docker/tarsum.go
index f91a90bdbda..f91a90bdbda 100644
--- a/pkgs/build-support/docker/tarsum.go
+++ b/nixpkgs/pkgs/build-support/docker/tarsum.go
diff --git a/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh b/nixpkgs/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh
index 37914170452..37914170452 100644
--- a/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh
+++ b/nixpkgs/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh
diff --git a/pkgs/build-support/dotnetbuildhelpers/default.nix b/nixpkgs/pkgs/build-support/dotnetbuildhelpers/default.nix
index 0edfd0b467a..0edfd0b467a 100644
--- a/pkgs/build-support/dotnetbuildhelpers/default.nix
+++ b/nixpkgs/pkgs/build-support/dotnetbuildhelpers/default.nix
diff --git a/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh b/nixpkgs/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh
index 3f81cc73e80..3f81cc73e80 100755
--- a/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh
+++ b/nixpkgs/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh
diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh b/nixpkgs/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh
index 8a7f36522a3..8a7f36522a3 100644
--- a/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh
+++ b/nixpkgs/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh
diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh b/nixpkgs/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh
index 0dbf1eecbad..0dbf1eecbad 100644
--- a/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh
+++ b/nixpkgs/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh
diff --git a/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh b/nixpkgs/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh
index d8d29912c8f..d8d29912c8f 100644
--- a/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh
+++ b/nixpkgs/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln b/nixpkgs/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln
index f2e7d4cf8b2..f2e7d4cf8b2 100644
--- a/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln
+++ b/nixpkgs/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs b/nixpkgs/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs
index 633d23c05ff..633d23c05ff 100644
--- a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs
+++ b/nixpkgs/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in b/nixpkgs/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
index abad090ebcb..abad090ebcb 100644
--- a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
+++ b/nixpkgs/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in b/nixpkgs/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in
index a991bcb6933..a991bcb6933 100644
--- a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in
+++ b/nixpkgs/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in
diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/nixpkgs/pkgs/build-support/dotnetenv/build-solution.nix
index 62370d361cd..62370d361cd 100644
--- a/pkgs/build-support/dotnetenv/build-solution.nix
+++ b/nixpkgs/pkgs/build-support/dotnetenv/build-solution.nix
diff --git a/pkgs/build-support/dotnetenv/default.nix b/nixpkgs/pkgs/build-support/dotnetenv/default.nix
index 781a5ba8c0e..781a5ba8c0e 100644
--- a/pkgs/build-support/dotnetenv/default.nix
+++ b/nixpkgs/pkgs/build-support/dotnetenv/default.nix
diff --git a/pkgs/build-support/dotnetenv/wrapper.nix b/nixpkgs/pkgs/build-support/dotnetenv/wrapper.nix
index 4b07fc27dcb..4b07fc27dcb 100644
--- a/pkgs/build-support/dotnetenv/wrapper.nix
+++ b/nixpkgs/pkgs/build-support/dotnetenv/wrapper.nix
diff --git a/pkgs/build-support/emacs/buffer.nix b/nixpkgs/pkgs/build-support/emacs/buffer.nix
index 8f824f4e1a5..8f824f4e1a5 100644
--- a/pkgs/build-support/emacs/buffer.nix
+++ b/nixpkgs/pkgs/build-support/emacs/buffer.nix
diff --git a/pkgs/build-support/emacs/elpa.nix b/nixpkgs/pkgs/build-support/emacs/elpa.nix
index e6f6c23e449..e6f6c23e449 100644
--- a/pkgs/build-support/emacs/elpa.nix
+++ b/nixpkgs/pkgs/build-support/emacs/elpa.nix
diff --git a/pkgs/build-support/emacs/elpa2nix.el b/nixpkgs/pkgs/build-support/emacs/elpa2nix.el
index 64587c0fad1..64587c0fad1 100644
--- a/pkgs/build-support/emacs/elpa2nix.el
+++ b/nixpkgs/pkgs/build-support/emacs/elpa2nix.el
diff --git a/pkgs/build-support/emacs/generic.nix b/nixpkgs/pkgs/build-support/emacs/generic.nix
index 6fa27f09839..6fa27f09839 100644
--- a/pkgs/build-support/emacs/generic.nix
+++ b/nixpkgs/pkgs/build-support/emacs/generic.nix
diff --git a/pkgs/build-support/emacs/melpa.nix b/nixpkgs/pkgs/build-support/emacs/melpa.nix
index e2ec84c75e6..e2ec84c75e6 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/nixpkgs/pkgs/build-support/emacs/melpa.nix
diff --git a/pkgs/build-support/emacs/melpa2nix.el b/nixpkgs/pkgs/build-support/emacs/melpa2nix.el
index 99c755e2afc..99c755e2afc 100644
--- a/pkgs/build-support/emacs/melpa2nix.el
+++ b/nixpkgs/pkgs/build-support/emacs/melpa2nix.el
diff --git a/pkgs/build-support/emacs/setup-hook.sh b/nixpkgs/pkgs/build-support/emacs/setup-hook.sh
index b210511d670..b210511d670 100644
--- a/pkgs/build-support/emacs/setup-hook.sh
+++ b/nixpkgs/pkgs/build-support/emacs/setup-hook.sh
diff --git a/pkgs/build-support/emacs/trivial.nix b/nixpkgs/pkgs/build-support/emacs/trivial.nix
index 396c971b2f0..396c971b2f0 100644
--- a/pkgs/build-support/emacs/trivial.nix
+++ b/nixpkgs/pkgs/build-support/emacs/trivial.nix
diff --git a/pkgs/build-support/emacs/wrapper.nix b/nixpkgs/pkgs/build-support/emacs/wrapper.nix
index 25f068cd3fa..25f068cd3fa 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/nixpkgs/pkgs/build-support/emacs/wrapper.nix
diff --git a/pkgs/build-support/expand-response-params/default.nix b/nixpkgs/pkgs/build-support/expand-response-params/default.nix
index 2a4bee74197..2a4bee74197 100644
--- a/pkgs/build-support/expand-response-params/default.nix
+++ b/nixpkgs/pkgs/build-support/expand-response-params/default.nix
diff --git a/pkgs/build-support/expand-response-params/expand-response-params.c b/nixpkgs/pkgs/build-support/expand-response-params/expand-response-params.c
index 05b9c62b1e8..05b9c62b1e8 100644
--- a/pkgs/build-support/expand-response-params/expand-response-params.c
+++ b/nixpkgs/pkgs/build-support/expand-response-params/expand-response-params.c
diff --git a/pkgs/build-support/fetchbitbucket/default.nix b/nixpkgs/pkgs/build-support/fetchbitbucket/default.nix
index a99f72e9eaa..a99f72e9eaa 100644
--- a/pkgs/build-support/fetchbitbucket/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchbitbucket/default.nix
diff --git a/pkgs/build-support/fetchbower/default.nix b/nixpkgs/pkgs/build-support/fetchbower/default.nix
index fd971d431df..fd971d431df 100644
--- a/pkgs/build-support/fetchbower/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchbower/default.nix
diff --git a/pkgs/build-support/fetchbzr/builder.sh b/nixpkgs/pkgs/build-support/fetchbzr/builder.sh
index e424fd92d51..e424fd92d51 100644
--- a/pkgs/build-support/fetchbzr/builder.sh
+++ b/nixpkgs/pkgs/build-support/fetchbzr/builder.sh
diff --git a/pkgs/build-support/fetchbzr/default.nix b/nixpkgs/pkgs/build-support/fetchbzr/default.nix
index f9250de4ee0..f9250de4ee0 100644
--- a/pkgs/build-support/fetchbzr/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchbzr/default.nix
diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/nixpkgs/pkgs/build-support/fetchbzr/nix-prefetch-bzr
index dbe8a7ef801..dbe8a7ef801 100755
--- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr
+++ b/nixpkgs/pkgs/build-support/fetchbzr/nix-prefetch-bzr
diff --git a/pkgs/build-support/fetchcvs/builder.sh b/nixpkgs/pkgs/build-support/fetchcvs/builder.sh
index 0975c347882..0975c347882 100644
--- a/pkgs/build-support/fetchcvs/builder.sh
+++ b/nixpkgs/pkgs/build-support/fetchcvs/builder.sh
diff --git a/pkgs/build-support/fetchcvs/default.nix b/nixpkgs/pkgs/build-support/fetchcvs/default.nix
index 1f7947d4d45..1f7947d4d45 100644
--- a/pkgs/build-support/fetchcvs/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchcvs/default.nix
diff --git a/pkgs/build-support/fetchcvs/nix-prefetch-cvs b/nixpkgs/pkgs/build-support/fetchcvs/nix-prefetch-cvs
index f9ed8ffa066..f9ed8ffa066 100755
--- a/pkgs/build-support/fetchcvs/nix-prefetch-cvs
+++ b/nixpkgs/pkgs/build-support/fetchcvs/nix-prefetch-cvs
diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh
index 301deb98307..301deb98307 100644
--- a/pkgs/build-support/fetchdarcs/builder.sh
+++ b/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh
diff --git a/pkgs/build-support/fetchdarcs/default.nix b/nixpkgs/pkgs/build-support/fetchdarcs/default.nix
index 02777c9900d..02777c9900d 100644
--- a/pkgs/build-support/fetchdarcs/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchdarcs/default.nix
diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/nixpkgs/pkgs/build-support/fetchdocker/credentials.nix
index 6d084d3c77e..6d084d3c77e 100644
--- a/pkgs/build-support/fetchdocker/credentials.nix
+++ b/nixpkgs/pkgs/build-support/fetchdocker/credentials.nix
diff --git a/pkgs/build-support/fetchdocker/default.nix b/nixpkgs/pkgs/build-support/fetchdocker/default.nix
index 57d2e4ad82d..57d2e4ad82d 100644
--- a/pkgs/build-support/fetchdocker/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchdocker/default.nix
diff --git a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix b/nixpkgs/pkgs/build-support/fetchdocker/fetchDockerConfig.nix
index 9fd813bfa57..9fd813bfa57 100644
--- a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix
+++ b/nixpkgs/pkgs/build-support/fetchdocker/fetchDockerConfig.nix
diff --git a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix b/nixpkgs/pkgs/build-support/fetchdocker/fetchDockerLayer.nix
index 869ba637429..869ba637429 100644
--- a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix
+++ b/nixpkgs/pkgs/build-support/fetchdocker/fetchDockerLayer.nix
diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/nixpkgs/pkgs/build-support/fetchdocker/fetchdocker-builder.sh
index 7443591e656..7443591e656 100644
--- a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh
+++ b/nixpkgs/pkgs/build-support/fetchdocker/fetchdocker-builder.sh
diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/nixpkgs/pkgs/build-support/fetchdocker/generic-fetcher.nix
index 3b0c3377046..3b0c3377046 100644
--- a/pkgs/build-support/fetchdocker/generic-fetcher.nix
+++ b/nixpkgs/pkgs/build-support/fetchdocker/generic-fetcher.nix
diff --git a/pkgs/build-support/fetchfossil/builder.sh b/nixpkgs/pkgs/build-support/fetchfossil/builder.sh
index 5f08aca424f..5f08aca424f 100644
--- a/pkgs/build-support/fetchfossil/builder.sh
+++ b/nixpkgs/pkgs/build-support/fetchfossil/builder.sh
diff --git a/pkgs/build-support/fetchfossil/default.nix b/nixpkgs/pkgs/build-support/fetchfossil/default.nix
index 27933b47178..27933b47178 100644
--- a/pkgs/build-support/fetchfossil/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchfossil/default.nix
diff --git a/pkgs/build-support/fetchgit/builder.sh b/nixpkgs/pkgs/build-support/fetchgit/builder.sh
index 6ae46469738..6ae46469738 100644
--- a/pkgs/build-support/fetchgit/builder.sh
+++ b/nixpkgs/pkgs/build-support/fetchgit/builder.sh
diff --git a/pkgs/build-support/fetchgit/default.nix b/nixpkgs/pkgs/build-support/fetchgit/default.nix
index 0405951a9e4..0405951a9e4 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchgit/default.nix
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git
index 8020ba46f3f..8020ba46f3f 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git
diff --git a/pkgs/build-support/fetchgithub/default.nix b/nixpkgs/pkgs/build-support/fetchgithub/default.nix
index 66671dd0a6a..66671dd0a6a 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchgithub/default.nix
diff --git a/pkgs/build-support/fetchgitiles/default.nix b/nixpkgs/pkgs/build-support/fetchgitiles/default.nix
index 827680992d6..827680992d6 100644
--- a/pkgs/build-support/fetchgitiles/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchgitiles/default.nix
diff --git a/pkgs/build-support/fetchgitlab/default.nix b/nixpkgs/pkgs/build-support/fetchgitlab/default.nix
index 6c4d52a0533..6c4d52a0533 100644
--- a/pkgs/build-support/fetchgitlab/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchgitlab/default.nix
diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/nixpkgs/pkgs/build-support/fetchgitlocal/default.nix
index fa194577553..fa194577553 100644
--- a/pkgs/build-support/fetchgitlocal/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchgitlocal/default.nix
diff --git a/pkgs/build-support/fetchgx/default.nix b/nixpkgs/pkgs/build-support/fetchgx/default.nix
index 3ccf5d273fc..3ccf5d273fc 100644
--- a/pkgs/build-support/fetchgx/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchgx/default.nix
diff --git a/pkgs/build-support/fetchhg/builder.sh b/nixpkgs/pkgs/build-support/fetchhg/builder.sh
index 847f18fa597..847f18fa597 100644
--- a/pkgs/build-support/fetchhg/builder.sh
+++ b/nixpkgs/pkgs/build-support/fetchhg/builder.sh
diff --git a/pkgs/build-support/fetchhg/default.nix b/nixpkgs/pkgs/build-support/fetchhg/default.nix
index 41eff1f9c0c..41eff1f9c0c 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchhg/default.nix
diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/nixpkgs/pkgs/build-support/fetchhg/nix-prefetch-hg
index 94c6b1ec694..94c6b1ec694 100755
--- a/pkgs/build-support/fetchhg/nix-prefetch-hg
+++ b/nixpkgs/pkgs/build-support/fetchhg/nix-prefetch-hg
diff --git a/pkgs/build-support/fetchipfs/builder.sh b/nixpkgs/pkgs/build-support/fetchipfs/builder.sh
index 7a6a517566f..7a6a517566f 100644
--- a/pkgs/build-support/fetchipfs/builder.sh
+++ b/nixpkgs/pkgs/build-support/fetchipfs/builder.sh
diff --git a/pkgs/build-support/fetchipfs/default.nix b/nixpkgs/pkgs/build-support/fetchipfs/default.nix
index 7a66999ec56..7a66999ec56 100644
--- a/pkgs/build-support/fetchipfs/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchipfs/default.nix
diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/nixpkgs/pkgs/build-support/fetchmavenartifact/default.nix
index dc48a312fb3..dc48a312fb3 100644
--- a/pkgs/build-support/fetchmavenartifact/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchmavenartifact/default.nix
diff --git a/pkgs/build-support/fetchmtn/builder.sh b/nixpkgs/pkgs/build-support/fetchmtn/builder.sh
index c1b0db895bc..c1b0db895bc 100644
--- a/pkgs/build-support/fetchmtn/builder.sh
+++ b/nixpkgs/pkgs/build-support/fetchmtn/builder.sh
diff --git a/pkgs/build-support/fetchmtn/default.nix b/nixpkgs/pkgs/build-support/fetchmtn/default.nix
index 7ce67453d69..7ce67453d69 100644
--- a/pkgs/build-support/fetchmtn/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchmtn/default.nix
diff --git a/pkgs/build-support/fetchnuget/default.nix b/nixpkgs/pkgs/build-support/fetchnuget/default.nix
index 960bc3c1ffb..960bc3c1ffb 100644
--- a/pkgs/build-support/fetchnuget/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchnuget/default.nix
diff --git a/pkgs/build-support/fetchpatch/default.nix b/nixpkgs/pkgs/build-support/fetchpatch/default.nix
index 2fb32b2324f..2fb32b2324f 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchpatch/default.nix
diff --git a/pkgs/build-support/fetchrepoorcz/default.nix b/nixpkgs/pkgs/build-support/fetchrepoorcz/default.nix
index 3ac7cace0dc..3ac7cace0dc 100644
--- a/pkgs/build-support/fetchrepoorcz/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchrepoorcz/default.nix
diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/nixpkgs/pkgs/build-support/fetchrepoproject/default.nix
index f8793dbac95..f8793dbac95 100644
--- a/pkgs/build-support/fetchrepoproject/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchrepoproject/default.nix
diff --git a/pkgs/build-support/fetchs3/default.nix b/nixpkgs/pkgs/build-support/fetchs3/default.nix
index 3dbde203374..3dbde203374 100644
--- a/pkgs/build-support/fetchs3/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchs3/default.nix
diff --git a/pkgs/build-support/fetchsavannah/default.nix b/nixpkgs/pkgs/build-support/fetchsavannah/default.nix
index 994922a5867..994922a5867 100644
--- a/pkgs/build-support/fetchsavannah/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchsavannah/default.nix
diff --git a/pkgs/build-support/fetchsvn/builder.sh b/nixpkgs/pkgs/build-support/fetchsvn/builder.sh
index c386a3f3489..c386a3f3489 100644
--- a/pkgs/build-support/fetchsvn/builder.sh
+++ b/nixpkgs/pkgs/build-support/fetchsvn/builder.sh
diff --git a/pkgs/build-support/fetchsvn/default.nix b/nixpkgs/pkgs/build-support/fetchsvn/default.nix
index 68433d1471d..68433d1471d 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchsvn/default.nix
diff --git a/pkgs/build-support/fetchsvn/nix-prefetch-svn b/nixpkgs/pkgs/build-support/fetchsvn/nix-prefetch-svn
index 03b9eb9a03d..03b9eb9a03d 100755
--- a/pkgs/build-support/fetchsvn/nix-prefetch-svn
+++ b/nixpkgs/pkgs/build-support/fetchsvn/nix-prefetch-svn
diff --git a/pkgs/build-support/fetchsvnrevision/default.nix b/nixpkgs/pkgs/build-support/fetchsvnrevision/default.nix
index 288451a225c..288451a225c 100644
--- a/pkgs/build-support/fetchsvnrevision/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchsvnrevision/default.nix
diff --git a/pkgs/build-support/fetchsvnssh/builder.sh b/nixpkgs/pkgs/build-support/fetchsvnssh/builder.sh
index d9c6dc7da31..d9c6dc7da31 100644
--- a/pkgs/build-support/fetchsvnssh/builder.sh
+++ b/nixpkgs/pkgs/build-support/fetchsvnssh/builder.sh
diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/nixpkgs/pkgs/build-support/fetchsvnssh/default.nix
index fbd74efd750..fbd74efd750 100644
--- a/pkgs/build-support/fetchsvnssh/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchsvnssh/default.nix
diff --git a/pkgs/build-support/fetchsvnssh/sshsubversion.exp b/nixpkgs/pkgs/build-support/fetchsvnssh/sshsubversion.exp
index c00f39714e5..c00f39714e5 100755
--- a/pkgs/build-support/fetchsvnssh/sshsubversion.exp
+++ b/nixpkgs/pkgs/build-support/fetchsvnssh/sshsubversion.exp
diff --git a/pkgs/build-support/fetchurl/boot.nix b/nixpkgs/pkgs/build-support/fetchurl/boot.nix
index bd71f93c529..bd71f93c529 100644
--- a/pkgs/build-support/fetchurl/boot.nix
+++ b/nixpkgs/pkgs/build-support/fetchurl/boot.nix
diff --git a/pkgs/build-support/fetchurl/builder.sh b/nixpkgs/pkgs/build-support/fetchurl/builder.sh
index 74fdc320835..74fdc320835 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/nixpkgs/pkgs/build-support/fetchurl/builder.sh
diff --git a/pkgs/build-support/fetchurl/default.nix b/nixpkgs/pkgs/build-support/fetchurl/default.nix
index 7d23a3a7f8f..7d23a3a7f8f 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchurl/default.nix
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix
index a0a61f7cc50..a0a61f7cc50 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix
diff --git a/pkgs/build-support/fetchurl/write-mirror-list.sh b/nixpkgs/pkgs/build-support/fetchurl/write-mirror-list.sh
index 2dabd2e722b..2dabd2e722b 100644
--- a/pkgs/build-support/fetchurl/write-mirror-list.sh
+++ b/nixpkgs/pkgs/build-support/fetchurl/write-mirror-list.sh
diff --git a/pkgs/build-support/fetchzip/default.nix b/nixpkgs/pkgs/build-support/fetchzip/default.nix
index c61df8ceb00..c61df8ceb00 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchzip/default.nix
diff --git a/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh b/nixpkgs/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh
index 994adbd91da..994adbd91da 100755
--- a/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh
+++ b/nixpkgs/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh
diff --git a/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme b/nixpkgs/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme
index 192f3bb54c2..192f3bb54c2 100755
--- a/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme
+++ b/nixpkgs/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme
diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/nixpkgs/pkgs/build-support/icon-conv-tools/default.nix
index 0ea18d8768a..0ea18d8768a 100644
--- a/pkgs/build-support/icon-conv-tools/default.nix
+++ b/nixpkgs/pkgs/build-support/icon-conv-tools/default.nix
diff --git a/pkgs/build-support/install-shell-files/default.nix b/nixpkgs/pkgs/build-support/install-shell-files/default.nix
index e1f2e24dd87..e1f2e24dd87 100644
--- a/pkgs/build-support/install-shell-files/default.nix
+++ b/nixpkgs/pkgs/build-support/install-shell-files/default.nix
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/nixpkgs/pkgs/build-support/kernel/make-initrd.nix
index ed5dbdaee17..ed5dbdaee17 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/nixpkgs/pkgs/build-support/kernel/make-initrd.nix
diff --git a/pkgs/build-support/kernel/make-initrd.sh b/nixpkgs/pkgs/build-support/kernel/make-initrd.sh
index 0aeaedeb372..0aeaedeb372 100644
--- a/pkgs/build-support/kernel/make-initrd.sh
+++ b/nixpkgs/pkgs/build-support/kernel/make-initrd.sh
diff --git a/pkgs/build-support/kernel/modules-closure.nix b/nixpkgs/pkgs/build-support/kernel/modules-closure.nix
index d82e279799b..d82e279799b 100644
--- a/pkgs/build-support/kernel/modules-closure.nix
+++ b/nixpkgs/pkgs/build-support/kernel/modules-closure.nix
diff --git a/pkgs/build-support/kernel/modules-closure.sh b/nixpkgs/pkgs/build-support/kernel/modules-closure.sh
index 220f3b00a77..220f3b00a77 100644
--- a/pkgs/build-support/kernel/modules-closure.sh
+++ b/nixpkgs/pkgs/build-support/kernel/modules-closure.sh
diff --git a/pkgs/build-support/kernel/paths-from-graph.pl b/nixpkgs/pkgs/build-support/kernel/paths-from-graph.pl
index 1465b73fddb..1465b73fddb 100644
--- a/pkgs/build-support/kernel/paths-from-graph.pl
+++ b/nixpkgs/pkgs/build-support/kernel/paths-from-graph.pl
diff --git a/pkgs/build-support/libredirect/default.nix b/nixpkgs/pkgs/build-support/libredirect/default.nix
index 6e54e2a696c..6e54e2a696c 100644
--- a/pkgs/build-support/libredirect/default.nix
+++ b/nixpkgs/pkgs/build-support/libredirect/default.nix
diff --git a/pkgs/build-support/libredirect/libredirect.c b/nixpkgs/pkgs/build-support/libredirect/libredirect.c
index e7f74c736ab..e7f74c736ab 100644
--- a/pkgs/build-support/libredirect/libredirect.c
+++ b/nixpkgs/pkgs/build-support/libredirect/libredirect.c
diff --git a/pkgs/build-support/libredirect/test.c b/nixpkgs/pkgs/build-support/libredirect/test.c
index b57664db3c1..b57664db3c1 100644
--- a/pkgs/build-support/libredirect/test.c
+++ b/nixpkgs/pkgs/build-support/libredirect/test.c
diff --git a/pkgs/build-support/make-desktopitem/default.nix b/nixpkgs/pkgs/build-support/make-desktopitem/default.nix
index 67b82fd66db..67b82fd66db 100644
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/nixpkgs/pkgs/build-support/make-desktopitem/default.nix
diff --git a/pkgs/build-support/make-startupitem/default.nix b/nixpkgs/pkgs/build-support/make-startupitem/default.nix
index da1d4105c89..da1d4105c89 100644
--- a/pkgs/build-support/make-startupitem/default.nix
+++ b/nixpkgs/pkgs/build-support/make-startupitem/default.nix
diff --git a/pkgs/build-support/make-symlinks/builder.sh b/nixpkgs/pkgs/build-support/make-symlinks/builder.sh
index 70f1d2ca1b2..70f1d2ca1b2 100644
--- a/pkgs/build-support/make-symlinks/builder.sh
+++ b/nixpkgs/pkgs/build-support/make-symlinks/builder.sh
diff --git a/pkgs/build-support/make-symlinks/default.nix b/nixpkgs/pkgs/build-support/make-symlinks/default.nix
index 30584aceb9f..30584aceb9f 100644
--- a/pkgs/build-support/make-symlinks/default.nix
+++ b/nixpkgs/pkgs/build-support/make-symlinks/default.nix
diff --git a/pkgs/build-support/mkshell/default.nix b/nixpkgs/pkgs/build-support/mkshell/default.nix
index a70dc0390cb..a70dc0390cb 100644
--- a/pkgs/build-support/mkshell/default.nix
+++ b/nixpkgs/pkgs/build-support/mkshell/default.nix
diff --git a/pkgs/build-support/mono-dll-fixer/builder.sh b/nixpkgs/pkgs/build-support/mono-dll-fixer/builder.sh
index 67abc465a9b..67abc465a9b 100644
--- a/pkgs/build-support/mono-dll-fixer/builder.sh
+++ b/nixpkgs/pkgs/build-support/mono-dll-fixer/builder.sh
diff --git a/pkgs/build-support/mono-dll-fixer/default.nix b/nixpkgs/pkgs/build-support/mono-dll-fixer/default.nix
index 8f7d1e795d7..8f7d1e795d7 100644
--- a/pkgs/build-support/mono-dll-fixer/default.nix
+++ b/nixpkgs/pkgs/build-support/mono-dll-fixer/default.nix
diff --git a/pkgs/build-support/mono-dll-fixer/dll-fixer.pl b/nixpkgs/pkgs/build-support/mono-dll-fixer/dll-fixer.pl
index 4a8b468692f..4a8b468692f 100644
--- a/pkgs/build-support/mono-dll-fixer/dll-fixer.pl
+++ b/nixpkgs/pkgs/build-support/mono-dll-fixer/dll-fixer.pl
diff --git a/pkgs/build-support/nix-gitignore/default.nix b/nixpkgs/pkgs/build-support/nix-gitignore/default.nix
index 28ee6bad554..28ee6bad554 100644
--- a/pkgs/build-support/nix-gitignore/default.nix
+++ b/nixpkgs/pkgs/build-support/nix-gitignore/default.nix
diff --git a/pkgs/build-support/nuke-references/builder.sh b/nixpkgs/pkgs/build-support/nuke-references/builder.sh
index 7da32203218..7da32203218 100644
--- a/pkgs/build-support/nuke-references/builder.sh
+++ b/nixpkgs/pkgs/build-support/nuke-references/builder.sh
diff --git a/pkgs/build-support/nuke-references/default.nix b/nixpkgs/pkgs/build-support/nuke-references/default.nix
index d894b56d366..d894b56d366 100644
--- a/pkgs/build-support/nuke-references/default.nix
+++ b/nixpkgs/pkgs/build-support/nuke-references/default.nix
diff --git a/pkgs/build-support/ocaml/default.nix b/nixpkgs/pkgs/build-support/ocaml/default.nix
index 3957b955a2c..3957b955a2c 100644
--- a/pkgs/build-support/ocaml/default.nix
+++ b/nixpkgs/pkgs/build-support/ocaml/default.nix
diff --git a/pkgs/build-support/ocaml/dune.nix b/nixpkgs/pkgs/build-support/ocaml/dune.nix
index a0aac144796..a0aac144796 100644
--- a/pkgs/build-support/ocaml/dune.nix
+++ b/nixpkgs/pkgs/build-support/ocaml/dune.nix
diff --git a/pkgs/build-support/ocaml/oasis.nix b/nixpkgs/pkgs/build-support/ocaml/oasis.nix
index 74977486f2f..74977486f2f 100644
--- a/pkgs/build-support/ocaml/oasis.nix
+++ b/nixpkgs/pkgs/build-support/ocaml/oasis.nix
diff --git a/pkgs/build-support/oci-tools/default.nix b/nixpkgs/pkgs/build-support/oci-tools/default.nix
index 18b238033ff..18b238033ff 100644
--- a/pkgs/build-support/oci-tools/default.nix
+++ b/nixpkgs/pkgs/build-support/oci-tools/default.nix
diff --git a/pkgs/build-support/plugins.nix b/nixpkgs/pkgs/build-support/plugins.nix
index bf8a982a88f..bf8a982a88f 100644
--- a/pkgs/build-support/plugins.nix
+++ b/nixpkgs/pkgs/build-support/plugins.nix
diff --git a/pkgs/build-support/prefer-remote-fetch/default.nix b/nixpkgs/pkgs/build-support/prefer-remote-fetch/default.nix
index 2e55e370742..2e55e370742 100644
--- a/pkgs/build-support/prefer-remote-fetch/default.nix
+++ b/nixpkgs/pkgs/build-support/prefer-remote-fetch/default.nix
diff --git a/pkgs/build-support/references-by-popularity/closure-graph.py b/nixpkgs/pkgs/build-support/references-by-popularity/closure-graph.py
index 579f3b041fa..579f3b041fa 100644
--- a/pkgs/build-support/references-by-popularity/closure-graph.py
+++ b/nixpkgs/pkgs/build-support/references-by-popularity/closure-graph.py
diff --git a/pkgs/build-support/references-by-popularity/default.nix b/nixpkgs/pkgs/build-support/references-by-popularity/default.nix
index 4cae2dcf3ca..4cae2dcf3ca 100644
--- a/pkgs/build-support/references-by-popularity/default.nix
+++ b/nixpkgs/pkgs/build-support/references-by-popularity/default.nix
diff --git a/pkgs/build-support/release/ant-build.nix b/nixpkgs/pkgs/build-support/release/ant-build.nix
index 2d24d5bd704..2d24d5bd704 100644
--- a/pkgs/build-support/release/ant-build.nix
+++ b/nixpkgs/pkgs/build-support/release/ant-build.nix
diff --git a/pkgs/build-support/release/binary-tarball.nix b/nixpkgs/pkgs/build-support/release/binary-tarball.nix
index dad65a0e7eb..dad65a0e7eb 100644
--- a/pkgs/build-support/release/binary-tarball.nix
+++ b/nixpkgs/pkgs/build-support/release/binary-tarball.nix
diff --git a/pkgs/build-support/release/debian-build.nix b/nixpkgs/pkgs/build-support/release/debian-build.nix
index 354d929c9b6..354d929c9b6 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/nixpkgs/pkgs/build-support/release/debian-build.nix
diff --git a/pkgs/build-support/release/default.nix b/nixpkgs/pkgs/build-support/release/default.nix
index 5e3eb751b81..5e3eb751b81 100644
--- a/pkgs/build-support/release/default.nix
+++ b/nixpkgs/pkgs/build-support/release/default.nix
diff --git a/pkgs/build-support/release/functions.sh b/nixpkgs/pkgs/build-support/release/functions.sh
index 120d1968542..120d1968542 100644
--- a/pkgs/build-support/release/functions.sh
+++ b/nixpkgs/pkgs/build-support/release/functions.sh
diff --git a/pkgs/build-support/release/gcov-report.nix b/nixpkgs/pkgs/build-support/release/gcov-report.nix
index 8ce5c0488a7..8ce5c0488a7 100644
--- a/pkgs/build-support/release/gcov-report.nix
+++ b/nixpkgs/pkgs/build-support/release/gcov-report.nix
diff --git a/pkgs/build-support/release/maven-build.nix b/nixpkgs/pkgs/build-support/release/maven-build.nix
index 71eb63b850d..71eb63b850d 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/nixpkgs/pkgs/build-support/release/maven-build.nix
diff --git a/pkgs/build-support/release/nix-build.nix b/nixpkgs/pkgs/build-support/release/nix-build.nix
index feda54de46f..feda54de46f 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/nixpkgs/pkgs/build-support/release/nix-build.nix
diff --git a/pkgs/build-support/release/rpm-build.nix b/nixpkgs/pkgs/build-support/release/rpm-build.nix
index 194bbc60534..194bbc60534 100644
--- a/pkgs/build-support/release/rpm-build.nix
+++ b/nixpkgs/pkgs/build-support/release/rpm-build.nix
diff --git a/pkgs/build-support/release/source-tarball.nix b/nixpkgs/pkgs/build-support/release/source-tarball.nix
index c7129ae83f9..c7129ae83f9 100644
--- a/pkgs/build-support/release/source-tarball.nix
+++ b/nixpkgs/pkgs/build-support/release/source-tarball.nix
diff --git a/pkgs/build-support/remove-references-to/default.nix b/nixpkgs/pkgs/build-support/remove-references-to/default.nix
index 8b1d05fc230..8b1d05fc230 100644
--- a/pkgs/build-support/remove-references-to/default.nix
+++ b/nixpkgs/pkgs/build-support/remove-references-to/default.nix
diff --git a/pkgs/build-support/replace-dependency.nix b/nixpkgs/pkgs/build-support/replace-dependency.nix
index 15ab50bf397..15ab50bf397 100644
--- a/pkgs/build-support/replace-dependency.nix
+++ b/nixpkgs/pkgs/build-support/replace-dependency.nix
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index dec49d24f52..dec49d24f52 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix
diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index c146ffef5ff..c146ffef5ff 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix
index 569b48d25ae..569b48d25ae 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix
diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/helpers.nix
index 386d0ce7084..386d0ce7084 100644
--- a/pkgs/build-support/rust/build-rust-crate/helpers.nix
+++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/helpers.nix
diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/install-crate.nix
index 5ba7b69bedc..5ba7b69bedc 100644
--- a/pkgs/build-support/rust/build-rust-crate/install-crate.nix
+++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/install-crate.nix
diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/nixpkgs/pkgs/build-support/rust/build-rust-crate/lib.sh
index d4d9317496f..d4d9317496f 100644
--- a/pkgs/build-support/rust/build-rust-crate/lib.sh
+++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/lib.sh
diff --git a/pkgs/build-support/rust/build-rust-crate/log.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/log.nix
index 25181c787e2..25181c787e2 100644
--- a/pkgs/build-support/rust/build-rust-crate/log.nix
+++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/log.nix
diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
index ab9b0a13ae7..ab9b0a13ae7 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
+++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix
index 6aad02992c1..6aad02992c1 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix
diff --git a/pkgs/build-support/rust/cargo-vendor-normalise.py b/nixpkgs/pkgs/build-support/rust/cargo-vendor-normalise.py
index 2d7a1895718..2d7a1895718 100755
--- a/pkgs/build-support/rust/cargo-vendor-normalise.py
+++ b/nixpkgs/pkgs/build-support/rust/cargo-vendor-normalise.py
diff --git a/pkgs/build-support/rust/carnix.nix b/nixpkgs/pkgs/build-support/rust/carnix.nix
index 46bbff92a9c..46bbff92a9c 100644
--- a/pkgs/build-support/rust/carnix.nix
+++ b/nixpkgs/pkgs/build-support/rust/carnix.nix
diff --git a/pkgs/build-support/rust/crates-io.nix b/nixpkgs/pkgs/build-support/rust/crates-io.nix
index 66f98cd9912..66f98cd9912 100644
--- a/pkgs/build-support/rust/crates-io.nix
+++ b/nixpkgs/pkgs/build-support/rust/crates-io.nix
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix
index 1c4fe9daead..1c4fe9daead 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix
diff --git a/pkgs/build-support/rust/default.nix b/nixpkgs/pkgs/build-support/rust/default.nix
index 4089436c0e0..4089436c0e0 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/nixpkgs/pkgs/build-support/rust/default.nix
diff --git a/pkgs/build-support/rust/fetchcargo-default-config.toml b/nixpkgs/pkgs/build-support/rust/fetchcargo-default-config.toml
index dd8ebbc32d3..dd8ebbc32d3 100755
--- a/pkgs/build-support/rust/fetchcargo-default-config.toml
+++ b/nixpkgs/pkgs/build-support/rust/fetchcargo-default-config.toml
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/nixpkgs/pkgs/build-support/rust/fetchcargo.nix
index 7a0ba38dce7..7a0ba38dce7 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/nixpkgs/pkgs/build-support/rust/fetchcargo.nix
diff --git a/pkgs/build-support/rust/fetchcrate.nix b/nixpkgs/pkgs/build-support/rust/fetchcrate.nix
index 95dfd38b12a..95dfd38b12a 100644
--- a/pkgs/build-support/rust/fetchcrate.nix
+++ b/nixpkgs/pkgs/build-support/rust/fetchcrate.nix
diff --git a/pkgs/build-support/rust/patch-registry-deps/pkg-config b/nixpkgs/pkgs/build-support/rust/patch-registry-deps/pkg-config
index fbb09430458..fbb09430458 100644
--- a/pkgs/build-support/rust/patch-registry-deps/pkg-config
+++ b/nixpkgs/pkgs/build-support/rust/patch-registry-deps/pkg-config
diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/nixpkgs/pkgs/build-support/setup-hooks/audit-tmpdir.sh
index c9dd32d1dd2..c9dd32d1dd2 100644
--- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/audit-tmpdir.sh
diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 52c50091d08..52c50091d08 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh
diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/nixpkgs/pkgs/build-support/setup-hooks/autoreconf.sh
index c08cab15868..c08cab15868 100644
--- a/pkgs/build-support/setup-hooks/autoreconf.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/autoreconf.sh
diff --git a/pkgs/build-support/setup-hooks/breakpoint-hook.sh b/nixpkgs/pkgs/build-support/setup-hooks/breakpoint-hook.sh
index 6bef786ac3a..6bef786ac3a 100644
--- a/pkgs/build-support/setup-hooks/breakpoint-hook.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/breakpoint-hook.sh
diff --git a/pkgs/build-support/setup-hooks/compress-man-pages.sh b/nixpkgs/pkgs/build-support/setup-hooks/compress-man-pages.sh
index 82e48cd8aa7..82e48cd8aa7 100644
--- a/pkgs/build-support/setup-hooks/compress-man-pages.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/compress-man-pages.sh
diff --git a/pkgs/build-support/setup-hooks/die.sh b/nixpkgs/pkgs/build-support/setup-hooks/die.sh
index 0db41e030f4..0db41e030f4 100644
--- a/pkgs/build-support/setup-hooks/die.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/die.sh
diff --git a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh b/nixpkgs/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
index 7175b408b02..7175b408b02 100644
--- a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
diff --git a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh b/nixpkgs/pkgs/build-support/setup-hooks/find-xml-catalogs.sh
index f446a6f27fd..f446a6f27fd 100644
--- a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/find-xml-catalogs.sh
diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/nixpkgs/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
index af2ff0cc966..af2ff0cc966 100644
--- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
diff --git a/pkgs/build-support/setup-hooks/gog-unpack.sh b/nixpkgs/pkgs/build-support/setup-hooks/gog-unpack.sh
index 559b543fadf..559b543fadf 100644
--- a/pkgs/build-support/setup-hooks/gog-unpack.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/gog-unpack.sh
diff --git a/pkgs/build-support/setup-hooks/install-shell-files.sh b/nixpkgs/pkgs/build-support/setup-hooks/install-shell-files.sh
index e0ea1f7f30a..e0ea1f7f30a 100644
--- a/pkgs/build-support/setup-hooks/install-shell-files.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/install-shell-files.sh
diff --git a/pkgs/build-support/setup-hooks/keep-build-tree.sh b/nixpkgs/pkgs/build-support/setup-hooks/keep-build-tree.sh
index 754900bfc33..754900bfc33 100644
--- a/pkgs/build-support/setup-hooks/keep-build-tree.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/keep-build-tree.sh
diff --git a/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh b/nixpkgs/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh
index b53e184b095..b53e184b095 100644
--- a/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh
diff --git a/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh b/nixpkgs/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh
index 9108b4c5035..9108b4c5035 100644
--- a/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh
diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/nixpkgs/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
index 0608d3ca81c..0608d3ca81c 100644
--- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh
index 8b7012677cd..8b7012677cd 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh
diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/nixpkgs/pkgs/build-support/setup-hooks/move-docs.sh
index ef31dcdce27..ef31dcdce27 100644
--- a/pkgs/build-support/setup-hooks/move-docs.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/move-docs.sh
diff --git a/pkgs/build-support/setup-hooks/move-lib64.sh b/nixpkgs/pkgs/build-support/setup-hooks/move-lib64.sh
index 9517af79732..9517af79732 100644
--- a/pkgs/build-support/setup-hooks/move-lib64.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/move-lib64.sh
diff --git a/pkgs/build-support/setup-hooks/move-sbin.sh b/nixpkgs/pkgs/build-support/setup-hooks/move-sbin.sh
index 1c0c4dc9f2d..1c0c4dc9f2d 100644
--- a/pkgs/build-support/setup-hooks/move-sbin.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/move-sbin.sh
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 2e95495c96f..2e95495c96f 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh
diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh
index 29fed7ad794..29fed7ad794 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh
diff --git a/pkgs/build-support/setup-hooks/prune-libtool-files.sh b/nixpkgs/pkgs/build-support/setup-hooks/prune-libtool-files.sh
index 0ec56549645..0ec56549645 100644
--- a/pkgs/build-support/setup-hooks/prune-libtool-files.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/prune-libtool-files.sh
diff --git a/pkgs/build-support/setup-hooks/role.bash b/nixpkgs/pkgs/build-support/setup-hooks/role.bash
index 6f1c36f5c05..6f1c36f5c05 100644
--- a/pkgs/build-support/setup-hooks/role.bash
+++ b/nixpkgs/pkgs/build-support/setup-hooks/role.bash
diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh
index 19dbb10d18e..19dbb10d18e 100644
--- a/pkgs/build-support/setup-hooks/separate-debug-info.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh
diff --git a/pkgs/build-support/setup-hooks/set-java-classpath.sh b/nixpkgs/pkgs/build-support/setup-hooks/set-java-classpath.sh
index 445fa56d61d..445fa56d61d 100644
--- a/pkgs/build-support/setup-hooks/set-java-classpath.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/set-java-classpath.sh
diff --git a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh b/nixpkgs/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
index ae34ffec485..ae34ffec485 100644
--- a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
diff --git a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh b/nixpkgs/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh
index 96bf48cf123..96bf48cf123 100644
--- a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh
diff --git a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh b/nixpkgs/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh
index 4bf7c0ff1af..4bf7c0ff1af 100644
--- a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh
diff --git a/pkgs/build-support/setup-hooks/strip.sh b/nixpkgs/pkgs/build-support/setup-hooks/strip.sh
index f5fa9378fd7..f5fa9378fd7 100644
--- a/pkgs/build-support/setup-hooks/strip.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/strip.sh
diff --git a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh b/nixpkgs/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
index ebd3afa05d9..ebd3afa05d9 100644
--- a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
diff --git a/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh b/nixpkgs/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh
index 53335d7a9a7..53335d7a9a7 100644
--- a/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh
diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/nixpkgs/pkgs/build-support/setup-hooks/win-dll-link.sh
index 6130f32bef8..6130f32bef8 100644
--- a/pkgs/build-support/setup-hooks/win-dll-link.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/win-dll-link.sh
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index ff0cda7eaf0..ff0cda7eaf0 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
diff --git a/pkgs/build-support/setup-systemd-units.nix b/nixpkgs/pkgs/build-support/setup-systemd-units.nix
index 4fa2f42c39d..4fa2f42c39d 100644
--- a/pkgs/build-support/setup-systemd-units.nix
+++ b/nixpkgs/pkgs/build-support/setup-systemd-units.nix
diff --git a/pkgs/build-support/singularity-tools/default.nix b/nixpkgs/pkgs/build-support/singularity-tools/default.nix
index c110d327d3a..c110d327d3a 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/nixpkgs/pkgs/build-support/singularity-tools/default.nix
diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix
index 9e4456a3a15..9e4456a3a15 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix
diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/nixpkgs/pkgs/build-support/skaware/clean-packaging.nix
index 16bae04b21e..16bae04b21e 100644
--- a/pkgs/build-support/skaware/clean-packaging.nix
+++ b/nixpkgs/pkgs/build-support/skaware/clean-packaging.nix
diff --git a/pkgs/build-support/snap/default.nix b/nixpkgs/pkgs/build-support/snap/default.nix
index ba527186891..ba527186891 100644
--- a/pkgs/build-support/snap/default.nix
+++ b/nixpkgs/pkgs/build-support/snap/default.nix
diff --git a/pkgs/build-support/snap/make-snap.nix b/nixpkgs/pkgs/build-support/snap/make-snap.nix
index cef7500bcba..cef7500bcba 100644
--- a/pkgs/build-support/snap/make-snap.nix
+++ b/nixpkgs/pkgs/build-support/snap/make-snap.nix
diff --git a/pkgs/build-support/source-from-head-fun.nix b/nixpkgs/pkgs/build-support/source-from-head-fun.nix
index 938df1efd18..938df1efd18 100644
--- a/pkgs/build-support/source-from-head-fun.nix
+++ b/nixpkgs/pkgs/build-support/source-from-head-fun.nix
diff --git a/pkgs/build-support/src-only/default.nix b/nixpkgs/pkgs/build-support/src-only/default.nix
index a93b3648090..a93b3648090 100644
--- a/pkgs/build-support/src-only/default.nix
+++ b/nixpkgs/pkgs/build-support/src-only/default.nix
diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/nixpkgs/pkgs/build-support/substitute-files/substitute-all-files.nix
index 66feb695c41..66feb695c41 100644
--- a/pkgs/build-support/substitute-files/substitute-all-files.nix
+++ b/nixpkgs/pkgs/build-support/substitute-files/substitute-all-files.nix
diff --git a/pkgs/build-support/substitute/substitute-all.nix b/nixpkgs/pkgs/build-support/substitute/substitute-all.nix
index 57b160bbe90..57b160bbe90 100644
--- a/pkgs/build-support/substitute/substitute-all.nix
+++ b/nixpkgs/pkgs/build-support/substitute/substitute-all.nix
diff --git a/pkgs/build-support/substitute/substitute-all.sh b/nixpkgs/pkgs/build-support/substitute/substitute-all.sh
index ec220481fcc..ec220481fcc 100644
--- a/pkgs/build-support/substitute/substitute-all.sh
+++ b/nixpkgs/pkgs/build-support/substitute/substitute-all.sh
diff --git a/pkgs/build-support/templaterpm/default.nix b/nixpkgs/pkgs/build-support/templaterpm/default.nix
index 30465c740e5..30465c740e5 100644
--- a/pkgs/build-support/templaterpm/default.nix
+++ b/nixpkgs/pkgs/build-support/templaterpm/default.nix
diff --git a/pkgs/build-support/templaterpm/nix-template-rpm.py b/nixpkgs/pkgs/build-support/templaterpm/nix-template-rpm.py
index f39595f8977..f39595f8977 100755
--- a/pkgs/build-support/templaterpm/nix-template-rpm.py
+++ b/nixpkgs/pkgs/build-support/templaterpm/nix-template-rpm.py
diff --git a/pkgs/build-support/trivial-builders.nix b/nixpkgs/pkgs/build-support/trivial-builders.nix
index 5210b7d7ba2..5210b7d7ba2 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/nixpkgs/pkgs/build-support/trivial-builders.nix
diff --git a/pkgs/build-support/upstream-updater/attrset-to-dir.nix b/nixpkgs/pkgs/build-support/upstream-updater/attrset-to-dir.nix
index 24f7b735c2e..24f7b735c2e 100644
--- a/pkgs/build-support/upstream-updater/attrset-to-dir.nix
+++ b/nixpkgs/pkgs/build-support/upstream-updater/attrset-to-dir.nix
diff --git a/pkgs/build-support/upstream-updater/create-src-info-git.sh b/nixpkgs/pkgs/build-support/upstream-updater/create-src-info-git.sh
index 6687a1f8f41..6687a1f8f41 100755
--- a/pkgs/build-support/upstream-updater/create-src-info-git.sh
+++ b/nixpkgs/pkgs/build-support/upstream-updater/create-src-info-git.sh
diff --git a/pkgs/build-support/upstream-updater/create-src-info.sh b/nixpkgs/pkgs/build-support/upstream-updater/create-src-info.sh
index fbbbe33a9e7..fbbbe33a9e7 100755
--- a/pkgs/build-support/upstream-updater/create-src-info.sh
+++ b/nixpkgs/pkgs/build-support/upstream-updater/create-src-info.sh
diff --git a/pkgs/build-support/upstream-updater/design.txt b/nixpkgs/pkgs/build-support/upstream-updater/design.txt
index 128be89d207..128be89d207 100644
--- a/pkgs/build-support/upstream-updater/design.txt
+++ b/nixpkgs/pkgs/build-support/upstream-updater/design.txt
diff --git a/pkgs/build-support/upstream-updater/snippets.sh b/nixpkgs/pkgs/build-support/upstream-updater/snippets.sh
index 2c06696c928..2c06696c928 100644
--- a/pkgs/build-support/upstream-updater/snippets.sh
+++ b/nixpkgs/pkgs/build-support/upstream-updater/snippets.sh
diff --git a/pkgs/build-support/upstream-updater/test-case.nix b/nixpkgs/pkgs/build-support/upstream-updater/test-case.nix
index 498f15c28a7..498f15c28a7 100644
--- a/pkgs/build-support/upstream-updater/test-case.nix
+++ b/nixpkgs/pkgs/build-support/upstream-updater/test-case.nix
diff --git a/pkgs/build-support/upstream-updater/update-upstream-data.sh b/nixpkgs/pkgs/build-support/upstream-updater/update-upstream-data.sh
index 38c0d13a723..38c0d13a723 100755
--- a/pkgs/build-support/upstream-updater/update-upstream-data.sh
+++ b/nixpkgs/pkgs/build-support/upstream-updater/update-upstream-data.sh
diff --git a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh b/nixpkgs/pkgs/build-support/upstream-updater/update-walker-service-specific.sh
index fe439c5d11e..fe439c5d11e 100644
--- a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh
+++ b/nixpkgs/pkgs/build-support/upstream-updater/update-walker-service-specific.sh
diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/nixpkgs/pkgs/build-support/upstream-updater/update-walker.sh
index e60499b60f2..e60499b60f2 100755
--- a/pkgs/build-support/upstream-updater/update-walker.sh
+++ b/nixpkgs/pkgs/build-support/upstream-updater/update-walker.sh
diff --git a/pkgs/build-support/upstream-updater/update-walker.txt b/nixpkgs/pkgs/build-support/upstream-updater/update-walker.txt
index ae47e559029..ae47e559029 100644
--- a/pkgs/build-support/upstream-updater/update-walker.txt
+++ b/nixpkgs/pkgs/build-support/upstream-updater/update-walker.txt
diff --git a/pkgs/build-support/upstream-updater/urls-from-page.sh b/nixpkgs/pkgs/build-support/upstream-updater/urls-from-page.sh
index db39286ccb0..db39286ccb0 100755
--- a/pkgs/build-support/upstream-updater/urls-from-page.sh
+++ b/nixpkgs/pkgs/build-support/upstream-updater/urls-from-page.sh
diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/nixpkgs/pkgs/build-support/vm/deb/deb-closure.pl
index bed397d6f07..bed397d6f07 100644
--- a/pkgs/build-support/vm/deb/deb-closure.pl
+++ b/nixpkgs/pkgs/build-support/vm/deb/deb-closure.pl
diff --git a/pkgs/build-support/vm/default.nix b/nixpkgs/pkgs/build-support/vm/default.nix
index a7050f52e52..a7050f52e52 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/nixpkgs/pkgs/build-support/vm/default.nix
diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/nixpkgs/pkgs/build-support/vm/rpm/rpm-closure.pl
index 6442cd91a95..6442cd91a95 100644
--- a/pkgs/build-support/vm/rpm/rpm-closure.pl
+++ b/nixpkgs/pkgs/build-support/vm/rpm/rpm-closure.pl
diff --git a/pkgs/build-support/vm/test.nix b/nixpkgs/pkgs/build-support/vm/test.nix
index 69850303267..69850303267 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/nixpkgs/pkgs/build-support/vm/test.nix
diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/nixpkgs/pkgs/build-support/vm/windows/bootstrap.nix
index 3b06d8f4749..3b06d8f4749 100644
--- a/pkgs/build-support/vm/windows/bootstrap.nix
+++ b/nixpkgs/pkgs/build-support/vm/windows/bootstrap.nix
diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/nixpkgs/pkgs/build-support/vm/windows/controller/default.nix
index 08b93aaf117..08b93aaf117 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/nixpkgs/pkgs/build-support/vm/windows/controller/default.nix
diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/nixpkgs/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index 76cd41a75bc..76cd41a75bc 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/nixpkgs/pkgs/build-support/vm/windows/cygwin-iso/default.nix
diff --git a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py b/nixpkgs/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
index 4c0d67c43ba..4c0d67c43ba 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
+++ b/nixpkgs/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
diff --git a/pkgs/build-support/vm/windows/default.nix b/nixpkgs/pkgs/build-support/vm/windows/default.nix
index 309241c36de..309241c36de 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/nixpkgs/pkgs/build-support/vm/windows/default.nix
diff --git a/pkgs/build-support/vm/windows/install/default.nix b/nixpkgs/pkgs/build-support/vm/windows/install/default.nix
index fe8e8f61de0..fe8e8f61de0 100644
--- a/pkgs/build-support/vm/windows/install/default.nix
+++ b/nixpkgs/pkgs/build-support/vm/windows/install/default.nix
diff --git a/pkgs/build-support/vm/windows/install/unattended-image.nix b/nixpkgs/pkgs/build-support/vm/windows/install/unattended-image.nix
index 5b1ff84cf44..5b1ff84cf44 100644
--- a/pkgs/build-support/vm/windows/install/unattended-image.nix
+++ b/nixpkgs/pkgs/build-support/vm/windows/install/unattended-image.nix
diff --git a/pkgs/build-support/wrapper-common/utils.bash b/nixpkgs/pkgs/build-support/wrapper-common/utils.bash
index 4fd57162072..4fd57162072 100644
--- a/pkgs/build-support/wrapper-common/utils.bash
+++ b/nixpkgs/pkgs/build-support/wrapper-common/utils.bash
diff --git a/pkgs/build-support/writers/default.nix b/nixpkgs/pkgs/build-support/writers/default.nix
index b90c6490e4a..b90c6490e4a 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/nixpkgs/pkgs/build-support/writers/default.nix
diff --git a/pkgs/build-support/writers/test.nix b/nixpkgs/pkgs/build-support/writers/test.nix
index 3cd0a080ae8..3cd0a080ae8 100644
--- a/pkgs/build-support/writers/test.nix
+++ b/nixpkgs/pkgs/build-support/writers/test.nix
diff --git a/pkgs/common-updater/scripts.nix b/nixpkgs/pkgs/common-updater/scripts.nix
index 1bec4a73996..1bec4a73996 100644
--- a/pkgs/common-updater/scripts.nix
+++ b/nixpkgs/pkgs/common-updater/scripts.nix
diff --git a/pkgs/common-updater/scripts/update-source-version b/nixpkgs/pkgs/common-updater/scripts/update-source-version
index d051a0f75c1..d051a0f75c1 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/nixpkgs/pkgs/common-updater/scripts/update-source-version
diff --git a/pkgs/data/documentation/bgnet/default.nix b/nixpkgs/pkgs/data/documentation/bgnet/default.nix
index 7297d18df27..7297d18df27 100644
--- a/pkgs/data/documentation/bgnet/default.nix
+++ b/nixpkgs/pkgs/data/documentation/bgnet/default.nix
diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix
index a47ec9ea790..a47ec9ea790 100644
--- a/pkgs/data/documentation/gnome-user-docs/default.nix
+++ b/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix
diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/nixpkgs/pkgs/data/documentation/man-pages-posix/default.nix
index b45edf7947b..b45edf7947b 100644
--- a/pkgs/data/documentation/man-pages-posix/default.nix
+++ b/nixpkgs/pkgs/data/documentation/man-pages-posix/default.nix
diff --git a/pkgs/data/documentation/man-pages/default.nix b/nixpkgs/pkgs/data/documentation/man-pages/default.nix
index b4435fb911f..b4435fb911f 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/nixpkgs/pkgs/data/documentation/man-pages/default.nix
diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/nixpkgs/pkgs/data/documentation/mustache-spec/default.nix
index b2a6eaa1535..b2a6eaa1535 100644
--- a/pkgs/data/documentation/mustache-spec/default.nix
+++ b/nixpkgs/pkgs/data/documentation/mustache-spec/default.nix
diff --git a/pkgs/data/documentation/rnrs/builder.sh b/nixpkgs/pkgs/data/documentation/rnrs/builder.sh
index 6ec5c855aba..6ec5c855aba 100644
--- a/pkgs/data/documentation/rnrs/builder.sh
+++ b/nixpkgs/pkgs/data/documentation/rnrs/builder.sh
diff --git a/pkgs/data/documentation/rnrs/common.nix b/nixpkgs/pkgs/data/documentation/rnrs/common.nix
index bd38389eb47..bd38389eb47 100644
--- a/pkgs/data/documentation/rnrs/common.nix
+++ b/nixpkgs/pkgs/data/documentation/rnrs/common.nix
diff --git a/pkgs/data/documentation/rnrs/r3rs.nix b/nixpkgs/pkgs/data/documentation/rnrs/r3rs.nix
index d252a1680bd..d252a1680bd 100644
--- a/pkgs/data/documentation/rnrs/r3rs.nix
+++ b/nixpkgs/pkgs/data/documentation/rnrs/r3rs.nix
diff --git a/pkgs/data/documentation/rnrs/r4rs.nix b/nixpkgs/pkgs/data/documentation/rnrs/r4rs.nix
index 1aa6a49f02d..1aa6a49f02d 100644
--- a/pkgs/data/documentation/rnrs/r4rs.nix
+++ b/nixpkgs/pkgs/data/documentation/rnrs/r4rs.nix
diff --git a/pkgs/data/documentation/rnrs/r5rs.nix b/nixpkgs/pkgs/data/documentation/rnrs/r5rs.nix
index a0fff6507e4..a0fff6507e4 100644
--- a/pkgs/data/documentation/rnrs/r5rs.nix
+++ b/nixpkgs/pkgs/data/documentation/rnrs/r5rs.nix
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/nixpkgs/pkgs/data/documentation/std-man-pages/default.nix
index b3b2b956de8..b3b2b956de8 100644
--- a/pkgs/data/documentation/std-man-pages/default.nix
+++ b/nixpkgs/pkgs/data/documentation/std-man-pages/default.nix
diff --git a/pkgs/data/documentation/stdman/default.nix b/nixpkgs/pkgs/data/documentation/stdman/default.nix
index 66f1a5033eb..66f1a5033eb 100644
--- a/pkgs/data/documentation/stdman/default.nix
+++ b/nixpkgs/pkgs/data/documentation/stdman/default.nix
diff --git a/pkgs/data/documentation/zeal/default.nix b/nixpkgs/pkgs/data/documentation/zeal/default.nix
index 2566b162d65..2566b162d65 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/nixpkgs/pkgs/data/documentation/zeal/default.nix
diff --git a/pkgs/data/documentation/zeal/remove_ads.patch b/nixpkgs/pkgs/data/documentation/zeal/remove_ads.patch
index be0cab305eb..be0cab305eb 100644
--- a/pkgs/data/documentation/zeal/remove_ads.patch
+++ b/nixpkgs/pkgs/data/documentation/zeal/remove_ads.patch
diff --git a/pkgs/data/fonts/agave/default.nix b/nixpkgs/pkgs/data/fonts/agave/default.nix
index 1fffbd9dcb1..1fffbd9dcb1 100644
--- a/pkgs/data/fonts/agave/default.nix
+++ b/nixpkgs/pkgs/data/fonts/agave/default.nix
diff --git a/pkgs/data/fonts/aileron/default.nix b/nixpkgs/pkgs/data/fonts/aileron/default.nix
index 4961a5e7449..4961a5e7449 100644
--- a/pkgs/data/fonts/aileron/default.nix
+++ b/nixpkgs/pkgs/data/fonts/aileron/default.nix
diff --git a/pkgs/data/fonts/amiri/default.nix b/nixpkgs/pkgs/data/fonts/amiri/default.nix
index 36d8ed3c674..36d8ed3c674 100644
--- a/pkgs/data/fonts/amiri/default.nix
+++ b/nixpkgs/pkgs/data/fonts/amiri/default.nix
diff --git a/pkgs/data/fonts/andagii/default.nix b/nixpkgs/pkgs/data/fonts/andagii/default.nix
index 0f20b9c46cf..0f20b9c46cf 100644
--- a/pkgs/data/fonts/andagii/default.nix
+++ b/nixpkgs/pkgs/data/fonts/andagii/default.nix
diff --git a/pkgs/data/fonts/andika/default.nix b/nixpkgs/pkgs/data/fonts/andika/default.nix
index e03a800b3ad..e03a800b3ad 100644
--- a/pkgs/data/fonts/andika/default.nix
+++ b/nixpkgs/pkgs/data/fonts/andika/default.nix
diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix
index 0b6340d1ba9..0b6340d1ba9 100644
--- a/pkgs/data/fonts/ankacoder/condensed.nix
+++ b/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix
diff --git a/pkgs/data/fonts/ankacoder/default.nix b/nixpkgs/pkgs/data/fonts/ankacoder/default.nix
index 3a57d08dbc2..3a57d08dbc2 100644
--- a/pkgs/data/fonts/ankacoder/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ankacoder/default.nix
diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/nixpkgs/pkgs/data/fonts/anonymous-pro/default.nix
index 4aeda64377e..4aeda64377e 100644
--- a/pkgs/data/fonts/anonymous-pro/default.nix
+++ b/nixpkgs/pkgs/data/fonts/anonymous-pro/default.nix
diff --git a/pkgs/data/fonts/arkpandora/default.nix b/nixpkgs/pkgs/data/fonts/arkpandora/default.nix
index 827d7b0a5a4..827d7b0a5a4 100644
--- a/pkgs/data/fonts/arkpandora/default.nix
+++ b/nixpkgs/pkgs/data/fonts/arkpandora/default.nix
diff --git a/pkgs/data/fonts/arphic/default.nix b/nixpkgs/pkgs/data/fonts/arphic/default.nix
index 1e52ea301af..1e52ea301af 100644
--- a/pkgs/data/fonts/arphic/default.nix
+++ b/nixpkgs/pkgs/data/fonts/arphic/default.nix
diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/nixpkgs/pkgs/data/fonts/aurulent-sans/default.nix
index a87be94acd0..a87be94acd0 100644
--- a/pkgs/data/fonts/aurulent-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/aurulent-sans/default.nix
diff --git a/pkgs/data/fonts/b612/default.nix b/nixpkgs/pkgs/data/fonts/b612/default.nix
index 1c2d7f53bad..1c2d7f53bad 100644
--- a/pkgs/data/fonts/b612/default.nix
+++ b/nixpkgs/pkgs/data/fonts/b612/default.nix
diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/nixpkgs/pkgs/data/fonts/babelstone-han/default.nix
index 0d46fc92d5f..0d46fc92d5f 100644
--- a/pkgs/data/fonts/babelstone-han/default.nix
+++ b/nixpkgs/pkgs/data/fonts/babelstone-han/default.nix
diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/nixpkgs/pkgs/data/fonts/baekmuk-ttf/default.nix
index 583a7457e2d..583a7457e2d 100644
--- a/pkgs/data/fonts/baekmuk-ttf/default.nix
+++ b/nixpkgs/pkgs/data/fonts/baekmuk-ttf/default.nix
diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/nixpkgs/pkgs/data/fonts/bakoma-ttf/default.nix
index 70074a58d96..70074a58d96 100644
--- a/pkgs/data/fonts/bakoma-ttf/default.nix
+++ b/nixpkgs/pkgs/data/fonts/bakoma-ttf/default.nix
diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix
index a0fcd5f7bbf..a0fcd5f7bbf 100644
--- a/pkgs/data/fonts/behdad-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix
diff --git a/pkgs/data/fonts/cabin/default.nix b/nixpkgs/pkgs/data/fonts/cabin/default.nix
index 0a8168cdf9e..0a8168cdf9e 100644
--- a/pkgs/data/fonts/cabin/default.nix
+++ b/nixpkgs/pkgs/data/fonts/cabin/default.nix
diff --git a/pkgs/data/fonts/caladea/cambria-alias.conf b/nixpkgs/pkgs/data/fonts/caladea/cambria-alias.conf
index f763e2a8c34..f763e2a8c34 100644
--- a/pkgs/data/fonts/caladea/cambria-alias.conf
+++ b/nixpkgs/pkgs/data/fonts/caladea/cambria-alias.conf
diff --git a/pkgs/data/fonts/caladea/default.nix b/nixpkgs/pkgs/data/fonts/caladea/default.nix
index b1f9312a7e9..b1f9312a7e9 100644
--- a/pkgs/data/fonts/caladea/default.nix
+++ b/nixpkgs/pkgs/data/fonts/caladea/default.nix
diff --git a/pkgs/data/fonts/camingo-code/default.nix b/nixpkgs/pkgs/data/fonts/camingo-code/default.nix
index 98175373ebd..98175373ebd 100644
--- a/pkgs/data/fonts/camingo-code/default.nix
+++ b/nixpkgs/pkgs/data/fonts/camingo-code/default.nix
diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix
index 4c3459d0f11..4c3459d0f11 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix
diff --git a/pkgs/data/fonts/carlito/calibri-alias.conf b/nixpkgs/pkgs/data/fonts/carlito/calibri-alias.conf
index 294af3b6c78..294af3b6c78 100644
--- a/pkgs/data/fonts/carlito/calibri-alias.conf
+++ b/nixpkgs/pkgs/data/fonts/carlito/calibri-alias.conf
diff --git a/pkgs/data/fonts/carlito/default.nix b/nixpkgs/pkgs/data/fonts/carlito/default.nix
index 79913bb8398..79913bb8398 100644
--- a/pkgs/data/fonts/carlito/default.nix
+++ b/nixpkgs/pkgs/data/fonts/carlito/default.nix
diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix
index 56894f92095..56894f92095 100644
--- a/pkgs/data/fonts/cascadia-code/default.nix
+++ b/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix
diff --git a/pkgs/data/fonts/charis-sil/default.nix b/nixpkgs/pkgs/data/fonts/charis-sil/default.nix
index e28a718fad1..e28a718fad1 100644
--- a/pkgs/data/fonts/charis-sil/default.nix
+++ b/nixpkgs/pkgs/data/fonts/charis-sil/default.nix
diff --git a/pkgs/data/fonts/cherry/default.nix b/nixpkgs/pkgs/data/fonts/cherry/default.nix
index 00a8a2f61fc..00a8a2f61fc 100644
--- a/pkgs/data/fonts/cherry/default.nix
+++ b/nixpkgs/pkgs/data/fonts/cherry/default.nix
diff --git a/pkgs/data/fonts/clearlyU/default.nix b/nixpkgs/pkgs/data/fonts/clearlyU/default.nix
index 0df3ba4f659..0df3ba4f659 100644
--- a/pkgs/data/fonts/clearlyU/default.nix
+++ b/nixpkgs/pkgs/data/fonts/clearlyU/default.nix
diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/nixpkgs/pkgs/data/fonts/cm-unicode/default.nix
index c058f07ed51..c058f07ed51 100644
--- a/pkgs/data/fonts/cm-unicode/default.nix
+++ b/nixpkgs/pkgs/data/fonts/cm-unicode/default.nix
diff --git a/pkgs/data/fonts/cnstrokeorder/default.nix b/nixpkgs/pkgs/data/fonts/cnstrokeorder/default.nix
index 965bf119f6e..965bf119f6e 100644
--- a/pkgs/data/fonts/cnstrokeorder/default.nix
+++ b/nixpkgs/pkgs/data/fonts/cnstrokeorder/default.nix
diff --git a/pkgs/data/fonts/comfortaa/default.nix b/nixpkgs/pkgs/data/fonts/comfortaa/default.nix
index 6e4c0bb08e7..6e4c0bb08e7 100644
--- a/pkgs/data/fonts/comfortaa/default.nix
+++ b/nixpkgs/pkgs/data/fonts/comfortaa/default.nix
diff --git a/pkgs/data/fonts/comic-neue/default.nix b/nixpkgs/pkgs/data/fonts/comic-neue/default.nix
index 6dcefe90055..6dcefe90055 100644
--- a/pkgs/data/fonts/comic-neue/default.nix
+++ b/nixpkgs/pkgs/data/fonts/comic-neue/default.nix
diff --git a/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf b/nixpkgs/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf
index be5f6cca866..be5f6cca866 100644
--- a/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf
+++ b/nixpkgs/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf
diff --git a/pkgs/data/fonts/comic-relief/default.nix b/nixpkgs/pkgs/data/fonts/comic-relief/default.nix
index d51c915b844..d51c915b844 100644
--- a/pkgs/data/fonts/comic-relief/default.nix
+++ b/nixpkgs/pkgs/data/fonts/comic-relief/default.nix
diff --git a/pkgs/data/fonts/cooper-hewitt/default.nix b/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix
index e1635c560d6..e1635c560d6 100644
--- a/pkgs/data/fonts/cooper-hewitt/default.nix
+++ b/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix
diff --git a/pkgs/data/fonts/corefonts/default.nix b/nixpkgs/pkgs/data/fonts/corefonts/default.nix
index 5e06a34b6f0..5e06a34b6f0 100644
--- a/pkgs/data/fonts/corefonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/corefonts/default.nix
diff --git a/pkgs/data/fonts/corefonts/no-op.conf b/nixpkgs/pkgs/data/fonts/corefonts/no-op.conf
index 503e62cfa29..503e62cfa29 100644
--- a/pkgs/data/fonts/corefonts/no-op.conf
+++ b/nixpkgs/pkgs/data/fonts/corefonts/no-op.conf
diff --git a/pkgs/data/fonts/creep/default.nix b/nixpkgs/pkgs/data/fonts/creep/default.nix
index bad78e3433e..bad78e3433e 100644
--- a/pkgs/data/fonts/creep/default.nix
+++ b/nixpkgs/pkgs/data/fonts/creep/default.nix
diff --git a/pkgs/data/fonts/crimson/default.nix b/nixpkgs/pkgs/data/fonts/crimson/default.nix
index a3f24985fd9..a3f24985fd9 100644
--- a/pkgs/data/fonts/crimson/default.nix
+++ b/nixpkgs/pkgs/data/fonts/crimson/default.nix
diff --git a/pkgs/data/fonts/culmus/default.nix b/nixpkgs/pkgs/data/fonts/culmus/default.nix
index 5aad7ff236f..5aad7ff236f 100644
--- a/pkgs/data/fonts/culmus/default.nix
+++ b/nixpkgs/pkgs/data/fonts/culmus/default.nix
diff --git a/pkgs/data/fonts/d2coding/default.nix b/nixpkgs/pkgs/data/fonts/d2coding/default.nix
index b73da9a504b..b73da9a504b 100644
--- a/pkgs/data/fonts/d2coding/default.nix
+++ b/nixpkgs/pkgs/data/fonts/d2coding/default.nix
diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix
index b14ba6479d9..b14ba6479d9 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix
diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/nixpkgs/pkgs/data/fonts/dina-pcf/default.nix
index eff0c579a70..eff0c579a70 100644
--- a/pkgs/data/fonts/dina-pcf/default.nix
+++ b/nixpkgs/pkgs/data/fonts/dina-pcf/default.nix
diff --git a/pkgs/data/fonts/dina/default.nix b/nixpkgs/pkgs/data/fonts/dina/default.nix
index 0d4cd286219..0d4cd286219 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/nixpkgs/pkgs/data/fonts/dina/default.nix
diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/nixpkgs/pkgs/data/fonts/dosemu-fonts/default.nix
index 81a1b5649b3..81a1b5649b3 100644
--- a/pkgs/data/fonts/dosemu-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/dosemu-fonts/default.nix
diff --git a/pkgs/data/fonts/dosis/default.nix b/nixpkgs/pkgs/data/fonts/dosis/default.nix
index 48b170e2e1b..48b170e2e1b 100644
--- a/pkgs/data/fonts/dosis/default.nix
+++ b/nixpkgs/pkgs/data/fonts/dosis/default.nix
diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix
index 59371593f79..59371593f79 100644
--- a/pkgs/data/fonts/doulos-sil/default.nix
+++ b/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix
diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/nixpkgs/pkgs/data/fonts/eb-garamond/default.nix
index 14233268991..14233268991 100644
--- a/pkgs/data/fonts/eb-garamond/default.nix
+++ b/nixpkgs/pkgs/data/fonts/eb-garamond/default.nix
diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/nixpkgs/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
index e7981f63baf..e7981f63baf 100644
--- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
diff --git a/pkgs/data/fonts/emojione/default.nix b/nixpkgs/pkgs/data/fonts/emojione/default.nix
index 171ec10c8f1..171ec10c8f1 100644
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/nixpkgs/pkgs/data/fonts/emojione/default.nix
diff --git a/pkgs/data/fonts/encode-sans/default.nix b/nixpkgs/pkgs/data/fonts/encode-sans/default.nix
index 787a83f9561..787a83f9561 100644
--- a/pkgs/data/fonts/encode-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/encode-sans/default.nix
diff --git a/pkgs/data/fonts/envypn-font/default.nix b/nixpkgs/pkgs/data/fonts/envypn-font/default.nix
index 351a0617ddc..351a0617ddc 100644
--- a/pkgs/data/fonts/envypn-font/default.nix
+++ b/nixpkgs/pkgs/data/fonts/envypn-font/default.nix
diff --git a/pkgs/data/fonts/et-book/default.nix b/nixpkgs/pkgs/data/fonts/et-book/default.nix
index 58586ba7db6..58586ba7db6 100644
--- a/pkgs/data/fonts/et-book/default.nix
+++ b/nixpkgs/pkgs/data/fonts/et-book/default.nix
diff --git a/pkgs/data/fonts/eunomia/default.nix b/nixpkgs/pkgs/data/fonts/eunomia/default.nix
index de68b17d6eb..de68b17d6eb 100644
--- a/pkgs/data/fonts/eunomia/default.nix
+++ b/nixpkgs/pkgs/data/fonts/eunomia/default.nix
diff --git a/pkgs/data/fonts/f5_6/default.nix b/nixpkgs/pkgs/data/fonts/f5_6/default.nix
index 175648198ce..175648198ce 100644
--- a/pkgs/data/fonts/f5_6/default.nix
+++ b/nixpkgs/pkgs/data/fonts/f5_6/default.nix
diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/nixpkgs/pkgs/data/fonts/fantasque-sans-mono/default.nix
index 156db5d214c..156db5d214c 100644
--- a/pkgs/data/fonts/fantasque-sans-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/fantasque-sans-mono/default.nix
diff --git a/pkgs/data/fonts/ferrum/default.nix b/nixpkgs/pkgs/data/fonts/ferrum/default.nix
index fe40252ab23..fe40252ab23 100644
--- a/pkgs/data/fonts/ferrum/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ferrum/default.nix
diff --git a/pkgs/data/fonts/fira-code/default.nix b/nixpkgs/pkgs/data/fonts/fira-code/default.nix
index 46149b0781b..46149b0781b 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/nixpkgs/pkgs/data/fonts/fira-code/default.nix
diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix
index 624616bdd58..624616bdd58 100644
--- a/pkgs/data/fonts/fira-code/symbols.nix
+++ b/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix
diff --git a/pkgs/data/fonts/fira-mono/default.nix b/nixpkgs/pkgs/data/fonts/fira-mono/default.nix
index 2f50a83a70b..2f50a83a70b 100644
--- a/pkgs/data/fonts/fira-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/fira-mono/default.nix
diff --git a/pkgs/data/fonts/fira/default.nix b/nixpkgs/pkgs/data/fonts/fira/default.nix
index fe27ac2cd5d..fe27ac2cd5d 100644
--- a/pkgs/data/fonts/fira/default.nix
+++ b/nixpkgs/pkgs/data/fonts/fira/default.nix
diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix
index 14232edee0c..14232edee0c 100644
--- a/pkgs/data/fonts/fixedsys-excelsior/default.nix
+++ b/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix
diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/nixpkgs/pkgs/data/fonts/font-awesome-5/default.nix
index bcf02f1328e..bcf02f1328e 100644
--- a/pkgs/data/fonts/font-awesome-5/default.nix
+++ b/nixpkgs/pkgs/data/fonts/font-awesome-5/default.nix
diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/nixpkgs/pkgs/data/fonts/fontconfig-penultimate/default.nix
index 601146d99a9..601146d99a9 100644
--- a/pkgs/data/fonts/fontconfig-penultimate/default.nix
+++ b/nixpkgs/pkgs/data/fonts/fontconfig-penultimate/default.nix
diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/nixpkgs/pkgs/data/fonts/freefont-ttf/default.nix
index c5e19edea26..c5e19edea26 100644
--- a/pkgs/data/fonts/freefont-ttf/default.nix
+++ b/nixpkgs/pkgs/data/fonts/freefont-ttf/default.nix
diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix
index 4d925b269cd..4d925b269cd 100644
--- a/pkgs/data/fonts/gandom-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix
diff --git a/pkgs/data/fonts/gdouros/default.nix b/nixpkgs/pkgs/data/fonts/gdouros/default.nix
index 71c92a72e59..71c92a72e59 100644
--- a/pkgs/data/fonts/gdouros/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gdouros/default.nix
diff --git a/pkgs/data/fonts/gelasio/default.nix b/nixpkgs/pkgs/data/fonts/gelasio/default.nix
index c8cf655a18c..c8cf655a18c 100644
--- a/pkgs/data/fonts/gelasio/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gelasio/default.nix
diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix
index 505b273c2d2..505b273c2d2 100644
--- a/pkgs/data/fonts/gentium-book-basic/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix
diff --git a/pkgs/data/fonts/gentium/default.nix b/nixpkgs/pkgs/data/fonts/gentium/default.nix
index a60a39f4f01..a60a39f4f01 100644
--- a/pkgs/data/fonts/gentium/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gentium/default.nix
diff --git a/pkgs/data/fonts/go-font/default.nix b/nixpkgs/pkgs/data/fonts/go-font/default.nix
index bb28d3be67f..bb28d3be67f 100644
--- a/pkgs/data/fonts/go-font/default.nix
+++ b/nixpkgs/pkgs/data/fonts/go-font/default.nix
diff --git a/pkgs/data/fonts/gohufont/default.nix b/nixpkgs/pkgs/data/fonts/gohufont/default.nix
index e4e9954d118..e4e9954d118 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gohufont/default.nix
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix
index 7c1af485a98..7c1af485a98 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix
diff --git a/pkgs/data/fonts/gubbi/default.nix b/nixpkgs/pkgs/data/fonts/gubbi/default.nix
index 2d1c520e610..2d1c520e610 100644
--- a/pkgs/data/fonts/gubbi/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gubbi/default.nix
diff --git a/pkgs/data/fonts/gyre/default.nix b/nixpkgs/pkgs/data/fonts/gyre/default.nix
index 91a8aaf3c30..91a8aaf3c30 100644
--- a/pkgs/data/fonts/gyre/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gyre/default.nix
diff --git a/pkgs/data/fonts/hack/default.nix b/nixpkgs/pkgs/data/fonts/hack/default.nix
index 3c49bf7f565..3c49bf7f565 100644
--- a/pkgs/data/fonts/hack/default.nix
+++ b/nixpkgs/pkgs/data/fonts/hack/default.nix
diff --git a/pkgs/data/fonts/hanazono/default.nix b/nixpkgs/pkgs/data/fonts/hanazono/default.nix
index 29c982ed8ae..29c982ed8ae 100644
--- a/pkgs/data/fonts/hanazono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/hanazono/default.nix
diff --git a/pkgs/data/fonts/hasklig/default.nix b/nixpkgs/pkgs/data/fonts/hasklig/default.nix
index 6286cf8a1df..6286cf8a1df 100644
--- a/pkgs/data/fonts/hasklig/default.nix
+++ b/nixpkgs/pkgs/data/fonts/hasklig/default.nix
diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/nixpkgs/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
index 23f6fb29be0..23f6fb29be0 100644
--- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
+++ b/nixpkgs/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
diff --git a/pkgs/data/fonts/hermit/default.nix b/nixpkgs/pkgs/data/fonts/hermit/default.nix
index f641b36a1b0..f641b36a1b0 100644
--- a/pkgs/data/fonts/hermit/default.nix
+++ b/nixpkgs/pkgs/data/fonts/hermit/default.nix
diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix
index 726fbab95bd..726fbab95bd 100644
--- a/pkgs/data/fonts/hyperscrypt/default.nix
+++ b/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix
diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix
index 1d910ed54a4..1d910ed54a4 100644
--- a/pkgs/data/fonts/ia-writer-duospace/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix
diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix
index ffd6a49be5c..ffd6a49be5c 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix
diff --git a/pkgs/data/fonts/inconsolata/default.nix b/nixpkgs/pkgs/data/fonts/inconsolata/default.nix
index a170a0780a4..a170a0780a4 100644
--- a/pkgs/data/fonts/inconsolata/default.nix
+++ b/nixpkgs/pkgs/data/fonts/inconsolata/default.nix
diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/nixpkgs/pkgs/data/fonts/inconsolata/lgc.nix
index aec48b12086..aec48b12086 100644
--- a/pkgs/data/fonts/inconsolata/lgc.nix
+++ b/nixpkgs/pkgs/data/fonts/inconsolata/lgc.nix
diff --git a/pkgs/data/fonts/input-fonts/default.nix b/nixpkgs/pkgs/data/fonts/input-fonts/default.nix
index c3d3bf4aa6a..c3d3bf4aa6a 100644
--- a/pkgs/data/fonts/input-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/input-fonts/default.nix
diff --git a/pkgs/data/fonts/inriafonts/default.nix b/nixpkgs/pkgs/data/fonts/inriafonts/default.nix
index 5a8e3476bf8..5a8e3476bf8 100644
--- a/pkgs/data/fonts/inriafonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/inriafonts/default.nix
diff --git a/pkgs/data/fonts/inter-ui/default.nix b/nixpkgs/pkgs/data/fonts/inter-ui/default.nix
index d9ef6684faa..d9ef6684faa 100644
--- a/pkgs/data/fonts/inter-ui/default.nix
+++ b/nixpkgs/pkgs/data/fonts/inter-ui/default.nix
diff --git a/pkgs/data/fonts/inter/default.nix b/nixpkgs/pkgs/data/fonts/inter/default.nix
index 83779e7618e..83779e7618e 100644
--- a/pkgs/data/fonts/inter/default.nix
+++ b/nixpkgs/pkgs/data/fonts/inter/default.nix
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
index cbe4b25bd36..cbe4b25bd36 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
diff --git a/pkgs/data/fonts/iosevka/default.nix b/nixpkgs/pkgs/data/fonts/iosevka/default.nix
index e2111065826..e2111065826 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/nixpkgs/pkgs/data/fonts/iosevka/default.nix
diff --git a/pkgs/data/fonts/iosevka/package.json b/nixpkgs/pkgs/data/fonts/iosevka/package.json
index 8faa397576b..8faa397576b 100644
--- a/pkgs/data/fonts/iosevka/package.json
+++ b/nixpkgs/pkgs/data/fonts/iosevka/package.json
diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix
index 4d7e2fa380e..4d7e2fa380e 100644
--- a/pkgs/data/fonts/ipaexfont/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix
diff --git a/pkgs/data/fonts/ipafont/default.nix b/nixpkgs/pkgs/data/fonts/ipafont/default.nix
index d1cb0070883..d1cb0070883 100644
--- a/pkgs/data/fonts/ipafont/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ipafont/default.nix
diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix
index eef3883506e..eef3883506e 100644
--- a/pkgs/data/fonts/ir-standard-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix
diff --git a/pkgs/data/fonts/iwona/default.nix b/nixpkgs/pkgs/data/fonts/iwona/default.nix
index afa59b737a5..afa59b737a5 100644
--- a/pkgs/data/fonts/iwona/default.nix
+++ b/nixpkgs/pkgs/data/fonts/iwona/default.nix
diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix
index 21c598b6cdd..21c598b6cdd 100644
--- a/pkgs/data/fonts/jetbrains-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix
diff --git a/pkgs/data/fonts/jost/default.nix b/nixpkgs/pkgs/data/fonts/jost/default.nix
index ecada2eda7b..ecada2eda7b 100644
--- a/pkgs/data/fonts/jost/default.nix
+++ b/nixpkgs/pkgs/data/fonts/jost/default.nix
diff --git a/pkgs/data/fonts/joypixels/default.nix b/nixpkgs/pkgs/data/fonts/joypixels/default.nix
index fc6481e9a89..fc6481e9a89 100644
--- a/pkgs/data/fonts/joypixels/default.nix
+++ b/nixpkgs/pkgs/data/fonts/joypixels/default.nix
diff --git a/pkgs/data/fonts/junicode/default.nix b/nixpkgs/pkgs/data/fonts/junicode/default.nix
index 1cfe1d5d4b0..1cfe1d5d4b0 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/nixpkgs/pkgs/data/fonts/junicode/default.nix
diff --git a/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/nixpkgs/pkgs/data/fonts/kanji-stroke-order-font/default.nix
index 1c1609b03f1..1c1609b03f1 100644
--- a/pkgs/data/fonts/kanji-stroke-order-font/default.nix
+++ b/nixpkgs/pkgs/data/fonts/kanji-stroke-order-font/default.nix
diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix
index f6a031c7faf..f6a031c7faf 100644
--- a/pkgs/data/fonts/kawkab-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix
diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/nixpkgs/pkgs/data/fonts/kochi-substitute-naga10/default.nix
index 1b63223f0bf..1b63223f0bf 100644
--- a/pkgs/data/fonts/kochi-substitute-naga10/default.nix
+++ b/nixpkgs/pkgs/data/fonts/kochi-substitute-naga10/default.nix
diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix
index cf89a8fcb8f..cf89a8fcb8f 100644
--- a/pkgs/data/fonts/kochi-substitute/default.nix
+++ b/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix
diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/nixpkgs/pkgs/data/fonts/lalezar-fonts/default.nix
index 2cd33e9fe1b..2cd33e9fe1b 100644
--- a/pkgs/data/fonts/lalezar-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/lalezar-fonts/default.nix
diff --git a/pkgs/data/fonts/lato/default.nix b/nixpkgs/pkgs/data/fonts/lato/default.nix
index ea9d1837ef5..ea9d1837ef5 100644
--- a/pkgs/data/fonts/lato/default.nix
+++ b/nixpkgs/pkgs/data/fonts/lato/default.nix
diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/nixpkgs/pkgs/data/fonts/league-of-moveable-type/default.nix
index 5657b8380a9..5657b8380a9 100644
--- a/pkgs/data/fonts/league-of-moveable-type/default.nix
+++ b/nixpkgs/pkgs/data/fonts/league-of-moveable-type/default.nix
diff --git a/pkgs/data/fonts/league-of-moveable-type/fonts.nix b/nixpkgs/pkgs/data/fonts/league-of-moveable-type/fonts.nix
index efbe6a4c41c..efbe6a4c41c 100644
--- a/pkgs/data/fonts/league-of-moveable-type/fonts.nix
+++ b/nixpkgs/pkgs/data/fonts/league-of-moveable-type/fonts.nix
diff --git a/pkgs/data/fonts/league-of-moveable-type/update.sh b/nixpkgs/pkgs/data/fonts/league-of-moveable-type/update.sh
index 4d41df4fdb8..4d41df4fdb8 100644
--- a/pkgs/data/fonts/league-of-moveable-type/update.sh
+++ b/nixpkgs/pkgs/data/fonts/league-of-moveable-type/update.sh
diff --git a/pkgs/data/fonts/liberastika/default.nix b/nixpkgs/pkgs/data/fonts/liberastika/default.nix
index 1bc3b9b2092..1bc3b9b2092 100644
--- a/pkgs/data/fonts/liberastika/default.nix
+++ b/nixpkgs/pkgs/data/fonts/liberastika/default.nix
diff --git a/pkgs/data/fonts/liberation-sans-narrow/default.nix b/nixpkgs/pkgs/data/fonts/liberation-sans-narrow/default.nix
index 51af6a20bae..51af6a20bae 100644
--- a/pkgs/data/fonts/liberation-sans-narrow/default.nix
+++ b/nixpkgs/pkgs/data/fonts/liberation-sans-narrow/default.nix
diff --git a/pkgs/data/fonts/libertine/default.nix b/nixpkgs/pkgs/data/fonts/libertine/default.nix
index eb0a47e13d9..eb0a47e13d9 100644
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/nixpkgs/pkgs/data/fonts/libertine/default.nix
diff --git a/pkgs/data/fonts/libertinus/default.nix b/nixpkgs/pkgs/data/fonts/libertinus/default.nix
index 62aad87c902..62aad87c902 100644
--- a/pkgs/data/fonts/libertinus/default.nix
+++ b/nixpkgs/pkgs/data/fonts/libertinus/default.nix
diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/nixpkgs/pkgs/data/fonts/libre-baskerville/default.nix
index f5e6083f944..f5e6083f944 100644
--- a/pkgs/data/fonts/libre-baskerville/default.nix
+++ b/nixpkgs/pkgs/data/fonts/libre-baskerville/default.nix
diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/nixpkgs/pkgs/data/fonts/libre-bodoni/default.nix
index e55d5030741..e55d5030741 100644
--- a/pkgs/data/fonts/libre-bodoni/default.nix
+++ b/nixpkgs/pkgs/data/fonts/libre-bodoni/default.nix
diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/nixpkgs/pkgs/data/fonts/libre-caslon/default.nix
index 7a68c9deb5a..7a68c9deb5a 100644
--- a/pkgs/data/fonts/libre-caslon/default.nix
+++ b/nixpkgs/pkgs/data/fonts/libre-caslon/default.nix
diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/nixpkgs/pkgs/data/fonts/libre-franklin/default.nix
index 97832ab5651..97832ab5651 100644
--- a/pkgs/data/fonts/libre-franklin/default.nix
+++ b/nixpkgs/pkgs/data/fonts/libre-franklin/default.nix
diff --git a/pkgs/data/fonts/lm-math/default.nix b/nixpkgs/pkgs/data/fonts/lm-math/default.nix
index 8df851cb9df..8df851cb9df 100644
--- a/pkgs/data/fonts/lm-math/default.nix
+++ b/nixpkgs/pkgs/data/fonts/lm-math/default.nix
diff --git a/pkgs/data/fonts/lmodern/default.nix b/nixpkgs/pkgs/data/fonts/lmodern/default.nix
index 1b277a0691c..1b277a0691c 100644
--- a/pkgs/data/fonts/lmodern/default.nix
+++ b/nixpkgs/pkgs/data/fonts/lmodern/default.nix
diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/nixpkgs/pkgs/data/fonts/lmodern/lmmath.nix
index 679f5200213..679f5200213 100644
--- a/pkgs/data/fonts/lmodern/lmmath.nix
+++ b/nixpkgs/pkgs/data/fonts/lmodern/lmmath.nix
diff --git a/pkgs/data/fonts/lobster-two/default.nix b/nixpkgs/pkgs/data/fonts/lobster-two/default.nix
index 773b53c8892..773b53c8892 100644
--- a/pkgs/data/fonts/lobster-two/default.nix
+++ b/nixpkgs/pkgs/data/fonts/lobster-two/default.nix
diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/nixpkgs/pkgs/data/fonts/lohit-fonts/default.nix
index 0e8b1f8fe4d..0e8b1f8fe4d 100644
--- a/pkgs/data/fonts/lohit-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/lohit-fonts/default.nix
diff --git a/pkgs/data/fonts/luculent/default.nix b/nixpkgs/pkgs/data/fonts/luculent/default.nix
index 7e5a69a2c1f..7e5a69a2c1f 100644
--- a/pkgs/data/fonts/luculent/default.nix
+++ b/nixpkgs/pkgs/data/fonts/luculent/default.nix
diff --git a/pkgs/data/fonts/manrope/default.nix b/nixpkgs/pkgs/data/fonts/manrope/default.nix
index 9dce73a28aa..9dce73a28aa 100644
--- a/pkgs/data/fonts/manrope/default.nix
+++ b/nixpkgs/pkgs/data/fonts/manrope/default.nix
diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/nixpkgs/pkgs/data/fonts/marathi-cursive/default.nix
index 60c77dddc8d..60c77dddc8d 100644
--- a/pkgs/data/fonts/marathi-cursive/default.nix
+++ b/nixpkgs/pkgs/data/fonts/marathi-cursive/default.nix
diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix
index 201b0dfe417..201b0dfe417 100644
--- a/pkgs/data/fonts/material-design-icons/default.nix
+++ b/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix
diff --git a/pkgs/data/fonts/material-icons/default.nix b/nixpkgs/pkgs/data/fonts/material-icons/default.nix
index 0126fbac225..0126fbac225 100644
--- a/pkgs/data/fonts/material-icons/default.nix
+++ b/nixpkgs/pkgs/data/fonts/material-icons/default.nix
diff --git a/pkgs/data/fonts/medio/default.nix b/nixpkgs/pkgs/data/fonts/medio/default.nix
index c94046f085f..c94046f085f 100644
--- a/pkgs/data/fonts/medio/default.nix
+++ b/nixpkgs/pkgs/data/fonts/medio/default.nix
diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix
index a041f9ce907..a041f9ce907 100644
--- a/pkgs/data/fonts/meslo-lg/default.nix
+++ b/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix
diff --git a/pkgs/data/fonts/migmix/default.nix b/nixpkgs/pkgs/data/fonts/migmix/default.nix
index 8a089ea9e79..8a089ea9e79 100644
--- a/pkgs/data/fonts/migmix/default.nix
+++ b/nixpkgs/pkgs/data/fonts/migmix/default.nix
diff --git a/pkgs/data/fonts/migu/default.nix b/nixpkgs/pkgs/data/fonts/migu/default.nix
index 775d1766894..775d1766894 100644
--- a/pkgs/data/fonts/migu/default.nix
+++ b/nixpkgs/pkgs/data/fonts/migu/default.nix
diff --git a/pkgs/data/fonts/mno16/default.nix b/nixpkgs/pkgs/data/fonts/mno16/default.nix
index 2a700be113a..2a700be113a 100644
--- a/pkgs/data/fonts/mno16/default.nix
+++ b/nixpkgs/pkgs/data/fonts/mno16/default.nix
diff --git a/pkgs/data/fonts/monoid/default.nix b/nixpkgs/pkgs/data/fonts/monoid/default.nix
index 22714170fa4..22714170fa4 100644
--- a/pkgs/data/fonts/monoid/default.nix
+++ b/nixpkgs/pkgs/data/fonts/monoid/default.nix
diff --git a/pkgs/data/fonts/mononoki/default.nix b/nixpkgs/pkgs/data/fonts/mononoki/default.nix
index 658c3bdf20a..658c3bdf20a 100644
--- a/pkgs/data/fonts/mononoki/default.nix
+++ b/nixpkgs/pkgs/data/fonts/mononoki/default.nix
diff --git a/pkgs/data/fonts/montserrat/default.nix b/nixpkgs/pkgs/data/fonts/montserrat/default.nix
index de8ea80b017..de8ea80b017 100644
--- a/pkgs/data/fonts/montserrat/default.nix
+++ b/nixpkgs/pkgs/data/fonts/montserrat/default.nix
diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/nixpkgs/pkgs/data/fonts/mph-2b-damase/default.nix
index 4230e63360b..4230e63360b 100644
--- a/pkgs/data/fonts/mph-2b-damase/default.nix
+++ b/nixpkgs/pkgs/data/fonts/mph-2b-damase/default.nix
diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix
index 75e8899e664..75e8899e664 100644
--- a/pkgs/data/fonts/mplus-outline-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix
diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/nixpkgs/pkgs/data/fonts/mro-unicode/default.nix
index bb5a1ed8a9f..bb5a1ed8a9f 100644
--- a/pkgs/data/fonts/mro-unicode/default.nix
+++ b/nixpkgs/pkgs/data/fonts/mro-unicode/default.nix
diff --git a/pkgs/data/fonts/myrica/default.nix b/nixpkgs/pkgs/data/fonts/myrica/default.nix
index 444d526f5ae..444d526f5ae 100644
--- a/pkgs/data/fonts/myrica/default.nix
+++ b/nixpkgs/pkgs/data/fonts/myrica/default.nix
diff --git a/pkgs/data/fonts/nafees/default.nix b/nixpkgs/pkgs/data/fonts/nafees/default.nix
index d2aaadc4279..d2aaadc4279 100644
--- a/pkgs/data/fonts/nafees/default.nix
+++ b/nixpkgs/pkgs/data/fonts/nafees/default.nix
diff --git a/pkgs/data/fonts/nahid-fonts/default.nix b/nixpkgs/pkgs/data/fonts/nahid-fonts/default.nix
index b9d9025b2c0..b9d9025b2c0 100644
--- a/pkgs/data/fonts/nahid-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/nahid-fonts/default.nix
diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix
index 7d908b62cc6..7d908b62cc6 100644
--- a/pkgs/data/fonts/nanum-gothic-coding/default.nix
+++ b/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix
diff --git a/pkgs/data/fonts/national-park/default.nix b/nixpkgs/pkgs/data/fonts/national-park/default.nix
index bc8fc8041a8..bc8fc8041a8 100644
--- a/pkgs/data/fonts/national-park/default.nix
+++ b/nixpkgs/pkgs/data/fonts/national-park/default.nix
diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix
index 454cbc09281..454cbc09281 100644
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix
diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix
index 3f58bc5f933..3f58bc5f933 100644
--- a/pkgs/data/fonts/nika-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix
diff --git a/pkgs/data/fonts/norwester/default.nix b/nixpkgs/pkgs/data/fonts/norwester/default.nix
index ae70c74c3e4..ae70c74c3e4 100644
--- a/pkgs/data/fonts/norwester/default.nix
+++ b/nixpkgs/pkgs/data/fonts/norwester/default.nix
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
index 04e8e581b63..04e8e581b63 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix
index d91ace35e2c..d91ace35e2c 100644
--- a/pkgs/data/fonts/noto-fonts/tools.nix
+++ b/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix
diff --git a/pkgs/data/fonts/office-code-pro/default.nix b/nixpkgs/pkgs/data/fonts/office-code-pro/default.nix
index 4354725c90c..4354725c90c 100644
--- a/pkgs/data/fonts/office-code-pro/default.nix
+++ b/nixpkgs/pkgs/data/fonts/office-code-pro/default.nix
diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/nixpkgs/pkgs/data/fonts/oldsindhi/default.nix
index c2ea6a7180b..c2ea6a7180b 100644
--- a/pkgs/data/fonts/oldsindhi/default.nix
+++ b/nixpkgs/pkgs/data/fonts/oldsindhi/default.nix
diff --git a/pkgs/data/fonts/oldstandard/default.nix b/nixpkgs/pkgs/data/fonts/oldstandard/default.nix
index cd0d0063efb..cd0d0063efb 100644
--- a/pkgs/data/fonts/oldstandard/default.nix
+++ b/nixpkgs/pkgs/data/fonts/oldstandard/default.nix
diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/nixpkgs/pkgs/data/fonts/open-dyslexic/default.nix
index 8519c346891..8519c346891 100644
--- a/pkgs/data/fonts/open-dyslexic/default.nix
+++ b/nixpkgs/pkgs/data/fonts/open-dyslexic/default.nix
diff --git a/pkgs/data/fonts/open-sans/default.nix b/nixpkgs/pkgs/data/fonts/open-sans/default.nix
index 0c1293ebda3..0c1293ebda3 100644
--- a/pkgs/data/fonts/open-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/open-sans/default.nix
diff --git a/pkgs/data/fonts/orbitron/default.nix b/nixpkgs/pkgs/data/fonts/orbitron/default.nix
index 699345f753e..699345f753e 100644
--- a/pkgs/data/fonts/orbitron/default.nix
+++ b/nixpkgs/pkgs/data/fonts/orbitron/default.nix
diff --git a/pkgs/data/fonts/overpass/default.nix b/nixpkgs/pkgs/data/fonts/overpass/default.nix
index 1d0cf04d756..1d0cf04d756 100644
--- a/pkgs/data/fonts/overpass/default.nix
+++ b/nixpkgs/pkgs/data/fonts/overpass/default.nix
diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/nixpkgs/pkgs/data/fonts/oxygenfonts/default.nix
index e34e49d9814..e34e49d9814 100644
--- a/pkgs/data/fonts/oxygenfonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/oxygenfonts/default.nix
diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix
index d297baddc4d..d297baddc4d 100644
--- a/pkgs/data/fonts/parastoo-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix
diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix
index 6b619d23201..6b619d23201 100644
--- a/pkgs/data/fonts/paratype-pt/mono.nix
+++ b/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix
diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix
index a3692809026..a3692809026 100644
--- a/pkgs/data/fonts/paratype-pt/sans.nix
+++ b/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix
diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix
index d74295571e0..d74295571e0 100644
--- a/pkgs/data/fonts/paratype-pt/serif.nix
+++ b/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix
diff --git a/pkgs/data/fonts/pecita/default.nix b/nixpkgs/pkgs/data/fonts/pecita/default.nix
index 1fc252421de..1fc252421de 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/nixpkgs/pkgs/data/fonts/pecita/default.nix
diff --git a/pkgs/data/fonts/penna/default.nix b/nixpkgs/pkgs/data/fonts/penna/default.nix
index 784f9d2573e..784f9d2573e 100644
--- a/pkgs/data/fonts/penna/default.nix
+++ b/nixpkgs/pkgs/data/fonts/penna/default.nix
diff --git a/pkgs/data/fonts/poly/default.nix b/nixpkgs/pkgs/data/fonts/poly/default.nix
index 24155f2ea54..24155f2ea54 100644
--- a/pkgs/data/fonts/poly/default.nix
+++ b/nixpkgs/pkgs/data/fonts/poly/default.nix
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/nixpkgs/pkgs/data/fonts/powerline-fonts/default.nix
index c8044905a08..c8044905a08 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/powerline-fonts/default.nix
diff --git a/pkgs/data/fonts/profont/default.nix b/nixpkgs/pkgs/data/fonts/profont/default.nix
index 89565910f7a..89565910f7a 100644
--- a/pkgs/data/fonts/profont/default.nix
+++ b/nixpkgs/pkgs/data/fonts/profont/default.nix
diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix
index 580ea61a2df..580ea61a2df 100644
--- a/pkgs/data/fonts/proggyfonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix
diff --git a/pkgs/data/fonts/public-sans/default.nix b/nixpkgs/pkgs/data/fonts/public-sans/default.nix
index 13eb4a4da5f..13eb4a4da5f 100644
--- a/pkgs/data/fonts/public-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/public-sans/default.nix
diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix
index 429cd80c2fc..429cd80c2fc 100644
--- a/pkgs/data/fonts/quattrocento-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix
diff --git a/pkgs/data/fonts/quattrocento/default.nix b/nixpkgs/pkgs/data/fonts/quattrocento/default.nix
index 7e268182eef..7e268182eef 100644
--- a/pkgs/data/fonts/quattrocento/default.nix
+++ b/nixpkgs/pkgs/data/fonts/quattrocento/default.nix
diff --git a/pkgs/data/fonts/raleway/default.nix b/nixpkgs/pkgs/data/fonts/raleway/default.nix
index 7fd6b80b714..7fd6b80b714 100644
--- a/pkgs/data/fonts/raleway/default.nix
+++ b/nixpkgs/pkgs/data/fonts/raleway/default.nix
diff --git a/pkgs/data/fonts/recursive/default.nix b/nixpkgs/pkgs/data/fonts/recursive/default.nix
index d3d65f8e515..d3d65f8e515 100644
--- a/pkgs/data/fonts/recursive/default.nix
+++ b/nixpkgs/pkgs/data/fonts/recursive/default.nix
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/nixpkgs/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index 6d075424bc5..6d075424bc5 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/redhat-liberation-fonts/default.nix
diff --git a/pkgs/data/fonts/redhat-official/default.nix b/nixpkgs/pkgs/data/fonts/redhat-official/default.nix
index 33321a2c7fe..33321a2c7fe 100644
--- a/pkgs/data/fonts/redhat-official/default.nix
+++ b/nixpkgs/pkgs/data/fonts/redhat-official/default.nix
diff --git a/pkgs/data/fonts/rhodium-libre/default.nix b/nixpkgs/pkgs/data/fonts/rhodium-libre/default.nix
index fc89d652592..fc89d652592 100644
--- a/pkgs/data/fonts/rhodium-libre/default.nix
+++ b/nixpkgs/pkgs/data/fonts/rhodium-libre/default.nix
diff --git a/pkgs/data/fonts/ricty/default.nix b/nixpkgs/pkgs/data/fonts/ricty/default.nix
index a248bb9d494..a248bb9d494 100644
--- a/pkgs/data/fonts/ricty/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ricty/default.nix
diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
index bf19fb8238f..bf19fb8238f 100644
--- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
+++ b/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix
index cfd4e3808aa..cfd4e3808aa 100644
--- a/pkgs/data/fonts/roboto-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix
diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix
index f9f6ec342e9..f9f6ec342e9 100644
--- a/pkgs/data/fonts/roboto-slab/default.nix
+++ b/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix
diff --git a/pkgs/data/fonts/roboto/default.nix b/nixpkgs/pkgs/data/fonts/roboto/default.nix
index 50629c5f977..50629c5f977 100644
--- a/pkgs/data/fonts/roboto/default.nix
+++ b/nixpkgs/pkgs/data/fonts/roboto/default.nix
diff --git a/pkgs/data/fonts/rounded-mgenplus/default.nix b/nixpkgs/pkgs/data/fonts/rounded-mgenplus/default.nix
index 43198702492..43198702492 100644
--- a/pkgs/data/fonts/rounded-mgenplus/default.nix
+++ b/nixpkgs/pkgs/data/fonts/rounded-mgenplus/default.nix
diff --git a/pkgs/data/fonts/route159/default.nix b/nixpkgs/pkgs/data/fonts/route159/default.nix
index cbc89c550b3..cbc89c550b3 100644
--- a/pkgs/data/fonts/route159/default.nix
+++ b/nixpkgs/pkgs/data/fonts/route159/default.nix
diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix
index 029ed33611f..029ed33611f 100644
--- a/pkgs/data/fonts/sahel-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix
diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix
index d8d3d0d3b5a..d8d3d0d3b5a 100644
--- a/pkgs/data/fonts/samim-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix
diff --git a/pkgs/data/fonts/sampradaya/default.nix b/nixpkgs/pkgs/data/fonts/sampradaya/default.nix
index 90b32f251ef..90b32f251ef 100644
--- a/pkgs/data/fonts/sampradaya/default.nix
+++ b/nixpkgs/pkgs/data/fonts/sampradaya/default.nix
diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix
index 7e073bf56d3..7e073bf56d3 100644
--- a/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix
diff --git a/pkgs/data/fonts/scheherazade/default.nix b/nixpkgs/pkgs/data/fonts/scheherazade/default.nix
index 062b29c9039..062b29c9039 100644
--- a/pkgs/data/fonts/scheherazade/default.nix
+++ b/nixpkgs/pkgs/data/fonts/scheherazade/default.nix
diff --git a/pkgs/data/fonts/seshat/default.nix b/nixpkgs/pkgs/data/fonts/seshat/default.nix
index 71483a04cbb..71483a04cbb 100644
--- a/pkgs/data/fonts/seshat/default.nix
+++ b/nixpkgs/pkgs/data/fonts/seshat/default.nix
diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix
index 5834b797eea..5834b797eea 100644
--- a/pkgs/data/fonts/shabnam-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix
diff --git a/pkgs/data/fonts/shrikhand/default.nix b/nixpkgs/pkgs/data/fonts/shrikhand/default.nix
index a00036510f5..a00036510f5 100644
--- a/pkgs/data/fonts/shrikhand/default.nix
+++ b/nixpkgs/pkgs/data/fonts/shrikhand/default.nix
diff --git a/pkgs/data/fonts/signwriting/default.nix b/nixpkgs/pkgs/data/fonts/signwriting/default.nix
index 883e43b4381..883e43b4381 100644
--- a/pkgs/data/fonts/signwriting/default.nix
+++ b/nixpkgs/pkgs/data/fonts/signwriting/default.nix
diff --git a/pkgs/data/fonts/siji/default.nix b/nixpkgs/pkgs/data/fonts/siji/default.nix
index a0acf78d855..a0acf78d855 100644
--- a/pkgs/data/fonts/siji/default.nix
+++ b/nixpkgs/pkgs/data/fonts/siji/default.nix
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/nixpkgs/pkgs/data/fonts/source-code-pro/default.nix
index be4d045815c..be4d045815c 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/nixpkgs/pkgs/data/fonts/source-code-pro/default.nix
diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/nixpkgs/pkgs/data/fonts/source-han-code-jp/default.nix
index 85f5cddd2ea..85f5cddd2ea 100644
--- a/pkgs/data/fonts/source-han-code-jp/default.nix
+++ b/nixpkgs/pkgs/data/fonts/source-han-code-jp/default.nix
diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/nixpkgs/pkgs/data/fonts/source-han-sans/default.nix
index 87e24c0e23c..87e24c0e23c 100644
--- a/pkgs/data/fonts/source-han-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/source-han-sans/default.nix
diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/nixpkgs/pkgs/data/fonts/source-han-serif/default.nix
index bb5a67c8306..bb5a67c8306 100644
--- a/pkgs/data/fonts/source-han-serif/default.nix
+++ b/nixpkgs/pkgs/data/fonts/source-han-serif/default.nix
diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/nixpkgs/pkgs/data/fonts/source-sans-pro/default.nix
index 5186b9fe4a5..5186b9fe4a5 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/nixpkgs/pkgs/data/fonts/source-sans-pro/default.nix
diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/nixpkgs/pkgs/data/fonts/source-serif-pro/default.nix
index eb776a3df26..eb776a3df26 100644
--- a/pkgs/data/fonts/source-serif-pro/default.nix
+++ b/nixpkgs/pkgs/data/fonts/source-serif-pro/default.nix
diff --git a/pkgs/data/fonts/spleen/default.nix b/nixpkgs/pkgs/data/fonts/spleen/default.nix
index 3e843e30f5e..3e843e30f5e 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/nixpkgs/pkgs/data/fonts/spleen/default.nix
diff --git a/pkgs/data/fonts/stix-otf/default.nix b/nixpkgs/pkgs/data/fonts/stix-otf/default.nix
index f3ff9600f5d..f3ff9600f5d 100644
--- a/pkgs/data/fonts/stix-otf/default.nix
+++ b/nixpkgs/pkgs/data/fonts/stix-otf/default.nix
diff --git a/pkgs/data/fonts/stix-two/default.nix b/nixpkgs/pkgs/data/fonts/stix-two/default.nix
index c71b51ad75d..c71b51ad75d 100644
--- a/pkgs/data/fonts/stix-two/default.nix
+++ b/nixpkgs/pkgs/data/fonts/stix-two/default.nix
diff --git a/pkgs/data/fonts/sudo/default.nix b/nixpkgs/pkgs/data/fonts/sudo/default.nix
index 3906353d82b..3906353d82b 100644
--- a/pkgs/data/fonts/sudo/default.nix
+++ b/nixpkgs/pkgs/data/fonts/sudo/default.nix
diff --git a/pkgs/data/fonts/tai-languages/default.nix b/nixpkgs/pkgs/data/fonts/tai-languages/default.nix
index 7778c4a98b8..7778c4a98b8 100644
--- a/pkgs/data/fonts/tai-languages/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tai-languages/default.nix
diff --git a/pkgs/data/fonts/tamsyn/default.nix b/nixpkgs/pkgs/data/fonts/tamsyn/default.nix
index 380024e7e1a..380024e7e1a 100644
--- a/pkgs/data/fonts/tamsyn/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tamsyn/default.nix
diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/nixpkgs/pkgs/data/fonts/tempora-lgc/default.nix
index f06a5bfee27..f06a5bfee27 100644
--- a/pkgs/data/fonts/tempora-lgc/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tempora-lgc/default.nix
diff --git a/pkgs/data/fonts/tenderness/default.nix b/nixpkgs/pkgs/data/fonts/tenderness/default.nix
index 09ea566e738..09ea566e738 100644
--- a/pkgs/data/fonts/tenderness/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tenderness/default.nix
diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix
index bdd0fd7762b..bdd0fd7762b 100644
--- a/pkgs/data/fonts/terminus-font-ttf/default.nix
+++ b/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/nixpkgs/pkgs/data/fonts/terminus-font/default.nix
index 358ab959cd0..358ab959cd0 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/nixpkgs/pkgs/data/fonts/terminus-font/default.nix
diff --git a/pkgs/data/fonts/tewi/default.nix b/nixpkgs/pkgs/data/fonts/tewi/default.nix
index fbc29cdf5fb..fbc29cdf5fb 100644
--- a/pkgs/data/fonts/tewi/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tewi/default.nix
diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/nixpkgs/pkgs/data/fonts/tex-gyre-math/default.nix
index 8e1d2743174..8e1d2743174 100644
--- a/pkgs/data/fonts/tex-gyre-math/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tex-gyre-math/default.nix
diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/nixpkgs/pkgs/data/fonts/tex-gyre/default.nix
index 7e55a70c71a..7e55a70c71a 100644
--- a/pkgs/data/fonts/tex-gyre/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tex-gyre/default.nix
diff --git a/pkgs/data/fonts/theano/default.nix b/nixpkgs/pkgs/data/fonts/theano/default.nix
index 82563205454..82563205454 100644
--- a/pkgs/data/fonts/theano/default.nix
+++ b/nixpkgs/pkgs/data/fonts/theano/default.nix
diff --git a/pkgs/data/fonts/tipa/default.nix b/nixpkgs/pkgs/data/fonts/tipa/default.nix
index 6cebe2120fe..6cebe2120fe 100644
--- a/pkgs/data/fonts/tipa/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tipa/default.nix
diff --git a/pkgs/data/fonts/tlwg/default.nix b/nixpkgs/pkgs/data/fonts/tlwg/default.nix
index 78700992831..78700992831 100644
--- a/pkgs/data/fonts/tlwg/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tlwg/default.nix
diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix
index f485f43b60c..f485f43b60c 100644
--- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix
diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/nixpkgs/pkgs/data/fonts/ttf-envy-code-r/default.nix
index 0f670f106fd..0f670f106fd 100644
--- a/pkgs/data/fonts/ttf-envy-code-r/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ttf-envy-code-r/default.nix
diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix
index a9bf3720c07..a9bf3720c07 100644
--- a/pkgs/data/fonts/twemoji-color-font/default.nix
+++ b/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix
diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix
index 4e464f37022..4e464f37022 100644
--- a/pkgs/data/fonts/twitter-color-emoji/default.nix
+++ b/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix
diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/nixpkgs/pkgs/data/fonts/ubuntu-font-family/default.nix
index 7c90c16d4d1..7c90c16d4d1 100644
--- a/pkgs/data/fonts/ubuntu-font-family/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ubuntu-font-family/default.nix
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix
index 0ea0363763d..0ea0363763d 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix
diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
index 5b07adf822e..5b07adf822e 100644
--- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix
index c98936b8096..c98936b8096 100644
--- a/pkgs/data/fonts/undefined-medium/default.nix
+++ b/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix
diff --git a/pkgs/data/fonts/uni-vga/default.nix b/nixpkgs/pkgs/data/fonts/uni-vga/default.nix
index cd719a62d99..cd719a62d99 100644
--- a/pkgs/data/fonts/uni-vga/default.nix
+++ b/nixpkgs/pkgs/data/fonts/uni-vga/default.nix
diff --git a/pkgs/data/fonts/unifont/default.nix b/nixpkgs/pkgs/data/fonts/unifont/default.nix
index a80beee342b..a80beee342b 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/nixpkgs/pkgs/data/fonts/unifont/default.nix
diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix
index 21d31914479..21d31914479 100644
--- a/pkgs/data/fonts/unifont_upper/default.nix
+++ b/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix
diff --git a/pkgs/data/fonts/unscii/default.nix b/nixpkgs/pkgs/data/fonts/unscii/default.nix
index cd4d0dc42cd..cd4d0dc42cd 100644
--- a/pkgs/data/fonts/unscii/default.nix
+++ b/nixpkgs/pkgs/data/fonts/unscii/default.nix
diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/nixpkgs/pkgs/data/fonts/uw-ttyp0/default.nix
index eae820fb0d1..eae820fb0d1 100644
--- a/pkgs/data/fonts/uw-ttyp0/default.nix
+++ b/nixpkgs/pkgs/data/fonts/uw-ttyp0/default.nix
diff --git a/pkgs/data/fonts/uw-ttyp0/determinism.patch b/nixpkgs/pkgs/data/fonts/uw-ttyp0/determinism.patch
index 8546ad35933..8546ad35933 100644
--- a/pkgs/data/fonts/uw-ttyp0/determinism.patch
+++ b/nixpkgs/pkgs/data/fonts/uw-ttyp0/determinism.patch
diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix
index f3986753809..f3986753809 100755
--- a/pkgs/data/fonts/vazir-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix
diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/nixpkgs/pkgs/data/fonts/vdrsymbols/default.nix
index fd74897077f..fd74897077f 100644
--- a/pkgs/data/fonts/vdrsymbols/default.nix
+++ b/nixpkgs/pkgs/data/fonts/vdrsymbols/default.nix
diff --git a/pkgs/data/fonts/vegur/default.nix b/nixpkgs/pkgs/data/fonts/vegur/default.nix
index a269f17bf0e..a269f17bf0e 100644
--- a/pkgs/data/fonts/vegur/default.nix
+++ b/nixpkgs/pkgs/data/fonts/vegur/default.nix
diff --git a/pkgs/data/fonts/victor-mono/default.nix b/nixpkgs/pkgs/data/fonts/victor-mono/default.nix
index 89b13585eb0..89b13585eb0 100644
--- a/pkgs/data/fonts/victor-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/victor-mono/default.nix
diff --git a/pkgs/data/fonts/vista-fonts-chs/default.nix b/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix
index 6a7cc71133a..6a7cc71133a 100644
--- a/pkgs/data/fonts/vista-fonts-chs/default.nix
+++ b/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix
diff --git a/pkgs/data/fonts/vista-fonts-chs/no-op.conf b/nixpkgs/pkgs/data/fonts/vista-fonts-chs/no-op.conf
index 2d00b624488..2d00b624488 100644
--- a/pkgs/data/fonts/vista-fonts-chs/no-op.conf
+++ b/nixpkgs/pkgs/data/fonts/vista-fonts-chs/no-op.conf
diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix
index 59cff1b0f47..59cff1b0f47 100644
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix
diff --git a/pkgs/data/fonts/vista-fonts/no-op.conf b/nixpkgs/pkgs/data/fonts/vista-fonts/no-op.conf
index 503e62cfa29..503e62cfa29 100644
--- a/pkgs/data/fonts/vista-fonts/no-op.conf
+++ b/nixpkgs/pkgs/data/fonts/vista-fonts/no-op.conf
diff --git a/pkgs/data/fonts/weather-icons/default.nix b/nixpkgs/pkgs/data/fonts/weather-icons/default.nix
index 17227367120..17227367120 100644
--- a/pkgs/data/fonts/weather-icons/default.nix
+++ b/nixpkgs/pkgs/data/fonts/weather-icons/default.nix
diff --git a/pkgs/data/fonts/work-sans/default.nix b/nixpkgs/pkgs/data/fonts/work-sans/default.nix
index 16a0e9ac021..16a0e9ac021 100644
--- a/pkgs/data/fonts/work-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/work-sans/default.nix
diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix
index dc87e6b634f..dc87e6b634f 100644
--- a/pkgs/data/fonts/wqy-microhei/default.nix
+++ b/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/nixpkgs/pkgs/data/fonts/wqy-zenhei/default.nix
index 7df1e5aeb2a..7df1e5aeb2a 100644
--- a/pkgs/data/fonts/wqy-zenhei/default.nix
+++ b/nixpkgs/pkgs/data/fonts/wqy-zenhei/default.nix
diff --git a/pkgs/data/fonts/xits-math/default.nix b/nixpkgs/pkgs/data/fonts/xits-math/default.nix
index db0ed425dee..db0ed425dee 100644
--- a/pkgs/data/fonts/xits-math/default.nix
+++ b/nixpkgs/pkgs/data/fonts/xits-math/default.nix
diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix
index e5dd11db72a..e5dd11db72a 100644
--- a/pkgs/data/fonts/xkcd-font/default.nix
+++ b/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix
diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/nixpkgs/pkgs/data/fonts/yanone-kaffeesatz/default.nix
index e713f4d64a3..e713f4d64a3 100644
--- a/pkgs/data/fonts/yanone-kaffeesatz/default.nix
+++ b/nixpkgs/pkgs/data/fonts/yanone-kaffeesatz/default.nix
diff --git a/pkgs/data/fonts/zilla-slab/default.nix b/nixpkgs/pkgs/data/fonts/zilla-slab/default.nix
index 369fb53e6ab..369fb53e6ab 100644
--- a/pkgs/data/fonts/zilla-slab/default.nix
+++ b/nixpkgs/pkgs/data/fonts/zilla-slab/default.nix
diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix
index b0a8a05fc68..b0a8a05fc68 100644
--- a/pkgs/data/icons/arc-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix
diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix
index d2e35136a8b..d2e35136a8b 100644
--- a/pkgs/data/icons/bibata-cursors/default.nix
+++ b/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix
diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix
index b9d4c22f878..b9d4c22f878 100644
--- a/pkgs/data/icons/bibata-cursors/extra.nix
+++ b/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix
diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/nixpkgs/pkgs/data/icons/bibata-cursors/translucent.nix
index d5b541317b5..d5b541317b5 100644
--- a/pkgs/data/icons/bibata-cursors/translucent.nix
+++ b/nixpkgs/pkgs/data/icons/bibata-cursors/translucent.nix
diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix
index 46d6c1a731e..46d6c1a731e 100644
--- a/pkgs/data/icons/capitaine-cursors/default.nix
+++ b/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix
diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index 221974c7941..221974c7941 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix
index efce0a16e13..efce0a16e13 100644
--- a/pkgs/data/icons/faba-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix
diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix
index 96bd4031150..96bd4031150 100644
--- a/pkgs/data/icons/faba-mono-icons/default.nix
+++ b/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix
diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix
index f0e13b21dfd..f0e13b21dfd 100644
--- a/pkgs/data/icons/flat-remix-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix
diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix
index 2c0872188e0..2c0872188e0 100644
--- a/pkgs/data/icons/hicolor-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix
diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh
index f07bab4b269..f07bab4b269 100644
--- a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh
+++ b/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh
diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix
index 96514b6a4cd..96514b6a4cd 100644
--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix
diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix
index 20bc8dc0a58..20bc8dc0a58 100644
--- a/pkgs/data/icons/maia-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix
diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix
index 539dfaa2d10..539dfaa2d10 100644
--- a/pkgs/data/icons/moka-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix
diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix
index 8e5a317082e..8e5a317082e 100644
--- a/pkgs/data/icons/numix-cursor-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix
index ed4b2581e85..ed4b2581e85 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix
index 620ef02fde7..620ef02fde7 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix
index d3bcdb12d3d..d3bcdb12d3d 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix
diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix
index 477960972a7..477960972a7 100644
--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix
index 218af2d9b3c..218af2d9b3c 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix
diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/papirus-maia-icon-theme/default.nix
index e15e64c2101..e15e64c2101 100644
--- a/pkgs/data/icons/papirus-maia-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/papirus-maia-icon-theme/default.nix
diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix
index 8bfde381633..8bfde381633 100644
--- a/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix
diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix
index a4a7237f974..a4a7237f974 100644
--- a/pkgs/data/icons/tango-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix
diff --git a/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch b/nixpkgs/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch
index ee3d00ccf3e..ee3d00ccf3e 100644
--- a/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch
+++ b/nixpkgs/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch
diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix
index f271d7a44e6..f271d7a44e6 100644
--- a/pkgs/data/icons/vanilla-dmz/default.nix
+++ b/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix
diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix
index c3670a6f58c..c3670a6f58c 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix
diff --git a/pkgs/data/machine-learning/mnist/default.nix b/nixpkgs/pkgs/data/machine-learning/mnist/default.nix
index fe9e83492e4..fe9e83492e4 100644
--- a/pkgs/data/machine-learning/mnist/default.nix
+++ b/nixpkgs/pkgs/data/machine-learning/mnist/default.nix
diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix
index 1c35d3deef9..1c35d3deef9 100644
--- a/pkgs/data/misc/adapta-backgrounds/default.nix
+++ b/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix
diff --git a/pkgs/data/misc/brise/default.nix b/nixpkgs/pkgs/data/misc/brise/default.nix
index f1e0604acf8..f1e0604acf8 100644
--- a/pkgs/data/misc/brise/default.nix
+++ b/nixpkgs/pkgs/data/misc/brise/default.nix
diff --git a/pkgs/data/misc/brise/fetchPackages.nix b/nixpkgs/pkgs/data/misc/brise/fetchPackages.nix
index 92930c67cc9..92930c67cc9 100644
--- a/pkgs/data/misc/brise/fetchPackages.nix
+++ b/nixpkgs/pkgs/data/misc/brise/fetchPackages.nix
diff --git a/pkgs/data/misc/cacert/default.nix b/nixpkgs/pkgs/data/misc/cacert/default.nix
index 34dd48b897f..34dd48b897f 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/nixpkgs/pkgs/data/misc/cacert/default.nix
diff --git a/pkgs/data/misc/cacert/fix-unicode-ca-names.patch b/nixpkgs/pkgs/data/misc/cacert/fix-unicode-ca-names.patch
index 07d3629196a..07d3629196a 100644
--- a/pkgs/data/misc/cacert/fix-unicode-ca-names.patch
+++ b/nixpkgs/pkgs/data/misc/cacert/fix-unicode-ca-names.patch
diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/nixpkgs/pkgs/data/misc/cacert/setup-hook.sh
index 77b68a5c251..77b68a5c251 100644
--- a/pkgs/data/misc/cacert/setup-hook.sh
+++ b/nixpkgs/pkgs/data/misc/cacert/setup-hook.sh
diff --git a/pkgs/data/misc/cldr-emoji-annotation/default.nix b/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix
index 4279cf8aec4..4279cf8aec4 100644
--- a/pkgs/data/misc/cldr-emoji-annotation/default.nix
+++ b/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix
diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix
index 5df7343f3be..5df7343f3be 100644
--- a/pkgs/data/misc/combinatorial_designs/default.nix
+++ b/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix
diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix
index 48b538fe183..48b538fe183 100644
--- a/pkgs/data/misc/conway_polynomials/default.nix
+++ b/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix
diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix
index 3cadb477ae8..3cadb477ae8 100644
--- a/pkgs/data/misc/ddccontrol-db/default.nix
+++ b/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix
diff --git a/pkgs/data/misc/dns-root-data/default.nix b/nixpkgs/pkgs/data/misc/dns-root-data/default.nix
index ee08c07f5a6..ee08c07f5a6 100644
--- a/pkgs/data/misc/dns-root-data/default.nix
+++ b/nixpkgs/pkgs/data/misc/dns-root-data/default.nix
diff --git a/pkgs/data/misc/dns-root-data/root.ds b/nixpkgs/pkgs/data/misc/dns-root-data/root.ds
index e292b5a7bf0..e292b5a7bf0 100644
--- a/pkgs/data/misc/dns-root-data/root.ds
+++ b/nixpkgs/pkgs/data/misc/dns-root-data/root.ds
diff --git a/pkgs/data/misc/dns-root-data/root.key b/nixpkgs/pkgs/data/misc/dns-root-data/root.key
index edfc762ad60..edfc762ad60 100644
--- a/pkgs/data/misc/dns-root-data/root.key
+++ b/nixpkgs/pkgs/data/misc/dns-root-data/root.key
diff --git a/pkgs/data/misc/dns-root-data/update-root-key.sh b/nixpkgs/pkgs/data/misc/dns-root-data/update-root-key.sh
index 9a3141aef19..9a3141aef19 100755
--- a/pkgs/data/misc/dns-root-data/update-root-key.sh
+++ b/nixpkgs/pkgs/data/misc/dns-root-data/update-root-key.sh
diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix
index 49b8736b084..49b8736b084 100644
--- a/pkgs/data/misc/elliptic_curves/default.nix
+++ b/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix
diff --git a/pkgs/data/misc/freepats/default.nix b/nixpkgs/pkgs/data/misc/freepats/default.nix
index e48470a67bb..e48470a67bb 100644
--- a/pkgs/data/misc/freepats/default.nix
+++ b/nixpkgs/pkgs/data/misc/freepats/default.nix
diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/nixpkgs/pkgs/data/misc/geolite-legacy/builder.sh
index 683b2e8606b..683b2e8606b 100644
--- a/pkgs/data/misc/geolite-legacy/builder.sh
+++ b/nixpkgs/pkgs/data/misc/geolite-legacy/builder.sh
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix
index 8cbd526f3d3..8cbd526f3d3 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix
diff --git a/pkgs/data/misc/graphs/default.nix b/nixpkgs/pkgs/data/misc/graphs/default.nix
index 14551c6a4a4..14551c6a4a4 100644
--- a/pkgs/data/misc/graphs/default.nix
+++ b/nixpkgs/pkgs/data/misc/graphs/default.nix
diff --git a/pkgs/data/misc/hackage/default.nix b/nixpkgs/pkgs/data/misc/hackage/default.nix
index 2415e94b92d..2415e94b92d 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/nixpkgs/pkgs/data/misc/hackage/default.nix
diff --git a/pkgs/data/misc/iana-etc/default.nix b/nixpkgs/pkgs/data/misc/iana-etc/default.nix
index 3124b57ac2b..3124b57ac2b 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/nixpkgs/pkgs/data/misc/iana-etc/default.nix
diff --git a/pkgs/data/misc/libkkc-data/default.nix b/nixpkgs/pkgs/data/misc/libkkc-data/default.nix
index cb446e9b0bc..cb446e9b0bc 100644
--- a/pkgs/data/misc/libkkc-data/default.nix
+++ b/nixpkgs/pkgs/data/misc/libkkc-data/default.nix
diff --git a/pkgs/data/misc/mailcap/default.nix b/nixpkgs/pkgs/data/misc/mailcap/default.nix
index 725d4ded0eb..725d4ded0eb 100644
--- a/pkgs/data/misc/mailcap/default.nix
+++ b/nixpkgs/pkgs/data/misc/mailcap/default.nix
diff --git a/pkgs/data/misc/media-player-info/default.nix b/nixpkgs/pkgs/data/misc/media-player-info/default.nix
index 0ac5dc51d6b..0ac5dc51d6b 100644
--- a/pkgs/data/misc/media-player-info/default.nix
+++ b/nixpkgs/pkgs/data/misc/media-player-info/default.nix
diff --git a/pkgs/data/misc/mime-types/default.nix b/nixpkgs/pkgs/data/misc/mime-types/default.nix
index 65ad964736d..65ad964736d 100644
--- a/pkgs/data/misc/mime-types/default.nix
+++ b/nixpkgs/pkgs/data/misc/mime-types/default.nix
diff --git a/pkgs/data/misc/miscfiles/default.nix b/nixpkgs/pkgs/data/misc/miscfiles/default.nix
index 4e1d1e02a2f..4e1d1e02a2f 100644
--- a/pkgs/data/misc/miscfiles/default.nix
+++ b/nixpkgs/pkgs/data/misc/miscfiles/default.nix
diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix
index a2df56c0898..a2df56c0898 100644
--- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix
+++ b/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix
diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/nixpkgs/pkgs/data/misc/nixos-artwork/default.nix
index 4814232fbfe..4814232fbfe 100644
--- a/pkgs/data/misc/nixos-artwork/default.nix
+++ b/nixpkgs/pkgs/data/misc/nixos-artwork/default.nix
diff --git a/pkgs/data/misc/nixos-artwork/grub2-theme.nix b/nixpkgs/pkgs/data/misc/nixos-artwork/grub2-theme.nix
index 8bc6c8adc13..8bc6c8adc13 100644
--- a/pkgs/data/misc/nixos-artwork/grub2-theme.nix
+++ b/nixpkgs/pkgs/data/misc/nixos-artwork/grub2-theme.nix
diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix
index 1c14bcc9f98..1c14bcc9f98 100644
--- a/pkgs/data/misc/nixos-artwork/icons.nix
+++ b/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix
diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix
index 3983869a452..3983869a452 100644
--- a/pkgs/data/misc/nixos-artwork/wallpapers.nix
+++ b/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix
index 31f7eb7efdb..31f7eb7efdb 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix
diff --git a/pkgs/data/misc/pari-galdata/default.nix b/nixpkgs/pkgs/data/misc/pari-galdata/default.nix
index 2535e8cfc25..2535e8cfc25 100644
--- a/pkgs/data/misc/pari-galdata/default.nix
+++ b/nixpkgs/pkgs/data/misc/pari-galdata/default.nix
diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix
index 3470a0804f7..3470a0804f7 100644
--- a/pkgs/data/misc/pari-seadata-small/default.nix
+++ b/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix
diff --git a/pkgs/data/misc/polytopes_db/default.nix b/nixpkgs/pkgs/data/misc/polytopes_db/default.nix
index 8fec9a85426..8fec9a85426 100644
--- a/pkgs/data/misc/polytopes_db/default.nix
+++ b/nixpkgs/pkgs/data/misc/polytopes_db/default.nix
diff --git a/pkgs/data/misc/poppler-data/default.nix b/nixpkgs/pkgs/data/misc/poppler-data/default.nix
index d14ccdec2ea..d14ccdec2ea 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/nixpkgs/pkgs/data/misc/poppler-data/default.nix
diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix
index ca79e251f28..ca79e251f28 100644
--- a/pkgs/data/misc/publicsuffix-list/default.nix
+++ b/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix
diff --git a/pkgs/data/misc/scowl/default.nix b/nixpkgs/pkgs/data/misc/scowl/default.nix
index f15a7534e26..f15a7534e26 100644
--- a/pkgs/data/misc/scowl/default.nix
+++ b/nixpkgs/pkgs/data/misc/scowl/default.nix
diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/nixpkgs/pkgs/data/misc/shared-desktop-ontologies/default.nix
index 72895653479..72895653479 100644
--- a/pkgs/data/misc/shared-desktop-ontologies/default.nix
+++ b/nixpkgs/pkgs/data/misc/shared-desktop-ontologies/default.nix
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix
index 4594ffc2392..4594ffc2392 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix
diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/nixpkgs/pkgs/data/misc/sound-theme-freedesktop/default.nix
index 355a2c2c577..355a2c2c577 100644
--- a/pkgs/data/misc/sound-theme-freedesktop/default.nix
+++ b/nixpkgs/pkgs/data/misc/sound-theme-freedesktop/default.nix
diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix
index 6be0ab73641..6be0ab73641 100644
--- a/pkgs/data/misc/spdx-license-list-data/default.nix
+++ b/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix
diff --git a/pkgs/data/misc/tzdata/default.nix b/nixpkgs/pkgs/data/misc/tzdata/default.nix
index 3227d9a7623..3227d9a7623 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/nixpkgs/pkgs/data/misc/tzdata/default.nix
diff --git a/pkgs/data/misc/tzdata/tzdata-setup-hook.sh b/nixpkgs/pkgs/data/misc/tzdata/tzdata-setup-hook.sh
index 9975d0aec31..9975d0aec31 100644
--- a/pkgs/data/misc/tzdata/tzdata-setup-hook.sh
+++ b/nixpkgs/pkgs/data/misc/tzdata/tzdata-setup-hook.sh
diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix
index 5f50049856f..5f50049856f 100644
--- a/pkgs/data/misc/unicode-character-database/default.nix
+++ b/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix
diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix
index 05472b26d88..05472b26d88 100644
--- a/pkgs/data/misc/unicode-emoji/default.nix
+++ b/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix
diff --git a/pkgs/data/misc/unihan-database/default.nix b/nixpkgs/pkgs/data/misc/unihan-database/default.nix
index 77da77242a9..77da77242a9 100644
--- a/pkgs/data/misc/unihan-database/default.nix
+++ b/nixpkgs/pkgs/data/misc/unihan-database/default.nix
diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix
index 43847b4b3b6..43847b4b3b6 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix
diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix
index 12acc424b9d..12acc424b9d 100644
--- a/pkgs/data/misc/xorg-rgb/default.nix
+++ b/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix
diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
index 17303e682b9..17303e682b9 100644
--- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
+++ b/nixpkgs/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix
index 9728b2f96c4..9728b2f96c4 100644
--- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix
+++ b/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix
diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix
index 78b99081504..78b99081504 100644
--- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix
+++ b/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
index 3d8e16443db..3d8e16443db 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
+++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat
index 896a8338f11..896a8338f11 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat
+++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
index 35e69641f11..35e69641f11 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
+++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
index f8c827e826d..f8c827e826d 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
+++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
index 2c253a1029d..2c253a1029d 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
+++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
index d051d205808..d051d205808 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
+++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
index 156ee653bbe..156ee653bbe 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
+++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
index 41c4b73d3f6..41c4b73d3f6 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
+++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
index 54ef5225d2f..54ef5225d2f 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
+++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/catalog-legacy-uris.patch b/nixpkgs/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/catalog-legacy-uris.patch
index 72922eee96c..72922eee96c 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/catalog-legacy-uris.patch
+++ b/nixpkgs/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/catalog-legacy-uris.patch
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/nixpkgs/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index 8aa1f0b6330..8aa1f0b6330 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/nixpkgs/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
diff --git a/pkgs/data/soundfonts/fluid/default.nix b/nixpkgs/pkgs/data/soundfonts/fluid/default.nix
index 7debe119aa1..7debe119aa1 100644
--- a/pkgs/data/soundfonts/fluid/default.nix
+++ b/nixpkgs/pkgs/data/soundfonts/fluid/default.nix
diff --git a/pkgs/data/themes/adapta-kde/default.nix b/nixpkgs/pkgs/data/themes/adapta-kde/default.nix
index 47740aa6762..47740aa6762 100644
--- a/pkgs/data/themes/adapta-kde/default.nix
+++ b/nixpkgs/pkgs/data/themes/adapta-kde/default.nix
diff --git a/pkgs/data/themes/adapta/default.nix b/nixpkgs/pkgs/data/themes/adapta/default.nix
index 02812b1f939..02812b1f939 100644
--- a/pkgs/data/themes/adapta/default.nix
+++ b/nixpkgs/pkgs/data/themes/adapta/default.nix
diff --git a/pkgs/data/themes/adementary/default.nix b/nixpkgs/pkgs/data/themes/adementary/default.nix
index 1cb7ac53432..1cb7ac53432 100644
--- a/pkgs/data/themes/adementary/default.nix
+++ b/nixpkgs/pkgs/data/themes/adementary/default.nix
diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix
index 7428b5fab2f..7428b5fab2f 100644
--- a/pkgs/data/themes/adwaita-qt/default.nix
+++ b/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix
diff --git a/pkgs/data/themes/albatross/default.nix b/nixpkgs/pkgs/data/themes/albatross/default.nix
index 870b348cc32..870b348cc32 100644
--- a/pkgs/data/themes/albatross/default.nix
+++ b/nixpkgs/pkgs/data/themes/albatross/default.nix
diff --git a/pkgs/data/themes/amber/default.nix b/nixpkgs/pkgs/data/themes/amber/default.nix
index a004c0fb3e9..a004c0fb3e9 100644
--- a/pkgs/data/themes/amber/default.nix
+++ b/nixpkgs/pkgs/data/themes/amber/default.nix
diff --git a/pkgs/data/themes/ant-theme/default.nix b/nixpkgs/pkgs/data/themes/ant-theme/default.nix
index 8ff869bc7aa..8ff869bc7aa 100644
--- a/pkgs/data/themes/ant-theme/default.nix
+++ b/nixpkgs/pkgs/data/themes/ant-theme/default.nix
diff --git a/pkgs/data/themes/arc-kde/default.nix b/nixpkgs/pkgs/data/themes/arc-kde/default.nix
index 4937a99daec..4937a99daec 100644
--- a/pkgs/data/themes/arc-kde/default.nix
+++ b/nixpkgs/pkgs/data/themes/arc-kde/default.nix
diff --git a/pkgs/data/themes/arc/default.nix b/nixpkgs/pkgs/data/themes/arc/default.nix
index 8dcfacadb49..8dcfacadb49 100644
--- a/pkgs/data/themes/arc/default.nix
+++ b/nixpkgs/pkgs/data/themes/arc/default.nix
diff --git a/pkgs/data/themes/blackbird/default.nix b/nixpkgs/pkgs/data/themes/blackbird/default.nix
index 7ffefb1d67f..7ffefb1d67f 100644
--- a/pkgs/data/themes/blackbird/default.nix
+++ b/nixpkgs/pkgs/data/themes/blackbird/default.nix
diff --git a/pkgs/data/themes/clearlooks-phenix/default.nix b/nixpkgs/pkgs/data/themes/clearlooks-phenix/default.nix
index 2f701b9b765..2f701b9b765 100644
--- a/pkgs/data/themes/clearlooks-phenix/default.nix
+++ b/nixpkgs/pkgs/data/themes/clearlooks-phenix/default.nix
diff --git a/pkgs/data/themes/e17gtk/default.nix b/nixpkgs/pkgs/data/themes/e17gtk/default.nix
index 74f0a54ccef..74f0a54ccef 100644
--- a/pkgs/data/themes/e17gtk/default.nix
+++ b/nixpkgs/pkgs/data/themes/e17gtk/default.nix
diff --git a/pkgs/data/themes/equilux-theme/default.nix b/nixpkgs/pkgs/data/themes/equilux-theme/default.nix
index f24524eb6b9..f24524eb6b9 100644
--- a/pkgs/data/themes/equilux-theme/default.nix
+++ b/nixpkgs/pkgs/data/themes/equilux-theme/default.nix
diff --git a/pkgs/data/themes/gnome-breeze/default.nix b/nixpkgs/pkgs/data/themes/gnome-breeze/default.nix
index 200cc4bae05..200cc4bae05 100644
--- a/pkgs/data/themes/gnome-breeze/default.nix
+++ b/nixpkgs/pkgs/data/themes/gnome-breeze/default.nix
diff --git a/pkgs/data/themes/greybird/default.nix b/nixpkgs/pkgs/data/themes/greybird/default.nix
index cc665749d3c..cc665749d3c 100644
--- a/pkgs/data/themes/greybird/default.nix
+++ b/nixpkgs/pkgs/data/themes/greybird/default.nix
diff --git a/pkgs/data/themes/jade1/default.nix b/nixpkgs/pkgs/data/themes/jade1/default.nix
index 01221d45014..01221d45014 100644
--- a/pkgs/data/themes/jade1/default.nix
+++ b/nixpkgs/pkgs/data/themes/jade1/default.nix
diff --git a/pkgs/data/themes/kde2/default.nix b/nixpkgs/pkgs/data/themes/kde2/default.nix
index 547e4f30aa6..547e4f30aa6 100644
--- a/pkgs/data/themes/kde2/default.nix
+++ b/nixpkgs/pkgs/data/themes/kde2/default.nix
diff --git a/pkgs/data/themes/lounge/default.nix b/nixpkgs/pkgs/data/themes/lounge/default.nix
index 15ec68b0757..15ec68b0757 100644
--- a/pkgs/data/themes/lounge/default.nix
+++ b/nixpkgs/pkgs/data/themes/lounge/default.nix
diff --git a/pkgs/data/themes/matcha/default.nix b/nixpkgs/pkgs/data/themes/matcha/default.nix
index 8ab868891b5..8ab868891b5 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/nixpkgs/pkgs/data/themes/matcha/default.nix
diff --git a/pkgs/data/themes/materia-theme/default.nix b/nixpkgs/pkgs/data/themes/materia-theme/default.nix
index 4a1458ee7a5..4a1458ee7a5 100644
--- a/pkgs/data/themes/materia-theme/default.nix
+++ b/nixpkgs/pkgs/data/themes/materia-theme/default.nix
diff --git a/pkgs/data/themes/mojave/default.nix b/nixpkgs/pkgs/data/themes/mojave/default.nix
index 6c38e3aaba4..6c38e3aaba4 100644
--- a/pkgs/data/themes/mojave/default.nix
+++ b/nixpkgs/pkgs/data/themes/mojave/default.nix
diff --git a/pkgs/data/themes/nordic-polar/default.nix b/nixpkgs/pkgs/data/themes/nordic-polar/default.nix
index d1cfb800001..d1cfb800001 100644
--- a/pkgs/data/themes/nordic-polar/default.nix
+++ b/nixpkgs/pkgs/data/themes/nordic-polar/default.nix
diff --git a/pkgs/data/themes/nordic/default.nix b/nixpkgs/pkgs/data/themes/nordic/default.nix
index 5172b2992cc..5172b2992cc 100644
--- a/pkgs/data/themes/nordic/default.nix
+++ b/nixpkgs/pkgs/data/themes/nordic/default.nix
diff --git a/pkgs/data/themes/numix-solarized/default.nix b/nixpkgs/pkgs/data/themes/numix-solarized/default.nix
index 0596141da80..0596141da80 100644
--- a/pkgs/data/themes/numix-solarized/default.nix
+++ b/nixpkgs/pkgs/data/themes/numix-solarized/default.nix
diff --git a/pkgs/data/themes/numix-sx/default.nix b/nixpkgs/pkgs/data/themes/numix-sx/default.nix
index 72e87e2e274..72e87e2e274 100644
--- a/pkgs/data/themes/numix-sx/default.nix
+++ b/nixpkgs/pkgs/data/themes/numix-sx/default.nix
diff --git a/pkgs/data/themes/numix/default.nix b/nixpkgs/pkgs/data/themes/numix/default.nix
index e01f8174e9e..e01f8174e9e 100644
--- a/pkgs/data/themes/numix/default.nix
+++ b/nixpkgs/pkgs/data/themes/numix/default.nix
diff --git a/pkgs/data/themes/obsidian2/default.nix b/nixpkgs/pkgs/data/themes/obsidian2/default.nix
index 452ee0f8897..452ee0f8897 100644
--- a/pkgs/data/themes/obsidian2/default.nix
+++ b/nixpkgs/pkgs/data/themes/obsidian2/default.nix
diff --git a/pkgs/data/themes/onestepback/default.nix b/nixpkgs/pkgs/data/themes/onestepback/default.nix
index 64ead2f75f4..64ead2f75f4 100644
--- a/pkgs/data/themes/onestepback/default.nix
+++ b/nixpkgs/pkgs/data/themes/onestepback/default.nix
diff --git a/pkgs/data/themes/orion/default.nix b/nixpkgs/pkgs/data/themes/orion/default.nix
index 9ba8cd368cf..9ba8cd368cf 100644
--- a/pkgs/data/themes/orion/default.nix
+++ b/nixpkgs/pkgs/data/themes/orion/default.nix
diff --git a/pkgs/data/themes/paper-gtk/default.nix b/nixpkgs/pkgs/data/themes/paper-gtk/default.nix
index e7235a900cf..e7235a900cf 100644
--- a/pkgs/data/themes/paper-gtk/default.nix
+++ b/nixpkgs/pkgs/data/themes/paper-gtk/default.nix
diff --git a/pkgs/data/themes/plano/default.nix b/nixpkgs/pkgs/data/themes/plano/default.nix
index ff1825f6341..ff1825f6341 100644
--- a/pkgs/data/themes/plano/default.nix
+++ b/nixpkgs/pkgs/data/themes/plano/default.nix
diff --git a/pkgs/data/themes/plata/default.nix b/nixpkgs/pkgs/data/themes/plata/default.nix
index 37eb9b7e5bc..37eb9b7e5bc 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/nixpkgs/pkgs/data/themes/plata/default.nix
diff --git a/pkgs/data/themes/pop-gtk/default.nix b/nixpkgs/pkgs/data/themes/pop-gtk/default.nix
index 151fadddc16..151fadddc16 100644
--- a/pkgs/data/themes/pop-gtk/default.nix
+++ b/nixpkgs/pkgs/data/themes/pop-gtk/default.nix
diff --git a/pkgs/data/themes/qogir/default.nix b/nixpkgs/pkgs/data/themes/qogir/default.nix
index 44993c7e2ec..44993c7e2ec 100644
--- a/pkgs/data/themes/qogir/default.nix
+++ b/nixpkgs/pkgs/data/themes/qogir/default.nix
diff --git a/pkgs/data/themes/qtcurve/default.nix b/nixpkgs/pkgs/data/themes/qtcurve/default.nix
index df8e86bf4c1..df8e86bf4c1 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/nixpkgs/pkgs/data/themes/qtcurve/default.nix
diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix
index 171f7010897..171f7010897 100644
--- a/pkgs/data/themes/shades-of-gray/default.nix
+++ b/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix
diff --git a/pkgs/data/themes/sierra/default.nix b/nixpkgs/pkgs/data/themes/sierra/default.nix
index 0c9cef9e097..0c9cef9e097 100644
--- a/pkgs/data/themes/sierra/default.nix
+++ b/nixpkgs/pkgs/data/themes/sierra/default.nix
diff --git a/pkgs/data/themes/solarc/default.nix b/nixpkgs/pkgs/data/themes/solarc/default.nix
index 96843e8d78b..96843e8d78b 100644
--- a/pkgs/data/themes/solarc/default.nix
+++ b/nixpkgs/pkgs/data/themes/solarc/default.nix
diff --git a/pkgs/data/themes/stilo/default.nix b/nixpkgs/pkgs/data/themes/stilo/default.nix
index 798c1b74f95..798c1b74f95 100644
--- a/pkgs/data/themes/stilo/default.nix
+++ b/nixpkgs/pkgs/data/themes/stilo/default.nix
diff --git a/pkgs/data/themes/sweet/default.nix b/nixpkgs/pkgs/data/themes/sweet/default.nix
index 9d3603cbf52..9d3603cbf52 100644
--- a/pkgs/data/themes/sweet/default.nix
+++ b/nixpkgs/pkgs/data/themes/sweet/default.nix
diff --git a/pkgs/data/themes/vertex/default.nix b/nixpkgs/pkgs/data/themes/vertex/default.nix
index 81c681f5371..81c681f5371 100644
--- a/pkgs/data/themes/vertex/default.nix
+++ b/nixpkgs/pkgs/data/themes/vertex/default.nix
diff --git a/pkgs/data/themes/yaru/default.nix b/nixpkgs/pkgs/data/themes/yaru/default.nix
index 2c3686f63d0..2c3686f63d0 100644
--- a/pkgs/data/themes/yaru/default.nix
+++ b/nixpkgs/pkgs/data/themes/yaru/default.nix
diff --git a/pkgs/data/themes/zuki/default.nix b/nixpkgs/pkgs/data/themes/zuki/default.nix
index 45f3862ea63..45f3862ea63 100644
--- a/pkgs/data/themes/zuki/default.nix
+++ b/nixpkgs/pkgs/data/themes/zuki/default.nix
diff --git a/pkgs/desktops/cdesktopenv/default.nix b/nixpkgs/pkgs/desktops/cdesktopenv/default.nix
index 09d53cdd1c5..09d53cdd1c5 100644
--- a/pkgs/desktops/cdesktopenv/default.nix
+++ b/nixpkgs/pkgs/desktops/cdesktopenv/default.nix
diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
index 79c4023152f..79c4023152f 100644
--- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
+++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
index a622e6abfd1..a622e6abfd1 100644
--- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
+++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
index 47242cdf38a..47242cdf38a 100644
--- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
+++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch
index 967ba98eb48..967ba98eb48 100644
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch
+++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
index 1dc58e3c3b5..1dc58e3c3b5 100644
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
+++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
index b03678c5d7a..b03678c5d7a 100644
--- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
+++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix
index 9dbab8fd767..9dbab8fd767 100644
--- a/pkgs/desktops/cinnamon/cjs/default.nix
+++ b/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix
diff --git a/pkgs/desktops/cinnamon/cjs/fix-werror.patch b/nixpkgs/pkgs/desktops/cinnamon/cjs/fix-werror.patch
index 0218eba3b46..0218eba3b46 100644
--- a/pkgs/desktops/cinnamon/cjs/fix-werror.patch
+++ b/nixpkgs/pkgs/desktops/cinnamon/cjs/fix-werror.patch
diff --git a/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix b/nixpkgs/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix
index 87f670c8c09..87f670c8c09 100644
--- a/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix
+++ b/nixpkgs/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/nixpkgs/pkgs/desktops/cinnamon/default.nix
index 44b81e85c68..44b81e85c68 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/nixpkgs/pkgs/desktops/cinnamon/default.nix
diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix
index 419aaf249f7..419aaf249f7 100644
--- a/pkgs/desktops/cinnamon/nemo/default.nix
+++ b/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix
diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix
index dce9d6f666a..dce9d6f666a 100644
--- a/pkgs/desktops/cinnamon/xapps/default.nix
+++ b/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix
diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix
index 9f7b0e478e1..9f7b0e478e1 100644
--- a/pkgs/desktops/deepin/dbus-factory/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix
diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix
index c4082ce454c..c4082ce454c 100644
--- a/pkgs/desktops/deepin/dde-api/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix
diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/nixpkgs/pkgs/desktops/deepin/dde-api/deps.nix
index 5ebe1f6af95..5ebe1f6af95 100644
--- a/pkgs/desktops/deepin/dde-api/deps.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-api/deps.nix
diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-calendar/default.nix
index 5460a932962..5460a932962 100644
--- a/pkgs/desktops/deepin/dde-calendar/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-calendar/default.nix
diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-control-center/default.nix
index a644da2e9a9..a644da2e9a9 100644
--- a/pkgs/desktops/deepin/dde-control-center/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-control-center/default.nix
diff --git a/pkgs/desktops/deepin/dde-control-center/fix-paths.patch b/nixpkgs/pkgs/desktops/deepin/dde-control-center/fix-paths.patch
index 2c6e204d343..2c6e204d343 100644
--- a/pkgs/desktops/deepin/dde-control-center/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/deepin/dde-control-center/fix-paths.patch
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix
index b5460029f78..b5460029f78 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix
diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/nixpkgs/pkgs/desktops/deepin/dde-daemon/deps.nix
index bcc5ab81808..bcc5ab81808 100644
--- a/pkgs/desktops/deepin/dde-daemon/deps.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-daemon/deps.nix
diff --git a/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch b/nixpkgs/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch
index 87b76045b43..87b76045b43 100644
--- a/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch
+++ b/nixpkgs/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch
diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-dock/default.nix
index 62d5622340c..62d5622340c 100644
--- a/pkgs/desktops/deepin/dde-dock/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-dock/default.nix
diff --git a/pkgs/desktops/deepin/dde-dock/wrapper.nix b/nixpkgs/pkgs/desktops/deepin/dde-dock/wrapper.nix
index 8f6d8a67b1a..8f6d8a67b1a 100644
--- a/pkgs/desktops/deepin/dde-dock/wrapper.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-dock/wrapper.nix
diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch
index 253a67b04ec..253a67b04ec 100644
--- a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch
+++ b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch
diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch
index 3ced15e7e5a..3ced15e7e5a 100644
--- a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch
diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch
index 582760e6db2..582760e6db2 100644
--- a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch
+++ b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch
diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/default.nix
index 62931dfcd81..62931dfcd81 100644
--- a/pkgs/desktops/deepin/dde-file-manager/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/default.nix
diff --git a/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch b/nixpkgs/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch
index 707eb207409..707eb207409 100644
--- a/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch
+++ b/nixpkgs/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch
diff --git a/pkgs/desktops/deepin/dde-kwin/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-kwin/default.nix
index 850186953f6..850186953f6 100644
--- a/pkgs/desktops/deepin/dde-kwin/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-kwin/default.nix
diff --git a/pkgs/desktops/deepin/dde-kwin/fix-paths.patch b/nixpkgs/pkgs/desktops/deepin/dde-kwin/fix-paths.patch
index 1bf576e5c1a..1bf576e5c1a 100644
--- a/pkgs/desktops/deepin/dde-kwin/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/deepin/dde-kwin/fix-paths.patch
diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-launcher/default.nix
index eae074381f3..eae074381f3 100644
--- a/pkgs/desktops/deepin/dde-launcher/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-launcher/default.nix
diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-network-utils/default.nix
index 778481fc651..778481fc651 100644
--- a/pkgs/desktops/deepin/dde-network-utils/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-network-utils/default.nix
diff --git a/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch b/nixpkgs/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch
index 9f7ecd423c5..9f7ecd423c5 100644
--- a/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch
diff --git a/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch b/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch
index a6941e975eb..a6941e975eb 100644
--- a/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch
+++ b/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch
diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix
index 7aaddf53872..7aaddf53872 100644
--- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix
diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
index ba237bcf755..ba237bcf755 100644
--- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-session-ui/default.nix
index a664defae56..a664defae56 100644
--- a/pkgs/desktops/deepin/dde-session-ui/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dde-session-ui/default.nix
diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix
index 184153a3981..184153a3981 100644
--- a/pkgs/desktops/deepin/deepin-anything/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix
diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-calculator/default.nix
index 26f2b99612e..26f2b99612e 100644
--- a/pkgs/desktops/deepin/deepin-calculator/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-calculator/default.nix
diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-base/default.nix
index 0ca42a88761..0ca42a88761 100644
--- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-base/default.nix
diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
index 579ceb442be..579ceb442be 100644
--- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
diff --git a/pkgs/desktops/deepin/deepin-editor/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-editor/default.nix
index 0aea9558ec0..0aea9558ec0 100644
--- a/pkgs/desktops/deepin/deepin-editor/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-editor/default.nix
diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
index 915cb8c6ac7..915cb8c6ac7 100644
--- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index 7c10e873209..7c10e873209 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix
index b6b9feb410b..b6b9feb410b 100644
--- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix
diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-image-viewer/default.nix
index aa13eb76055..aa13eb76055 100644
--- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-image-viewer/default.nix
diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-menu/default.nix
index b23a7491aaf..b23a7491aaf 100644
--- a/pkgs/desktops/deepin/deepin-menu/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-menu/default.nix
diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
index b3930c8e399..b3930c8e399 100644
--- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix
index 374af8be2be..374af8be2be 100644
--- a/pkgs/desktops/deepin/deepin-screenshot/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix
diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
index a8d143ff8b0..a8d143ff8b0 100644
--- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix
index 378945ac1dd..378945ac1dd 100644
--- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-terminal/default.nix
index 049c856419d..049c856419d 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-terminal/default.nix
diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-turbo/default.nix
index 3aa6003592b..3aa6003592b 100644
--- a/pkgs/desktops/deepin/deepin-turbo/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-turbo/default.nix
diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-wallpapers/default.nix
index 6baee0eda11..6baee0eda11 100644
--- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-wallpapers/default.nix
diff --git a/pkgs/desktops/deepin/default.nix b/nixpkgs/pkgs/desktops/deepin/default.nix
index 64dbdbfd104..64dbdbfd104 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/default.nix
diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/nixpkgs/pkgs/desktops/deepin/disomaster/default.nix
index 3ce2adba098..3ce2adba098 100644
--- a/pkgs/desktops/deepin/disomaster/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/disomaster/default.nix
diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/nixpkgs/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
index ed01cd92c7c..ed01cd92c7c 100644
--- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/nixpkgs/pkgs/desktops/deepin/dtkcore/default.nix
index 8ae1c6f0952..8ae1c6f0952 100644
--- a/pkgs/desktops/deepin/dtkcore/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dtkcore/default.nix
diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/nixpkgs/pkgs/desktops/deepin/dtkwidget/default.nix
index 751fe02562f..751fe02562f 100644
--- a/pkgs/desktops/deepin/dtkwidget/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dtkwidget/default.nix
diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/nixpkgs/pkgs/desktops/deepin/dtkwm/default.nix
index ead96fe2533..ead96fe2533 100644
--- a/pkgs/desktops/deepin/dtkwm/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/dtkwm/default.nix
diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix
index 0b7c6cfdc91..0b7c6cfdc91 100644
--- a/pkgs/desktops/deepin/go-dbus-factory/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix
diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix
index fed8b6f2c6a..fed8b6f2c6a 100644
--- a/pkgs/desktops/deepin/go-dbus-generator/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix
diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix
index 5a10efa1932..5a10efa1932 100644
--- a/pkgs/desktops/deepin/go-gir-generator/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix
diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix
index 730412a58f3..730412a58f3 100644
--- a/pkgs/desktops/deepin/go-lib/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix
diff --git a/pkgs/desktops/deepin/qcef/default.nix b/nixpkgs/pkgs/desktops/deepin/qcef/default.nix
index 38ca4f3b676..38ca4f3b676 100644
--- a/pkgs/desktops/deepin/qcef/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/qcef/default.nix
diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
index 6b1f212716c..6b1f212716c 100644
--- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix
index 5de46f8a1dd..5de46f8a1dd 100644
--- a/pkgs/desktops/deepin/qt5integration/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix
diff --git a/pkgs/desktops/deepin/setup-hook.sh b/nixpkgs/pkgs/desktops/deepin/setup-hook.sh
index ce1d7330a22..ce1d7330a22 100755
--- a/pkgs/desktops/deepin/setup-hook.sh
+++ b/nixpkgs/pkgs/desktops/deepin/setup-hook.sh
diff --git a/pkgs/desktops/deepin/startdde/default.nix b/nixpkgs/pkgs/desktops/deepin/startdde/default.nix
index 137b3f690a6..137b3f690a6 100644
--- a/pkgs/desktops/deepin/startdde/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/startdde/default.nix
diff --git a/pkgs/desktops/deepin/startdde/deps.nix b/nixpkgs/pkgs/desktops/deepin/startdde/deps.nix
index 8898b8c50fb..8898b8c50fb 100644
--- a/pkgs/desktops/deepin/startdde/deps.nix
+++ b/nixpkgs/pkgs/desktops/deepin/startdde/deps.nix
diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix
index 7972d8f9a3f..7972d8f9a3f 100644
--- a/pkgs/desktops/deepin/udisks2-qt5/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix
diff --git a/pkgs/desktops/deepin/update.nix b/nixpkgs/pkgs/desktops/deepin/update.nix
index 089d9289827..089d9289827 100644
--- a/pkgs/desktops/deepin/update.nix
+++ b/nixpkgs/pkgs/desktops/deepin/update.nix
diff --git a/pkgs/desktops/enlightenment/default.nix b/nixpkgs/pkgs/desktops/enlightenment/default.nix
index 2739b9a2517..2739b9a2517 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/nixpkgs/pkgs/desktops/enlightenment/default.nix
diff --git a/pkgs/desktops/enlightenment/econnman.nix b/nixpkgs/pkgs/desktops/enlightenment/econnman.nix
index 9aca09a510a..9aca09a510a 100644
--- a/pkgs/desktops/enlightenment/econnman.nix
+++ b/nixpkgs/pkgs/desktops/enlightenment/econnman.nix
diff --git a/pkgs/desktops/enlightenment/efl-elua.patch b/nixpkgs/pkgs/desktops/enlightenment/efl-elua.patch
index 96c42b3ff3c..96c42b3ff3c 100644
--- a/pkgs/desktops/enlightenment/efl-elua.patch
+++ b/nixpkgs/pkgs/desktops/enlightenment/efl-elua.patch
diff --git a/pkgs/desktops/enlightenment/efl.nix b/nixpkgs/pkgs/desktops/enlightenment/efl.nix
index b4b271fb38f..b4b271fb38f 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/nixpkgs/pkgs/desktops/enlightenment/efl.nix
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix
index 0fb249135a2..0fb249135a2 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix
diff --git a/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch b/nixpkgs/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch
index f53f6ffa7ca..f53f6ffa7ca 100644
--- a/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch
+++ b/nixpkgs/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch
diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/nixpkgs/pkgs/desktops/enlightenment/ephoto.nix
index b00b3d7a846..b00b3d7a846 100644
--- a/pkgs/desktops/enlightenment/ephoto.nix
+++ b/nixpkgs/pkgs/desktops/enlightenment/ephoto.nix
diff --git a/pkgs/desktops/enlightenment/rage.nix b/nixpkgs/pkgs/desktops/enlightenment/rage.nix
index f0a9799e5b4..f0a9799e5b4 100644
--- a/pkgs/desktops/enlightenment/rage.nix
+++ b/nixpkgs/pkgs/desktops/enlightenment/rage.nix
diff --git a/pkgs/desktops/enlightenment/terminology.nix b/nixpkgs/pkgs/desktops/enlightenment/terminology.nix
index ee140e09150..ee140e09150 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/nixpkgs/pkgs/desktops/enlightenment/terminology.nix
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/nixpkgs/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
index 7d8365337aa..7d8365337aa 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/nixpkgs/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
index 37bd631adbc..37bd631adbc 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/nixpkgs/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
index 177a9f47c31..177a9f47c31 100644
--- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
diff --git a/pkgs/desktops/gnome-2/default.nix b/nixpkgs/pkgs/desktops/gnome-2/default.nix
index d0a7a890355..d0a7a890355 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/default.nix
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/nixpkgs/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
index 0f2a98c61f6..0f2a98c61f6 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 87d2931d274..87d2931d274 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/nixpkgs/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index c12d50d792f..c12d50d792f 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch b/nixpkgs/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch
index e246a8cc938..e246a8cc938 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch
+++ b/nixpkgs/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch
diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/nixpkgs/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
index 7c713cb9122..7c713cb9122 100644
--- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
diff --git a/pkgs/desktops/gnome-2/desktop/vte/alt.patch b/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/alt.patch
index 65c3ddf1fcf..65c3ddf1fcf 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/alt.patch
+++ b/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/alt.patch
diff --git a/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch b/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch
index 9e3e83b1262..9e3e83b1262 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch
+++ b/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/default.nix
index 606ba93d3fc..606ba93d3fc 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/GConf/default.nix
index f13ff571242..f13ff571242 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/GConf/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
index ef18f0783ce..ef18f0783ce 100644
--- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
index 54a2bd526a9..54a2bd526a9 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
index c3aee9024a2..c3aee9024a2 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index 7196840978f..7196840978f 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
index 522c5ce6b06..522c5ce6b06 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch b/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch
index 1d9a179d236..1d9a179d236 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
index 33c2abef0fa..33c2abef0fa 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
index 3c89f9ff0fc..3c89f9ff0fc 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libIDL/default.nix
index 1fc78002606..1fc78002606 100644
--- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libIDL/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
index 7b1ccb97dc4..7b1ccb97dc4 100644
--- a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
index bf0cec8dfbe..bf0cec8dfbe 100644
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
index 0be9d7acb9c..0be9d7acb9c 100644
--- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libglade/default.nix
index d51cccf7906..d51cccf7906 100644
--- a/pkgs/desktops/gnome-2/platform/libglade/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libglade/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index 42f47bc5a83..42f47bc5a83 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnome/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch
index ceabfbdd158..ceabfbdd158 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
index 72928d82037..72928d82037 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
index d2539889fdb..d2539889fdb 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch
index 68f379c2510..68f379c2510 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
index ee0282147de..ee0282147de 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch
index 3f73af861c0..3f73af861c0 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/bug653388.patch b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomeprint/bug653388.patch
index 468f8e287a7..468f8e287a7 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprint/bug653388.patch
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomeprint/bug653388.patch
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
index 44c4469c565..44c4469c565 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
index 215c9eb3e5e..215c9eb3e5e 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
index 838e5133745..838e5133745 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
index cf34c7e7c68..cf34c7e7c68 100644
--- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index 8fd4a092376..8fd4a092376 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix
index b3bb1e1093c..b3bb1e1093c 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix
index a8c5d93b88d..a8c5d93b88d 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 387f0ebdc44..387f0ebdc44 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 6ea04910d23..6ea04910d23 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/ghex/default.nix
index 0998dbd069d..0998dbd069d 100644
--- a/pkgs/desktops/gnome-3/apps/ghex/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/ghex/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix
index 84d1a8a76ba..84d1a8a76ba 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
index 628442c3075..628442c3075 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 1fecf80e9ae..1fecf80e9ae 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index b00045cf9e9..b00045cf9e9 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 9e44573d2e3..9e44573d2e3 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index a99e775b26b..a99e775b26b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 5aa39e09cd6..5aa39e09cd6 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index f5261011d11..f5261011d11 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index c80238740e5..c80238740e5 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 784b0142f46..784b0142f46 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 9926672aa4b..9926672aa4b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
index 37401af3ce6..37401af3ce6 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index 7137ec7180e..7137ec7180e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
index fd47f54eb89..fd47f54eb89 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
index 3996a2e7564..3996a2e7564 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
index f5c4eedc48d..f5c4eedc48d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index c71baa146d1..c71baa146d1 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix
index 02b476c2eea..02b476c2eea 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 315968fde65..315968fde65 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index c5377157ef0..c5377157ef0 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 4900717898f..4900717898f 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix
index 5817d8ff942..5817d8ff942 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix
diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/caribou/default.nix
index bad06bae405..bad06bae405 100644
--- a/pkgs/desktops/gnome-3/core/caribou/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/caribou/default.nix
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 93d22a99e15..93d22a99e15 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/empathy/default.nix
index 06777252462..06777252462 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/empathy/default.nix
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix
index 80ef1f4659f..80ef1f4659f 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 46f0f4191df..46f0f4191df 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix
index bab84eeb78c..bab84eeb78c 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index d0273f0fac1..d0273f0fac1 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch
index 33423551659..33423551659 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch
index c499bac4552..c499bac4552 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix
index ba660a64418..ba660a64418 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
index 6b5bd6152bd..6b5bd6152bd 100644
--- a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch
index 401b6aea0c2..401b6aea0c2 100644
--- a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch
diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch
index 66071aa4af8..66071aa4af8 100644
--- a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch
diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch
index 58481f0730f..58481f0730f 100644
--- a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch
diff --git a/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override
index 8c17f494b0f..8c17f494b0f 100644
--- a/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override
diff --git a/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch
index 61defd9c4bc..61defd9c4bc 100644
--- a/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index 4b91b3219be..4b91b3219be 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index b52161f90ae..b52161f90ae 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index cabe7c9ca74..cabe7c9ca74 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
index 200d038d0fb..200d038d0fb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-common/default.nix
index f2eb65e50bb..f2eb65e50bb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-common/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index d2375b5341b..d2375b5341b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index d2346958303..d2346958303 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
index 97d8f0bee68..97d8f0bee68 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
index 57eb4b3d44a..57eb4b3d44a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 6e777636747..6e777636747 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
index 98398311882..98398311882 100644
--- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 86739bb0f45..86739bb0f45 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 0589dfe7285..0589dfe7285 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
index 4423755f71c..4423755f71c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch
index 94e14f688b3..94e14f688b3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf
index a06b37e100e..a06b37e100e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index fa960087f9b..fa960087f9b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index b21e3f6f68a..b21e3f6f68a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
index fd507acc009..fd507acc009 100644
--- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index 34ff8793224..34ff8793224 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 3df78b88090..3df78b88090 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
index 2399c656016..2399c656016 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index c388c4f7211..c388c4f7211 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
index 2229302cab7..2229302cab7 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch
index 8f3951af2da..8f3951af2da 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index 44c9e3eff44..44c9e3eff44 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch
index 555664e8ae2..555664e8ae2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index c4fec93079a..c4fec93079a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
index 7b93475619b..7b93475619b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 051f0e4b432..051f0e4b432 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch
index 6f443a8a43e..6f443a8a43e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index a9f8367a548..a9f8367a548 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 31f125e9720..31f125e9720 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
index 5cd8f249481..5cd8f249481 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 6207dd42a61..6207dd42a61 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index ce5e073ac06..ce5e073ac06 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix
diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
index bc0f5683a75..bc0f5683a75 100644
--- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
index 0e1c33773b0..0e1c33773b0 100644
--- a/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
index 2df70ff9646..2df70ff9646 100644
--- a/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index 85208163415..85208163415 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.28.nix
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix
index 642a825d539..642a825d539 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix
diff --git a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch
index 574ed572561..574ed572561 100644
--- a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch
index 6c40624a55d..6c40624a55d 100644
--- a/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch
index 6ac0a431f61..6ac0a431f61 100644
--- a/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch
index 96e27559828..96e27559828 100644
--- a/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix
index e55bf19f528..e55bf19f528 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix
diff --git a/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch b/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch
index e1313999675..e1313999675 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch
diff --git a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch b/nixpkgs/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch
index 4259f93eb24..4259f93eb24 100644
--- a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch
diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix
index 415974d0c2b..415974d0c2b 100644
--- a/pkgs/desktops/gnome-3/core/rygel/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 8d737b22a7a..8d737b22a7a 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix
index 2d6d398fb45..2d6d398fb45 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix
index 50e30d2717e..50e30d2717e 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/vino/default.nix
index abfe8b2e039..abfe8b2e039 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/vino/default.nix
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 34f6accdd5f..34f6accdd5f 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix
index 438c71c4ad3..438c71c4ad3 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix
index 16ef06d8d9d..16ef06d8d9d 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix
diff --git a/pkgs/desktops/gnome-3/default.nix b/nixpkgs/pkgs/desktops/gnome-3/default.nix
index c7c26cec7c3..c7c26cec7c3 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/default.nix
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/nixpkgs/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index 4f5562bbffa..4f5562bbffa 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 080a332d7df..080a332d7df 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index 81f63941729..81f63941729 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index 910007bc05b..910007bc05b 100644
--- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
index f85b91d354d..f85b91d354d 100644
--- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch b/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch
index 7f6b8489ea8..7f6b8489ea8 100644
--- a/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch
diff --git a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
index b7bde83915c..b7bde83915c 100644
--- a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
index 1761887f8fb..1761887f8fb 100644
--- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
index f04999a449c..f04999a449c 100644
--- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
index 5277cb08cbb..5277cb08cbb 100644
--- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index 6ac82c539a2..6ac82c539a2 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
index 33261472487..33261472487 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
index 4e7fa17d495..4e7fa17d495 100644
--- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch b/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch
index 3544c91ee89..3544c91ee89 100644
--- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index 08011ab5c72..08011ab5c72 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
index 629d34b6f68..629d34b6f68 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
index 8bfd681625f..8bfd681625f 100644
--- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience.nix
index b36f3489b57..b36f3489b57 100644
--- a/pkgs/desktops/gnome-3/extensions/impatience.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience.nix
diff --git a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix
index dca346c6cce..dca346c6cce 100644
--- a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
index 8d3a775e949..8d3a775e949 100644
--- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
index f9f72bd77f0..f9f72bd77f0 100644
--- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch
index 9a53d63860d..9a53d63860d 100644
--- a/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
index cffe96894cc..cffe96894cc 100644
--- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
index fbbd56f1c0f..fbbd56f1c0f 100644
--- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
index a5f94288ae5..a5f94288ae5 100644
--- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 13b2d6a1db4..13b2d6a1db4 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch
index 82e3d7c541b..82e3d7c541b 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch
diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
index 1e44cd4de5c..1e44cd4de5c 100644
--- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch
index 2ea54f4b089..2ea54f4b089 100644
--- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix
index 22f857a7809..22f857a7809 100644
--- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix
index 04e98d51b0c..04e98d51b0c 100644
--- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
index f0f6279fe2e..f0f6279fe2e 100644
--- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
index 072d31b84fe..072d31b84fe 100644
--- a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
diff --git a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix
index 7d5de1062b1..7d5de1062b1 100644
--- a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
index ca4b72111c6..ca4b72111c6 100644
--- a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/nixpkgs/pkgs/desktops/gnome-3/find-latest-version.py
index b0359f79969..b0359f79969 100644
--- a/pkgs/desktops/gnome-3/find-latest-version.py
+++ b/nixpkgs/pkgs/desktops/gnome-3/find-latest-version.py
diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index 474c49fb584..474c49fb584 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/aisleriot/default.nix
diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/atomix/default.nix
index ec9895b3bf5..ec9895b3bf5 100644
--- a/pkgs/desktops/gnome-3/games/atomix/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/atomix/default.nix
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index b4c6eaaec1b..b4c6eaaec1b 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 078b5051c84..078b5051c84 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index 72c4bdf1d29..72c4bdf1d29 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index 5b2b797e362..5b2b797e362 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index aa7824a0317..aa7824a0317 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index 8c620fdd0d1..8c620fdd0d1 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index 94bc8a56b39..94bc8a56b39 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 484110cfaa9..484110cfaa9 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index 53cd073af34..53cd073af34 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 00f138ee762..00f138ee762 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index 1337a810807..1337a810807 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix
index cf83527432f..cf83527432f 100644
--- a/pkgs/desktops/gnome-3/games/hitori/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix
index 9f1b52990ca..9f1b52990ca 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 0a236d0425a..0a236d0425a 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix
diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index 2ac4c4c96f7..2ac4c4c96f7 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index 02a61d46c73..02a61d46c73 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/swell-foop/default.nix
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix
index f196ada3850..f196ada3850 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix
diff --git a/pkgs/desktops/gnome-3/installer.nix b/nixpkgs/pkgs/desktops/gnome-3/installer.nix
index 4999e1f3343..4999e1f3343 100644
--- a/pkgs/desktops/gnome-3/installer.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/installer.nix
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix
index 07319337a9a..07319337a9a 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix
index d5617ee493d..d5617ee493d 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
index fff328c608d..fff328c608d 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index 8f1d193a6d3..8f1d193a6d3 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index c1791ee5bbd..c1791ee5bbd 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index ce6d943c39f..ce6d943c39f 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
index 423a393eb77..423a393eb77 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix
index 4a530e54de7..4a530e54de7 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch
index 81e037ee690..81e037ee690 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index f40911577c1..f40911577c1 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index 00e21e30a29..00e21e30a29 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch
index c8a3fad2272..c8a3fad2272 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
index a607a6eb6a0..a607a6eb6a0 100644
--- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
index d591fb6033d..d591fb6033d 100644
--- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/default.nix
index 8355051fa85..8355051fa85 100644
--- a/pkgs/desktops/gnome-3/misc/metacity/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch
index ff3a244e67d..ff3a244e67d 100644
--- a/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix
index 4c2a551b1c7..4c2a551b1c7 100644
--- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index 1dbd9ce5bfe..1dbd9ce5bfe 100644
--- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
diff --git a/pkgs/desktops/gnome-3/update.nix b/nixpkgs/pkgs/desktops/gnome-3/update.nix
index f42b6723950..f42b6723950 100644
--- a/pkgs/desktops/gnome-3/update.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/update.nix
diff --git a/pkgs/desktops/gnustep/back/default.nix b/nixpkgs/pkgs/desktops/gnustep/back/default.nix
index 54ea8dcf487..54ea8dcf487 100644
--- a/pkgs/desktops/gnustep/back/default.nix
+++ b/nixpkgs/pkgs/desktops/gnustep/back/default.nix
diff --git a/pkgs/desktops/gnustep/base/default.nix b/nixpkgs/pkgs/desktops/gnustep/base/default.nix
index 87cded31e5f..87cded31e5f 100644
--- a/pkgs/desktops/gnustep/base/default.nix
+++ b/nixpkgs/pkgs/desktops/gnustep/base/default.nix
diff --git a/pkgs/desktops/gnustep/base/fixup-paths.patch b/nixpkgs/pkgs/desktops/gnustep/base/fixup-paths.patch
index fa28412dbf6..fa28412dbf6 100644
--- a/pkgs/desktops/gnustep/base/fixup-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnustep/base/fixup-paths.patch
diff --git a/pkgs/desktops/gnustep/default.nix b/nixpkgs/pkgs/desktops/gnustep/default.nix
index 4f7c13e8e4a..4f7c13e8e4a 100644
--- a/pkgs/desktops/gnustep/default.nix
+++ b/nixpkgs/pkgs/desktops/gnustep/default.nix
diff --git a/pkgs/desktops/gnustep/gorm/default.nix b/nixpkgs/pkgs/desktops/gnustep/gorm/default.nix
index c977c61dd09..c977c61dd09 100644
--- a/pkgs/desktops/gnustep/gorm/default.nix
+++ b/nixpkgs/pkgs/desktops/gnustep/gorm/default.nix
diff --git a/pkgs/desktops/gnustep/gui/default.nix b/nixpkgs/pkgs/desktops/gnustep/gui/default.nix
index 72d109b6979..72d109b6979 100644
--- a/pkgs/desktops/gnustep/gui/default.nix
+++ b/nixpkgs/pkgs/desktops/gnustep/gui/default.nix
diff --git a/pkgs/desktops/gnustep/gui/fixup-all.patch b/nixpkgs/pkgs/desktops/gnustep/gui/fixup-all.patch
index 4b412db409a..4b412db409a 100644
--- a/pkgs/desktops/gnustep/gui/fixup-all.patch
+++ b/nixpkgs/pkgs/desktops/gnustep/gui/fixup-all.patch
diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/nixpkgs/pkgs/desktops/gnustep/gworkspace/default.nix
index d5018a4350f..d5018a4350f 100644
--- a/pkgs/desktops/gnustep/gworkspace/default.nix
+++ b/nixpkgs/pkgs/desktops/gnustep/gworkspace/default.nix
diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix
index b058bd87989..b058bd87989 100644
--- a/pkgs/desktops/gnustep/libobjc2/default.nix
+++ b/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix
diff --git a/pkgs/desktops/gnustep/make/GNUstep.conf b/nixpkgs/pkgs/desktops/gnustep/make/GNUstep.conf
index f4e0e3b8162..f4e0e3b8162 100644
--- a/pkgs/desktops/gnustep/make/GNUstep.conf
+++ b/nixpkgs/pkgs/desktops/gnustep/make/GNUstep.conf
diff --git a/pkgs/desktops/gnustep/make/builder.sh b/nixpkgs/pkgs/desktops/gnustep/make/builder.sh
index 66afe1271ca..66afe1271ca 100644
--- a/pkgs/desktops/gnustep/make/builder.sh
+++ b/nixpkgs/pkgs/desktops/gnustep/make/builder.sh
diff --git a/pkgs/desktops/gnustep/make/default.nix b/nixpkgs/pkgs/desktops/gnustep/make/default.nix
index 64e9332a306..64e9332a306 100644
--- a/pkgs/desktops/gnustep/make/default.nix
+++ b/nixpkgs/pkgs/desktops/gnustep/make/default.nix
diff --git a/pkgs/desktops/gnustep/make/fixup-paths.patch b/nixpkgs/pkgs/desktops/gnustep/make/fixup-paths.patch
index b5eb093ad96..b5eb093ad96 100644
--- a/pkgs/desktops/gnustep/make/fixup-paths.patch
+++ b/nixpkgs/pkgs/desktops/gnustep/make/fixup-paths.patch
diff --git a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/nixpkgs/pkgs/desktops/gnustep/make/gsmakeDerivation.nix
index 7bb287c3fa5..7bb287c3fa5 100644
--- a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix
+++ b/nixpkgs/pkgs/desktops/gnustep/make/gsmakeDerivation.nix
diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/nixpkgs/pkgs/desktops/gnustep/make/setup-hook.sh
index b2b90f1e522..b2b90f1e522 100644
--- a/pkgs/desktops/gnustep/make/setup-hook.sh
+++ b/nixpkgs/pkgs/desktops/gnustep/make/setup-hook.sh
diff --git a/pkgs/desktops/gnustep/make/wrapper.sh b/nixpkgs/pkgs/desktops/gnustep/make/wrapper.sh
index 1bc2e130d88..1bc2e130d88 100644
--- a/pkgs/desktops/gnustep/make/wrapper.sh
+++ b/nixpkgs/pkgs/desktops/gnustep/make/wrapper.sh
diff --git a/pkgs/desktops/gnustep/projectcenter/default.nix b/nixpkgs/pkgs/desktops/gnustep/projectcenter/default.nix
index abfdac1e7af..abfdac1e7af 100644
--- a/pkgs/desktops/gnustep/projectcenter/default.nix
+++ b/nixpkgs/pkgs/desktops/gnustep/projectcenter/default.nix
diff --git a/pkgs/desktops/gnustep/systempreferences/default.nix b/nixpkgs/pkgs/desktops/gnustep/systempreferences/default.nix
index 096520f08f3..096520f08f3 100644
--- a/pkgs/desktops/gnustep/systempreferences/default.nix
+++ b/nixpkgs/pkgs/desktops/gnustep/systempreferences/default.nix
diff --git a/pkgs/desktops/lumina/default.nix b/nixpkgs/pkgs/desktops/lumina/default.nix
index 10e75eea38f..10e75eea38f 100644
--- a/pkgs/desktops/lumina/default.nix
+++ b/nixpkgs/pkgs/desktops/lumina/default.nix
diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix
index 70e0f2e3511..70e0f2e3511 100644
--- a/pkgs/desktops/lumina/lumina-calculator/default.nix
+++ b/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix
diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix
index 62d59d18cc5..62d59d18cc5 100644
--- a/pkgs/desktops/lumina/lumina-pdf/default.nix
+++ b/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix
diff --git a/pkgs/desktops/lumina/lumina/LuminaOS-NixOS.cpp.patch b/nixpkgs/pkgs/desktops/lumina/lumina/LuminaOS-NixOS.cpp.patch
index 6ddd9c76591..6ddd9c76591 100644
--- a/pkgs/desktops/lumina/lumina/LuminaOS-NixOS.cpp.patch
+++ b/nixpkgs/pkgs/desktops/lumina/lumina/LuminaOS-NixOS.cpp.patch
diff --git a/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch b/nixpkgs/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch
index f5ef6cba41f..f5ef6cba41f 100644
--- a/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch
+++ b/nixpkgs/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch
diff --git a/pkgs/desktops/lumina/lumina/default.nix b/nixpkgs/pkgs/desktops/lumina/lumina/default.nix
index c758fc38a1b..c758fc38a1b 100644
--- a/pkgs/desktops/lumina/lumina/default.nix
+++ b/nixpkgs/pkgs/desktops/lumina/lumina/default.nix
diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix
index c06a99eb36c..c06a99eb36c 100644
--- a/pkgs/desktops/lxde/core/lxappearance/default.nix
+++ b/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix
diff --git a/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch b/nixpkgs/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch
index a63882aa2a7..a63882aa2a7 100644
--- a/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch
+++ b/nixpkgs/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch
diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/nixpkgs/pkgs/desktops/lxde/core/lxmenu-data.nix
index 550e98c9dcc..550e98c9dcc 100644
--- a/pkgs/desktops/lxde/core/lxmenu-data.nix
+++ b/nixpkgs/pkgs/desktops/lxde/core/lxmenu-data.nix
diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix
index a24a33c2e76..a24a33c2e76 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix
diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix
index 0866fd104d2..0866fd104d2 100644
--- a/pkgs/desktops/lxde/core/lxrandr/default.nix
+++ b/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix
diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix
index 0646078d825..0646078d825 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix
diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix
index e639996f7c6..e639996f7c6 100644
--- a/pkgs/desktops/lxqt/compton-conf/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix
diff --git a/pkgs/desktops/lxqt/default.nix b/nixpkgs/pkgs/desktops/lxqt/default.nix
index 6b03c2a6c9e..6b03c2a6c9e 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/default.nix
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix
index 39cece7724e..39cece7724e 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix
index f5ab9c9ae8e..f5ab9c9ae8e 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix
diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix
index 5f7485fc63b..5f7485fc63b 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix
diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix
index dc2ce54d6ae..dc2ce54d6ae 100644
--- a/pkgs/desktops/lxqt/libsysstat/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix
index 33e6a1f99e5..33e6a1f99e5 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix
index 5fa074120ff..5fa074120ff 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix
index 9f0b22bf6cc..9f0b22bf6cc 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index 205ea2fd201..205ea2fd201 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/LXQtConfigVars.cmake b/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/LXQtConfigVars.cmake
index fd7ef927f8b..fd7ef927f8b 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/LXQtConfigVars.cmake
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/LXQtConfigVars.cmake
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index 626c99fcf9c..626c99fcf9c 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh b/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh
index e40765116e9..e40765116e9 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix
index d34c419ae66..d34c419ae66 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index 9f844b4676b..9f844b4676b 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index af64f523d48..af64f523d48 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index 5f270b8efc9..5f270b8efc9 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 8310ae95f09..8310ae95f09 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index a64d682bf1c..a64d682bf1c 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index d415cb618cc..d415cb618cc 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index a67efaee37a..a67efaee37a 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix
index db05d803891..db05d803891 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix
index 458a5080bcf..458a5080bcf 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index c0e7443d3dd..c0e7443d3dd 100644
--- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix
diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix
index f4648188140..f4648188140 100644
--- a/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix
diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix
index 1333d027fca..1333d027fca 100644
--- a/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix
diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index 7b7d7290320..7b7d7290320 100644
--- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 168b7f35ad2..168b7f35ad2 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix
index df717debbae..df717debbae 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix
diff --git a/pkgs/desktops/lxqt/qps/default.nix b/nixpkgs/pkgs/desktops/lxqt/qps/default.nix
index cb8e5b2569c..cb8e5b2569c 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/qps/default.nix
diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix
index 10f525eb9e6..10f525eb9e6 100644
--- a/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix
diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix
index e61360f6a3b..e61360f6a3b 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix
index 7eff539091f..7eff539091f 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix
diff --git a/pkgs/desktops/lxqt/update.sh b/nixpkgs/pkgs/desktops/lxqt/update.sh
index 47d3dfb3d5f..47d3dfb3d5f 100755
--- a/pkgs/desktops/lxqt/update.sh
+++ b/nixpkgs/pkgs/desktops/lxqt/update.sh
diff --git a/pkgs/desktops/mate/atril/default.nix b/nixpkgs/pkgs/desktops/mate/atril/default.nix
index ecb9ea2e377..ecb9ea2e377 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/atril/default.nix
diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix
index 820b1e905ec..820b1e905ec 100644
--- a/pkgs/desktops/mate/caja-dropbox/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix
diff --git a/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch b/nixpkgs/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch
index de591f493f6..de591f493f6 100644
--- a/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch
+++ b/nixpkgs/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch
diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix
index 10595bbbaec..10595bbbaec 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix
diff --git a/pkgs/desktops/mate/caja-with-extensions/default.nix b/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix
index 35e3cd198f6..35e3cd198f6 100644
--- a/pkgs/desktops/mate/caja-with-extensions/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix
diff --git a/pkgs/desktops/mate/caja/caja-extension-dirs.patch b/nixpkgs/pkgs/desktops/mate/caja/caja-extension-dirs.patch
index 7490a368efd..7490a368efd 100644
--- a/pkgs/desktops/mate/caja/caja-extension-dirs.patch
+++ b/nixpkgs/pkgs/desktops/mate/caja/caja-extension-dirs.patch
diff --git a/pkgs/desktops/mate/caja/default.nix b/nixpkgs/pkgs/desktops/mate/caja/default.nix
index c460a2cf2dc..c460a2cf2dc 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/caja/default.nix
diff --git a/pkgs/desktops/mate/default.nix b/nixpkgs/pkgs/desktops/mate/default.nix
index 3970b2b2921..3970b2b2921 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/default.nix
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix
index 9569b1919e4..9569b1919e4 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix
diff --git a/pkgs/desktops/mate/eom/default.nix b/nixpkgs/pkgs/desktops/mate/eom/default.nix
index 457a9e56c5d..457a9e56c5d 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/eom/default.nix
diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix
index 6364b89204a..6364b89204a 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix
diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix
index 9c2dc412d4d..9c2dc412d4d 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix
index 0c14cdb96b5..0c14cdb96b5 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix
diff --git a/pkgs/desktops/mate/marco/default.nix b/nixpkgs/pkgs/desktops/mate/marco/default.nix
index fd551c0cc78..fd551c0cc78 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/marco/default.nix
diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix
index 3b5a4ccf2a2..3b5a4ccf2a2 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix
diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix
index 4b41caba710..4b41caba710 100644
--- a/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix
diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix
index d89e1e35d92..d89e1e35d92 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix
diff --git a/pkgs/desktops/mate/mate-common/default.nix b/nixpkgs/pkgs/desktops/mate/mate-common/default.nix
index b0a7096c5e7..b0a7096c5e7 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-common/default.nix
diff --git a/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch b/nixpkgs/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch
index fb2917b36bb..fb2917b36bb 100644
--- a/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch
+++ b/nixpkgs/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix
index 2451c403c82..2451c403c82 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix
diff --git a/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch b/nixpkgs/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch
index 4a3036ae16e..4a3036ae16e 100644
--- a/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch
+++ b/nixpkgs/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix
index 2dca83bcd46..2dca83bcd46 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix
diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index a4fa6fedae3..a4fa6fedae3 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix
index d374092c48a..d374092c48a 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix
diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix
index b2e07d0a3e7..b2e07d0a3e7 100644
--- a/pkgs/desktops/mate/mate-indicator-applet/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix
diff --git a/pkgs/desktops/mate/mate-media/default.nix b/nixpkgs/pkgs/desktops/mate/mate-media/default.nix
index 156a305a63f..156a305a63f 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-media/default.nix
diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix
index 299c9b0e60f..299c9b0e60f 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix
diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix
index 337e2bfdb3b..337e2bfdb3b 100644
--- a/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix
diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix
index a83bbcb3ffb..a83bbcb3ffb 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix
index 06e9b386adb..06e9b386adb 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix
diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix
index e11bcb10257..e11bcb10257 100644
--- a/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix
diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix
index 3f84e60f9b6..3f84e60f9b6 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix
diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix
index 23e8080f01f..23e8080f01f 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix
diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix
index 0c20880d7ec..0c20880d7ec 100644
--- a/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix
index 61dec6b3484..61dec6b3484 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix
index f126918afca..f126918afca 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix
diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix
index 982d2d77b3e..982d2d77b3e 100644
--- a/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix
index 905e5643898..905e5643898 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix
index c994513273b..c994513273b 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix
diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix
index 386b53837b1..386b53837b1 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix
diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix
index 7f5e4e10f14..7f5e4e10f14 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix
diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix
index 0afeb00610b..0afeb00610b 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix
diff --git a/pkgs/desktops/mate/mozo/default.nix b/nixpkgs/pkgs/desktops/mate/mozo/default.nix
index 365a471dd7a..365a471dd7a 100644
--- a/pkgs/desktops/mate/mozo/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mozo/default.nix
diff --git a/pkgs/desktops/mate/pluma/default.nix b/nixpkgs/pkgs/desktops/mate/pluma/default.nix
index cb1e3de376e..cb1e3de376e 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/pluma/default.nix
diff --git a/pkgs/desktops/mate/python-caja/default.nix b/nixpkgs/pkgs/desktops/mate/python-caja/default.nix
index c566c8a6953..c566c8a6953 100644
--- a/pkgs/desktops/mate/python-caja/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/python-caja/default.nix
diff --git a/pkgs/desktops/mate/update.sh b/nixpkgs/pkgs/desktops/mate/update.sh
index fe294ae4985..fe294ae4985 100755
--- a/pkgs/desktops/mate/update.sh
+++ b/nixpkgs/pkgs/desktops/mate/update.sh
diff --git a/pkgs/desktops/maxx/default.nix b/nixpkgs/pkgs/desktops/maxx/default.nix
index aaf9986fbb2..aaf9986fbb2 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/nixpkgs/pkgs/desktops/maxx/default.nix
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix
index 244146771c4..244146771c4 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix
diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index 1876020a8fe..1876020a8fe 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index 5a70fa94c5e..5a70fa94c5e 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index 7c95d88053d..7c95d88053d 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index d92f24d615e..d92f24d615e 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix
diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
index fb56b3d1b33..fb56b3d1b33 100644
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index ae43a372acc..ae43a372acc 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch
index 3191f4e3cb2..3191f4e3cb2 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index b5303021772..b5303021772 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index ea74686e504..ea74686e504 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
index befa2bbbb02..befa2bbbb02 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 27bcb21a006..27bcb21a006 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
index c8bde494399..c8bde494399 100644
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix
index f04cb7cd53b..f04cb7cd53b 100644
--- a/pkgs/desktops/pantheon/apps/sideload/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index 5cd5d365ed9..5cd5d365ed9 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch
index 4d69390f39d..4d69390f39d 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index d501cba7c06..d501cba7c06 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch
index d458689a325..d458689a325 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index 0d0a7507afe..0d0a7507afe 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index 6f2fefa4873..6f2fefa4873 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index 501059896f2..501059896f2 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch
index 35f73d36599..35f73d36599 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index bd9669e2499..bd9669e2499 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index 81a694f2ea9..81a694f2ea9 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch
index 33237d9c939..33237d9c939 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index 5a4eaf79b38..5a4eaf79b38 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 6e050c92d80..6e050c92d80 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch
index e2d7a6d4970..e2d7a6d4970 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index bd7fee51d8d..bd7fee51d8d 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index fdd3f4f5765..fdd3f4f5765 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch
index a1b019179d1..a1b019179d1 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index ab9ecbc5a33..ab9ecbc5a33 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index a8513f0b29b..a8513f0b29b 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch
index 335d3f29626..335d3f29626 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index b21fc1c099f..b21fc1c099f 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index 9d457aedc96..9d457aedc96 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index 3d240fc6221..3d240fc6221 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index 8d8cd1c940a..8d8cd1c940a 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 28ec4e65f52..28ec4e65f52 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix
diff --git a/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch
index d5931d59ec9..d5931d59ec9 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch
diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
index cc6b37095fd..cc6b37095fd 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index 25c3f2201ef..25c3f2201ef 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 291977349bd..291977349bd 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
index df2475ce82a..df2475ce82a 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
index c19a465e9b1..c19a465e9b1 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
index 2f3b0ee059f..2f3b0ee059f 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
diff --git a/pkgs/desktops/pantheon/default.nix b/nixpkgs/pkgs/desktops/pantheon/default.nix
index d4e6b192f20..d4e6b192f20 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/0001-Build-with-Meson.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/0001-Build-with-Meson.patch
index 3a0b3812450..3a0b3812450 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/0001-Build-with-Meson.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/0001-Build-with-Meson.patch
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index be97c5903eb..be97c5903eb 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist
index 0cff31f4f77..0cff31f4f77 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/gala-multitaskingview.dockitem b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/gala-multitaskingview.dockitem
index b25bb8c8590..b25bb8c8590 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/gala-multitaskingview.dockitem
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/gala-multitaskingview.dockitem
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.calendar.dockitem b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.calendar.dockitem
index 3bd7d531840..3bd7d531840 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.calendar.dockitem
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.calendar.dockitem
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.music.dockitem b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.music.dockitem
index 494edde183c..494edde183c 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.music.dockitem
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.music.dockitem
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.photos.dockitem b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.photos.dockitem
index 89536754964..89536754964 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.photos.dockitem
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.photos.dockitem
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.switchboard.dockitem b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.switchboard.dockitem
index 312c35d9bf0..312c35d9bf0 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.switchboard.dockitem
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.switchboard.dockitem
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.videos.dockitem b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.videos.dockitem
index 3b0f721a564..3b0f721a564 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.videos.dockitem
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.videos.dockitem
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Epiphany.dockitem b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Epiphany.dockitem
index b0218bac52d..b0218bac52d 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Epiphany.dockitem
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Epiphany.dockitem
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Geary.dockitem b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Geary.dockitem
index 8b04efe417e..8b04efe417e 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Geary.dockitem
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Geary.dockitem
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override
index 671448745c5..671448745c5 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index dc0b764d319..dc0b764d319 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-fallback-background.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-fallback-background.patch
index 7d2afe7b16c..7d2afe7b16c 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-fallback-background.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-fallback-background.patch
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patch
index 9bacbcf4f98..9bacbcf4f98 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patch
diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
index 38e57539de4..38e57539de4 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
index 06b5183c1e0..06b5183c1e0 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
index e79a85bee95..e79a85bee95 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 58acdd12147..58acdd12147 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch
index 39d15565661..39d15565661 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list
index 3b5e3b0e77a..3b5e3b0e77a 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list
diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
index 2ba5f4becc1..2ba5f4becc1 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
index 8e180ca83a6..8e180ca83a6 100644
--- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch
index 3b97e306119..3b97e306119 100644
--- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix
index 5791fb5c58f..5791fb5c58f 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch
index e83308ea552..e83308ea552 100644
--- a/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch
index 264a4a5b26d..264a4a5b26d 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 34c29c1b72a..34c29c1b72a 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch
index 25e3891a205..25e3891a205 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 93ddb0e1dee..93ddb0e1dee 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index f6ff962a944..f6ff962a944 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index 66f805b9a49..66f805b9a49 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch
index 58e6853e606..58e6853e606 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index fd22de25d63..fd22de25d63 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index 9d2669821de..9d2669821de 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index e5dabead7c5..e5dabead7c5 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index 12223644971..12223644971 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index af6155037ef..af6155037ef 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index ccd233e1a3e..ccd233e1a3e 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index 694166a5d64..694166a5d64 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/indicators.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/indicators.patch
index 68a5fd532a8..68a5fd532a8 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/indicators.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/indicators.patch
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
index 596ee816f89..596ee816f89 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
diff --git a/pkgs/desktops/pantheon/granite/default.nix b/nixpkgs/pkgs/desktops/pantheon/granite/default.nix
index 198be9f3430..198be9f3430 100644
--- a/pkgs/desktops/pantheon/granite/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/granite/default.nix
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc
index 1d953f4bd73..1d953f4bd73 100644
--- a/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc
+++ b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs
index d2cda26eddc..d2cda26eddc 100644
--- a/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs
+++ b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore
index 877c95f1f63..877c95f1f63 100644
--- a/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore
+++ b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix
index 834291222cf..834291222cf 100644
--- a/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex
index e735c428516..e735c428516 100644
--- a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex
+++ b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex
index 5333ad154f5..5333ad154f5 100644
--- a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex
+++ b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex
index d5d9af84a6b..d5d9af84a6b 100644
--- a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex
+++ b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs
index 3498c7066a4..3498c7066a4 100644
--- a/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs
+++ b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix
index 0bb4e58a6a1..0bb4e58a6a1 100644
--- a/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs
index c5a57698fed..c5a57698fed 100644
--- a/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs
+++ b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs
index 869559e709e..869559e709e 100644
--- a/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs
+++ b/nixpkgs/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs
diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/cerbere/default.nix
index a911440fa5d..a911440fa5d 100644
--- a/pkgs/desktops/pantheon/services/cerbere/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/services/cerbere/default.nix
diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/contractor/default.nix
index 68532bdd812..68532bdd812 100644
--- a/pkgs/desktops/pantheon/services/contractor/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/services/contractor/default.nix
diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index d41750f8dfc..d41750f8dfc 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch b/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch
index a59c74f22b3..a59c74f22b3 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch
diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
index 4ec1df36bea..4ec1df36bea 100644
--- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index 582793ff590..582793ff590 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch
index 272656fae78..272656fae78 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch
index c073b23e6b9..c073b23e6b9 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
index 0f919c7c94d..0f919c7c94d 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
index f244e0e4637..f244e0e4637 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
diff --git a/pkgs/desktops/pantheon/update.nix b/nixpkgs/pkgs/desktops/pantheon/update.nix
index 1137c533016..1137c533016 100644
--- a/pkgs/desktops/pantheon/update.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/update.nix
diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix
index b5ff3f5dd05..b5ff3f5dd05 100644
--- a/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix
diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/nixpkgs/pkgs/desktops/plasma-5/breeze-grub.nix
index eed396b5437..eed396b5437 100644
--- a/pkgs/desktops/plasma-5/breeze-grub.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/breeze-grub.nix
diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/nixpkgs/pkgs/desktops/plasma-5/breeze-gtk.nix
index 1be3fe1c309..1be3fe1c309 100644
--- a/pkgs/desktops/plasma-5/breeze-gtk.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/breeze-gtk.nix
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/nixpkgs/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index 5b6abddbcda..5b6abddbcda 100644
--- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch b/nixpkgs/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch
index 5d5856d122d..5d5856d122d 100644
--- a/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/series b/nixpkgs/pkgs/desktops/plasma-5/breeze-plymouth/series
index 8920e7ca518..8920e7ca518 100644
--- a/pkgs/desktops/plasma-5/breeze-plymouth/series
+++ b/nixpkgs/pkgs/desktops/plasma-5/breeze-plymouth/series
diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/nixpkgs/pkgs/desktops/plasma-5/breeze-qt5.nix
index 3f3222e05cd..3f3222e05cd 100644
--- a/pkgs/desktops/plasma-5/breeze-qt5.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/breeze-qt5.nix
diff --git a/pkgs/desktops/plasma-5/default.nix b/nixpkgs/pkgs/desktops/plasma-5/default.nix
index a199a4a959d..a199a4a959d 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/default.nix
diff --git a/pkgs/desktops/plasma-5/discover.nix b/nixpkgs/pkgs/desktops/plasma-5/discover.nix
index a859285e078..a859285e078 100644
--- a/pkgs/desktops/plasma-5/discover.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/discover.nix
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
index e2e6da6f07c..e2e6da6f07c 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index d2870c27e65..d2870c27e65 100644
--- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix
diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/nixpkgs/pkgs/desktops/plasma-5/kde-cli-tools.nix
index 3364ee2c063..3364ee2c063 100644
--- a/pkgs/desktops/plasma-5/kde-cli-tools.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kde-cli-tools.nix
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index 8cfc947d30b..8cfc947d30b 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch b/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch
index f30a0a4588f..f30a0a4588f 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch b/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch
index 69f7bc4e56a..69f7bc4e56a 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/series b/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/patches/series
index 7aad1acf6ac..7aad1acf6ac 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/series
+++ b/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/patches/series
diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix
index 3f2e9be462d..3f2e9be462d 100644
--- a/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/nixpkgs/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index 398fc356fc9..398fc356fc9 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kdeplasma-addons.nix
diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix
index ccbf3820b90..ccbf3820b90 100644
--- a/pkgs/desktops/plasma-5/kgamma5.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/nixpkgs/pkgs/desktops/plasma-5/khotkeys.nix
index 77763c5e203..77763c5e203 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/khotkeys.nix
diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix
index b35493929ff..b35493929ff 100644
--- a/pkgs/desktops/plasma-5/kinfocenter.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix
diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/nixpkgs/pkgs/desktops/plasma-5/kmenuedit.nix
index 016ea940d99..016ea940d99 100644
--- a/pkgs/desktops/plasma-5/kmenuedit.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kmenuedit.nix
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/nixpkgs/pkgs/desktops/plasma-5/kscreen.nix
index 422bb95c605..422bb95c605 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kscreen.nix
diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix
index e748121132c..e748121132c 100644
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix
diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix
index 39e260f6c70..39e260f6c70 100644
--- a/pkgs/desktops/plasma-5/ksshaskpass.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix
diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix
index 01e740f74c4..01e740f74c4 100644
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix
diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/nixpkgs/pkgs/desktops/plasma-5/kwallet-pam.nix
index 7ddd6e2abb7..7ddd6e2abb7 100644
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kwallet-pam.nix
diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix
index 1344b477f73..1344b477f73 100644
--- a/pkgs/desktops/plasma-5/kwayland-integration.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
index b8f381e9714..b8f381e9714 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
diff --git a/pkgs/desktops/plasma-5/kwin/follow-symlinks.patch b/nixpkgs/pkgs/desktops/plasma-5/kwin/follow-symlinks.patch
index 60b8f5ef541..60b8f5ef541 100644
--- a/pkgs/desktops/plasma-5/kwin/follow-symlinks.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/kwin/follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch b/nixpkgs/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch
index 80aacacc6ca..80aacacc6ca 100644
--- a/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch
diff --git a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix b/nixpkgs/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix
index 7a7c88b6bcf..7a7c88b6bcf 100644
--- a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix
diff --git a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix b/nixpkgs/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix
index d2c68d3cb7b..d2c68d3cb7b 100644
--- a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix
diff --git a/pkgs/desktops/plasma-5/kwin/series b/nixpkgs/pkgs/desktops/plasma-5/kwin/series
index 8efb74eabd6..8efb74eabd6 100644
--- a/pkgs/desktops/plasma-5/kwin/series
+++ b/nixpkgs/pkgs/desktops/plasma-5/kwin/series
diff --git a/pkgs/desktops/plasma-5/kwin/xwayland.patch b/nixpkgs/pkgs/desktops/plasma-5/kwin/xwayland.patch
index 9d405b3bbb8..9d405b3bbb8 100644
--- a/pkgs/desktops/plasma-5/kwin/xwayland.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/kwin/xwayland.patch
diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix
index f6f6187e946..f6f6187e946 100644
--- a/pkgs/desktops/plasma-5/kwrited.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix
diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix
index cf9d7084401..cf9d7084401 100644
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix
diff --git a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/nixpkgs/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
index 48be0d037df..48be0d037df 100644
--- a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
diff --git a/pkgs/desktops/plasma-5/libkscreen/series b/nixpkgs/pkgs/desktops/plasma-5/libkscreen/series
index 86bf4ab1060..86bf4ab1060 100644
--- a/pkgs/desktops/plasma-5/libkscreen/series
+++ b/nixpkgs/pkgs/desktops/plasma-5/libkscreen/series
diff --git a/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch b/nixpkgs/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch
index fbbb11ae755..fbbb11ae755 100644
--- a/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix
index 96d113e11fb..96d113e11fb 100644
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix
diff --git a/pkgs/desktops/plasma-5/milou.nix b/nixpkgs/pkgs/desktops/plasma-5/milou.nix
index db019db358b..db019db358b 100644
--- a/pkgs/desktops/plasma-5/milou.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/milou.nix
diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/nixpkgs/pkgs/desktops/plasma-5/oxygen.nix
index 1b1f34f17b5..1b1f34f17b5 100644
--- a/pkgs/desktops/plasma-5/oxygen.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/oxygen.nix
diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-browser-integration.nix
index e01efabe8a6..e01efabe8a6 100644
--- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-browser-integration.nix
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 4183b38ba49..4183b38ba49 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
index a46212af10f..a46212af10f 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/series b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/series
index 26517ba9356..26517ba9356 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/series
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/series
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
index 97504b330fe..97504b330fe 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-integration/default.nix
index f6964428762..f6964428762 100644
--- a/pkgs/desktops/plasma-5/plasma-integration/default.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-integration/default.nix
diff --git a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
index 79b5cfb437e..79b5cfb437e 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
diff --git a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
index 3bc871f0906..3bc871f0906 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 8296d549782..8296d549782 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix
index b60b5298d6d..b60b5298d6d 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix
diff --git a/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch
index 6bab35fe4a9..6bab35fe4a9 100644
--- a/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch
diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-vault/default.nix
index e016944be45..e016944be45 100644
--- a/pkgs/desktops/plasma-5/plasma-vault/default.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-vault/default.nix
diff --git a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch
index e1c325e1693..e1c325e1693 100644
--- a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch
diff --git a/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch
index b2a7866531b..b2a7866531b 100644
--- a/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch
diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
index cb068166c1d..cb068166c1d 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 1403c9e4c8b..1403c9e4c8b 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
index 5159328ed3f..5159328ed3f 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
+++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix
index c25b3d2744b..c25b3d2744b 100644
--- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix
diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix
index 65fc5446c16..65fc5446c16 100644
--- a/pkgs/desktops/plasma-5/powerdevil.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix
diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix
index 6becf3bf420..6becf3bf420 100644
--- a/pkgs/desktops/plasma-5/sddm-kcm.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
index f299ed953de..f299ed953de 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix
index 9ff906f7974..9ff906f7974 100644
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix
diff --git a/pkgs/desktops/plasma-5/user-manager.nix b/nixpkgs/pkgs/desktops/plasma-5/user-manager.nix
index f46792fc48f..f46792fc48f 100644
--- a/pkgs/desktops/plasma-5/user-manager.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/user-manager.nix
diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
index 1e04eb1e2b0..1e04eb1e2b0 100644
--- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/nixpkgs/pkgs/desktops/rox/rox-filer/default.nix
index b7c40153209..b7c40153209 100644
--- a/pkgs/desktops/rox/rox-filer/default.nix
+++ b/nixpkgs/pkgs/desktops/rox/rox-filer/default.nix
diff --git a/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch b/nixpkgs/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch
index 11bd8004459..11bd8004459 100644
--- a/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch
+++ b/nixpkgs/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch
diff --git a/pkgs/desktops/surf-display/default.nix b/nixpkgs/pkgs/desktops/surf-display/default.nix
index dd064486647..dd064486647 100644
--- a/pkgs/desktops/surf-display/default.nix
+++ b/nixpkgs/pkgs/desktops/surf-display/default.nix
diff --git a/pkgs/desktops/surf-display/pdf-makefile.patch b/nixpkgs/pkgs/desktops/surf-display/pdf-makefile.patch
index 9c2541052c0..9c2541052c0 100644
--- a/pkgs/desktops/surf-display/pdf-makefile.patch
+++ b/nixpkgs/pkgs/desktops/surf-display/pdf-makefile.patch
diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix
index 736e89a4f44..736e89a4f44 100644
--- a/pkgs/desktops/xfce/applications/catfish/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix
diff --git a/pkgs/desktops/xfce/applications/gigolo/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/gigolo/default.nix
index 32486aab981..32486aab981 100644
--- a/pkgs/desktops/xfce/applications/gigolo/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/gigolo/default.nix
diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix
index 6f841958c79..6f841958c79 100644
--- a/pkgs/desktops/xfce/applications/mousepad/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix
diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix
index 4a48cc83dda..4a48cc83dda 100644
--- a/pkgs/desktops/xfce/applications/orage/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix
diff --git a/pkgs/desktops/xfce/applications/parole/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/parole/default.nix
index 20b899165f0..20b899165f0 100644
--- a/pkgs/desktops/xfce/applications/parole/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/parole/default.nix
diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/ristretto/default.nix
index 8766bd302ab..8766bd302ab 100644
--- a/pkgs/desktops/xfce/applications/ristretto/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/ristretto/default.nix
diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfburn/default.nix
index 08f2bd511a8..08f2bd511a8 100644
--- a/pkgs/desktops/xfce/applications/xfburn/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfburn/default.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-dict/configure-gio.patch b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-dict/configure-gio.patch
index 787b63511a2..787b63511a2 100644
--- a/pkgs/desktops/xfce/applications/xfce4-dict/configure-gio.patch
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-dict/configure-gio.patch
diff --git a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-dict/default.nix
index b2682080216..b2682080216 100644
--- a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-dict/default.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
index a991e8c8180..a991e8c8180 100644
--- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
index 012486baac9..012486baac9 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
index e3d8b4b87d9..e3d8b4b87d9 100644
--- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
index 3b9cd268d55..3b9cd268d55 100644
--- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
index 413c04a84cc..413c04a84cc 100644
--- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix
index dafb72582b3..dafb72582b3 100644
--- a/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix
diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix
index a17c29f6723..a17c29f6723 100644
--- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix
diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix
index 6ac601c6685..6ac601c6685 100644
--- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix
+++ b/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix
diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes.nix
index 783fbb13c83..783fbb13c83 100644
--- a/pkgs/desktops/xfce/art/xfwm4-themes.nix
+++ b/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes.nix
diff --git a/pkgs/desktops/xfce/automakeAddFlags.sh b/nixpkgs/pkgs/desktops/xfce/automakeAddFlags.sh
index 92d5659d05c..92d5659d05c 100644
--- a/pkgs/desktops/xfce/automakeAddFlags.sh
+++ b/nixpkgs/pkgs/desktops/xfce/automakeAddFlags.sh
diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix
index 59ab5823314..59ab5823314 100644
--- a/pkgs/desktops/xfce/core/exo/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix
diff --git a/pkgs/desktops/xfce/core/garcon/default.nix b/nixpkgs/pkgs/desktops/xfce/core/garcon/default.nix
index 69184f2afa8..69184f2afa8 100644
--- a/pkgs/desktops/xfce/core/garcon/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/garcon/default.nix
diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix
index 79c8ec74b62..79c8ec74b62 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix
diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/nixpkgs/pkgs/desktops/xfce/core/libxfce4util/default.nix
index 4540d235251..4540d235251 100644
--- a/pkgs/desktops/xfce/core/libxfce4util/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/libxfce4util/default.nix
diff --git a/pkgs/desktops/xfce/core/thunar-volman/default.nix b/nixpkgs/pkgs/desktops/xfce/core/thunar-volman/default.nix
index fc6db0fcce4..fc6db0fcce4 100644
--- a/pkgs/desktops/xfce/core/thunar-volman/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/thunar-volman/default.nix
diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix
index 11220141d2a..11220141d2a 100644
--- a/pkgs/desktops/xfce/core/thunar/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix
diff --git a/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch b/nixpkgs/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch
index 594a81c829e..594a81c829e 100644
--- a/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch
+++ b/nixpkgs/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch
diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix
index cc44e662457..cc44e662457 100644
--- a/pkgs/desktops/xfce/core/thunar/wrapper.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix
diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/nixpkgs/pkgs/desktops/xfce/core/tumbler/default.nix
index b795007ca7c..b795007ca7c 100644
--- a/pkgs/desktops/xfce/core/tumbler/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/tumbler/default.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
index cbb444c6c76..cbb444c6c76 100644
--- a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
index 38fe82ffb01..38fe82ffb01 100644
--- a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh b/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
index 600bf47fd87..600bf47fd87 100644
--- a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix
index f4d86247c6c..f4d86247c6c 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch
index ed9df9ef36f..ed9df9ef36f 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch
diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
index fb3f05b3664..fb3f05b3664 100644
--- a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix
index f97c07156c5..f97c07156c5 100644
--- a/pkgs/desktops/xfce/core/xfce4-session/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix
index 74ab96ed1bc..74ab96ed1bc 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix
diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix
index a0923f0fda1..a0923f0fda1 100644
--- a/pkgs/desktops/xfce/core/xfconf/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix
diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix
index afcd0d19dc3..afcd0d19dc3 100644
--- a/pkgs/desktops/xfce/core/xfdesktop/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix
diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix
index 2dff3302617..2dff3302617 100644
--- a/pkgs/desktops/xfce/core/xfwm4/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix
diff --git a/pkgs/desktops/xfce/default.nix b/nixpkgs/pkgs/desktops/xfce/default.nix
index 7442ff478f5..7442ff478f5 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/default.nix
diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix
index b7dc8322569..b7dc8322569 100644
--- a/pkgs/desktops/xfce/mkXfceDerivation.nix
+++ b/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
index 3966e256b16..3966e256b16 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
index bd1a3b5e5e3..bd1a3b5e5e3 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
index 3798edbf89d..3798edbf89d 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
index ef7f7e58020..ef7f7e58020 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix
index 3cfb010b12d..3cfb010b12d 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
index 3abeb74a435..3abeb74a435 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
index b33ba7770be..b33ba7770be 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
index e6d1f6da26b..e6d1f6da26b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
index 03e5a222967..03e5a222967 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
index ee663aa71ca..ee663aa71ca 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
index 193d27af98a..193d27af98a 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
index 2782decf6c4..2782decf6c4 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
index e9d2eb590be..e9d2eb590be 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
index b909540144a..b909540144a 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
index 8c6c91e2519..8c6c91e2519 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
index d774649b536..d774649b536 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
index 2876c1b1f7d..2876c1b1f7d 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
index 83778aa8fff..83778aa8fff 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
index 2e7233e6cdb..2e7233e6cdb 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
index 5575962ab77..5575962ab77 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
index 4eddfe8df57..4eddfe8df57 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
index 39393dd39e9..39393dd39e9 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
index 43e943f194a..43e943f194a 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
index 1ed86a67f72..1ed86a67f72 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
index 288aaddfb98..288aaddfb98 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
index 5ab311ef16f..5ab311ef16f 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
index ef47d37e5ef..ef47d37e5ef 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
index 8798851579d..8798851579d 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
index 4497a7b0e36..4497a7b0e36 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
index e3c72d3b50e..e3c72d3b50e 100644
--- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/nixpkgs/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
index 8674c586552..8674c586552 100644
--- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index f8be40eecab..f8be40eecab 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
diff --git a/pkgs/development/androidndk-pkgs/default.nix b/nixpkgs/pkgs/development/androidndk-pkgs/default.nix
index 7bb779d1d13..7bb779d1d13 100644
--- a/pkgs/development/androidndk-pkgs/default.nix
+++ b/nixpkgs/pkgs/development/androidndk-pkgs/default.nix
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
index 840fbff60eb..840fbff60eb 100644
--- a/pkgs/development/arduino/arduino-core/default.nix
+++ b/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/nixpkgs/pkgs/development/arduino/arduino-core/downloads.nix
index 9c4f795d293..9c4f795d293 100644
--- a/pkgs/development/arduino/arduino-core/downloads.nix
+++ b/nixpkgs/pkgs/development/arduino/arduino-core/downloads.nix
diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix
index f450d4f850f..f450d4f850f 100644
--- a/pkgs/development/arduino/arduino-mk/default.nix
+++ b/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix
diff --git a/pkgs/development/arduino/ino/default.nix b/nixpkgs/pkgs/development/arduino/ino/default.nix
index 83b72488bfd..83b72488bfd 100644
--- a/pkgs/development/arduino/ino/default.nix
+++ b/nixpkgs/pkgs/development/arduino/ino/default.nix
diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix
index 01a2fb873aa..01a2fb873aa 100644
--- a/pkgs/development/arduino/platformio/chrootenv.nix
+++ b/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix
diff --git a/pkgs/development/arduino/platformio/core.nix b/nixpkgs/pkgs/development/arduino/platformio/core.nix
index 7beb2cba9c5..7beb2cba9c5 100644
--- a/pkgs/development/arduino/platformio/core.nix
+++ b/nixpkgs/pkgs/development/arduino/platformio/core.nix
diff --git a/pkgs/development/arduino/platformio/default.nix b/nixpkgs/pkgs/development/arduino/platformio/default.nix
index 280fd496650..280fd496650 100644
--- a/pkgs/development/arduino/platformio/default.nix
+++ b/nixpkgs/pkgs/development/arduino/platformio/default.nix
diff --git a/pkgs/development/arduino/platformio/fix-searchpath.patch b/nixpkgs/pkgs/development/arduino/platformio/fix-searchpath.patch
index 46e84d15a82..46e84d15a82 100644
--- a/pkgs/development/arduino/platformio/fix-searchpath.patch
+++ b/nixpkgs/pkgs/development/arduino/platformio/fix-searchpath.patch
diff --git a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/nixpkgs/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch
index 90251d668bc..90251d668bc 100644
--- a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch
+++ b/nixpkgs/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch
diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix
index 4dedf782b75..4dedf782b75 100644
--- a/pkgs/development/beam-modules/build-erlang-mk.nix
+++ b/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix
diff --git a/pkgs/development/beam-modules/build-hex.nix b/nixpkgs/pkgs/development/beam-modules/build-hex.nix
index 27ce64582f3..27ce64582f3 100644
--- a/pkgs/development/beam-modules/build-hex.nix
+++ b/nixpkgs/pkgs/development/beam-modules/build-hex.nix
diff --git a/pkgs/development/beam-modules/build-mix.nix b/nixpkgs/pkgs/development/beam-modules/build-mix.nix
index 9aebad2dabf..9aebad2dabf 100644
--- a/pkgs/development/beam-modules/build-mix.nix
+++ b/nixpkgs/pkgs/development/beam-modules/build-mix.nix
diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix
index 224d111026a..224d111026a 100644
--- a/pkgs/development/beam-modules/build-rebar3.nix
+++ b/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix
diff --git a/pkgs/development/beam-modules/default.nix b/nixpkgs/pkgs/development/beam-modules/default.nix
index 96062a57300..96062a57300 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/nixpkgs/pkgs/development/beam-modules/default.nix
diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix
index c55a7a80ff3..c55a7a80ff3 100644
--- a/pkgs/development/beam-modules/fetch-hex.nix
+++ b/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix
diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix
index 389e07beca6..389e07beca6 100644
--- a/pkgs/development/beam-modules/fetch-rebar-deps.nix
+++ b/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix
diff --git a/pkgs/development/beam-modules/hex/default.nix b/nixpkgs/pkgs/development/beam-modules/hex/default.nix
index e8faa9c0a9c..e8faa9c0a9c 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/nixpkgs/pkgs/development/beam-modules/hex/default.nix
diff --git a/pkgs/development/beam-modules/lib.nix b/nixpkgs/pkgs/development/beam-modules/lib.nix
index db40c47794f..db40c47794f 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/nixpkgs/pkgs/development/beam-modules/lib.nix
diff --git a/pkgs/development/beam-modules/mix-bootstrap b/nixpkgs/pkgs/development/beam-modules/mix-bootstrap
index 7e31def71fa..7e31def71fa 100755
--- a/pkgs/development/beam-modules/mix-bootstrap
+++ b/nixpkgs/pkgs/development/beam-modules/mix-bootstrap
diff --git a/pkgs/development/beam-modules/pc/default.nix b/nixpkgs/pkgs/development/beam-modules/pc/default.nix
index d30b0fbdbd2..d30b0fbdbd2 100644
--- a/pkgs/development/beam-modules/pc/default.nix
+++ b/nixpkgs/pkgs/development/beam-modules/pc/default.nix
diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/nixpkgs/pkgs/development/beam-modules/pgsql/default.nix
index 6edee5d8bc6..6edee5d8bc6 100644
--- a/pkgs/development/beam-modules/pgsql/default.nix
+++ b/nixpkgs/pkgs/development/beam-modules/pgsql/default.nix
diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix
index 1ec9f244d6c..1ec9f244d6c 100644
--- a/pkgs/development/beam-modules/rebar3-release.nix
+++ b/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix
diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix
index d772ad7a3c7..d772ad7a3c7 100644
--- a/pkgs/development/beam-modules/webdriver/default.nix
+++ b/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix
diff --git a/pkgs/development/bower-modules/generic/default.nix b/nixpkgs/pkgs/development/bower-modules/generic/default.nix
index ba15b588160..ba15b588160 100644
--- a/pkgs/development/bower-modules/generic/default.nix
+++ b/nixpkgs/pkgs/development/bower-modules/generic/default.nix
diff --git a/pkgs/development/chez-modules/chez-matchable/default.nix b/nixpkgs/pkgs/development/chez-modules/chez-matchable/default.nix
index 2b3de233f9b..2b3de233f9b 100644
--- a/pkgs/development/chez-modules/chez-matchable/default.nix
+++ b/nixpkgs/pkgs/development/chez-modules/chez-matchable/default.nix
diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/nixpkgs/pkgs/development/chez-modules/chez-mit/default.nix
index 3614e97d9ea..3614e97d9ea 100644
--- a/pkgs/development/chez-modules/chez-mit/default.nix
+++ b/nixpkgs/pkgs/development/chez-modules/chez-mit/default.nix
diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/nixpkgs/pkgs/development/chez-modules/chez-scmutils/default.nix
index ceebef11363..ceebef11363 100644
--- a/pkgs/development/chez-modules/chez-scmutils/default.nix
+++ b/nixpkgs/pkgs/development/chez-modules/chez-scmutils/default.nix
diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/nixpkgs/pkgs/development/chez-modules/chez-srfi/default.nix
index 7f88b8fe7b0..7f88b8fe7b0 100644
--- a/pkgs/development/chez-modules/chez-srfi/default.nix
+++ b/nixpkgs/pkgs/development/chez-modules/chez-srfi/default.nix
diff --git a/pkgs/development/compilers/abcl/default.nix b/nixpkgs/pkgs/development/compilers/abcl/default.nix
index 44f72a93c3a..44f72a93c3a 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/abcl/default.nix
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
index 22a3c9cf468..22a3c9cf468 100755
--- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
index 5e402b2d728..5e402b2d728 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index fe38f2b2163..fe38f2b2163 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
index d1db77215d1..d1db77215d1 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
index 755ffaab271..755ffaab271 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
index a170e0141cf..a170e0141cf 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
index 4937eace490..4937eace490 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json
index e40ed72c46c..e40ed72c46c 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json
diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
index dd03ce0171f..dd03ce0171f 100644
--- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch b/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch
index 85cad6cf467..85cad6cf467 100644
--- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch
+++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch
diff --git a/pkgs/development/compilers/aldor/default.nix b/nixpkgs/pkgs/development/compilers/aldor/default.nix
index 604838e8831..604838e8831 100644
--- a/pkgs/development/compilers/aldor/default.nix
+++ b/nixpkgs/pkgs/development/compilers/aldor/default.nix
diff --git a/pkgs/development/compilers/aliceml/default.nix b/nixpkgs/pkgs/development/compilers/aliceml/default.nix
index 08d0005c99e..08d0005c99e 100644
--- a/pkgs/development/compilers/aliceml/default.nix
+++ b/nixpkgs/pkgs/development/compilers/aliceml/default.nix
diff --git a/pkgs/development/compilers/aliceml/make.patch b/nixpkgs/pkgs/development/compilers/aliceml/make.patch
index 78e2b28974e..78e2b28974e 100644
--- a/pkgs/development/compilers/aliceml/make.patch
+++ b/nixpkgs/pkgs/development/compilers/aliceml/make.patch
diff --git a/pkgs/development/compilers/aliceml/seam.patch b/nixpkgs/pkgs/development/compilers/aliceml/seam.patch
index d489037fef4..d489037fef4 100644
--- a/pkgs/development/compilers/aliceml/seam.patch
+++ b/nixpkgs/pkgs/development/compilers/aliceml/seam.patch
diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix
index ed6b2b2ff24..ed6b2b2ff24 100644
--- a/pkgs/development/compilers/apache-flex-sdk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix
diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix
index 0b5ff381730..0b5ff381730 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix
diff --git a/pkgs/development/compilers/as31/default.nix b/nixpkgs/pkgs/development/compilers/as31/default.nix
index b70fde00e15..b70fde00e15 100644
--- a/pkgs/development/compilers/as31/default.nix
+++ b/nixpkgs/pkgs/development/compilers/as31/default.nix
diff --git a/pkgs/development/compilers/asn1c/default.nix b/nixpkgs/pkgs/development/compilers/asn1c/default.nix
index 3cbb7577f34..3cbb7577f34 100644
--- a/pkgs/development/compilers/asn1c/default.nix
+++ b/nixpkgs/pkgs/development/compilers/asn1c/default.nix
diff --git a/pkgs/development/compilers/aspectj/builder.sh b/nixpkgs/pkgs/development/compilers/aspectj/builder.sh
index 3b439372004..3b439372004 100755
--- a/pkgs/development/compilers/aspectj/builder.sh
+++ b/nixpkgs/pkgs/development/compilers/aspectj/builder.sh
diff --git a/pkgs/development/compilers/aspectj/default.nix b/nixpkgs/pkgs/development/compilers/aspectj/default.nix
index 4b216761259..4b216761259 100644
--- a/pkgs/development/compilers/aspectj/default.nix
+++ b/nixpkgs/pkgs/development/compilers/aspectj/default.nix
diff --git a/pkgs/development/compilers/ats/default.nix b/nixpkgs/pkgs/development/compilers/ats/default.nix
index f086c36468d..f086c36468d 100644
--- a/pkgs/development/compilers/ats/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ats/default.nix
diff --git a/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch b/nixpkgs/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch
index 93c6fa07d8a..93c6fa07d8a 100644
--- a/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch
+++ b/nixpkgs/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch
diff --git a/pkgs/development/compilers/ats2/default.nix b/nixpkgs/pkgs/development/compilers/ats2/default.nix
index a1e5927e349..a1e5927e349 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ats2/default.nix
diff --git a/pkgs/development/compilers/ats2/setup-contrib-hook.sh b/nixpkgs/pkgs/development/compilers/ats2/setup-contrib-hook.sh
index 8c5e123b61c..8c5e123b61c 100644
--- a/pkgs/development/compilers/ats2/setup-contrib-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/ats2/setup-contrib-hook.sh
diff --git a/pkgs/development/compilers/ats2/setup-hook.sh b/nixpkgs/pkgs/development/compilers/ats2/setup-hook.sh
index 67647b1edf6..67647b1edf6 100644
--- a/pkgs/development/compilers/ats2/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/ats2/setup-hook.sh
diff --git a/pkgs/development/compilers/avian/default.nix b/nixpkgs/pkgs/development/compilers/avian/default.nix
index 34d1e64c484..34d1e64c484 100644
--- a/pkgs/development/compilers/avian/default.nix
+++ b/nixpkgs/pkgs/development/compilers/avian/default.nix
diff --git a/pkgs/development/compilers/avra/default.nix b/nixpkgs/pkgs/development/compilers/avra/default.nix
index 88a34bd6fd6..88a34bd6fd6 100644
--- a/pkgs/development/compilers/avra/default.nix
+++ b/nixpkgs/pkgs/development/compilers/avra/default.nix
diff --git a/pkgs/development/compilers/bigloo/default.nix b/nixpkgs/pkgs/development/compilers/bigloo/default.nix
index 6e768e65091..6e768e65091 100644
--- a/pkgs/development/compilers/bigloo/default.nix
+++ b/nixpkgs/pkgs/development/compilers/bigloo/default.nix
diff --git a/pkgs/development/compilers/binaryen/default.nix b/nixpkgs/pkgs/development/compilers/binaryen/default.nix
index 664335c3dad..664335c3dad 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/nixpkgs/pkgs/development/compilers/binaryen/default.nix
diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/nixpkgs/pkgs/development/compilers/bs-platform/build-bs-platform.nix
index 830a0b647c4..830a0b647c4 100644
--- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix
+++ b/nixpkgs/pkgs/development/compilers/bs-platform/build-bs-platform.nix
diff --git a/pkgs/development/compilers/bs-platform/default.nix b/nixpkgs/pkgs/development/compilers/bs-platform/default.nix
index 7abf7b306a5..7abf7b306a5 100644
--- a/pkgs/development/compilers/bs-platform/default.nix
+++ b/nixpkgs/pkgs/development/compilers/bs-platform/default.nix
diff --git a/pkgs/development/compilers/bs-platform/ocaml.nix b/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix
index 9aa34d02b36..9aa34d02b36 100644
--- a/pkgs/development/compilers/bs-platform/ocaml.nix
+++ b/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix
diff --git a/pkgs/development/compilers/bupc/default.nix b/nixpkgs/pkgs/development/compilers/bupc/default.nix
index ad10845e98c..ad10845e98c 100644
--- a/pkgs/development/compilers/bupc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/bupc/default.nix
diff --git a/pkgs/development/compilers/carp/default.nix b/nixpkgs/pkgs/development/compilers/carp/default.nix
index e02880b314e..e02880b314e 100644
--- a/pkgs/development/compilers/carp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/carp/default.nix
diff --git a/pkgs/development/compilers/ccl/default.nix b/nixpkgs/pkgs/development/compilers/ccl/default.nix
index ec166352267..ec166352267 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ccl/default.nix
diff --git a/pkgs/development/compilers/chez/default.nix b/nixpkgs/pkgs/development/compilers/chez/default.nix
index c0fd742082f..c0fd742082f 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/nixpkgs/pkgs/development/compilers/chez/default.nix
diff --git a/pkgs/development/compilers/chicken/4/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch b/nixpkgs/pkgs/development/compilers/chicken/4/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch
index ca72ba0119f..ca72ba0119f 100644
--- a/pkgs/development/compilers/chicken/4/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch
diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix
index 380755bf01e..380755bf01e 100644
--- a/pkgs/development/compilers/chicken/4/chicken.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix
diff --git a/pkgs/development/compilers/chicken/4/default.nix b/nixpkgs/pkgs/development/compilers/chicken/4/default.nix
index 8d29c7c9a2b..8d29c7c9a2b 100644
--- a/pkgs/development/compilers/chicken/4/default.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/default.nix
diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix
index 8f796d09ee5..8f796d09ee5 100644
--- a/pkgs/development/compilers/chicken/4/egg2nix.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix
diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix
index cd340c22174..cd340c22174 100644
--- a/pkgs/development/compilers/chicken/4/eggDerivation.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix
diff --git a/pkgs/development/compilers/chicken/4/eggs.nix b/nixpkgs/pkgs/development/compilers/chicken/4/eggs.nix
index 6e6f104f8a0..6e6f104f8a0 100644
--- a/pkgs/development/compilers/chicken/4/eggs.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/eggs.nix
diff --git a/pkgs/development/compilers/chicken/4/eggs.scm b/nixpkgs/pkgs/development/compilers/chicken/4/eggs.scm
index d847ae9e29b..d847ae9e29b 100644
--- a/pkgs/development/compilers/chicken/4/eggs.scm
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/eggs.scm
diff --git a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/builder.sh
index 20466106309..20466106309 100644
--- a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/builder.sh
diff --git a/pkgs/development/compilers/chicken/4/fetchegg/default.nix b/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/default.nix
index d4d33a5593c..d4d33a5593c 100644
--- a/pkgs/development/compilers/chicken/4/fetchegg/default.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/default.nix
diff --git a/pkgs/development/compilers/chicken/4/overrides.nix b/nixpkgs/pkgs/development/compilers/chicken/4/overrides.nix
index 9fdda9b6d9f..9fdda9b6d9f 100644
--- a/pkgs/development/compilers/chicken/4/overrides.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/overrides.nix
diff --git a/pkgs/development/compilers/chicken/4/setup-hook.sh b/nixpkgs/pkgs/development/compilers/chicken/4/setup-hook.sh
index 661dc08c090..661dc08c090 100644
--- a/pkgs/development/compilers/chicken/4/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/chicken/4/setup-hook.sh
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix
index 3e47e413636..3e47e413636 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix
diff --git a/pkgs/development/compilers/chicken/5/default.nix b/nixpkgs/pkgs/development/compilers/chicken/5/default.nix
index 8d29c7c9a2b..8d29c7c9a2b 100644
--- a/pkgs/development/compilers/chicken/5/default.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/default.nix
diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/nixpkgs/pkgs/development/compilers/chicken/5/egg2nix.nix
index 77ed32cafe1..77ed32cafe1 100644
--- a/pkgs/development/compilers/chicken/5/egg2nix.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/egg2nix.nix
diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix
index 8d4a62776d0..8d4a62776d0 100644
--- a/pkgs/development/compilers/chicken/5/eggDerivation.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix
diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix
index a35b1f05891..a35b1f05891 100644
--- a/pkgs/development/compilers/chicken/5/eggs.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix
diff --git a/pkgs/development/compilers/chicken/5/eggs.scm b/nixpkgs/pkgs/development/compilers/chicken/5/eggs.scm
index b743d6e3229..b743d6e3229 100644
--- a/pkgs/development/compilers/chicken/5/eggs.scm
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/eggs.scm
diff --git a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh b/nixpkgs/pkgs/development/compilers/chicken/5/fetchegg/builder.sh
index d9adf510f22..d9adf510f22 100644
--- a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/fetchegg/builder.sh
diff --git a/pkgs/development/compilers/chicken/5/fetchegg/default.nix b/nixpkgs/pkgs/development/compilers/chicken/5/fetchegg/default.nix
index 24bfbd7a30f..24bfbd7a30f 100644
--- a/pkgs/development/compilers/chicken/5/fetchegg/default.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/fetchegg/default.nix
diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix
index 2c63c085104..2c63c085104 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix
diff --git a/pkgs/development/compilers/chicken/5/setup-hook.sh b/nixpkgs/pkgs/development/compilers/chicken/5/setup-hook.sh
index f5ebaaf638e..f5ebaaf638e 100644
--- a/pkgs/development/compilers/chicken/5/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/chicken/5/setup-hook.sh
diff --git a/pkgs/development/compilers/clasp/default.nix b/nixpkgs/pkgs/development/compilers/clasp/default.nix
index 664d8492113..664d8492113 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/clasp/default.nix
diff --git a/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch b/nixpkgs/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch
index 3e0fbe6b996..3e0fbe6b996 100644
--- a/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch
+++ b/nixpkgs/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch
diff --git a/pkgs/development/compilers/clean/default.nix b/nixpkgs/pkgs/development/compilers/clean/default.nix
index 03a5cec5004..03a5cec5004 100644
--- a/pkgs/development/compilers/clean/default.nix
+++ b/nixpkgs/pkgs/development/compilers/clean/default.nix
diff --git a/pkgs/development/compilers/closure/default.nix b/nixpkgs/pkgs/development/compilers/closure/default.nix
index 682a8aa4eed..682a8aa4eed 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/nixpkgs/pkgs/development/compilers/closure/default.nix
diff --git a/pkgs/development/compilers/cmdstan/default.nix b/nixpkgs/pkgs/development/compilers/cmdstan/default.nix
index edde6af615f..edde6af615f 100644
--- a/pkgs/development/compilers/cmdstan/default.nix
+++ b/nixpkgs/pkgs/development/compilers/cmdstan/default.nix
diff --git a/pkgs/development/compilers/cmucl/binary.nix b/nixpkgs/pkgs/development/compilers/cmucl/binary.nix
index 3f93ea9e1ba..3f93ea9e1ba 100644
--- a/pkgs/development/compilers/cmucl/binary.nix
+++ b/nixpkgs/pkgs/development/compilers/cmucl/binary.nix
diff --git a/pkgs/development/compilers/colm/cross-compile.patch b/nixpkgs/pkgs/development/compilers/colm/cross-compile.patch
index 470ea23aaf1..470ea23aaf1 100644
--- a/pkgs/development/compilers/colm/cross-compile.patch
+++ b/nixpkgs/pkgs/development/compilers/colm/cross-compile.patch
diff --git a/pkgs/development/compilers/colm/default.nix b/nixpkgs/pkgs/development/compilers/colm/default.nix
index cc8e9f827b7..cc8e9f827b7 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/colm/default.nix
diff --git a/pkgs/development/compilers/compcert/default.nix b/nixpkgs/pkgs/development/compilers/compcert/default.nix
index 3a6c5e9c2c7..3a6c5e9c2c7 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/nixpkgs/pkgs/development/compilers/compcert/default.nix
diff --git a/pkgs/development/compilers/computecpp/default.nix b/nixpkgs/pkgs/development/compilers/computecpp/default.nix
index 65cfcaa7ff6..65cfcaa7ff6 100644
--- a/pkgs/development/compilers/computecpp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/computecpp/default.nix
diff --git a/pkgs/development/compilers/coreclr/default.nix b/nixpkgs/pkgs/development/compilers/coreclr/default.nix
index 00816fca36b..00816fca36b 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/nixpkgs/pkgs/development/compilers/coreclr/default.nix
diff --git a/pkgs/development/compilers/crystal/build-package.nix b/nixpkgs/pkgs/development/compilers/crystal/build-package.nix
index 8ffa89a11b4..8ffa89a11b4 100644
--- a/pkgs/development/compilers/crystal/build-package.nix
+++ b/nixpkgs/pkgs/development/compilers/crystal/build-package.nix
diff --git a/pkgs/development/compilers/crystal/crystal2nix.cr b/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.cr
index 0610de5cfa4..0610de5cfa4 100644
--- a/pkgs/development/compilers/crystal/crystal2nix.cr
+++ b/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.cr
diff --git a/pkgs/development/compilers/crystal/crystal2nix.nix b/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.nix
index ac69b9b3d96..ac69b9b3d96 100644
--- a/pkgs/development/compilers/crystal/crystal2nix.nix
+++ b/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.nix
diff --git a/pkgs/development/compilers/crystal/default.nix b/nixpkgs/pkgs/development/compilers/crystal/default.nix
index 12464344348..12464344348 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/nixpkgs/pkgs/development/compilers/crystal/default.nix
diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix
index 2e93c0b661b..2e93c0b661b 100644
--- a/pkgs/development/compilers/cudatoolkit/common.nix
+++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix
index c3b16293204..c3b16293204 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix
diff --git a/pkgs/development/compilers/dale/default.nix b/nixpkgs/pkgs/development/compilers/dale/default.nix
index 9c70e96a9c0..9c70e96a9c0 100644
--- a/pkgs/development/compilers/dale/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dale/default.nix
diff --git a/pkgs/development/compilers/dev86/default.nix b/nixpkgs/pkgs/development/compilers/dev86/default.nix
index 37f79933b77..37f79933b77 100644
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dev86/default.nix
diff --git a/pkgs/development/compilers/dmd/default.nix b/nixpkgs/pkgs/development/compilers/dmd/default.nix
index 6cae1fa073b..6cae1fa073b 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dmd/default.nix
diff --git a/pkgs/development/compilers/dotnet/buildDotnet.nix b/nixpkgs/pkgs/development/compilers/dotnet/buildDotnet.nix
index 58e67ff008a..58e67ff008a 100644
--- a/pkgs/development/compilers/dotnet/buildDotnet.nix
+++ b/nixpkgs/pkgs/development/compilers/dotnet/buildDotnet.nix
diff --git a/pkgs/development/compilers/dotnet/combinePackages.nix b/nixpkgs/pkgs/development/compilers/dotnet/combinePackages.nix
index 00fb7c6d9b4..00fb7c6d9b4 100644
--- a/pkgs/development/compilers/dotnet/combinePackages.nix
+++ b/nixpkgs/pkgs/development/compilers/dotnet/combinePackages.nix
diff --git a/pkgs/development/compilers/dotnet/default.nix b/nixpkgs/pkgs/development/compilers/dotnet/default.nix
index 58d49a50515..58d49a50515 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dotnet/default.nix
diff --git a/pkgs/development/compilers/dtc/default.nix b/nixpkgs/pkgs/development/compilers/dtc/default.nix
index 78e5eccbf14..78e5eccbf14 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dtc/default.nix
diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix
index a7b2aa6be74..a7b2aa6be74 100644
--- a/pkgs/development/compilers/ecl/16.1.2.nix
+++ b/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix
diff --git a/pkgs/development/compilers/ecl/default.nix b/nixpkgs/pkgs/development/compilers/ecl/default.nix
index 375b38f1dc6..375b38f1dc6 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ecl/default.nix
diff --git a/pkgs/development/compilers/ecl/default.upstream b/nixpkgs/pkgs/development/compilers/ecl/default.upstream
index eeb82cbfcab..eeb82cbfcab 100644
--- a/pkgs/development/compilers/ecl/default.upstream
+++ b/nixpkgs/pkgs/development/compilers/ecl/default.upstream
diff --git a/pkgs/development/compilers/ecl/ecl-1.16.2-libffi-3.3-abi.patch b/nixpkgs/pkgs/development/compilers/ecl/ecl-1.16.2-libffi-3.3-abi.patch
index 28dd7d0805b..28dd7d0805b 100644
--- a/pkgs/development/compilers/ecl/ecl-1.16.2-libffi-3.3-abi.patch
+++ b/nixpkgs/pkgs/development/compilers/ecl/ecl-1.16.2-libffi-3.3-abi.patch
diff --git a/pkgs/development/compilers/ecl/libffi-3.3-abi.patch b/nixpkgs/pkgs/development/compilers/ecl/libffi-3.3-abi.patch
index 0a2b5f4dd56..0a2b5f4dd56 100644
--- a/pkgs/development/compilers/ecl/libffi-3.3-abi.patch
+++ b/nixpkgs/pkgs/development/compilers/ecl/libffi-3.3-abi.patch
diff --git a/pkgs/development/compilers/edk2/default.nix b/nixpkgs/pkgs/development/compilers/edk2/default.nix
index 97af433d606..97af433d606 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/nixpkgs/pkgs/development/compilers/edk2/default.nix
diff --git a/pkgs/development/compilers/eli/default.nix b/nixpkgs/pkgs/development/compilers/eli/default.nix
index 90c2b8fd23c..90c2b8fd23c 100644
--- a/pkgs/development/compilers/eli/default.nix
+++ b/nixpkgs/pkgs/development/compilers/eli/default.nix
diff --git a/pkgs/development/compilers/elm/README.md b/nixpkgs/pkgs/development/compilers/elm/README.md
index f0254d0f954..f0254d0f954 100644
--- a/pkgs/development/compilers/elm/README.md
+++ b/nixpkgs/pkgs/development/compilers/elm/README.md
diff --git a/pkgs/development/compilers/elm/default.nix b/nixpkgs/pkgs/development/compilers/elm/default.nix
index 1d61b833149..1d61b833149 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/default.nix
diff --git a/pkgs/development/compilers/elm/fetchElmDeps.nix b/nixpkgs/pkgs/development/compilers/elm/fetchElmDeps.nix
index 05dffaa9e2e..05dffaa9e2e 100644
--- a/pkgs/development/compilers/elm/fetchElmDeps.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/fetchElmDeps.nix
diff --git a/pkgs/development/compilers/elm/makeDotElm.nix b/nixpkgs/pkgs/development/compilers/elm/makeDotElm.nix
index 0831d382c4b..0831d382c4b 100644
--- a/pkgs/development/compilers/elm/makeDotElm.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/makeDotElm.nix
diff --git a/pkgs/development/compilers/elm/packages/README.md b/nixpkgs/pkgs/development/compilers/elm/packages/README.md
index 5b21736afc0..5b21736afc0 100644
--- a/pkgs/development/compilers/elm/packages/README.md
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/README.md
diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix
index 3660e42e363..3660e42e363 100644
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix
diff --git a/pkgs/development/compilers/elm/packages/elm-srcs.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-srcs.nix
index 0d4523b8b09..0d4523b8b09 100644
--- a/pkgs/development/compilers/elm/packages/elm-srcs.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-srcs.nix
diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm.nix
index 644a53fd619..644a53fd619 100644
--- a/pkgs/development/compilers/elm/packages/elm.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm.nix
diff --git a/pkgs/development/compilers/elm/packages/elmi-to-json.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix
index 87b02f013f8..87b02f013f8 100644
--- a/pkgs/development/compilers/elm/packages/elmi-to-json.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix
diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh
index 1d24df549ea..1d24df549ea 100755
--- a/pkgs/development/compilers/elm/packages/generate-node-packages.sh
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh
diff --git a/pkgs/development/compilers/elm/packages/indents.nix b/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix
index 6bf7fa7890e..6bf7fa7890e 100644
--- a/pkgs/development/compilers/elm/packages/indents.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix
index 1ffd758ac82..1ffd758ac82 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix
diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json
index e129a0ffaec..e129a0ffaec 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.json
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json
diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix
index c9b54aee4fd..c9b54aee4fd 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix
diff --git a/pkgs/development/compilers/elm/packages/patch-binwrap.nix b/nixpkgs/pkgs/development/compilers/elm/packages/patch-binwrap.nix
index 3a67954b78c..3a67954b78c 100644
--- a/pkgs/development/compilers/elm/packages/patch-binwrap.nix
+++ b/nixpkgs/pkgs/development/compilers/elm/packages/patch-binwrap.nix
diff --git a/pkgs/development/compilers/elm/registry.dat b/nixpkgs/pkgs/development/compilers/elm/registry.dat
index 14fcb12a746..14fcb12a746 100644
--- a/pkgs/development/compilers/elm/registry.dat
+++ b/nixpkgs/pkgs/development/compilers/elm/registry.dat
diff --git a/pkgs/development/compilers/elm/update.sh b/nixpkgs/pkgs/development/compilers/elm/update.sh
index c2500b462ad..c2500b462ad 100755
--- a/pkgs/development/compilers/elm/update.sh
+++ b/nixpkgs/pkgs/development/compilers/elm/update.sh
diff --git a/pkgs/development/compilers/emscripten/default.nix b/nixpkgs/pkgs/development/compilers/emscripten/default.nix
index d0af770a2a4..d0af770a2a4 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/nixpkgs/pkgs/development/compilers/emscripten/default.nix
diff --git a/pkgs/development/compilers/emscripten/fastcomp/default.nix b/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/default.nix
index 57496d28860..57496d28860 100644
--- a/pkgs/development/compilers/emscripten/fastcomp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/default.nix
diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
index 91a42f53d28..91a42f53d28 100644
--- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
+++ b/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
diff --git a/pkgs/development/compilers/eql/default.nix b/nixpkgs/pkgs/development/compilers/eql/default.nix
index aac61912689..aac61912689 100644
--- a/pkgs/development/compilers/eql/default.nix
+++ b/nixpkgs/pkgs/development/compilers/eql/default.nix
diff --git a/pkgs/development/compilers/factor-lang/default.nix b/nixpkgs/pkgs/development/compilers/factor-lang/default.nix
index 314a2d0fc52..314a2d0fc52 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/factor-lang/default.nix
diff --git a/pkgs/development/compilers/factor-lang/fuel-dir.patch b/nixpkgs/pkgs/development/compilers/factor-lang/fuel-dir.patch
index 8f45b037246..8f45b037246 100644
--- a/pkgs/development/compilers/factor-lang/fuel-dir.patch
+++ b/nixpkgs/pkgs/development/compilers/factor-lang/fuel-dir.patch
diff --git a/pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch b/nixpkgs/pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch
index 57fc657ddcf..57fc657ddcf 100644
--- a/pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch
+++ b/nixpkgs/pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch
diff --git a/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch b/nixpkgs/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch
index f1498743dd6..f1498743dd6 100644
--- a/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch
+++ b/nixpkgs/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch
diff --git a/pkgs/development/compilers/fasm/bin.nix b/nixpkgs/pkgs/development/compilers/fasm/bin.nix
index 135bae2daf4..135bae2daf4 100644
--- a/pkgs/development/compilers/fasm/bin.nix
+++ b/nixpkgs/pkgs/development/compilers/fasm/bin.nix
diff --git a/pkgs/development/compilers/fasm/default.nix b/nixpkgs/pkgs/development/compilers/fasm/default.nix
index f17d18bf92a..f17d18bf92a 100644
--- a/pkgs/development/compilers/fasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/fasm/default.nix
diff --git a/pkgs/development/compilers/flux/default.nix b/nixpkgs/pkgs/development/compilers/flux/default.nix
index c599c9f8baf..c599c9f8baf 100644
--- a/pkgs/development/compilers/flux/default.nix
+++ b/nixpkgs/pkgs/development/compilers/flux/default.nix
diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/nixpkgs/pkgs/development/compilers/fpc/binary-builder.sh
index 4308c1ed211..4308c1ed211 100755
--- a/pkgs/development/compilers/fpc/binary-builder.sh
+++ b/nixpkgs/pkgs/development/compilers/fpc/binary-builder.sh
diff --git a/pkgs/development/compilers/fpc/binary.nix b/nixpkgs/pkgs/development/compilers/fpc/binary.nix
index cf13ab6f595..cf13ab6f595 100644
--- a/pkgs/development/compilers/fpc/binary.nix
+++ b/nixpkgs/pkgs/development/compilers/fpc/binary.nix
diff --git a/pkgs/development/compilers/fpc/default.nix b/nixpkgs/pkgs/development/compilers/fpc/default.nix
index 7bddafc6ff5..7bddafc6ff5 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/fpc/default.nix
diff --git a/pkgs/development/compilers/fpc/default.upstream b/nixpkgs/pkgs/development/compilers/fpc/default.upstream
index 9f16c1b645c..9f16c1b645c 100644
--- a/pkgs/development/compilers/fpc/default.upstream
+++ b/nixpkgs/pkgs/development/compilers/fpc/default.upstream
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix
index 1b3f4d168ee..1b3f4d168ee 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix
diff --git a/pkgs/development/compilers/fsharp/default.nix b/nixpkgs/pkgs/development/compilers/fsharp/default.nix
index bcb95d9ca90..bcb95d9ca90 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/fsharp/default.nix
diff --git a/pkgs/development/compilers/fsharp41/default.nix b/nixpkgs/pkgs/development/compilers/fsharp41/default.nix
index e497deb2e87..e497deb2e87 100644
--- a/pkgs/development/compilers/fsharp41/default.nix
+++ b/nixpkgs/pkgs/development/compilers/fsharp41/default.nix
diff --git a/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch b/nixpkgs/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch
index 06dd3e82adc..06dd3e82adc 100644
--- a/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch
+++ b/nixpkgs/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch
diff --git a/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch b/nixpkgs/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch
index f791317d080..f791317d080 100644
--- a/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch
+++ b/nixpkgs/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch
diff --git a/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch b/nixpkgs/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch
index 4b36eaabcaf..4b36eaabcaf 100644
--- a/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch
+++ b/nixpkgs/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch
diff --git a/pkgs/development/compilers/fstar/default.nix b/nixpkgs/pkgs/development/compilers/fstar/default.nix
index 533140631a5..533140631a5 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/nixpkgs/pkgs/development/compilers/fstar/default.nix
diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix
index f00a8b6efc9..f00a8b6efc9 100644
--- a/pkgs/development/compilers/gambit/bootstrap.nix
+++ b/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix
diff --git a/pkgs/development/compilers/gambit/build.nix b/nixpkgs/pkgs/development/compilers/gambit/build.nix
index 7a3324d7560..7a3324d7560 100644
--- a/pkgs/development/compilers/gambit/build.nix
+++ b/nixpkgs/pkgs/development/compilers/gambit/build.nix
diff --git a/pkgs/development/compilers/gambit/default.nix b/nixpkgs/pkgs/development/compilers/gambit/default.nix
index 303f6a30aad..303f6a30aad 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gambit/default.nix
diff --git a/pkgs/development/compilers/gambit/unstable.nix b/nixpkgs/pkgs/development/compilers/gambit/unstable.nix
index d855b83f0af..d855b83f0af 100644
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/nixpkgs/pkgs/development/compilers/gambit/unstable.nix
diff --git a/pkgs/development/compilers/gavrasm/default.nix b/nixpkgs/pkgs/development/compilers/gavrasm/default.nix
index 92781d79cc7..92781d79cc7 100644
--- a/pkgs/development/compilers/gavrasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gavrasm/default.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
index f635fce972f..f635fce972f 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
index 4944038fde4..4944038fde4 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
index 510889dad62..510889dad62 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
index 8ded47d6e37..8ded47d6e37 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix
index ef697b74bbe..ef697b74bbe 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix
index b287a8551f3..b287a8551f3 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix
diff --git a/pkgs/development/compilers/gcc/4.9/parallel-strsignal.patch b/nixpkgs/pkgs/development/compilers/gcc/4.9/parallel-strsignal.patch
index 4c98ca273a5..4c98ca273a5 100644
--- a/pkgs/development/compilers/gcc/4.9/parallel-strsignal.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/4.9/parallel-strsignal.patch
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix
index b1a981cfdf7..b1a981cfdf7 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix
diff --git a/pkgs/development/compilers/gcc/6/fix-objdump-check.patch b/nixpkgs/pkgs/development/compilers/gcc/6/fix-objdump-check.patch
index f9adbe9eb1c..f9adbe9eb1c 100644
--- a/pkgs/development/compilers/gcc/6/fix-objdump-check.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/6/fix-objdump-check.patch
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/nixpkgs/pkgs/development/compilers/gcc/7/default.nix
index 22d772cff6d..22d772cff6d 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/7/default.nix
diff --git a/pkgs/development/compilers/gcc/7/riscv-no-relax.patch b/nixpkgs/pkgs/development/compilers/gcc/7/riscv-no-relax.patch
index 93d9cd1d60f..93d9cd1d60f 100644
--- a/pkgs/development/compilers/gcc/7/riscv-no-relax.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/7/riscv-no-relax.patch
diff --git a/pkgs/development/compilers/gcc/7/riscv-pthread-reentrant.patch b/nixpkgs/pkgs/development/compilers/gcc/7/riscv-pthread-reentrant.patch
index c7527ffb2b1..c7527ffb2b1 100644
--- a/pkgs/development/compilers/gcc/7/riscv-pthread-reentrant.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/7/riscv-pthread-reentrant.patch
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
index c6b785f84a4..c6b785f84a4 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
index 7ff8d7529ca..7ff8d7529ca 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
diff --git a/pkgs/development/compilers/gcc/builder.sh b/nixpkgs/pkgs/development/compilers/gcc/builder.sh
index 07a003691d6..07a003691d6 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/nixpkgs/pkgs/development/compilers/gcc/builder.sh
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix
index aa0fcb50628..aa0fcb50628 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix
diff --git a/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix
index bce9a8d4738..bce9a8d4738 100644
--- a/pkgs/development/compilers/gcc/common/extra-target-flags.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix
diff --git a/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix b/nixpkgs/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix
index f8822c6dba0..f8822c6dba0 100644
--- a/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix
diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix
index f3cdce41193..f3cdce41193 100644
--- a/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix
diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix
index 4c86d37e243..4c86d37e243 100644
--- a/pkgs/development/compilers/gcc/common/pre-configure.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix
diff --git a/pkgs/development/compilers/gcc/gfortran-darwin-NXConstStr.patch b/nixpkgs/pkgs/development/compilers/gcc/gfortran-darwin-NXConstStr.patch
index a7e158ca364..a7e158ca364 100644
--- a/pkgs/development/compilers/gcc/gfortran-darwin-NXConstStr.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/gfortran-darwin-NXConstStr.patch
diff --git a/pkgs/development/compilers/gcc/gfortran-driving.patch b/nixpkgs/pkgs/development/compilers/gcc/gfortran-driving.patch
index 70708886b40..70708886b40 100644
--- a/pkgs/development/compilers/gcc/gfortran-driving.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/gfortran-driving.patch
diff --git a/pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch b/nixpkgs/pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch
index afd1f7456d3..afd1f7456d3 100644
--- a/pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch
diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/nixpkgs/pkgs/development/compilers/gcc/libstdc++-hook.sh
index 19db70597ce..19db70597ce 100644
--- a/pkgs/development/compilers/gcc/libstdc++-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/gcc/libstdc++-hook.sh
diff --git a/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch b/nixpkgs/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch
index 28fff80b786..28fff80b786 100644
--- a/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch
diff --git a/pkgs/development/compilers/gcc/libstdc++-target.patch b/nixpkgs/pkgs/development/compilers/gcc/libstdc++-target.patch
index fb622b39580..fb622b39580 100644
--- a/pkgs/development/compilers/gcc/libstdc++-target.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/libstdc++-target.patch
diff --git a/pkgs/development/compilers/gcc/no-sys-dirs.patch b/nixpkgs/pkgs/development/compilers/gcc/no-sys-dirs.patch
index 36df51904ac..36df51904ac 100644
--- a/pkgs/development/compilers/gcc/no-sys-dirs.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc/parallel-bconfig.patch b/nixpkgs/pkgs/development/compilers/gcc/parallel-bconfig.patch
index bc56ac698f5..bc56ac698f5 100644
--- a/pkgs/development/compilers/gcc/parallel-bconfig.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/parallel-bconfig.patch
diff --git a/pkgs/development/compilers/gcc/ppc-musl.patch b/nixpkgs/pkgs/development/compilers/gcc/ppc-musl.patch
index bc90888a379..bc90888a379 100644
--- a/pkgs/development/compilers/gcc/ppc-musl.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/ppc-musl.patch
diff --git a/pkgs/development/compilers/gcc/res_state-not-declared.patch b/nixpkgs/pkgs/development/compilers/gcc/res_state-not-declared.patch
index e970487786d..e970487786d 100644
--- a/pkgs/development/compilers/gcc/res_state-not-declared.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/res_state-not-declared.patch
diff --git a/pkgs/development/compilers/gcc/sigsegv-not-declared.patch b/nixpkgs/pkgs/development/compilers/gcc/sigsegv-not-declared.patch
index f9cfaec8202..f9cfaec8202 100644
--- a/pkgs/development/compilers/gcc/sigsegv-not-declared.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/sigsegv-not-declared.patch
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/nixpkgs/pkgs/development/compilers/gcc/snapshot/default.nix
index 0441296ef17..0441296ef17 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/snapshot/default.nix
diff --git a/pkgs/development/compilers/gcc/struct-sigaltstack-4.9.patch b/nixpkgs/pkgs/development/compilers/gcc/struct-sigaltstack-4.9.patch
index fc126b4813d..fc126b4813d 100644
--- a/pkgs/development/compilers/gcc/struct-sigaltstack-4.9.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/struct-sigaltstack-4.9.patch
diff --git a/pkgs/development/compilers/gcc/struct-sigaltstack.patch b/nixpkgs/pkgs/development/compilers/gcc/struct-sigaltstack.patch
index 6e1ddb252c2..6e1ddb252c2 100644
--- a/pkgs/development/compilers/gcc/struct-sigaltstack.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/struct-sigaltstack.patch
diff --git a/pkgs/development/compilers/gcc/struct-ucontext-4.5.patch b/nixpkgs/pkgs/development/compilers/gcc/struct-ucontext-4.5.patch
index a84e9ffe268..a84e9ffe268 100644
--- a/pkgs/development/compilers/gcc/struct-ucontext-4.5.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/struct-ucontext-4.5.patch
diff --git a/pkgs/development/compilers/gcc/struct-ucontext-4.8.patch b/nixpkgs/pkgs/development/compilers/gcc/struct-ucontext-4.8.patch
index 630ef6586e4..630ef6586e4 100644
--- a/pkgs/development/compilers/gcc/struct-ucontext-4.8.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/struct-ucontext-4.8.patch
diff --git a/pkgs/development/compilers/gcc/struct-ucontext-libjava.patch b/nixpkgs/pkgs/development/compilers/gcc/struct-ucontext-libjava.patch
index 3892a56954e..3892a56954e 100644
--- a/pkgs/development/compilers/gcc/struct-ucontext-libjava.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/struct-ucontext-libjava.patch
diff --git a/pkgs/development/compilers/gcc/struct-ucontext.patch b/nixpkgs/pkgs/development/compilers/gcc/struct-ucontext.patch
index c7fb6d1f71c..c7fb6d1f71c 100644
--- a/pkgs/development/compilers/gcc/struct-ucontext.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/struct-ucontext.patch
diff --git a/pkgs/development/compilers/gcc/use-source-date-epoch.patch b/nixpkgs/pkgs/development/compilers/gcc/use-source-date-epoch.patch
index 65a5ab028c1..65a5ab028c1 100644
--- a/pkgs/development/compilers/gcc/use-source-date-epoch.patch
+++ b/nixpkgs/pkgs/development/compilers/gcc/use-source-date-epoch.patch
diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix
index f4f63bc9b19..f4f63bc9b19 100644
--- a/pkgs/development/compilers/gcl/2.6.13-pre.nix
+++ b/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix
diff --git a/pkgs/development/compilers/gcl/default.nix b/nixpkgs/pkgs/development/compilers/gcl/default.nix
index e3c2d0e09de..e3c2d0e09de 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcl/default.nix
diff --git a/pkgs/development/compilers/gerbil/build.nix b/nixpkgs/pkgs/development/compilers/gerbil/build.nix
index e2ab0976482..e2ab0976482 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/nixpkgs/pkgs/development/compilers/gerbil/build.nix
diff --git a/pkgs/development/compilers/gerbil/default.nix b/nixpkgs/pkgs/development/compilers/gerbil/default.nix
index 8c6b1a87cd3..8c6b1a87cd3 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gerbil/default.nix
diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix
index 5f0347aa9a6..5f0347aa9a6 100644
--- a/pkgs/development/compilers/gerbil/unstable.nix
+++ b/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix
diff --git a/pkgs/development/compilers/gforth/default.nix b/nixpkgs/pkgs/development/compilers/gforth/default.nix
index e90e0dc3d98..e90e0dc3d98 100644
--- a/pkgs/development/compilers/gforth/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gforth/default.nix
diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix
index b68e4802551..b68e4802551 100644
--- a/pkgs/development/compilers/ghc/8.10.1.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix
diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix
index 1f24b9a1ff2..1f24b9a1ff2 100644
--- a/pkgs/development/compilers/ghc/8.2.2-binary.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.4.4.nix
index 075947a02a4..075947a02a4 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.4.4.nix
diff --git a/pkgs/development/compilers/ghc/8.6.3-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.3-binary.nix
index fe576186b0e..fe576186b0e 100644
--- a/pkgs/development/compilers/ghc/8.6.3-binary.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.3-binary.nix
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix
index b31b3db7eb2..b31b3db7eb2 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix
diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix
index 2b859de9799..2b859de9799 100644
--- a/pkgs/development/compilers/ghc/8.8.1.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix
diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix
index b0eef9ef924..b0eef9ef924 100644
--- a/pkgs/development/compilers/ghc/8.8.2.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix
diff --git a/pkgs/development/compilers/ghc/backport-dylib-command-size-limit.patch b/nixpkgs/pkgs/development/compilers/ghc/backport-dylib-command-size-limit.patch
index d0d94717d9c..d0d94717d9c 100644
--- a/pkgs/development/compilers/ghc/backport-dylib-command-size-limit.patch
+++ b/nixpkgs/pkgs/development/compilers/ghc/backport-dylib-command-size-limit.patch
diff --git a/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh b/nixpkgs/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh
index 45af982c297..45af982c297 100755
--- a/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh
+++ b/nixpkgs/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh
diff --git a/pkgs/development/compilers/ghc/head.nix b/nixpkgs/pkgs/development/compilers/ghc/head.nix
index d6ba6dd0fad..d6ba6dd0fad 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/head.nix
diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
index c54c782fafa..c54c782fafa 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/git.json b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json
index 1114e1a1290..1114e1a1290 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.6/git.json
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json
diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
index b957a6aa9e1..b957a6aa9e1 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
diff --git a/pkgs/development/compilers/ghcjs-ng/README.md b/nixpkgs/pkgs/development/compilers/ghcjs-ng/README.md
index 99ad980c965..99ad980c965 100644
--- a/pkgs/development/compilers/ghcjs-ng/README.md
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/README.md
diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
index 00a071651ed..00a071651ed 100644
--- a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
index 943866d5f24..943866d5f24 100644
--- a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix
index 7b6fbc460a9..7b6fbc460a9 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix
diff --git a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
index 7c10ce6572f..7c10ce6572f 100644
--- a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
diff --git a/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix
index f45ebb4511d..f45ebb4511d 100644
--- a/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix
diff --git a/pkgs/development/compilers/gleam/default.nix b/nixpkgs/pkgs/development/compilers/gleam/default.nix
index beef0ce03d9..beef0ce03d9 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gleam/default.nix
diff --git a/pkgs/development/compilers/glslang/default.nix b/nixpkgs/pkgs/development/compilers/glslang/default.nix
index 161e57b5479..161e57b5479 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/glslang/default.nix
diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix
index df5202cb1c2..df5202cb1c2 100644
--- a/pkgs/development/compilers/gnu-cobol/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix
diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix
index 1035091654a..1035091654a 100644
--- a/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix
diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix
index 94919090367..94919090367 100644
--- a/pkgs/development/compilers/go-jsonnet/default.nix
+++ b/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix
diff --git a/pkgs/development/compilers/go/1.12.nix b/nixpkgs/pkgs/development/compilers/go/1.12.nix
index 0a684a3a49e..0a684a3a49e 100644
--- a/pkgs/development/compilers/go/1.12.nix
+++ b/nixpkgs/pkgs/development/compilers/go/1.12.nix
diff --git a/pkgs/development/compilers/go/1.13.nix b/nixpkgs/pkgs/development/compilers/go/1.13.nix
index f9723728caa..f9723728caa 100644
--- a/pkgs/development/compilers/go/1.13.nix
+++ b/nixpkgs/pkgs/development/compilers/go/1.13.nix
diff --git a/pkgs/development/compilers/go/1.4.nix b/nixpkgs/pkgs/development/compilers/go/1.4.nix
index 0dd852a1ef1..0dd852a1ef1 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/nixpkgs/pkgs/development/compilers/go/1.4.nix
diff --git a/pkgs/development/compilers/go/creds-test-1.4.patch b/nixpkgs/pkgs/development/compilers/go/creds-test-1.4.patch
index 98cec532dcc..98cec532dcc 100644
--- a/pkgs/development/compilers/go/creds-test-1.4.patch
+++ b/nixpkgs/pkgs/development/compilers/go/creds-test-1.4.patch
diff --git a/pkgs/development/compilers/go/creds-test.patch b/nixpkgs/pkgs/development/compilers/go/creds-test.patch
index 6a18e6cc42e..6a18e6cc42e 100644
--- a/pkgs/development/compilers/go/creds-test.patch
+++ b/nixpkgs/pkgs/development/compilers/go/creds-test.patch
diff --git a/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch b/nixpkgs/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch
index a4d9f067479..a4d9f067479 100644
--- a/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch
+++ b/nixpkgs/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch
diff --git a/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch b/nixpkgs/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch
index 13db40ababc..13db40ababc 100644
--- a/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch
+++ b/nixpkgs/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch
diff --git a/pkgs/development/compilers/go/remove-fhs-test-references.patch b/nixpkgs/pkgs/development/compilers/go/remove-fhs-test-references.patch
index 1ea7f85d529..1ea7f85d529 100644
--- a/pkgs/development/compilers/go/remove-fhs-test-references.patch
+++ b/nixpkgs/pkgs/development/compilers/go/remove-fhs-test-references.patch
diff --git a/pkgs/development/compilers/go/remove-test-pie-1.13.patch b/nixpkgs/pkgs/development/compilers/go/remove-test-pie-1.13.patch
index 05f18b813f9..05f18b813f9 100644
--- a/pkgs/development/compilers/go/remove-test-pie-1.13.patch
+++ b/nixpkgs/pkgs/development/compilers/go/remove-test-pie-1.13.patch
diff --git a/pkgs/development/compilers/go/remove-test-pie.patch b/nixpkgs/pkgs/development/compilers/go/remove-test-pie.patch
index fb8e116af76..fb8e116af76 100644
--- a/pkgs/development/compilers/go/remove-test-pie.patch
+++ b/nixpkgs/pkgs/development/compilers/go/remove-test-pie.patch
diff --git a/pkgs/development/compilers/go/remove-tools-1.11.patch b/nixpkgs/pkgs/development/compilers/go/remove-tools-1.11.patch
index cff35999a83..cff35999a83 100644
--- a/pkgs/development/compilers/go/remove-tools-1.11.patch
+++ b/nixpkgs/pkgs/development/compilers/go/remove-tools-1.11.patch
diff --git a/pkgs/development/compilers/go/remove-tools-1.4.patch b/nixpkgs/pkgs/development/compilers/go/remove-tools-1.4.patch
index 807ab8e089c..807ab8e089c 100644
--- a/pkgs/development/compilers/go/remove-tools-1.4.patch
+++ b/nixpkgs/pkgs/development/compilers/go/remove-tools-1.4.patch
diff --git a/pkgs/development/compilers/go/remove-tools-1.9.patch b/nixpkgs/pkgs/development/compilers/go/remove-tools-1.9.patch
index e76ed61693a..e76ed61693a 100644
--- a/pkgs/development/compilers/go/remove-tools-1.9.patch
+++ b/nixpkgs/pkgs/development/compilers/go/remove-tools-1.9.patch
diff --git a/pkgs/development/compilers/go/setup-hook.sh b/nixpkgs/pkgs/development/compilers/go/setup-hook.sh
index 7dce15eeb10..7dce15eeb10 100644
--- a/pkgs/development/compilers/go/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/go/setup-hook.sh
diff --git a/pkgs/development/compilers/go/skip-external-network-tests.patch b/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests.patch
index 5791b213cb5..5791b213cb5 100644
--- a/pkgs/development/compilers/go/skip-external-network-tests.patch
+++ b/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests.patch
diff --git a/pkgs/development/compilers/go/skip-nohup-tests.patch b/nixpkgs/pkgs/development/compilers/go/skip-nohup-tests.patch
index 1da07407d04..1da07407d04 100644
--- a/pkgs/development/compilers/go/skip-nohup-tests.patch
+++ b/nixpkgs/pkgs/development/compilers/go/skip-nohup-tests.patch
diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch b/nixpkgs/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch
index afe5aea3d91..afe5aea3d91 100644
--- a/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch
+++ b/nixpkgs/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch
diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32.patch b/nixpkgs/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32.patch
index f3566b3ddaa..f3566b3ddaa 100644
--- a/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32.patch
+++ b/nixpkgs/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32.patch
diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch b/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch
index aa3116d76c1..aa3116d76c1 100644
--- a/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch
+++ b/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch
diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.13.patch b/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.13.patch
index 02a50d9c72f..02a50d9c72f 100644
--- a/pkgs/development/compilers/go/ssl-cert-file-1.13.patch
+++ b/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.13.patch
diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.9.patch b/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.9.patch
index 3f27bc138c1..3f27bc138c1 100644
--- a/pkgs/development/compilers/go/ssl-cert-file-1.9.patch
+++ b/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.9.patch
diff --git a/pkgs/development/compilers/gprolog/default.nix b/nixpkgs/pkgs/development/compilers/gprolog/default.nix
index b823bf9bdd4..b823bf9bdd4 100644
--- a/pkgs/development/compilers/gprolog/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gprolog/default.nix
diff --git a/pkgs/development/compilers/graalvm/001_mx.py.patch b/nixpkgs/pkgs/development/compilers/graalvm/001_mx.py.patch
index a87a030aa39..a87a030aa39 100644
--- a/pkgs/development/compilers/graalvm/001_mx.py.patch
+++ b/nixpkgs/pkgs/development/compilers/graalvm/001_mx.py.patch
diff --git a/pkgs/development/compilers/graalvm/002_setjmp.c.patch b/nixpkgs/pkgs/development/compilers/graalvm/002_setjmp.c.patch
index 38a29fd8fbf..38a29fd8fbf 100644
--- a/pkgs/development/compilers/graalvm/002_setjmp.c.patch
+++ b/nixpkgs/pkgs/development/compilers/graalvm/002_setjmp.c.patch
diff --git a/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch b/nixpkgs/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch
index bb9a0068712..bb9a0068712 100644
--- a/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch
+++ b/nixpkgs/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch
diff --git a/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch b/nixpkgs/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch
index 0aa1bc9b88d..0aa1bc9b88d 100644
--- a/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch
+++ b/nixpkgs/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch
diff --git a/pkgs/development/compilers/graalvm/default.nix b/nixpkgs/pkgs/development/compilers/graalvm/default.nix
index ec81063e67e..ec81063e67e 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/graalvm/default.nix
diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix
index c34c4695a23..c34c4695a23 100644
--- a/pkgs/development/compilers/graalvm/enterprise-edition.nix
+++ b/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix
diff --git a/pkgs/development/compilers/graalvm/truffle.make b/nixpkgs/pkgs/development/compilers/graalvm/truffle.make
index da887c14240..da887c14240 100644
--- a/pkgs/development/compilers/graalvm/truffle.make
+++ b/nixpkgs/pkgs/development/compilers/graalvm/truffle.make
diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix
index f15e1060203..f15e1060203 100644
--- a/pkgs/development/compilers/gwt/2.4.0.nix
+++ b/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix
diff --git a/pkgs/development/compilers/halide/default.nix b/nixpkgs/pkgs/development/compilers/halide/default.nix
index 44c079af926..44c079af926 100644
--- a/pkgs/development/compilers/halide/default.nix
+++ b/nixpkgs/pkgs/development/compilers/halide/default.nix
diff --git a/pkgs/development/compilers/halide/nix.patch b/nixpkgs/pkgs/development/compilers/halide/nix.patch
index fb9bbf1a4cf..fb9bbf1a4cf 100644
--- a/pkgs/development/compilers/halide/nix.patch
+++ b/nixpkgs/pkgs/development/compilers/halide/nix.patch
diff --git a/pkgs/development/compilers/haxe/default.nix b/nixpkgs/pkgs/development/compilers/haxe/default.nix
index 5329cf59aa3..5329cf59aa3 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/nixpkgs/pkgs/development/compilers/haxe/default.nix
diff --git a/pkgs/development/compilers/haxe/setup-hook.sh b/nixpkgs/pkgs/development/compilers/haxe/setup-hook.sh
index e6496107a5e..e6496107a5e 100644
--- a/pkgs/development/compilers/haxe/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/haxe/setup-hook.sh
diff --git a/pkgs/development/compilers/hhvm/default.nix b/nixpkgs/pkgs/development/compilers/hhvm/default.nix
index 08ba9e46814..08ba9e46814 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/hhvm/default.nix
diff --git a/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch b/nixpkgs/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch
index 61b6e5e8d8c..61b6e5e8d8c 100644
--- a/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch
+++ b/nixpkgs/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch
diff --git a/pkgs/development/compilers/hop/default.nix b/nixpkgs/pkgs/development/compilers/hop/default.nix
index 3db916e6003..3db916e6003 100644
--- a/pkgs/development/compilers/hop/default.nix
+++ b/nixpkgs/pkgs/development/compilers/hop/default.nix
diff --git a/pkgs/development/compilers/iasl/default.nix b/nixpkgs/pkgs/development/compilers/iasl/default.nix
index 1e7a46e7807..1e7a46e7807 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/iasl/default.nix
diff --git a/pkgs/development/compilers/inform7/default.nix b/nixpkgs/pkgs/development/compilers/inform7/default.nix
index 2a6551aad18..2a6551aad18 100644
--- a/pkgs/development/compilers/inform7/default.nix
+++ b/nixpkgs/pkgs/development/compilers/inform7/default.nix
diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix
index 0070bc23f73..0070bc23f73 100644
--- a/pkgs/development/compilers/intel-graphics-compiler/default.nix
+++ b/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix
diff --git a/pkgs/development/compilers/intercal/default.nix b/nixpkgs/pkgs/development/compilers/intercal/default.nix
index d890dc0fdfa..d890dc0fdfa 100644
--- a/pkgs/development/compilers/intercal/default.nix
+++ b/nixpkgs/pkgs/development/compilers/intercal/default.nix
diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix
index e64c0c912d9..e64c0c912d9 100644
--- a/pkgs/development/compilers/ios-cross-compile/9.2.nix
+++ b/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix
diff --git a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh
index 4604b1fdea7..4604b1fdea7 100644
--- a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh
+++ b/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh
diff --git a/pkgs/development/compilers/ios-cross-compile/alt_wrapper.c b/nixpkgs/pkgs/development/compilers/ios-cross-compile/alt_wrapper.c
index 928b64e6fd9..928b64e6fd9 100644
--- a/pkgs/development/compilers/ios-cross-compile/alt_wrapper.c
+++ b/nixpkgs/pkgs/development/compilers/ios-cross-compile/alt_wrapper.c
diff --git a/pkgs/development/compilers/ispc/default.nix b/nixpkgs/pkgs/development/compilers/ispc/default.nix
index 0c44595b24b..0c44595b24b 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ispc/default.nix
diff --git a/pkgs/development/compilers/jasmin/default.nix b/nixpkgs/pkgs/development/compilers/jasmin/default.nix
index ef1b3055190..ef1b3055190 100644
--- a/pkgs/development/compilers/jasmin/default.nix
+++ b/nixpkgs/pkgs/development/compilers/jasmin/default.nix
diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j b/nixpkgs/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j
index 564e6c8a9aa..564e6c8a9aa 100644
--- a/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j
+++ b/nixpkgs/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j
diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix b/nixpkgs/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix
index 1840edffa77..1840edffa77 100644
--- a/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix
+++ b/nixpkgs/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix
diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix
index f49d3d6e210..f49d3d6e210 100644
--- a/pkgs/development/compilers/javacard-devkit/default.nix
+++ b/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix
index 54d95fbd8a8..54d95fbd8a8 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix
diff --git a/pkgs/development/compilers/jsonnet/default.nix b/nixpkgs/pkgs/development/compilers/jsonnet/default.nix
index d7c05331991..d7c05331991 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/nixpkgs/pkgs/development/compilers/jsonnet/default.nix
diff --git a/pkgs/development/compilers/julia/0.7.nix b/nixpkgs/pkgs/development/compilers/julia/0.7.nix
index e0992d80003..e0992d80003 100644
--- a/pkgs/development/compilers/julia/0.7.nix
+++ b/nixpkgs/pkgs/development/compilers/julia/0.7.nix
diff --git a/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch b/nixpkgs/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch
index be4391399f5..be4391399f5 100644
--- a/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch
+++ b/nixpkgs/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch
diff --git a/pkgs/development/compilers/julia/1.0.nix b/nixpkgs/pkgs/development/compilers/julia/1.0.nix
index 3cd9daee141..3cd9daee141 100644
--- a/pkgs/development/compilers/julia/1.0.nix
+++ b/nixpkgs/pkgs/development/compilers/julia/1.0.nix
diff --git a/pkgs/development/compilers/julia/1.1.nix b/nixpkgs/pkgs/development/compilers/julia/1.1.nix
index 5be34b4c4b4..5be34b4c4b4 100644
--- a/pkgs/development/compilers/julia/1.1.nix
+++ b/nixpkgs/pkgs/development/compilers/julia/1.1.nix
diff --git a/pkgs/development/compilers/julia/allow_nix_mtime.patch b/nixpkgs/pkgs/development/compilers/julia/allow_nix_mtime.patch
index e4a164cfa1a..e4a164cfa1a 100644
--- a/pkgs/development/compilers/julia/allow_nix_mtime.patch
+++ b/nixpkgs/pkgs/development/compilers/julia/allow_nix_mtime.patch
diff --git a/pkgs/development/compilers/julia/shared.nix b/nixpkgs/pkgs/development/compilers/julia/shared.nix
index c706f2facec..c706f2facec 100644
--- a/pkgs/development/compilers/julia/shared.nix
+++ b/nixpkgs/pkgs/development/compilers/julia/shared.nix
diff --git a/pkgs/development/compilers/jwasm/default.nix b/nixpkgs/pkgs/development/compilers/jwasm/default.nix
index a9613de91eb..a9613de91eb 100644
--- a/pkgs/development/compilers/jwasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/jwasm/default.nix
diff --git a/pkgs/development/compilers/kotlin/default.nix b/nixpkgs/pkgs/development/compilers/kotlin/default.nix
index 6ad3f96bf59..6ad3f96bf59 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/nixpkgs/pkgs/development/compilers/kotlin/default.nix
diff --git a/pkgs/development/compilers/ldc/default.nix b/nixpkgs/pkgs/development/compilers/ldc/default.nix
index c397d02038d..c397d02038d 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ldc/default.nix
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix
index e391ce046db..e391ce046db 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix
diff --git a/pkgs/development/compilers/llvm/5/clang/purity.patch b/nixpkgs/pkgs/development/compilers/llvm/5/clang/purity.patch
index b30d0d0b5d5..b30d0d0b5d5 100644
--- a/pkgs/development/compilers/llvm/5/clang/purity.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/clang/purity.patch
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt-codesign.patch b/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt-codesign.patch
index 8f4c76bca1e..8f4c76bca1e 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt-codesign.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt-codesign.patch
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix
index 0282591b6e2..0282591b6e2 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/default.nix
index 05f4dbf6aa0..05f4dbf6aa0 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/default.nix
diff --git a/pkgs/development/compilers/llvm/5/fix-gcc9.patch b/nixpkgs/pkgs/development/compilers/llvm/5/fix-gcc9.patch
index eaf71f1468d..eaf71f1468d 100644
--- a/pkgs/development/compilers/llvm/5/fix-gcc9.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/fix-gcc9.patch
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix
index b02e09a83a8..b02e09a83a8 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix
diff --git a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh b/nixpkgs/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh
index 6611259165a..6611259165a 100644
--- a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi.nix
index 1b891af09ed..1b891af09ed 100644
--- a/pkgs/development/compilers/llvm/5/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi.nix
diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/5/lld.nix
index bfee91d91bf..bfee91d91bf 100644
--- a/pkgs/development/compilers/llvm/5/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/lld.nix
diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix
index a91a7e4354e..a91a7e4354e 100644
--- a/pkgs/development/compilers/llvm/5/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix
diff --git a/pkgs/development/compilers/llvm/5/llvm-outputs.patch b/nixpkgs/pkgs/development/compilers/llvm/5/llvm-outputs.patch
index 40096fa3497..40096fa3497 100644
--- a/pkgs/development/compilers/llvm/5/llvm-outputs.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/llvm-outputs.patch
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix
index 2ce17765d63..2ce17765d63 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix
diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/5/openmp.nix
index 559377bcc1b..559377bcc1b 100644
--- a/pkgs/development/compilers/llvm/5/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/openmp.nix
diff --git a/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch b/nixpkgs/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch
index c9ddfe45c89..c9ddfe45c89 100644
--- a/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix
index 9374fc0bda9..9374fc0bda9 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix
diff --git a/pkgs/development/compilers/llvm/6/clang/purity.patch b/nixpkgs/pkgs/development/compilers/llvm/6/clang/purity.patch
index b30d0d0b5d5..b30d0d0b5d5 100644
--- a/pkgs/development/compilers/llvm/6/clang/purity.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/clang/purity.patch
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch b/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch
index 8f4c76bca1e..8f4c76bca1e 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix
index b3b6e86fc52..b3b6e86fc52 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/nixpkgs/pkgs/development/compilers/llvm/6/default.nix
index d4745930ed3..d4745930ed3 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/default.nix
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix
index 831c6c9c700..831c6c9c700 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix
diff --git a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh b/nixpkgs/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
index 6611259165a..6611259165a 100644
--- a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi.nix
index ac1f4f653e6..ac1f4f653e6 100644
--- a/pkgs/development/compilers/llvm/6/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi.nix
diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/6/lld.nix
index 58b9b8060fa..58b9b8060fa 100644
--- a/pkgs/development/compilers/llvm/6/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/lld.nix
diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix
index 30d72d94426..30d72d94426 100644
--- a/pkgs/development/compilers/llvm/6/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix
diff --git a/pkgs/development/compilers/llvm/6/llvm-outputs.patch b/nixpkgs/pkgs/development/compilers/llvm/6/llvm-outputs.patch
index 40096fa3497..40096fa3497 100644
--- a/pkgs/development/compilers/llvm/6/llvm-outputs.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/llvm-outputs.patch
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix
index 80acd3fa2fe..80acd3fa2fe 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/6/openmp.nix
index 447904b9ad5..447904b9ad5 100644
--- a/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/openmp.nix
diff --git a/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch b/nixpkgs/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch
index 6266eb1958d..6266eb1958d 100644
--- a/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch
diff --git a/pkgs/development/compilers/llvm/7/bintools.nix b/nixpkgs/pkgs/development/compilers/llvm/7/bintools.nix
index 72a2a733193..72a2a733193 100644
--- a/pkgs/development/compilers/llvm/7/bintools.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/bintools.nix
diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix
index cc5dcfc160b..cc5dcfc160b 100644
--- a/pkgs/development/compilers/llvm/7/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix
diff --git a/pkgs/development/compilers/llvm/7/clang/purity.patch b/nixpkgs/pkgs/development/compilers/llvm/7/clang/purity.patch
index b30d0d0b5d5..b30d0d0b5d5 100644
--- a/pkgs/development/compilers/llvm/7/clang/purity.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/clang/purity.patch
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch
index 3cc12b94b20..3cc12b94b20 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix
index ae98940adea..ae98940adea 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix
diff --git a/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch b/nixpkgs/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch
index e63be181f95..e63be181f95 100644
--- a/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/default.nix
index f5dbea58a7d..f5dbea58a7d 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/default.nix
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix
index f2cdd2f6f5f..f2cdd2f6f5f 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix
diff --git a/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh
index 6611259165a..6611259165a 100644
--- a/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix
index 9067bf43a8f..9067bf43a8f 100644
--- a/pkgs/development/compilers/llvm/7/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix
diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/7/lld.nix
index 823e9640cf4..823e9640cf4 100644
--- a/pkgs/development/compilers/llvm/7/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/lld.nix
diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/7/lldb.nix
index ace6ae812fd..ace6ae812fd 100644
--- a/pkgs/development/compilers/llvm/7/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/lldb.nix
diff --git a/pkgs/development/compilers/llvm/7/llvm-outputs.patch b/nixpkgs/pkgs/development/compilers/llvm/7/llvm-outputs.patch
index 40096fa3497..40096fa3497 100644
--- a/pkgs/development/compilers/llvm/7/llvm-outputs.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/llvm-outputs.patch
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix
index d7fb1fe4b93..d7fb1fe4b93 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix
diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/7/openmp.nix
index 7adc2aa588e..7adc2aa588e 100644
--- a/pkgs/development/compilers/llvm/7/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/openmp.nix
diff --git a/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch b/nixpkgs/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
index 1f2ac97818e..1f2ac97818e 100644
--- a/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
diff --git a/pkgs/development/compilers/llvm/8/bintools.nix b/nixpkgs/pkgs/development/compilers/llvm/8/bintools.nix
index 72a2a733193..72a2a733193 100644
--- a/pkgs/development/compilers/llvm/8/bintools.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/bintools.nix
diff --git a/pkgs/development/compilers/llvm/8/clang/clang-xpc.patch b/nixpkgs/pkgs/development/compilers/llvm/8/clang/clang-xpc.patch
index eb57d345822..eb57d345822 100644
--- a/pkgs/development/compilers/llvm/8/clang/clang-xpc.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/clang-xpc.patch
diff --git a/pkgs/development/compilers/llvm/8/clang/compiler-rt-baremetal.patch b/nixpkgs/pkgs/development/compilers/llvm/8/clang/compiler-rt-baremetal.patch
index a4a0f21b0fc..a4a0f21b0fc 100644
--- a/pkgs/development/compilers/llvm/8/clang/compiler-rt-baremetal.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/compiler-rt-baremetal.patch
diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix
index 8601f6d0680..8601f6d0680 100644
--- a/pkgs/development/compilers/llvm/8/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix
diff --git a/pkgs/development/compilers/llvm/8/clang/purity.patch b/nixpkgs/pkgs/development/compilers/llvm/8/clang/purity.patch
index b30d0d0b5d5..b30d0d0b5d5 100644
--- a/pkgs/development/compilers/llvm/8/clang/purity.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/purity.patch
diff --git a/pkgs/development/compilers/llvm/8/clang/static-pie.patch b/nixpkgs/pkgs/development/compilers/llvm/8/clang/static-pie.patch
index d1f86a16232..d1f86a16232 100644
--- a/pkgs/development/compilers/llvm/8/clang/static-pie.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/static-pie.patch
diff --git a/pkgs/development/compilers/llvm/8/clang/unwindlib.patch b/nixpkgs/pkgs/development/compilers/llvm/8/clang/unwindlib.patch
index 6958fce60ce..6958fce60ce 100644
--- a/pkgs/development/compilers/llvm/8/clang/unwindlib.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/unwindlib.patch
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt-codesign.patch b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt-codesign.patch
index 3cc12b94b20..3cc12b94b20 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt-codesign.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt-codesign.patch
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 9c0829146f7..9c0829146f7 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix
diff --git a/pkgs/development/compilers/llvm/8/crtbegin-and-end.patch b/nixpkgs/pkgs/development/compilers/llvm/8/crtbegin-and-end.patch
index e63be181f95..e63be181f95 100644
--- a/pkgs/development/compilers/llvm/8/crtbegin-and-end.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/crtbegin-and-end.patch
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix
index 8b916e1cda7..8b916e1cda7 100644
--- a/pkgs/development/compilers/llvm/8/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix
diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix
index 883d9c8776f..883d9c8776f 100644
--- a/pkgs/development/compilers/llvm/8/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix
diff --git a/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh
index 6611259165a..6611259165a 100644
--- a/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix
index 58a1241d823..58a1241d823 100644
--- a/pkgs/development/compilers/llvm/8/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix
diff --git a/pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch b/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch
index 787f3e16500..787f3e16500 100644
--- a/pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch
diff --git a/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch b/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch
index 4ebfe46aa81..4ebfe46aa81 100644
--- a/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch
diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix
index 646cd3c3ca4..646cd3c3ca4 100644
--- a/pkgs/development/compilers/llvm/8/libunwind.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix
diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix
index fc52d691d03..fc52d691d03 100644
--- a/pkgs/development/compilers/llvm/8/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix
diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix
index 75be5b993df..75be5b993df 100644
--- a/pkgs/development/compilers/llvm/8/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix
diff --git a/pkgs/development/compilers/llvm/8/llvm-outputs.patch b/nixpkgs/pkgs/development/compilers/llvm/8/llvm-outputs.patch
index 40096fa3497..40096fa3497 100644
--- a/pkgs/development/compilers/llvm/8/llvm-outputs.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/llvm-outputs.patch
diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix
index a9c4a6b0ba2..a9c4a6b0ba2 100644
--- a/pkgs/development/compilers/llvm/8/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix
diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix
index 166e7f68eb3..166e7f68eb3 100644
--- a/pkgs/development/compilers/llvm/8/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix
diff --git a/pkgs/development/compilers/llvm/8/sanitizers-nongnu.patch b/nixpkgs/pkgs/development/compilers/llvm/8/sanitizers-nongnu.patch
index 1f2ac97818e..1f2ac97818e 100644
--- a/pkgs/development/compilers/llvm/8/sanitizers-nongnu.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/8/sanitizers-nongnu.patch
diff --git a/pkgs/development/compilers/llvm/9/bintools.nix b/nixpkgs/pkgs/development/compilers/llvm/9/bintools.nix
index 72a2a733193..72a2a733193 100644
--- a/pkgs/development/compilers/llvm/9/bintools.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/bintools.nix
diff --git a/pkgs/development/compilers/llvm/9/clang/compiler-rt-baremetal.patch b/nixpkgs/pkgs/development/compilers/llvm/9/clang/compiler-rt-baremetal.patch
index a4a0f21b0fc..a4a0f21b0fc 100644
--- a/pkgs/development/compilers/llvm/9/clang/compiler-rt-baremetal.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/clang/compiler-rt-baremetal.patch
diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix
index 5f89c3dc3b7..5f89c3dc3b7 100644
--- a/pkgs/development/compilers/llvm/9/clang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix
diff --git a/pkgs/development/compilers/llvm/9/clang/purity.patch b/nixpkgs/pkgs/development/compilers/llvm/9/clang/purity.patch
index a6729a9b004..a6729a9b004 100644
--- a/pkgs/development/compilers/llvm/9/clang/purity.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/clang/purity.patch
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt-codesign.patch b/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt-codesign.patch
index 3cc12b94b20..3cc12b94b20 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt-codesign.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt-codesign.patch
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix
index 037953bb23d..037953bb23d 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/nixpkgs/pkgs/development/compilers/llvm/9/default.nix
index 38ab7794018..38ab7794018 100644
--- a/pkgs/development/compilers/llvm/9/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/default.nix
diff --git a/pkgs/development/compilers/llvm/9/fix-test-on-non-x86-like-others.patch b/nixpkgs/pkgs/development/compilers/llvm/9/fix-test-on-non-x86-like-others.patch
index e6c2f040684..e6c2f040684 100644
--- a/pkgs/development/compilers/llvm/9/fix-test-on-non-x86-like-others.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/fix-test-on-non-x86-like-others.patch
diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix
index 9e3525574d5..9e3525574d5 100644
--- a/pkgs/development/compilers/llvm/9/libc++/default.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix
diff --git a/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh b/nixpkgs/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh
index 6611259165a..6611259165a 100644
--- a/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi.nix
index fbc9a3731ef..fbc9a3731ef 100644
--- a/pkgs/development/compilers/llvm/9/libc++abi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi.nix
diff --git a/pkgs/development/compilers/llvm/9/libcxxabi-no-threads.patch b/nixpkgs/pkgs/development/compilers/llvm/9/libcxxabi-no-threads.patch
index 787f3e16500..787f3e16500 100644
--- a/pkgs/development/compilers/llvm/9/libcxxabi-no-threads.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/libcxxabi-no-threads.patch
diff --git a/pkgs/development/compilers/llvm/9/libcxxabi-wasm.patch b/nixpkgs/pkgs/development/compilers/llvm/9/libcxxabi-wasm.patch
index 4ebfe46aa81..4ebfe46aa81 100644
--- a/pkgs/development/compilers/llvm/9/libcxxabi-wasm.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/libcxxabi-wasm.patch
diff --git a/pkgs/development/compilers/llvm/9/libunwind.nix b/nixpkgs/pkgs/development/compilers/llvm/9/libunwind.nix
index 883c36baf06..883c36baf06 100644
--- a/pkgs/development/compilers/llvm/9/libunwind.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/libunwind.nix
diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/9/lld.nix
index 775dc2e1905..775dc2e1905 100644
--- a/pkgs/development/compilers/llvm/9/lld.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/lld.nix
diff --git a/pkgs/development/compilers/llvm/9/lldb-procfs.patch b/nixpkgs/pkgs/development/compilers/llvm/9/lldb-procfs.patch
index b075dbaeee0..b075dbaeee0 100644
--- a/pkgs/development/compilers/llvm/9/lldb-procfs.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/lldb-procfs.patch
diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/9/lldb.nix
index 506fc1c3e50..506fc1c3e50 100644
--- a/pkgs/development/compilers/llvm/9/lldb.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/lldb.nix
diff --git a/pkgs/development/compilers/llvm/9/llvm-outputs.patch b/nixpkgs/pkgs/development/compilers/llvm/9/llvm-outputs.patch
index 40096fa3497..40096fa3497 100644
--- a/pkgs/development/compilers/llvm/9/llvm-outputs.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/llvm-outputs.patch
diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/9/llvm.nix
index 2cdc5a5fd06..2cdc5a5fd06 100644
--- a/pkgs/development/compilers/llvm/9/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/llvm.nix
diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/9/openmp.nix
index 4e0a5535ae3..4e0a5535ae3 100644
--- a/pkgs/development/compilers/llvm/9/openmp.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/openmp.nix
diff --git a/pkgs/development/compilers/llvm/9/sanitizers-nongnu.patch b/nixpkgs/pkgs/development/compilers/llvm/9/sanitizers-nongnu.patch
index 1f2ac97818e..1f2ac97818e 100644
--- a/pkgs/development/compilers/llvm/9/sanitizers-nongnu.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/9/sanitizers-nongnu.patch
diff --git a/pkgs/development/compilers/llvm/TLI-musl.patch b/nixpkgs/pkgs/development/compilers/llvm/TLI-musl.patch
index 1a690808663..1a690808663 100644
--- a/pkgs/development/compilers/llvm/TLI-musl.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/TLI-musl.patch
diff --git a/pkgs/development/compilers/llvm/aarch64.patch b/nixpkgs/pkgs/development/compilers/llvm/aarch64.patch
index 205074e48e4..205074e48e4 100644
--- a/pkgs/development/compilers/llvm/aarch64.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/aarch64.patch
diff --git a/pkgs/development/compilers/llvm/libcxx-0001-musl-hacks.patch b/nixpkgs/pkgs/development/compilers/llvm/libcxx-0001-musl-hacks.patch
index bcb5ad8cfb8..bcb5ad8cfb8 100644
--- a/pkgs/development/compilers/llvm/libcxx-0001-musl-hacks.patch
+++ b/nixpkgs/pkgs/development/compilers/llvm/libcxx-0001-musl-hacks.patch
diff --git a/pkgs/development/compilers/llvm/multi.nix b/nixpkgs/pkgs/development/compilers/llvm/multi.nix
index b4f2f8f9d6f..b4f2f8f9d6f 100644
--- a/pkgs/development/compilers/llvm/multi.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/multi.nix
diff --git a/pkgs/development/compilers/manticore/default.nix b/nixpkgs/pkgs/development/compilers/manticore/default.nix
index adfde05e658..adfde05e658 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/nixpkgs/pkgs/development/compilers/manticore/default.nix
diff --git a/pkgs/development/compilers/matter-compiler/Gemfile b/nixpkgs/pkgs/development/compilers/matter-compiler/Gemfile
index 21ec2345205..21ec2345205 100644
--- a/pkgs/development/compilers/matter-compiler/Gemfile
+++ b/nixpkgs/pkgs/development/compilers/matter-compiler/Gemfile
diff --git a/pkgs/development/compilers/matter-compiler/Gemfile.lock b/nixpkgs/pkgs/development/compilers/matter-compiler/Gemfile.lock
index ab1833b3cfe..ab1833b3cfe 100644
--- a/pkgs/development/compilers/matter-compiler/Gemfile.lock
+++ b/nixpkgs/pkgs/development/compilers/matter-compiler/Gemfile.lock
diff --git a/pkgs/development/compilers/matter-compiler/default.nix b/nixpkgs/pkgs/development/compilers/matter-compiler/default.nix
index f415fa8c012..f415fa8c012 100644
--- a/pkgs/development/compilers/matter-compiler/default.nix
+++ b/nixpkgs/pkgs/development/compilers/matter-compiler/default.nix
diff --git a/pkgs/development/compilers/matter-compiler/gemset.nix b/nixpkgs/pkgs/development/compilers/matter-compiler/gemset.nix
index 014fc226607..014fc226607 100644
--- a/pkgs/development/compilers/matter-compiler/gemset.nix
+++ b/nixpkgs/pkgs/development/compilers/matter-compiler/gemset.nix
diff --git a/pkgs/development/compilers/mcpp/default.nix b/nixpkgs/pkgs/development/compilers/mcpp/default.nix
index d7151147933..d7151147933 100644
--- a/pkgs/development/compilers/mcpp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mcpp/default.nix
diff --git a/pkgs/development/compilers/mercury/default.nix b/nixpkgs/pkgs/development/compilers/mercury/default.nix
index 0327e0dc215..0327e0dc215 100644
--- a/pkgs/development/compilers/mercury/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mercury/default.nix
diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
index 3869bdad84f..3869bdad84f 100644
--- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
+++ b/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
diff --git a/pkgs/development/compilers/mezzo/default.nix b/nixpkgs/pkgs/development/compilers/mezzo/default.nix
index c0b53574713..c0b53574713 100644
--- a/pkgs/development/compilers/mezzo/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mezzo/default.nix
diff --git a/pkgs/development/compilers/microscheme/default.nix b/nixpkgs/pkgs/development/compilers/microscheme/default.nix
index a18202b9f88..a18202b9f88 100644
--- a/pkgs/development/compilers/microscheme/default.nix
+++ b/nixpkgs/pkgs/development/compilers/microscheme/default.nix
diff --git a/pkgs/development/compilers/mint/default.nix b/nixpkgs/pkgs/development/compilers/mint/default.nix
index 5f72bd3649b..5f72bd3649b 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mint/default.nix
diff --git a/pkgs/development/compilers/mint/shards.nix b/nixpkgs/pkgs/development/compilers/mint/shards.nix
index dc6866e3af3..dc6866e3af3 100644
--- a/pkgs/development/compilers/mint/shards.nix
+++ b/nixpkgs/pkgs/development/compilers/mint/shards.nix
diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix
index ef7ad9b3266..ef7ad9b3266 100644
--- a/pkgs/development/compilers/mit-scheme/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix
diff --git a/pkgs/development/compilers/mkcl/default.nix b/nixpkgs/pkgs/development/compilers/mkcl/default.nix
index 405846343cf..405846343cf 100644
--- a/pkgs/development/compilers/mkcl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mkcl/default.nix
diff --git a/pkgs/development/compilers/mlton/20130715.nix b/nixpkgs/pkgs/development/compilers/mlton/20130715.nix
index 52bb0a0775c..52bb0a0775c 100644
--- a/pkgs/development/compilers/mlton/20130715.nix
+++ b/nixpkgs/pkgs/development/compilers/mlton/20130715.nix
diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/nixpkgs/pkgs/development/compilers/mlton/20180207-binary.nix
index 2b4998f91c9..2b4998f91c9 100644
--- a/pkgs/development/compilers/mlton/20180207-binary.nix
+++ b/nixpkgs/pkgs/development/compilers/mlton/20180207-binary.nix
diff --git a/pkgs/development/compilers/mlton/default.nix b/nixpkgs/pkgs/development/compilers/mlton/default.nix
index aaf58885140..aaf58885140 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mlton/default.nix
diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix
index 2585b599caf..2585b599caf 100644
--- a/pkgs/development/compilers/mlton/from-git-source.nix
+++ b/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix
diff --git a/pkgs/development/compilers/mlton/meta.nix b/nixpkgs/pkgs/development/compilers/mlton/meta.nix
index c4dc9c430bc..c4dc9c430bc 100644
--- a/pkgs/development/compilers/mlton/meta.nix
+++ b/nixpkgs/pkgs/development/compilers/mlton/meta.nix
diff --git a/pkgs/development/compilers/mono/4.nix b/nixpkgs/pkgs/development/compilers/mono/4.nix
index cb6edb2a546..cb6edb2a546 100644
--- a/pkgs/development/compilers/mono/4.nix
+++ b/nixpkgs/pkgs/development/compilers/mono/4.nix
diff --git a/pkgs/development/compilers/mono/5.nix b/nixpkgs/pkgs/development/compilers/mono/5.nix
index 0ecb362acb4..0ecb362acb4 100644
--- a/pkgs/development/compilers/mono/5.nix
+++ b/nixpkgs/pkgs/development/compilers/mono/5.nix
diff --git a/pkgs/development/compilers/mono/6.nix b/nixpkgs/pkgs/development/compilers/mono/6.nix
index 0157fa7b7f6..0157fa7b7f6 100644
--- a/pkgs/development/compilers/mono/6.nix
+++ b/nixpkgs/pkgs/development/compilers/mono/6.nix
diff --git a/pkgs/development/compilers/mono/generic.nix b/nixpkgs/pkgs/development/compilers/mono/generic.nix
index e0cfe247b23..e0cfe247b23 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/nixpkgs/pkgs/development/compilers/mono/generic.nix
diff --git a/pkgs/development/compilers/mono/llvm.nix b/nixpkgs/pkgs/development/compilers/mono/llvm.nix
index 36a457125fa..36a457125fa 100644
--- a/pkgs/development/compilers/mono/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/mono/llvm.nix
diff --git a/pkgs/development/compilers/mono/pkgconfig-before-gac.patch b/nixpkgs/pkgs/development/compilers/mono/pkgconfig-before-gac.patch
index 7632d850391..7632d850391 100644
--- a/pkgs/development/compilers/mono/pkgconfig-before-gac.patch
+++ b/nixpkgs/pkgs/development/compilers/mono/pkgconfig-before-gac.patch
diff --git a/pkgs/development/compilers/mosml/default.nix b/nixpkgs/pkgs/development/compilers/mosml/default.nix
index 19324593a30..19324593a30 100644
--- a/pkgs/development/compilers/mosml/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mosml/default.nix
diff --git a/pkgs/development/compilers/mozart/binary.nix b/nixpkgs/pkgs/development/compilers/mozart/binary.nix
index 8eb35f1b5f7..8eb35f1b5f7 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/nixpkgs/pkgs/development/compilers/mozart/binary.nix
diff --git a/pkgs/development/compilers/mozart/default.nix b/nixpkgs/pkgs/development/compilers/mozart/default.nix
index b8951c8c800..b8951c8c800 100644
--- a/pkgs/development/compilers/mozart/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mozart/default.nix
diff --git a/pkgs/development/compilers/mruby/default.nix b/nixpkgs/pkgs/development/compilers/mruby/default.nix
index e4c756e9c7d..e4c756e9c7d 100644
--- a/pkgs/development/compilers/mruby/default.nix
+++ b/nixpkgs/pkgs/development/compilers/mruby/default.nix
diff --git a/pkgs/development/compilers/nasm/default.nix b/nixpkgs/pkgs/development/compilers/nasm/default.nix
index f5645ae0219..f5645ae0219 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/nasm/default.nix
diff --git a/pkgs/development/compilers/neko/default.nix b/nixpkgs/pkgs/development/compilers/neko/default.nix
index 79c4aacbed5..79c4aacbed5 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/nixpkgs/pkgs/development/compilers/neko/default.nix
diff --git a/pkgs/development/compilers/nextpnr/default.nix b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix
index f0c1ba14c48..f0c1ba14c48 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix
diff --git a/pkgs/development/compilers/nim/default.nix b/nixpkgs/pkgs/development/compilers/nim/default.nix
index 316ddbfcb60..316ddbfcb60 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/nixpkgs/pkgs/development/compilers/nim/default.nix
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/nixpkgs/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index fa49bf9dd73..fa49bf9dd73 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/nixpkgs/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
diff --git a/pkgs/development/compilers/obliv-c/default.nix b/nixpkgs/pkgs/development/compilers/obliv-c/default.nix
index 8fd6f33740e..8fd6f33740e 100644
--- a/pkgs/development/compilers/obliv-c/default.nix
+++ b/nixpkgs/pkgs/development/compilers/obliv-c/default.nix
diff --git a/pkgs/development/compilers/obliv-c/ignore-complex-float128.patch b/nixpkgs/pkgs/development/compilers/obliv-c/ignore-complex-float128.patch
index e3a5b74a9cb..e3a5b74a9cb 100644
--- a/pkgs/development/compilers/obliv-c/ignore-complex-float128.patch
+++ b/nixpkgs/pkgs/development/compilers/obliv-c/ignore-complex-float128.patch
diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix
index cd621c131ff..cd621c131ff 100644
--- a/pkgs/development/compilers/ocaml/3.08.0.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix
index a6d2bcd875e..a6d2bcd875e 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix
diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix
index f582ef9834a..f582ef9834a 100644
--- a/pkgs/development/compilers/ocaml/3.11.2.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix
diff --git a/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch b/nixpkgs/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch
index 4b867bbb1e6..4b867bbb1e6 100644
--- a/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch
+++ b/nixpkgs/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix
index 1026b1bd8d7..1026b1bd8d7 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix
diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.00.1.nix
index a4b21251bd1..a4b21251bd1 100644
--- a/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.00.1.nix
diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.01.0.nix
index 6362f360f7d..6362f360f7d 100644
--- a/pkgs/development/compilers/ocaml/4.01.0.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.01.0.nix
diff --git a/pkgs/development/compilers/ocaml/4.02.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.02.nix
index 4773f9f74a5..4773f9f74a5 100644
--- a/pkgs/development/compilers/ocaml/4.02.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.02.nix
diff --git a/pkgs/development/compilers/ocaml/4.03.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.03.nix
index 0bbe8233041..0bbe8233041 100644
--- a/pkgs/development/compilers/ocaml/4.03.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.03.nix
diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.04.nix
index 4f49bcf8072..4f49bcf8072 100644
--- a/pkgs/development/compilers/ocaml/4.04.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.04.nix
diff --git a/pkgs/development/compilers/ocaml/4.05.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.05.nix
index a63b06a9f62..a63b06a9f62 100644
--- a/pkgs/development/compilers/ocaml/4.05.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.05.nix
diff --git a/pkgs/development/compilers/ocaml/4.06.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.06.nix
index b54b8a6288f..b54b8a6288f 100644
--- a/pkgs/development/compilers/ocaml/4.06.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.06.nix
diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.07.nix
index c1952f30ba6..c1952f30ba6 100644
--- a/pkgs/development/compilers/ocaml/4.07.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.07.nix
diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix
index 11c22e636ef..11c22e636ef 100644
--- a/pkgs/development/compilers/ocaml/4.08.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix
diff --git a/pkgs/development/compilers/ocaml/4.09.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.09.nix
index 4b56d82eba5..4b56d82eba5 100644
--- a/pkgs/development/compilers/ocaml/4.09.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.09.nix
diff --git a/pkgs/development/compilers/ocaml/4.10.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.10.nix
index 6f78ae05e02..6f78ae05e02 100644
--- a/pkgs/development/compilers/ocaml/4.10.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.10.nix
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix
index fb507b9836a..fb507b9836a 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix
diff --git a/pkgs/development/compilers/ocaml/builder.sh b/nixpkgs/pkgs/development/compilers/ocaml/builder.sh
index a1807682d86..a1807682d86 100644
--- a/pkgs/development/compilers/ocaml/builder.sh
+++ b/nixpkgs/pkgs/development/compilers/ocaml/builder.sh
diff --git a/pkgs/development/compilers/ocaml/configure-3.08.0 b/nixpkgs/pkgs/development/compilers/ocaml/configure-3.08.0
index 9c870585512..9c870585512 100755
--- a/pkgs/development/compilers/ocaml/configure-3.08.0
+++ b/nixpkgs/pkgs/development/compilers/ocaml/configure-3.08.0
diff --git a/pkgs/development/compilers/ocaml/fix-clang-build-on-osx.diff b/nixpkgs/pkgs/development/compilers/ocaml/fix-clang-build-on-osx.diff
index d7d9c863858..d7d9c863858 100644
--- a/pkgs/development/compilers/ocaml/fix-clang-build-on-osx.diff
+++ b/nixpkgs/pkgs/development/compilers/ocaml/fix-clang-build-on-osx.diff
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/nixpkgs/pkgs/development/compilers/ocaml/generic.nix
index 6980b6e5ff1..6980b6e5ff1 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/generic.nix
diff --git a/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch b/nixpkgs/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch
index dc2bcb86976..dc2bcb86976 100644
--- a/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch
+++ b/nixpkgs/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch
diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
index 1f53c4f0e78..1f53c4f0e78 100644
--- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
diff --git a/pkgs/development/compilers/ocaml/mips64.patch b/nixpkgs/pkgs/development/compilers/ocaml/mips64.patch
index cdef9cafb93..cdef9cafb93 100644
--- a/pkgs/development/compilers/ocaml/mips64.patch
+++ b/nixpkgs/pkgs/development/compilers/ocaml/mips64.patch
diff --git a/pkgs/development/compilers/ocaml/ocamlbuild.patch b/nixpkgs/pkgs/development/compilers/ocaml/ocamlbuild.patch
index d153fb67d41..d153fb67d41 100644
--- a/pkgs/development/compilers/ocaml/ocamlbuild.patch
+++ b/nixpkgs/pkgs/development/compilers/ocaml/ocamlbuild.patch
diff --git a/pkgs/development/compilers/opa/default.nix b/nixpkgs/pkgs/development/compilers/opa/default.nix
index da1df6f30bb..da1df6f30bb 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/nixpkgs/pkgs/development/compilers/opa/default.nix
diff --git a/pkgs/development/compilers/opendylan/bin.nix b/nixpkgs/pkgs/development/compilers/opendylan/bin.nix
index e11bb7251a6..e11bb7251a6 100644
--- a/pkgs/development/compilers/opendylan/bin.nix
+++ b/nixpkgs/pkgs/development/compilers/opendylan/bin.nix
diff --git a/pkgs/development/compilers/opendylan/default.nix b/nixpkgs/pkgs/development/compilers/opendylan/default.nix
index 8e732d7d8bf..8e732d7d8bf 100644
--- a/pkgs/development/compilers/opendylan/default.nix
+++ b/nixpkgs/pkgs/development/compilers/opendylan/default.nix
diff --git a/pkgs/development/compilers/openjdk/004_add-fontconfig.patch b/nixpkgs/pkgs/development/compilers/openjdk/004_add-fontconfig.patch
index 8172bc82190..8172bc82190 100644
--- a/pkgs/development/compilers/openjdk/004_add-fontconfig.patch
+++ b/nixpkgs/pkgs/development/compilers/openjdk/004_add-fontconfig.patch
diff --git a/pkgs/development/compilers/openjdk/005_enable-infinality.patch b/nixpkgs/pkgs/development/compilers/openjdk/005_enable-infinality.patch
index cc34e548758..cc34e548758 100644
--- a/pkgs/development/compilers/openjdk/005_enable-infinality.patch
+++ b/nixpkgs/pkgs/development/compilers/openjdk/005_enable-infinality.patch
diff --git a/pkgs/development/compilers/openjdk/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/11.nix
index 2081d339670..2081d339670 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/11.nix
diff --git a/pkgs/development/compilers/openjdk/8.nix b/nixpkgs/pkgs/development/compilers/openjdk/8.nix
index c6b3644fecc..c6b3644fecc 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/8.nix
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/nixpkgs/pkgs/development/compilers/openjdk/bootstrap.nix
index e58888cc9ed..e58888cc9ed 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/bootstrap.nix
diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch b/nixpkgs/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch
index e058eff0746..e058eff0746 100644
--- a/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch
+++ b/nixpkgs/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch
diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch b/nixpkgs/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch
index 2ff0fcc3d41..2ff0fcc3d41 100644
--- a/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch
+++ b/nixpkgs/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix
index 0b659b95aa8..0b659b95aa8 100644
--- a/pkgs/development/compilers/openjdk/darwin/11.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix
diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix
index bc7a33932b2..bc7a33932b2 100644
--- a/pkgs/development/compilers/openjdk/darwin/8.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix
diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix
index c954a8e2cf8..c954a8e2cf8 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix
diff --git a/pkgs/development/compilers/openjdk/default.nix b/nixpkgs/pkgs/development/compilers/openjdk/default.nix
index b2d511173c4..b2d511173c4 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/default.nix
diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch b/nixpkgs/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
index c037fde2972..c037fde2972 100644
--- a/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
+++ b/nixpkgs/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch b/nixpkgs/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch
index 6189412c999..6189412c999 100644
--- a/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch
+++ b/nixpkgs/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/generate-cacerts.pl b/nixpkgs/pkgs/development/compilers/openjdk/generate-cacerts.pl
index 3bdd42f7274..3bdd42f7274 100644
--- a/pkgs/development/compilers/openjdk/generate-cacerts.pl
+++ b/nixpkgs/pkgs/development/compilers/openjdk/generate-cacerts.pl
diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch b/nixpkgs/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch
index 6a1b253f913..6a1b253f913 100644
--- a/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch
+++ b/nixpkgs/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch
diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/nixpkgs/pkgs/development/compilers/openjdk/make-bootstrap.nix
index aac54417e2a..aac54417e2a 100644
--- a/pkgs/development/compilers/openjdk/make-bootstrap.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/make-bootstrap.nix
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix
index c6bff396108..c6bff396108 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix
diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/12.nix
index 30c8d36fdfc..30c8d36fdfc 100644
--- a/pkgs/development/compilers/openjdk/openjfx/12.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/12.nix
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch b/nixpkgs/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
index 6203064f5c0..6203064f5c0 100644
--- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
+++ b/nixpkgs/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch b/nixpkgs/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
index 08cf554a18f..08cf554a18f 100644
--- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
+++ b/nixpkgs/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch b/nixpkgs/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch
index b9258c500db..b9258c500db 100644
--- a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch
+++ b/nixpkgs/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch
diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch b/nixpkgs/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch
index 9538aade672..9538aade672 100644
--- a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch
+++ b/nixpkgs/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch
diff --git a/pkgs/development/compilers/openspin/default.nix b/nixpkgs/pkgs/development/compilers/openspin/default.nix
index b1e95bb704c..b1e95bb704c 100644
--- a/pkgs/development/compilers/openspin/default.nix
+++ b/nixpkgs/pkgs/development/compilers/openspin/default.nix
diff --git a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh b/nixpkgs/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
index 459bfce5098..459bfce5098 100644
--- a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
+++ b/nixpkgs/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index a96e703b28c..a96e703b28c 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index d9ee5010f7c..d9ee5010f7c 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 9fab02ab536..9fab02ab536 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
diff --git a/pkgs/development/compilers/orc/default.nix b/nixpkgs/pkgs/development/compilers/orc/default.nix
index 987c86ba264..987c86ba264 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/orc/default.nix
diff --git a/pkgs/development/compilers/osl/default.nix b/nixpkgs/pkgs/development/compilers/osl/default.nix
index 86a13a776ce..86a13a776ce 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/osl/default.nix
diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix
index 80ea9eb4c0b..80ea9eb4c0b 100644
--- a/pkgs/development/compilers/owl-lisp/default.nix
+++ b/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix
diff --git a/pkgs/development/compilers/pakcs/curry-base.nix b/nixpkgs/pkgs/development/compilers/pakcs/curry-base.nix
index b34a2146383..b34a2146383 100644
--- a/pkgs/development/compilers/pakcs/curry-base.nix
+++ b/nixpkgs/pkgs/development/compilers/pakcs/curry-base.nix
diff --git a/pkgs/development/compilers/pakcs/curry-frontend.nix b/nixpkgs/pkgs/development/compilers/pakcs/curry-frontend.nix
index b169578c7c3..b169578c7c3 100644
--- a/pkgs/development/compilers/pakcs/curry-frontend.nix
+++ b/nixpkgs/pkgs/development/compilers/pakcs/curry-frontend.nix
diff --git a/pkgs/development/compilers/pakcs/default.nix b/nixpkgs/pkgs/development/compilers/pakcs/default.nix
index 94b6daa888e..94b6daa888e 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/nixpkgs/pkgs/development/compilers/pakcs/default.nix
diff --git a/pkgs/development/compilers/pforth/default.nix b/nixpkgs/pkgs/development/compilers/pforth/default.nix
index 67d444428e9..67d444428e9 100644
--- a/pkgs/development/compilers/pforth/default.nix
+++ b/nixpkgs/pkgs/development/compilers/pforth/default.nix
diff --git a/pkgs/development/compilers/picat/default.nix b/nixpkgs/pkgs/development/compilers/picat/default.nix
index 87af63c671a..87af63c671a 100644
--- a/pkgs/development/compilers/picat/default.nix
+++ b/nixpkgs/pkgs/development/compilers/picat/default.nix
diff --git a/pkgs/development/compilers/polyml/5.6.nix b/nixpkgs/pkgs/development/compilers/polyml/5.6.nix
index 70a56e6f41e..70a56e6f41e 100644
--- a/pkgs/development/compilers/polyml/5.6.nix
+++ b/nixpkgs/pkgs/development/compilers/polyml/5.6.nix
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/nixpkgs/pkgs/development/compilers/polyml/5.7.nix
index db1c7613f65..db1c7613f65 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/nixpkgs/pkgs/development/compilers/polyml/5.7.nix
diff --git a/pkgs/development/compilers/polyml/default.nix b/nixpkgs/pkgs/development/compilers/polyml/default.nix
index 7be5fd993ae..7be5fd993ae 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/nixpkgs/pkgs/development/compilers/polyml/default.nix
diff --git a/pkgs/development/compilers/ponyc/default.nix b/nixpkgs/pkgs/development/compilers/ponyc/default.nix
index f5bcfa20aa0..f5bcfa20aa0 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ponyc/default.nix
diff --git a/pkgs/development/compilers/ponyc/disable-tests.patch b/nixpkgs/pkgs/development/compilers/ponyc/disable-tests.patch
index f8c996137af..f8c996137af 100644
--- a/pkgs/development/compilers/ponyc/disable-tests.patch
+++ b/nixpkgs/pkgs/development/compilers/ponyc/disable-tests.patch
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix
index 23e7f3b28f7..23e7f3b28f7 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix
diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix
index c2f8765a131..c2f8765a131 100644
--- a/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix
diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix
index d1797a448ad..d1797a448ad 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix
diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js b/nixpkgs/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js
index a3547e206b7..a3547e206b7 100644
--- a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js
+++ b/nixpkgs/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js
diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs b/nixpkgs/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs
index 8bf5a23f346..8bf5a23f346 100644
--- a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs
+++ b/nixpkgs/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs
diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix b/nixpkgs/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix
index 5f01298960c..5f01298960c 100644
--- a/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix
+++ b/nixpkgs/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix
diff --git a/pkgs/development/compilers/qbe/default.nix b/nixpkgs/pkgs/development/compilers/qbe/default.nix
index 8926fced482..8926fced482 100644
--- a/pkgs/development/compilers/qbe/default.nix
+++ b/nixpkgs/pkgs/development/compilers/qbe/default.nix
diff --git a/pkgs/development/compilers/rasm/default.nix b/nixpkgs/pkgs/development/compilers/rasm/default.nix
index ced0855597c..ced0855597c 100644
--- a/pkgs/development/compilers/rasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/rasm/default.nix
diff --git a/pkgs/development/compilers/reason/default.nix b/nixpkgs/pkgs/development/compilers/reason/default.nix
index 20286dcc43c..20286dcc43c 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/nixpkgs/pkgs/development/compilers/reason/default.nix
diff --git a/pkgs/development/compilers/rgbds/default.nix b/nixpkgs/pkgs/development/compilers/rgbds/default.nix
index bf2594b9bf4..bf2594b9bf4 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/nixpkgs/pkgs/development/compilers/rgbds/default.nix
diff --git a/pkgs/development/compilers/rust/1_38_0.nix b/nixpkgs/pkgs/development/compilers/rust/1_38_0.nix
index 13d2139bffd..13d2139bffd 100644
--- a/pkgs/development/compilers/rust/1_38_0.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/1_38_0.nix
diff --git a/pkgs/development/compilers/rust/1_40_0.nix b/nixpkgs/pkgs/development/compilers/rust/1_40_0.nix
index 2280605439f..2280605439f 100644
--- a/pkgs/development/compilers/rust/1_40_0.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/1_40_0.nix
diff --git a/pkgs/development/compilers/rust/binary.nix b/nixpkgs/pkgs/development/compilers/rust/binary.nix
index 06202901563..06202901563 100644
--- a/pkgs/development/compilers/rust/binary.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/binary.nix
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix
index 7c0b46d5593..7c0b46d5593 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix
diff --git a/pkgs/development/compilers/rust/cargo.nix b/nixpkgs/pkgs/development/compilers/rust/cargo.nix
index f639d330566..f639d330566 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/cargo.nix
diff --git a/pkgs/development/compilers/rust/clippy.nix b/nixpkgs/pkgs/development/compilers/rust/clippy.nix
index 56b70f21d4c..56b70f21d4c 100644
--- a/pkgs/development/compilers/rust/clippy.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/clippy.nix
diff --git a/pkgs/development/compilers/rust/default.nix b/nixpkgs/pkgs/development/compilers/rust/default.nix
index da3421a987d..da3421a987d 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/default.nix
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh
index 1d46fe376d4..1d46fe376d4 100755
--- a/pkgs/development/compilers/rust/print-hashes.sh
+++ b/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh
diff --git a/pkgs/development/compilers/rust/rls/default.nix b/nixpkgs/pkgs/development/compilers/rust/rls/default.nix
index 942e23c6170..942e23c6170 100644
--- a/pkgs/development/compilers/rust/rls/default.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/rls/default.nix
diff --git a/pkgs/development/compilers/rust/rust-src.nix b/nixpkgs/pkgs/development/compilers/rust/rust-src.nix
index 8977fb84caf..8977fb84caf 100644
--- a/pkgs/development/compilers/rust/rust-src.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/rust-src.nix
diff --git a/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix
index b0c26f3dffd..b0c26f3dffd 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix
diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix
index 9793eee1708..9793eee1708 100644
--- a/pkgs/development/compilers/rust/rustfmt.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix
diff --git a/pkgs/development/compilers/rust/setup-hook.sh b/nixpkgs/pkgs/development/compilers/rust/setup-hook.sh
index 5d4eb642fec..5d4eb642fec 100644
--- a/pkgs/development/compilers/rust/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/rust/setup-hook.sh
diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix
index 4b1358b7247..4b1358b7247 100644
--- a/pkgs/development/compilers/sagittarius-scheme/default.nix
+++ b/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix
index 9c777cc7572..9c777cc7572 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix
diff --git a/pkgs/development/compilers/sbcl/default.nix b/nixpkgs/pkgs/development/compilers/sbcl/default.nix
index 79173871095..79173871095 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/sbcl/default.nix
diff --git a/pkgs/development/compilers/scala/2.10.nix b/nixpkgs/pkgs/development/compilers/scala/2.10.nix
index 16e0389ad03..16e0389ad03 100644
--- a/pkgs/development/compilers/scala/2.10.nix
+++ b/nixpkgs/pkgs/development/compilers/scala/2.10.nix
diff --git a/pkgs/development/compilers/scala/2.11.nix b/nixpkgs/pkgs/development/compilers/scala/2.11.nix
index db1a8f4edca..db1a8f4edca 100644
--- a/pkgs/development/compilers/scala/2.11.nix
+++ b/nixpkgs/pkgs/development/compilers/scala/2.11.nix
diff --git a/pkgs/development/compilers/scala/2.12.nix b/nixpkgs/pkgs/development/compilers/scala/2.12.nix
index 3f61669b938..3f61669b938 100644
--- a/pkgs/development/compilers/scala/2.12.nix
+++ b/nixpkgs/pkgs/development/compilers/scala/2.12.nix
diff --git a/pkgs/development/compilers/scala/2.13.nix b/nixpkgs/pkgs/development/compilers/scala/2.13.nix
index b140d4e2a2d..b140d4e2a2d 100644
--- a/pkgs/development/compilers/scala/2.13.nix
+++ b/nixpkgs/pkgs/development/compilers/scala/2.13.nix
diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix
index 675e91b302a..675e91b302a 100644
--- a/pkgs/development/compilers/scala/dotty-bare.nix
+++ b/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix
diff --git a/pkgs/development/compilers/scala/dotty.nix b/nixpkgs/pkgs/development/compilers/scala/dotty.nix
index 7bc7fa3d4c2..7bc7fa3d4c2 100644
--- a/pkgs/development/compilers/scala/dotty.nix
+++ b/nixpkgs/pkgs/development/compilers/scala/dotty.nix
diff --git a/pkgs/development/compilers/sdcc/default.nix b/nixpkgs/pkgs/development/compilers/sdcc/default.nix
index cdac400b1af..cdac400b1af 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/sdcc/default.nix
diff --git a/pkgs/development/compilers/seexpr/default.nix b/nixpkgs/pkgs/development/compilers/seexpr/default.nix
index f6b732f02ae..f6b732f02ae 100644
--- a/pkgs/development/compilers/seexpr/default.nix
+++ b/nixpkgs/pkgs/development/compilers/seexpr/default.nix
diff --git a/pkgs/development/compilers/serpent/default.nix b/nixpkgs/pkgs/development/compilers/serpent/default.nix
index 6f1156897db..6f1156897db 100644
--- a/pkgs/development/compilers/serpent/default.nix
+++ b/nixpkgs/pkgs/development/compilers/serpent/default.nix
diff --git a/pkgs/development/compilers/shaderc/default.nix b/nixpkgs/pkgs/development/compilers/shaderc/default.nix
index 82cccc3befc..82cccc3befc 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/shaderc/default.nix
diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix
index e2103fb718f..e2103fb718f 100644
--- a/pkgs/development/compilers/smlnj/bootstrap.nix
+++ b/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix
diff --git a/pkgs/development/compilers/smlnj/default.nix b/nixpkgs/pkgs/development/compilers/smlnj/default.nix
index a79c9a702c4..a79c9a702c4 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/nixpkgs/pkgs/development/compilers/smlnj/default.nix
diff --git a/pkgs/development/compilers/smlnj/heap2exec.diff b/nixpkgs/pkgs/development/compilers/smlnj/heap2exec.diff
index ef21a8e7f07..ef21a8e7f07 100644
--- a/pkgs/development/compilers/smlnj/heap2exec.diff
+++ b/nixpkgs/pkgs/development/compilers/smlnj/heap2exec.diff
diff --git a/pkgs/development/compilers/solc/default.nix b/nixpkgs/pkgs/development/compilers/solc/default.nix
index 0f71ed79e7e..0f71ed79e7e 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/solc/default.nix
diff --git a/pkgs/development/compilers/souffle/default.nix b/nixpkgs/pkgs/development/compilers/souffle/default.nix
index 00d1a2f7960..00d1a2f7960 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/nixpkgs/pkgs/development/compilers/souffle/default.nix
diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix
index 1ee0b9ed0cc..1ee0b9ed0cc 100644
--- a/pkgs/development/compilers/spirv-llvm-translator/default.nix
+++ b/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix
diff --git a/pkgs/development/compilers/squeak/default.nix b/nixpkgs/pkgs/development/compilers/squeak/default.nix
index c8379fe9090..c8379fe9090 100644
--- a/pkgs/development/compilers/squeak/default.nix
+++ b/nixpkgs/pkgs/development/compilers/squeak/default.nix
diff --git a/pkgs/development/compilers/stalin/default.nix b/nixpkgs/pkgs/development/compilers/stalin/default.nix
index 09045ee2c11..09045ee2c11 100644
--- a/pkgs/development/compilers/stalin/default.nix
+++ b/nixpkgs/pkgs/development/compilers/stalin/default.nix
diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix
index 0140bb40111..0140bb40111 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix
diff --git a/pkgs/development/compilers/swift/default.nix b/nixpkgs/pkgs/development/compilers/swift/default.nix
index 77bc3cc5b73..77bc3cc5b73 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/nixpkgs/pkgs/development/compilers/swift/default.nix
diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/nixpkgs/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
index 60b2996b340..60b2996b340 100644
--- a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
+++ b/nixpkgs/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/nixpkgs/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
index 5ca6bf1354d..5ca6bf1354d 100644
--- a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
+++ b/nixpkgs/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch b/nixpkgs/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch
index 0a66af9e513..0a66af9e513 100644
--- a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch
+++ b/nixpkgs/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch
diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/nixpkgs/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
index 304b53a1dbf..304b53a1dbf 100644
--- a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
+++ b/nixpkgs/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
diff --git a/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch b/nixpkgs/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
index c05db520801..c05db520801 100644
--- a/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
+++ b/nixpkgs/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
diff --git a/pkgs/development/compilers/swift/patches/llvm-toolchain-dir.patch b/nixpkgs/pkgs/development/compilers/swift/patches/llvm-toolchain-dir.patch
index c22b5c820c8..c22b5c820c8 100644
--- a/pkgs/development/compilers/swift/patches/llvm-toolchain-dir.patch
+++ b/nixpkgs/pkgs/development/compilers/swift/patches/llvm-toolchain-dir.patch
diff --git a/pkgs/development/compilers/swift/purity.patch b/nixpkgs/pkgs/development/compilers/swift/purity.patch
index 4133e89c283..4133e89c283 100644
--- a/pkgs/development/compilers/swift/purity.patch
+++ b/nixpkgs/pkgs/development/compilers/swift/purity.patch
diff --git a/pkgs/development/compilers/terra/default.nix b/nixpkgs/pkgs/development/compilers/terra/default.nix
index 63557d61019..63557d61019 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/nixpkgs/pkgs/development/compilers/terra/default.nix
diff --git a/pkgs/development/compilers/terra/nix-cflags.patch b/nixpkgs/pkgs/development/compilers/terra/nix-cflags.patch
index 339ae23cef6..339ae23cef6 100644
--- a/pkgs/development/compilers/terra/nix-cflags.patch
+++ b/nixpkgs/pkgs/development/compilers/terra/nix-cflags.patch
diff --git a/pkgs/development/compilers/teyjus/default.nix b/nixpkgs/pkgs/development/compilers/teyjus/default.nix
index 41cc9b38606..41cc9b38606 100644
--- a/pkgs/development/compilers/teyjus/default.nix
+++ b/nixpkgs/pkgs/development/compilers/teyjus/default.nix
diff --git a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch b/nixpkgs/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch
index fa82d80633a..fa82d80633a 100644
--- a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch
+++ b/nixpkgs/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch
diff --git a/pkgs/development/compilers/tinycc/default.nix b/nixpkgs/pkgs/development/compilers/tinycc/default.nix
index 03e8be7053a..03e8be7053a 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/tinycc/default.nix
diff --git a/pkgs/development/compilers/tinygo/default.nix b/nixpkgs/pkgs/development/compilers/tinygo/default.nix
index 1c7363a83bb..1c7363a83bb 100644
--- a/pkgs/development/compilers/tinygo/default.nix
+++ b/nixpkgs/pkgs/development/compilers/tinygo/default.nix
diff --git a/pkgs/development/compilers/unison/default.nix b/nixpkgs/pkgs/development/compilers/unison/default.nix
index c24786cd9a0..c24786cd9a0 100644
--- a/pkgs/development/compilers/unison/default.nix
+++ b/nixpkgs/pkgs/development/compilers/unison/default.nix
diff --git a/pkgs/development/compilers/urn/default.nix b/nixpkgs/pkgs/development/compilers/urn/default.nix
index f3ff864f81b..f3ff864f81b 100644
--- a/pkgs/development/compilers/urn/default.nix
+++ b/nixpkgs/pkgs/development/compilers/urn/default.nix
diff --git a/pkgs/development/compilers/urweb/default.nix b/nixpkgs/pkgs/development/compilers/urweb/default.nix
index 31381aac741..31381aac741 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/nixpkgs/pkgs/development/compilers/urweb/default.nix
diff --git a/pkgs/development/compilers/vala/default.nix b/nixpkgs/pkgs/development/compilers/vala/default.nix
index d84503caa60..d84503caa60 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/nixpkgs/pkgs/development/compilers/vala/default.nix
diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch
index fdc1eabf513..fdc1eabf513 100644
--- a/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch
+++ b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch
diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch
index fc971c26492..fc971c26492 100644
--- a/pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch
+++ b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch
diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch
index 8c3e54b6a95..8c3e54b6a95 100644
--- a/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch
+++ b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch
diff --git a/pkgs/development/compilers/vala/gvc-compat.patch b/nixpkgs/pkgs/development/compilers/vala/gvc-compat.patch
index 8c0d25098f1..8c0d25098f1 100644
--- a/pkgs/development/compilers/vala/gvc-compat.patch
+++ b/nixpkgs/pkgs/development/compilers/vala/gvc-compat.patch
diff --git a/pkgs/development/compilers/vala/setup-hook.sh b/nixpkgs/pkgs/development/compilers/vala/setup-hook.sh
index 8252143e998..8252143e998 100644
--- a/pkgs/development/compilers/vala/setup-hook.sh
+++ b/nixpkgs/pkgs/development/compilers/vala/setup-hook.sh
diff --git a/pkgs/development/compilers/vlang/default.nix b/nixpkgs/pkgs/development/compilers/vlang/default.nix
index fba11a06a6e..fba11a06a6e 100644
--- a/pkgs/development/compilers/vlang/default.nix
+++ b/nixpkgs/pkgs/development/compilers/vlang/default.nix
diff --git a/pkgs/development/compilers/wcc/default.nix b/nixpkgs/pkgs/development/compilers/wcc/default.nix
index 5f812e2c463..5f812e2c463 100644
--- a/pkgs/development/compilers/wcc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/wcc/default.nix
diff --git a/pkgs/development/compilers/wla-dx/default.nix b/nixpkgs/pkgs/development/compilers/wla-dx/default.nix
index 5f83845a12a..5f83845a12a 100644
--- a/pkgs/development/compilers/wla-dx/default.nix
+++ b/nixpkgs/pkgs/development/compilers/wla-dx/default.nix
diff --git a/pkgs/development/compilers/x11basic/default.nix b/nixpkgs/pkgs/development/compilers/x11basic/default.nix
index 147ec13c555..147ec13c555 100644
--- a/pkgs/development/compilers/x11basic/default.nix
+++ b/nixpkgs/pkgs/development/compilers/x11basic/default.nix
diff --git a/pkgs/development/compilers/yap/default.nix b/nixpkgs/pkgs/development/compilers/yap/default.nix
index e6fdd03bb67..e6fdd03bb67 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/nixpkgs/pkgs/development/compilers/yap/default.nix
diff --git a/pkgs/development/compilers/yasm/default.nix b/nixpkgs/pkgs/development/compilers/yasm/default.nix
index 5aea623b91d..5aea623b91d 100644
--- a/pkgs/development/compilers/yasm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/yasm/default.nix
diff --git a/pkgs/development/compilers/yosys/default.nix b/nixpkgs/pkgs/development/compilers/yosys/default.nix
index 8948af17145..8948af17145 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/nixpkgs/pkgs/development/compilers/yosys/default.nix
diff --git a/pkgs/development/compilers/z88dk/default.nix b/nixpkgs/pkgs/development/compilers/z88dk/default.nix
index 2d62bfede09..2d62bfede09 100644
--- a/pkgs/development/compilers/z88dk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/z88dk/default.nix
diff --git a/pkgs/development/compilers/zig/default.nix b/nixpkgs/pkgs/development/compilers/zig/default.nix
index 961e28da82e..961e28da82e 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/nixpkgs/pkgs/development/compilers/zig/default.nix
diff --git a/pkgs/development/compilers/zulu/8.nix b/nixpkgs/pkgs/development/compilers/zulu/8.nix
index d05ec1a682a..d05ec1a682a 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/nixpkgs/pkgs/development/compilers/zulu/8.nix
diff --git a/pkgs/development/compilers/zulu/default.nix b/nixpkgs/pkgs/development/compilers/zulu/default.nix
index 5fe2473bac6..5fe2473bac6 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/nixpkgs/pkgs/development/compilers/zulu/default.nix
diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix
index 14048d1b0d8..14048d1b0d8 100644
--- a/pkgs/development/coq-modules/Cheerios/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix
diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix
index d145586af43..d145586af43 100644
--- a/pkgs/development/coq-modules/CoLoR/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix
diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix
index fb01da8d59c..fb01da8d59c 100644
--- a/pkgs/development/coq-modules/HoTT/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix
diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix
index ced2b7ce3db..ced2b7ce3db 100644
--- a/pkgs/development/coq-modules/InfSeqExt/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
index b9961289480..b9961289480 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix
index 798aaabe677..798aaabe677 100644
--- a/pkgs/development/coq-modules/StructTact/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix
diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix
index 92c9b2569ca..92c9b2569ca 100644
--- a/pkgs/development/coq-modules/Velisarios/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix
diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix
index 3cf3a4e8d4b..3cf3a4e8d4b 100644
--- a/pkgs/development/coq-modules/Verdi/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix
diff --git a/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch b/nixpkgs/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch
index dde0e2e03eb..dde0e2e03eb 100644
--- a/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch
+++ b/nixpkgs/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch
diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix
index ee08af40c51..ee08af40c51 100644
--- a/pkgs/development/coq-modules/autosubst/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/nixpkgs/pkgs/development/coq-modules/bignums/default.nix
index 0d6d7f17216..0d6d7f17216 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/bignums/default.nix
diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix
index 025a67a1e70..025a67a1e70 100644
--- a/pkgs/development/coq-modules/category-theory/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix
diff --git a/pkgs/development/coq-modules/contribs/default.nix b/nixpkgs/pkgs/development/coq-modules/contribs/default.nix
index 8362c704d95..8362c704d95 100644
--- a/pkgs/development/coq-modules/contribs/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/contribs/default.nix
diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix
index ed6118dbb55..ed6118dbb55 100644
--- a/pkgs/development/coq-modules/coq-bits/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix
diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix
index 56aa005c4a9..56aa005c4a9 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix
diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix
index 97703922395..97703922395 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix
diff --git a/pkgs/development/coq-modules/coq-extensible-records/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-extensible-records/default.nix
index 3b93b6b2de2..3b93b6b2de2 100644
--- a/pkgs/development/coq-modules/coq-extensible-records/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coq-extensible-records/default.nix
diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix
index e9263fb2be1..e9263fb2be1 100644
--- a/pkgs/development/coq-modules/coq-haskell/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix
diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix
index 83a505017fb..83a505017fb 100644
--- a/pkgs/development/coq-modules/coqhammer/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix
diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix
index aaf867baf25..aaf867baf25 100644
--- a/pkgs/development/coq-modules/coqprime/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix
diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix
index 3b916b5e40b..3b916b5e40b 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix
diff --git a/pkgs/development/coq-modules/corn/default.nix b/nixpkgs/pkgs/development/coq-modules/corn/default.nix
index 97bb884c92e..97bb884c92e 100644
--- a/pkgs/development/coq-modules/corn/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/corn/default.nix
diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix
index 49288d3cb32..49288d3cb32 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix
diff --git a/pkgs/development/coq-modules/equations/default.nix b/nixpkgs/pkgs/development/coq-modules/equations/default.nix
index 9ea9ac21671..9ea9ac21671 100644
--- a/pkgs/development/coq-modules/equations/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/equations/default.nix
diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/nixpkgs/pkgs/development/coq-modules/fiat/HEAD.nix
index 4abaec6528a..4abaec6528a 100644
--- a/pkgs/development/coq-modules/fiat/HEAD.nix
+++ b/nixpkgs/pkgs/development/coq-modules/fiat/HEAD.nix
diff --git a/pkgs/development/coq-modules/flocq/default.nix b/nixpkgs/pkgs/development/coq-modules/flocq/default.nix
index d9ad7d6e3be..d9ad7d6e3be 100644
--- a/pkgs/development/coq-modules/flocq/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/flocq/default.nix
diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix
index c610039eeec..c610039eeec 100644
--- a/pkgs/development/coq-modules/gappalib/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix
diff --git a/pkgs/development/coq-modules/heq/default.nix b/nixpkgs/pkgs/development/coq-modules/heq/default.nix
index 5d3c94c5f5c..5d3c94c5f5c 100644
--- a/pkgs/development/coq-modules/heq/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/heq/default.nix
diff --git a/pkgs/development/coq-modules/interval/default.nix b/nixpkgs/pkgs/development/coq-modules/interval/default.nix
index 73a0a07f704..73a0a07f704 100644
--- a/pkgs/development/coq-modules/interval/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/interval/default.nix
diff --git a/pkgs/development/coq-modules/iris/default.nix b/nixpkgs/pkgs/development/coq-modules/iris/default.nix
index 0718e518b35..0718e518b35 100644
--- a/pkgs/development/coq-modules/iris/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/iris/default.nix
diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix
index 92484f169c1..92484f169c1 100644
--- a/pkgs/development/coq-modules/ltac2/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix
diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix
index 7aad4261fd3..7aad4261fd3 100644
--- a/pkgs/development/coq-modules/math-classes/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix
index 647a13afa8f..647a13afa8f 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix
diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix
index 2df9cbe58c7..2df9cbe58c7 100644
--- a/pkgs/development/coq-modules/mathcomp/extra.nix
+++ b/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix
diff --git a/pkgs/development/coq-modules/metalib/default.nix b/nixpkgs/pkgs/development/coq-modules/metalib/default.nix
index c196bdbcd76..c196bdbcd76 100644
--- a/pkgs/development/coq-modules/metalib/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/metalib/default.nix
diff --git a/pkgs/development/coq-modules/paco/default.nix b/nixpkgs/pkgs/development/coq-modules/paco/default.nix
index fee6de7b35b..fee6de7b35b 100644
--- a/pkgs/development/coq-modules/paco/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/paco/default.nix
diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix
index a57d1bc9088..a57d1bc9088 100644
--- a/pkgs/development/coq-modules/paramcoq/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix
diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
index e74b158d33a..e74b158d33a 100644
--- a/pkgs/development/coq-modules/simple-io/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/nixpkgs/pkgs/development/coq-modules/ssreflect/default.nix
index 01df38375ef..01df38375ef 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/ssreflect/default.nix
diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix
index 3ba99e87ffb..3ba99e87ffb 100644
--- a/pkgs/development/coq-modules/stdpp/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix
diff --git a/pkgs/development/coq-modules/tlc/default.nix b/nixpkgs/pkgs/development/coq-modules/tlc/default.nix
index 119261f412b..119261f412b 100644
--- a/pkgs/development/coq-modules/tlc/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/tlc/default.nix
diff --git a/pkgs/development/dhall-modules/default.nix b/nixpkgs/pkgs/development/dhall-modules/default.nix
index b6632a86f31..b6632a86f31 100644
--- a/pkgs/development/dhall-modules/default.nix
+++ b/nixpkgs/pkgs/development/dhall-modules/default.nix
diff --git a/pkgs/development/dhall-modules/prelude/v3.nix b/nixpkgs/pkgs/development/dhall-modules/prelude/v3.nix
index ef673310ceb..ef673310ceb 100644
--- a/pkgs/development/dhall-modules/prelude/v3.nix
+++ b/nixpkgs/pkgs/development/dhall-modules/prelude/v3.nix
diff --git a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch b/nixpkgs/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch
index a3b2f87f378..a3b2f87f378 100644
--- a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch
+++ b/nixpkgs/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch
diff --git a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch b/nixpkgs/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch
index e53482e0c00..e53482e0c00 100644
--- a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch
+++ b/nixpkgs/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch
diff --git a/pkgs/development/em-modules/generic/default.nix b/nixpkgs/pkgs/development/em-modules/generic/default.nix
index a260beb5104..a260beb5104 100644
--- a/pkgs/development/em-modules/generic/default.nix
+++ b/nixpkgs/pkgs/development/em-modules/generic/default.nix
diff --git a/pkgs/development/go-modules/generic/default.nix b/nixpkgs/pkgs/development/go-modules/generic/default.nix
index 1bffb71e8f9..1bffb71e8f9 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/nixpkgs/pkgs/development/go-modules/generic/default.nix
diff --git a/pkgs/development/go-modules/tools/setup-hook.sh b/nixpkgs/pkgs/development/go-modules/tools/setup-hook.sh
index e354e50c35a..e354e50c35a 100644
--- a/pkgs/development/go-modules/tools/setup-hook.sh
+++ b/nixpkgs/pkgs/development/go-modules/tools/setup-hook.sh
diff --git a/pkgs/development/go-packages/generic/default.nix b/nixpkgs/pkgs/development/go-packages/generic/default.nix
index 03d777d5c88..03d777d5c88 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/nixpkgs/pkgs/development/go-packages/generic/default.nix
diff --git a/pkgs/development/go-packages/tools/setup-hook.sh b/nixpkgs/pkgs/development/go-packages/tools/setup-hook.sh
index e354e50c35a..e354e50c35a 100644
--- a/pkgs/development/go-packages/tools/setup-hook.sh
+++ b/nixpkgs/pkgs/development/go-packages/tools/setup-hook.sh
diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix
index 8377dad690f..8377dad690f 100644
--- a/pkgs/development/guile-modules/guile-cairo/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix
diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-fibers/default.nix
index cfb56790221..cfb56790221 100644
--- a/pkgs/development/guile-modules/guile-fibers/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-fibers/default.nix
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix
index 17f03f67cef..17f03f67cef 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix
index 97f501f41db..97f501f41db 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix
diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-ncurses/default.nix
index 8f601858267..8f601858267 100644
--- a/pkgs/development/guile-modules/guile-ncurses/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-ncurses/default.nix
diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-opengl/default.nix
index e1e04ecfe69..e1e04ecfe69 100644
--- a/pkgs/development/guile-modules/guile-opengl/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-opengl/default.nix
diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix
index 6ffcc153ec4..6ffcc153ec4 100644
--- a/pkgs/development/guile-modules/guile-reader/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix
diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix
index eff4c699625..eff4c699625 100644
--- a/pkgs/development/guile-modules/guile-sdl/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix
diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix
index be885d990ec..be885d990ec 100644
--- a/pkgs/development/guile-modules/guile-sdl2/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix
diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-xcb/default.nix
index b08d8313930..b08d8313930 100644
--- a/pkgs/development/guile-modules/guile-xcb/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-xcb/default.nix
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
index 64a15e39689..64a15e39689 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 5fc85101d4c..5fc85101d4c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 045c5dc1e5b..045c5dc1e5b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 513c55ea9e9..513c55ea9e9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 7c0866bfbe5..7c0866bfbe5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index be852679c9a..be852679c9a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 09755e4cc94..09755e4cc94 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 862b45299a6..862b45299a6 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5eddabd8934..5eddabd8934 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
index b2c65b7f03a..b2c65b7f03a 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-tensorflow.nix
index 71ae70335fd..71ae70335fd 100644
--- a/pkgs/development/haskell-modules/configuration-tensorflow.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-tensorflow.nix
diff --git a/pkgs/development/haskell-modules/default.nix b/nixpkgs/pkgs/development/haskell-modules/default.nix
index a4f0399cf3c..a4f0399cf3c 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/default.nix
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix
index c93fc5b7e45..c93fc5b7e45 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix
diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix
index 45c1a8fbd33..45c1a8fbd33 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
index dd8d563e42e..dd8d563e42e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
diff --git a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh b/nixpkgs/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
index 223d19b70f0..223d19b70f0 100644
--- a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
+++ b/nixpkgs/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/nixpkgs/pkgs/development/haskell-modules/hoogle.nix
index 0f620d46ccc..0f620d46ccc 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/hoogle.nix
diff --git a/pkgs/development/haskell-modules/initial-packages.nix b/nixpkgs/pkgs/development/haskell-modules/initial-packages.nix
index 6ab7da96911..6ab7da96911 100644
--- a/pkgs/development/haskell-modules/initial-packages.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/initial-packages.nix
diff --git a/pkgs/development/haskell-modules/lib.nix b/nixpkgs/pkgs/development/haskell-modules/lib.nix
index aebab7b6f04..aebab7b6f04 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/lib.nix
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix
index 9ba25e09db9..9ba25e09db9 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix
index 9a2ff6f4a2a..9a2ff6f4a2a 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix
diff --git a/pkgs/development/haskell-modules/patches/GLUT.patch b/nixpkgs/pkgs/development/haskell-modules/patches/GLUT.patch
index f2b63738611..f2b63738611 100644
--- a/pkgs/development/haskell-modules/patches/GLUT.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/GLUT.patch
diff --git a/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch b/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch
index 9e1eeb75160..9e1eeb75160 100644
--- a/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch
diff --git a/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch b/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch
index d99072d79c6..d99072d79c6 100644
--- a/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch
diff --git a/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch b/nixpkgs/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch
index 7b32dcb4ab6..7b32dcb4ab6 100644
--- a/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch
diff --git a/pkgs/development/haskell-modules/patches/dyre-nix.patch b/nixpkgs/pkgs/development/haskell-modules/patches/dyre-nix.patch
index 458e540e0c4..458e540e0c4 100644
--- a/pkgs/development/haskell-modules/patches/dyre-nix.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/dyre-nix.patch
diff --git a/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch b/nixpkgs/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch
index 510e450945b..510e450945b 100644
--- a/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch
diff --git a/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch b/nixpkgs/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
index 48cf6a035af..48cf6a035af 100644
--- a/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
diff --git a/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch b/nixpkgs/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch
index b3c75a26a03..b3c75a26a03 100644
--- a/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch
diff --git a/pkgs/development/haskell-modules/patches/hunspell.patch b/nixpkgs/pkgs/development/haskell-modules/patches/hunspell.patch
index cc115029a7a..cc115029a7a 100644
--- a/pkgs/development/haskell-modules/patches/hunspell.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/hunspell.patch
diff --git a/pkgs/development/haskell-modules/patches/opencv-fix-116.patch b/nixpkgs/pkgs/development/haskell-modules/patches/opencv-fix-116.patch
index bf89d8daf9f..bf89d8daf9f 100644
--- a/pkgs/development/haskell-modules/patches/opencv-fix-116.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/opencv-fix-116.patch
diff --git a/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch b/nixpkgs/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch
index 100a828a501..100a828a501 100644
--- a/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch
diff --git a/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch b/nixpkgs/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch
index 87fd2aeab21..87fd2aeab21 100644
--- a/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch
diff --git a/pkgs/development/haskell-modules/patches/servant-client-core-redact-auth-header.patch b/nixpkgs/pkgs/development/haskell-modules/patches/servant-client-core-redact-auth-header.patch
index 0f6a34f4f26..0f6a34f4f26 100644
--- a/pkgs/development/haskell-modules/patches/servant-client-core-redact-auth-header.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/servant-client-core-redact-auth-header.patch
diff --git a/pkgs/development/haskell-modules/patches/sexpr-0.2.1.patch b/nixpkgs/pkgs/development/haskell-modules/patches/sexpr-0.2.1.patch
index acafadba031..acafadba031 100644
--- a/pkgs/development/haskell-modules/patches/sexpr-0.2.1.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/sexpr-0.2.1.patch
diff --git a/pkgs/development/haskell-modules/patches/xattr-fix-build.patch b/nixpkgs/pkgs/development/haskell-modules/patches/xattr-fix-build.patch
index 4b4f370b17f..4b4f370b17f 100644
--- a/pkgs/development/haskell-modules/patches/xattr-fix-build.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/xattr-fix-build.patch
diff --git a/pkgs/development/haskell-modules/patches/xmonad-nix.patch b/nixpkgs/pkgs/development/haskell-modules/patches/xmonad-nix.patch
index cce011347f4..cce011347f4 100644
--- a/pkgs/development/haskell-modules/patches/xmonad-nix.patch
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/xmonad-nix.patch
diff --git a/pkgs/development/haskell-modules/stack-hook.sh b/nixpkgs/pkgs/development/haskell-modules/stack-hook.sh
index 44c184a5624..44c184a5624 100644
--- a/pkgs/development/haskell-modules/stack-hook.sh
+++ b/nixpkgs/pkgs/development/haskell-modules/stack-hook.sh
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 49beed8549d..49beed8549d 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix
diff --git a/pkgs/development/idris-modules/README.md b/nixpkgs/pkgs/development/idris-modules/README.md
index 80b7ccefbcf..80b7ccefbcf 100644
--- a/pkgs/development/idris-modules/README.md
+++ b/nixpkgs/pkgs/development/idris-modules/README.md
diff --git a/pkgs/development/idris-modules/TODO.md b/nixpkgs/pkgs/development/idris-modules/TODO.md
index 4dcaa61829a..4dcaa61829a 100644
--- a/pkgs/development/idris-modules/TODO.md
+++ b/nixpkgs/pkgs/development/idris-modules/TODO.md
diff --git a/pkgs/development/idris-modules/array.nix b/nixpkgs/pkgs/development/idris-modules/array.nix
index 38d25827d50..38d25827d50 100644
--- a/pkgs/development/idris-modules/array.nix
+++ b/nixpkgs/pkgs/development/idris-modules/array.nix
diff --git a/pkgs/development/idris-modules/bi.nix b/nixpkgs/pkgs/development/idris-modules/bi.nix
index 844ce98cd4c..844ce98cd4c 100644
--- a/pkgs/development/idris-modules/bi.nix
+++ b/nixpkgs/pkgs/development/idris-modules/bi.nix
diff --git a/pkgs/development/idris-modules/bifunctors.nix b/nixpkgs/pkgs/development/idris-modules/bifunctors.nix
index 3a915cd67f4..3a915cd67f4 100644
--- a/pkgs/development/idris-modules/bifunctors.nix
+++ b/nixpkgs/pkgs/development/idris-modules/bifunctors.nix
diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/nixpkgs/pkgs/development/idris-modules/build-builtin-package.nix
index ff19e52135c..ff19e52135c 100644
--- a/pkgs/development/idris-modules/build-builtin-package.nix
+++ b/nixpkgs/pkgs/development/idris-modules/build-builtin-package.nix
diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix
index ac0555636be..ac0555636be 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix
diff --git a/pkgs/development/idris-modules/bytes.nix b/nixpkgs/pkgs/development/idris-modules/bytes.nix
index ad63cb28399..ad63cb28399 100644
--- a/pkgs/development/idris-modules/bytes.nix
+++ b/nixpkgs/pkgs/development/idris-modules/bytes.nix
diff --git a/pkgs/development/idris-modules/canvas.nix b/nixpkgs/pkgs/development/idris-modules/canvas.nix
index 0f6e258ee20..0f6e258ee20 100644
--- a/pkgs/development/idris-modules/canvas.nix
+++ b/nixpkgs/pkgs/development/idris-modules/canvas.nix
diff --git a/pkgs/development/idris-modules/categories.nix b/nixpkgs/pkgs/development/idris-modules/categories.nix
index 91ee174dadf..91ee174dadf 100644
--- a/pkgs/development/idris-modules/categories.nix
+++ b/nixpkgs/pkgs/development/idris-modules/categories.nix
diff --git a/pkgs/development/idris-modules/coda.nix b/nixpkgs/pkgs/development/idris-modules/coda.nix
index c5e33f4594f..c5e33f4594f 100644
--- a/pkgs/development/idris-modules/coda.nix
+++ b/nixpkgs/pkgs/development/idris-modules/coda.nix
diff --git a/pkgs/development/idris-modules/comonad.nix b/nixpkgs/pkgs/development/idris-modules/comonad.nix
index a47739d52b1..a47739d52b1 100644
--- a/pkgs/development/idris-modules/comonad.nix
+++ b/nixpkgs/pkgs/development/idris-modules/comonad.nix
diff --git a/pkgs/development/idris-modules/composition.nix b/nixpkgs/pkgs/development/idris-modules/composition.nix
index de93d39395b..de93d39395b 100644
--- a/pkgs/development/idris-modules/composition.nix
+++ b/nixpkgs/pkgs/development/idris-modules/composition.nix
diff --git a/pkgs/development/idris-modules/config.nix b/nixpkgs/pkgs/development/idris-modules/config.nix
index 5c37961b7cb..5c37961b7cb 100644
--- a/pkgs/development/idris-modules/config.nix
+++ b/nixpkgs/pkgs/development/idris-modules/config.nix
diff --git a/pkgs/development/idris-modules/console.nix b/nixpkgs/pkgs/development/idris-modules/console.nix
index 71785483ce6..71785483ce6 100644
--- a/pkgs/development/idris-modules/console.nix
+++ b/nixpkgs/pkgs/development/idris-modules/console.nix
diff --git a/pkgs/development/idris-modules/containers.nix b/nixpkgs/pkgs/development/idris-modules/containers.nix
index 2fe783da448..2fe783da448 100644
--- a/pkgs/development/idris-modules/containers.nix
+++ b/nixpkgs/pkgs/development/idris-modules/containers.nix
diff --git a/pkgs/development/idris-modules/cube.nix b/nixpkgs/pkgs/development/idris-modules/cube.nix
index 7ccda5f21c0..7ccda5f21c0 100644
--- a/pkgs/development/idris-modules/cube.nix
+++ b/nixpkgs/pkgs/development/idris-modules/cube.nix
diff --git a/pkgs/development/idris-modules/data.nix b/nixpkgs/pkgs/development/idris-modules/data.nix
index 1c515ec3975..1c515ec3975 100644
--- a/pkgs/development/idris-modules/data.nix
+++ b/nixpkgs/pkgs/development/idris-modules/data.nix
diff --git a/pkgs/development/idris-modules/default.nix b/nixpkgs/pkgs/development/idris-modules/default.nix
index 074a260b816..074a260b816 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/nixpkgs/pkgs/development/idris-modules/default.nix
diff --git a/pkgs/development/idris-modules/derive.nix b/nixpkgs/pkgs/development/idris-modules/derive.nix
index 7f3164f3160..7f3164f3160 100644
--- a/pkgs/development/idris-modules/derive.nix
+++ b/nixpkgs/pkgs/development/idris-modules/derive.nix
diff --git a/pkgs/development/idris-modules/descncrunch.nix b/nixpkgs/pkgs/development/idris-modules/descncrunch.nix
index 8c808447f64..8c808447f64 100644
--- a/pkgs/development/idris-modules/descncrunch.nix
+++ b/nixpkgs/pkgs/development/idris-modules/descncrunch.nix
diff --git a/pkgs/development/idris-modules/dict.nix b/nixpkgs/pkgs/development/idris-modules/dict.nix
index c17ed9eefa2..c17ed9eefa2 100644
--- a/pkgs/development/idris-modules/dict.nix
+++ b/nixpkgs/pkgs/development/idris-modules/dict.nix
diff --git a/pkgs/development/idris-modules/dom.nix b/nixpkgs/pkgs/development/idris-modules/dom.nix
index e215e069609..e215e069609 100644
--- a/pkgs/development/idris-modules/dom.nix
+++ b/nixpkgs/pkgs/development/idris-modules/dom.nix
diff --git a/pkgs/development/idris-modules/electron.nix b/nixpkgs/pkgs/development/idris-modules/electron.nix
index 8b968c9732a..8b968c9732a 100644
--- a/pkgs/development/idris-modules/electron.nix
+++ b/nixpkgs/pkgs/development/idris-modules/electron.nix
diff --git a/pkgs/development/idris-modules/eternal.nix b/nixpkgs/pkgs/development/idris-modules/eternal.nix
index 9e0529628fe..9e0529628fe 100644
--- a/pkgs/development/idris-modules/eternal.nix
+++ b/nixpkgs/pkgs/development/idris-modules/eternal.nix
diff --git a/pkgs/development/idris-modules/farrp.nix b/nixpkgs/pkgs/development/idris-modules/farrp.nix
index bf0e609a610..bf0e609a610 100644
--- a/pkgs/development/idris-modules/farrp.nix
+++ b/nixpkgs/pkgs/development/idris-modules/farrp.nix
diff --git a/pkgs/development/idris-modules/free.nix b/nixpkgs/pkgs/development/idris-modules/free.nix
index 06b8ec5e82d..06b8ec5e82d 100644
--- a/pkgs/development/idris-modules/free.nix
+++ b/nixpkgs/pkgs/development/idris-modules/free.nix
diff --git a/pkgs/development/idris-modules/fsm.nix b/nixpkgs/pkgs/development/idris-modules/fsm.nix
index c6d8d8cf913..c6d8d8cf913 100644
--- a/pkgs/development/idris-modules/fsm.nix
+++ b/nixpkgs/pkgs/development/idris-modules/fsm.nix
diff --git a/pkgs/development/idris-modules/glfw.nix b/nixpkgs/pkgs/development/idris-modules/glfw.nix
index 882058bb185..882058bb185 100644
--- a/pkgs/development/idris-modules/glfw.nix
+++ b/nixpkgs/pkgs/development/idris-modules/glfw.nix
diff --git a/pkgs/development/idris-modules/graphviz.nix b/nixpkgs/pkgs/development/idris-modules/graphviz.nix
index 47c2ee638c5..47c2ee638c5 100644
--- a/pkgs/development/idris-modules/graphviz.nix
+++ b/nixpkgs/pkgs/development/idris-modules/graphviz.nix
diff --git a/pkgs/development/idris-modules/hamt.nix b/nixpkgs/pkgs/development/idris-modules/hamt.nix
index 79df925323e..79df925323e 100644
--- a/pkgs/development/idris-modules/hamt.nix
+++ b/nixpkgs/pkgs/development/idris-modules/hamt.nix
diff --git a/pkgs/development/idris-modules/hezarfen.nix b/nixpkgs/pkgs/development/idris-modules/hezarfen.nix
index f538cb29850..f538cb29850 100644
--- a/pkgs/development/idris-modules/hezarfen.nix
+++ b/nixpkgs/pkgs/development/idris-modules/hezarfen.nix
diff --git a/pkgs/development/idris-modules/hrtime.nix b/nixpkgs/pkgs/development/idris-modules/hrtime.nix
index 9e9736d2566..9e9736d2566 100644
--- a/pkgs/development/idris-modules/hrtime.nix
+++ b/nixpkgs/pkgs/development/idris-modules/hrtime.nix
diff --git a/pkgs/development/idris-modules/html.nix b/nixpkgs/pkgs/development/idris-modules/html.nix
index a44f0e70252..a44f0e70252 100644
--- a/pkgs/development/idris-modules/html.nix
+++ b/nixpkgs/pkgs/development/idris-modules/html.nix
diff --git a/pkgs/development/idris-modules/http.nix b/nixpkgs/pkgs/development/idris-modules/http.nix
index beec74a2f65..beec74a2f65 100644
--- a/pkgs/development/idris-modules/http.nix
+++ b/nixpkgs/pkgs/development/idris-modules/http.nix
diff --git a/pkgs/development/idris-modules/http4idris.nix b/nixpkgs/pkgs/development/idris-modules/http4idris.nix
index 80e95745f03..80e95745f03 100644
--- a/pkgs/development/idris-modules/http4idris.nix
+++ b/nixpkgs/pkgs/development/idris-modules/http4idris.nix
diff --git a/pkgs/development/idris-modules/iaia.nix b/nixpkgs/pkgs/development/idris-modules/iaia.nix
index f317b980d52..f317b980d52 100644
--- a/pkgs/development/idris-modules/iaia.nix
+++ b/nixpkgs/pkgs/development/idris-modules/iaia.nix
diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/nixpkgs/pkgs/development/idris-modules/idris-wrapper.nix
index 4e1d2f9c82e..4e1d2f9c82e 100644
--- a/pkgs/development/idris-modules/idris-wrapper.nix
+++ b/nixpkgs/pkgs/development/idris-modules/idris-wrapper.nix
diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/nixpkgs/pkgs/development/idris-modules/idrishighlighter.nix
index 5629221d601..5629221d601 100644
--- a/pkgs/development/idris-modules/idrishighlighter.nix
+++ b/nixpkgs/pkgs/development/idris-modules/idrishighlighter.nix
diff --git a/pkgs/development/idris-modules/idrisscript.nix b/nixpkgs/pkgs/development/idris-modules/idrisscript.nix
index 4365c588769..4365c588769 100644
--- a/pkgs/development/idris-modules/idrisscript.nix
+++ b/nixpkgs/pkgs/development/idris-modules/idrisscript.nix
diff --git a/pkgs/development/idris-modules/ipkgparser.nix b/nixpkgs/pkgs/development/idris-modules/ipkgparser.nix
index 3a4c0954fe8..3a4c0954fe8 100644
--- a/pkgs/development/idris-modules/ipkgparser.nix
+++ b/nixpkgs/pkgs/development/idris-modules/ipkgparser.nix
diff --git a/pkgs/development/idris-modules/jheiling-extras.nix b/nixpkgs/pkgs/development/idris-modules/jheiling-extras.nix
index 58f8a13864a..58f8a13864a 100644
--- a/pkgs/development/idris-modules/jheiling-extras.nix
+++ b/nixpkgs/pkgs/development/idris-modules/jheiling-extras.nix
diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/nixpkgs/pkgs/development/idris-modules/jheiling-js.nix
index dae310cda05..dae310cda05 100644
--- a/pkgs/development/idris-modules/jheiling-js.nix
+++ b/nixpkgs/pkgs/development/idris-modules/jheiling-js.nix
diff --git a/pkgs/development/idris-modules/js.nix b/nixpkgs/pkgs/development/idris-modules/js.nix
index 55169caaa10..55169caaa10 100644
--- a/pkgs/development/idris-modules/js.nix
+++ b/nixpkgs/pkgs/development/idris-modules/js.nix
diff --git a/pkgs/development/idris-modules/lens.nix b/nixpkgs/pkgs/development/idris-modules/lens.nix
index 490fd7bd2ed..490fd7bd2ed 100644
--- a/pkgs/development/idris-modules/lens.nix
+++ b/nixpkgs/pkgs/development/idris-modules/lens.nix
diff --git a/pkgs/development/idris-modules/lightyear.nix b/nixpkgs/pkgs/development/idris-modules/lightyear.nix
index fd014db30ef..fd014db30ef 100644
--- a/pkgs/development/idris-modules/lightyear.nix
+++ b/nixpkgs/pkgs/development/idris-modules/lightyear.nix
diff --git a/pkgs/development/idris-modules/logic.nix b/nixpkgs/pkgs/development/idris-modules/logic.nix
index 2346c89c48c..2346c89c48c 100644
--- a/pkgs/development/idris-modules/logic.nix
+++ b/nixpkgs/pkgs/development/idris-modules/logic.nix
diff --git a/pkgs/development/idris-modules/mapping.nix b/nixpkgs/pkgs/development/idris-modules/mapping.nix
index a4ac168dc4f..a4ac168dc4f 100644
--- a/pkgs/development/idris-modules/mapping.nix
+++ b/nixpkgs/pkgs/development/idris-modules/mapping.nix
diff --git a/pkgs/development/idris-modules/mhd.nix b/nixpkgs/pkgs/development/idris-modules/mhd.nix
index 197cb1552cb..197cb1552cb 100644
--- a/pkgs/development/idris-modules/mhd.nix
+++ b/nixpkgs/pkgs/development/idris-modules/mhd.nix
diff --git a/pkgs/development/idris-modules/pacman.nix b/nixpkgs/pkgs/development/idris-modules/pacman.nix
index 4ebffa3e87c..4ebffa3e87c 100644
--- a/pkgs/development/idris-modules/pacman.nix
+++ b/nixpkgs/pkgs/development/idris-modules/pacman.nix
diff --git a/pkgs/development/idris-modules/patricia.nix b/nixpkgs/pkgs/development/idris-modules/patricia.nix
index 5ce9ad7e915..5ce9ad7e915 100644
--- a/pkgs/development/idris-modules/patricia.nix
+++ b/nixpkgs/pkgs/development/idris-modules/patricia.nix
diff --git a/pkgs/development/idris-modules/permutations.nix b/nixpkgs/pkgs/development/idris-modules/permutations.nix
index 21b81f4a95c..21b81f4a95c 100644
--- a/pkgs/development/idris-modules/permutations.nix
+++ b/nixpkgs/pkgs/development/idris-modules/permutations.nix
diff --git a/pkgs/development/idris-modules/pfds.nix b/nixpkgs/pkgs/development/idris-modules/pfds.nix
index f9fbd26a0dd..f9fbd26a0dd 100644
--- a/pkgs/development/idris-modules/pfds.nix
+++ b/nixpkgs/pkgs/development/idris-modules/pfds.nix
diff --git a/pkgs/development/idris-modules/pipes.nix b/nixpkgs/pkgs/development/idris-modules/pipes.nix
index 0f62d73b9da..0f62d73b9da 100644
--- a/pkgs/development/idris-modules/pipes.nix
+++ b/nixpkgs/pkgs/development/idris-modules/pipes.nix
diff --git a/pkgs/development/idris-modules/posix.nix b/nixpkgs/pkgs/development/idris-modules/posix.nix
index 194b60bd298..194b60bd298 100644
--- a/pkgs/development/idris-modules/posix.nix
+++ b/nixpkgs/pkgs/development/idris-modules/posix.nix
diff --git a/pkgs/development/idris-modules/protobuf.nix b/nixpkgs/pkgs/development/idris-modules/protobuf.nix
index 1c2a58a6b7c..1c2a58a6b7c 100644
--- a/pkgs/development/idris-modules/protobuf.nix
+++ b/nixpkgs/pkgs/development/idris-modules/protobuf.nix
diff --git a/pkgs/development/idris-modules/quantities.nix b/nixpkgs/pkgs/development/idris-modules/quantities.nix
index 63cc2184504..63cc2184504 100644
--- a/pkgs/development/idris-modules/quantities.nix
+++ b/nixpkgs/pkgs/development/idris-modules/quantities.nix
diff --git a/pkgs/development/idris-modules/rationals.nix b/nixpkgs/pkgs/development/idris-modules/rationals.nix
index 7ce290c824e..7ce290c824e 100644
--- a/pkgs/development/idris-modules/rationals.nix
+++ b/nixpkgs/pkgs/development/idris-modules/rationals.nix
diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/nixpkgs/pkgs/development/idris-modules/recursion_schemes.nix
index dab6913ee8b..dab6913ee8b 100644
--- a/pkgs/development/idris-modules/recursion_schemes.nix
+++ b/nixpkgs/pkgs/development/idris-modules/recursion_schemes.nix
diff --git a/pkgs/development/idris-modules/refined.nix b/nixpkgs/pkgs/development/idris-modules/refined.nix
index 433fdf64769..433fdf64769 100644
--- a/pkgs/development/idris-modules/refined.nix
+++ b/nixpkgs/pkgs/development/idris-modules/refined.nix
diff --git a/pkgs/development/idris-modules/sdl.nix b/nixpkgs/pkgs/development/idris-modules/sdl.nix
index 4495e60d6bb..4495e60d6bb 100644
--- a/pkgs/development/idris-modules/sdl.nix
+++ b/nixpkgs/pkgs/development/idris-modules/sdl.nix
diff --git a/pkgs/development/idris-modules/sdl2.nix b/nixpkgs/pkgs/development/idris-modules/sdl2.nix
index e4a1fbae562..e4a1fbae562 100644
--- a/pkgs/development/idris-modules/sdl2.nix
+++ b/nixpkgs/pkgs/development/idris-modules/sdl2.nix
diff --git a/pkgs/development/idris-modules/semidirect.nix b/nixpkgs/pkgs/development/idris-modules/semidirect.nix
index 8e7428665cd..8e7428665cd 100644
--- a/pkgs/development/idris-modules/semidirect.nix
+++ b/nixpkgs/pkgs/development/idris-modules/semidirect.nix
diff --git a/pkgs/development/idris-modules/setoids.nix b/nixpkgs/pkgs/development/idris-modules/setoids.nix
index 6db49c3c3c9..6db49c3c3c9 100644
--- a/pkgs/development/idris-modules/setoids.nix
+++ b/nixpkgs/pkgs/development/idris-modules/setoids.nix
diff --git a/pkgs/development/idris-modules/smproc.nix b/nixpkgs/pkgs/development/idris-modules/smproc.nix
index 97ed06d307a..97ed06d307a 100644
--- a/pkgs/development/idris-modules/smproc.nix
+++ b/nixpkgs/pkgs/development/idris-modules/smproc.nix
diff --git a/pkgs/development/idris-modules/snippets.nix b/nixpkgs/pkgs/development/idris-modules/snippets.nix
index 6d752fed0f9..6d752fed0f9 100644
--- a/pkgs/development/idris-modules/snippets.nix
+++ b/nixpkgs/pkgs/development/idris-modules/snippets.nix
diff --git a/pkgs/development/idris-modules/software_foundations.nix b/nixpkgs/pkgs/development/idris-modules/software_foundations.nix
index 57748243302..57748243302 100644
--- a/pkgs/development/idris-modules/software_foundations.nix
+++ b/nixpkgs/pkgs/development/idris-modules/software_foundations.nix
diff --git a/pkgs/development/idris-modules/specdris.nix b/nixpkgs/pkgs/development/idris-modules/specdris.nix
index 06982a0b2ba..06982a0b2ba 100644
--- a/pkgs/development/idris-modules/specdris.nix
+++ b/nixpkgs/pkgs/development/idris-modules/specdris.nix
diff --git a/pkgs/development/idris-modules/tap.nix b/nixpkgs/pkgs/development/idris-modules/tap.nix
index 98f4b4ea4d6..98f4b4ea4d6 100644
--- a/pkgs/development/idris-modules/tap.nix
+++ b/nixpkgs/pkgs/development/idris-modules/tap.nix
diff --git a/pkgs/development/idris-modules/test.nix b/nixpkgs/pkgs/development/idris-modules/test.nix
index ccb575e270c..ccb575e270c 100644
--- a/pkgs/development/idris-modules/test.nix
+++ b/nixpkgs/pkgs/development/idris-modules/test.nix
diff --git a/pkgs/development/idris-modules/tlhydra.nix b/nixpkgs/pkgs/development/idris-modules/tlhydra.nix
index ffe1e46d86e..ffe1e46d86e 100644
--- a/pkgs/development/idris-modules/tlhydra.nix
+++ b/nixpkgs/pkgs/development/idris-modules/tlhydra.nix
diff --git a/pkgs/development/idris-modules/tomladris.nix b/nixpkgs/pkgs/development/idris-modules/tomladris.nix
index 402b5a01b76..402b5a01b76 100644
--- a/pkgs/development/idris-modules/tomladris.nix
+++ b/nixpkgs/pkgs/development/idris-modules/tomladris.nix
diff --git a/pkgs/development/idris-modules/tp.nix b/nixpkgs/pkgs/development/idris-modules/tp.nix
index 1823e76c290..1823e76c290 100644
--- a/pkgs/development/idris-modules/tp.nix
+++ b/nixpkgs/pkgs/development/idris-modules/tp.nix
diff --git a/pkgs/development/idris-modules/tparsec.nix b/nixpkgs/pkgs/development/idris-modules/tparsec.nix
index 599ca72c615..599ca72c615 100644
--- a/pkgs/development/idris-modules/tparsec.nix
+++ b/nixpkgs/pkgs/development/idris-modules/tparsec.nix
diff --git a/pkgs/development/idris-modules/transducers.nix b/nixpkgs/pkgs/development/idris-modules/transducers.nix
index 8f10f9bd247..8f10f9bd247 100644
--- a/pkgs/development/idris-modules/transducers.nix
+++ b/nixpkgs/pkgs/development/idris-modules/transducers.nix
diff --git a/pkgs/development/idris-modules/trees.nix b/nixpkgs/pkgs/development/idris-modules/trees.nix
index 69042e27d3d..69042e27d3d 100644
--- a/pkgs/development/idris-modules/trees.nix
+++ b/nixpkgs/pkgs/development/idris-modules/trees.nix
diff --git a/pkgs/development/idris-modules/union_type.nix b/nixpkgs/pkgs/development/idris-modules/union_type.nix
index 3a6dced48ce..3a6dced48ce 100644
--- a/pkgs/development/idris-modules/union_type.nix
+++ b/nixpkgs/pkgs/development/idris-modules/union_type.nix
diff --git a/pkgs/development/idris-modules/vdom.nix b/nixpkgs/pkgs/development/idris-modules/vdom.nix
index f6fdaf7a75e..f6fdaf7a75e 100644
--- a/pkgs/development/idris-modules/vdom.nix
+++ b/nixpkgs/pkgs/development/idris-modules/vdom.nix
diff --git a/pkgs/development/idris-modules/vecspace.nix b/nixpkgs/pkgs/development/idris-modules/vecspace.nix
index bf7e56cf8c0..bf7e56cf8c0 100644
--- a/pkgs/development/idris-modules/vecspace.nix
+++ b/nixpkgs/pkgs/development/idris-modules/vecspace.nix
diff --git a/pkgs/development/idris-modules/webgl.nix b/nixpkgs/pkgs/development/idris-modules/webgl.nix
index ddd0dec03a4..ddd0dec03a4 100644
--- a/pkgs/development/idris-modules/webgl.nix
+++ b/nixpkgs/pkgs/development/idris-modules/webgl.nix
diff --git a/pkgs/development/idris-modules/with-packages.nix b/nixpkgs/pkgs/development/idris-modules/with-packages.nix
index 47136839d01..47136839d01 100644
--- a/pkgs/development/idris-modules/with-packages.nix
+++ b/nixpkgs/pkgs/development/idris-modules/with-packages.nix
diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/nixpkgs/pkgs/development/idris-modules/wl-pprint.nix
index baceb2214e3..baceb2214e3 100644
--- a/pkgs/development/idris-modules/wl-pprint.nix
+++ b/nixpkgs/pkgs/development/idris-modules/wl-pprint.nix
diff --git a/pkgs/development/idris-modules/wyvern.nix b/nixpkgs/pkgs/development/idris-modules/wyvern.nix
index 870bf1a6b9b..870bf1a6b9b 100644
--- a/pkgs/development/idris-modules/wyvern.nix
+++ b/nixpkgs/pkgs/development/idris-modules/wyvern.nix
diff --git a/pkgs/development/idris-modules/xhr.nix b/nixpkgs/pkgs/development/idris-modules/xhr.nix
index 9e6f40b963f..9e6f40b963f 100644
--- a/pkgs/development/idris-modules/xhr.nix
+++ b/nixpkgs/pkgs/development/idris-modules/xhr.nix
diff --git a/pkgs/development/idris-modules/yaml.nix b/nixpkgs/pkgs/development/idris-modules/yaml.nix
index 61efb8cd575..61efb8cd575 100644
--- a/pkgs/development/idris-modules/yaml.nix
+++ b/nixpkgs/pkgs/development/idris-modules/yaml.nix
diff --git a/pkgs/development/idris-modules/yampa.nix b/nixpkgs/pkgs/development/idris-modules/yampa.nix
index ebe92f46898..ebe92f46898 100644
--- a/pkgs/development/idris-modules/yampa.nix
+++ b/nixpkgs/pkgs/development/idris-modules/yampa.nix
diff --git a/pkgs/development/interpreters/acl2/default.nix b/nixpkgs/pkgs/development/interpreters/acl2/default.nix
index 8d93492209c..8d93492209c 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/acl2/default.nix
diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/nixpkgs/pkgs/development/interpreters/angelscript/2.22.nix
index 0449572da02..0449572da02 100644
--- a/pkgs/development/interpreters/angelscript/2.22.nix
+++ b/nixpkgs/pkgs/development/interpreters/angelscript/2.22.nix
diff --git a/pkgs/development/interpreters/angelscript/default.nix b/nixpkgs/pkgs/development/interpreters/angelscript/default.nix
index 0209bcaaafc..0209bcaaafc 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/angelscript/default.nix
diff --git a/pkgs/development/interpreters/angelscript/default.upstream b/nixpkgs/pkgs/development/interpreters/angelscript/default.upstream
index 7dbe527b276..7dbe527b276 100644
--- a/pkgs/development/interpreters/angelscript/default.upstream
+++ b/nixpkgs/pkgs/development/interpreters/angelscript/default.upstream
diff --git a/pkgs/development/interpreters/bats/default.nix b/nixpkgs/pkgs/development/interpreters/bats/default.nix
index 744106bce5d..744106bce5d 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/bats/default.nix
diff --git a/pkgs/development/interpreters/ceptre/default.nix b/nixpkgs/pkgs/development/interpreters/ceptre/default.nix
index cde9146f78c..cde9146f78c 100644
--- a/pkgs/development/interpreters/ceptre/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/ceptre/default.nix
diff --git a/pkgs/development/interpreters/chibi/default.nix b/nixpkgs/pkgs/development/interpreters/chibi/default.nix
index 2ad0bc0285e..2ad0bc0285e 100644
--- a/pkgs/development/interpreters/chibi/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/chibi/default.nix
diff --git a/pkgs/development/interpreters/clips/default.nix b/nixpkgs/pkgs/development/interpreters/clips/default.nix
index c70bfd9406e..c70bfd9406e 100644
--- a/pkgs/development/interpreters/clips/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/clips/default.nix
diff --git a/pkgs/development/interpreters/clisp/bits_ipctypes_to_sys_ipc.patch b/nixpkgs/pkgs/development/interpreters/clisp/bits_ipctypes_to_sys_ipc.patch
index d6163022830..d6163022830 100644
--- a/pkgs/development/interpreters/clisp/bits_ipctypes_to_sys_ipc.patch
+++ b/nixpkgs/pkgs/development/interpreters/clisp/bits_ipctypes_to_sys_ipc.patch
diff --git a/pkgs/development/interpreters/clisp/default.nix b/nixpkgs/pkgs/development/interpreters/clisp/default.nix
index 5dcfa42c92f..5dcfa42c92f 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/clisp/default.nix
diff --git a/pkgs/development/interpreters/clisp/hg.nix b/nixpkgs/pkgs/development/interpreters/clisp/hg.nix
index 550535f30ae..550535f30ae 100644
--- a/pkgs/development/interpreters/clisp/hg.nix
+++ b/nixpkgs/pkgs/development/interpreters/clisp/hg.nix
diff --git a/pkgs/development/interpreters/clisp/remove-cfree-binding.patch b/nixpkgs/pkgs/development/interpreters/clisp/remove-cfree-binding.patch
index 4b570c3a467..4b570c3a467 100644
--- a/pkgs/development/interpreters/clisp/remove-cfree-binding.patch
+++ b/nixpkgs/pkgs/development/interpreters/clisp/remove-cfree-binding.patch
diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix
index 369d84708dc..369d84708dc 100644
--- a/pkgs/development/interpreters/clojure/clooj.nix
+++ b/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix
diff --git a/pkgs/development/interpreters/clojure/default.nix b/nixpkgs/pkgs/development/interpreters/clojure/default.nix
index 8187bf4af8e..8187bf4af8e 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/clojure/default.nix
diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix
index 0e9d81d5e95..0e9d81d5e95 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix
diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.edn b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/deps.edn
index e1563599a8c..e1563599a8c 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/deps.edn
+++ b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/deps.edn
diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.nix b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/deps.nix
index 3e53c7f98dd..3e53c7f98dd 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/deps.nix
+++ b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/deps.nix
diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/package.json
index cfffdc890d1..cfffdc890d1 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/package.json
+++ b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/package.json
diff --git a/pkgs/development/interpreters/dart/default.nix b/nixpkgs/pkgs/development/interpreters/dart/default.nix
index 02ac6bfbcde..02ac6bfbcde 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/dart/default.nix
diff --git a/pkgs/development/interpreters/dhall/default.nix b/nixpkgs/pkgs/development/interpreters/dhall/default.nix
index 8e1df36e412..8e1df36e412 100644
--- a/pkgs/development/interpreters/dhall/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/dhall/default.nix
diff --git a/pkgs/development/interpreters/duktape/default.nix b/nixpkgs/pkgs/development/interpreters/duktape/default.nix
index 369c3840b87..369c3840b87 100644
--- a/pkgs/development/interpreters/duktape/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/duktape/default.nix
diff --git a/pkgs/development/interpreters/eff/default.nix b/nixpkgs/pkgs/development/interpreters/eff/default.nix
index 9da2b0d899d..9da2b0d899d 100644
--- a/pkgs/development/interpreters/eff/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/eff/default.nix
diff --git a/pkgs/development/interpreters/elixir/1.10.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.10.nix
index f9e1451354d..f9e1451354d 100644
--- a/pkgs/development/interpreters/elixir/1.10.nix
+++ b/nixpkgs/pkgs/development/interpreters/elixir/1.10.nix
diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.6.nix
index 94dffd1f763..94dffd1f763 100644
--- a/pkgs/development/interpreters/elixir/1.6.nix
+++ b/nixpkgs/pkgs/development/interpreters/elixir/1.6.nix
diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.7.nix
index 10ebd5438a1..10ebd5438a1 100644
--- a/pkgs/development/interpreters/elixir/1.7.nix
+++ b/nixpkgs/pkgs/development/interpreters/elixir/1.7.nix
diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.8.nix
index 931fa50b1f7..931fa50b1f7 100644
--- a/pkgs/development/interpreters/elixir/1.8.nix
+++ b/nixpkgs/pkgs/development/interpreters/elixir/1.8.nix
diff --git a/pkgs/development/interpreters/elixir/1.9.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.9.nix
index 4eead35bae3..4eead35bae3 100644
--- a/pkgs/development/interpreters/elixir/1.9.nix
+++ b/nixpkgs/pkgs/development/interpreters/elixir/1.9.nix
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix
index a1186557101..a1186557101 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix
diff --git a/pkgs/development/interpreters/elixir/setup-hook.sh b/nixpkgs/pkgs/development/interpreters/elixir/setup-hook.sh
index 501eca3cf02..501eca3cf02 100644
--- a/pkgs/development/interpreters/elixir/setup-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/elixir/setup-hook.sh
diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix
index 11637868ed0..11637868ed0 100644
--- a/pkgs/development/interpreters/erlang/R16B02-basho.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix
diff --git a/pkgs/development/interpreters/erlang/R18.nix b/nixpkgs/pkgs/development/interpreters/erlang/R18.nix
index e9d9366851e..e9d9366851e 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/R18.nix
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/nixpkgs/pkgs/development/interpreters/erlang/R19.nix
index d5f3afe5f3d..d5f3afe5f3d 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/R19.nix
diff --git a/pkgs/development/interpreters/erlang/R20.nix b/nixpkgs/pkgs/development/interpreters/erlang/R20.nix
index 3a33e55767b..3a33e55767b 100644
--- a/pkgs/development/interpreters/erlang/R20.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/R20.nix
diff --git a/pkgs/development/interpreters/erlang/R21.nix b/nixpkgs/pkgs/development/interpreters/erlang/R21.nix
index fdd034fc607..fdd034fc607 100644
--- a/pkgs/development/interpreters/erlang/R21.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/R21.nix
diff --git a/pkgs/development/interpreters/erlang/R22.nix b/nixpkgs/pkgs/development/interpreters/erlang/R22.nix
index 88fe21453a8..88fe21453a8 100644
--- a/pkgs/development/interpreters/erlang/R22.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/R22.nix
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix
index c0203e5915f..c0203e5915f 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix
diff --git a/pkgs/development/interpreters/erlang/setup-hook.sh b/nixpkgs/pkgs/development/interpreters/erlang/setup-hook.sh
index 3962d154ba9..3962d154ba9 100644
--- a/pkgs/development/interpreters/erlang/setup-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/erlang/setup-hook.sh
diff --git a/pkgs/development/interpreters/evcxr/default.nix b/nixpkgs/pkgs/development/interpreters/evcxr/default.nix
index 168b012efcc..168b012efcc 100644
--- a/pkgs/development/interpreters/evcxr/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/evcxr/default.nix
diff --git a/pkgs/development/interpreters/falcon/default.nix b/nixpkgs/pkgs/development/interpreters/falcon/default.nix
index 39d4918a70b..39d4918a70b 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/falcon/default.nix
diff --git a/pkgs/development/interpreters/gauche/default.nix b/nixpkgs/pkgs/development/interpreters/gauche/default.nix
index 9b38d1e4ad5..9b38d1e4ad5 100644
--- a/pkgs/development/interpreters/gauche/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/gauche/default.nix
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix
index c2a3556cfea..c2a3556cfea 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix
diff --git a/pkgs/development/interpreters/groovy/default.nix b/nixpkgs/pkgs/development/interpreters/groovy/default.nix
index 67d9ecf9c61..67d9ecf9c61 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/groovy/default.nix
diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix
index 4a8330f2749..4a8330f2749 100644
--- a/pkgs/development/interpreters/gtk-server/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/nixpkgs/pkgs/development/interpreters/guile/1.8.nix
index 158987d4e0e..158987d4e0e 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/nixpkgs/pkgs/development/interpreters/guile/1.8.nix
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/nixpkgs/pkgs/development/interpreters/guile/2.0.nix
index af71d5cc80d..af71d5cc80d 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/nixpkgs/pkgs/development/interpreters/guile/2.0.nix
diff --git a/pkgs/development/interpreters/guile/clang.patch b/nixpkgs/pkgs/development/interpreters/guile/clang.patch
index 4d0f342b211..4d0f342b211 100644
--- a/pkgs/development/interpreters/guile/clang.patch
+++ b/nixpkgs/pkgs/development/interpreters/guile/clang.patch
diff --git a/pkgs/development/interpreters/guile/cpp-4.5.patch b/nixpkgs/pkgs/development/interpreters/guile/cpp-4.5.patch
index 7e7671f0da0..7e7671f0da0 100644
--- a/pkgs/development/interpreters/guile/cpp-4.5.patch
+++ b/nixpkgs/pkgs/development/interpreters/guile/cpp-4.5.patch
diff --git a/pkgs/development/interpreters/guile/default.nix b/nixpkgs/pkgs/development/interpreters/guile/default.nix
index fce94ecc846..fce94ecc846 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/guile/default.nix
diff --git a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch b/nixpkgs/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
index 076091a702a..076091a702a 100644
--- a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
+++ b/nixpkgs/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
diff --git a/pkgs/development/interpreters/guile/eai_system.patch b/nixpkgs/pkgs/development/interpreters/guile/eai_system.patch
index b0eb7ac44da..b0eb7ac44da 100644
--- a/pkgs/development/interpreters/guile/eai_system.patch
+++ b/nixpkgs/pkgs/development/interpreters/guile/eai_system.patch
diff --git a/pkgs/development/interpreters/guile/filter-mkostemp-darwin.patch b/nixpkgs/pkgs/development/interpreters/guile/filter-mkostemp-darwin.patch
index 8b9b853fb00..8b9b853fb00 100644
--- a/pkgs/development/interpreters/guile/filter-mkostemp-darwin.patch
+++ b/nixpkgs/pkgs/development/interpreters/guile/filter-mkostemp-darwin.patch
diff --git a/pkgs/development/interpreters/guile/gcov-file-name.patch b/nixpkgs/pkgs/development/interpreters/guile/gcov-file-name.patch
index f144296170e..f144296170e 100644
--- a/pkgs/development/interpreters/guile/gcov-file-name.patch
+++ b/nixpkgs/pkgs/development/interpreters/guile/gcov-file-name.patch
diff --git a/pkgs/development/interpreters/guile/riscv.patch b/nixpkgs/pkgs/development/interpreters/guile/riscv.patch
index b835e161383..b835e161383 100644
--- a/pkgs/development/interpreters/guile/riscv.patch
+++ b/nixpkgs/pkgs/development/interpreters/guile/riscv.patch
diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/nixpkgs/pkgs/development/interpreters/guile/setup-hook-2.0.sh
index 6bb3910aaff..6bb3910aaff 100644
--- a/pkgs/development/interpreters/guile/setup-hook-2.0.sh
+++ b/nixpkgs/pkgs/development/interpreters/guile/setup-hook-2.0.sh
diff --git a/pkgs/development/interpreters/guile/setup-hook-2.2.sh b/nixpkgs/pkgs/development/interpreters/guile/setup-hook-2.2.sh
index 4b3541fcc7f..4b3541fcc7f 100644
--- a/pkgs/development/interpreters/guile/setup-hook-2.2.sh
+++ b/nixpkgs/pkgs/development/interpreters/guile/setup-hook-2.2.sh
diff --git a/pkgs/development/interpreters/guile/setup-hook.sh b/nixpkgs/pkgs/development/interpreters/guile/setup-hook.sh
index d006b50ce8e..d006b50ce8e 100644
--- a/pkgs/development/interpreters/guile/setup-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/guile/setup-hook.sh
diff --git a/pkgs/development/interpreters/hugs/default.nix b/nixpkgs/pkgs/development/interpreters/hugs/default.nix
index 2177ae22db5..2177ae22db5 100644
--- a/pkgs/development/interpreters/hugs/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/hugs/default.nix
diff --git a/pkgs/development/interpreters/hy/default.nix b/nixpkgs/pkgs/development/interpreters/hy/default.nix
index 5816b3a175c..5816b3a175c 100644
--- a/pkgs/development/interpreters/hy/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/hy/default.nix
diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix
index 0d3fe100329..0d3fe100329 100644
--- a/pkgs/development/interpreters/icon-lang/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix
diff --git a/pkgs/development/interpreters/io/default.nix b/nixpkgs/pkgs/development/interpreters/io/default.nix
index f763274c15d..f763274c15d 100644
--- a/pkgs/development/interpreters/io/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/io/default.nix
diff --git a/pkgs/development/interpreters/j/default.nix b/nixpkgs/pkgs/development/interpreters/j/default.nix
index 791ac6dd338..791ac6dd338 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/j/default.nix
diff --git a/pkgs/development/interpreters/janet/default.nix b/nixpkgs/pkgs/development/interpreters/janet/default.nix
index 3138d1ba3d7..3138d1ba3d7 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/janet/default.nix
diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix
index d803fe43fd7..d803fe43fd7 100644
--- a/pkgs/development/interpreters/jimtcl/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix
diff --git a/pkgs/development/interpreters/joker/default.nix b/nixpkgs/pkgs/development/interpreters/joker/default.nix
index df8ad2fbe4d..df8ad2fbe4d 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/joker/default.nix
diff --git a/pkgs/development/interpreters/jruby/default.nix b/nixpkgs/pkgs/development/interpreters/jruby/default.nix
index 4e3f92d7cdc..4e3f92d7cdc 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/jruby/default.nix
diff --git a/pkgs/development/interpreters/jython/default.nix b/nixpkgs/pkgs/development/interpreters/jython/default.nix
index 84941f9a6fa..84941f9a6fa 100644
--- a/pkgs/development/interpreters/jython/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/jython/default.nix
diff --git a/pkgs/development/interpreters/kona/default.nix b/nixpkgs/pkgs/development/interpreters/kona/default.nix
index 9b7f36f4c87..9b7f36f4c87 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/kona/default.nix
diff --git a/pkgs/development/interpreters/lfe/1.2.nix b/nixpkgs/pkgs/development/interpreters/lfe/1.2.nix
index b81acdaa499..b81acdaa499 100644
--- a/pkgs/development/interpreters/lfe/1.2.nix
+++ b/nixpkgs/pkgs/development/interpreters/lfe/1.2.nix
diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix
index 6e74229e1e8..6e74229e1e8 100644
--- a/pkgs/development/interpreters/lfe/generic-builder.nix
+++ b/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix
diff --git a/pkgs/development/interpreters/lfe/no-test-deps.patch b/nixpkgs/pkgs/development/interpreters/lfe/no-test-deps.patch
index 8c3faf1ff40..8c3faf1ff40 100644
--- a/pkgs/development/interpreters/lfe/no-test-deps.patch
+++ b/nixpkgs/pkgs/development/interpreters/lfe/no-test-deps.patch
diff --git a/pkgs/development/interpreters/lolcode/default.nix b/nixpkgs/pkgs/development/interpreters/lolcode/default.nix
index 3ef239e89a9..3ef239e89a9 100644
--- a/pkgs/development/interpreters/lolcode/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/lolcode/default.nix
diff --git a/pkgs/development/interpreters/love/0.10.nix b/nixpkgs/pkgs/development/interpreters/love/0.10.nix
index e1ca3ded208..e1ca3ded208 100644
--- a/pkgs/development/interpreters/love/0.10.nix
+++ b/nixpkgs/pkgs/development/interpreters/love/0.10.nix
diff --git a/pkgs/development/interpreters/love/0.7-gl-prototypes.patch b/nixpkgs/pkgs/development/interpreters/love/0.7-gl-prototypes.patch
index 0b6778f6a90..0b6778f6a90 100644
--- a/pkgs/development/interpreters/love/0.7-gl-prototypes.patch
+++ b/nixpkgs/pkgs/development/interpreters/love/0.7-gl-prototypes.patch
diff --git a/pkgs/development/interpreters/love/0.7.nix b/nixpkgs/pkgs/development/interpreters/love/0.7.nix
index 3bf8aee0d07..3bf8aee0d07 100644
--- a/pkgs/development/interpreters/love/0.7.nix
+++ b/nixpkgs/pkgs/development/interpreters/love/0.7.nix
diff --git a/pkgs/development/interpreters/love/0.8.nix b/nixpkgs/pkgs/development/interpreters/love/0.8.nix
index 3a6c385ee5f..3a6c385ee5f 100644
--- a/pkgs/development/interpreters/love/0.8.nix
+++ b/nixpkgs/pkgs/development/interpreters/love/0.8.nix
diff --git a/pkgs/development/interpreters/love/0.9.nix b/nixpkgs/pkgs/development/interpreters/love/0.9.nix
index a2182f45436..a2182f45436 100644
--- a/pkgs/development/interpreters/love/0.9.nix
+++ b/nixpkgs/pkgs/development/interpreters/love/0.9.nix
diff --git a/pkgs/development/interpreters/love/11.1.nix b/nixpkgs/pkgs/development/interpreters/love/11.1.nix
index 3629345baf6..3629345baf6 100644
--- a/pkgs/development/interpreters/love/11.1.nix
+++ b/nixpkgs/pkgs/development/interpreters/love/11.1.nix
diff --git a/pkgs/development/interpreters/lua-5/5.1.darwin.patch b/nixpkgs/pkgs/development/interpreters/lua-5/5.1.darwin.patch
index b7754da79ba..b7754da79ba 100644
--- a/pkgs/development/interpreters/lua-5/5.1.darwin.patch
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/5.1.darwin.patch
diff --git a/pkgs/development/interpreters/lua-5/5.2.darwin.patch b/nixpkgs/pkgs/development/interpreters/lua-5/5.2.darwin.patch
index be0e206bbfc..be0e206bbfc 100644
--- a/pkgs/development/interpreters/lua-5/5.2.darwin.patch
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/5.2.darwin.patch
diff --git a/pkgs/development/interpreters/lua-5/CVE-2014-5461.patch b/nixpkgs/pkgs/development/interpreters/lua-5/CVE-2014-5461.patch
index 31d3b8bdee7..31d3b8bdee7 100644
--- a/pkgs/development/interpreters/lua-5/CVE-2014-5461.patch
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/CVE-2014-5461.patch
diff --git a/pkgs/development/interpreters/lua-5/CVE-2019-6706.patch b/nixpkgs/pkgs/development/interpreters/lua-5/CVE-2019-6706.patch
index 89e81b7eb68..89e81b7eb68 100644
--- a/pkgs/development/interpreters/lua-5/CVE-2019-6706.patch
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/CVE-2019-6706.patch
diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix
index be7aa5fc09d..be7aa5fc09d 100644
--- a/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix
index 7e79ff8f117..7e79ff8f117 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix
diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix
index 64050ea95f8..64050ea95f8 100644
--- a/pkgs/development/interpreters/lua-5/filesystem.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix
diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix
index fb0021cb709..fb0021cb709 100644
--- a/pkgs/development/interpreters/lua-5/interpreter.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix
diff --git a/pkgs/development/interpreters/lua-5/lua-5.3-dso.make b/nixpkgs/pkgs/development/interpreters/lua-5/lua-5.3-dso.make
index c70dbc4f9cc..c70dbc4f9cc 100644
--- a/pkgs/development/interpreters/lua-5/lua-5.3-dso.make
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/lua-5.3-dso.make
diff --git a/pkgs/development/interpreters/lua-5/setup-hook.nix b/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.nix
index 62caffd8d8a..62caffd8d8a 100644
--- a/pkgs/development/interpreters/lua-5/setup-hook.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.nix
diff --git a/pkgs/development/interpreters/lua-5/setup-hook.sh b/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.sh
index 1c445b82afd..1c445b82afd 100644
--- a/pkgs/development/interpreters/lua-5/setup-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.sh
diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix
index f0eb1becc57..f0eb1becc57 100644
--- a/pkgs/development/interpreters/lua-5/sockets.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix
diff --git a/pkgs/development/interpreters/lua-5/with-packages.nix b/nixpkgs/pkgs/development/interpreters/lua-5/with-packages.nix
index 0e0fbd39735..0e0fbd39735 100644
--- a/pkgs/development/interpreters/lua-5/with-packages.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/with-packages.nix
diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix
index f00e0d5ac33..f00e0d5ac33 100644
--- a/pkgs/development/interpreters/lua-5/wrap-lua.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix
diff --git a/pkgs/development/interpreters/lua-5/wrap.sh b/nixpkgs/pkgs/development/interpreters/lua-5/wrap.sh
index 5941ff4a6b9..5941ff4a6b9 100644
--- a/pkgs/development/interpreters/lua-5/wrap.sh
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/wrap.sh
diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix
index 53ec2baeb5e..53ec2baeb5e 100644
--- a/pkgs/development/interpreters/lua-5/wrapper.nix
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix
diff --git a/pkgs/development/interpreters/lua-5/zip.patch b/nixpkgs/pkgs/development/interpreters/lua-5/zip.patch
index c3f88f451e8..c3f88f451e8 100644
--- a/pkgs/development/interpreters/lua-5/zip.patch
+++ b/nixpkgs/pkgs/development/interpreters/lua-5/zip.patch
diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix
index 7db3830447f..7db3830447f 100644
--- a/pkgs/development/interpreters/luajit/2.0.nix
+++ b/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix
diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix
index e8f1b8b338c..e8f1b8b338c 100644
--- a/pkgs/development/interpreters/luajit/2.1.nix
+++ b/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix
diff --git a/pkgs/development/interpreters/luajit/default.nix b/nixpkgs/pkgs/development/interpreters/luajit/default.nix
index 5b776116447..5b776116447 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/luajit/default.nix
diff --git a/pkgs/development/interpreters/lush/default.nix b/nixpkgs/pkgs/development/interpreters/lush/default.nix
index a8db08e87a2..a8db08e87a2 100644
--- a/pkgs/development/interpreters/lush/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/lush/default.nix
diff --git a/pkgs/development/interpreters/lush/default.upstream b/nixpkgs/pkgs/development/interpreters/lush/default.upstream
index 8a8b08fcd68..8a8b08fcd68 100644
--- a/pkgs/development/interpreters/lush/default.upstream
+++ b/nixpkgs/pkgs/development/interpreters/lush/default.upstream
diff --git a/pkgs/development/interpreters/maude/default.nix b/nixpkgs/pkgs/development/interpreters/maude/default.nix
index e44209799a3..e44209799a3 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/maude/default.nix
diff --git a/pkgs/development/interpreters/metamath/default.nix b/nixpkgs/pkgs/development/interpreters/metamath/default.nix
index 2213ace8f57..2213ace8f57 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/metamath/default.nix
diff --git a/pkgs/development/interpreters/micropython/default.nix b/nixpkgs/pkgs/development/interpreters/micropython/default.nix
index 3293c4b9f58..3293c4b9f58 100644
--- a/pkgs/development/interpreters/micropython/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/micropython/default.nix
diff --git a/pkgs/development/interpreters/mujs/default.nix b/nixpkgs/pkgs/development/interpreters/mujs/default.nix
index aef23ad6881..aef23ad6881 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/mujs/default.nix
diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix
index bde2f5d9fa9..bde2f5d9fa9 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix
diff --git a/pkgs/development/interpreters/octave/default.nix b/nixpkgs/pkgs/development/interpreters/octave/default.nix
index eb9827969e1..eb9827969e1 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/octave/default.nix
diff --git a/pkgs/development/interpreters/octave/hg.nix b/nixpkgs/pkgs/development/interpreters/octave/hg.nix
index a34834af48c..a34834af48c 100644
--- a/pkgs/development/interpreters/octave/hg.nix
+++ b/nixpkgs/pkgs/development/interpreters/octave/hg.nix
diff --git a/pkgs/development/interpreters/perl/MakeMaker-cross.patch b/nixpkgs/pkgs/development/interpreters/perl/MakeMaker-cross.patch
index 40626c51f9b..40626c51f9b 100644
--- a/pkgs/development/interpreters/perl/MakeMaker-cross.patch
+++ b/nixpkgs/pkgs/development/interpreters/perl/MakeMaker-cross.patch
diff --git a/pkgs/development/interpreters/perl/cpp-precomp.patch b/nixpkgs/pkgs/development/interpreters/perl/cpp-precomp.patch
index 231853fe51a..231853fe51a 100644
--- a/pkgs/development/interpreters/perl/cpp-precomp.patch
+++ b/nixpkgs/pkgs/development/interpreters/perl/cpp-precomp.patch
diff --git a/pkgs/development/interpreters/perl/default.nix b/nixpkgs/pkgs/development/interpreters/perl/default.nix
index 751b9667a1f..751b9667a1f 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/perl/default.nix
diff --git a/pkgs/development/interpreters/perl/ld-shared.patch b/nixpkgs/pkgs/development/interpreters/perl/ld-shared.patch
index 9f92368df68..9f92368df68 100644
--- a/pkgs/development/interpreters/perl/ld-shared.patch
+++ b/nixpkgs/pkgs/development/interpreters/perl/ld-shared.patch
diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch b/nixpkgs/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch
index ad65d1339f3..ad65d1339f3 100644
--- a/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch
+++ b/nixpkgs/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch
diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch b/nixpkgs/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch
index 0ccf6254b78..0ccf6254b78 100644
--- a/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch
+++ b/nixpkgs/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch
diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch b/nixpkgs/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch
index 62dce0e25b9..62dce0e25b9 100644
--- a/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch
+++ b/nixpkgs/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch
diff --git a/pkgs/development/interpreters/perl/setup-hook-cross.sh b/nixpkgs/pkgs/development/interpreters/perl/setup-hook-cross.sh
index 95aae0b2670..95aae0b2670 100644
--- a/pkgs/development/interpreters/perl/setup-hook-cross.sh
+++ b/nixpkgs/pkgs/development/interpreters/perl/setup-hook-cross.sh
diff --git a/pkgs/development/interpreters/perl/setup-hook.sh b/nixpkgs/pkgs/development/interpreters/perl/setup-hook.sh
index 7909412806c..7909412806c 100644
--- a/pkgs/development/interpreters/perl/setup-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/perl/setup-hook.sh
diff --git a/pkgs/development/interpreters/perl/sw_vers.patch b/nixpkgs/pkgs/development/interpreters/perl/sw_vers.patch
index 2e30dba9292..2e30dba9292 100644
--- a/pkgs/development/interpreters/perl/sw_vers.patch
+++ b/nixpkgs/pkgs/development/interpreters/perl/sw_vers.patch
diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix
index 2e3d394f851..2e3d394f851 100644
--- a/pkgs/development/interpreters/perl/wrapper.nix
+++ b/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix
diff --git a/pkgs/development/interpreters/php/default.nix b/nixpkgs/pkgs/development/interpreters/php/default.nix
index 0fa605a4cac..0fa605a4cac 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/php/default.nix
diff --git a/pkgs/development/interpreters/php/fix-paths-php7.patch b/nixpkgs/pkgs/development/interpreters/php/fix-paths-php7.patch
index 908f06ec49a..908f06ec49a 100644
--- a/pkgs/development/interpreters/php/fix-paths-php7.patch
+++ b/nixpkgs/pkgs/development/interpreters/php/fix-paths-php7.patch
diff --git a/pkgs/development/interpreters/php/php72-darwin-isfinite.patch b/nixpkgs/pkgs/development/interpreters/php/php72-darwin-isfinite.patch
index ea2e3e28f2c..ea2e3e28f2c 100644
--- a/pkgs/development/interpreters/php/php72-darwin-isfinite.patch
+++ b/nixpkgs/pkgs/development/interpreters/php/php72-darwin-isfinite.patch
diff --git a/pkgs/development/interpreters/php/php73-darwin-isfinite.patch b/nixpkgs/pkgs/development/interpreters/php/php73-darwin-isfinite.patch
index 7f784e0f5a9..7f784e0f5a9 100644
--- a/pkgs/development/interpreters/php/php73-darwin-isfinite.patch
+++ b/nixpkgs/pkgs/development/interpreters/php/php73-darwin-isfinite.patch
diff --git a/pkgs/development/interpreters/picoc/default.nix b/nixpkgs/pkgs/development/interpreters/picoc/default.nix
index 6e57ad250bb..6e57ad250bb 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/picoc/default.nix
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/nixpkgs/pkgs/development/interpreters/picolisp/default.nix
index 1a0a781b918..1a0a781b918 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/picolisp/default.nix
diff --git a/pkgs/development/interpreters/pixie/default.nix b/nixpkgs/pkgs/development/interpreters/pixie/default.nix
index 02f6d34a030..02f6d34a030 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/pixie/default.nix
diff --git a/pkgs/development/interpreters/pixie/dust.nix b/nixpkgs/pkgs/development/interpreters/pixie/dust.nix
index 4a7f3423def..4a7f3423def 100644
--- a/pkgs/development/interpreters/pixie/dust.nix
+++ b/nixpkgs/pkgs/development/interpreters/pixie/dust.nix
diff --git a/pkgs/development/interpreters/pixie/load_paths.patch b/nixpkgs/pkgs/development/interpreters/pixie/load_paths.patch
index a36d280c586..a36d280c586 100644
--- a/pkgs/development/interpreters/pixie/load_paths.patch
+++ b/nixpkgs/pkgs/development/interpreters/pixie/load_paths.patch
diff --git a/pkgs/development/interpreters/pixie/make-paths-configurable.patch b/nixpkgs/pkgs/development/interpreters/pixie/make-paths-configurable.patch
index 122ab6e2c07..122ab6e2c07 100644
--- a/pkgs/development/interpreters/pixie/make-paths-configurable.patch
+++ b/nixpkgs/pkgs/development/interpreters/pixie/make-paths-configurable.patch
diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/nixpkgs/pkgs/development/interpreters/proglodyte-wasm/default.nix
index 8ebbf6cf501..8ebbf6cf501 100644
--- a/pkgs/development/interpreters/proglodyte-wasm/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/proglodyte-wasm/default.nix
diff --git a/pkgs/development/interpreters/pure/default.nix b/nixpkgs/pkgs/development/interpreters/pure/default.nix
index 19e6c93378f..19e6c93378f 100644
--- a/pkgs/development/interpreters/pure/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/pure/default.nix
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix
index 30a601ef8df..30a601ef8df 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix
index 69a93089188..69a93089188 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix
diff --git a/pkgs/development/interpreters/python/catch_conflicts/README.md b/nixpkgs/pkgs/development/interpreters/python/catch_conflicts/README.md
index d144b80e338..d144b80e338 100644
--- a/pkgs/development/interpreters/python/catch_conflicts/README.md
+++ b/nixpkgs/pkgs/development/interpreters/python/catch_conflicts/README.md
diff --git a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py b/nixpkgs/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py
index bb82900c65a..bb82900c65a 100644
--- a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py
+++ b/nixpkgs/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py
diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.5.2-ctypes-util-find_library.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.5.2-ctypes-util-find_library.patch
index 22bc0f7ced0..22bc0f7ced0 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/2.5.2-ctypes-util-find_library.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.5.2-ctypes-util-find_library.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.5.2-tkinter-x11.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.5.2-tkinter-x11.patch
index 28b6dafc3f1..28b6dafc3f1 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/2.5.2-tkinter-x11.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.5.2-tkinter-x11.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.6.2-ssl-threads.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.6.2-ssl-threads.patch
index bef137efda7..bef137efda7 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/2.6.2-ssl-threads.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.6.2-ssl-threads.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.6.5-FD_SETSIZE.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.6.5-FD_SETSIZE.patch
index d1dae8c47dc..d1dae8c47dc 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/2.6.5-FD_SETSIZE.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.6.5-FD_SETSIZE.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.6.5-export-PySignal_SetWakeupFd.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.6.5-export-PySignal_SetWakeupFd.patch
index ea696978236..ea696978236 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/2.6.5-export-PySignal_SetWakeupFd.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.6.5-export-PySignal_SetWakeupFd.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.6.5-ncurses-abi6.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.6.5-ncurses-abi6.patch
index e1cf5ad4bbf..e1cf5ad4bbf 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/2.6.5-ncurses-abi6.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.6.5-ncurses-abi6.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dbm.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dbm.patch
index bfaeb37c287..bfaeb37c287 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dbm.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dbm.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dylib.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dylib.patch
index 6e1fc8b53e8..6e1fc8b53e8 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dylib.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dylib.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-getpath-exe-extension.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.7.3-getpath-exe-extension.patch
index 68f6921ba6a..68f6921ba6a 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-getpath-exe-extension.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.7.3-getpath-exe-extension.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-no-libm.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.7.3-no-libm.patch
index 55281db6768..55281db6768 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-no-libm.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/2.7.3-no-libm.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch
index 06d3718d499..06d3718d499 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch
index c83b56437a4..c83b56437a4 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 77b37c5f5c3..77b37c5f5c3 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
diff --git a/pkgs/development/interpreters/python/cpython/2.7/deterministic-build.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/deterministic-build.patch
index 98d9d339fa1..98d9d339fa1 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/deterministic-build.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/deterministic-build.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/nix-store-mtime.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/nix-store-mtime.patch
index 83f3fea1931..83f3fea1931 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/nix-store-mtime.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/nix-store-mtime.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch
index 2a6b2a20dd1..2a6b2a20dd1 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch
index 78d9272d098..78d9272d098 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/search-path.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/search-path.patch
index 2e7b7526c0c..2e7b7526c0c 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/search-path.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/search-path.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch
index b73f62b97ec..b73f62b97ec 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch
index c263cdbff4d..c263cdbff4d 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.5/ld_library_path.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.5/ld_library_path.patch
index 013c2d266ef..013c2d266ef 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/ld_library_path.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.5/ld_library_path.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch
index 9718b1d8dce..9718b1d8dce 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.5/python-3.x-distutils-C++.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.5/python-3.x-distutils-C++.patch
index 01356020b39..01356020b39 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/python-3.x-distutils-C++.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.5/python-3.x-distutils-C++.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch
index b73f62b97ec..b73f62b97ec 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch
index 0f829860a5b..0f829860a5b 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch
index b73f62b97ec..b73f62b97ec 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
index a1f9d68eb16..a1f9d68eb16 100644
--- a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch
index 243313f7654..243313f7654 100644
--- a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
index a1f9d68eb16..a1f9d68eb16 100644
--- a/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
index a1f9d68eb16..a1f9d68eb16 100644
--- a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
index 70eff43daf5..70eff43daf5 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
index e27959c05e8..e27959c05e8 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
index 0226f7cd880..0226f7cd880 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
index 88d1a693166..88d1a693166 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
index ea35e9fb6a3..ea35e9fb6a3 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
index 45783eb8263..45783eb8263 100644
--- a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
index 998af644c71..998af644c71 100644
--- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
index 1c6aea5ee3c..1c6aea5ee3c 100644
--- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
index 32388780f6f..32388780f6f 100644
--- a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
diff --git a/pkgs/development/interpreters/python/cpython/docs/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/default.nix
index a538f731473..a538f731473 100644
--- a/pkgs/development/interpreters/python/cpython/docs/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/default.nix
diff --git a/pkgs/development/interpreters/python/cpython/docs/generate.sh b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/generate.sh
index a4b2e0893fc..a4b2e0893fc 100755
--- a/pkgs/development/interpreters/python/cpython/docs/generate.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/generate.sh
diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/template.nix
index 3cc0c2a9ee8..3cc0c2a9ee8 100644
--- a/pkgs/development/interpreters/python/cpython/docs/template.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/docs/template.nix
diff --git a/pkgs/development/interpreters/python/default.nix b/nixpkgs/pkgs/development/interpreters/python/default.nix
index b4326235c4e..b4326235c4e 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/default.nix
diff --git a/pkgs/development/interpreters/python/fetchpypi.nix b/nixpkgs/pkgs/development/interpreters/python/fetchpypi.nix
index e60c9df1f8b..e60c9df1f8b 100644
--- a/pkgs/development/interpreters/python/fetchpypi.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/fetchpypi.nix
diff --git a/pkgs/development/interpreters/python/graalpython/default.nix b/nixpkgs/pkgs/development/interpreters/python/graalpython/default.nix
index b5d7d130b5a..b5d7d130b5a 100644
--- a/pkgs/development/interpreters/python/graalpython/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/graalpython/default.nix
diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix
index 159637ae9d5..159637ae9d5 100644
--- a/pkgs/development/interpreters/python/hooks/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix
diff --git a/pkgs/development/interpreters/python/hooks/egg-build-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/egg-build-hook.sh
index d5abc8d55e5..d5abc8d55e5 100644
--- a/pkgs/development/interpreters/python/hooks/egg-build-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/egg-build-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/egg-install-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/egg-install-hook.sh
index ae894fb1bde..ae894fb1bde 100644
--- a/pkgs/development/interpreters/python/hooks/egg-install-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/egg-install-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh
index c8ed3dee83b..c8ed3dee83b 100644
--- a/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
index 45893aae00f..45893aae00f 100644
--- a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
index 292f13d3015..292f13d3015 100644
--- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
index 4eefe22d3f2..4eefe22d3f2 100644
--- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
index 18f05b6d218..18f05b6d218 100644
--- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh
index 374a2eddb40..374a2eddb40 100644
--- a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
index 0fc55145a8e..0fc55145a8e 100644
--- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh
index 2add23f2316..2add23f2316 100644
--- a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh
index 2aec9279382..2aec9279382 100644
--- a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh
index 88b7b11931b..88b7b11931b 100644
--- a/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh
index 3185b1f9fae..3185b1f9fae 100644
--- a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh
diff --git a/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh
index fca808a933b..fca808a933b 100644
--- a/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh
diff --git a/pkgs/development/interpreters/python/manylinux/default.nix b/nixpkgs/pkgs/development/interpreters/python/manylinux/default.nix
index a44ead23752..a44ead23752 100644
--- a/pkgs/development/interpreters/python/manylinux/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/manylinux/default.nix
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix
index 020298cc8e9..020298cc8e9 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix
index 0c4f3eda7b1..0c4f3eda7b1 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix
index 7ac8037293f..7ac8037293f 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix
diff --git a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch b/nixpkgs/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch
index 0b78caf7e07..0b78caf7e07 100644
--- a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch
+++ b/nixpkgs/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch
diff --git a/pkgs/development/interpreters/python/run_setup.py b/nixpkgs/pkgs/development/interpreters/python/run_setup.py
index e3a530eb0cb..e3a530eb0cb 100644
--- a/pkgs/development/interpreters/python/run_setup.py
+++ b/nixpkgs/pkgs/development/interpreters/python/run_setup.py
diff --git a/pkgs/development/interpreters/python/setup-hook.nix b/nixpkgs/pkgs/development/interpreters/python/setup-hook.nix
index b66bd1cc5f6..b66bd1cc5f6 100644
--- a/pkgs/development/interpreters/python/setup-hook.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/setup-hook.nix
diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/nixpkgs/pkgs/development/interpreters/python/setup-hook.sh
index 523df5762fa..523df5762fa 100644
--- a/pkgs/development/interpreters/python/setup-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/setup-hook.sh
diff --git a/pkgs/development/interpreters/python/sitecustomize.py b/nixpkgs/pkgs/development/interpreters/python/sitecustomize.py
index e03b244dbc0..e03b244dbc0 100644
--- a/pkgs/development/interpreters/python/sitecustomize.py
+++ b/nixpkgs/pkgs/development/interpreters/python/sitecustomize.py
diff --git a/pkgs/development/interpreters/python/update-python-libraries/default.nix b/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/default.nix
index 762ca2bdd34..762ca2bdd34 100644
--- a/pkgs/development/interpreters/python/update-python-libraries/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/default.nix
diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
index 7e0580ce063..7e0580ce063 100755
--- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
+++ b/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
diff --git a/pkgs/development/interpreters/python/with-packages.nix b/nixpkgs/pkgs/development/interpreters/python/with-packages.nix
index e1de0b2ee4c..e1de0b2ee4c 100644
--- a/pkgs/development/interpreters/python/with-packages.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/with-packages.nix
diff --git a/pkgs/development/interpreters/python/wrap-python.nix b/nixpkgs/pkgs/development/interpreters/python/wrap-python.nix
index 6a19a215241..6a19a215241 100644
--- a/pkgs/development/interpreters/python/wrap-python.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/wrap-python.nix
diff --git a/pkgs/development/interpreters/python/wrap.sh b/nixpkgs/pkgs/development/interpreters/python/wrap.sh
index f10ba003432..f10ba003432 100644
--- a/pkgs/development/interpreters/python/wrap.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/wrap.sh
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/nixpkgs/pkgs/development/interpreters/python/wrapper.nix
index b437584024f..b437584024f 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/wrapper.nix
diff --git a/pkgs/development/interpreters/qnial/default.nix b/nixpkgs/pkgs/development/interpreters/qnial/default.nix
index d49886da8f5..d49886da8f5 100644
--- a/pkgs/development/interpreters/qnial/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/qnial/default.nix
diff --git a/pkgs/development/interpreters/quickjs/default.nix b/nixpkgs/pkgs/development/interpreters/quickjs/default.nix
index b1d03252d7e..b1d03252d7e 100644
--- a/pkgs/development/interpreters/quickjs/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/quickjs/default.nix
diff --git a/pkgs/development/interpreters/racket/default.nix b/nixpkgs/pkgs/development/interpreters/racket/default.nix
index f12d1f1090f..f12d1f1090f 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/racket/default.nix
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/nixpkgs/pkgs/development/interpreters/racket/minimal.nix
index df7c72c4a68..df7c72c4a68 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/nixpkgs/pkgs/development/interpreters/racket/minimal.nix
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/nixpkgs/pkgs/development/interpreters/rakudo/default.nix
index ab5493e8a9d..ab5493e8a9d 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/rakudo/default.nix
diff --git a/pkgs/development/interpreters/rascal/default.nix b/nixpkgs/pkgs/development/interpreters/rascal/default.nix
index 22eee0f6ead..22eee0f6ead 100644
--- a/pkgs/development/interpreters/rascal/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/rascal/default.nix
diff --git a/pkgs/development/interpreters/rebol/default.nix b/nixpkgs/pkgs/development/interpreters/rebol/default.nix
index 274b70b2c79..274b70b2c79 100644
--- a/pkgs/development/interpreters/rebol/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/rebol/default.nix
diff --git a/pkgs/development/interpreters/red/default.nix b/nixpkgs/pkgs/development/interpreters/red/default.nix
index 2121f54a3b1..2121f54a3b1 100644
--- a/pkgs/development/interpreters/red/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/red/default.nix
diff --git a/pkgs/development/interpreters/regina/default.nix b/nixpkgs/pkgs/development/interpreters/regina/default.nix
index ec19b0679f4..ec19b0679f4 100644
--- a/pkgs/development/interpreters/regina/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/regina/default.nix
diff --git a/pkgs/development/interpreters/regina/default.upstream b/nixpkgs/pkgs/development/interpreters/regina/default.upstream
index 481d9848f83..481d9848f83 100644
--- a/pkgs/development/interpreters/regina/default.upstream
+++ b/nixpkgs/pkgs/development/interpreters/regina/default.upstream
diff --git a/pkgs/development/interpreters/renpy/default.nix b/nixpkgs/pkgs/development/interpreters/renpy/default.nix
index 759a44b5760..759a44b5760 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/renpy/default.nix
diff --git a/pkgs/development/interpreters/renpy/launcherenv.patch b/nixpkgs/pkgs/development/interpreters/renpy/launcherenv.patch
index 85a6c6439b9..85a6c6439b9 100644
--- a/pkgs/development/interpreters/renpy/launcherenv.patch
+++ b/nixpkgs/pkgs/development/interpreters/renpy/launcherenv.patch
diff --git a/pkgs/development/interpreters/ruby/config.nix b/nixpkgs/pkgs/development/interpreters/ruby/config.nix
index c4f3160d160..c4f3160d160 100644
--- a/pkgs/development/interpreters/ruby/config.nix
+++ b/nixpkgs/pkgs/development/interpreters/ruby/config.nix
diff --git a/pkgs/development/interpreters/ruby/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/default.nix
index 8b8e7ccc8bb..8b8e7ccc8bb 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/ruby/default.nix
diff --git a/pkgs/development/interpreters/ruby/dev.nix b/nixpkgs/pkgs/development/interpreters/ruby/dev.nix
index 62d561fbc14..62d561fbc14 100644
--- a/pkgs/development/interpreters/ruby/dev.nix
+++ b/nixpkgs/pkgs/development/interpreters/ruby/dev.nix
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
index 4838a1a09e5..4838a1a09e5 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
diff --git a/pkgs/development/interpreters/ruby/rbconfig.rb b/nixpkgs/pkgs/development/interpreters/ruby/rbconfig.rb
index eeba930b54b..eeba930b54b 100644
--- a/pkgs/development/interpreters/ruby/rbconfig.rb
+++ b/nixpkgs/pkgs/development/interpreters/ruby/rbconfig.rb
diff --git a/pkgs/development/interpreters/ruby/ruby-version.nix b/nixpkgs/pkgs/development/interpreters/ruby/ruby-version.nix
index b1cbbfc216d..b1cbbfc216d 100644
--- a/pkgs/development/interpreters/ruby/ruby-version.nix
+++ b/nixpkgs/pkgs/development/interpreters/ruby/ruby-version.nix
diff --git a/pkgs/development/interpreters/ruby/rubygems/0001-add-post-extract-hook.patch b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/0001-add-post-extract-hook.patch
index 84d1d52409e..84d1d52409e 100644
--- a/pkgs/development/interpreters/ruby/rubygems/0001-add-post-extract-hook.patch
+++ b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/0001-add-post-extract-hook.patch
diff --git a/pkgs/development/interpreters/ruby/rubygems/0002-binaries-with-env-shebang.patch b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/0002-binaries-with-env-shebang.patch
index d6eba67e106..d6eba67e106 100644
--- a/pkgs/development/interpreters/ruby/rubygems/0002-binaries-with-env-shebang.patch
+++ b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/0002-binaries-with-env-shebang.patch
diff --git a/pkgs/development/interpreters/ruby/rubygems/0003-gem-install-default-to-user.patch b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/0003-gem-install-default-to-user.patch
index 138d432c820..138d432c820 100644
--- a/pkgs/development/interpreters/ruby/rubygems/0003-gem-install-default-to-user.patch
+++ b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/0003-gem-install-default-to-user.patch
diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix
index 3caac2447e2..3caac2447e2 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix
diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index 883987683b0..883987683b0 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix
diff --git a/pkgs/development/interpreters/scheme48/default.nix b/nixpkgs/pkgs/development/interpreters/scheme48/default.nix
index e01aef98303..e01aef98303 100644
--- a/pkgs/development/interpreters/scheme48/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/scheme48/default.nix
diff --git a/pkgs/development/interpreters/scsh/default.nix b/nixpkgs/pkgs/development/interpreters/scsh/default.nix
index 85c9434f081..85c9434f081 100644
--- a/pkgs/development/interpreters/scsh/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/scsh/default.nix
diff --git a/pkgs/development/interpreters/self/default.nix b/nixpkgs/pkgs/development/interpreters/self/default.nix
index 43f5758e4c4..43f5758e4c4 100644
--- a/pkgs/development/interpreters/self/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/self/default.nix
diff --git a/pkgs/development/interpreters/self/self b/nixpkgs/pkgs/development/interpreters/self/self
index d504682086b..d504682086b 100755
--- a/pkgs/development/interpreters/self/self
+++ b/nixpkgs/pkgs/development/interpreters/self/self
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch b/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch
index 721aff154e3..721aff154e3 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch
+++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch b/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch
index f6dab5497a0..f6dab5497a0 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch
+++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index fe77a27d449..fe77a27d449 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix
index 89bbd713a5c..89bbd713a5c 100644
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix
diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix
index f6a4483edba..f6a4483edba 100644
--- a/pkgs/development/interpreters/spidermonkey/60.nix
+++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/nixpkgs/pkgs/development/interpreters/supercollider/default.nix
index b4ed9232452..b4ed9232452 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/supercollider/default.nix
diff --git a/pkgs/development/interpreters/tcl/8.5.nix b/nixpkgs/pkgs/development/interpreters/tcl/8.5.nix
index 193ff4f9376..193ff4f9376 100644
--- a/pkgs/development/interpreters/tcl/8.5.nix
+++ b/nixpkgs/pkgs/development/interpreters/tcl/8.5.nix
diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix
index d76ceb3421d..d76ceb3421d 100644
--- a/pkgs/development/interpreters/tcl/8.6.nix
+++ b/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix
index fd84d93ba75..fd84d93ba75 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix
diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix
index ca897ec692c..ca897ec692c 100644
--- a/pkgs/development/interpreters/tinyscheme/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix
diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix
index bb4a2d01499..bb4a2d01499 100644
--- a/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix
diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/nixpkgs/pkgs/development/interpreters/wasm-gc/default.nix
index 44ac11be540..44ac11be540 100644
--- a/pkgs/development/interpreters/wasm-gc/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/wasm-gc/default.nix
diff --git a/pkgs/development/interpreters/wasm-gc/fix-build.patch b/nixpkgs/pkgs/development/interpreters/wasm-gc/fix-build.patch
index 3144dd89837..3144dd89837 100644
--- a/pkgs/development/interpreters/wasm-gc/fix-build.patch
+++ b/nixpkgs/pkgs/development/interpreters/wasm-gc/fix-build.patch
diff --git a/pkgs/development/interpreters/wasmer/default.nix b/nixpkgs/pkgs/development/interpreters/wasmer/default.nix
index 7c270e5fb44..7c270e5fb44 100644
--- a/pkgs/development/interpreters/wasmer/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/wasmer/default.nix
diff --git a/pkgs/development/interpreters/wasmtime/cargo-lock.patch b/nixpkgs/pkgs/development/interpreters/wasmtime/cargo-lock.patch
index 3ce3f765988..3ce3f765988 100644
--- a/pkgs/development/interpreters/wasmtime/cargo-lock.patch
+++ b/nixpkgs/pkgs/development/interpreters/wasmtime/cargo-lock.patch
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix
index c978f023936..c978f023936 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix
diff --git a/pkgs/development/java-modules/apache/ant-launcher.nix b/nixpkgs/pkgs/development/java-modules/apache/ant-launcher.nix
index e5f4d5f6ee0..e5f4d5f6ee0 100644
--- a/pkgs/development/java-modules/apache/ant-launcher.nix
+++ b/nixpkgs/pkgs/development/java-modules/apache/ant-launcher.nix
diff --git a/pkgs/development/java-modules/apache/ant.nix b/nixpkgs/pkgs/development/java-modules/apache/ant.nix
index 5de82b1703b..5de82b1703b 100644
--- a/pkgs/development/java-modules/apache/ant.nix
+++ b/nixpkgs/pkgs/development/java-modules/apache/ant.nix
diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/nixpkgs/pkgs/development/java-modules/apache/commons-cli.nix
index 5cb25a0f379..5cb25a0f379 100644
--- a/pkgs/development/java-modules/apache/commons-cli.nix
+++ b/nixpkgs/pkgs/development/java-modules/apache/commons-cli.nix
diff --git a/pkgs/development/java-modules/apache/commons-io.nix b/nixpkgs/pkgs/development/java-modules/apache/commons-io.nix
index 28bb9d381f9..28bb9d381f9 100644
--- a/pkgs/development/java-modules/apache/commons-io.nix
+++ b/nixpkgs/pkgs/development/java-modules/apache/commons-io.nix
diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/nixpkgs/pkgs/development/java-modules/apache/commons-lang.nix
index 501da6d204d..501da6d204d 100644
--- a/pkgs/development/java-modules/apache/commons-lang.nix
+++ b/nixpkgs/pkgs/development/java-modules/apache/commons-lang.nix
diff --git a/pkgs/development/java-modules/apache/commons-lang3.nix b/nixpkgs/pkgs/development/java-modules/apache/commons-lang3.nix
index 3bbbe9d2e39..3bbbe9d2e39 100644
--- a/pkgs/development/java-modules/apache/commons-lang3.nix
+++ b/nixpkgs/pkgs/development/java-modules/apache/commons-lang3.nix
diff --git a/pkgs/development/java-modules/apache/commons-logging-api.nix b/nixpkgs/pkgs/development/java-modules/apache/commons-logging-api.nix
index befb2003d01..befb2003d01 100644
--- a/pkgs/development/java-modules/apache/commons-logging-api.nix
+++ b/nixpkgs/pkgs/development/java-modules/apache/commons-logging-api.nix
diff --git a/pkgs/development/java-modules/apache/xbean-reflect.nix b/nixpkgs/pkgs/development/java-modules/apache/xbean-reflect.nix
index 8f7c35b716f..8f7c35b716f 100644
--- a/pkgs/development/java-modules/apache/xbean-reflect.nix
+++ b/nixpkgs/pkgs/development/java-modules/apache/xbean-reflect.nix
diff --git a/pkgs/development/java-modules/beanshell/bsh.nix b/nixpkgs/pkgs/development/java-modules/beanshell/bsh.nix
index 783fdc8679c..783fdc8679c 100644
--- a/pkgs/development/java-modules/beanshell/bsh.nix
+++ b/nixpkgs/pkgs/development/java-modules/beanshell/bsh.nix
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/nixpkgs/pkgs/development/java-modules/build-maven-package.nix
index a7196c6e031..a7196c6e031 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/nixpkgs/pkgs/development/java-modules/build-maven-package.nix
diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/nixpkgs/pkgs/development/java-modules/classworlds/classworlds.nix
index 3561c0b6e5e..3561c0b6e5e 100644
--- a/pkgs/development/java-modules/classworlds/classworlds.nix
+++ b/nixpkgs/pkgs/development/java-modules/classworlds/classworlds.nix
diff --git a/pkgs/development/java-modules/collections.nix b/nixpkgs/pkgs/development/java-modules/collections.nix
index 83f7a95af81..83f7a95af81 100644
--- a/pkgs/development/java-modules/collections.nix
+++ b/nixpkgs/pkgs/development/java-modules/collections.nix
diff --git a/pkgs/development/java-modules/eclipse/aether-util.nix b/nixpkgs/pkgs/development/java-modules/eclipse/aether-util.nix
index 6ebca58c44e..6ebca58c44e 100644
--- a/pkgs/development/java-modules/eclipse/aether-util.nix
+++ b/nixpkgs/pkgs/development/java-modules/eclipse/aether-util.nix
diff --git a/pkgs/development/java-modules/findbugs/jsr305.nix b/nixpkgs/pkgs/development/java-modules/findbugs/jsr305.nix
index 7816ab49d61..7816ab49d61 100644
--- a/pkgs/development/java-modules/findbugs/jsr305.nix
+++ b/nixpkgs/pkgs/development/java-modules/findbugs/jsr305.nix
diff --git a/pkgs/development/java-modules/google/collections.nix b/nixpkgs/pkgs/development/java-modules/google/collections.nix
index b5b4551dd97..b5b4551dd97 100644
--- a/pkgs/development/java-modules/google/collections.nix
+++ b/nixpkgs/pkgs/development/java-modules/google/collections.nix
diff --git a/pkgs/development/java-modules/hamcrest/all.nix b/nixpkgs/pkgs/development/java-modules/hamcrest/all.nix
index 73c27c4af8b..73c27c4af8b 100644
--- a/pkgs/development/java-modules/hamcrest/all.nix
+++ b/nixpkgs/pkgs/development/java-modules/hamcrest/all.nix
diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/nixpkgs/pkgs/development/java-modules/hamcrest/core.nix
index 4145191fdd9..4145191fdd9 100644
--- a/pkgs/development/java-modules/hamcrest/core.nix
+++ b/nixpkgs/pkgs/development/java-modules/hamcrest/core.nix
diff --git a/pkgs/development/java-modules/jogl/default.nix b/nixpkgs/pkgs/development/java-modules/jogl/default.nix
index 80f19ab65f5..80f19ab65f5 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/nixpkgs/pkgs/development/java-modules/jogl/default.nix
diff --git a/pkgs/development/java-modules/junit/default.nix b/nixpkgs/pkgs/development/java-modules/junit/default.nix
index 6f86cede512..6f86cede512 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/nixpkgs/pkgs/development/java-modules/junit/default.nix
diff --git a/pkgs/development/java-modules/log4j/default.nix b/nixpkgs/pkgs/development/java-modules/log4j/default.nix
index e95c0847aac..e95c0847aac 100644
--- a/pkgs/development/java-modules/log4j/default.nix
+++ b/nixpkgs/pkgs/development/java-modules/log4j/default.nix
diff --git a/pkgs/development/java-modules/m2install.nix b/nixpkgs/pkgs/development/java-modules/m2install.nix
index 3a289c9c9c4..3a289c9c9c4 100644
--- a/pkgs/development/java-modules/m2install.nix
+++ b/nixpkgs/pkgs/development/java-modules/m2install.nix
diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix
index b8e128ac728..b8e128ac728 100644
--- a/pkgs/development/java-modules/maven-hello/default.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/nixpkgs/pkgs/development/java-modules/maven-minimal.nix
index c1fab1e9bc9..c1fab1e9bc9 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven-minimal.nix
diff --git a/pkgs/development/java-modules/maven/archiver.nix b/nixpkgs/pkgs/development/java-modules/maven/archiver.nix
index 9965f86f72b..9965f86f72b 100644
--- a/pkgs/development/java-modules/maven/archiver.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/archiver.nix
diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/nixpkgs/pkgs/development/java-modules/maven/artifact-manager.nix
index 5bf3ef01bc6..5bf3ef01bc6 100644
--- a/pkgs/development/java-modules/maven/artifact-manager.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/artifact-manager.nix
diff --git a/pkgs/development/java-modules/maven/artifact.nix b/nixpkgs/pkgs/development/java-modules/maven/artifact.nix
index 80e3392abd2..80e3392abd2 100644
--- a/pkgs/development/java-modules/maven/artifact.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/artifact.nix
diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/nixpkgs/pkgs/development/java-modules/maven/common-artifact-filters.nix
index 8c388667991..8c388667991 100644
--- a/pkgs/development/java-modules/maven/common-artifact-filters.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/common-artifact-filters.nix
diff --git a/pkgs/development/java-modules/maven/core.nix b/nixpkgs/pkgs/development/java-modules/maven/core.nix
index a1ea9292a51..a1ea9292a51 100644
--- a/pkgs/development/java-modules/maven/core.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/core.nix
diff --git a/pkgs/development/java-modules/maven/dependency-tree.nix b/nixpkgs/pkgs/development/java-modules/maven/dependency-tree.nix
index aa3a93849c2..aa3a93849c2 100644
--- a/pkgs/development/java-modules/maven/dependency-tree.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/dependency-tree.nix
diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/nixpkgs/pkgs/development/java-modules/maven/doxia-sink-api.nix
index 8314abe4924..8314abe4924 100644
--- a/pkgs/development/java-modules/maven/doxia-sink-api.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/doxia-sink-api.nix
diff --git a/pkgs/development/java-modules/maven/enforcer.nix b/nixpkgs/pkgs/development/java-modules/maven/enforcer.nix
index c7a1d212e0e..c7a1d212e0e 100644
--- a/pkgs/development/java-modules/maven/enforcer.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/enforcer.nix
diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/nixpkgs/pkgs/development/java-modules/maven/error-diagnostics.nix
index f16f10462ff..f16f10462ff 100644
--- a/pkgs/development/java-modules/maven/error-diagnostics.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/error-diagnostics.nix
diff --git a/pkgs/development/java-modules/maven/filtering.nix b/nixpkgs/pkgs/development/java-modules/maven/filtering.nix
index f1e2e551cee..f1e2e551cee 100644
--- a/pkgs/development/java-modules/maven/filtering.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/filtering.nix
diff --git a/pkgs/development/java-modules/maven/model.nix b/nixpkgs/pkgs/development/java-modules/maven/model.nix
index 147b15b6e40..147b15b6e40 100644
--- a/pkgs/development/java-modules/maven/model.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/model.nix
diff --git a/pkgs/development/java-modules/maven/monitor.nix b/nixpkgs/pkgs/development/java-modules/maven/monitor.nix
index 609745e9422..609745e9422 100644
--- a/pkgs/development/java-modules/maven/monitor.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/monitor.nix
diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/nixpkgs/pkgs/development/java-modules/maven/plugin-annotations.nix
index bf8d608488e..bf8d608488e 100644
--- a/pkgs/development/java-modules/maven/plugin-annotations.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/plugin-annotations.nix
diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/nixpkgs/pkgs/development/java-modules/maven/plugin-api.nix
index 55fb0d2c5dd..55fb0d2c5dd 100644
--- a/pkgs/development/java-modules/maven/plugin-api.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/plugin-api.nix
diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/nixpkgs/pkgs/development/java-modules/maven/plugin-descriptor.nix
index 7f5c22fe3b3..7f5c22fe3b3 100644
--- a/pkgs/development/java-modules/maven/plugin-descriptor.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/plugin-descriptor.nix
diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/nixpkgs/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
index 4ff07574dc9..4ff07574dc9 100644
--- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/nixpkgs/pkgs/development/java-modules/maven/plugin-registry.nix
index a7bb92e645d..a7bb92e645d 100644
--- a/pkgs/development/java-modules/maven/plugin-registry.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/plugin-registry.nix
diff --git a/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/nixpkgs/pkgs/development/java-modules/maven/plugin-testing-harness.nix
index 4cd32d508f3..4cd32d508f3 100644
--- a/pkgs/development/java-modules/maven/plugin-testing-harness.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/plugin-testing-harness.nix
diff --git a/pkgs/development/java-modules/maven/profile.nix b/nixpkgs/pkgs/development/java-modules/maven/profile.nix
index c40f87f1c45..c40f87f1c45 100644
--- a/pkgs/development/java-modules/maven/profile.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/profile.nix
diff --git a/pkgs/development/java-modules/maven/project.nix b/nixpkgs/pkgs/development/java-modules/maven/project.nix
index fad53a0250b..fad53a0250b 100644
--- a/pkgs/development/java-modules/maven/project.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/project.nix
diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/nixpkgs/pkgs/development/java-modules/maven/reporting-api.nix
index 87999d452fc..87999d452fc 100644
--- a/pkgs/development/java-modules/maven/reporting-api.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/reporting-api.nix
diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/nixpkgs/pkgs/development/java-modules/maven/repository-metadata.nix
index 0d8f55737b7..0d8f55737b7 100644
--- a/pkgs/development/java-modules/maven/repository-metadata.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/repository-metadata.nix
diff --git a/pkgs/development/java-modules/maven/settings.nix b/nixpkgs/pkgs/development/java-modules/maven/settings.nix
index 09e0170945d..09e0170945d 100644
--- a/pkgs/development/java-modules/maven/settings.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/settings.nix
diff --git a/pkgs/development/java-modules/maven/shared-incremental.nix b/nixpkgs/pkgs/development/java-modules/maven/shared-incremental.nix
index 9fa74f8bfe7..9fa74f8bfe7 100644
--- a/pkgs/development/java-modules/maven/shared-incremental.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/shared-incremental.nix
diff --git a/pkgs/development/java-modules/maven/shared-utils.nix b/nixpkgs/pkgs/development/java-modules/maven/shared-utils.nix
index 38addcfe8aa..38addcfe8aa 100644
--- a/pkgs/development/java-modules/maven/shared-utils.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/shared-utils.nix
diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/nixpkgs/pkgs/development/java-modules/maven/surefire-api.nix
index 9ad284365d9..9ad284365d9 100644
--- a/pkgs/development/java-modules/maven/surefire-api.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/surefire-api.nix
diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/nixpkgs/pkgs/development/java-modules/maven/surefire-booter.nix
index 41f9848d5cd..41f9848d5cd 100644
--- a/pkgs/development/java-modules/maven/surefire-booter.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/surefire-booter.nix
diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/nixpkgs/pkgs/development/java-modules/maven/surefire-common.nix
index 2f4617eff8c..2f4617eff8c 100644
--- a/pkgs/development/java-modules/maven/surefire-common.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/surefire-common.nix
diff --git a/pkgs/development/java-modules/maven/surefire-junit4.nix b/nixpkgs/pkgs/development/java-modules/maven/surefire-junit4.nix
index d67177d80d2..d67177d80d2 100644
--- a/pkgs/development/java-modules/maven/surefire-junit4.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/surefire-junit4.nix
diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/nixpkgs/pkgs/development/java-modules/maven/toolchain.nix
index 91f8fdb77a4..91f8fdb77a4 100644
--- a/pkgs/development/java-modules/maven/toolchain.nix
+++ b/nixpkgs/pkgs/development/java-modules/maven/toolchain.nix
diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/nixpkgs/pkgs/development/java-modules/mavenPlugins.nix
index e481f5d250a..e481f5d250a 100644
--- a/pkgs/development/java-modules/mavenPlugins.nix
+++ b/nixpkgs/pkgs/development/java-modules/mavenPlugins.nix
diff --git a/pkgs/development/java-modules/mojo/animal-sniffer.nix b/nixpkgs/pkgs/development/java-modules/mojo/animal-sniffer.nix
index 221e59f766b..221e59f766b 100644
--- a/pkgs/development/java-modules/mojo/animal-sniffer.nix
+++ b/nixpkgs/pkgs/development/java-modules/mojo/animal-sniffer.nix
diff --git a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/nixpkgs/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
index f6f7e490c7c..f6f7e490c7c 100644
--- a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
+++ b/nixpkgs/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
diff --git a/pkgs/development/java-modules/ow2/asm-all.nix b/nixpkgs/pkgs/development/java-modules/ow2/asm-all.nix
index 92418d8c619..92418d8c619 100644
--- a/pkgs/development/java-modules/ow2/asm-all.nix
+++ b/nixpkgs/pkgs/development/java-modules/ow2/asm-all.nix
diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/nixpkgs/pkgs/development/java-modules/plexus/archiver.nix
index 41a334007e8..41a334007e8 100644
--- a/pkgs/development/java-modules/plexus/archiver.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/archiver.nix
diff --git a/pkgs/development/java-modules/plexus/build-api.nix b/nixpkgs/pkgs/development/java-modules/plexus/build-api.nix
index b362f905091..b362f905091 100644
--- a/pkgs/development/java-modules/plexus/build-api.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/build-api.nix
diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/nixpkgs/pkgs/development/java-modules/plexus/classworlds.nix
index 7cb6c3dbf55..7cb6c3dbf55 100644
--- a/pkgs/development/java-modules/plexus/classworlds.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/classworlds.nix
diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/nixpkgs/pkgs/development/java-modules/plexus/compiler-api.nix
index a1c6556a769..a1c6556a769 100644
--- a/pkgs/development/java-modules/plexus/compiler-api.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/compiler-api.nix
diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/nixpkgs/pkgs/development/java-modules/plexus/compiler-javac.nix
index d86240b6d45..d86240b6d45 100644
--- a/pkgs/development/java-modules/plexus/compiler-javac.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/compiler-javac.nix
diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/nixpkgs/pkgs/development/java-modules/plexus/compiler-manager.nix
index 3f27981b154..3f27981b154 100644
--- a/pkgs/development/java-modules/plexus/compiler-manager.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/compiler-manager.nix
diff --git a/pkgs/development/java-modules/plexus/component-annotations.nix b/nixpkgs/pkgs/development/java-modules/plexus/component-annotations.nix
index 89ae778e762..89ae778e762 100644
--- a/pkgs/development/java-modules/plexus/component-annotations.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/component-annotations.nix
diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/nixpkgs/pkgs/development/java-modules/plexus/container-default.nix
index 79d8ac1087b..79d8ac1087b 100644
--- a/pkgs/development/java-modules/plexus/container-default.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/container-default.nix
diff --git a/pkgs/development/java-modules/plexus/digest.nix b/nixpkgs/pkgs/development/java-modules/plexus/digest.nix
index a9c80c146c9..a9c80c146c9 100644
--- a/pkgs/development/java-modules/plexus/digest.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/digest.nix
diff --git a/pkgs/development/java-modules/plexus/i18n.nix b/nixpkgs/pkgs/development/java-modules/plexus/i18n.nix
index 0b016a7bd49..0b016a7bd49 100644
--- a/pkgs/development/java-modules/plexus/i18n.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/i18n.nix
diff --git a/pkgs/development/java-modules/plexus/interactivity-api.nix b/nixpkgs/pkgs/development/java-modules/plexus/interactivity-api.nix
index 378fa76d8c6..378fa76d8c6 100644
--- a/pkgs/development/java-modules/plexus/interactivity-api.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/interactivity-api.nix
diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/nixpkgs/pkgs/development/java-modules/plexus/interpolation.nix
index f2813e103f5..f2813e103f5 100644
--- a/pkgs/development/java-modules/plexus/interpolation.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/interpolation.nix
diff --git a/pkgs/development/java-modules/plexus/io.nix b/nixpkgs/pkgs/development/java-modules/plexus/io.nix
index e2cfd4b5882..e2cfd4b5882 100644
--- a/pkgs/development/java-modules/plexus/io.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/io.nix
diff --git a/pkgs/development/java-modules/plexus/utils.nix b/nixpkgs/pkgs/development/java-modules/plexus/utils.nix
index c52425342b0..c52425342b0 100644
--- a/pkgs/development/java-modules/plexus/utils.nix
+++ b/nixpkgs/pkgs/development/java-modules/plexus/utils.nix
diff --git a/pkgs/development/java-modules/poms.nix b/nixpkgs/pkgs/development/java-modules/poms.nix
index d93edb7aa4f..d93edb7aa4f 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/nixpkgs/pkgs/development/java-modules/poms.nix
diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix
index 69cb24fc0b0..69cb24fc0b0 100644
--- a/pkgs/development/java-modules/postgresql_jdbc/default.nix
+++ b/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix
diff --git a/pkgs/development/java-modules/sisu/guice.nix b/nixpkgs/pkgs/development/java-modules/sisu/guice.nix
index e4d0e1f98d4..e4d0e1f98d4 100644
--- a/pkgs/development/java-modules/sisu/guice.nix
+++ b/nixpkgs/pkgs/development/java-modules/sisu/guice.nix
diff --git a/pkgs/development/java-modules/sisu/inject-bean.nix b/nixpkgs/pkgs/development/java-modules/sisu/inject-bean.nix
index 22d3582608a..22d3582608a 100644
--- a/pkgs/development/java-modules/sisu/inject-bean.nix
+++ b/nixpkgs/pkgs/development/java-modules/sisu/inject-bean.nix
diff --git a/pkgs/development/java-modules/sisu/inject-plexus.nix b/nixpkgs/pkgs/development/java-modules/sisu/inject-plexus.nix
index aee624c551c..aee624c551c 100644
--- a/pkgs/development/java-modules/sisu/inject-plexus.nix
+++ b/nixpkgs/pkgs/development/java-modules/sisu/inject-plexus.nix
diff --git a/pkgs/development/java-modules/xerces/impl.nix b/nixpkgs/pkgs/development/java-modules/xerces/impl.nix
index 2ea05581d0d..2ea05581d0d 100644
--- a/pkgs/development/java-modules/xerces/impl.nix
+++ b/nixpkgs/pkgs/development/java-modules/xerces/impl.nix
diff --git a/pkgs/development/java-modules/xml-apis/default.nix b/nixpkgs/pkgs/development/java-modules/xml-apis/default.nix
index 871629dbf3c..871629dbf3c 100644
--- a/pkgs/development/java-modules/xml-apis/default.nix
+++ b/nixpkgs/pkgs/development/java-modules/xml-apis/default.nix
diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix
index 1ae6346cbe5..1ae6346cbe5 100644
--- a/pkgs/development/libraries/AntTweakBar/default.nix
+++ b/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix
diff --git a/pkgs/development/libraries/CGAL/4.nix b/nixpkgs/pkgs/development/libraries/CGAL/4.nix
index 60c244009ce..60c244009ce 100644
--- a/pkgs/development/libraries/CGAL/4.nix
+++ b/nixpkgs/pkgs/development/libraries/CGAL/4.nix
diff --git a/pkgs/development/libraries/CGAL/default.nix b/nixpkgs/pkgs/development/libraries/CGAL/default.nix
index d2d74769a1f..d2d74769a1f 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/nixpkgs/pkgs/development/libraries/CGAL/default.nix
diff --git a/pkgs/development/libraries/CoinMP/default.nix b/nixpkgs/pkgs/development/libraries/CoinMP/default.nix
index f251d2bed0c..f251d2bed0c 100644
--- a/pkgs/development/libraries/CoinMP/default.nix
+++ b/nixpkgs/pkgs/development/libraries/CoinMP/default.nix
diff --git a/pkgs/development/libraries/LASzip/default.nix b/nixpkgs/pkgs/development/libraries/LASzip/default.nix
index 418900ddeeb..418900ddeeb 100644
--- a/pkgs/development/libraries/LASzip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/LASzip/default.nix
diff --git a/pkgs/development/libraries/NSPlist/default.nix b/nixpkgs/pkgs/development/libraries/NSPlist/default.nix
index bfee9961984..bfee9961984 100644
--- a/pkgs/development/libraries/NSPlist/default.nix
+++ b/nixpkgs/pkgs/development/libraries/NSPlist/default.nix
diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/nixpkgs/pkgs/development/libraries/PlistCpp/default.nix
index f7703b731b9..f7703b731b9 100644
--- a/pkgs/development/libraries/PlistCpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/PlistCpp/default.nix
diff --git a/pkgs/development/libraries/SDL/default.nix b/nixpkgs/pkgs/development/libraries/SDL/default.nix
index 61609a90dd0..61609a90dd0 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL/default.nix
diff --git a/pkgs/development/libraries/SDL/find-headers.patch b/nixpkgs/pkgs/development/libraries/SDL/find-headers.patch
index fd498117fd6..fd498117fd6 100644
--- a/pkgs/development/libraries/SDL/find-headers.patch
+++ b/nixpkgs/pkgs/development/libraries/SDL/find-headers.patch
diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/nixpkgs/pkgs/development/libraries/SDL/setup-hook.sh
index 553e8553a77..553e8553a77 100644
--- a/pkgs/development/libraries/SDL/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/SDL/setup-hook.sh
diff --git a/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix
index e02ea05a726..e02ea05a726 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix
diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch
index a6b10ddb7ed..a6b10ddb7ed 100644
--- a/pkgs/development/libraries/SDL2/find-headers.patch
+++ b/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch
diff --git a/pkgs/development/libraries/SDL2/setup-hook.sh b/nixpkgs/pkgs/development/libraries/SDL2/setup-hook.sh
index 0119926491a..0119926491a 100644
--- a/pkgs/development/libraries/SDL2/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/SDL2/setup-hook.sh
diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix
index d57bb6cbc94..d57bb6cbc94 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix
index 326d9d66264..326d9d66264 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix
index 58c76e3a3f5..58c76e3a3f5 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix
diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix
index 309102e70b5..309102e70b5 100644
--- a/pkgs/development/libraries/SDL2_net/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix
diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix
index 50e47bc1d36..50e47bc1d36 100644
--- a/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix
diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix
index e330ccef611..e330ccef611 100644
--- a/pkgs/development/libraries/SDL_Pango/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix
diff --git a/pkgs/development/libraries/SDL_Pango/fixes.patch b/nixpkgs/pkgs/development/libraries/SDL_Pango/fixes.patch
index 9703c0d4918..9703c0d4918 100644
--- a/pkgs/development/libraries/SDL_Pango/fixes.patch
+++ b/nixpkgs/pkgs/development/libraries/SDL_Pango/fixes.patch
diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix
index 74a31d94687..74a31d94687 100644
--- a/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix
diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/nixpkgs/pkgs/development/libraries/SDL_gpu/default.nix
index f15009c2f5d..f15009c2f5d 100644
--- a/pkgs/development/libraries/SDL_gpu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_gpu/default.nix
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/nixpkgs/pkgs/development/libraries/SDL_image/default.nix
index 8e3078563e2..8e3078563e2 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_image/default.nix
diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix
index 427439f496e..427439f496e 100644
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix
diff --git a/pkgs/development/libraries/SDL_net/default.nix b/nixpkgs/pkgs/development/libraries/SDL_net/default.nix
index 6ac91a6d129..6ac91a6d129 100644
--- a/pkgs/development/libraries/SDL_net/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_net/default.nix
diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix
index 66fa8888fd1..66fa8888fd1 100644
--- a/pkgs/development/libraries/SDL_sixel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix
diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/nixpkgs/pkgs/development/libraries/SDL_sound/default.nix
index 94534ecd699..94534ecd699 100644
--- a/pkgs/development/libraries/SDL_sound/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_sound/default.nix
diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix
index 9695d51ed89..9695d51ed89 100644
--- a/pkgs/development/libraries/SDL_stretch/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix
diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/nixpkgs/pkgs/development/libraries/SDL_ttf/default.nix
index 96b60b1061f..96b60b1061f 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL_ttf/default.nix
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix
index 3e496b7e981..3e496b7e981 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix
diff --git a/pkgs/development/libraries/a52dec/default.nix b/nixpkgs/pkgs/development/libraries/a52dec/default.nix
index 5ff5e609723..5ff5e609723 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/a52dec/default.nix
diff --git a/pkgs/development/libraries/aalib/darwin.patch b/nixpkgs/pkgs/development/libraries/aalib/darwin.patch
index 44559d06210..44559d06210 100644
--- a/pkgs/development/libraries/aalib/darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/aalib/darwin.patch
diff --git a/pkgs/development/libraries/aalib/default.nix b/nixpkgs/pkgs/development/libraries/aalib/default.nix
index 8b1878b0cc3..8b1878b0cc3 100644
--- a/pkgs/development/libraries/aalib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aalib/default.nix
diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix
index b46963f4673..b46963f4673 100644
--- a/pkgs/development/libraries/abseil-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix
diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix
index bae7b56cb8e..bae7b56cb8e 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix
diff --git a/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch b/nixpkgs/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch
index acaccb8c848..acaccb8c848 100644
--- a/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch
+++ b/nixpkgs/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix
index eb48aca80ee..eb48aca80ee 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix
diff --git a/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch b/nixpkgs/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch
index 4b5222c9552..4b5222c9552 100644
--- a/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch
+++ b/nixpkgs/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch
diff --git a/pkgs/development/libraries/accountsservice/fix-paths.patch b/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch
index 0bf6ee3d91a..0bf6ee3d91a 100644
--- a/pkgs/development/libraries/accountsservice/fix-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch
diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch
index 0333f925d26..0333f925d26 100644
--- a/pkgs/development/libraries/accountsservice/no-create-dirs.patch
+++ b/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch
diff --git a/pkgs/development/libraries/ace/default.nix b/nixpkgs/pkgs/development/libraries/ace/default.nix
index ea352772b33..ea352772b33 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ace/default.nix
diff --git a/pkgs/development/libraries/acl/default.nix b/nixpkgs/pkgs/development/libraries/acl/default.nix
index 4b280cc1862..4b280cc1862 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/acl/default.nix
diff --git a/pkgs/development/libraries/adns/default.nix b/nixpkgs/pkgs/development/libraries/adns/default.nix
index c9797b31eaa..c9797b31eaa 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/adns/default.nix
diff --git a/pkgs/development/libraries/afflib/default.nix b/nixpkgs/pkgs/development/libraries/afflib/default.nix
index f0d87c81133..f0d87c81133 100644
--- a/pkgs/development/libraries/afflib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/afflib/default.nix
diff --git a/pkgs/development/libraries/aften/default.nix b/nixpkgs/pkgs/development/libraries/aften/default.nix
index a1d4c225909..a1d4c225909 100644
--- a/pkgs/development/libraries/aften/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aften/default.nix
diff --git a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix b/nixpkgs/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
index 62856157b4b..62856157b4b 100644
--- a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile b/nixpkgs/pkgs/development/libraries/agda/TotalParserCombinators/contextfile
index 46743cba3b6..46743cba3b6 100644
--- a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile
+++ b/nixpkgs/pkgs/development/libraries/agda/TotalParserCombinators/contextfile
diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/nixpkgs/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
index 344da00d04f..344da00d04f 100644
--- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
diff --git a/pkgs/development/libraries/agda/agda-base/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-base/default.nix
index 1bc9d0cb882..1bc9d0cb882 100644
--- a/pkgs/development/libraries/agda/agda-base/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/agda-base/default.nix
diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
index 30a03980e44..30a03980e44 100644
--- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix
index bcdad18bede..bcdad18bede 100644
--- a/pkgs/development/libraries/agda/agda-prelude/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix
diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-stdlib/default.nix
index 033ba67f661..033ba67f661 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/agda-stdlib/default.nix
diff --git a/pkgs/development/libraries/agda/bitvector/default.nix b/nixpkgs/pkgs/development/libraries/agda/bitvector/default.nix
index c09702c48d7..c09702c48d7 100644
--- a/pkgs/development/libraries/agda/bitvector/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/bitvector/default.nix
diff --git a/pkgs/development/libraries/agda/categories/default.nix b/nixpkgs/pkgs/development/libraries/agda/categories/default.nix
index a58afd7e866..a58afd7e866 100644
--- a/pkgs/development/libraries/agda/categories/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/categories/default.nix
diff --git a/pkgs/development/libraries/agda/pretty/contextfile b/nixpkgs/pkgs/development/libraries/agda/pretty/contextfile
index 2ea20153bbc..2ea20153bbc 100644
--- a/pkgs/development/libraries/agda/pretty/contextfile
+++ b/nixpkgs/pkgs/development/libraries/agda/pretty/contextfile
diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/nixpkgs/pkgs/development/libraries/agda/pretty/default.nix
index ffae1f6f900..ffae1f6f900 100644
--- a/pkgs/development/libraries/agda/pretty/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/pretty/default.nix
diff --git a/pkgs/development/libraries/agg/default.nix b/nixpkgs/pkgs/development/libraries/agg/default.nix
index 69517817b59..69517817b59 100644
--- a/pkgs/development/libraries/agg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agg/default.nix
diff --git a/pkgs/development/libraries/alembic/default.nix b/nixpkgs/pkgs/development/libraries/alembic/default.nix
index 0c3ba0abaa9..0c3ba0abaa9 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/nixpkgs/pkgs/development/libraries/alembic/default.nix
diff --git a/pkgs/development/libraries/alkimia/default.nix b/nixpkgs/pkgs/development/libraries/alkimia/default.nix
index d7d8c268928..d7d8c268928 100644
--- a/pkgs/development/libraries/alkimia/default.nix
+++ b/nixpkgs/pkgs/development/libraries/alkimia/default.nix
diff --git a/pkgs/development/libraries/allegro/5.nix b/nixpkgs/pkgs/development/libraries/allegro/5.nix
index 5f5368f2866..5f5368f2866 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/nixpkgs/pkgs/development/libraries/allegro/5.nix
diff --git a/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch b/nixpkgs/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch
index c49ebb550f3..c49ebb550f3 100644
--- a/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch
+++ b/nixpkgs/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch
diff --git a/pkgs/development/libraries/allegro/default.nix b/nixpkgs/pkgs/development/libraries/allegro/default.nix
index 64488b25b09..64488b25b09 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/nixpkgs/pkgs/development/libraries/allegro/default.nix
diff --git a/pkgs/development/libraries/allegro/nix-unstable-sandbox-fix.patch b/nixpkgs/pkgs/development/libraries/allegro/nix-unstable-sandbox-fix.patch
index a227cea1ce7..a227cea1ce7 100644
--- a/pkgs/development/libraries/allegro/nix-unstable-sandbox-fix.patch
+++ b/nixpkgs/pkgs/development/libraries/allegro/nix-unstable-sandbox-fix.patch
diff --git a/pkgs/development/libraries/alure/default.nix b/nixpkgs/pkgs/development/libraries/alure/default.nix
index a4f3b714e1c..a4f3b714e1c 100644
--- a/pkgs/development/libraries/alure/default.nix
+++ b/nixpkgs/pkgs/development/libraries/alure/default.nix
diff --git a/pkgs/development/libraries/alure2/default.nix b/nixpkgs/pkgs/development/libraries/alure2/default.nix
index 91919873fa6..91919873fa6 100644
--- a/pkgs/development/libraries/alure2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/alure2/default.nix
diff --git a/pkgs/development/libraries/amrnb/default.nix b/nixpkgs/pkgs/development/libraries/amrnb/default.nix
index bfb72be24fe..bfb72be24fe 100644
--- a/pkgs/development/libraries/amrnb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/amrnb/default.nix
diff --git a/pkgs/development/libraries/amrwb/default.nix b/nixpkgs/pkgs/development/libraries/amrwb/default.nix
index 7525b3baab0..7525b3baab0 100644
--- a/pkgs/development/libraries/amrwb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/amrwb/default.nix
diff --git a/pkgs/development/libraries/amtk/default.nix b/nixpkgs/pkgs/development/libraries/amtk/default.nix
index 177bf324b7a..177bf324b7a 100644
--- a/pkgs/development/libraries/amtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/amtk/default.nix
diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix
index 9fc11555b69..9fc11555b69 100644
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix
index 694d91d5a0a..694d91d5a0a 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix
diff --git a/pkgs/development/libraries/appstream-glib/paths.patch b/nixpkgs/pkgs/development/libraries/appstream-glib/paths.patch
index 5c6396988a1..5c6396988a1 100644
--- a/pkgs/development/libraries/appstream-glib/paths.patch
+++ b/nixpkgs/pkgs/development/libraries/appstream-glib/paths.patch
diff --git a/pkgs/development/libraries/appstream/default.nix b/nixpkgs/pkgs/development/libraries/appstream/default.nix
index 62d72844386..62d72844386 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/nixpkgs/pkgs/development/libraries/appstream/default.nix
diff --git a/pkgs/development/libraries/appstream/qt.nix b/nixpkgs/pkgs/development/libraries/appstream/qt.nix
index 22f1566ad0a..22f1566ad0a 100644
--- a/pkgs/development/libraries/appstream/qt.nix
+++ b/nixpkgs/pkgs/development/libraries/appstream/qt.nix
diff --git a/pkgs/development/libraries/apr-util/default.nix b/nixpkgs/pkgs/development/libraries/apr-util/default.nix
index 87563d6a9cb..87563d6a9cb 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/nixpkgs/pkgs/development/libraries/apr-util/default.nix
diff --git a/pkgs/development/libraries/apr-util/include-static-dependencies.patch b/nixpkgs/pkgs/development/libraries/apr-util/include-static-dependencies.patch
index 1813c721781..1813c721781 100644
--- a/pkgs/development/libraries/apr-util/include-static-dependencies.patch
+++ b/nixpkgs/pkgs/development/libraries/apr-util/include-static-dependencies.patch
diff --git a/pkgs/development/libraries/apr/default.nix b/nixpkgs/pkgs/development/libraries/apr/default.nix
index 2ce4b77927f..2ce4b77927f 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/apr/default.nix
diff --git a/pkgs/development/libraries/apr/is-this-a-compiler-bug.patch b/nixpkgs/pkgs/development/libraries/apr/is-this-a-compiler-bug.patch
index bbc10fabb26..bbc10fabb26 100644
--- a/pkgs/development/libraries/apr/is-this-a-compiler-bug.patch
+++ b/nixpkgs/pkgs/development/libraries/apr/is-this-a-compiler-bug.patch
diff --git a/pkgs/development/libraries/aqbanking/default.nix b/nixpkgs/pkgs/development/libraries/aqbanking/default.nix
index 8be98f061a8..8be98f061a8 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aqbanking/default.nix
diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index 061ed77849f..061ed77849f 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix
diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix
index 32ec4dd06fd..32ec4dd06fd 100644
--- a/pkgs/development/libraries/aqbanking/libchipcard.nix
+++ b/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix
diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix
index 884543d282a..884543d282a 100644
--- a/pkgs/development/libraries/aqbanking/sources.nix
+++ b/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix
diff --git a/pkgs/development/libraries/aqbanking/update.sh b/nixpkgs/pkgs/development/libraries/aqbanking/update.sh
index 8929e8bc6eb..8929e8bc6eb 100755
--- a/pkgs/development/libraries/aqbanking/update.sh
+++ b/nixpkgs/pkgs/development/libraries/aqbanking/update.sh
diff --git a/pkgs/development/libraries/aravis/default.nix b/nixpkgs/pkgs/development/libraries/aravis/default.nix
index eaeddbcad36..eaeddbcad36 100644
--- a/pkgs/development/libraries/aravis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aravis/default.nix
diff --git a/pkgs/development/libraries/arb/default.nix b/nixpkgs/pkgs/development/libraries/arb/default.nix
index 6393e25f561..6393e25f561 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/arb/default.nix
diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix
index 6544c481187..6544c481187 100644
--- a/pkgs/development/libraries/argp-standalone/default.nix
+++ b/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix
diff --git a/pkgs/development/libraries/arguments/default.nix b/nixpkgs/pkgs/development/libraries/arguments/default.nix
index cb0c65e97e3..cb0c65e97e3 100644
--- a/pkgs/development/libraries/arguments/default.nix
+++ b/nixpkgs/pkgs/development/libraries/arguments/default.nix
diff --git a/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix
index 9f0f16d5cee..9f0f16d5cee 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix
diff --git a/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch b/nixpkgs/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch
index a1442d14119..a1442d14119 100644
--- a/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch
+++ b/nixpkgs/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch
diff --git a/pkgs/development/libraries/arrayfire/default.nix b/nixpkgs/pkgs/development/libraries/arrayfire/default.nix
index 21e93a8cd49..21e93a8cd49 100644
--- a/pkgs/development/libraries/arrayfire/default.nix
+++ b/nixpkgs/pkgs/development/libraries/arrayfire/default.nix
diff --git a/pkgs/development/libraries/arrayfire/no-download.patch b/nixpkgs/pkgs/development/libraries/arrayfire/no-download.patch
index 2b3ac492a54..2b3ac492a54 100644
--- a/pkgs/development/libraries/arrayfire/no-download.patch
+++ b/nixpkgs/pkgs/development/libraries/arrayfire/no-download.patch
diff --git a/pkgs/development/libraries/arrow-cpp/darwin.patch b/nixpkgs/pkgs/development/libraries/arrow-cpp/darwin.patch
index de9b1986ffe..de9b1986ffe 100644
--- a/pkgs/development/libraries/arrow-cpp/darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/darwin.patch
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix
index 87684a4bbe4..87684a4bbe4 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix
diff --git a/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch b/nixpkgs/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch
index 0f7955724e1..0f7955724e1 100644
--- a/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch
+++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch
diff --git a/pkgs/development/libraries/asio/1.10.nix b/nixpkgs/pkgs/development/libraries/asio/1.10.nix
index f63fbbd495c..f63fbbd495c 100644
--- a/pkgs/development/libraries/asio/1.10.nix
+++ b/nixpkgs/pkgs/development/libraries/asio/1.10.nix
diff --git a/pkgs/development/libraries/asio/1.12.nix b/nixpkgs/pkgs/development/libraries/asio/1.12.nix
index 94fe4c70367..94fe4c70367 100644
--- a/pkgs/development/libraries/asio/1.12.nix
+++ b/nixpkgs/pkgs/development/libraries/asio/1.12.nix
diff --git a/pkgs/development/libraries/asio/generic.nix b/nixpkgs/pkgs/development/libraries/asio/generic.nix
index b8d166507a9..b8d166507a9 100644
--- a/pkgs/development/libraries/asio/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/asio/generic.nix
diff --git a/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/nixpkgs/pkgs/development/libraries/aspell/aspell-with-dicts.nix
index fd5ccf9696c..fd5ccf9696c 100644
--- a/pkgs/development/libraries/aspell/aspell-with-dicts.nix
+++ b/nixpkgs/pkgs/development/libraries/aspell/aspell-with-dicts.nix
diff --git a/pkgs/development/libraries/aspell/clang.patch b/nixpkgs/pkgs/development/libraries/aspell/clang.patch
index c4cfa426588..c4cfa426588 100644
--- a/pkgs/development/libraries/aspell/clang.patch
+++ b/nixpkgs/pkgs/development/libraries/aspell/clang.patch
diff --git a/pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch b/nixpkgs/pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch
index c19827ba93e..c19827ba93e 100644
--- a/pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch
+++ b/nixpkgs/pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch
diff --git a/pkgs/development/libraries/aspell/default.nix b/nixpkgs/pkgs/development/libraries/aspell/default.nix
index ad0f910dcbf..ad0f910dcbf 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aspell/default.nix
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix
index 05a1c95c81f..05a1c95c81f 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix
diff --git a/pkgs/development/libraries/assimp/default.nix b/nixpkgs/pkgs/development/libraries/assimp/default.nix
index ca332026982..ca332026982 100644
--- a/pkgs/development/libraries/assimp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/assimp/default.nix
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix
index f63a341e26e..f63a341e26e 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix
index 84a8a6b9026..84a8a6b9026 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix
diff --git a/pkgs/development/libraries/atk/default.nix b/nixpkgs/pkgs/development/libraries/atk/default.nix
index 9e80d4fc6ca..9e80d4fc6ca 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/atk/default.nix
diff --git a/pkgs/development/libraries/atk/fix_pc.patch b/nixpkgs/pkgs/development/libraries/atk/fix_pc.patch
index 3d19d9862cb..3d19d9862cb 100644
--- a/pkgs/development/libraries/atk/fix_pc.patch
+++ b/nixpkgs/pkgs/development/libraries/atk/fix_pc.patch
diff --git a/pkgs/development/libraries/atkmm/default.nix b/nixpkgs/pkgs/development/libraries/atkmm/default.nix
index 5338aa683a7..5338aa683a7 100644
--- a/pkgs/development/libraries/atkmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/atkmm/default.nix
diff --git a/pkgs/development/libraries/attica/default.nix b/nixpkgs/pkgs/development/libraries/attica/default.nix
index d883100fd3c..d883100fd3c 100644
--- a/pkgs/development/libraries/attica/default.nix
+++ b/nixpkgs/pkgs/development/libraries/attica/default.nix
diff --git a/pkgs/development/libraries/attr/default.nix b/nixpkgs/pkgs/development/libraries/attr/default.nix
index 497262c04d7..497262c04d7 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/attr/default.nix
diff --git a/pkgs/development/libraries/aubio/default.nix b/nixpkgs/pkgs/development/libraries/aubio/default.nix
index db5ecf3b016..db5ecf3b016 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aubio/default.nix
diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/nixpkgs/pkgs/development/libraries/audio/jamomacore/default.nix
index 02409d6ace0..02409d6ace0 100644
--- a/pkgs/development/libraries/audio/jamomacore/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/jamomacore/default.nix
diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix
index 3552e335fed..3552e335fed 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix
diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix
index 2fde40327e9..2fde40327e9 100644
--- a/pkgs/development/libraries/audio/libbs2b/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix
diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix
index b8f1a5c088a..b8f1a5c088a 100644
--- a/pkgs/development/libraries/audio/libgme/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix
index 94c454859ae..94c454859ae 100644
--- a/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix
diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix
index 1c5a5302d71..1c5a5302d71 100644
--- a/pkgs/development/libraries/audio/libsmf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix
index 44be67d71b4..44be67d71b4 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix
index 0f86cd76e2a..0f86cd76e2a 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix
index 826c36db1a6..826c36db1a6 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix
diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix
index c4c931ecade..c4c931ecade 100644
--- a/pkgs/development/libraries/audio/ntk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix
diff --git a/pkgs/development/libraries/audio/raul/default.nix b/nixpkgs/pkgs/development/libraries/audio/raul/default.nix
index de78385e0ab..de78385e0ab 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/raul/default.nix
diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix
index f26f2b07e71..f26f2b07e71 100644
--- a/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix
index 16527a763c9..16527a763c9 100644
--- a/pkgs/development/libraries/audio/rtmidi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix
index 840b50d788f..840b50d788f 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix
diff --git a/pkgs/development/libraries/audio/suil/default.nix b/nixpkgs/pkgs/development/libraries/audio/suil/default.nix
index 8bd460ce545..8bd460ce545 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/suil/default.nix
diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/nixpkgs/pkgs/development/libraries/audio/vamp/default.nix
index 2ac3115af2a..2ac3115af2a 100644
--- a/pkgs/development/libraries/audio/vamp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/vamp/default.nix
diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
index debe7d56f7b..debe7d56f7b 100644
--- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix
index 93bd18abaae..93bd18abaae 100644
--- a/pkgs/development/libraries/audio/zita-convolver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix
index b0b0186af88..b0b0186af88 100644
--- a/pkgs/development/libraries/audio/zita-resampler/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix
diff --git a/pkgs/development/libraries/audiofile/CVE-2015-7747.patch b/nixpkgs/pkgs/development/libraries/audiofile/CVE-2015-7747.patch
index a01aaa14dce..a01aaa14dce 100644
--- a/pkgs/development/libraries/audiofile/CVE-2015-7747.patch
+++ b/nixpkgs/pkgs/development/libraries/audiofile/CVE-2015-7747.patch
diff --git a/pkgs/development/libraries/audiofile/default.nix b/nixpkgs/pkgs/development/libraries/audiofile/default.nix
index 680b585643b..680b585643b 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audiofile/default.nix
diff --git a/pkgs/development/libraries/audiofile/gcc-6.patch b/nixpkgs/pkgs/development/libraries/audiofile/gcc-6.patch
index 1a7edd5af9a..1a7edd5af9a 100644
--- a/pkgs/development/libraries/audiofile/gcc-6.patch
+++ b/nixpkgs/pkgs/development/libraries/audiofile/gcc-6.patch
diff --git a/pkgs/development/libraries/avahi/default.nix b/nixpkgs/pkgs/development/libraries/avahi/default.nix
index babfd6849a8..babfd6849a8 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/avahi/default.nix
diff --git a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch b/nixpkgs/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
index 72965c9f028..72965c9f028 100644
--- a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
+++ b/nixpkgs/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
diff --git a/pkgs/development/libraries/avro-c++/default.nix b/nixpkgs/pkgs/development/libraries/avro-c++/default.nix
index a2fdb66d7e9..a2fdb66d7e9 100644
--- a/pkgs/development/libraries/avro-c++/default.nix
+++ b/nixpkgs/pkgs/development/libraries/avro-c++/default.nix
diff --git a/pkgs/development/libraries/avro-c/default.nix b/nixpkgs/pkgs/development/libraries/avro-c/default.nix
index 5d7dedd0e07..5d7dedd0e07 100644
--- a/pkgs/development/libraries/avro-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/avro-c/default.nix
diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
index b10797d3d56..b10797d3d56 100644
--- a/pkgs/development/libraries/aws-c-common/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix
index ccc4abb85fd..ccc4abb85fd 100644
--- a/pkgs/development/libraries/aws-c-event-stream/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix
diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix
index 124984f0d53..124984f0d53 100644
--- a/pkgs/development/libraries/aws-checksums/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 8024f310951..8024f310951 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix
diff --git a/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix
index 5a579a0505b..5a579a0505b 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/babl/default.nix
diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix
index af727e394d1..af727e394d1 100644
--- a/pkgs/development/libraries/backward-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix
diff --git a/pkgs/development/libraries/bamf/default.nix b/nixpkgs/pkgs/development/libraries/bamf/default.nix
index 60322f53016..60322f53016 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bamf/default.nix
diff --git a/pkgs/development/libraries/bamf/gtester2xunit-python3.patch b/nixpkgs/pkgs/development/libraries/bamf/gtester2xunit-python3.patch
index 8dc47854194..8dc47854194 100644
--- a/pkgs/development/libraries/bamf/gtester2xunit-python3.patch
+++ b/nixpkgs/pkgs/development/libraries/bamf/gtester2xunit-python3.patch
diff --git a/pkgs/development/libraries/bcg729/default.nix b/nixpkgs/pkgs/development/libraries/bcg729/default.nix
index 4363948e830..4363948e830 100644
--- a/pkgs/development/libraries/bcg729/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bcg729/default.nix
diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix
index 1c81dd608cb..1c81dd608cb 100644
--- a/pkgs/development/libraries/bctoolbox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix
diff --git a/pkgs/development/libraries/beecrypt/default.nix b/nixpkgs/pkgs/development/libraries/beecrypt/default.nix
index d7d6ef54516..d7d6ef54516 100644
--- a/pkgs/development/libraries/beecrypt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/beecrypt/default.nix
diff --git a/pkgs/development/libraries/beignet/clang_llvm.patch b/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch
index bcdad510e10..bcdad510e10 100644
--- a/pkgs/development/libraries/beignet/clang_llvm.patch
+++ b/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch
diff --git a/pkgs/development/libraries/beignet/default.nix b/nixpkgs/pkgs/development/libraries/beignet/default.nix
index af0053519e3..af0053519e3 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/beignet/default.nix
diff --git a/pkgs/development/libraries/belcard/default.nix b/nixpkgs/pkgs/development/libraries/belcard/default.nix
index aa6cb8513ae..aa6cb8513ae 100644
--- a/pkgs/development/libraries/belcard/default.nix
+++ b/nixpkgs/pkgs/development/libraries/belcard/default.nix
diff --git a/pkgs/development/libraries/belle-sip/default.nix b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix
index 0d3df37d8e0..0d3df37d8e0 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix
diff --git a/pkgs/development/libraries/belr/default.nix b/nixpkgs/pkgs/development/libraries/belr/default.nix
index f0557b0379f..f0557b0379f 100644
--- a/pkgs/development/libraries/belr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/belr/default.nix
diff --git a/pkgs/development/libraries/biblesync/default.nix b/nixpkgs/pkgs/development/libraries/biblesync/default.nix
index 16be4600ec6..16be4600ec6 100644
--- a/pkgs/development/libraries/biblesync/default.nix
+++ b/nixpkgs/pkgs/development/libraries/biblesync/default.nix
diff --git a/pkgs/development/libraries/bobcat/default.nix b/nixpkgs/pkgs/development/libraries/bobcat/default.nix
index c7520c89ef5..c7520c89ef5 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bobcat/default.nix
diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix
index 1cbbee469e6..1cbbee469e6 100644
--- a/pkgs/development/libraries/boehm-gc/7.6.6.nix
+++ b/nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix
index f061626a897..f061626a897 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix
diff --git a/pkgs/development/libraries/boehm-gc/mcfgthread.patch b/nixpkgs/pkgs/development/libraries/boehm-gc/mcfgthread.patch
index c4aa996aebd..c4aa996aebd 100644
--- a/pkgs/development/libraries/boehm-gc/mcfgthread.patch
+++ b/nixpkgs/pkgs/development/libraries/boehm-gc/mcfgthread.patch
diff --git a/pkgs/development/libraries/boehm-gc/riscv.patch b/nixpkgs/pkgs/development/libraries/boehm-gc/riscv.patch
index 249137d0a0d..249137d0a0d 100644
--- a/pkgs/development/libraries/boehm-gc/riscv.patch
+++ b/nixpkgs/pkgs/development/libraries/boehm-gc/riscv.patch
diff --git a/pkgs/development/libraries/boolstuff/default.nix b/nixpkgs/pkgs/development/libraries/boolstuff/default.nix
index 9ec27d3e9eb..9ec27d3e9eb 100644
--- a/pkgs/development/libraries/boolstuff/default.nix
+++ b/nixpkgs/pkgs/development/libraries/boolstuff/default.nix
diff --git a/pkgs/development/libraries/boost-process/default.nix b/nixpkgs/pkgs/development/libraries/boost-process/default.nix
index b90006a5e97..b90006a5e97 100644
--- a/pkgs/development/libraries/boost-process/default.nix
+++ b/nixpkgs/pkgs/development/libraries/boost-process/default.nix
diff --git a/pkgs/development/libraries/boost/1.55.nix b/nixpkgs/pkgs/development/libraries/boost/1.55.nix
index bcb452ea4f8..bcb452ea4f8 100644
--- a/pkgs/development/libraries/boost/1.55.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.55.nix
diff --git a/pkgs/development/libraries/boost/1.59.nix b/nixpkgs/pkgs/development/libraries/boost/1.59.nix
index fb65e49c500..fb65e49c500 100644
--- a/pkgs/development/libraries/boost/1.59.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.59.nix
diff --git a/pkgs/development/libraries/boost/1.60.nix b/nixpkgs/pkgs/development/libraries/boost/1.60.nix
index 646f4652f77..646f4652f77 100644
--- a/pkgs/development/libraries/boost/1.60.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.60.nix
diff --git a/pkgs/development/libraries/boost/1.62.nix b/nixpkgs/pkgs/development/libraries/boost/1.62.nix
index a1b3c51d0e6..a1b3c51d0e6 100644
--- a/pkgs/development/libraries/boost/1.62.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.62.nix
diff --git a/pkgs/development/libraries/boost/1.63.nix b/nixpkgs/pkgs/development/libraries/boost/1.63.nix
index a8b459f4b12..a8b459f4b12 100644
--- a/pkgs/development/libraries/boost/1.63.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.63.nix
diff --git a/pkgs/development/libraries/boost/1.64.nix b/nixpkgs/pkgs/development/libraries/boost/1.64.nix
index 32632f79d22..32632f79d22 100644
--- a/pkgs/development/libraries/boost/1.64.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.64.nix
diff --git a/pkgs/development/libraries/boost/1.65.nix b/nixpkgs/pkgs/development/libraries/boost/1.65.nix
index 922c09ba7fe..922c09ba7fe 100644
--- a/pkgs/development/libraries/boost/1.65.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.65.nix
diff --git a/pkgs/development/libraries/boost/1.66.nix b/nixpkgs/pkgs/development/libraries/boost/1.66.nix
index 0a99717a799..0a99717a799 100644
--- a/pkgs/development/libraries/boost/1.66.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.66.nix
diff --git a/pkgs/development/libraries/boost/1.67.nix b/nixpkgs/pkgs/development/libraries/boost/1.67.nix
index a2fe9447c12..a2fe9447c12 100644
--- a/pkgs/development/libraries/boost/1.67.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.67.nix
diff --git a/pkgs/development/libraries/boost/1.68.nix b/nixpkgs/pkgs/development/libraries/boost/1.68.nix
index 4d98172c6d0..4d98172c6d0 100644
--- a/pkgs/development/libraries/boost/1.68.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.68.nix
diff --git a/pkgs/development/libraries/boost/1.69.nix b/nixpkgs/pkgs/development/libraries/boost/1.69.nix
index 95c4aa854a4..95c4aa854a4 100644
--- a/pkgs/development/libraries/boost/1.69.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.69.nix
diff --git a/pkgs/development/libraries/boost/1.70.nix b/nixpkgs/pkgs/development/libraries/boost/1.70.nix
index 45a8bdb9318..45a8bdb9318 100644
--- a/pkgs/development/libraries/boost/1.70.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.70.nix
diff --git a/pkgs/development/libraries/boost/1.71.nix b/nixpkgs/pkgs/development/libraries/boost/1.71.nix
index f66bd4cd6fb..f66bd4cd6fb 100644
--- a/pkgs/development/libraries/boost/1.71.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.71.nix
diff --git a/pkgs/development/libraries/boost/clang-math-2.patch b/nixpkgs/pkgs/development/libraries/boost/clang-math-2.patch
index f819e9bec62..f819e9bec62 100644
--- a/pkgs/development/libraries/boost/clang-math-2.patch
+++ b/nixpkgs/pkgs/development/libraries/boost/clang-math-2.patch
diff --git a/pkgs/development/libraries/boost/clang-math.patch b/nixpkgs/pkgs/development/libraries/boost/clang-math.patch
index aa3d76af28b..aa3d76af28b 100644
--- a/pkgs/development/libraries/boost/clang-math.patch
+++ b/nixpkgs/pkgs/development/libraries/boost/clang-math.patch
diff --git a/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch b/nixpkgs/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch
index f8163f6d271..f8163f6d271 100644
--- a/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch
+++ b/nixpkgs/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch
diff --git a/pkgs/development/libraries/boost/darwin-no-system-python.patch b/nixpkgs/pkgs/development/libraries/boost/darwin-no-system-python.patch
index 73e0910336a..73e0910336a 100644
--- a/pkgs/development/libraries/boost/darwin-no-system-python.patch
+++ b/nixpkgs/pkgs/development/libraries/boost/darwin-no-system-python.patch
diff --git a/pkgs/development/libraries/boost/gcc-5.patch b/nixpkgs/pkgs/development/libraries/boost/gcc-5.patch
index 2b2713590ca..2b2713590ca 100644
--- a/pkgs/development/libraries/boost/gcc-5.patch
+++ b/nixpkgs/pkgs/development/libraries/boost/gcc-5.patch
diff --git a/pkgs/development/libraries/boost/generic.nix b/nixpkgs/pkgs/development/libraries/boost/generic.nix
index 82bcd49592d..82bcd49592d 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/generic.nix
diff --git a/pkgs/development/libraries/bootil/default.nix b/nixpkgs/pkgs/development/libraries/bootil/default.nix
index 9283f37a8c4..9283f37a8c4 100644
--- a/pkgs/development/libraries/bootil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bootil/default.nix
diff --git a/pkgs/development/libraries/boringssl/default.nix b/nixpkgs/pkgs/development/libraries/boringssl/default.nix
index 67e2794c8a2..67e2794c8a2 100644
--- a/pkgs/development/libraries/boringssl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/boringssl/default.nix
diff --git a/pkgs/development/libraries/botan/2.0.nix b/nixpkgs/pkgs/development/libraries/botan/2.0.nix
index 91f7f664730..91f7f664730 100644
--- a/pkgs/development/libraries/botan/2.0.nix
+++ b/nixpkgs/pkgs/development/libraries/botan/2.0.nix
diff --git a/pkgs/development/libraries/botan/2.0.upstream b/nixpkgs/pkgs/development/libraries/botan/2.0.upstream
index 74eb1a2ca83..74eb1a2ca83 100644
--- a/pkgs/development/libraries/botan/2.0.upstream
+++ b/nixpkgs/pkgs/development/libraries/botan/2.0.upstream
diff --git a/pkgs/development/libraries/botan/default.nix b/nixpkgs/pkgs/development/libraries/botan/default.nix
index 04652aa013a..04652aa013a 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/nixpkgs/pkgs/development/libraries/botan/default.nix
diff --git a/pkgs/development/libraries/botan/default.upstream b/nixpkgs/pkgs/development/libraries/botan/default.upstream
index 43f6a3b268e..43f6a3b268e 100644
--- a/pkgs/development/libraries/botan/default.upstream
+++ b/nixpkgs/pkgs/development/libraries/botan/default.upstream
diff --git a/pkgs/development/libraries/botan/generic.nix b/nixpkgs/pkgs/development/libraries/botan/generic.nix
index 18b1b47f6d3..18b1b47f6d3 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/botan/generic.nix
diff --git a/pkgs/development/libraries/box2d/default.nix b/nixpkgs/pkgs/development/libraries/box2d/default.nix
index 64b18f389ac..64b18f389ac 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/box2d/default.nix
diff --git a/pkgs/development/libraries/boxfort/default.nix b/nixpkgs/pkgs/development/libraries/boxfort/default.nix
index fb6e735c46e..fb6e735c46e 100644
--- a/pkgs/development/libraries/boxfort/default.nix
+++ b/nixpkgs/pkgs/development/libraries/boxfort/default.nix
diff --git a/pkgs/development/libraries/brigand/default.nix b/nixpkgs/pkgs/development/libraries/brigand/default.nix
index 7710747d800..7710747d800 100644
--- a/pkgs/development/libraries/brigand/default.nix
+++ b/nixpkgs/pkgs/development/libraries/brigand/default.nix
diff --git a/pkgs/development/libraries/buddy/default.nix b/nixpkgs/pkgs/development/libraries/buddy/default.nix
index 9b722602a65..9b722602a65 100644
--- a/pkgs/development/libraries/buddy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/buddy/default.nix
diff --git a/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch b/nixpkgs/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch
index 2e7efd1c466..2e7efd1c466 100644
--- a/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch
+++ b/nixpkgs/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch
diff --git a/pkgs/development/libraries/bullet/default.nix b/nixpkgs/pkgs/development/libraries/bullet/default.nix
index 5b4e37eff9f..5b4e37eff9f 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bullet/default.nix
diff --git a/pkgs/development/libraries/bullet/gwen-narrowing.patch b/nixpkgs/pkgs/development/libraries/bullet/gwen-narrowing.patch
index c6c06325dae..c6c06325dae 100644
--- a/pkgs/development/libraries/bullet/gwen-narrowing.patch
+++ b/nixpkgs/pkgs/development/libraries/bullet/gwen-narrowing.patch
diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix
index 34a9ee3b6ee..34a9ee3b6ee 100644
--- a/pkgs/development/libraries/bullet/roboschool-fork.nix
+++ b/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix
diff --git a/pkgs/development/libraries/bulletml/default.nix b/nixpkgs/pkgs/development/libraries/bulletml/default.nix
index f64090bd53a..f64090bd53a 100644
--- a/pkgs/development/libraries/bulletml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bulletml/default.nix
diff --git a/pkgs/development/libraries/bwidget/default.nix b/nixpkgs/pkgs/development/libraries/bwidget/default.nix
index e763afc4a43..e763afc4a43 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bwidget/default.nix
diff --git a/pkgs/development/libraries/bzrtp/default.nix b/nixpkgs/pkgs/development/libraries/bzrtp/default.nix
index b2dc295db5b..b2dc295db5b 100644
--- a/pkgs/development/libraries/bzrtp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/bzrtp/default.nix
diff --git a/pkgs/development/libraries/c-ares/default.nix b/nixpkgs/pkgs/development/libraries/c-ares/default.nix
index 9e38398dfad..9e38398dfad 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/nixpkgs/pkgs/development/libraries/c-ares/default.nix
diff --git a/pkgs/development/libraries/c-blosc/default.nix b/nixpkgs/pkgs/development/libraries/c-blosc/default.nix
index 4a9e627e544..4a9e627e544 100644
--- a/pkgs/development/libraries/c-blosc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/c-blosc/default.nix
diff --git a/pkgs/development/libraries/caf/default.nix b/nixpkgs/pkgs/development/libraries/caf/default.nix
index e32ec169579..e32ec169579 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/caf/default.nix
diff --git a/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix
index 80f8f9498d7..80f8f9498d7 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix
diff --git a/pkgs/development/libraries/cairomm/default.nix b/nixpkgs/pkgs/development/libraries/cairomm/default.nix
index 13550bf3fab..13550bf3fab 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cairomm/default.nix
diff --git a/pkgs/development/libraries/capnproto/default.nix b/nixpkgs/pkgs/development/libraries/capnproto/default.nix
index 9020ccf08b5..9020ccf08b5 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/nixpkgs/pkgs/development/libraries/capnproto/default.nix
diff --git a/pkgs/development/libraries/capstone/default.nix b/nixpkgs/pkgs/development/libraries/capstone/default.nix
index 956fd74da58..956fd74da58 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/nixpkgs/pkgs/development/libraries/capstone/default.nix
diff --git a/pkgs/development/libraries/catch/default.nix b/nixpkgs/pkgs/development/libraries/catch/default.nix
index 92e5c04e032..92e5c04e032 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/nixpkgs/pkgs/development/libraries/catch/default.nix
diff --git a/pkgs/development/libraries/catch2/default.nix b/nixpkgs/pkgs/development/libraries/catch2/default.nix
index cc338e35d83..cc338e35d83 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/catch2/default.nix
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/nixpkgs/pkgs/development/libraries/ccrtp/default.nix
index cd9d031788a..cd9d031788a 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ccrtp/default.nix
diff --git a/pkgs/development/libraries/cctz/default.nix b/nixpkgs/pkgs/development/libraries/cctz/default.nix
index 5897f84efff..5897f84efff 100644
--- a/pkgs/development/libraries/cctz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cctz/default.nix
diff --git a/pkgs/development/libraries/cddlib/default.nix b/nixpkgs/pkgs/development/libraries/cddlib/default.nix
index d84cda5b750..d84cda5b750 100644
--- a/pkgs/development/libraries/cddlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cddlib/default.nix
diff --git a/pkgs/development/libraries/cdk/default.nix b/nixpkgs/pkgs/development/libraries/cdk/default.nix
index 8487435981c..8487435981c 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cdk/default.nix
diff --git a/pkgs/development/libraries/cdo/default.nix b/nixpkgs/pkgs/development/libraries/cdo/default.nix
index 2a3dbc7a2d1..2a3dbc7a2d1 100644
--- a/pkgs/development/libraries/cdo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cdo/default.nix
diff --git a/pkgs/development/libraries/cegui/default.nix b/nixpkgs/pkgs/development/libraries/cegui/default.nix
index eaeb6bf8e43..eaeb6bf8e43 100644
--- a/pkgs/development/libraries/cegui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cegui/default.nix
diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/nixpkgs/pkgs/development/libraries/celt/0.5.1.nix
index e45d74345d4..e45d74345d4 100644
--- a/pkgs/development/libraries/celt/0.5.1.nix
+++ b/nixpkgs/pkgs/development/libraries/celt/0.5.1.nix
diff --git a/pkgs/development/libraries/celt/0.7.nix b/nixpkgs/pkgs/development/libraries/celt/0.7.nix
index a5dd401ec49..a5dd401ec49 100644
--- a/pkgs/development/libraries/celt/0.7.nix
+++ b/nixpkgs/pkgs/development/libraries/celt/0.7.nix
diff --git a/pkgs/development/libraries/celt/default.nix b/nixpkgs/pkgs/development/libraries/celt/default.nix
index 61352d5caf9..61352d5caf9 100644
--- a/pkgs/development/libraries/celt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/celt/default.nix
diff --git a/pkgs/development/libraries/celt/generic.nix b/nixpkgs/pkgs/development/libraries/celt/generic.nix
index 3b7e870b4fe..3b7e870b4fe 100644
--- a/pkgs/development/libraries/celt/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/celt/generic.nix
diff --git a/pkgs/development/libraries/cereal/default.nix b/nixpkgs/pkgs/development/libraries/cereal/default.nix
index 03a1f9b3179..03a1f9b3179 100644
--- a/pkgs/development/libraries/cereal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cereal/default.nix
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix
index 3ce8c4ef080..3ce8c4ef080 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix
diff --git a/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch b/nixpkgs/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch
index af38abf329e..af38abf329e 100644
--- a/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch
+++ b/nixpkgs/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch
diff --git a/pkgs/development/libraries/cfitsio/default.nix b/nixpkgs/pkgs/development/libraries/cfitsio/default.nix
index 4b84f73a258..4b84f73a258 100644
--- a/pkgs/development/libraries/cfitsio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cfitsio/default.nix
diff --git a/pkgs/development/libraries/cgui/default.nix b/nixpkgs/pkgs/development/libraries/cgui/default.nix
index 39ed74d0075..39ed74d0075 100644
--- a/pkgs/development/libraries/cgui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cgui/default.nix
diff --git a/pkgs/development/libraries/check/default.nix b/nixpkgs/pkgs/development/libraries/check/default.nix
index 6a94d9a71ce..6a94d9a71ce 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/nixpkgs/pkgs/development/libraries/check/default.nix
diff --git a/pkgs/development/libraries/chipmunk/default.nix b/nixpkgs/pkgs/development/libraries/chipmunk/default.nix
index 5dd9917bc52..5dd9917bc52 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/chipmunk/default.nix
diff --git a/pkgs/development/libraries/chmlib/default.nix b/nixpkgs/pkgs/development/libraries/chmlib/default.nix
index 4f4af87227f..4f4af87227f 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/chmlib/default.nix
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/nixpkgs/pkgs/development/libraries/chromaprint/default.nix
index 6ad6a09ec14..6ad6a09ec14 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/nixpkgs/pkgs/development/libraries/chromaprint/default.nix
diff --git a/pkgs/development/libraries/cimg/default.nix b/nixpkgs/pkgs/development/libraries/cimg/default.nix
index 22ad25a8bbe..22ad25a8bbe 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cimg/default.nix
diff --git a/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch b/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch
index 47f41972745..47f41972745 100644
--- a/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch
+++ b/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch
diff --git a/pkgs/development/libraries/civetweb/default.nix b/nixpkgs/pkgs/development/libraries/civetweb/default.nix
index 3f8de005ff8..3f8de005ff8 100644
--- a/pkgs/development/libraries/civetweb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/civetweb/default.nix
diff --git a/pkgs/development/libraries/cl/default.nix b/nixpkgs/pkgs/development/libraries/cl/default.nix
index 2c8ac5113b1..2c8ac5113b1 100644
--- a/pkgs/development/libraries/cl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cl/default.nix
diff --git a/pkgs/development/libraries/classads/default.nix b/nixpkgs/pkgs/development/libraries/classads/default.nix
index ff8e1ca6759..ff8e1ca6759 100644
--- a/pkgs/development/libraries/classads/default.nix
+++ b/nixpkgs/pkgs/development/libraries/classads/default.nix
diff --git a/pkgs/development/libraries/clearsilver/default.nix b/nixpkgs/pkgs/development/libraries/clearsilver/default.nix
index fd4d8d5ca31..fd4d8d5ca31 100644
--- a/pkgs/development/libraries/clearsilver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clearsilver/default.nix
diff --git a/pkgs/development/libraries/clfft/default.nix b/nixpkgs/pkgs/development/libraries/clfft/default.nix
index 5eb5b842ecf..5eb5b842ecf 100644
--- a/pkgs/development/libraries/clfft/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clfft/default.nix
diff --git a/pkgs/development/libraries/clipp/clipp.pc b/nixpkgs/pkgs/development/libraries/clipp/clipp.pc
index 38c07e5ba16..38c07e5ba16 100644
--- a/pkgs/development/libraries/clipp/clipp.pc
+++ b/nixpkgs/pkgs/development/libraries/clipp/clipp.pc
diff --git a/pkgs/development/libraries/clipp/default.nix b/nixpkgs/pkgs/development/libraries/clipp/default.nix
index f7c8f90e868..f7c8f90e868 100644
--- a/pkgs/development/libraries/clipp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clipp/default.nix
diff --git a/pkgs/development/libraries/clipper/default.nix b/nixpkgs/pkgs/development/libraries/clipper/default.nix
index ebb41fde423..ebb41fde423 100644
--- a/pkgs/development/libraries/clipper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clipper/default.nix
diff --git a/pkgs/development/libraries/cln/default.nix b/nixpkgs/pkgs/development/libraries/cln/default.nix
index 6627f46c18e..6627f46c18e 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cln/default.nix
diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/nixpkgs/pkgs/development/libraries/cloog-ppl/default.nix
index 47037339d41..47037339d41 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cloog-ppl/default.nix
diff --git a/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch b/nixpkgs/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch
index 8440d839411..8440d839411 100644
--- a/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch
+++ b/nixpkgs/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch
diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix
index fa4e19f716a..fa4e19f716a 100644
--- a/pkgs/development/libraries/cloog/0.18.0.nix
+++ b/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix
diff --git a/pkgs/development/libraries/cloog/default.nix b/nixpkgs/pkgs/development/libraries/cloog/default.nix
index 902e0b26687..902e0b26687 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cloog/default.nix
diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix
index 91347813a24..91347813a24 100644
--- a/pkgs/development/libraries/clucene-core/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix
diff --git a/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch b/nixpkgs/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
index 80e49a8e712..80e49a8e712 100644
--- a/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
+++ b/nixpkgs/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
diff --git a/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch b/nixpkgs/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch
index f5f44a7fa2c..f5f44a7fa2c 100644
--- a/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch
+++ b/nixpkgs/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch
diff --git a/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch b/nixpkgs/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch
index 899411fe02b..899411fe02b 100644
--- a/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch
+++ b/nixpkgs/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch
diff --git a/pkgs/development/libraries/clucene-core/default.nix b/nixpkgs/pkgs/development/libraries/clucene-core/default.nix
index 8451b085372..8451b085372 100644
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clucene-core/default.nix
diff --git a/pkgs/development/libraries/clucene-core/fix-darwin.patch b/nixpkgs/pkgs/development/libraries/clucene-core/fix-darwin.patch
index c06413f3c2e..c06413f3c2e 100644
--- a/pkgs/development/libraries/clucene-core/fix-darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/clucene-core/fix-darwin.patch
diff --git a/pkgs/development/libraries/clucene-core/gcc6.patch b/nixpkgs/pkgs/development/libraries/clucene-core/gcc6.patch
index f78b26d24f6..f78b26d24f6 100644
--- a/pkgs/development/libraries/clucene-core/gcc6.patch
+++ b/nixpkgs/pkgs/development/libraries/clucene-core/gcc6.patch
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix
index 3c88327c790..3c88327c790 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix
index d59bc5161af..d59bc5161af 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix
diff --git a/pkgs/development/libraries/clutter/default.nix b/nixpkgs/pkgs/development/libraries/clutter/default.nix
index 32e723671e8..32e723671e8 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/nixpkgs/pkgs/development/libraries/clutter/default.nix
diff --git a/pkgs/development/libraries/cm256cc/default.nix b/nixpkgs/pkgs/development/libraries/cm256cc/default.nix
index aaf40998102..aaf40998102 100644
--- a/pkgs/development/libraries/cm256cc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cm256cc/default.nix
diff --git a/pkgs/development/libraries/cmark/default.nix b/nixpkgs/pkgs/development/libraries/cmark/default.nix
index e7c02312b66..e7c02312b66 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cmark/default.nix
diff --git a/pkgs/development/libraries/cminpack/default.nix b/nixpkgs/pkgs/development/libraries/cminpack/default.nix
index cb4f3e39aef..cb4f3e39aef 100644
--- a/pkgs/development/libraries/cminpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cminpack/default.nix
diff --git a/pkgs/development/libraries/cmocka/default.nix b/nixpkgs/pkgs/development/libraries/cmocka/default.nix
index ae110846ff0..ae110846ff0 100644
--- a/pkgs/development/libraries/cmocka/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cmocka/default.nix
diff --git a/pkgs/development/libraries/cmrt/default.nix b/nixpkgs/pkgs/development/libraries/cmrt/default.nix
index 11e719b36df..11e719b36df 100644
--- a/pkgs/development/libraries/cmrt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cmrt/default.nix
diff --git a/pkgs/development/libraries/codec2/default.nix b/nixpkgs/pkgs/development/libraries/codec2/default.nix
index 9c31b50c028..9c31b50c028 100644
--- a/pkgs/development/libraries/codec2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/codec2/default.nix
diff --git a/pkgs/development/libraries/cogl/default.nix b/nixpkgs/pkgs/development/libraries/cogl/default.nix
index e122c1e7b12..e122c1e7b12 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cogl/default.nix
diff --git a/pkgs/development/libraries/coin3d/default.nix b/nixpkgs/pkgs/development/libraries/coin3d/default.nix
index 634ac27058b..634ac27058b 100644
--- a/pkgs/development/libraries/coin3d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/coin3d/default.nix
diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix
index cc42407433c..cc42407433c 100644
--- a/pkgs/development/libraries/concurrencykit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix
index dc742a5c051..dc742a5c051 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix
diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix
index dfebccc88e3..dfebccc88e3 100644
--- a/pkgs/development/libraries/cpp-ipfs-api/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix
index 31c4c70dd9d..31c4c70dd9d 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix
diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix
index e4335061294..e4335061294 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix
diff --git a/pkgs/development/libraries/cppcms/default.nix b/nixpkgs/pkgs/development/libraries/cppcms/default.nix
index 7bb2bad9689..7bb2bad9689 100644
--- a/pkgs/development/libraries/cppcms/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cppcms/default.nix
diff --git a/pkgs/development/libraries/cppdb/default.nix b/nixpkgs/pkgs/development/libraries/cppdb/default.nix
index bb521ba3ec0..bb521ba3ec0 100644
--- a/pkgs/development/libraries/cppdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cppdb/default.nix
diff --git a/pkgs/development/libraries/cpptest/default.nix b/nixpkgs/pkgs/development/libraries/cpptest/default.nix
index e663c87f799..e663c87f799 100644
--- a/pkgs/development/libraries/cpptest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cpptest/default.nix
diff --git a/pkgs/development/libraries/cppunit/default.nix b/nixpkgs/pkgs/development/libraries/cppunit/default.nix
index 76fd6db18b0..76fd6db18b0 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cppunit/default.nix
diff --git a/pkgs/development/libraries/cpputest/default.nix b/nixpkgs/pkgs/development/libraries/cpputest/default.nix
index 28ab31a08cc..28ab31a08cc 100644
--- a/pkgs/development/libraries/cpputest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cpputest/default.nix
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/nixpkgs/pkgs/development/libraries/cppzmq/default.nix
index 78cefe89e3b..78cefe89e3b 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cppzmq/default.nix
diff --git a/pkgs/development/libraries/cracklib/default.nix b/nixpkgs/pkgs/development/libraries/cracklib/default.nix
index ea3f5e6476b..ea3f5e6476b 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cracklib/default.nix
diff --git a/pkgs/development/libraries/crc32c/default.nix b/nixpkgs/pkgs/development/libraries/crc32c/default.nix
index a7313c20553..a7313c20553 100644
--- a/pkgs/development/libraries/crc32c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/crc32c/default.nix
diff --git a/pkgs/development/libraries/cre2/default.nix b/nixpkgs/pkgs/development/libraries/cre2/default.nix
index a4313fa94d3..a4313fa94d3 100644
--- a/pkgs/development/libraries/cre2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cre2/default.nix
diff --git a/pkgs/development/libraries/criterion/default.nix b/nixpkgs/pkgs/development/libraries/criterion/default.nix
index 3dc4b462404..3dc4b462404 100644
--- a/pkgs/development/libraries/criterion/default.nix
+++ b/nixpkgs/pkgs/development/libraries/criterion/default.nix
diff --git a/pkgs/development/libraries/croaring/default.nix b/nixpkgs/pkgs/development/libraries/croaring/default.nix
index 6e6ee2479d4..6e6ee2479d4 100644
--- a/pkgs/development/libraries/croaring/default.nix
+++ b/nixpkgs/pkgs/development/libraries/croaring/default.nix
diff --git a/pkgs/development/libraries/crypto++/default.nix b/nixpkgs/pkgs/development/libraries/crypto++/default.nix
index 3fe27748155..3fe27748155 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/nixpkgs/pkgs/development/libraries/crypto++/default.nix
diff --git a/pkgs/development/libraries/csfml/default.nix b/nixpkgs/pkgs/development/libraries/csfml/default.nix
index 9bfff5c4aa8..9bfff5c4aa8 100644
--- a/pkgs/development/libraries/csfml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/csfml/default.nix
diff --git a/pkgs/development/libraries/ctl/default.nix b/nixpkgs/pkgs/development/libraries/ctl/default.nix
index 71e30104476..71e30104476 100644
--- a/pkgs/development/libraries/ctl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ctl/default.nix
diff --git a/pkgs/development/libraries/ctpl/default.nix b/nixpkgs/pkgs/development/libraries/ctpl/default.nix
index 5696684e91d..5696684e91d 100644
--- a/pkgs/development/libraries/ctpl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ctpl/default.nix
diff --git a/pkgs/development/libraries/ctpp2/default.nix b/nixpkgs/pkgs/development/libraries/ctpp2/default.nix
index ea2230909a2..ea2230909a2 100644
--- a/pkgs/development/libraries/ctpp2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ctpp2/default.nix
diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix
index 1e12afd95ca..1e12afd95ca 100644
--- a/pkgs/development/libraries/ctypes_sh/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix
diff --git a/pkgs/development/libraries/curlcpp/default.nix b/nixpkgs/pkgs/development/libraries/curlcpp/default.nix
index 6f531414242..6f531414242 100644
--- a/pkgs/development/libraries/curlcpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/curlcpp/default.nix
diff --git a/pkgs/development/libraries/curlpp/default.nix b/nixpkgs/pkgs/development/libraries/curlpp/default.nix
index 490f472a066..490f472a066 100644
--- a/pkgs/development/libraries/curlpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/curlpp/default.nix
diff --git a/pkgs/development/libraries/cutee/default.nix b/nixpkgs/pkgs/development/libraries/cutee/default.nix
index 1c14454af5c..1c14454af5c 100644
--- a/pkgs/development/libraries/cutee/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cutee/default.nix
diff --git a/pkgs/development/libraries/cutelyst/default.nix b/nixpkgs/pkgs/development/libraries/cutelyst/default.nix
index 2cf611eed27..2cf611eed27 100644
--- a/pkgs/development/libraries/cutelyst/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cutelyst/default.nix
diff --git a/pkgs/development/libraries/cwiid/default.nix b/nixpkgs/pkgs/development/libraries/cwiid/default.nix
index d9a17aff941..d9a17aff941 100644
--- a/pkgs/development/libraries/cwiid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cwiid/default.nix
diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix
index e668e653477..e668e653477 100644
--- a/pkgs/development/libraries/cxx-prettyprint/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/nixpkgs/pkgs/development/libraries/cxxtest/default.nix
index 9b6407715df..9b6407715df 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cxxtest/default.nix
diff --git a/pkgs/development/libraries/cxxtools/default.nix b/nixpkgs/pkgs/development/libraries/cxxtools/default.nix
index 4c572cf781a..4c572cf781a 100644
--- a/pkgs/development/libraries/cxxtools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cxxtools/default.nix
diff --git a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch b/nixpkgs/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch
index 8662e812e99..8662e812e99 100644
--- a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch
+++ b/nixpkgs/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix
index 68f6a7c5d8b..68f6a7c5d8b 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix
diff --git a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch b/nixpkgs/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
index da96818ca26..da96818ca26 100644
--- a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
+++ b/nixpkgs/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
diff --git a/pkgs/development/libraries/czmq/default.nix b/nixpkgs/pkgs/development/libraries/czmq/default.nix
index 05e499c73d0..05e499c73d0 100644
--- a/pkgs/development/libraries/czmq/default.nix
+++ b/nixpkgs/pkgs/development/libraries/czmq/default.nix
diff --git a/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix
index 5542a37661a..5542a37661a 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dav1d/default.nix
diff --git a/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch b/nixpkgs/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch
index ed916fcf4d1..ed916fcf4d1 100644
--- a/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch
+++ b/nixpkgs/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch
diff --git a/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch b/nixpkgs/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch
index 652e962bbe1..652e962bbe1 100644
--- a/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch
+++ b/nixpkgs/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch
diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/nixpkgs/pkgs/development/libraries/db/clang-4.8.patch
index aa46b8500b5..aa46b8500b5 100644
--- a/pkgs/development/libraries/db/clang-4.8.patch
+++ b/nixpkgs/pkgs/development/libraries/db/clang-4.8.patch
diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/nixpkgs/pkgs/development/libraries/db/clang-5.3.patch
index caf19ffeb92..caf19ffeb92 100644
--- a/pkgs/development/libraries/db/clang-5.3.patch
+++ b/nixpkgs/pkgs/development/libraries/db/clang-5.3.patch
diff --git a/pkgs/development/libraries/db/clang-6.0.patch b/nixpkgs/pkgs/development/libraries/db/clang-6.0.patch
index a411e60dc39..a411e60dc39 100644
--- a/pkgs/development/libraries/db/clang-6.0.patch
+++ b/nixpkgs/pkgs/development/libraries/db/clang-6.0.patch
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/nixpkgs/pkgs/development/libraries/db/db-4.8.nix
index dc668a233b0..dc668a233b0 100644
--- a/pkgs/development/libraries/db/db-4.8.nix
+++ b/nixpkgs/pkgs/development/libraries/db/db-4.8.nix
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/nixpkgs/pkgs/development/libraries/db/db-5.3.nix
index 1223cb897e8..1223cb897e8 100644
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/nixpkgs/pkgs/development/libraries/db/db-5.3.nix
diff --git a/pkgs/development/libraries/db/db-6.0.nix b/nixpkgs/pkgs/development/libraries/db/db-6.0.nix
index 642054b5a01..642054b5a01 100644
--- a/pkgs/development/libraries/db/db-6.0.nix
+++ b/nixpkgs/pkgs/development/libraries/db/db-6.0.nix
diff --git a/pkgs/development/libraries/db/db-6.2.nix b/nixpkgs/pkgs/development/libraries/db/db-6.2.nix
index dee07a9637e..dee07a9637e 100644
--- a/pkgs/development/libraries/db/db-6.2.nix
+++ b/nixpkgs/pkgs/development/libraries/db/db-6.2.nix
diff --git a/pkgs/development/libraries/db/generic.nix b/nixpkgs/pkgs/development/libraries/db/generic.nix
index bb501fb9c68..bb501fb9c68 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/db/generic.nix
diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix
index 2609f47b276..2609f47b276 100644
--- a/pkgs/development/libraries/dbus-cplusplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix
index c6237795960..c6237795960 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix
diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
index 22c0a9137ca..22c0a9137ca 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/default.nix
index 496a109b58f..496a109b58f 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/default.nix
diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/nixpkgs/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
index 084beae5972..084beae5972 100644
--- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/nixpkgs/pkgs/development/libraries/dbus-sharp/default.nix
index 0fd638dbf8e..0fd638dbf8e 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus-sharp/default.nix
diff --git a/pkgs/development/libraries/dbus/default.nix b/nixpkgs/pkgs/development/libraries/dbus/default.nix
index 5024ea3ef24..5024ea3ef24 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus/default.nix
diff --git a/pkgs/development/libraries/dbus/implement-getgrouplist.patch b/nixpkgs/pkgs/development/libraries/dbus/implement-getgrouplist.patch
index e3a4a25cb72..e3a4a25cb72 100644
--- a/pkgs/development/libraries/dbus/implement-getgrouplist.patch
+++ b/nixpkgs/pkgs/development/libraries/dbus/implement-getgrouplist.patch
diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix
index e714b96b7e9..e714b96b7e9 100644
--- a/pkgs/development/libraries/dbus/make-dbus-conf.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix
diff --git a/pkgs/development/libraries/dbus/make-session-conf.xsl b/nixpkgs/pkgs/development/libraries/dbus/make-session-conf.xsl
index 6a19ee14a22..6a19ee14a22 100644
--- a/pkgs/development/libraries/dbus/make-session-conf.xsl
+++ b/nixpkgs/pkgs/development/libraries/dbus/make-session-conf.xsl
diff --git a/pkgs/development/libraries/dbus/make-system-conf.xsl b/nixpkgs/pkgs/development/libraries/dbus/make-system-conf.xsl
index dd644b4bce7..dd644b4bce7 100644
--- a/pkgs/development/libraries/dbus/make-system-conf.xsl
+++ b/nixpkgs/pkgs/development/libraries/dbus/make-system-conf.xsl
diff --git a/pkgs/development/libraries/dbxml/cxx11.patch b/nixpkgs/pkgs/development/libraries/dbxml/cxx11.patch
index f264515c7d6..f264515c7d6 100644
--- a/pkgs/development/libraries/dbxml/cxx11.patch
+++ b/nixpkgs/pkgs/development/libraries/dbxml/cxx11.patch
diff --git a/pkgs/development/libraries/dbxml/default.nix b/nixpkgs/pkgs/development/libraries/dbxml/default.nix
index b940315aed8..b940315aed8 100644
--- a/pkgs/development/libraries/dbxml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbxml/default.nix
diff --git a/pkgs/development/libraries/dbxml/incorrect-optimization.patch b/nixpkgs/pkgs/development/libraries/dbxml/incorrect-optimization.patch
index 630dc972e18..630dc972e18 100644
--- a/pkgs/development/libraries/dbxml/incorrect-optimization.patch
+++ b/nixpkgs/pkgs/development/libraries/dbxml/incorrect-optimization.patch
diff --git a/pkgs/development/libraries/dclib/default.nix b/nixpkgs/pkgs/development/libraries/dclib/default.nix
index 5a879e04c7d..5a879e04c7d 100644
--- a/pkgs/development/libraries/dclib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dclib/default.nix
diff --git a/pkgs/development/libraries/dclxvi/default.nix b/nixpkgs/pkgs/development/libraries/dclxvi/default.nix
index cd78d6d8a6a..cd78d6d8a6a 100644
--- a/pkgs/development/libraries/dclxvi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dclxvi/default.nix
diff --git a/pkgs/development/libraries/dconf/default.nix b/nixpkgs/pkgs/development/libraries/dconf/default.nix
index 5b37088cd95..5b37088cd95 100644
--- a/pkgs/development/libraries/dconf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dconf/default.nix
diff --git a/pkgs/development/libraries/dee/default.nix b/nixpkgs/pkgs/development/libraries/dee/default.nix
index dd26e5eb8ba..dd26e5eb8ba 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dee/default.nix
diff --git a/pkgs/development/libraries/directfb/default.nix b/nixpkgs/pkgs/development/libraries/directfb/default.nix
index f7545bb03d5..f7545bb03d5 100644
--- a/pkgs/development/libraries/directfb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/directfb/default.nix
diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix
index 3a8290a6597..3a8290a6597 100644
--- a/pkgs/development/libraries/discord-rpc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix
diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix
index 643e7d3cc5d..643e7d3cc5d 100644
--- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix
diff --git a/pkgs/development/libraries/dleyna-core/0001-Search-connectors-in-DLEYNA_CONNECTOR_PATH.patch b/nixpkgs/pkgs/development/libraries/dleyna-core/0001-Search-connectors-in-DLEYNA_CONNECTOR_PATH.patch
index cc50c159800..cc50c159800 100644
--- a/pkgs/development/libraries/dleyna-core/0001-Search-connectors-in-DLEYNA_CONNECTOR_PATH.patch
+++ b/nixpkgs/pkgs/development/libraries/dleyna-core/0001-Search-connectors-in-DLEYNA_CONNECTOR_PATH.patch
diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix
index 9d83812fefb..9d83812fefb 100644
--- a/pkgs/development/libraries/dleyna-core/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix
diff --git a/pkgs/development/libraries/dleyna-core/setup-hook.sh b/nixpkgs/pkgs/development/libraries/dleyna-core/setup-hook.sh
index 287ad4dc189..287ad4dc189 100644
--- a/pkgs/development/libraries/dleyna-core/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/dleyna-core/setup-hook.sh
diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix
index 18244d83dee..18244d83dee 100644
--- a/pkgs/development/libraries/dleyna-renderer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix
diff --git a/pkgs/development/libraries/dleyna-renderer/gupnp-1.2.diff b/nixpkgs/pkgs/development/libraries/dleyna-renderer/gupnp-1.2.diff
index 3255695ab23..3255695ab23 100644
--- a/pkgs/development/libraries/dleyna-renderer/gupnp-1.2.diff
+++ b/nixpkgs/pkgs/development/libraries/dleyna-renderer/gupnp-1.2.diff
diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix
index 4730d455950..4730d455950 100644
--- a/pkgs/development/libraries/dleyna-server/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix
diff --git a/pkgs/development/libraries/dlib/default.nix b/nixpkgs/pkgs/development/libraries/dlib/default.nix
index 6d6bef21f39..6d6bef21f39 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dlib/default.nix
diff --git a/pkgs/development/libraries/dnnl/bash-to-sh.patch b/nixpkgs/pkgs/development/libraries/dnnl/bash-to-sh.patch
index 063d9ef952b..063d9ef952b 100644
--- a/pkgs/development/libraries/dnnl/bash-to-sh.patch
+++ b/nixpkgs/pkgs/development/libraries/dnnl/bash-to-sh.patch
diff --git a/pkgs/development/libraries/dnnl/default.nix b/nixpkgs/pkgs/development/libraries/dnnl/default.nix
index 8a02ea1598c..8a02ea1598c 100644
--- a/pkgs/development/libraries/dnnl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dnnl/default.nix
diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix
index 59578ef796e..59578ef796e 100644
--- a/pkgs/development/libraries/docopt_cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix
diff --git a/pkgs/development/libraries/dotconf/default.nix b/nixpkgs/pkgs/development/libraries/dotconf/default.nix
index a2b2e08fd62..a2b2e08fd62 100644
--- a/pkgs/development/libraries/dotconf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dotconf/default.nix
diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/nixpkgs/pkgs/development/libraries/dotnetfx35/default.nix
index e1c59846aec..e1c59846aec 100644
--- a/pkgs/development/libraries/dotnetfx35/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dotnetfx35/default.nix
diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/nixpkgs/pkgs/development/libraries/dotnetfx40/default.nix
index 701464071d0..701464071d0 100644
--- a/pkgs/development/libraries/dotnetfx40/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dotnetfx40/default.nix
diff --git a/pkgs/development/libraries/double-conversion/default.nix b/nixpkgs/pkgs/development/libraries/double-conversion/default.nix
index ecd5ee67cf6..ecd5ee67cf6 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/nixpkgs/pkgs/development/libraries/double-conversion/default.nix
diff --git a/pkgs/development/libraries/dqlite/default.nix b/nixpkgs/pkgs/development/libraries/dqlite/default.nix
index 84b4b1bab77..84b4b1bab77 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dqlite/default.nix
diff --git a/pkgs/development/libraries/drumstick/default.nix b/nixpkgs/pkgs/development/libraries/drumstick/default.nix
index 92c97436d7a..92c97436d7a 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/nixpkgs/pkgs/development/libraries/drumstick/default.nix
diff --git a/pkgs/development/libraries/dssi/default.nix b/nixpkgs/pkgs/development/libraries/dssi/default.nix
index 779e6b07762..779e6b07762 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dssi/default.nix
diff --git a/pkgs/development/libraries/dxflib/default.nix b/nixpkgs/pkgs/development/libraries/dxflib/default.nix
index 8d8b41e0609..8d8b41e0609 100644
--- a/pkgs/development/libraries/dxflib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dxflib/default.nix
diff --git a/pkgs/development/libraries/dyncall/default.nix b/nixpkgs/pkgs/development/libraries/dyncall/default.nix
index 83c754e2928..83c754e2928 100644
--- a/pkgs/development/libraries/dyncall/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dyncall/default.nix
diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix
index 028cd221614..028cd221614 100644
--- a/pkgs/development/libraries/easyloggingpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix
diff --git a/pkgs/development/libraries/eccodes/default.nix b/nixpkgs/pkgs/development/libraries/eccodes/default.nix
index a9a77f6a9da..a9a77f6a9da 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/eccodes/default.nix
diff --git a/pkgs/development/libraries/eclib/default.nix b/nixpkgs/pkgs/development/libraries/eclib/default.nix
index 765e13fffb9..765e13fffb9 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/eclib/default.nix
diff --git a/pkgs/development/libraries/editline/default.nix b/nixpkgs/pkgs/development/libraries/editline/default.nix
index 5f9c72f04af..5f9c72f04af 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/nixpkgs/pkgs/development/libraries/editline/default.nix
diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix
index fa2c3687ba7..fa2c3687ba7 100644
--- a/pkgs/development/libraries/egl-wayland/default.nix
+++ b/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix
diff --git a/pkgs/development/libraries/egl-wayland/eglmesaext.patch b/nixpkgs/pkgs/development/libraries/egl-wayland/eglmesaext.patch
index 9384ecff9b0..9384ecff9b0 100644
--- a/pkgs/development/libraries/egl-wayland/eglmesaext.patch
+++ b/nixpkgs/pkgs/development/libraries/egl-wayland/eglmesaext.patch
diff --git a/pkgs/development/libraries/eigen/2.0.nix b/nixpkgs/pkgs/development/libraries/eigen/2.0.nix
index 015aeaed55b..015aeaed55b 100644
--- a/pkgs/development/libraries/eigen/2.0.nix
+++ b/nixpkgs/pkgs/development/libraries/eigen/2.0.nix
diff --git a/pkgs/development/libraries/eigen/default.nix b/nixpkgs/pkgs/development/libraries/eigen/default.nix
index 63e2707917a..63e2707917a 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/nixpkgs/pkgs/development/libraries/eigen/default.nix
diff --git a/pkgs/development/libraries/eigen/default.upstream b/nixpkgs/pkgs/development/libraries/eigen/default.upstream
index c0c05efc466..c0c05efc466 100644
--- a/pkgs/development/libraries/eigen/default.upstream
+++ b/nixpkgs/pkgs/development/libraries/eigen/default.upstream
diff --git a/pkgs/development/libraries/eigen/include-dir.patch b/nixpkgs/pkgs/development/libraries/eigen/include-dir.patch
index 7f3bd88557e..7f3bd88557e 100644
--- a/pkgs/development/libraries/eigen/include-dir.patch
+++ b/nixpkgs/pkgs/development/libraries/eigen/include-dir.patch
diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix
index 13617d67bf5..13617d67bf5 100644
--- a/pkgs/development/libraries/elementary-cmake-modules/default.nix
+++ b/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix
diff --git a/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh b/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh
index 6408ac47157..6408ac47157 100644
--- a/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh
diff --git a/pkgs/development/libraries/elf-header/default.nix b/nixpkgs/pkgs/development/libraries/elf-header/default.nix
index c1764e83c30..c1764e83c30 100644
--- a/pkgs/development/libraries/elf-header/default.nix
+++ b/nixpkgs/pkgs/development/libraries/elf-header/default.nix
diff --git a/pkgs/development/libraries/embree/2.x.nix b/nixpkgs/pkgs/development/libraries/embree/2.x.nix
index e968e09459a..e968e09459a 100644
--- a/pkgs/development/libraries/embree/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/embree/2.x.nix
diff --git a/pkgs/development/libraries/enchant/1.x.nix b/nixpkgs/pkgs/development/libraries/enchant/1.x.nix
index ed91f791149..ed91f791149 100644
--- a/pkgs/development/libraries/enchant/1.x.nix
+++ b/nixpkgs/pkgs/development/libraries/enchant/1.x.nix
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix
index 92e34145abd..92e34145abd 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix
diff --git a/pkgs/development/libraries/enet/default.nix b/nixpkgs/pkgs/development/libraries/enet/default.nix
index bf6260ca766..bf6260ca766 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/enet/default.nix
diff --git a/pkgs/development/libraries/epoxy/default.nix b/nixpkgs/pkgs/development/libraries/epoxy/default.nix
index 362607eed18..362607eed18 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/epoxy/default.nix
diff --git a/pkgs/development/libraries/epoxy/libgl-path.patch b/nixpkgs/pkgs/development/libraries/epoxy/libgl-path.patch
index 8f38ee27174..8f38ee27174 100644
--- a/pkgs/development/libraries/epoxy/libgl-path.patch
+++ b/nixpkgs/pkgs/development/libraries/epoxy/libgl-path.patch
diff --git a/pkgs/development/libraries/ethash/default.nix b/nixpkgs/pkgs/development/libraries/ethash/default.nix
index da2fd13465f..da2fd13465f 100644
--- a/pkgs/development/libraries/ethash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ethash/default.nix
diff --git a/pkgs/development/libraries/eventlog/default.nix b/nixpkgs/pkgs/development/libraries/eventlog/default.nix
index 838693ba12d..838693ba12d 100644
--- a/pkgs/development/libraries/eventlog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/eventlog/default.nix
diff --git a/pkgs/development/libraries/exempi/default.nix b/nixpkgs/pkgs/development/libraries/exempi/default.nix
index 5638db71245..5638db71245 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/exempi/default.nix
diff --git a/pkgs/development/libraries/exiv2/default.nix b/nixpkgs/pkgs/development/libraries/exiv2/default.nix
index 425346df816..425346df816 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/exiv2/default.nix
diff --git a/pkgs/development/libraries/exosip/default.nix b/nixpkgs/pkgs/development/libraries/exosip/default.nix
index 4968c38bfd3..4968c38bfd3 100644
--- a/pkgs/development/libraries/exosip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/exosip/default.nix
diff --git a/pkgs/development/libraries/expat/default.nix b/nixpkgs/pkgs/development/libraries/expat/default.nix
index bb86ac57832..bb86ac57832 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/nixpkgs/pkgs/development/libraries/expat/default.nix
diff --git a/pkgs/development/libraries/faac/default.nix b/nixpkgs/pkgs/development/libraries/faac/default.nix
index 7a5afd8e801..7a5afd8e801 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/nixpkgs/pkgs/development/libraries/faac/default.nix
diff --git a/pkgs/development/libraries/faad2/default.nix b/nixpkgs/pkgs/development/libraries/faad2/default.nix
index 29c0252482e..29c0252482e 100644
--- a/pkgs/development/libraries/faad2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/faad2/default.nix
diff --git a/pkgs/development/libraries/farbfeld/default.nix b/nixpkgs/pkgs/development/libraries/farbfeld/default.nix
index a528ad6f7f6..a528ad6f7f6 100644
--- a/pkgs/development/libraries/farbfeld/default.nix
+++ b/nixpkgs/pkgs/development/libraries/farbfeld/default.nix
diff --git a/pkgs/development/libraries/farstream/default.nix b/nixpkgs/pkgs/development/libraries/farstream/default.nix
index 763caa811e3..763caa811e3 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/nixpkgs/pkgs/development/libraries/farstream/default.nix
diff --git a/pkgs/development/libraries/fastjson/default.nix b/nixpkgs/pkgs/development/libraries/fastjson/default.nix
index 75d9146c335..75d9146c335 100644
--- a/pkgs/development/libraries/fastjson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fastjson/default.nix
diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/nixpkgs/pkgs/development/libraries/fastpbkdf2/default.nix
index e781e2aab83..e781e2aab83 100644
--- a/pkgs/development/libraries/fastpbkdf2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fastpbkdf2/default.nix
diff --git a/pkgs/development/libraries/faudio/default.nix b/nixpkgs/pkgs/development/libraries/faudio/default.nix
index 2be8caaa1b1..2be8caaa1b1 100644
--- a/pkgs/development/libraries/faudio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/faudio/default.nix
diff --git a/pkgs/development/libraries/fcgi/default.nix b/nixpkgs/pkgs/development/libraries/fcgi/default.nix
index 5eb7e3866ce..5eb7e3866ce 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fcgi/default.nix
diff --git a/pkgs/development/libraries/fcgi/gcc-4.4.diff b/nixpkgs/pkgs/development/libraries/fcgi/gcc-4.4.diff
index c6806c12c06..c6806c12c06 100644
--- a/pkgs/development/libraries/fcgi/gcc-4.4.diff
+++ b/nixpkgs/pkgs/development/libraries/fcgi/gcc-4.4.diff
diff --git a/pkgs/development/libraries/fcppt/default.nix b/nixpkgs/pkgs/development/libraries/fcppt/default.nix
index 77e26f6b5dc..77e26f6b5dc 100644
--- a/pkgs/development/libraries/fcppt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fcppt/default.nix
diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix
index 16560f19c86..16560f19c86 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix
index b7d5d79544e..b7d5d79544e 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
index 214da206f56..214da206f56 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
diff --git a/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch b/nixpkgs/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch
index 789bfc2674f..789bfc2674f 100644
--- a/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch
+++ b/nixpkgs/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch
diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix
index f5ef8e850dd..f5ef8e850dd 100644
--- a/pkgs/development/libraries/ffmpeg-sixel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix
diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix
index 3b3fc900ede..3b3fc900ede 100644
--- a/pkgs/development/libraries/ffmpeg/2.8.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix
diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix
index 6c16b55dfe8..6c16b55dfe8 100644
--- a/pkgs/development/libraries/ffmpeg/3.4.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix
index 31cb0477c21..31cb0477c21 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix
index 26a3206d205..26a3206d205 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix
diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index 6f5b1840c24..6f5b1840c24 100644
--- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix
diff --git a/pkgs/development/libraries/ffms/default.nix b/nixpkgs/pkgs/development/libraries/ffms/default.nix
index 30fb94aa248..30fb94aa248 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ffms/default.nix
diff --git a/pkgs/development/libraries/fftw/default.nix b/nixpkgs/pkgs/development/libraries/fftw/default.nix
index c9577436c30..c9577436c30 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fftw/default.nix
diff --git a/pkgs/development/libraries/filter-audio/default.nix b/nixpkgs/pkgs/development/libraries/filter-audio/default.nix
index 3438bfee07b..3438bfee07b 100644
--- a/pkgs/development/libraries/filter-audio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/filter-audio/default.nix
diff --git a/pkgs/development/libraries/flann/default.nix b/nixpkgs/pkgs/development/libraries/flann/default.nix
index a25f3ea04e2..a25f3ea04e2 100644
--- a/pkgs/development/libraries/flann/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flann/default.nix
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix
index 11e86703616..11e86703616 100644
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix
diff --git a/pkgs/development/libraries/flatcc/default.nix b/nixpkgs/pkgs/development/libraries/flatcc/default.nix
index d49f6d110de..d49f6d110de 100644
--- a/pkgs/development/libraries/flatcc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flatcc/default.nix
diff --git a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/nixpkgs/pkgs/development/libraries/flatpak/bubblewrap-paths.patch
index 407811736f8..407811736f8 100644
--- a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/flatpak/bubblewrap-paths.patch
diff --git a/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix
index c0a3d3718f3..c0a3d3718f3 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix
diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/nixpkgs/pkgs/development/libraries/flatpak/fix-paths.patch
index 746b4382864..746b4382864 100644
--- a/pkgs/development/libraries/flatpak/fix-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/flatpak/fix-paths.patch
diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch
index 85b222152d0..85b222152d0 100644
--- a/pkgs/development/libraries/flatpak/fix-test-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch
diff --git a/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch b/nixpkgs/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch
index 4cee60be2d0..4cee60be2d0 100644
--- a/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch
+++ b/nixpkgs/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch
diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch
index 63ce0d12fe0..63ce0d12fe0 100644
--- a/pkgs/development/libraries/flatpak/unset-env-vars.patch
+++ b/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch
diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/nixpkgs/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch
index 01363ffb7b3..01363ffb7b3 100644
--- a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch
+++ b/nixpkgs/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch
diff --git a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch b/nixpkgs/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch
index 086114e11c3..086114e11c3 100644
--- a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch
+++ b/nixpkgs/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch
diff --git a/pkgs/development/libraries/flint/default.nix b/nixpkgs/pkgs/development/libraries/flint/default.nix
index 462d186c72d..462d186c72d 100644
--- a/pkgs/development/libraries/flint/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flint/default.nix
diff --git a/pkgs/development/libraries/flite/default.nix b/nixpkgs/pkgs/development/libraries/flite/default.nix
index 4ac8150274c..4ac8150274c 100644
--- a/pkgs/development/libraries/flite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flite/default.nix
diff --git a/pkgs/development/libraries/fltk/1.4.nix b/nixpkgs/pkgs/development/libraries/fltk/1.4.nix
index 1fe50b402cb..1fe50b402cb 100644
--- a/pkgs/development/libraries/fltk/1.4.nix
+++ b/nixpkgs/pkgs/development/libraries/fltk/1.4.nix
diff --git a/pkgs/development/libraries/fltk/default.nix b/nixpkgs/pkgs/development/libraries/fltk/default.nix
index fe7de504b4f..fe7de504b4f 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fltk/default.nix
diff --git a/pkgs/development/libraries/fltk/nsosv.patch b/nixpkgs/pkgs/development/libraries/fltk/nsosv.patch
index 9e55b011b57..9e55b011b57 100644
--- a/pkgs/development/libraries/fltk/nsosv.patch
+++ b/nixpkgs/pkgs/development/libraries/fltk/nsosv.patch
diff --git a/pkgs/development/libraries/fmt/default.nix b/nixpkgs/pkgs/development/libraries/fmt/default.nix
index 3e79ebe15cf..3e79ebe15cf 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fmt/default.nix
diff --git a/pkgs/development/libraries/folks/default.nix b/nixpkgs/pkgs/development/libraries/folks/default.nix
index c08be846915..c08be846915 100644
--- a/pkgs/development/libraries/folks/default.nix
+++ b/nixpkgs/pkgs/development/libraries/folks/default.nix
diff --git a/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix
index 15f29ce77f5..15f29ce77f5 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/nixpkgs/pkgs/development/libraries/folly/default.nix
diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/nixpkgs/pkgs/development/libraries/fontconfig/2.10.nix
index 635baff796b..635baff796b 100644
--- a/pkgs/development/libraries/fontconfig/2.10.nix
+++ b/nixpkgs/pkgs/development/libraries/fontconfig/2.10.nix
diff --git a/pkgs/development/libraries/fontconfig/config-compat.patch b/nixpkgs/pkgs/development/libraries/fontconfig/config-compat.patch
index e86f08fb553..e86f08fb553 100644
--- a/pkgs/development/libraries/fontconfig/config-compat.patch
+++ b/nixpkgs/pkgs/development/libraries/fontconfig/config-compat.patch
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix
index 617e058bd8f..617e058bd8f 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix
diff --git a/pkgs/development/libraries/fontconfig/fix-joypixels.patch b/nixpkgs/pkgs/development/libraries/fontconfig/fix-joypixels.patch
index d5654063fe8..d5654063fe8 100644
--- a/pkgs/development/libraries/fontconfig/fix-joypixels.patch
+++ b/nixpkgs/pkgs/development/libraries/fontconfig/fix-joypixels.patch
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index f1a2e865bb7..f1a2e865bb7 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
index b18d72e0a22..b18d72e0a22 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
+++ b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
index dddbbe9e516..dddbbe9e516 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+++ b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
diff --git a/pkgs/development/libraries/forge/default.nix b/nixpkgs/pkgs/development/libraries/forge/default.nix
index 83630aef9aa..83630aef9aa 100644
--- a/pkgs/development/libraries/forge/default.nix
+++ b/nixpkgs/pkgs/development/libraries/forge/default.nix
diff --git a/pkgs/development/libraries/fox/clang.patch b/nixpkgs/pkgs/development/libraries/fox/clang.patch
index 0ca2ebf0d8d..0ca2ebf0d8d 100644
--- a/pkgs/development/libraries/fox/clang.patch
+++ b/nixpkgs/pkgs/development/libraries/fox/clang.patch
diff --git a/pkgs/development/libraries/fox/default.nix b/nixpkgs/pkgs/development/libraries/fox/default.nix
index fa4a8c23e2f..fa4a8c23e2f 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fox/default.nix
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix
index bb59a34b1cc..bb59a34b1cc 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix
diff --git a/pkgs/development/libraries/fplll/20160331.nix b/nixpkgs/pkgs/development/libraries/fplll/20160331.nix
index aabbfd14a78..aabbfd14a78 100644
--- a/pkgs/development/libraries/fplll/20160331.nix
+++ b/nixpkgs/pkgs/development/libraries/fplll/20160331.nix
diff --git a/pkgs/development/libraries/fplll/default.nix b/nixpkgs/pkgs/development/libraries/fplll/default.nix
index 107635267c6..107635267c6 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fplll/default.nix
diff --git a/pkgs/development/libraries/frame/default.nix b/nixpkgs/pkgs/development/libraries/frame/default.nix
index feccfd1bfd2..feccfd1bfd2 100644
--- a/pkgs/development/libraries/frame/default.nix
+++ b/nixpkgs/pkgs/development/libraries/frame/default.nix
diff --git a/pkgs/development/libraries/freealut/default.nix b/nixpkgs/pkgs/development/libraries/freealut/default.nix
index c6ea5bbd23b..c6ea5bbd23b 100644
--- a/pkgs/development/libraries/freealut/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freealut/default.nix
diff --git a/pkgs/development/libraries/freeglut/default.nix b/nixpkgs/pkgs/development/libraries/freeglut/default.nix
index 16c35347bc5..16c35347bc5 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freeglut/default.nix
diff --git a/pkgs/development/libraries/freeimage/default.nix b/nixpkgs/pkgs/development/libraries/freeimage/default.nix
index 188543bf7bf..188543bf7bf 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freeimage/default.nix
diff --git a/pkgs/development/libraries/freeimage/dylib.patch b/nixpkgs/pkgs/development/libraries/freeimage/dylib.patch
index 0d8188aca70..0d8188aca70 100644
--- a/pkgs/development/libraries/freeimage/dylib.patch
+++ b/nixpkgs/pkgs/development/libraries/freeimage/dylib.patch
diff --git a/pkgs/development/libraries/freenect/default.nix b/nixpkgs/pkgs/development/libraries/freenect/default.nix
index 9520542481c..9520542481c 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freenect/default.nix
diff --git a/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix
index 855ca0385df..855ca0385df 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freetds/default.nix
diff --git a/pkgs/development/libraries/freetts/default.nix b/nixpkgs/pkgs/development/libraries/freetts/default.nix
index 8c6f60b9801..8c6f60b9801 100644
--- a/pkgs/development/libraries/freetts/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freetts/default.nix
diff --git a/pkgs/development/libraries/freetype/default.nix b/nixpkgs/pkgs/development/libraries/freetype/default.nix
index 6eaf1bbcc2f..6eaf1bbcc2f 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freetype/default.nix
diff --git a/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch b/nixpkgs/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch
index 6b3577eb4f0..6b3577eb4f0 100644
--- a/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch
+++ b/nixpkgs/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch
diff --git a/pkgs/development/libraries/freetype/enable-table-validation.patch b/nixpkgs/pkgs/development/libraries/freetype/enable-table-validation.patch
index bd964c3342d..bd964c3342d 100644
--- a/pkgs/development/libraries/freetype/enable-table-validation.patch
+++ b/nixpkgs/pkgs/development/libraries/freetype/enable-table-validation.patch
diff --git a/pkgs/development/libraries/frei0r/default.nix b/nixpkgs/pkgs/development/libraries/frei0r/default.nix
index 560855c908b..560855c908b 100644
--- a/pkgs/development/libraries/frei0r/default.nix
+++ b/nixpkgs/pkgs/development/libraries/frei0r/default.nix
diff --git a/pkgs/development/libraries/fribidi/default.nix b/nixpkgs/pkgs/development/libraries/fribidi/default.nix
index 3b0b30f573b..3b0b30f573b 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fribidi/default.nix
diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix
index 5e8197d5e81..5e8197d5e81 100644
--- a/pkgs/development/libraries/fstrcmp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix
diff --git a/pkgs/development/libraries/fstrm/default.nix b/nixpkgs/pkgs/development/libraries/fstrm/default.nix
index 40ffe6918a4..40ffe6918a4 100644
--- a/pkgs/development/libraries/fstrm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fstrm/default.nix
diff --git a/pkgs/development/libraries/ftgl/default.nix b/nixpkgs/pkgs/development/libraries/ftgl/default.nix
index a99228efcf4..a99228efcf4 100644
--- a/pkgs/development/libraries/ftgl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ftgl/default.nix
diff --git a/pkgs/development/libraries/funambol/default.nix b/nixpkgs/pkgs/development/libraries/funambol/default.nix
index 04903cc5e9e..04903cc5e9e 100644
--- a/pkgs/development/libraries/funambol/default.nix
+++ b/nixpkgs/pkgs/development/libraries/funambol/default.nix
diff --git a/pkgs/development/libraries/g2o/default.nix b/nixpkgs/pkgs/development/libraries/g2o/default.nix
index 21975766e74..21975766e74 100644
--- a/pkgs/development/libraries/g2o/default.nix
+++ b/nixpkgs/pkgs/development/libraries/g2o/default.nix
diff --git a/pkgs/development/libraries/g2o/remove-compiler-reference.patch b/nixpkgs/pkgs/development/libraries/g2o/remove-compiler-reference.patch
index 347c5780240..347c5780240 100644
--- a/pkgs/development/libraries/g2o/remove-compiler-reference.patch
+++ b/nixpkgs/pkgs/development/libraries/g2o/remove-compiler-reference.patch
diff --git a/pkgs/development/libraries/gaia/default.nix b/nixpkgs/pkgs/development/libraries/gaia/default.nix
index b154f80c1dd..b154f80c1dd 100644
--- a/pkgs/development/libraries/gaia/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gaia/default.nix
diff --git a/pkgs/development/libraries/gamin/deadlock.patch b/nixpkgs/pkgs/development/libraries/gamin/deadlock.patch
index e2abc8ce2d9..e2abc8ce2d9 100644
--- a/pkgs/development/libraries/gamin/deadlock.patch
+++ b/nixpkgs/pkgs/development/libraries/gamin/deadlock.patch
diff --git a/pkgs/development/libraries/gamin/debian-patches.nix b/nixpkgs/pkgs/development/libraries/gamin/debian-patches.nix
index a8f334fb3c3..a8f334fb3c3 100644
--- a/pkgs/development/libraries/gamin/debian-patches.nix
+++ b/nixpkgs/pkgs/development/libraries/gamin/debian-patches.nix
diff --git a/pkgs/development/libraries/gamin/debian-patches.txt b/nixpkgs/pkgs/development/libraries/gamin/debian-patches.txt
index 46d2420b21e..46d2420b21e 100644
--- a/pkgs/development/libraries/gamin/debian-patches.txt
+++ b/nixpkgs/pkgs/development/libraries/gamin/debian-patches.txt
diff --git a/pkgs/development/libraries/gamin/default.nix b/nixpkgs/pkgs/development/libraries/gamin/default.nix
index 611c9faa851..611c9faa851 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gamin/default.nix
diff --git a/pkgs/development/libraries/gamin/returnval.patch b/nixpkgs/pkgs/development/libraries/gamin/returnval.patch
index 3944b14be64..3944b14be64 100644
--- a/pkgs/development/libraries/gamin/returnval.patch
+++ b/nixpkgs/pkgs/development/libraries/gamin/returnval.patch
diff --git a/pkgs/development/libraries/ganv/default.nix b/nixpkgs/pkgs/development/libraries/ganv/default.nix
index a883b2c1d10..a883b2c1d10 100644
--- a/pkgs/development/libraries/ganv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ganv/default.nix
diff --git a/pkgs/development/libraries/garmintools/default.nix b/nixpkgs/pkgs/development/libraries/garmintools/default.nix
index a086648c912..a086648c912 100644
--- a/pkgs/development/libraries/garmintools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/garmintools/default.nix
diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix
index a990da4b010..a990da4b010 100644
--- a/pkgs/development/libraries/gbenchmark/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix
diff --git a/pkgs/development/libraries/gcab/default.nix b/nixpkgs/pkgs/development/libraries/gcab/default.nix
index 9946ebc05a5..9946ebc05a5 100644
--- a/pkgs/development/libraries/gcab/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gcab/default.nix
diff --git a/pkgs/development/libraries/gcab/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/gcab/installed-tests-path.patch
index ab3b6b3fae3..ab3b6b3fae3 100644
--- a/pkgs/development/libraries/gcab/installed-tests-path.patch
+++ b/nixpkgs/pkgs/development/libraries/gcab/installed-tests-path.patch
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix
index d638c2bb278..d638c2bb278 100644
--- a/pkgs/development/libraries/gcc/libgcc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix
diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix
index 2589b6cfa16..2589b6cfa16 100644
--- a/pkgs/development/libraries/gcc/libstdc++/5.nix
+++ b/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix
diff --git a/pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch b/nixpkgs/pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch
index 8c91d75f2a5..8c91d75f2a5 100644
--- a/pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch
+++ b/nixpkgs/pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch
diff --git a/pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch b/nixpkgs/pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch
index 5462e0e33ec..5462e0e33ec 100644
--- a/pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch
+++ b/nixpkgs/pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch
diff --git a/pkgs/development/libraries/gcr/default.nix b/nixpkgs/pkgs/development/libraries/gcr/default.nix
index cf0f22fdd40..cf0f22fdd40 100644
--- a/pkgs/development/libraries/gcr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gcr/default.nix
diff --git a/pkgs/development/libraries/gd/default.nix b/nixpkgs/pkgs/development/libraries/gd/default.nix
index 6f57d735980..6f57d735980 100644
--- a/pkgs/development/libraries/gd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gd/default.nix
diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix
index f914a112e10..f914a112e10 100644
--- a/pkgs/development/libraries/gdal/2.4.0.nix
+++ b/nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix
diff --git a/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix
index 7a00a5aa94e..7a00a5aa94e 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix
diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix
index 6a086d9c998..6a086d9c998 100644
--- a/pkgs/development/libraries/gdal/gdal-1_11.nix
+++ b/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix
diff --git a/pkgs/development/libraries/gdal/python.patch b/nixpkgs/pkgs/development/libraries/gdal/python.patch
index 50504c62edd..50504c62edd 100644
--- a/pkgs/development/libraries/gdal/python.patch
+++ b/nixpkgs/pkgs/development/libraries/gdal/python.patch
diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix
index 58036351a09..58036351a09 100644
--- a/pkgs/development/libraries/gdata-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix
diff --git a/pkgs/development/libraries/gdbm/default.nix b/nixpkgs/pkgs/development/libraries/gdbm/default.nix
index 830a311db70..830a311db70 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdbm/default.nix
diff --git a/pkgs/development/libraries/gdcm/default.nix b/nixpkgs/pkgs/development/libraries/gdcm/default.nix
index 0b5e0af84ba..0b5e0af84ba 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdcm/default.nix
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
index 0ecbb35c167..0ecbb35c167 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
diff --git a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
index 1da2b0a10dc..1da2b0a10dc 100644
--- a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
+++ b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
index 06958be3213..06958be3213 100644
--- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
diff --git a/pkgs/development/libraries/gdl/default.nix b/nixpkgs/pkgs/development/libraries/gdl/default.nix
index c4baaa3fae9..c4baaa3fae9 100644
--- a/pkgs/development/libraries/gdl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdl/default.nix
diff --git a/pkgs/development/libraries/gdome2/default.nix b/nixpkgs/pkgs/development/libraries/gdome2/default.nix
index e8982c4b70a..e8982c4b70a 100644
--- a/pkgs/development/libraries/gdome2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdome2/default.nix
diff --git a/pkgs/development/libraries/gdome2/xml-document.patch b/nixpkgs/pkgs/development/libraries/gdome2/xml-document.patch
index 7567d1049fc..7567d1049fc 100644
--- a/pkgs/development/libraries/gdome2/xml-document.patch
+++ b/nixpkgs/pkgs/development/libraries/gdome2/xml-document.patch
diff --git a/pkgs/development/libraries/gecode/3.nix b/nixpkgs/pkgs/development/libraries/gecode/3.nix
index 0d96b9b5a92..0d96b9b5a92 100644
--- a/pkgs/development/libraries/gecode/3.nix
+++ b/nixpkgs/pkgs/development/libraries/gecode/3.nix
diff --git a/pkgs/development/libraries/gecode/default.nix b/nixpkgs/pkgs/development/libraries/gecode/default.nix
index 454e811447a..454e811447a 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gecode/default.nix
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix
index 45f2c96dffe..45f2c96dffe 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix
diff --git a/pkgs/development/libraries/gegl/default.nix b/nixpkgs/pkgs/development/libraries/gegl/default.nix
index e90cc257e7e..e90cc257e7e 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gegl/default.nix
diff --git a/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch b/nixpkgs/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch
index bf07572182b..bf07572182b 100644
--- a/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch
+++ b/nixpkgs/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch
diff --git a/pkgs/development/libraries/geis/default.nix b/nixpkgs/pkgs/development/libraries/geis/default.nix
index 1b3d5ba4b7c..1b3d5ba4b7c 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geis/default.nix
diff --git a/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix
index 20e2f6905ce..20e2f6905ce 100644
--- a/pkgs/development/libraries/gensio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gensio/default.nix
diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/nixpkgs/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
index 9eb53acebb0..9eb53acebb0 100644
--- a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
+++ b/nixpkgs/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
diff --git a/pkgs/development/libraries/geoclue/default.nix b/nixpkgs/pkgs/development/libraries/geoclue/default.nix
index 8d94dacbb61..8d94dacbb61 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geoclue/default.nix
diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix
index c1d0d7e8a4f..c1d0d7e8a4f 100644
--- a/pkgs/development/libraries/geocode-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix
diff --git a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/geocode-glib/installed-tests-path.patch
index 499c6800808..499c6800808 100644
--- a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch
+++ b/nixpkgs/pkgs/development/libraries/geocode-glib/installed-tests-path.patch
diff --git a/pkgs/development/libraries/geoip/default.nix b/nixpkgs/pkgs/development/libraries/geoip/default.nix
index d55983952b8..d55983952b8 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geoip/default.nix
diff --git a/pkgs/development/libraries/geos/default.nix b/nixpkgs/pkgs/development/libraries/geos/default.nix
index e7fce696894..e7fce696894 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geos/default.nix
diff --git a/pkgs/development/libraries/getdata/default.nix b/nixpkgs/pkgs/development/libraries/getdata/default.nix
index 0e0477cd24d..0e0477cd24d 100644
--- a/pkgs/development/libraries/getdata/default.nix
+++ b/nixpkgs/pkgs/development/libraries/getdata/default.nix
diff --git a/pkgs/development/libraries/getdns/default.nix b/nixpkgs/pkgs/development/libraries/getdns/default.nix
index 721245ceb6d..721245ceb6d 100644
--- a/pkgs/development/libraries/getdns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/getdns/default.nix
diff --git a/pkgs/development/libraries/gettext/absolute-paths.diff b/nixpkgs/pkgs/development/libraries/gettext/absolute-paths.diff
index af37f61a9a4..af37f61a9a4 100644
--- a/pkgs/development/libraries/gettext/absolute-paths.diff
+++ b/nixpkgs/pkgs/development/libraries/gettext/absolute-paths.diff
diff --git a/pkgs/development/libraries/gettext/default.nix b/nixpkgs/pkgs/development/libraries/gettext/default.nix
index c2165a9d9c7..c2165a9d9c7 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gettext/default.nix
diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/nixpkgs/pkgs/development/libraries/gettext/gettext-setup-hook.sh
index 69020146f84..69020146f84 100644
--- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/gettext/gettext-setup-hook.sh
diff --git a/pkgs/development/libraries/gettext/gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch b/nixpkgs/pkgs/development/libraries/gettext/gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch
index 4a19b11507a..4a19b11507a 100644
--- a/pkgs/development/libraries/gettext/gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch
+++ b/nixpkgs/pkgs/development/libraries/gettext/gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch
diff --git a/pkgs/development/libraries/gexiv2/default.nix b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix
index 7203f8531c2..7203f8531c2 100644
--- a/pkgs/development/libraries/gexiv2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix
diff --git a/pkgs/development/libraries/gf2x/default.nix b/nixpkgs/pkgs/development/libraries/gf2x/default.nix
index 4697f28bb9f..4697f28bb9f 100644
--- a/pkgs/development/libraries/gf2x/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gf2x/default.nix
diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix
index 235cd195071..235cd195071 100644
--- a/pkgs/development/libraries/gfbgraph/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix
diff --git a/pkgs/development/libraries/gflags/default.nix b/nixpkgs/pkgs/development/libraries/gflags/default.nix
index b09936f2924..b09936f2924 100644
--- a/pkgs/development/libraries/gflags/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gflags/default.nix
diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix
index 6003c5ea33e..6003c5ea33e 100644
--- a/pkgs/development/libraries/ggz_base_libs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix
diff --git a/pkgs/development/libraries/giblib/default.nix b/nixpkgs/pkgs/development/libraries/giblib/default.nix
index b166a69043e..b166a69043e 100644
--- a/pkgs/development/libraries/giblib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/giblib/default.nix
diff --git a/pkgs/development/libraries/giflib/4.1.nix b/nixpkgs/pkgs/development/libraries/giflib/4.1.nix
index 941a7c27fea..941a7c27fea 100644
--- a/pkgs/development/libraries/giflib/4.1.nix
+++ b/nixpkgs/pkgs/development/libraries/giflib/4.1.nix
diff --git a/pkgs/development/libraries/giflib/default.nix b/nixpkgs/pkgs/development/libraries/giflib/default.nix
index e2ff96d366a..e2ff96d366a 100644
--- a/pkgs/development/libraries/giflib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/giflib/default.nix
diff --git a/pkgs/development/libraries/giflib/libungif.nix b/nixpkgs/pkgs/development/libraries/giflib/libungif.nix
index 6336d30aeba..6336d30aeba 100644
--- a/pkgs/development/libraries/giflib/libungif.nix
+++ b/nixpkgs/pkgs/development/libraries/giflib/libungif.nix
diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/nixpkgs/pkgs/development/libraries/gio-sharp/default.nix
index affd57c06bc..affd57c06bc 100644
--- a/pkgs/development/libraries/gio-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gio-sharp/default.nix
diff --git a/pkgs/development/libraries/git2/default.nix b/nixpkgs/pkgs/development/libraries/git2/default.nix
index 2d89355cffe..2d89355cffe 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/git2/default.nix
diff --git a/pkgs/development/libraries/givaro/3.7.nix b/nixpkgs/pkgs/development/libraries/givaro/3.7.nix
index debddc6723f..debddc6723f 100644
--- a/pkgs/development/libraries/givaro/3.7.nix
+++ b/nixpkgs/pkgs/development/libraries/givaro/3.7.nix
diff --git a/pkgs/development/libraries/givaro/3.nix b/nixpkgs/pkgs/development/libraries/givaro/3.nix
index efed0926bb3..efed0926bb3 100644
--- a/pkgs/development/libraries/givaro/3.nix
+++ b/nixpkgs/pkgs/development/libraries/givaro/3.nix
diff --git a/pkgs/development/libraries/givaro/default.nix b/nixpkgs/pkgs/development/libraries/givaro/default.nix
index 6011dd03a46..6011dd03a46 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/nixpkgs/pkgs/development/libraries/givaro/default.nix
diff --git a/pkgs/development/libraries/gjs/default.nix b/nixpkgs/pkgs/development/libraries/gjs/default.nix
index dc2a7ed4859..dc2a7ed4859 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gjs/default.nix
diff --git a/pkgs/development/libraries/gl2ps/default.nix b/nixpkgs/pkgs/development/libraries/gl2ps/default.nix
index 8b522c6e92b..8b522c6e92b 100644
--- a/pkgs/development/libraries/gl2ps/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gl2ps/default.nix
diff --git a/pkgs/development/libraries/glbinding/default.nix b/nixpkgs/pkgs/development/libraries/glbinding/default.nix
index 6498419bc27..6498419bc27 100644
--- a/pkgs/development/libraries/glbinding/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glbinding/default.nix
diff --git a/pkgs/development/libraries/gle/default.nix b/nixpkgs/pkgs/development/libraries/gle/default.nix
index d656473ba80..d656473ba80 100644
--- a/pkgs/development/libraries/gle/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gle/default.nix
diff --git a/pkgs/development/libraries/glew/1.10.nix b/nixpkgs/pkgs/development/libraries/glew/1.10.nix
index b265cfcc016..b265cfcc016 100644
--- a/pkgs/development/libraries/glew/1.10.nix
+++ b/nixpkgs/pkgs/development/libraries/glew/1.10.nix
diff --git a/pkgs/development/libraries/glew/default.nix b/nixpkgs/pkgs/development/libraries/glew/default.nix
index ec56c544cac..ec56c544cac 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glew/default.nix
diff --git a/pkgs/development/libraries/glfw/2.x.nix b/nixpkgs/pkgs/development/libraries/glfw/2.x.nix
index b1118b473b6..b1118b473b6 100644
--- a/pkgs/development/libraries/glfw/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/glfw/2.x.nix
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix
index 16368ae2127..16368ae2127 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix
index 86f73e23d50..86f73e23d50 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix
diff --git a/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch b/nixpkgs/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch
index 0a091b2344d..0a091b2344d 100644
--- a/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch
+++ b/nixpkgs/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch
diff --git a/pkgs/development/libraries/glib-networking/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/glib-networking/installed-tests-path.patch
index 942ca053dd4..942ca053dd4 100644
--- a/pkgs/development/libraries/glib-networking/installed-tests-path.patch
+++ b/nixpkgs/pkgs/development/libraries/glib-networking/installed-tests-path.patch
diff --git a/pkgs/development/libraries/glib/darwin-compilation.patch b/nixpkgs/pkgs/development/libraries/glib/darwin-compilation.patch
index f215eef798a..f215eef798a 100644
--- a/pkgs/development/libraries/glib/darwin-compilation.patch
+++ b/nixpkgs/pkgs/development/libraries/glib/darwin-compilation.patch
diff --git a/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix
index 18756213230..18756213230 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glib/default.nix
diff --git a/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch b/nixpkgs/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch
index 4fdec2dd7e7..4fdec2dd7e7 100644
--- a/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch
+++ b/nixpkgs/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch
diff --git a/pkgs/development/libraries/glib/gobject_init_on_demand.patch b/nixpkgs/pkgs/development/libraries/glib/gobject_init_on_demand.patch
index d72d0b61dca..d72d0b61dca 100644
--- a/pkgs/development/libraries/glib/gobject_init_on_demand.patch
+++ b/nixpkgs/pkgs/development/libraries/glib/gobject_init_on_demand.patch
diff --git a/pkgs/development/libraries/glib/quark_init_on_demand.patch b/nixpkgs/pkgs/development/libraries/glib/quark_init_on_demand.patch
index 16808648431..16808648431 100644
--- a/pkgs/development/libraries/glib/quark_init_on_demand.patch
+++ b/nixpkgs/pkgs/development/libraries/glib/quark_init_on_demand.patch
diff --git a/pkgs/development/libraries/glib/schema-override-variable.patch b/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch
index 1cb5a730351..1cb5a730351 100644
--- a/pkgs/development/libraries/glib/schema-override-variable.patch
+++ b/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch
diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh
index 37c750b8db6..37c750b8db6 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh
diff --git a/pkgs/development/libraries/glib/skip-timer-test.patch b/nixpkgs/pkgs/development/libraries/glib/skip-timer-test.patch
index 942f3e7864c..942f3e7864c 100644
--- a/pkgs/development/libraries/glib/skip-timer-test.patch
+++ b/nixpkgs/pkgs/development/libraries/glib/skip-timer-test.patch
diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch
index 9d3989a30a5..9d3989a30a5 100644
--- a/pkgs/development/libraries/glib/split-dev-programs.patch
+++ b/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch
diff --git a/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch b/nixpkgs/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch
index 2c558f53b73..2c558f53b73 100644
--- a/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch
diff --git a/pkgs/development/libraries/glibc/CVE-2018-11236.patch b/nixpkgs/pkgs/development/libraries/glibc/CVE-2018-11236.patch
index db86e7146f2..db86e7146f2 100644
--- a/pkgs/development/libraries/glibc/CVE-2018-11236.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/CVE-2018-11236.patch
diff --git a/pkgs/development/libraries/glibc/CVE-2018-11237.patch b/nixpkgs/pkgs/development/libraries/glibc/CVE-2018-11237.patch
index ffc2cec1d57..ffc2cec1d57 100644
--- a/pkgs/development/libraries/glibc/CVE-2018-11237.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/CVE-2018-11237.patch
diff --git a/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch b/nixpkgs/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch
index ce18b874c42..ce18b874c42 100644
--- a/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch
diff --git a/pkgs/development/libraries/glibc/common.nix b/nixpkgs/pkgs/development/libraries/glibc/common.nix
index 458745694bc..458745694bc 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/nixpkgs/pkgs/development/libraries/glibc/common.nix
diff --git a/pkgs/development/libraries/glibc/darwin-cross-build.patch b/nixpkgs/pkgs/development/libraries/glibc/darwin-cross-build.patch
index 7b224924104..7b224924104 100644
--- a/pkgs/development/libraries/glibc/darwin-cross-build.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/darwin-cross-build.patch
diff --git a/pkgs/development/libraries/glibc/default.nix b/nixpkgs/pkgs/development/libraries/glibc/default.nix
index 150681ebda1..150681ebda1 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glibc/default.nix
diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch b/nixpkgs/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch
index f84b1049adf..f84b1049adf 100644
--- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch
diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch b/nixpkgs/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch
index 894e2a11cf8..894e2a11cf8 100644
--- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch
diff --git a/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-findidxwc.patch b/nixpkgs/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-findidxwc.patch
index 2d1ac0bc3af..2d1ac0bc3af 100644
--- a/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-findidxwc.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-findidxwc.patch
diff --git a/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-ibm-1390-converter.patch b/nixpkgs/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-ibm-1390-converter.patch
index 8b560566a49..8b560566a49 100644
--- a/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-ibm-1390-converter.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-ibm-1390-converter.patch
diff --git a/pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch b/nixpkgs/pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch
index 19f8bfc7cce..19f8bfc7cce 100644
--- a/pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch
diff --git a/pkgs/development/libraries/glibc/fix-x64-abi.patch b/nixpkgs/pkgs/development/libraries/glibc/fix-x64-abi.patch
index 1d60dcd7988..1d60dcd7988 100644
--- a/pkgs/development/libraries/glibc/fix-x64-abi.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/fix-x64-abi.patch
diff --git a/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch b/nixpkgs/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch
index 714e49db560..714e49db560 100644
--- a/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch
diff --git a/pkgs/development/libraries/glibc/info.nix b/nixpkgs/pkgs/development/libraries/glibc/info.nix
index 5cb004cc870..5cb004cc870 100644
--- a/pkgs/development/libraries/glibc/info.nix
+++ b/nixpkgs/pkgs/development/libraries/glibc/info.nix
diff --git a/pkgs/development/libraries/glibc/locales-builder.sh b/nixpkgs/pkgs/development/libraries/glibc/locales-builder.sh
index d732e208fa2..d732e208fa2 100644
--- a/pkgs/development/libraries/glibc/locales-builder.sh
+++ b/nixpkgs/pkgs/development/libraries/glibc/locales-builder.sh
diff --git a/pkgs/development/libraries/glibc/locales.nix b/nixpkgs/pkgs/development/libraries/glibc/locales.nix
index 0dc19197415..0dc19197415 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/nixpkgs/pkgs/development/libraries/glibc/locales.nix
diff --git a/pkgs/development/libraries/glibc/multi.nix b/nixpkgs/pkgs/development/libraries/glibc/multi.nix
index 5d3626b95cc..5d3626b95cc 100644
--- a/pkgs/development/libraries/glibc/multi.nix
+++ b/nixpkgs/pkgs/development/libraries/glibc/multi.nix
diff --git a/pkgs/development/libraries/glibc/nix-locale-archive.patch b/nixpkgs/pkgs/development/libraries/glibc/nix-locale-archive.patch
index 39312951fcf..39312951fcf 100644
--- a/pkgs/development/libraries/glibc/nix-locale-archive.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/nix-locale-archive.patch
diff --git a/pkgs/development/libraries/glibc/rpcgen-path.patch b/nixpkgs/pkgs/development/libraries/glibc/rpcgen-path.patch
index 3349449d916..3349449d916 100644
--- a/pkgs/development/libraries/glibc/rpcgen-path.patch
+++ b/nixpkgs/pkgs/development/libraries/glibc/rpcgen-path.patch
diff --git a/pkgs/development/libraries/glibmm/default.nix b/nixpkgs/pkgs/development/libraries/glibmm/default.nix
index 18963e31b6e..18963e31b6e 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glibmm/default.nix
diff --git a/pkgs/development/libraries/glm/default.nix b/nixpkgs/pkgs/development/libraries/glm/default.nix
index d39d6f0d7a3..d39d6f0d7a3 100644
--- a/pkgs/development/libraries/glm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glm/default.nix
diff --git a/pkgs/development/libraries/globalarrays/default.nix b/nixpkgs/pkgs/development/libraries/globalarrays/default.nix
index 9cb5dda507d..9cb5dda507d 100644
--- a/pkgs/development/libraries/globalarrays/default.nix
+++ b/nixpkgs/pkgs/development/libraries/globalarrays/default.nix
diff --git a/pkgs/development/libraries/globalplatform/default.nix b/nixpkgs/pkgs/development/libraries/globalplatform/default.nix
index b3cf36107af..b3cf36107af 100644
--- a/pkgs/development/libraries/globalplatform/default.nix
+++ b/nixpkgs/pkgs/development/libraries/globalplatform/default.nix
diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
index e01deea1175..e01deea1175 100644
--- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
+++ b/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
diff --git a/pkgs/development/libraries/glog/default.nix b/nixpkgs/pkgs/development/libraries/glog/default.nix
index aa846e41d55..aa846e41d55 100644
--- a/pkgs/development/libraries/glog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glog/default.nix
diff --git a/pkgs/development/libraries/gloox/default.nix b/nixpkgs/pkgs/development/libraries/gloox/default.nix
index 3343c78bea1..3343c78bea1 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gloox/default.nix
diff --git a/pkgs/development/libraries/glpk/default.nix b/nixpkgs/pkgs/development/libraries/glpk/default.nix
index 84a7aff7107..84a7aff7107 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glpk/default.nix
diff --git a/pkgs/development/libraries/glui/default.nix b/nixpkgs/pkgs/development/libraries/glui/default.nix
index d84a9227c3b..d84a9227c3b 100644
--- a/pkgs/development/libraries/glui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glui/default.nix
diff --git a/pkgs/development/libraries/gmime/2.nix b/nixpkgs/pkgs/development/libraries/gmime/2.nix
index 3b4ad1393d0..3b4ad1393d0 100644
--- a/pkgs/development/libraries/gmime/2.nix
+++ b/nixpkgs/pkgs/development/libraries/gmime/2.nix
diff --git a/pkgs/development/libraries/gmime/3.nix b/nixpkgs/pkgs/development/libraries/gmime/3.nix
index 754d5aa7411..754d5aa7411 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/nixpkgs/pkgs/development/libraries/gmime/3.nix
diff --git a/pkgs/development/libraries/gmm/default.nix b/nixpkgs/pkgs/development/libraries/gmm/default.nix
index 63d9d8c2762..63d9d8c2762 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gmm/default.nix
diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/nixpkgs/pkgs/development/libraries/gmp/4.3.2.nix
index a6035a2b7af..a6035a2b7af 100644
--- a/pkgs/development/libraries/gmp/4.3.2.nix
+++ b/nixpkgs/pkgs/development/libraries/gmp/4.3.2.nix
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix
index 494d9acb6bb..494d9acb6bb 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix
index 4b35f7828fe..4b35f7828fe 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix
diff --git a/pkgs/development/libraries/gmp/need-size-t.patch b/nixpkgs/pkgs/development/libraries/gmp/need-size-t.patch
index c4ba086182a..c4ba086182a 100644
--- a/pkgs/development/libraries/gmp/need-size-t.patch
+++ b/nixpkgs/pkgs/development/libraries/gmp/need-size-t.patch
diff --git a/pkgs/development/libraries/gmtk/default.nix b/nixpkgs/pkgs/development/libraries/gmtk/default.nix
index 10d584c6ccb..10d584c6ccb 100644
--- a/pkgs/development/libraries/gmtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gmtk/default.nix
diff --git a/pkgs/development/libraries/gmtk/fix-paths.patch b/nixpkgs/pkgs/development/libraries/gmtk/fix-paths.patch
index 64738300aba..64738300aba 100644
--- a/pkgs/development/libraries/gmtk/fix-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/gmtk/fix-paths.patch
diff --git a/pkgs/development/libraries/gnet/default.nix b/nixpkgs/pkgs/development/libraries/gnet/default.nix
index 0b2fb9fef6c..0b2fb9fef6c 100644
--- a/pkgs/development/libraries/gnet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnet/default.nix
diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix
index f6ff3a2ea4a..f6ff3a2ea4a 100644
--- a/pkgs/development/libraries/gnome-menus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix
diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix
index adbb714c7b2..adbb714c7b2 100644
--- a/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix
diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix
index fa762c3a02e..fa762c3a02e 100644
--- a/pkgs/development/libraries/gnome-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix
diff --git a/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch b/nixpkgs/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch
index 706f119c8ba..706f119c8ba 100644
--- a/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch
+++ b/nixpkgs/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch
diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix
index 03799c1ef7c..03799c1ef7c 100644
--- a/pkgs/development/libraries/gnome-video-effects/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix
diff --git a/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch b/nixpkgs/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch
index 62b29e7d025..62b29e7d025 100644
--- a/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch
+++ b/nixpkgs/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch
diff --git a/pkgs/development/libraries/gnu-config/default.nix b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix
index 638d483b60e..638d483b60e 100644
--- a/pkgs/development/libraries/gnu-config/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix
index b5b8add2db5..b5b8add2db5 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix
diff --git a/pkgs/development/libraries/gnutls-kdh/3.5.nix b/nixpkgs/pkgs/development/libraries/gnutls-kdh/3.5.nix
index 015163b3293..015163b3293 100644
--- a/pkgs/development/libraries/gnutls-kdh/3.5.nix
+++ b/nixpkgs/pkgs/development/libraries/gnutls-kdh/3.5.nix
diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix
index 6079387fc72..6079387fc72 100644
--- a/pkgs/development/libraries/gnutls-kdh/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix
diff --git a/pkgs/development/libraries/gnutls/default.nix b/nixpkgs/pkgs/development/libraries/gnutls/default.nix
index deef141c5df..deef141c5df 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gnutls/default.nix
diff --git a/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch b/nixpkgs/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch
index 90d1e85ee8c..90d1e85ee8c 100644
--- a/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch
+++ b/nixpkgs/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch
diff --git a/pkgs/development/libraries/gnutls/no-security-framework.patch b/nixpkgs/pkgs/development/libraries/gnutls/no-security-framework.patch
index 7f5808e5053..7f5808e5053 100644
--- a/pkgs/development/libraries/gnutls/no-security-framework.patch
+++ b/nixpkgs/pkgs/development/libraries/gnutls/no-security-framework.patch
diff --git a/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch b/nixpkgs/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch
index d4160b51d68..d4160b51d68 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch
+++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch
diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/nixpkgs/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 6e56d3fab41..6e56d3fab41 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix
index 81df734a2ce..81df734a2ce 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix
diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/nixpkgs/pkgs/development/libraries/gobject-introspection/setup-hook.sh
index a68d544cfbe..a68d544cfbe 100644
--- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/setup-hook.sh
diff --git a/pkgs/development/libraries/gobject-introspection/test_shlibs.patch b/nixpkgs/pkgs/development/libraries/gobject-introspection/test_shlibs.patch
index 65b5a1a13b9..65b5a1a13b9 100644
--- a/pkgs/development/libraries/gobject-introspection/test_shlibs.patch
+++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/test_shlibs.patch
diff --git a/pkgs/development/libraries/goffice/default.nix b/nixpkgs/pkgs/development/libraries/goffice/default.nix
index f41fa73a6ef..f41fa73a6ef 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/goffice/default.nix
diff --git a/pkgs/development/libraries/gom/default.nix b/nixpkgs/pkgs/development/libraries/gom/default.nix
index e006f8cd6f8..e006f8cd6f8 100644
--- a/pkgs/development/libraries/gom/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gom/default.nix
diff --git a/pkgs/development/libraries/gom/longer-stress-timeout.patch b/nixpkgs/pkgs/development/libraries/gom/longer-stress-timeout.patch
index 3dcd1d0a107..3dcd1d0a107 100644
--- a/pkgs/development/libraries/gom/longer-stress-timeout.patch
+++ b/nixpkgs/pkgs/development/libraries/gom/longer-stress-timeout.patch
diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix
index 1440d3f6aa0..1440d3f6aa0 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix
diff --git a/pkgs/development/libraries/goocanvas/default.nix b/nixpkgs/pkgs/development/libraries/goocanvas/default.nix
index 024ac363af1..024ac363af1 100644
--- a/pkgs/development/libraries/goocanvas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/goocanvas/default.nix
diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix
index b7f56837686..b7f56837686 100644
--- a/pkgs/development/libraries/goocanvasmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix
diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
index be7132dc845..be7132dc845 100644
--- a/pkgs/development/libraries/google-cloud-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
diff --git a/pkgs/development/libraries/gperftools/default.nix b/nixpkgs/pkgs/development/libraries/gperftools/default.nix
index 0e985754985..0e985754985 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gperftools/default.nix
diff --git a/pkgs/development/libraries/gpgme/default.nix b/nixpkgs/pkgs/development/libraries/gpgme/default.nix
index ed2b5563bd3..ed2b5563bd3 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gpgme/default.nix
diff --git a/pkgs/development/libraries/grail/default.nix b/nixpkgs/pkgs/development/libraries/grail/default.nix
index 722fb79d5d6..722fb79d5d6 100644
--- a/pkgs/development/libraries/grail/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grail/default.nix
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix
index 45096e031d3..45096e031d3 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix
diff --git a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch b/nixpkgs/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
index d049d6c96f8..d049d6c96f8 100644
--- a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
+++ b/nixpkgs/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
diff --git a/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch b/nixpkgs/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch
index f6c13dbd6d5..f6c13dbd6d5 100644
--- a/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch
+++ b/nixpkgs/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch
diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/nixpkgs/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch
index d78ef74ce35..d78ef74ce35 100644
--- a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch
+++ b/nixpkgs/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch
diff --git a/pkgs/development/libraries/grantlee/5/series b/nixpkgs/pkgs/development/libraries/grantlee/5/series
index 19850b2e7e4..19850b2e7e4 100644
--- a/pkgs/development/libraries/grantlee/5/series
+++ b/nixpkgs/pkgs/development/libraries/grantlee/5/series
diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/nixpkgs/pkgs/development/libraries/grantlee/5/setup-hook.sh
index b51cb4a3190..b51cb4a3190 100644
--- a/pkgs/development/libraries/grantlee/5/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/grantlee/5/setup-hook.sh
diff --git a/pkgs/development/libraries/grantlee/default.nix b/nixpkgs/pkgs/development/libraries/grantlee/default.nix
index 1446e339745..1446e339745 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grantlee/default.nix
diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix
index be32a74ea45..be32a74ea45 100644
--- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix
diff --git a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/nixpkgs/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
index 51bc206659d..51bc206659d 100644
--- a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
+++ b/nixpkgs/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
diff --git a/pkgs/development/libraries/graphene/default.nix b/nixpkgs/pkgs/development/libraries/graphene/default.nix
index e540604c9cb..e540604c9cb 100644
--- a/pkgs/development/libraries/graphene/default.nix
+++ b/nixpkgs/pkgs/development/libraries/graphene/default.nix
diff --git a/pkgs/development/libraries/grib-api/default.nix b/nixpkgs/pkgs/development/libraries/grib-api/default.nix
index 0c9e4bf3156..0c9e4bf3156 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grib-api/default.nix
diff --git a/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch b/nixpkgs/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch
index cb6a1a35494..cb6a1a35494 100644
--- a/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch
+++ b/nixpkgs/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch
diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix
index ddf29c2dcd8..ddf29c2dcd8 100644
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix
diff --git a/pkgs/development/libraries/grilo/default.nix b/nixpkgs/pkgs/development/libraries/grilo/default.nix
index 734a103e0b7..734a103e0b7 100644
--- a/pkgs/development/libraries/grilo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grilo/default.nix
diff --git a/pkgs/development/libraries/grilo/setup-hook.sh b/nixpkgs/pkgs/development/libraries/grilo/setup-hook.sh
index 9337c520a20..9337c520a20 100644
--- a/pkgs/development/libraries/grilo/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/grilo/setup-hook.sh
diff --git a/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix
index dfec171f1db..dfec171f1db 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix
diff --git a/pkgs/development/libraries/gsasl/default.nix b/nixpkgs/pkgs/development/libraries/gsasl/default.nix
index 899aa116b2c..899aa116b2c 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsasl/default.nix
diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
index ea6e08811af..ea6e08811af 100644
--- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix
index 8b118fe9483..8b118fe9483 100644
--- a/pkgs/development/libraries/gsettings-qt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix
diff --git a/pkgs/development/libraries/gsignond/conf.patch b/nixpkgs/pkgs/development/libraries/gsignond/conf.patch
index 0aa2034e399..0aa2034e399 100644
--- a/pkgs/development/libraries/gsignond/conf.patch
+++ b/nixpkgs/pkgs/development/libraries/gsignond/conf.patch
diff --git a/pkgs/development/libraries/gsignond/default.nix b/nixpkgs/pkgs/development/libraries/gsignond/default.nix
index 88a4ecb3622..88a4ecb3622 100644
--- a/pkgs/development/libraries/gsignond/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsignond/default.nix
diff --git a/pkgs/development/libraries/gsignond/plugin-load-env.patch b/nixpkgs/pkgs/development/libraries/gsignond/plugin-load-env.patch
index 5da2b4c157e..5da2b4c157e 100644
--- a/pkgs/development/libraries/gsignond/plugin-load-env.patch
+++ b/nixpkgs/pkgs/development/libraries/gsignond/plugin-load-env.patch
diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix
index ebaf694f04e..ebaf694f04e 100644
--- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix
+++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix
diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix
index c4d23bd834c..c4d23bd834c 100644
--- a/pkgs/development/libraries/gsignond/plugins/mail.nix
+++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix
diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix
index a140859b693..a140859b693 100644
--- a/pkgs/development/libraries/gsignond/plugins/oauth.nix
+++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix
diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix
index af57950ac65..af57950ac65 100644
--- a/pkgs/development/libraries/gsignond/plugins/sasl.nix
+++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix
diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/nixpkgs/pkgs/development/libraries/gsignond/wrapper.nix
index a4738e4b6a7..a4738e4b6a7 100644
--- a/pkgs/development/libraries/gsignond/wrapper.nix
+++ b/nixpkgs/pkgs/development/libraries/gsignond/wrapper.nix
diff --git a/pkgs/development/libraries/gsl/default.nix b/nixpkgs/pkgs/development/libraries/gsl/default.nix
index 966d6a8ffd5..966d6a8ffd5 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsl/default.nix
diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix
index ae102ac6030..ae102ac6030 100644
--- a/pkgs/development/libraries/gsl/gsl-1_16.nix
+++ b/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix
diff --git a/pkgs/development/libraries/gsm/default.nix b/nixpkgs/pkgs/development/libraries/gsm/default.nix
index 1405d4782ad..1405d4782ad 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsm/default.nix
diff --git a/pkgs/development/libraries/gsmlib/default.nix b/nixpkgs/pkgs/development/libraries/gsmlib/default.nix
index 88bec83e624..88bec83e624 100644
--- a/pkgs/development/libraries/gsmlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsmlib/default.nix
diff --git a/pkgs/development/libraries/gsoap/default.nix b/nixpkgs/pkgs/development/libraries/gsoap/default.nix
index a1a0da51017..a1a0da51017 100644
--- a/pkgs/development/libraries/gsoap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsoap/default.nix
diff --git a/pkgs/development/libraries/gsound/default.nix b/nixpkgs/pkgs/development/libraries/gsound/default.nix
index b1869193a09..b1869193a09 100644
--- a/pkgs/development/libraries/gsound/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsound/default.nix
diff --git a/pkgs/development/libraries/gspell/default.nix b/nixpkgs/pkgs/development/libraries/gspell/default.nix
index 71a427eb2a6..71a427eb2a6 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gspell/default.nix
diff --git a/pkgs/development/libraries/gss/default.nix b/nixpkgs/pkgs/development/libraries/gss/default.nix
index a9ee776d441..a9ee776d441 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gss/default.nix
diff --git a/pkgs/development/libraries/gssdp/default.nix b/nixpkgs/pkgs/development/libraries/gssdp/default.nix
index 3c49b579b9c..3c49b579b9c 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gssdp/default.nix
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
index 9b2d3d0e247..9b2d3d0e247 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
diff --git a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch b/nixpkgs/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
index c687fffc9c0..c687fffc9c0 100644
--- a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
index 178f6a1fe89..178f6a1fe89 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
diff --git a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch b/nixpkgs/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
index 04486a4647f..04486a4647f 100644
--- a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
index 3dd7a547de9..3dd7a547de9 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
diff --git a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
index c388a82fa2a..c388a82fa2a 100644
--- a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/nixpkgs/pkgs/development/libraries/gstreamer/core/setup-hook.sh
index 026a4e5f55a..026a4e5f55a 100644
--- a/pkgs/development/libraries/gstreamer/core/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/setup-hook.sh
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/default.nix
index 94d71760a7f..94d71760a7f 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/default.nix
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
index af2579d0594..af2579d0594 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
diff --git a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch b/nixpkgs/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
index 1e12f3bbfbe..1e12f3bbfbe 100644
--- a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
index a7c2bcf838e..a7c2bcf838e 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
diff --git a/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch b/nixpkgs/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
index f68ad603a37..f68ad603a37 100644
--- a/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
index 35c278da03b..35c278da03b 100644
--- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
index 402074a4e5f..402074a4e5f 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
index 77465645d23..77465645d23 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
index eed9d423fdb..eed9d423fdb 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch
index fd9f6ea240d..fd9f6ea240d 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
index 2b78d4daaf3..2b78d4daaf3 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch
index f13d3a16671..f13d3a16671 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch
index 22cff574134..22cff574134 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
index 2f46016adac..2f46016adac 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
index c8414a7b681..c8414a7b681 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch
index d0c9960e5d2..d0c9960e5d2 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch
index 67dfc34434d..67dfc34434d 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
index e69e584b23d..e69e584b23d 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
index 636e20b732b..636e20b732b 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
index 27036ad86ed..27036ad86ed 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
index e36eba37007..e36eba37007 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index dfb18754c83..dfb18754c83 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix
index d8c36fa4070..d8c36fa4070 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
index cac56f64cc9..cac56f64cc9 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/validate/default.nix
index 74e89848163..74e89848163 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/validate/default.nix
diff --git a/pkgs/development/libraries/gtdialog/default.nix b/nixpkgs/pkgs/development/libraries/gtdialog/default.nix
index d0a2d3691b4..d0a2d3691b4 100644
--- a/pkgs/development/libraries/gtdialog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtdialog/default.nix
diff --git a/pkgs/development/libraries/gtdialog/default.upstream b/nixpkgs/pkgs/development/libraries/gtdialog/default.upstream
index b9cbcf4c5c7..b9cbcf4c5c7 100644
--- a/pkgs/development/libraries/gtdialog/default.upstream
+++ b/nixpkgs/pkgs/development/libraries/gtdialog/default.upstream
diff --git a/pkgs/development/libraries/gtest/default.nix b/nixpkgs/pkgs/development/libraries/gtest/default.nix
index bbc582f581c..bbc582f581c 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtest/default.nix
diff --git a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch
index c05e3a9326a..c05e3a9326a 100644
--- a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch
+++ b/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch
diff --git a/pkgs/development/libraries/gthree/default.nix b/nixpkgs/pkgs/development/libraries/gthree/default.nix
index 04d7c8d8f4d..04d7c8d8f4d 100644
--- a/pkgs/development/libraries/gthree/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gthree/default.nix
diff --git a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
index 99ca221f5ba..99ca221f5ba 100644
--- a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
diff --git a/pkgs/development/libraries/gtk-engine-murrine/default.nix b/nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix
index 9acb7b25a0d..9acb7b25a0d 100644
--- a/pkgs/development/libraries/gtk-engine-murrine/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix
diff --git a/pkgs/development/libraries/gtk-engines/default.nix b/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix
index 2f56f6eb4c5..2f56f6eb4c5 100644
--- a/pkgs/development/libraries/gtk-engines/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix
diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix
index c00e8035f18..c00e8035f18 100644
--- a/pkgs/development/libraries/gtk-layer-shell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix
diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix
index 2281055c62b..2281055c62b 100644
--- a/pkgs/development/libraries/gtk-mac-integration/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix
diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix
index 2b83a8ef52e..2b83a8ef52e 100644
--- a/pkgs/development/libraries/gtk-sharp-beans/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix
diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix
index 615ea66f4d9..615ea66f4d9 100644
--- a/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix
diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix
index f8f1f20cc2f..f8f1f20cc2f 100644
--- a/pkgs/development/libraries/gtk-sharp/3.0.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix
diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/nixpkgs/pkgs/development/libraries/gtk-sharp/builder.sh
index 4b8f757540b..4b8f757540b 100644
--- a/pkgs/development/libraries/gtk-sharp/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/gtk-sharp/builder.sh
diff --git a/pkgs/development/libraries/gtk/2.x.nix b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
index 932527eed09..932527eed09 100644
--- a/pkgs/development/libraries/gtk/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
index f0d5d9d9bf2..f0d5d9d9bf2 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
diff --git a/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh b/nixpkgs/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh
index f28a856c4f5..f28a856c4f5 100644
--- a/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh
+++ b/nixpkgs/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh
diff --git a/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh b/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh
index dde991fd27c..dde991fd27c 100644
--- a/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh
+++ b/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh
diff --git a/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh b/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh
index d2d5287831a..d2d5287831a 100644
--- a/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh
+++ b/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh
diff --git a/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch
index ec69a12514f..ec69a12514f 100644
--- a/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch
+++ b/nixpkgs/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch
diff --git a/pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch b/nixpkgs/pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch
index 9725cfb8426..9725cfb8426 100644
--- a/pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch
+++ b/nixpkgs/pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch
diff --git a/pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch b/nixpkgs/pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch
index 1b8231756e7..1b8231756e7 100644
--- a/pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch
+++ b/nixpkgs/pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch
diff --git a/pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch b/nixpkgs/pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch
index 86631634b5b..86631634b5b 100644
--- a/pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch
+++ b/nixpkgs/pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch
diff --git a/pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch b/nixpkgs/pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch
index bbe5f28dbd3..bbe5f28dbd3 100644
--- a/pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch
+++ b/nixpkgs/pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch
diff --git a/pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch b/nixpkgs/pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch
index edd69b07807..edd69b07807 100644
--- a/pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch
diff --git a/pkgs/development/libraries/gtk/patches/missing-header.patch b/nixpkgs/pkgs/development/libraries/gtk/patches/missing-header.patch
index 49eb51dae9a..49eb51dae9a 100644
--- a/pkgs/development/libraries/gtk/patches/missing-header.patch
+++ b/nixpkgs/pkgs/development/libraries/gtk/patches/missing-header.patch
diff --git a/pkgs/development/libraries/gtkd/default.nix b/nixpkgs/pkgs/development/libraries/gtkd/default.nix
index 0b2df597be5..0b2df597be5 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkd/default.nix
diff --git a/pkgs/development/libraries/gtkd/paths.d b/nixpkgs/pkgs/development/libraries/gtkd/paths.d
index 8793da44069..8793da44069 100644
--- a/pkgs/development/libraries/gtkd/paths.d
+++ b/nixpkgs/pkgs/development/libraries/gtkd/paths.d
diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix
index 54054270c3c..54054270c3c 100644
--- a/pkgs/development/libraries/gtkdatabox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix
diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix
index babcaa99334..babcaa99334 100644
--- a/pkgs/development/libraries/gtkimageview/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix
diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/nixpkgs/pkgs/development/libraries/gtkmathview/default.nix
index 12b9181a952..12b9181a952 100644
--- a/pkgs/development/libraries/gtkmathview/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkmathview/default.nix
diff --git a/pkgs/development/libraries/gtkmathview/gcc-4.3-build-fixes.patch b/nixpkgs/pkgs/development/libraries/gtkmathview/gcc-4.3-build-fixes.patch
index 14ad594b38b..14ad594b38b 100644
--- a/pkgs/development/libraries/gtkmathview/gcc-4.3-build-fixes.patch
+++ b/nixpkgs/pkgs/development/libraries/gtkmathview/gcc-4.3-build-fixes.patch
diff --git a/pkgs/development/libraries/gtkmathview/gcc-4.4-build-fixes.patch b/nixpkgs/pkgs/development/libraries/gtkmathview/gcc-4.4-build-fixes.patch
index 0ebd31ef2a7..0ebd31ef2a7 100644
--- a/pkgs/development/libraries/gtkmathview/gcc-4.4-build-fixes.patch
+++ b/nixpkgs/pkgs/development/libraries/gtkmathview/gcc-4.4-build-fixes.patch
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix
index 523c5b50d28..523c5b50d28 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix
index d79e739f80c..d79e739f80c 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix
diff --git a/pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch
index c87350167c2..c87350167c2 100644
--- a/pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch
+++ b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix
index 1b35221f066..1b35221f066 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix
diff --git a/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch
index a35d9a88d0d..a35d9a88d0d 100644
--- a/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch
+++ b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
index d3a7d849062..d3a7d849062 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix
index d60bb29c47a..d60bb29c47a 100644
--- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix
diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix
index 1b66bfd031f..1b66bfd031f 100644
--- a/pkgs/development/libraries/gtksourceviewmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/nixpkgs/pkgs/development/libraries/gtkspell/3.nix
index b68c814ad54..b68c814ad54 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkspell/3.nix
diff --git a/pkgs/development/libraries/gtkspell/default.nix b/nixpkgs/pkgs/development/libraries/gtkspell/default.nix
index 14676be0dcb..14676be0dcb 100644
--- a/pkgs/development/libraries/gtkspell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkspell/default.nix
diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix
index 97f1a12c178..97f1a12c178 100644
--- a/pkgs/development/libraries/gtkspellmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix
diff --git a/pkgs/development/libraries/gts/default.nix b/nixpkgs/pkgs/development/libraries/gts/default.nix
index 18640e923e8..18640e923e8 100644
--- a/pkgs/development/libraries/gts/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gts/default.nix
diff --git a/pkgs/development/libraries/gumbo/default.nix b/nixpkgs/pkgs/development/libraries/gumbo/default.nix
index 2db8c1e6739..2db8c1e6739 100644
--- a/pkgs/development/libraries/gumbo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gumbo/default.nix
diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix
index b764ce2c2e2..b764ce2c2e2 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix
diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix
index 4dfbaafdc32..4dfbaafdc32 100644
--- a/pkgs/development/libraries/gupnp-dlna/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix
diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix
index 56a274316e8..56a274316e8 100644
--- a/pkgs/development/libraries/gupnp-igd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix
diff --git a/pkgs/development/libraries/gupnp/default.nix b/nixpkgs/pkgs/development/libraries/gupnp/default.nix
index a69df33dd65..a69df33dd65 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gupnp/default.nix
diff --git a/pkgs/development/libraries/gupnp/fix-requires.patch b/nixpkgs/pkgs/development/libraries/gupnp/fix-requires.patch
index ffe9b68fd04..ffe9b68fd04 100644
--- a/pkgs/development/libraries/gupnp/fix-requires.patch
+++ b/nixpkgs/pkgs/development/libraries/gupnp/fix-requires.patch
diff --git a/pkgs/development/libraries/gusb/default.nix b/nixpkgs/pkgs/development/libraries/gusb/default.nix
index 2f39b03898d..2f39b03898d 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gusb/default.nix
diff --git a/pkgs/development/libraries/gvfs/default.nix b/nixpkgs/pkgs/development/libraries/gvfs/default.nix
index f8db6f573d9..f8db6f573d9 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gvfs/default.nix
diff --git a/pkgs/development/libraries/half/default.nix b/nixpkgs/pkgs/development/libraries/half/default.nix
index 063d416a8fc..063d416a8fc 100644
--- a/pkgs/development/libraries/half/default.nix
+++ b/nixpkgs/pkgs/development/libraries/half/default.nix
diff --git a/pkgs/development/libraries/hamlib/default.nix b/nixpkgs/pkgs/development/libraries/hamlib/default.nix
index 000af7fd74e..000af7fd74e 100644
--- a/pkgs/development/libraries/hamlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hamlib/default.nix
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
index 42f68eea83f..42f68eea83f 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
diff --git a/pkgs/development/libraries/hawknl/default.nix b/nixpkgs/pkgs/development/libraries/hawknl/default.nix
index 77c1ca07dc9..77c1ca07dc9 100644
--- a/pkgs/development/libraries/hawknl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hawknl/default.nix
diff --git a/pkgs/development/libraries/herqq/default.nix b/nixpkgs/pkgs/development/libraries/herqq/default.nix
index ec86db036e9..ec86db036e9 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/nixpkgs/pkgs/development/libraries/herqq/default.nix
diff --git a/pkgs/development/libraries/hidapi/default.nix b/nixpkgs/pkgs/development/libraries/hidapi/default.nix
index 28e96244ba5..28e96244ba5 100644
--- a/pkgs/development/libraries/hidapi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hidapi/default.nix
diff --git a/pkgs/development/libraries/hiredis-vip/default.nix b/nixpkgs/pkgs/development/libraries/hiredis-vip/default.nix
index 59e168115a8..59e168115a8 100644
--- a/pkgs/development/libraries/hiredis-vip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hiredis-vip/default.nix
diff --git a/pkgs/development/libraries/hiredis/default.nix b/nixpkgs/pkgs/development/libraries/hiredis/default.nix
index 6dc3871e1c1..6dc3871e1c1 100644
--- a/pkgs/development/libraries/hiredis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hiredis/default.nix
diff --git a/pkgs/development/libraries/hivex/default.nix b/nixpkgs/pkgs/development/libraries/hivex/default.nix
index ca547faa2ab..ca547faa2ab 100644
--- a/pkgs/development/libraries/hivex/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hivex/default.nix
diff --git a/pkgs/development/libraries/hivex/hivex-syms.patch b/nixpkgs/pkgs/development/libraries/hivex/hivex-syms.patch
index bacd34e8515..bacd34e8515 100644
--- a/pkgs/development/libraries/hivex/hivex-syms.patch
+++ b/nixpkgs/pkgs/development/libraries/hivex/hivex-syms.patch
diff --git a/pkgs/development/libraries/hotpatch/default.nix b/nixpkgs/pkgs/development/libraries/hotpatch/default.nix
index df3581cc809..df3581cc809 100644
--- a/pkgs/development/libraries/hotpatch/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hotpatch/default.nix
diff --git a/pkgs/development/libraries/hpx/default.nix b/nixpkgs/pkgs/development/libraries/hpx/default.nix
index eafd85cc92a..eafd85cc92a 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hpx/default.nix
diff --git a/pkgs/development/libraries/hspell/default.nix b/nixpkgs/pkgs/development/libraries/hspell/default.nix
index 32743e61797..32743e61797 100644
--- a/pkgs/development/libraries/hspell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hspell/default.nix
diff --git a/pkgs/development/libraries/hspell/dicts.nix b/nixpkgs/pkgs/development/libraries/hspell/dicts.nix
index 83942c2c1dd..83942c2c1dd 100644
--- a/pkgs/development/libraries/hspell/dicts.nix
+++ b/nixpkgs/pkgs/development/libraries/hspell/dicts.nix
diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix
index f0968c47822..f0968c47822 100644
--- a/pkgs/development/libraries/htmlcxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix
diff --git a/pkgs/development/libraries/htmlcxx/ptrdiff.patch b/nixpkgs/pkgs/development/libraries/htmlcxx/ptrdiff.patch
index 6348ba24f8d..6348ba24f8d 100644
--- a/pkgs/development/libraries/htmlcxx/ptrdiff.patch
+++ b/nixpkgs/pkgs/development/libraries/htmlcxx/ptrdiff.patch
diff --git a/pkgs/development/libraries/http-parser/build-shared.patch b/nixpkgs/pkgs/development/libraries/http-parser/build-shared.patch
index 5922cdfb584..5922cdfb584 100644
--- a/pkgs/development/libraries/http-parser/build-shared.patch
+++ b/nixpkgs/pkgs/development/libraries/http-parser/build-shared.patch
diff --git a/pkgs/development/libraries/http-parser/default.nix b/nixpkgs/pkgs/development/libraries/http-parser/default.nix
index 4b1a695ca55..4b1a695ca55 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/nixpkgs/pkgs/development/libraries/http-parser/default.nix
diff --git a/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch b/nixpkgs/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch
index 4607f8b8ee0..4607f8b8ee0 100644
--- a/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch
+++ b/nixpkgs/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch
diff --git a/pkgs/development/libraries/hunspell/default.nix b/nixpkgs/pkgs/development/libraries/hunspell/default.nix
index f2f8cdcab20..f2f8cdcab20 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hunspell/default.nix
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix
index fb64aa81d1a..fb64aa81d1a 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix
diff --git a/pkgs/development/libraries/hunspell/wrapper.nix b/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix
index 34c3d26c55e..34c3d26c55e 100644
--- a/pkgs/development/libraries/hunspell/wrapper.nix
+++ b/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix
diff --git a/pkgs/development/libraries/hwloc/default.nix b/nixpkgs/pkgs/development/libraries/hwloc/default.nix
index ffa64858b75..ffa64858b75 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hwloc/default.nix
diff --git a/pkgs/development/libraries/hyena/default.nix b/nixpkgs/pkgs/development/libraries/hyena/default.nix
index 09b7751c828..09b7751c828 100644
--- a/pkgs/development/libraries/hyena/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hyena/default.nix
diff --git a/pkgs/development/libraries/hyperscan/default.nix b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
index d389b69087b..d389b69087b 100644
--- a/pkgs/development/libraries/hyperscan/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
diff --git a/pkgs/development/libraries/hyphen/default.nix b/nixpkgs/pkgs/development/libraries/hyphen/default.nix
index 9f30ff54823..9f30ff54823 100644
--- a/pkgs/development/libraries/hyphen/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hyphen/default.nix
diff --git a/pkgs/development/libraries/icu/58.nix b/nixpkgs/pkgs/development/libraries/icu/58.nix
index e53e4e3737e..e53e4e3737e 100644
--- a/pkgs/development/libraries/icu/58.nix
+++ b/nixpkgs/pkgs/development/libraries/icu/58.nix
diff --git a/pkgs/development/libraries/icu/59.nix b/nixpkgs/pkgs/development/libraries/icu/59.nix
index 9ca66ca525f..9ca66ca525f 100644
--- a/pkgs/development/libraries/icu/59.nix
+++ b/nixpkgs/pkgs/development/libraries/icu/59.nix
diff --git a/pkgs/development/libraries/icu/60.nix b/nixpkgs/pkgs/development/libraries/icu/60.nix
index e56135b15c6..e56135b15c6 100644
--- a/pkgs/development/libraries/icu/60.nix
+++ b/nixpkgs/pkgs/development/libraries/icu/60.nix
diff --git a/pkgs/development/libraries/icu/63.nix b/nixpkgs/pkgs/development/libraries/icu/63.nix
index 719318990c6..719318990c6 100644
--- a/pkgs/development/libraries/icu/63.nix
+++ b/nixpkgs/pkgs/development/libraries/icu/63.nix
diff --git a/pkgs/development/libraries/icu/64.nix b/nixpkgs/pkgs/development/libraries/icu/64.nix
index c7bdd22c179..c7bdd22c179 100644
--- a/pkgs/development/libraries/icu/64.nix
+++ b/nixpkgs/pkgs/development/libraries/icu/64.nix
diff --git a/pkgs/development/libraries/icu/base.nix b/nixpkgs/pkgs/development/libraries/icu/base.nix
index e51224433e8..e51224433e8 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/nixpkgs/pkgs/development/libraries/icu/base.nix
diff --git a/pkgs/development/libraries/id3lib/default.nix b/nixpkgs/pkgs/development/libraries/id3lib/default.nix
index ddce76b10f7..ddce76b10f7 100644
--- a/pkgs/development/libraries/id3lib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/id3lib/default.nix
diff --git a/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch b/nixpkgs/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch
index 2b7457d54c7..2b7457d54c7 100644
--- a/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch
+++ b/nixpkgs/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch
diff --git a/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/nixpkgs/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
index b05d2cf298d..b05d2cf298d 100644
--- a/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
+++ b/nixpkgs/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
diff --git a/pkgs/development/libraries/idnkit/default.nix b/nixpkgs/pkgs/development/libraries/idnkit/default.nix
index 3d00d20f170..3d00d20f170 100644
--- a/pkgs/development/libraries/idnkit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/idnkit/default.nix
diff --git a/pkgs/development/libraries/ignition-math/default.nix b/nixpkgs/pkgs/development/libraries/ignition-math/default.nix
index 3a642c8837a..3a642c8837a 100644
--- a/pkgs/development/libraries/ignition-math/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ignition-math/default.nix
diff --git a/pkgs/development/libraries/ignition-transport/0.9.0.nix b/nixpkgs/pkgs/development/libraries/ignition-transport/0.9.0.nix
index 3452c72839f..3452c72839f 100644
--- a/pkgs/development/libraries/ignition-transport/0.9.0.nix
+++ b/nixpkgs/pkgs/development/libraries/ignition-transport/0.9.0.nix
diff --git a/pkgs/development/libraries/ignition-transport/1.0.1.nix b/nixpkgs/pkgs/development/libraries/ignition-transport/1.0.1.nix
index 2f9605a3a72..2f9605a3a72 100644
--- a/pkgs/development/libraries/ignition-transport/1.0.1.nix
+++ b/nixpkgs/pkgs/development/libraries/ignition-transport/1.0.1.nix
diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix
index 0e7603db585..0e7603db585 100644
--- a/pkgs/development/libraries/ignition-transport/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix
diff --git a/pkgs/development/libraries/igraph/default.nix b/nixpkgs/pkgs/development/libraries/igraph/default.nix
index f3206700cb8..f3206700cb8 100644
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/nixpkgs/pkgs/development/libraries/igraph/default.nix
diff --git a/pkgs/development/libraries/ijs/default.nix b/nixpkgs/pkgs/development/libraries/ijs/default.nix
index 98a34477e4f..98a34477e4f 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ijs/default.nix
diff --git a/pkgs/development/libraries/iksemel/default.nix b/nixpkgs/pkgs/development/libraries/iksemel/default.nix
index 6330347cd27..6330347cd27 100644
--- a/pkgs/development/libraries/iksemel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/iksemel/default.nix
diff --git a/pkgs/development/libraries/ilbc/CMakeLists.txt b/nixpkgs/pkgs/development/libraries/ilbc/CMakeLists.txt
index edd8e7a3279..edd8e7a3279 100644
--- a/pkgs/development/libraries/ilbc/CMakeLists.txt
+++ b/nixpkgs/pkgs/development/libraries/ilbc/CMakeLists.txt
diff --git a/pkgs/development/libraries/ilbc/default.nix b/nixpkgs/pkgs/development/libraries/ilbc/default.nix
index cb83322ebb6..cb83322ebb6 100644
--- a/pkgs/development/libraries/ilbc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ilbc/default.nix
diff --git a/pkgs/development/libraries/ilbc/extract-cfile.awk b/nixpkgs/pkgs/development/libraries/ilbc/extract-cfile.awk
index e4b07bc0896..e4b07bc0896 100644
--- a/pkgs/development/libraries/ilbc/extract-cfile.awk
+++ b/nixpkgs/pkgs/development/libraries/ilbc/extract-cfile.awk
diff --git a/pkgs/development/libraries/ilixi/default.nix b/nixpkgs/pkgs/development/libraries/ilixi/default.nix
index bb6e23937c0..bb6e23937c0 100644
--- a/pkgs/development/libraries/ilixi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ilixi/default.nix
diff --git a/pkgs/development/libraries/ilmbase/bootstrap.patch b/nixpkgs/pkgs/development/libraries/ilmbase/bootstrap.patch
index db6af6daebd..db6af6daebd 100644
--- a/pkgs/development/libraries/ilmbase/bootstrap.patch
+++ b/nixpkgs/pkgs/development/libraries/ilmbase/bootstrap.patch
diff --git a/pkgs/development/libraries/ilmbase/cross.patch b/nixpkgs/pkgs/development/libraries/ilmbase/cross.patch
index 207a440a0d8..207a440a0d8 100644
--- a/pkgs/development/libraries/ilmbase/cross.patch
+++ b/nixpkgs/pkgs/development/libraries/ilmbase/cross.patch
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/nixpkgs/pkgs/development/libraries/ilmbase/default.nix
index 00cdda1e570..00cdda1e570 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ilmbase/default.nix
diff --git a/pkgs/development/libraries/iml/default.nix b/nixpkgs/pkgs/development/libraries/iml/default.nix
index 2b85f12115b..2b85f12115b 100644
--- a/pkgs/development/libraries/iml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/iml/default.nix
diff --git a/pkgs/development/libraries/imlib/default.nix b/nixpkgs/pkgs/development/libraries/imlib/default.nix
index e476bc22eca..e476bc22eca 100644
--- a/pkgs/development/libraries/imlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/imlib/default.nix
diff --git a/pkgs/development/libraries/imlib2/default.nix b/nixpkgs/pkgs/development/libraries/imlib2/default.nix
index 2576580908a..2576580908a 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/imlib2/default.nix
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/nixpkgs/pkgs/development/libraries/incrtcl/default.nix
index e7f575b04be..e7f575b04be 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/incrtcl/default.nix
diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix
index 16a21382d85..16a21382d85 100644
--- a/pkgs/development/libraries/indicator-application/gtk2.nix
+++ b/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix
diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/nixpkgs/pkgs/development/libraries/indicator-application/gtk3.nix
index 02357297635..02357297635 100644
--- a/pkgs/development/libraries/indicator-application/gtk3.nix
+++ b/nixpkgs/pkgs/development/libraries/indicator-application/gtk3.nix
diff --git a/pkgs/development/libraries/indilib/default.nix b/nixpkgs/pkgs/development/libraries/indilib/default.nix
index 5816f044f57..5816f044f57 100644
--- a/pkgs/development/libraries/indilib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/indilib/default.nix
diff --git a/pkgs/development/libraries/indilib/udev-dir.patch b/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch
index 0f497419e70..0f497419e70 100644
--- a/pkgs/development/libraries/indilib/udev-dir.patch
+++ b/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch
diff --git a/pkgs/development/libraries/iniparser/default.nix b/nixpkgs/pkgs/development/libraries/iniparser/default.nix
index 51c6728e8b0..51c6728e8b0 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/nixpkgs/pkgs/development/libraries/iniparser/default.nix
diff --git a/pkgs/development/libraries/iniparser/no-usr.patch b/nixpkgs/pkgs/development/libraries/iniparser/no-usr.patch
index a3c568cdde4..a3c568cdde4 100644
--- a/pkgs/development/libraries/iniparser/no-usr.patch
+++ b/nixpkgs/pkgs/development/libraries/iniparser/no-usr.patch
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
index 4637c8c950f..4637c8c950f 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix
index 176f2809304..176f2809304 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix
diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix
index 0ca31f551e8..0ca31f551e8 100644
--- a/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix
diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix
index 50ae63f2d0d..50ae63f2d0d 100644
--- a/pkgs/development/libraries/ip2location-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/nixpkgs/pkgs/development/libraries/irrlicht/default.nix
index 788772888c6..788772888c6 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/nixpkgs/pkgs/development/libraries/irrlicht/default.nix
diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/nixpkgs/pkgs/development/libraries/isl/0.11.1.nix
index 13c71dc8f70..13c71dc8f70 100644
--- a/pkgs/development/libraries/isl/0.11.1.nix
+++ b/nixpkgs/pkgs/development/libraries/isl/0.11.1.nix
diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/nixpkgs/pkgs/development/libraries/isl/0.14.1.nix
index 1ff4b7ec18a..1ff4b7ec18a 100644
--- a/pkgs/development/libraries/isl/0.14.1.nix
+++ b/nixpkgs/pkgs/development/libraries/isl/0.14.1.nix
diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/nixpkgs/pkgs/development/libraries/isl/0.17.1.nix
index 59d4d38ce57..59d4d38ce57 100644
--- a/pkgs/development/libraries/isl/0.17.1.nix
+++ b/nixpkgs/pkgs/development/libraries/isl/0.17.1.nix
diff --git a/pkgs/development/libraries/isl/0.20.0.nix b/nixpkgs/pkgs/development/libraries/isl/0.20.0.nix
index 72ef581725b..72ef581725b 100644
--- a/pkgs/development/libraries/isl/0.20.0.nix
+++ b/nixpkgs/pkgs/development/libraries/isl/0.20.0.nix
diff --git a/pkgs/development/libraries/isl/fix-gcc-build.diff b/nixpkgs/pkgs/development/libraries/isl/fix-gcc-build.diff
index 6fbd1f9d478..6fbd1f9d478 100644
--- a/pkgs/development/libraries/isl/fix-gcc-build.diff
+++ b/nixpkgs/pkgs/development/libraries/isl/fix-gcc-build.diff
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/nixpkgs/pkgs/development/libraries/iso-codes/default.nix
index 1766abb2aac..1766abb2aac 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/iso-codes/default.nix
diff --git a/pkgs/development/libraries/itk/4.x.nix b/nixpkgs/pkgs/development/libraries/itk/4.x.nix
index 7e24ba901e5..7e24ba901e5 100644
--- a/pkgs/development/libraries/itk/4.x.nix
+++ b/nixpkgs/pkgs/development/libraries/itk/4.x.nix
diff --git a/pkgs/development/libraries/itk/default.nix b/nixpkgs/pkgs/development/libraries/itk/default.nix
index 3577e7a8196..3577e7a8196 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/itk/default.nix
diff --git a/pkgs/development/libraries/jama/default.nix b/nixpkgs/pkgs/development/libraries/jama/default.nix
index 26ec06fad7b..26ec06fad7b 100644
--- a/pkgs/development/libraries/jama/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jama/default.nix
diff --git a/pkgs/development/libraries/jansson/default.nix b/nixpkgs/pkgs/development/libraries/jansson/default.nix
index 25b55f00311..25b55f00311 100644
--- a/pkgs/development/libraries/jansson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jansson/default.nix
diff --git a/pkgs/development/libraries/jasper/default.nix b/nixpkgs/pkgs/development/libraries/jasper/default.nix
index 093fd0c5f28..093fd0c5f28 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jasper/default.nix
diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix
index 4a2b030a3db..4a2b030a3db 100644
--- a/pkgs/development/libraries/java/commons/bcel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix
diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix
index e3c464482c7..e3c464482c7 100644
--- a/pkgs/development/libraries/java/commons/bsf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix
diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix
index d418145e1b5..d418145e1b5 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix
diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix
index 0aca6bf8baa..0aca6bf8baa 100644
--- a/pkgs/development/libraries/java/commons/fileupload/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix
diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix
index c545ad68e72..c545ad68e72 100644
--- a/pkgs/development/libraries/java/commons/io/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix
diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix
index 675265ed4e3..675265ed4e3 100644
--- a/pkgs/development/libraries/java/commons/lang/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix
diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix
index 4e3fa265502..4e3fa265502 100644
--- a/pkgs/development/libraries/java/commons/logging/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix
diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix
index 7c4fc5c632e..7c4fc5c632e 100644
--- a/pkgs/development/libraries/java/commons/math/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix
diff --git a/pkgs/development/libraries/java/cup/default.nix b/nixpkgs/pkgs/development/libraries/java/cup/default.nix
index e485eabe1cb..e485eabe1cb 100644
--- a/pkgs/development/libraries/java/cup/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/cup/default.nix
diff --git a/pkgs/development/libraries/java/cup/javacup-0.11b_beta20160615-build-xml-git.patch b/nixpkgs/pkgs/development/libraries/java/cup/javacup-0.11b_beta20160615-build-xml-git.patch
index f2054ee9d4d..f2054ee9d4d 100644
--- a/pkgs/development/libraries/java/cup/javacup-0.11b_beta20160615-build-xml-git.patch
+++ b/nixpkgs/pkgs/development/libraries/java/cup/javacup-0.11b_beta20160615-build-xml-git.patch
diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix
index 5ec10cc7e0d..5ec10cc7e0d 100644
--- a/pkgs/development/libraries/java/dbus-java/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix
diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix
index 6af8885464a..6af8885464a 100644
--- a/pkgs/development/libraries/java/geoipjava/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix
diff --git a/pkgs/development/libraries/java/gwt-dragdrop/builder.sh b/nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/builder.sh
index d37e110011e..d37e110011e 100644
--- a/pkgs/development/libraries/java/gwt-dragdrop/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/builder.sh
diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/default.nix
index e34699d7740..e34699d7740 100644
--- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/default.nix
diff --git a/pkgs/development/libraries/java/gwt-widgets/builder.sh b/nixpkgs/pkgs/development/libraries/java/gwt-widgets/builder.sh
index 8c2502385f2..8c2502385f2 100644
--- a/pkgs/development/libraries/java/gwt-widgets/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/java/gwt-widgets/builder.sh
diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/nixpkgs/pkgs/development/libraries/java/gwt-widgets/default.nix
index ec407076906..ec407076906 100644
--- a/pkgs/development/libraries/java/gwt-widgets/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/gwt-widgets/default.nix
diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix
index d9139ec1d82..d9139ec1d82 100644
--- a/pkgs/development/libraries/java/hsqldb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix
diff --git a/pkgs/development/libraries/java/httpunit/builder.sh b/nixpkgs/pkgs/development/libraries/java/httpunit/builder.sh
index 27385008295..27385008295 100755
--- a/pkgs/development/libraries/java/httpunit/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/java/httpunit/builder.sh
diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/nixpkgs/pkgs/development/libraries/java/httpunit/default.nix
index 500c575f73a..500c575f73a 100644
--- a/pkgs/development/libraries/java/httpunit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/httpunit/default.nix
diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix
index 1f2aeda80cf..1f2aeda80cf 100644
--- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix
diff --git a/pkgs/development/libraries/java/jdom/builder.sh b/nixpkgs/pkgs/development/libraries/java/jdom/builder.sh
index dbec4b6f3e0..dbec4b6f3e0 100755
--- a/pkgs/development/libraries/java/jdom/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/java/jdom/builder.sh
diff --git a/pkgs/development/libraries/java/jdom/default.nix b/nixpkgs/pkgs/development/libraries/java/jdom/default.nix
index 16755471acd..16755471acd 100644
--- a/pkgs/development/libraries/java/jdom/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/jdom/default.nix
diff --git a/pkgs/development/libraries/java/jflex/default.nix b/nixpkgs/pkgs/development/libraries/java/jflex/default.nix
index 744419dcd53..744419dcd53 100644
--- a/pkgs/development/libraries/java/jflex/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/jflex/default.nix
diff --git a/pkgs/development/libraries/java/junit/default.nix b/nixpkgs/pkgs/development/libraries/java/junit/default.nix
index 0879f0a6926..0879f0a6926 100644
--- a/pkgs/development/libraries/java/junit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/junit/default.nix
diff --git a/pkgs/development/libraries/java/junixsocket/darwin.patch b/nixpkgs/pkgs/development/libraries/java/junixsocket/darwin.patch
index 97fd42d0b81..97fd42d0b81 100644
--- a/pkgs/development/libraries/java/junixsocket/darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/java/junixsocket/darwin.patch
diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix
index bc34957b9c3..bc34957b9c3 100644
--- a/pkgs/development/libraries/java/junixsocket/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix
diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/nixpkgs/pkgs/development/libraries/java/jzmq/default.nix
index e25106e22c6..e25106e22c6 100644
--- a/pkgs/development/libraries/java/jzmq/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/jzmq/default.nix
diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/nixpkgs/pkgs/development/libraries/java/libmatthew-java/default.nix
index 98291a7763c..98291a7763c 100644
--- a/pkgs/development/libraries/java/libmatthew-java/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/libmatthew-java/default.nix
diff --git a/pkgs/development/libraries/java/lombok/default.nix b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix
index 09cec463141..09cec463141 100644
--- a/pkgs/development/libraries/java/lombok/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix
diff --git a/pkgs/development/libraries/java/lucene/builder.sh b/nixpkgs/pkgs/development/libraries/java/lucene/builder.sh
index d95feb5eeb4..d95feb5eeb4 100755
--- a/pkgs/development/libraries/java/lucene/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/java/lucene/builder.sh
diff --git a/pkgs/development/libraries/java/lucene/default.nix b/nixpkgs/pkgs/development/libraries/java/lucene/default.nix
index c0eabe51657..c0eabe51657 100644
--- a/pkgs/development/libraries/java/lucene/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/lucene/default.nix
diff --git a/pkgs/development/libraries/java/mockobjects/builder.sh b/nixpkgs/pkgs/development/libraries/java/mockobjects/builder.sh
index fd5d1a20869..fd5d1a20869 100755
--- a/pkgs/development/libraries/java/mockobjects/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/java/mockobjects/builder.sh
diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix
index ae93765ff98..ae93765ff98 100644
--- a/pkgs/development/libraries/java/mockobjects/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/nixpkgs/pkgs/development/libraries/java/rhino/default.nix
index 0fdce1bceed..0fdce1bceed 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/rhino/default.nix
diff --git a/pkgs/development/libraries/java/rhino/gcj-type-mismatch.patch b/nixpkgs/pkgs/development/libraries/java/rhino/gcj-type-mismatch.patch
index dac7b209069..dac7b209069 100644
--- a/pkgs/development/libraries/java/rhino/gcj-type-mismatch.patch
+++ b/nixpkgs/pkgs/development/libraries/java/rhino/gcj-type-mismatch.patch
diff --git a/pkgs/development/libraries/java/saxon/default.nix b/nixpkgs/pkgs/development/libraries/java/saxon/default.nix
index 687e1e8a1de..687e1e8a1de 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/saxon/default.nix
diff --git a/pkgs/development/libraries/java/smack/builder.sh b/nixpkgs/pkgs/development/libraries/java/smack/builder.sh
index c97259e6a17..c97259e6a17 100644
--- a/pkgs/development/libraries/java/smack/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/java/smack/builder.sh
diff --git a/pkgs/development/libraries/java/smack/default.nix b/nixpkgs/pkgs/development/libraries/java/smack/default.nix
index d5f8ac217f3..d5f8ac217f3 100644
--- a/pkgs/development/libraries/java/smack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/smack/default.nix
diff --git a/pkgs/development/libraries/java/swt/default.nix b/nixpkgs/pkgs/development/libraries/java/swt/default.nix
index b0fdca11218..b0fdca11218 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/java/swt/default.nix
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix
index 2dff3bafdd3..2dff3bafdd3 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix
diff --git a/pkgs/development/libraries/jbigkit/default.nix b/nixpkgs/pkgs/development/libraries/jbigkit/default.nix
index 2b2f75abfd1..2b2f75abfd1 100644
--- a/pkgs/development/libraries/jbigkit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jbigkit/default.nix
diff --git a/pkgs/development/libraries/jcal/default.nix b/nixpkgs/pkgs/development/libraries/jcal/default.nix
index dfb0003cc98..dfb0003cc98 100644
--- a/pkgs/development/libraries/jcal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jcal/default.nix
diff --git a/pkgs/development/libraries/jemalloc/common.nix b/nixpkgs/pkgs/development/libraries/jemalloc/common.nix
index 128910e00f2..128910e00f2 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/nixpkgs/pkgs/development/libraries/jemalloc/common.nix
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/nixpkgs/pkgs/development/libraries/jemalloc/default.nix
index 7ea7bccd6b8..7ea7bccd6b8 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jemalloc/default.nix
diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/nixpkgs/pkgs/development/libraries/jemalloc/jemalloc450.nix
index d328ab8016a..d328ab8016a 100644
--- a/pkgs/development/libraries/jemalloc/jemalloc450.nix
+++ b/nixpkgs/pkgs/development/libraries/jemalloc/jemalloc450.nix
diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix
index 6492077eee4..6492077eee4 100644
--- a/pkgs/development/libraries/jitterentropy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix
diff --git a/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch b/nixpkgs/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch
index 68de5a8ae78..68de5a8ae78 100644
--- a/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch
+++ b/nixpkgs/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch
diff --git a/pkgs/development/libraries/json-c/default.nix b/nixpkgs/pkgs/development/libraries/json-c/default.nix
index 27d1b701f05..27d1b701f05 100644
--- a/pkgs/development/libraries/json-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/json-c/default.nix
diff --git a/pkgs/development/libraries/json-glib/default.nix b/nixpkgs/pkgs/development/libraries/json-glib/default.nix
index 9a18b025fab..9a18b025fab 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/json-glib/default.nix
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix
index 7b06cc8ad4e..7b06cc8ad4e 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix
diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix
index b1249546721..b1249546721 100644
--- a/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix
diff --git a/pkgs/development/libraries/judy/default.nix b/nixpkgs/pkgs/development/libraries/judy/default.nix
index 01ba605b506..01ba605b506 100644
--- a/pkgs/development/libraries/judy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/judy/default.nix
diff --git a/pkgs/development/libraries/jxrlib/default.nix b/nixpkgs/pkgs/development/libraries/jxrlib/default.nix
index bc5be3172ec..bc5be3172ec 100644
--- a/pkgs/development/libraries/jxrlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jxrlib/default.nix
diff --git a/pkgs/development/libraries/kdb/default.nix b/nixpkgs/pkgs/development/libraries/kdb/default.nix
index 03eabc6447b..03eabc6447b 100644
--- a/pkgs/development/libraries/kdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kdb/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix
index 0766a589a2e..0766a589a2e 100644
--- a/pkgs/development/libraries/kde-frameworks/attica.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix
diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix
index d5da9f5af17..d5da9f5af17 100644
--- a/pkgs/development/libraries/kde-frameworks/baloo.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix
diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
index 9717e770ed5..9717e770ed5 100644
--- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
index d9192b94036..d9192b94036 100644
--- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix
index d18dea1c381..d18dea1c381 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
index 654eb94b51a..654eb94b51a 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
index f019e67d3f0..f019e67d3f0 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series
index b4569e50a5f..b4569e50a5f 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
index 4135f6bfd7a..4135f6bfd7a 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh
index c76ff9fb2c8..c76ff9fb2c8 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index 58b064806e5..58b064806e5 100644
--- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
index b558306248a..b558306248a 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kactivities.nix
index eabac6aadd7..eabac6aadd7 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kactivities.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix
index ca5e773a45b..ca5e773a45b 100644
--- a/pkgs/development/libraries/kde-frameworks/kapidox.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix
diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix
index 8c55f8da6a0..8c55f8da6a0 100644
--- a/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kauth/cmake-install-paths.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/cmake-install-paths.patch
index c66f5ecd008..c66f5ecd008 100644
--- a/pkgs/development/libraries/kde-frameworks/kauth/cmake-install-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix
index c94c8b91ecd..c94c8b91ecd 100644
--- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kauth/series b/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/series
index d2689425c38..d2689425c38 100644
--- a/pkgs/development/libraries/kde-frameworks/kauth/series
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/series
diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
index dc2339632e4..dc2339632e4 100644
--- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix
index e0b6c5313bb..e0b6c5313bb 100644
--- a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
index 0c661dcdd48..0c661dcdd48 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch
index 0411755f45a..0411755f45a 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
index cc041b9aa3b..cc041b9aa3b 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/series b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/series
index f2c22554a45..f2c22554a45 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/series
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/series
diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index 978db644a56..978db644a56 100644
--- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix
index fdfe28db6c0..fdfe28db6c0 100644
--- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix
index 2650843aa55..2650843aa55 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfig.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
index 3b6ea27d41e..3b6ea27d41e 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
index 3d7c7cdedef..3d7c7cdedef 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index d5a407ee16f..d5a407ee16f 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcrash.nix
index d45d73d33e4..d45d73d33e4 100644
--- a/pkgs/development/libraries/kde-frameworks/kcrash.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcrash.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
index c94167d5d76..c94167d5d76 100644
--- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
index 34e01b4c1b6..34e01b4c1b6 100644
--- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix
index 65377789582..65377789582 100644
--- a/pkgs/development/libraries/kde-frameworks/kded.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
index 7e3de9d4d14..7e3de9d4d14 100644
--- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch
index eabb7025448..eabb7025448 100644
--- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/series b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/series
index 9b08ab20877..9b08ab20877 100644
--- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/series
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/series
diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh
index 21ac2e83b5d..21ac2e83b5d 100644
--- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
index 8418863eabb..8418863eabb 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kdesu.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu.nix
index df60511b511..df60511b511 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesu.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
index 9f682b44975..9f682b44975 100644
--- a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix
index 9e2f827eff5..9e2f827eff5 100644
--- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index 68b5c08aa09..68b5c08aa09 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch
index 4e3a33efab3..4e3a33efab3 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh
index 2928d9b34db..2928d9b34db 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kemoticons.nix
index b7f4f036db5..b7f4f036db5 100644
--- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kemoticons.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch
index 732f7b69c82..732f7b69c82 100644
--- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
index c72cb5b71a4..c72cb5b71a4 100644
--- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/series b/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/series
index d2689425c38..d2689425c38 100644
--- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/series
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/series
diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index ca015151e0f..ca015151e0f 100644
--- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index 66cd8ddf64f..66cd8ddf64f 100644
--- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kholidays.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kholidays.nix
index 2ede69e7495..2ede69e7495 100644
--- a/pkgs/development/libraries/kde-frameworks/kholidays.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kholidays.nix
diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/khtml.nix
index 5bb3078ea86..5bb3078ea86 100644
--- a/pkgs/development/libraries/kde-frameworks/khtml.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/khtml.nix
diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix
index 69ad2fbc737..69ad2fbc737 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default-theme-breeze.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/default-theme-breeze.patch
index f7cb0ea3aac..f7cb0ea3aac 100644
--- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default-theme-breeze.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
index 8faac005f2a..8faac005f2a 100644
--- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/series b/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/series
index ab5cc8a3edb..ab5cc8a3edb 100644
--- a/pkgs/development/libraries/kde-frameworks/kiconthemes/series
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/series
diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix
index a1e53bb408b..a1e53bb408b 100644
--- a/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index 29748a5f7f4..29748a5f7f4 100644
--- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix
index 42a1e157a91..42a1e157a91 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
index 89145e3e1dd..89145e3e1dd 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
index b949723fb54..b949723fb54 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/series b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/series
index 9195a4e8e6b..9195a4e8e6b 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/series
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/series
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
index e3bfc2ebe6b..e3bfc2ebe6b 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix
index fee21a6a923..fee21a6a923 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch
index d26af49e5eb..d26af49e5eb 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
index 3e18d304c30..3e18d304c30 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kio/series b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/series
index 5330c40a330..5330c40a330 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/series
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/series
diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix
index f4fc40f6d31..f4fc40f6d31 100644
--- a/pkgs/development/libraries/kde-frameworks/kirigami2.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
index 91bc3e2b98d..91bc3e2b98d 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix
index 004d1ac77a6..004d1ac77a6 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
index 810e2bf8c84..810e2bf8c84 100644
--- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kjs.nix
index 311f07241d6..311f07241d6 100644
--- a/pkgs/development/libraries/kde-frameworks/kjs.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kjs.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kjsembed.nix
index e8cd5070ae5..e8cd5070ae5 100644
--- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kjsembed.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
index a4714c9e4ad..a4714c9e4ad 100644
--- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/knewstuff.nix
index df384648e6a..df384648e6a 100644
--- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/knewstuff.nix
diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifications.nix
index 964e1b44115..964e1b44115 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifications.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifications.nix
diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
index 6739f96183c..6739f96183c 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
index c1c9efde7f7..c1c9efde7f7 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index 6779faa50cd..6779faa50cd 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch
index cab334838ee..cab334838ee 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/series b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/series
index 9b7f076efc7..9b7f076efc7 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/series
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/series
diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kparts.nix
index f657569277a..f657569277a 100644
--- a/pkgs/development/libraries/kde-frameworks/kparts.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kparts.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpeople.nix
index 04181fd3e13..04181fd3e13 100644
--- a/pkgs/development/libraries/kde-frameworks/kpeople.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpeople.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix
index 1774b044b16..1774b044b16 100644
--- a/pkgs/development/libraries/kde-frameworks/kplotting.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpty.nix
index 150c5b3d2b2..150c5b3d2b2 100644
--- a/pkgs/development/libraries/kde-frameworks/kpty.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpty.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kross.nix
index f45fb5ecd1d..f45fb5ecd1d 100644
--- a/pkgs/development/libraries/kde-frameworks/kross.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kross.nix
diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix
index 826999f2f9b..826999f2f9b 100644
--- a/pkgs/development/libraries/kde-frameworks/krunner.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/default.nix
index 356e6537a4f..356e6537a4f 100644
--- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kservice/no-canonicalize-path.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/no-canonicalize-path.patch
index cf98ffb9067..cf98ffb9067 100644
--- a/pkgs/development/libraries/kde-frameworks/kservice/no-canonicalize-path.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/no-canonicalize-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch
index fdd8b4d81a1..fdd8b4d81a1 100644
--- a/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kservice/series b/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/series
index 3ce22dbd35a..3ce22dbd35a 100644
--- a/pkgs/development/libraries/kde-frameworks/kservice/series
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/series
diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index 98f9b3f82ca..98f9b3f82ca 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
index 604066b9639..604066b9639 100644
--- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
index d6c079fd83b..d6c079fd83b 100644
--- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwallet.nix
index fca0dedd083..fca0dedd083 100644
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwallet.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix
index c19836ed7a7..c19836ed7a7 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
index 63a95bc217c..63a95bc217c 100644
--- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index c075adf0294..c075adf0294 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
index 27501732210..27501732210 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/series b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/series
index 2cd02056ff8..2cd02056ff8 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/series
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/series
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
index 5adcf281e62..5adcf281e62 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
index acffde6a7cf..acffde6a7cf 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
index 195e90feef6..195e90feef6 100644
--- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
index 4ded321674f..4ded321674f 100644
--- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
index 2d795bfc50c..2d795bfc50c 100644
--- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index 44005ec7d28..44005ec7d28 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/prison.nix
index cf74ee20c2d..cf74ee20c2d 100644
--- a/pkgs/development/libraries/kde-frameworks/prison.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/prison.nix
diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix
index 1484b2d0489..1484b2d0489 100644
--- a/pkgs/development/libraries/kde-frameworks/purpose.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix
diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix
index d1beb03fa62..d1beb03fa62 100644
--- a/pkgs/development/libraries/kde-frameworks/solid.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix
diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix
index cccd9251358..cccd9251358 100644
--- a/pkgs/development/libraries/kde-frameworks/sonnet.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix
index 32edca38710..32edca38710 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix
diff --git a/pkgs/development/libraries/kde-frameworks/syndication.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/syndication.nix
index 71ee520995c..71ee520995c 100644
--- a/pkgs/development/libraries/kde-frameworks/syndication.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/syndication.nix
diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
index ceb8200d4c6..ceb8200d4c6 100644
--- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix
index b95f70dd674..b95f70dd674 100644
--- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix
diff --git a/pkgs/development/libraries/kdiagram/default.nix b/nixpkgs/pkgs/development/libraries/kdiagram/default.nix
index 50f3e6a6c02..50f3e6a6c02 100644
--- a/pkgs/development/libraries/kdiagram/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kdiagram/default.nix
diff --git a/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch b/nixpkgs/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch
index a0fa625538b..a0fa625538b 100644
--- a/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch
+++ b/nixpkgs/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix
index 2eb9262d189..2eb9262d189 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix
index 124c961b96a..124c961b96a 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix
diff --git a/pkgs/development/libraries/keybinder/default.nix b/nixpkgs/pkgs/development/libraries/keybinder/default.nix
index 0a130c017c0..0a130c017c0 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/nixpkgs/pkgs/development/libraries/keybinder/default.nix
diff --git a/pkgs/development/libraries/keybinder3/default.nix b/nixpkgs/pkgs/development/libraries/keybinder3/default.nix
index ed2dd341f45..ed2dd341f45 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/keybinder3/default.nix
diff --git a/pkgs/development/libraries/kf5gpgmepp/default.nix b/nixpkgs/pkgs/development/libraries/kf5gpgmepp/default.nix
index 32aa17e687e..32aa17e687e 100644
--- a/pkgs/development/libraries/kf5gpgmepp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kf5gpgmepp/default.nix
diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
index a57b103b0d9..a57b103b0d9 100644
--- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
+++ b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch
index 415a1b1dfe4..415a1b1dfe4 100644
--- a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch
+++ b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch
diff --git a/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch b/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch
index 49edbf63a54..49edbf63a54 100644
--- a/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch
+++ b/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch
diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/default.nix
index 21e3c4d3424..21e3c4d3424 100644
--- a/pkgs/development/libraries/kinetic-cpp-client/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/default.nix
diff --git a/pkgs/development/libraries/kmsxx/default.nix b/nixpkgs/pkgs/development/libraries/kmsxx/default.nix
index 70058db4c0a..70058db4c0a 100644
--- a/pkgs/development/libraries/kmsxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kmsxx/default.nix
diff --git a/pkgs/development/libraries/kpmcore/default.nix b/nixpkgs/pkgs/development/libraries/kpmcore/default.nix
index 52e6264843b..52e6264843b 100644
--- a/pkgs/development/libraries/kpmcore/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kpmcore/default.nix
diff --git a/pkgs/development/libraries/kproperty/default.nix b/nixpkgs/pkgs/development/libraries/kproperty/default.nix
index 991fd4d27a7..991fd4d27a7 100644
--- a/pkgs/development/libraries/kproperty/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kproperty/default.nix
diff --git a/pkgs/development/libraries/kreport/default.nix b/nixpkgs/pkgs/development/libraries/kreport/default.nix
index 46d55b1f550..46d55b1f550 100644
--- a/pkgs/development/libraries/kreport/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kreport/default.nix
diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix
index 897f33953af..897f33953af 100644
--- a/pkgs/development/libraries/kyotocabinet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix
diff --git a/pkgs/development/libraries/l-smash/default.nix b/nixpkgs/pkgs/development/libraries/l-smash/default.nix
index 374d9c398ef..374d9c398ef 100644
--- a/pkgs/development/libraries/l-smash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/l-smash/default.nix
diff --git a/pkgs/development/libraries/lame/default.nix b/nixpkgs/pkgs/development/libraries/lame/default.nix
index 933d51b9575..933d51b9575 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lame/default.nix
diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/nixpkgs/pkgs/development/libraries/languagemachines/frog.nix
index dcff8c2757e..dcff8c2757e 100644
--- a/pkgs/development/libraries/languagemachines/frog.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/frog.nix
diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/nixpkgs/pkgs/development/libraries/languagemachines/frogdata.nix
index 2c418c1bc5f..2c418c1bc5f 100644
--- a/pkgs/development/libraries/languagemachines/frogdata.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/frogdata.nix
diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix
index a00c3be4193..a00c3be4193 100644
--- a/pkgs/development/libraries/languagemachines/libfolia.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix
diff --git a/pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch b/nixpkgs/pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch
index 9037f1093bb..9037f1093bb 100644
--- a/pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch
diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/nixpkgs/pkgs/development/libraries/languagemachines/mbt.nix
index b99cb4f595a..b99cb4f595a 100644
--- a/pkgs/development/libraries/languagemachines/mbt.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/mbt.nix
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/nixpkgs/pkgs/development/libraries/languagemachines/packages.nix
index 8a490bbc986..8a490bbc986 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/packages.nix
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json
index 55c2ec20a31..55c2ec20a31 100644
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
index 6ea44938717..6ea44938717 100644
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json
index 792d958213f..792d958213f 100644
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json
index f1bbff47a28..f1bbff47a28 100644
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json
index 11069c6b02c..11069c6b02c 100644
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json
index d35f2c8333a..d35f2c8333a 100644
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json
index d588da3f8b6..d588da3f8b6 100644
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json
index 9b05cf3e139..9b05cf3e139 100644
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json
index 08069bb333b..08069bb333b 100644
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json
diff --git a/pkgs/development/libraries/languagemachines/test.nix b/nixpkgs/pkgs/development/libraries/languagemachines/test.nix
index 48c41ac52f2..48c41ac52f2 100644
--- a/pkgs/development/libraries/languagemachines/test.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/test.nix
diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/nixpkgs/pkgs/development/libraries/languagemachines/ticcutils.nix
index 779ec664996..779ec664996 100644
--- a/pkgs/development/libraries/languagemachines/ticcutils.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/ticcutils.nix
diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix
index c6c216f5abf..c6c216f5abf 100644
--- a/pkgs/development/libraries/languagemachines/timbl.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix
diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/nixpkgs/pkgs/development/libraries/languagemachines/timblserver.nix
index aeadb075953..aeadb075953 100644
--- a/pkgs/development/libraries/languagemachines/timblserver.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/timblserver.nix
diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix
index ab047d0516e..ab047d0516e 100644
--- a/pkgs/development/libraries/languagemachines/ucto.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix
diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/nixpkgs/pkgs/development/libraries/languagemachines/uctodata.nix
index 01a78b5b4be..01a78b5b4be 100644
--- a/pkgs/development/libraries/languagemachines/uctodata.nix
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/uctodata.nix
diff --git a/pkgs/development/libraries/languagemachines/update b/nixpkgs/pkgs/development/libraries/languagemachines/update
index 3189637df74..3189637df74 100755
--- a/pkgs/development/libraries/languagemachines/update
+++ b/nixpkgs/pkgs/development/libraries/languagemachines/update
diff --git a/pkgs/development/libraries/lasem/default.nix b/nixpkgs/pkgs/development/libraries/lasem/default.nix
index 5e00ce1037f..5e00ce1037f 100644
--- a/pkgs/development/libraries/lasem/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lasem/default.nix
diff --git a/pkgs/development/libraries/lasso/default.nix b/nixpkgs/pkgs/development/libraries/lasso/default.nix
index f401f231de2..f401f231de2 100644
--- a/pkgs/development/libraries/lasso/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lasso/default.nix
diff --git a/pkgs/development/libraries/lcms/cve-2013-4276.patch b/nixpkgs/pkgs/development/libraries/lcms/cve-2013-4276.patch
index 8f2f3229782..8f2f3229782 100644
--- a/pkgs/development/libraries/lcms/cve-2013-4276.patch
+++ b/nixpkgs/pkgs/development/libraries/lcms/cve-2013-4276.patch
diff --git a/pkgs/development/libraries/lcms/default.nix b/nixpkgs/pkgs/development/libraries/lcms/default.nix
index 63c81822ddf..63c81822ddf 100644
--- a/pkgs/development/libraries/lcms/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lcms/default.nix
diff --git a/pkgs/development/libraries/lcms2/default.nix b/nixpkgs/pkgs/development/libraries/lcms2/default.nix
index 5d307dcfa7a..5d307dcfa7a 100644
--- a/pkgs/development/libraries/lcms2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lcms2/default.nix
diff --git a/pkgs/development/libraries/ldacbt/default.nix b/nixpkgs/pkgs/development/libraries/ldacbt/default.nix
index ae8fc1e22db..ae8fc1e22db 100644
--- a/pkgs/development/libraries/ldacbt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ldacbt/default.nix
diff --git a/pkgs/development/libraries/ldb/default.nix b/nixpkgs/pkgs/development/libraries/ldb/default.nix
index 12f7b176bb7..12f7b176bb7 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ldb/default.nix
diff --git a/pkgs/development/libraries/ldns/default.nix b/nixpkgs/pkgs/development/libraries/ldns/default.nix
index 74ac59fef28..74ac59fef28 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ldns/default.nix
diff --git a/pkgs/development/libraries/leatherman/default.nix b/nixpkgs/pkgs/development/libraries/leatherman/default.nix
index 48735c13ed1..48735c13ed1 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/nixpkgs/pkgs/development/libraries/leatherman/default.nix
diff --git a/pkgs/development/libraries/lensfun/default.nix b/nixpkgs/pkgs/development/libraries/lensfun/default.nix
index 6137638222e..6137638222e 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lensfun/default.nix
diff --git a/pkgs/development/libraries/leptonica/default.nix b/nixpkgs/pkgs/development/libraries/leptonica/default.nix
index 6d73b00a6d1..6d73b00a6d1 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/nixpkgs/pkgs/development/libraries/leptonica/default.nix
diff --git a/pkgs/development/libraries/lesstif/c-missing_xm_h.patch b/nixpkgs/pkgs/development/libraries/lesstif/c-missing_xm_h.patch
index 2d298d5f4c4..2d298d5f4c4 100644
--- a/pkgs/development/libraries/lesstif/c-missing_xm_h.patch
+++ b/nixpkgs/pkgs/development/libraries/lesstif/c-missing_xm_h.patch
diff --git a/pkgs/development/libraries/lesstif/c-render_table_crash.patch b/nixpkgs/pkgs/development/libraries/lesstif/c-render_table_crash.patch
index 1699dbe1908..1699dbe1908 100644
--- a/pkgs/development/libraries/lesstif/c-render_table_crash.patch
+++ b/nixpkgs/pkgs/development/libraries/lesstif/c-render_table_crash.patch
diff --git a/pkgs/development/libraries/lesstif/c-xpmpipethrough.patch b/nixpkgs/pkgs/development/libraries/lesstif/c-xpmpipethrough.patch
index 69f9a2464c6..69f9a2464c6 100644
--- a/pkgs/development/libraries/lesstif/c-xpmpipethrough.patch
+++ b/nixpkgs/pkgs/development/libraries/lesstif/c-xpmpipethrough.patch
diff --git a/pkgs/development/libraries/lesstif/default.nix b/nixpkgs/pkgs/development/libraries/lesstif/default.nix
index b678a089386..b678a089386 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lesstif/default.nix
diff --git a/pkgs/development/libraries/leveldb/default.nix b/nixpkgs/pkgs/development/libraries/leveldb/default.nix
index 17a754a027a..17a754a027a 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/leveldb/default.nix
diff --git a/pkgs/development/libraries/levmar/default.nix b/nixpkgs/pkgs/development/libraries/levmar/default.nix
index 9a933b176d3..9a933b176d3 100644
--- a/pkgs/development/libraries/levmar/default.nix
+++ b/nixpkgs/pkgs/development/libraries/levmar/default.nix
diff --git a/pkgs/development/libraries/lib3ds/default.nix b/nixpkgs/pkgs/development/libraries/lib3ds/default.nix
index 32fecd3d99c..32fecd3d99c 100644
--- a/pkgs/development/libraries/lib3ds/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lib3ds/default.nix
diff --git a/pkgs/development/libraries/lib3mf/default.nix b/nixpkgs/pkgs/development/libraries/lib3mf/default.nix
index 5d1894da579..5d1894da579 100644
--- a/pkgs/development/libraries/lib3mf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lib3mf/default.nix
diff --git a/pkgs/development/libraries/libHX/default.nix b/nixpkgs/pkgs/development/libraries/libHX/default.nix
index 39f493d821c..39f493d821c 100644
--- a/pkgs/development/libraries/libHX/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libHX/default.nix
diff --git a/pkgs/development/libraries/libLAS/default.nix b/nixpkgs/pkgs/development/libraries/libLAS/default.nix
index 15ef9ee890a..15ef9ee890a 100644
--- a/pkgs/development/libraries/libLAS/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libLAS/default.nix
diff --git a/pkgs/development/libraries/libaacs/default.nix b/nixpkgs/pkgs/development/libraries/libaacs/default.nix
index bda7d560fcd..bda7d560fcd 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaacs/default.nix
diff --git a/pkgs/development/libraries/libaal/default.nix b/nixpkgs/pkgs/development/libraries/libaal/default.nix
index 87eeac4b4f5..87eeac4b4f5 100644
--- a/pkgs/development/libraries/libaal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaal/default.nix
diff --git a/pkgs/development/libraries/libaal/libaal-1.0.6-glibc-2.26.patch b/nixpkgs/pkgs/development/libraries/libaal/libaal-1.0.6-glibc-2.26.patch
index 6d49682f03a..6d49682f03a 100644
--- a/pkgs/development/libraries/libaal/libaal-1.0.6-glibc-2.26.patch
+++ b/nixpkgs/pkgs/development/libraries/libaal/libaal-1.0.6-glibc-2.26.patch
diff --git a/pkgs/development/libraries/libabigail/default.nix b/nixpkgs/pkgs/development/libraries/libabigail/default.nix
index dc19adfb6a6..dc19adfb6a6 100644
--- a/pkgs/development/libraries/libabigail/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libabigail/default.nix
diff --git a/pkgs/development/libraries/libabw/default.nix b/nixpkgs/pkgs/development/libraries/libabw/default.nix
index a37d4756cbd..a37d4756cbd 100644
--- a/pkgs/development/libraries/libabw/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libabw/default.nix
diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix
index 07e0a3500a7..07e0a3500a7 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix
diff --git a/pkgs/development/libraries/libaccounts-glib/py-override.patch b/nixpkgs/pkgs/development/libraries/libaccounts-glib/py-override.patch
index 4179f4fa0af..4179f4fa0af 100644
--- a/pkgs/development/libraries/libaccounts-glib/py-override.patch
+++ b/nixpkgs/pkgs/development/libraries/libaccounts-glib/py-override.patch
diff --git a/pkgs/development/libraries/libagar/default.nix b/nixpkgs/pkgs/development/libraries/libagar/default.nix
index c0a43efc27e..c0a43efc27e 100644
--- a/pkgs/development/libraries/libagar/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libagar/default.nix
diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix
index 4295971d5a0..4295971d5a0 100644
--- a/pkgs/development/libraries/libagar/libagar_test.nix
+++ b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix
diff --git a/pkgs/development/libraries/libagar/srcs.nix b/nixpkgs/pkgs/development/libraries/libagar/srcs.nix
index 53c6a5b89da..53c6a5b89da 100644
--- a/pkgs/development/libraries/libagar/srcs.nix
+++ b/nixpkgs/pkgs/development/libraries/libagar/srcs.nix
diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix
index 315d3f49956..315d3f49956 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix
diff --git a/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch b/nixpkgs/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch
index 9f8d700929b..9f8d700929b 100644
--- a/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch
diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix
index 28f0ca2905c..28f0ca2905c 100644
--- a/pkgs/development/libraries/libantlr3c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix
diff --git a/pkgs/development/libraries/libao/default.nix b/nixpkgs/pkgs/development/libraries/libao/default.nix
index 2d7edee4041..2d7edee4041 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libao/default.nix
diff --git a/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix
index 2d9a9f18fa2..2d9a9f18fa2 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix
diff --git a/pkgs/development/libraries/libaosd/default.nix b/nixpkgs/pkgs/development/libraries/libaosd/default.nix
index 6cf395d7e74..6cf395d7e74 100644
--- a/pkgs/development/libraries/libaosd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaosd/default.nix
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/nixpkgs/pkgs/development/libraries/libappindicator/default.nix
index e9fccaf28ab..e9fccaf28ab 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libappindicator/default.nix
diff --git a/pkgs/development/libraries/libarchive/default.nix b/nixpkgs/pkgs/development/libraries/libarchive/default.nix
index 04b4e409b9b..04b4e409b9b 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libarchive/default.nix
diff --git a/pkgs/development/libraries/libargon2/default.nix b/nixpkgs/pkgs/development/libraries/libargon2/default.nix
index 9bf05a679cc..9bf05a679cc 100644
--- a/pkgs/development/libraries/libargon2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libargon2/default.nix
diff --git a/pkgs/development/libraries/libasr/default.nix b/nixpkgs/pkgs/development/libraries/libasr/default.nix
index 40158898f3d..40158898f3d 100644
--- a/pkgs/development/libraries/libasr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libasr/default.nix
diff --git a/pkgs/development/libraries/libass/default.nix b/nixpkgs/pkgs/development/libraries/libass/default.nix
index 41406ce18ea..41406ce18ea 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libass/default.nix
diff --git a/pkgs/development/libraries/libassuan/default.nix b/nixpkgs/pkgs/development/libraries/libassuan/default.nix
index d55c3816868..d55c3816868 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libassuan/default.nix
diff --git a/pkgs/development/libraries/libast/default.nix b/nixpkgs/pkgs/development/libraries/libast/default.nix
index 348cfa9ed5b..348cfa9ed5b 100644
--- a/pkgs/development/libraries/libast/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libast/default.nix
diff --git a/pkgs/development/libraries/libasyncns/default.nix b/nixpkgs/pkgs/development/libraries/libasyncns/default.nix
index f7805c9f375..f7805c9f375 100644
--- a/pkgs/development/libraries/libasyncns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libasyncns/default.nix
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix
index b576896876e..b576896876e 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix
diff --git a/pkgs/development/libraries/libaudclient/default.nix b/nixpkgs/pkgs/development/libraries/libaudclient/default.nix
index eebe667badb..eebe667badb 100644
--- a/pkgs/development/libraries/libaudclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libaudclient/default.nix
diff --git a/pkgs/development/libraries/libav/default.nix b/nixpkgs/pkgs/development/libraries/libav/default.nix
index 43cfe2ef251..43cfe2ef251 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libav/default.nix
diff --git a/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch b/nixpkgs/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch
index 456828c025e..456828c025e 100644
--- a/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch
+++ b/nixpkgs/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/nixpkgs/pkgs/development/libraries/libavc1394/default.nix
index 726e9573d37..726e9573d37 100644
--- a/pkgs/development/libraries/libavc1394/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libavc1394/default.nix
diff --git a/pkgs/development/libraries/libb2/default.nix b/nixpkgs/pkgs/development/libraries/libb2/default.nix
index d39c12d58d5..d39c12d58d5 100644
--- a/pkgs/development/libraries/libb2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libb2/default.nix
diff --git a/pkgs/development/libraries/libb64/default.nix b/nixpkgs/pkgs/development/libraries/libb64/default.nix
index 3c9a9768427..3c9a9768427 100644
--- a/pkgs/development/libraries/libb64/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libb64/default.nix
diff --git a/pkgs/development/libraries/libbap/default.nix b/nixpkgs/pkgs/development/libraries/libbap/default.nix
index 9aedde923f0..9aedde923f0 100644
--- a/pkgs/development/libraries/libbap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbap/default.nix
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/nixpkgs/pkgs/development/libraries/libbdplus/default.nix
index 3af98a578f2..3af98a578f2 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbdplus/default.nix
diff --git a/pkgs/development/libraries/libbfd/default.nix b/nixpkgs/pkgs/development/libraries/libbfd/default.nix
index 15561677ad5..15561677ad5 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbfd/default.nix
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix
index 043f3500b0c..043f3500b0c 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix
index 4982157c3ba..4982157c3ba 100644
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix
diff --git a/pkgs/development/libraries/libblockdev/fix-paths.patch b/nixpkgs/pkgs/development/libraries/libblockdev/fix-paths.patch
index 85822165d8c..85822165d8c 100644
--- a/pkgs/development/libraries/libblockdev/fix-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/libblockdev/fix-paths.patch
diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix
index 7863e596e1b..7863e596e1b 100644
--- a/pkgs/development/libraries/libblocksruntime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix
diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix
index d9639cf5c14..d9639cf5c14 100644
--- a/pkgs/development/libraries/libbluedevil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix
diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
index 8d9c5d0fbba..8d9c5d0fbba 100644
--- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
+++ b/nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
diff --git a/pkgs/development/libraries/libbluray/default.nix b/nixpkgs/pkgs/development/libraries/libbluray/default.nix
index daa349ca630..daa349ca630 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbluray/default.nix
diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch
index 340eb47a630..340eb47a630 100644
--- a/pkgs/development/libraries/libbsd/darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch
diff --git a/pkgs/development/libraries/libbsd/default.nix b/nixpkgs/pkgs/development/libraries/libbsd/default.nix
index e251295a4c7..e251295a4c7 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbsd/default.nix
diff --git a/pkgs/development/libraries/libbson/default.nix b/nixpkgs/pkgs/development/libraries/libbson/default.nix
index 5bd6b11ac7a..5bd6b11ac7a 100644
--- a/pkgs/development/libraries/libbson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbson/default.nix
diff --git a/pkgs/development/libraries/libburn/default.nix b/nixpkgs/pkgs/development/libraries/libburn/default.nix
index b6cadf9df18..b6cadf9df18 100644
--- a/pkgs/development/libraries/libburn/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libburn/default.nix
diff --git a/pkgs/development/libraries/libbytesize/default.nix b/nixpkgs/pkgs/development/libraries/libbytesize/default.nix
index 4fea84723f9..4fea84723f9 100644
--- a/pkgs/development/libraries/libbytesize/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbytesize/default.nix
diff --git a/pkgs/development/libraries/libcaca/default.nix b/nixpkgs/pkgs/development/libraries/libcaca/default.nix
index 7773fe46c0c..7773fe46c0c 100644
--- a/pkgs/development/libraries/libcaca/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcaca/default.nix
diff --git a/pkgs/development/libraries/libcacard/default.nix b/nixpkgs/pkgs/development/libraries/libcacard/default.nix
index 2e134c5bb63..2e134c5bb63 100644
--- a/pkgs/development/libraries/libcacard/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcacard/default.nix
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/nixpkgs/pkgs/development/libraries/libcanberra/default.nix
index 6d76c941114..6d76c941114 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcanberra/default.nix
diff --git a/pkgs/development/libraries/libcangjie/default.nix b/nixpkgs/pkgs/development/libraries/libcangjie/default.nix
index 42a49713a0b..42a49713a0b 100644
--- a/pkgs/development/libraries/libcangjie/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcangjie/default.nix
diff --git a/pkgs/development/libraries/libcbor/default.nix b/nixpkgs/pkgs/development/libraries/libcbor/default.nix
index 4949d657669..4949d657669 100644
--- a/pkgs/development/libraries/libcbor/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcbor/default.nix
diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/nixpkgs/pkgs/development/libraries/libcdaudio/default.nix
index df7e93de063..df7e93de063 100644
--- a/pkgs/development/libraries/libcdaudio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcdaudio/default.nix
diff --git a/pkgs/development/libraries/libcddb/default.nix b/nixpkgs/pkgs/development/libraries/libcddb/default.nix
index 591369df83f..591369df83f 100644
--- a/pkgs/development/libraries/libcddb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcddb/default.nix
diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix
index 48e632ba52d..48e632ba52d 100644
--- a/pkgs/development/libraries/libcdio-paranoia/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix
diff --git a/pkgs/development/libraries/libcdio/default.nix b/nixpkgs/pkgs/development/libraries/libcdio/default.nix
index 9c3132a3e63..9c3132a3e63 100644
--- a/pkgs/development/libraries/libcdio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcdio/default.nix
diff --git a/pkgs/development/libraries/libcdr/default.nix b/nixpkgs/pkgs/development/libraries/libcdr/default.nix
index f7276d39b14..f7276d39b14 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcdr/default.nix
diff --git a/pkgs/development/libraries/libcec/default.nix b/nixpkgs/pkgs/development/libraries/libcec/default.nix
index 070cb58149c..070cb58149c 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcec/default.nix
diff --git a/pkgs/development/libraries/libcec/platform.nix b/nixpkgs/pkgs/development/libraries/libcec/platform.nix
index e43cfb10a37..e43cfb10a37 100644
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/nixpkgs/pkgs/development/libraries/libcec/platform.nix
diff --git a/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix
index 03cc3b2beb4..03cc3b2beb4 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcef/default.nix
diff --git a/pkgs/development/libraries/libcello/default.nix b/nixpkgs/pkgs/development/libraries/libcello/default.nix
index 96c3db6ae43..96c3db6ae43 100644
--- a/pkgs/development/libraries/libcello/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcello/default.nix
diff --git a/pkgs/development/libraries/libcerf/default.nix b/nixpkgs/pkgs/development/libraries/libcerf/default.nix
index 0ffb2085967..0ffb2085967 100644
--- a/pkgs/development/libraries/libcerf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcerf/default.nix
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/nixpkgs/pkgs/development/libraries/libchamplain/default.nix
index 48446d87b8d..48446d87b8d 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libchamplain/default.nix
diff --git a/pkgs/development/libraries/libchardet/default.nix b/nixpkgs/pkgs/development/libraries/libchardet/default.nix
index 11617a0107c..11617a0107c 100644
--- a/pkgs/development/libraries/libchardet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libchardet/default.nix
diff --git a/pkgs/development/libraries/libchewing/default.nix b/nixpkgs/pkgs/development/libraries/libchewing/default.nix
index 3c234d780ef..3c234d780ef 100644
--- a/pkgs/development/libraries/libchewing/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libchewing/default.nix
diff --git a/pkgs/development/libraries/libchop/default.nix b/nixpkgs/pkgs/development/libraries/libchop/default.nix
index c802bd68ab0..c802bd68ab0 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libchop/default.nix
diff --git a/pkgs/development/libraries/libchop/gets-undeclared.patch b/nixpkgs/pkgs/development/libraries/libchop/gets-undeclared.patch
index b6cdc77caa8..b6cdc77caa8 100644
--- a/pkgs/development/libraries/libchop/gets-undeclared.patch
+++ b/nixpkgs/pkgs/development/libraries/libchop/gets-undeclared.patch
diff --git a/pkgs/development/libraries/libchop/size_t.patch b/nixpkgs/pkgs/development/libraries/libchop/size_t.patch
index 82b6cb995ef..82b6cb995ef 100644
--- a/pkgs/development/libraries/libchop/size_t.patch
+++ b/nixpkgs/pkgs/development/libraries/libchop/size_t.patch
diff --git a/pkgs/development/libraries/libck/default.nix b/nixpkgs/pkgs/development/libraries/libck/default.nix
index 934a250ac7c..934a250ac7c 100644
--- a/pkgs/development/libraries/libck/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libck/default.nix
diff --git a/pkgs/development/libraries/libclc/default.nix b/nixpkgs/pkgs/development/libraries/libclc/default.nix
index 119adcb4ef2..119adcb4ef2 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libclc/default.nix
diff --git a/pkgs/development/libraries/libcli/default.nix b/nixpkgs/pkgs/development/libraries/libcli/default.nix
index d896cf63733..d896cf63733 100644
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcli/default.nix
diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix
index 2814d6c5c1e..2814d6c5c1e 100644
--- a/pkgs/development/libraries/libcloudproviders/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/nixpkgs/pkgs/development/libraries/libclthreads/default.nix
index 325afc56ae7..325afc56ae7 100644
--- a/pkgs/development/libraries/libclthreads/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libclthreads/default.nix
diff --git a/pkgs/development/libraries/libclxclient/default.nix b/nixpkgs/pkgs/development/libraries/libclxclient/default.nix
index d6e2ad398d7..d6e2ad398d7 100644
--- a/pkgs/development/libraries/libclxclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libclxclient/default.nix
diff --git a/pkgs/development/libraries/libcmis/default.nix b/nixpkgs/pkgs/development/libraries/libcmis/default.nix
index 53474190ce9..53474190ce9 100644
--- a/pkgs/development/libraries/libcmis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcmis/default.nix
diff --git a/pkgs/development/libraries/libco-canonical/default.nix b/nixpkgs/pkgs/development/libraries/libco-canonical/default.nix
index 56974fcca7b..56974fcca7b 100644
--- a/pkgs/development/libraries/libco-canonical/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libco-canonical/default.nix
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix
index 0f1cbeb2f96..0f1cbeb2f96 100644
--- a/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/nixpkgs/pkgs/development/libraries/libcommuni/default.nix
index 8eb7ff303de..8eb7ff303de 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcommuni/default.nix
diff --git a/pkgs/development/libraries/libconfig/default.nix b/nixpkgs/pkgs/development/libraries/libconfig/default.nix
index cdc225c8bf7..cdc225c8bf7 100644
--- a/pkgs/development/libraries/libconfig/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libconfig/default.nix
diff --git a/pkgs/development/libraries/libconfuse/default.nix b/nixpkgs/pkgs/development/libraries/libconfuse/default.nix
index cfef09c480a..cfef09c480a 100644
--- a/pkgs/development/libraries/libconfuse/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libconfuse/default.nix
diff --git a/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch b/nixpkgs/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch
index 1c57757f855..1c57757f855 100644
--- a/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch
+++ b/nixpkgs/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix
index 53ec231dec9..53ec231dec9 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix
diff --git a/pkgs/development/libraries/libcrafter/default.nix b/nixpkgs/pkgs/development/libraries/libcrafter/default.nix
index ba9a6325b07..ba9a6325b07 100644
--- a/pkgs/development/libraries/libcrafter/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcrafter/default.nix
diff --git a/pkgs/development/libraries/libcredis/default.nix b/nixpkgs/pkgs/development/libraries/libcredis/default.nix
index bfc7fe1d949..bfc7fe1d949 100644
--- a/pkgs/development/libraries/libcredis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcredis/default.nix
diff --git a/pkgs/development/libraries/libcroco/default.nix b/nixpkgs/pkgs/development/libraries/libcroco/default.nix
index 90ed8c6d985..90ed8c6d985 100644
--- a/pkgs/development/libraries/libcroco/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcroco/default.nix
diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/nixpkgs/pkgs/development/libraries/libcrossguid/default.nix
index e5c09675c4b..e5c09675c4b 100644
--- a/pkgs/development/libraries/libcrossguid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcrossguid/default.nix
diff --git a/pkgs/development/libraries/libcryptui/default.nix b/nixpkgs/pkgs/development/libraries/libcryptui/default.nix
index fef8e7f510d..fef8e7f510d 100644
--- a/pkgs/development/libraries/libcryptui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcryptui/default.nix
diff --git a/pkgs/development/libraries/libcsptr/default.nix b/nixpkgs/pkgs/development/libraries/libcsptr/default.nix
index 4bf26bde228..4bf26bde228 100644
--- a/pkgs/development/libraries/libcsptr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcsptr/default.nix
diff --git a/pkgs/development/libraries/libctb/default.nix b/nixpkgs/pkgs/development/libraries/libctb/default.nix
index 161c7c98c63..161c7c98c63 100644
--- a/pkgs/development/libraries/libctb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libctb/default.nix
diff --git a/pkgs/development/libraries/libctb/include-kbhit.patch b/nixpkgs/pkgs/development/libraries/libctb/include-kbhit.patch
index 76b4e38fadb..76b4e38fadb 100644
--- a/pkgs/development/libraries/libctb/include-kbhit.patch
+++ b/nixpkgs/pkgs/development/libraries/libctb/include-kbhit.patch
diff --git a/pkgs/development/libraries/libctemplate/default.nix b/nixpkgs/pkgs/development/libraries/libctemplate/default.nix
index f4e2e621c28..f4e2e621c28 100644
--- a/pkgs/development/libraries/libctemplate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libctemplate/default.nix
diff --git a/pkgs/development/libraries/libcue/default.nix b/nixpkgs/pkgs/development/libraries/libcue/default.nix
index 8ebab123524..8ebab123524 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcue/default.nix
diff --git a/pkgs/development/libraries/libcutl/default.nix b/nixpkgs/pkgs/development/libraries/libcutl/default.nix
index b13805aa37a..b13805aa37a 100644
--- a/pkgs/development/libraries/libcutl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcutl/default.nix
diff --git a/pkgs/development/libraries/libdaemon/default.nix b/nixpkgs/pkgs/development/libraries/libdaemon/default.nix
index 5dc153dd5cc..5dc153dd5cc 100644
--- a/pkgs/development/libraries/libdaemon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdaemon/default.nix
diff --git a/pkgs/development/libraries/libdaemon/fix-includes.patch b/nixpkgs/pkgs/development/libraries/libdaemon/fix-includes.patch
index 51c5133afed..51c5133afed 100644
--- a/pkgs/development/libraries/libdaemon/fix-includes.patch
+++ b/nixpkgs/pkgs/development/libraries/libdaemon/fix-includes.patch
diff --git a/pkgs/development/libraries/libdap/default.nix b/nixpkgs/pkgs/development/libraries/libdap/default.nix
index df2e4c367bf..df2e4c367bf 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdap/default.nix
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix
index 173ad6d2e85..173ad6d2e85 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix
index 52b8a32fab4..52b8a32fab4 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix
diff --git a/pkgs/development/libraries/libdbi/default.nix b/nixpkgs/pkgs/development/libraries/libdbi/default.nix
index b242bd8613e..b242bd8613e 100644
--- a/pkgs/development/libraries/libdbi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdbi/default.nix
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 6b4be0db414..6b4be0db414 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index 279dcb6bc83..279dcb6bc83 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix
index 770e95472ea..770e95472ea 100644
--- a/pkgs/development/libraries/libdbusmenu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix
diff --git a/pkgs/development/libraries/libdc1394/default.nix b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix
index 0f2ba019d3f..0f2ba019d3f 100644
--- a/pkgs/development/libraries/libdc1394/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix
diff --git a/pkgs/development/libraries/libde265/default.nix b/nixpkgs/pkgs/development/libraries/libde265/default.nix
index 918f7675389..918f7675389 100644
--- a/pkgs/development/libraries/libde265/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libde265/default.nix
diff --git a/pkgs/development/libraries/libdeflate/default.nix b/nixpkgs/pkgs/development/libraries/libdeflate/default.nix
index cc06815bbff..cc06815bbff 100644
--- a/pkgs/development/libraries/libdeflate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdeflate/default.nix
diff --git a/pkgs/development/libraries/libdevil/default.nix b/nixpkgs/pkgs/development/libraries/libdevil/default.nix
index afbff3dc0cf..afbff3dc0cf 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdevil/default.nix
diff --git a/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch b/nixpkgs/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch
index 5fc53c2dc6a..5fc53c2dc6a 100644
--- a/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch
+++ b/nixpkgs/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch
diff --git a/pkgs/development/libraries/libdevil/il_endian.h.patch b/nixpkgs/pkgs/development/libraries/libdevil/il_endian.h.patch
index c220e6802fd..c220e6802fd 100644
--- a/pkgs/development/libraries/libdevil/il_endian.h.patch
+++ b/nixpkgs/pkgs/development/libraries/libdevil/il_endian.h.patch
diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix
index 06ba10904a7..06ba10904a7 100644
--- a/pkgs/development/libraries/libdigidoc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix
index c4a351739b6..c4a351739b6 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix
diff --git a/pkgs/development/libraries/libdiscid/default.nix b/nixpkgs/pkgs/development/libraries/libdiscid/default.nix
index d7d88b38386..d7d88b38386 100644
--- a/pkgs/development/libraries/libdiscid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdiscid/default.nix
diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix
index 5598e6b2fa7..5598e6b2fa7 100644
--- a/pkgs/development/libraries/libdivecomputer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix
diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/nixpkgs/pkgs/development/libraries/libdivsufsort/default.nix
index 01ac56e885d..01ac56e885d 100644
--- a/pkgs/development/libraries/libdivsufsort/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdivsufsort/default.nix
diff --git a/pkgs/development/libraries/libdmtx/default.nix b/nixpkgs/pkgs/development/libraries/libdmtx/default.nix
index f5248dfc79e..f5248dfc79e 100644
--- a/pkgs/development/libraries/libdmtx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdmtx/default.nix
diff --git a/pkgs/development/libraries/libdnet/default.nix b/nixpkgs/pkgs/development/libraries/libdnet/default.nix
index 46e264b59ca..46e264b59ca 100644
--- a/pkgs/development/libraries/libdnet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdnet/default.nix
diff --git a/pkgs/development/libraries/libdrm/cross-build-nm-path.patch b/nixpkgs/pkgs/development/libraries/libdrm/cross-build-nm-path.patch
index 478534e65e5..478534e65e5 100644
--- a/pkgs/development/libraries/libdrm/cross-build-nm-path.patch
+++ b/nixpkgs/pkgs/development/libraries/libdrm/cross-build-nm-path.patch
diff --git a/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix
index 61ca98e2256..61ca98e2256 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix
diff --git a/pkgs/development/libraries/libdv/default.nix b/nixpkgs/pkgs/development/libraries/libdv/default.nix
index a5058de597e..a5058de597e 100644
--- a/pkgs/development/libraries/libdv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdv/default.nix
diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix
index 3a83d01353f..3a83d01353f 100644
--- a/pkgs/development/libraries/libdvbpsi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix
index fd89077a256..fd89077a256 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix
diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix
index 18e2689002e..18e2689002e 100644
--- a/pkgs/development/libraries/libdvdnav/4.2.1.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix
index 45a73a62488..45a73a62488 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix
diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/nixpkgs/pkgs/development/libraries/libdvdread/4.9.9.nix
index fbe56023a91..fbe56023a91 100644
--- a/pkgs/development/libraries/libdvdread/4.9.9.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvdread/4.9.9.nix
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/nixpkgs/pkgs/development/libraries/libdvdread/default.nix
index c133c0ba6f9..c133c0ba6f9 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvdread/default.nix
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix
index 352d2b17406..352d2b17406 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix
diff --git a/pkgs/development/libraries/libdwg/default.nix b/nixpkgs/pkgs/development/libraries/libdwg/default.nix
index 5ee92b46385..5ee92b46385 100644
--- a/pkgs/development/libraries/libdwg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdwg/default.nix
diff --git a/pkgs/development/libraries/libdynd/default.nix b/nixpkgs/pkgs/development/libraries/libdynd/default.nix
index c02a6f9a502..c02a6f9a502 100644
--- a/pkgs/development/libraries/libdynd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdynd/default.nix
diff --git a/pkgs/development/libraries/libe-book/default.nix b/nixpkgs/pkgs/development/libraries/libe-book/default.nix
index 805b1869ac3..805b1869ac3 100644
--- a/pkgs/development/libraries/libe-book/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libe-book/default.nix
diff --git a/pkgs/development/libraries/libe-book/default.upstream b/nixpkgs/pkgs/development/libraries/libe-book/default.upstream
index a06a9af99bb..a06a9af99bb 100644
--- a/pkgs/development/libraries/libe-book/default.upstream
+++ b/nixpkgs/pkgs/development/libraries/libe-book/default.upstream
diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix
index 5127231dab6..5127231dab6 100644
--- a/pkgs/development/libraries/libeatmydata/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix
diff --git a/pkgs/development/libraries/libeb/default.nix b/nixpkgs/pkgs/development/libraries/libeb/default.nix
index 2fdb1d071b6..2fdb1d071b6 100644
--- a/pkgs/development/libraries/libeb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libeb/default.nix
diff --git a/pkgs/development/libraries/libebml/default.nix b/nixpkgs/pkgs/development/libraries/libebml/default.nix
index 591ad72e4ec..591ad72e4ec 100644
--- a/pkgs/development/libraries/libebml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libebml/default.nix
diff --git a/pkgs/development/libraries/libebur128/default.nix b/nixpkgs/pkgs/development/libraries/libebur128/default.nix
index 16624a78079..16624a78079 100644
--- a/pkgs/development/libraries/libebur128/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libebur128/default.nix
diff --git a/pkgs/development/libraries/libechonest/default.nix b/nixpkgs/pkgs/development/libraries/libechonest/default.nix
index cde046bf132..cde046bf132 100644
--- a/pkgs/development/libraries/libechonest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libechonest/default.nix
diff --git a/pkgs/development/libraries/libedit/01-cygwin.patch b/nixpkgs/pkgs/development/libraries/libedit/01-cygwin.patch
index 33bd39ed61e..33bd39ed61e 100644
--- a/pkgs/development/libraries/libedit/01-cygwin.patch
+++ b/nixpkgs/pkgs/development/libraries/libedit/01-cygwin.patch
diff --git a/pkgs/development/libraries/libedit/default.nix b/nixpkgs/pkgs/development/libraries/libedit/default.nix
index b83984e23c8..b83984e23c8 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libedit/default.nix
diff --git a/pkgs/development/libraries/libee/default.nix b/nixpkgs/pkgs/development/libraries/libee/default.nix
index 7255b3fece4..7255b3fece4 100644
--- a/pkgs/development/libraries/libee/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libee/default.nix
diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix
index 1835b924ec1..1835b924ec1 100644
--- a/pkgs/development/libraries/libelf-freebsd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix
diff --git a/pkgs/development/libraries/libelf/default.nix b/nixpkgs/pkgs/development/libraries/libelf/default.nix
index b168dd9bb56..b168dd9bb56 100644
--- a/pkgs/development/libraries/libelf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libelf/default.nix
diff --git a/pkgs/development/libraries/libelf/dont-hardcode-ar.patch b/nixpkgs/pkgs/development/libraries/libelf/dont-hardcode-ar.patch
index e282d9005db..e282d9005db 100644
--- a/pkgs/development/libraries/libelf/dont-hardcode-ar.patch
+++ b/nixpkgs/pkgs/development/libraries/libelf/dont-hardcode-ar.patch
diff --git a/pkgs/development/libraries/libelf/preprocessor-warnings.patch b/nixpkgs/pkgs/development/libraries/libelf/preprocessor-warnings.patch
index e04c8ee202a..e04c8ee202a 100644
--- a/pkgs/development/libraries/libelf/preprocessor-warnings.patch
+++ b/nixpkgs/pkgs/development/libraries/libelf/preprocessor-warnings.patch
diff --git a/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch b/nixpkgs/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch
index e4b4e592b7a..e4b4e592b7a 100644
--- a/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch
+++ b/nixpkgs/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch
diff --git a/pkgs/development/libraries/libelfin/default.nix b/nixpkgs/pkgs/development/libraries/libelfin/default.nix
index 2eb1bd0e4fc..2eb1bd0e4fc 100644
--- a/pkgs/development/libraries/libelfin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libelfin/default.nix
diff --git a/pkgs/development/libraries/libepc/default.nix b/nixpkgs/pkgs/development/libraries/libepc/default.nix
index 59780699fd1..59780699fd1 100644
--- a/pkgs/development/libraries/libepc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libepc/default.nix
diff --git a/pkgs/development/libraries/libesmtp/default.nix b/nixpkgs/pkgs/development/libraries/libesmtp/default.nix
index 9650f540fcf..9650f540fcf 100644
--- a/pkgs/development/libraries/libesmtp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libesmtp/default.nix
diff --git a/pkgs/development/libraries/libestr/default.nix b/nixpkgs/pkgs/development/libraries/libestr/default.nix
index b8f62901eed..b8f62901eed 100644
--- a/pkgs/development/libraries/libestr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libestr/default.nix
diff --git a/pkgs/development/libraries/libetpan/default.nix b/nixpkgs/pkgs/development/libraries/libetpan/default.nix
index 6756a8dbc56..6756a8dbc56 100644
--- a/pkgs/development/libraries/libetpan/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libetpan/default.nix
diff --git a/pkgs/development/libraries/libev/default.nix b/nixpkgs/pkgs/development/libraries/libev/default.nix
index 371c0b1d980..371c0b1d980 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libev/default.nix
diff --git a/pkgs/development/libraries/libevdev/default.nix b/nixpkgs/pkgs/development/libraries/libevdev/default.nix
index 7a61437b5ee..7a61437b5ee 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libevdev/default.nix
diff --git a/pkgs/development/libraries/libevdevplus/default.nix b/nixpkgs/pkgs/development/libraries/libevdevplus/default.nix
index 0f2b3e05266..0f2b3e05266 100644
--- a/pkgs/development/libraries/libevdevplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libevdevplus/default.nix
diff --git a/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix
index a94b6d1dc2a..a94b6d1dc2a 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libevent/default.nix
diff --git a/pkgs/development/libraries/libewf/default.nix b/nixpkgs/pkgs/development/libraries/libewf/default.nix
index fd1e203ed37..fd1e203ed37 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libewf/default.nix
diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
index 4519cc7dd74..4519cc7dd74 100644
--- a/pkgs/development/libraries/libexecinfo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
diff --git a/pkgs/development/libraries/libexif/default.nix b/nixpkgs/pkgs/development/libraries/libexif/default.nix
index 833ccf5dca5..833ccf5dca5 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libexif/default.nix
diff --git a/pkgs/development/libraries/libextractor/default.nix b/nixpkgs/pkgs/development/libraries/libextractor/default.nix
index ea155440c8d..ea155440c8d 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libextractor/default.nix
diff --git a/pkgs/development/libraries/libextractor/fix-gcc8-build.patch b/nixpkgs/pkgs/development/libraries/libextractor/fix-gcc8-build.patch
index e04d09be899..e04d09be899 100644
--- a/pkgs/development/libraries/libextractor/fix-gcc8-build.patch
+++ b/nixpkgs/pkgs/development/libraries/libextractor/fix-gcc8-build.patch
diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix
index 7b3df42c24c..7b3df42c24c 100644
--- a/pkgs/development/libraries/libexttextcat/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix
diff --git a/pkgs/development/libraries/libf2c/default.nix b/nixpkgs/pkgs/development/libraries/libf2c/default.nix
index 10a0d179d3e..10a0d179d3e 100644
--- a/pkgs/development/libraries/libf2c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libf2c/default.nix
diff --git a/pkgs/development/libraries/libfakekey/default.nix b/nixpkgs/pkgs/development/libraries/libfakekey/default.nix
index 3c243191543..3c243191543 100644
--- a/pkgs/development/libraries/libfakekey/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfakekey/default.nix
diff --git a/pkgs/development/libraries/libfaketime/default.nix b/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
index 10cc5cace7b..10cc5cace7b 100644
--- a/pkgs/development/libraries/libfaketime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
diff --git a/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch b/nixpkgs/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch
index 7b7e362fbf0..7b7e362fbf0 100644
--- a/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch
+++ b/nixpkgs/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch
diff --git a/pkgs/development/libraries/libfann/default.nix b/nixpkgs/pkgs/development/libraries/libfann/default.nix
index 5e1c985fe2c..5e1c985fe2c 100644
--- a/pkgs/development/libraries/libfann/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfann/default.nix
diff --git a/pkgs/development/libraries/libffcall/default.nix b/nixpkgs/pkgs/development/libraries/libffcall/default.nix
index 8d11cd86c45..8d11cd86c45 100644
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libffcall/default.nix
diff --git a/pkgs/development/libraries/libffi/default.nix b/nixpkgs/pkgs/development/libraries/libffi/default.nix
index cc080e7c638..cc080e7c638 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libffi/default.nix
diff --git a/pkgs/development/libraries/libfido2/default.nix b/nixpkgs/pkgs/development/libraries/libfido2/default.nix
index a0f44a33220..a0f44a33220 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfido2/default.nix
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix
index 0fa5c3a7db0..0fa5c3a7db0 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix
diff --git a/pkgs/development/libraries/libfive/default.nix b/nixpkgs/pkgs/development/libraries/libfive/default.nix
index e007ab2f95a..e007ab2f95a 100644
--- a/pkgs/development/libraries/libfive/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfive/default.nix
diff --git a/pkgs/development/libraries/libfixposix/default.nix b/nixpkgs/pkgs/development/libraries/libfixposix/default.nix
index 9c9b6c8034c..9c9b6c8034c 100644
--- a/pkgs/development/libraries/libfixposix/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfixposix/default.nix
diff --git a/pkgs/development/libraries/libfm/default.nix b/nixpkgs/pkgs/development/libraries/libfm/default.nix
index a0323481be9..a0323481be9 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfm/default.nix
diff --git a/pkgs/development/libraries/libfprint/default.nix b/nixpkgs/pkgs/development/libraries/libfprint/default.nix
index 9a6db72ae05..9a6db72ae05 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfprint/default.nix
diff --git a/pkgs/development/libraries/libfpx/default.nix b/nixpkgs/pkgs/development/libraries/libfpx/default.nix
index 97df5107409..97df5107409 100644
--- a/pkgs/development/libraries/libfpx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfpx/default.nix
diff --git a/pkgs/development/libraries/libfreefare/default.nix b/nixpkgs/pkgs/development/libraries/libfreefare/default.nix
index 8ddce0aa98c..8ddce0aa98c 100644
--- a/pkgs/development/libraries/libfreefare/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfreefare/default.nix
diff --git a/pkgs/development/libraries/libfsm/default.nix b/nixpkgs/pkgs/development/libraries/libfsm/default.nix
index 78f1f66623a..78f1f66623a 100644
--- a/pkgs/development/libraries/libfsm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfsm/default.nix
diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix
index 26002725d91..26002725d91 100644
--- a/pkgs/development/libraries/libftdi/1.x.nix
+++ b/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix
diff --git a/pkgs/development/libraries/libftdi/default.nix b/nixpkgs/pkgs/development/libraries/libftdi/default.nix
index 3dffbd075e9..3dffbd075e9 100644
--- a/pkgs/development/libraries/libftdi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libftdi/default.nix
diff --git a/pkgs/development/libraries/libgadu/default.nix b/nixpkgs/pkgs/development/libraries/libgadu/default.nix
index b039c84b2fb..b039c84b2fb 100644
--- a/pkgs/development/libraries/libgadu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgadu/default.nix
diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix
index d83b43a782e..d83b43a782e 100644
--- a/pkgs/development/libraries/libgaminggear/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix
diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix
index 80cb6641bfb..80cb6641bfb 100644
--- a/pkgs/development/libraries/libgcrypt/1.5.nix
+++ b/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
index e7a9ec60a6d..e7a9ec60a6d 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
diff --git a/pkgs/development/libraries/libgda/default.nix b/nixpkgs/pkgs/development/libraries/libgda/default.nix
index a1871f6b2e6..a1871f6b2e6 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgda/default.nix
diff --git a/pkgs/development/libraries/libgdamm/default.nix b/nixpkgs/pkgs/development/libraries/libgdamm/default.nix
index f5cc5efa06a..f5cc5efa06a 100644
--- a/pkgs/development/libraries/libgdamm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgdamm/default.nix
diff --git a/pkgs/development/libraries/libgdata/default.nix b/nixpkgs/pkgs/development/libraries/libgdata/default.nix
index 6830d47df74..6830d47df74 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgdata/default.nix
diff --git a/pkgs/development/libraries/libgdata/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/libgdata/installed-tests-path.patch
index f8c0a1293a1..f8c0a1293a1 100644
--- a/pkgs/development/libraries/libgdata/installed-tests-path.patch
+++ b/nixpkgs/pkgs/development/libraries/libgdata/installed-tests-path.patch
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix
index 54bf091e5ea..54bf091e5ea 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix
diff --git a/pkgs/development/libraries/libgee/default.nix b/nixpkgs/pkgs/development/libraries/libgee/default.nix
index b9e1d668cd3..b9e1d668cd3 100644
--- a/pkgs/development/libraries/libgee/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgee/default.nix
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix
index db75ff1784f..db75ff1784f 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix
diff --git a/pkgs/development/libraries/libgepub/default.nix b/nixpkgs/pkgs/development/libraries/libgepub/default.nix
index 70ec222f88f..70ec222f88f 100644
--- a/pkgs/development/libraries/libgepub/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgepub/default.nix
diff --git a/pkgs/development/libraries/libgig/default.nix b/nixpkgs/pkgs/development/libraries/libgig/default.nix
index 27939238278..27939238278 100644
--- a/pkgs/development/libraries/libgig/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgig/default.nix
diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix
index d5edefc5d54..d5edefc5d54 100644
--- a/pkgs/development/libraries/libgit2-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix
diff --git a/pkgs/development/libraries/libgksu/default.nix b/nixpkgs/pkgs/development/libraries/libgksu/default.nix
index 24052ea4058..24052ea4058 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgksu/default.nix
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch
index 5c007be5b4b..5c007be5b4b 100644
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch
+++ b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch
index 0f22166fb8b..0f22166fb8b 100644
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch
+++ b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch
index dd52b8247fa..dd52b8247fa 100644
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch
+++ b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch
index 3787ef6bfc1..3787ef6bfc1 100644
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch
+++ b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch
index 2c3a8cc786b..2c3a8cc786b 100644
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch
+++ b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch
index b9fb77f2714..b9fb77f2714 100644
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch
+++ b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch
index e423af16b44..e423af16b44 100644
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch
+++ b/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
index 55b801b0b0d..55b801b0b0d 100644
--- a/pkgs/development/libraries/libglvnd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix
index 33a6a075ae4..33a6a075ae4 100644
--- a/pkgs/development/libraries/libgnome-keyring/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix
diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix
index 21523bf2e1a..21523bf2e1a 100644
--- a/pkgs/development/libraries/libgnomekbd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/nixpkgs/pkgs/development/libraries/libgnurl/default.nix
index a1e8ef76394..a1e8ef76394 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgnurl/default.nix
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix
index c02bc7f0ed3..c02bc7f0ed3 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix
index 6203b8c7b71..6203b8c7b71 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix
diff --git a/pkgs/development/libraries/libgpiod/default.nix b/nixpkgs/pkgs/development/libraries/libgpiod/default.nix
index 782c0a8857a..782c0a8857a 100644
--- a/pkgs/development/libraries/libgpiod/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgpiod/default.nix
diff --git a/pkgs/development/libraries/libgpod/default.nix b/nixpkgs/pkgs/development/libraries/libgpod/default.nix
index 063588e9f1e..063588e9f1e 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgpod/default.nix
diff --git a/pkgs/development/libraries/libgringotts/default.nix b/nixpkgs/pkgs/development/libraries/libgringotts/default.nix
index 76d7ebcc8cc..76d7ebcc8cc 100644
--- a/pkgs/development/libraries/libgringotts/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgringotts/default.nix
diff --git a/pkgs/development/libraries/libgroove/default.nix b/nixpkgs/pkgs/development/libraries/libgroove/default.nix
index bea3c85260c..bea3c85260c 100644
--- a/pkgs/development/libraries/libgroove/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgroove/default.nix
diff --git a/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch b/nixpkgs/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch
index 86a8a935769..86a8a935769 100644
--- a/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch
+++ b/nixpkgs/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch
diff --git a/pkgs/development/libraries/libgrss/default.nix b/nixpkgs/pkgs/development/libraries/libgrss/default.nix
index 8fc44fb6a8d..8fc44fb6a8d 100644
--- a/pkgs/development/libraries/libgrss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgrss/default.nix
diff --git a/pkgs/development/libraries/libgsf/default.nix b/nixpkgs/pkgs/development/libraries/libgsf/default.nix
index a60d3a16533..a60d3a16533 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgsf/default.nix
diff --git a/pkgs/development/libraries/libgssglue/default.nix b/nixpkgs/pkgs/development/libraries/libgssglue/default.nix
index 0177869d3e3..0177869d3e3 100644
--- a/pkgs/development/libraries/libgssglue/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgssglue/default.nix
diff --git a/pkgs/development/libraries/libgtop/default.nix b/nixpkgs/pkgs/development/libraries/libgtop/default.nix
index fe7986bf21a..fe7986bf21a 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgtop/default.nix
diff --git a/pkgs/development/libraries/libgudev/default.nix b/nixpkgs/pkgs/development/libraries/libgudev/default.nix
index 8023acb75d2..8023acb75d2 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgudev/default.nix
diff --git a/pkgs/development/libraries/libguestfs/appliance.nix b/nixpkgs/pkgs/development/libraries/libguestfs/appliance.nix
index ad4a93517e9..ad4a93517e9 100644
--- a/pkgs/development/libraries/libguestfs/appliance.nix
+++ b/nixpkgs/pkgs/development/libraries/libguestfs/appliance.nix
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/nixpkgs/pkgs/development/libraries/libguestfs/default.nix
index 8d480c2d882..8d480c2d882 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libguestfs/default.nix
diff --git a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch b/nixpkgs/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
index 09c4b1393ce..09c4b1393ce 100644
--- a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
+++ b/nixpkgs/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
diff --git a/pkgs/development/libraries/libgumath/default.nix b/nixpkgs/pkgs/development/libraries/libgumath/default.nix
index f1483c38c15..f1483c38c15 100644
--- a/pkgs/development/libraries/libgumath/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgumath/default.nix
diff --git a/pkgs/development/libraries/libgweather/default.nix b/nixpkgs/pkgs/development/libraries/libgweather/default.nix
index e51a10cfe8a..e51a10cfe8a 100644
--- a/pkgs/development/libraries/libgweather/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgweather/default.nix
diff --git a/pkgs/development/libraries/libgxps/default.nix b/nixpkgs/pkgs/development/libraries/libgxps/default.nix
index 30e5e247ab2..30e5e247ab2 100644
--- a/pkgs/development/libraries/libgxps/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgxps/default.nix
diff --git a/pkgs/development/libraries/libhandy/default.nix b/nixpkgs/pkgs/development/libraries/libhandy/default.nix
index 88736113ee5..88736113ee5 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libhandy/default.nix
diff --git a/pkgs/development/libraries/libhangul/default.nix b/nixpkgs/pkgs/development/libraries/libhangul/default.nix
index 9e72d933433..9e72d933433 100644
--- a/pkgs/development/libraries/libhangul/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libhangul/default.nix
diff --git a/pkgs/development/libraries/libharu/default.nix b/nixpkgs/pkgs/development/libraries/libharu/default.nix
index 0830b45b308..0830b45b308 100644
--- a/pkgs/development/libraries/libharu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libharu/default.nix
diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix
index 5dc1fb93834..5dc1fb93834 100644
--- a/pkgs/development/libraries/libhdhomerun/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix
diff --git a/pkgs/development/libraries/libheif/default.nix b/nixpkgs/pkgs/development/libraries/libheif/default.nix
index a6e072ef76f..a6e072ef76f 100644
--- a/pkgs/development/libraries/libheif/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libheif/default.nix
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix
index c58812eca58..c58812eca58 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix
diff --git a/pkgs/development/libraries/libiberty/default.nix b/nixpkgs/pkgs/development/libraries/libiberty/default.nix
index 08a88bfee45..08a88bfee45 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiberty/default.nix
diff --git a/pkgs/development/libraries/libibmad/default.nix b/nixpkgs/pkgs/development/libraries/libibmad/default.nix
index 00bd7e6eeea..00bd7e6eeea 100644
--- a/pkgs/development/libraries/libibmad/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libibmad/default.nix
diff --git a/pkgs/development/libraries/libibumad/default.nix b/nixpkgs/pkgs/development/libraries/libibumad/default.nix
index 689e9a0be5d..689e9a0be5d 100644
--- a/pkgs/development/libraries/libibumad/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libibumad/default.nix
diff --git a/pkgs/development/libraries/libical/default.nix b/nixpkgs/pkgs/development/libraries/libical/default.nix
index 69c4b3aeb74..69c4b3aeb74 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libical/default.nix
diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/nixpkgs/pkgs/development/libraries/libical/respect-env-tzdir.patch
index 59d23e490e5..59d23e490e5 100644
--- a/pkgs/development/libraries/libical/respect-env-tzdir.patch
+++ b/nixpkgs/pkgs/development/libraries/libical/respect-env-tzdir.patch
diff --git a/pkgs/development/libraries/libicns/default.nix b/nixpkgs/pkgs/development/libraries/libicns/default.nix
index 27ec8b17c0d..27ec8b17c0d 100644
--- a/pkgs/development/libraries/libicns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libicns/default.nix
diff --git a/pkgs/development/libraries/libiconv/default.nix b/nixpkgs/pkgs/development/libraries/libiconv/default.nix
index 7dc90d9ae3e..7dc90d9ae3e 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiconv/default.nix
diff --git a/pkgs/development/libraries/libiconv/setup-hook.sh b/nixpkgs/pkgs/development/libraries/libiconv/setup-hook.sh
index 120cf06c61b..120cf06c61b 100644
--- a/pkgs/development/libraries/libiconv/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/libiconv/setup-hook.sh
diff --git a/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/nixpkgs/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
index b1f9d0978ce..b1f9d0978ce 100644
--- a/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
+++ b/nixpkgs/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
diff --git a/pkgs/development/libraries/libid3tag/debian-patches.patch b/nixpkgs/pkgs/development/libraries/libid3tag/debian-patches.patch
index 0a828b334cf..0a828b334cf 100644
--- a/pkgs/development/libraries/libid3tag/debian-patches.patch
+++ b/nixpkgs/pkgs/development/libraries/libid3tag/debian-patches.patch
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/nixpkgs/pkgs/development/libraries/libid3tag/default.nix
index c6d430e10fc..c6d430e10fc 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libid3tag/default.nix
diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/nixpkgs/pkgs/development/libraries/libid3tag/id3tag.pc
index e3df7b3f9df..e3df7b3f9df 100644
--- a/pkgs/development/libraries/libid3tag/id3tag.pc
+++ b/nixpkgs/pkgs/development/libraries/libid3tag/id3tag.pc
diff --git a/pkgs/development/libraries/libidn/default.nix b/nixpkgs/pkgs/development/libraries/libidn/default.nix
index 8291499daf3..8291499daf3 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libidn/default.nix
diff --git a/pkgs/development/libraries/libidn2/default.nix b/nixpkgs/pkgs/development/libraries/libidn2/default.nix
index c1363d7a928..c1363d7a928 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libidn2/default.nix
diff --git a/pkgs/development/libraries/libidn2/fix-error-darwin.patch b/nixpkgs/pkgs/development/libraries/libidn2/fix-error-darwin.patch
index e2202abd947..e2202abd947 100644
--- a/pkgs/development/libraries/libidn2/fix-error-darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/libidn2/fix-error-darwin.patch
diff --git a/pkgs/development/libraries/libiec61883/default.nix b/nixpkgs/pkgs/development/libraries/libiec61883/default.nix
index 936d165a6cf..936d165a6cf 100644
--- a/pkgs/development/libraries/libiec61883/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiec61883/default.nix
diff --git a/pkgs/development/libraries/libieee1284/default.nix b/nixpkgs/pkgs/development/libraries/libieee1284/default.nix
index b5708a83a7d..b5708a83a7d 100644
--- a/pkgs/development/libraries/libieee1284/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libieee1284/default.nix
diff --git a/pkgs/development/libraries/libiio/default.nix b/nixpkgs/pkgs/development/libraries/libiio/default.nix
index 9392061a269..9392061a269 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiio/default.nix
diff --git a/pkgs/development/libraries/libimagequant/default.nix b/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
index 44fa395204b..44fa395204b 100644
--- a/pkgs/development/libraries/libimagequant/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix
index 950fe3e3718..950fe3e3718 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix
diff --git a/pkgs/development/libraries/libindicator/default.nix b/nixpkgs/pkgs/development/libraries/libindicator/default.nix
index 33691f79a4c..33691f79a4c 100644
--- a/pkgs/development/libraries/libindicator/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libindicator/default.nix
diff --git a/pkgs/development/libraries/libinfinity/default.nix b/nixpkgs/pkgs/development/libraries/libinfinity/default.nix
index 9be58ac537a..9be58ac537a 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libinfinity/default.nix
diff --git a/pkgs/development/libraries/libinjection/default.nix b/nixpkgs/pkgs/development/libraries/libinjection/default.nix
index b3bdbb41588..b3bdbb41588 100644
--- a/pkgs/development/libraries/libinjection/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libinjection/default.nix
diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix
index 75cd1a00507..75cd1a00507 100644
--- a/pkgs/development/libraries/libinotify-kqueue/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix
diff --git a/pkgs/development/libraries/libinput/default.nix b/nixpkgs/pkgs/development/libraries/libinput/default.nix
index 8d48082e1d9..8d48082e1d9 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libinput/default.nix
diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/nixpkgs/pkgs/development/libraries/libinput/udev-absolute-path.patch
index 5c85b863948..5c85b863948 100644
--- a/pkgs/development/libraries/libinput/udev-absolute-path.patch
+++ b/nixpkgs/pkgs/development/libraries/libinput/udev-absolute-path.patch
diff --git a/pkgs/development/libraries/libiodbc/default.nix b/nixpkgs/pkgs/development/libraries/libiodbc/default.nix
index ad55c6cb18f..ad55c6cb18f 100644
--- a/pkgs/development/libraries/libiodbc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiodbc/default.nix
diff --git a/pkgs/development/libraries/libipfix/default.nix b/nixpkgs/pkgs/development/libraries/libipfix/default.nix
index fccf4b3d50f..fccf4b3d50f 100644
--- a/pkgs/development/libraries/libipfix/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libipfix/default.nix
diff --git a/pkgs/development/libraries/libipt/default.nix b/nixpkgs/pkgs/development/libraries/libipt/default.nix
index 792a74da581..792a74da581 100644
--- a/pkgs/development/libraries/libipt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libipt/default.nix
diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix
index 8e1ca68a69e..8e1ca68a69e 100644
--- a/pkgs/development/libraries/libiptcdata/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix
diff --git a/pkgs/development/libraries/libircclient/default.nix b/nixpkgs/pkgs/development/libraries/libircclient/default.nix
index 561a5248278..561a5248278 100644
--- a/pkgs/development/libraries/libircclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libircclient/default.nix
diff --git a/pkgs/development/libraries/libirecovery/default.nix b/nixpkgs/pkgs/development/libraries/libirecovery/default.nix
index bf48e88a4ec..bf48e88a4ec 100644
--- a/pkgs/development/libraries/libirecovery/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libirecovery/default.nix
diff --git a/pkgs/development/libraries/libisds/default.nix b/nixpkgs/pkgs/development/libraries/libisds/default.nix
index 4ed5a830964..4ed5a830964 100644
--- a/pkgs/development/libraries/libisds/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libisds/default.nix
diff --git a/pkgs/development/libraries/libisoburn/default.nix b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix
index 633f19cef79..633f19cef79 100644
--- a/pkgs/development/libraries/libisoburn/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix
diff --git a/pkgs/development/libraries/libisofs/default.nix b/nixpkgs/pkgs/development/libraries/libisofs/default.nix
index 2c1bb3b3b8e..2c1bb3b3b8e 100644
--- a/pkgs/development/libraries/libisofs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libisofs/default.nix
diff --git a/pkgs/development/libraries/libite/default.nix b/nixpkgs/pkgs/development/libraries/libite/default.nix
index 34ca7406d69..34ca7406d69 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libite/default.nix
diff --git a/pkgs/development/libraries/libivykis/default.nix b/nixpkgs/pkgs/development/libraries/libivykis/default.nix
index 17cca74c7d2..17cca74c7d2 100644
--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libivykis/default.nix
diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix
index 1790f3f68b2..1790f3f68b2 100644
--- a/pkgs/development/libraries/libixp-hg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix
diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-drop/default.nix
index 8ed1c9bf92f..8ed1c9bf92f 100644
--- a/pkgs/development/libraries/libjpeg-drop/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjpeg-drop/default.nix
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix
index f05ac6d521b..f05ac6d521b 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix
diff --git a/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch
index 9b9483d6398..9b9483d6398 100644
--- a/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch
+++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch
diff --git a/pkgs/development/libraries/libjpeg/builder.sh b/nixpkgs/pkgs/development/libraries/libjpeg/builder.sh
index 58ca9a790ba..58ca9a790ba 100755
--- a/pkgs/development/libraries/libjpeg/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/libjpeg/builder.sh
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg/default.nix
index abd6c7bbf6c..abd6c7bbf6c 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjpeg/default.nix
diff --git a/pkgs/development/libraries/libjreen/default.nix b/nixpkgs/pkgs/development/libraries/libjreen/default.nix
index 9e81c932405..9e81c932405 100644
--- a/pkgs/development/libraries/libjreen/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjreen/default.nix
diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index a7c9427080d..a7c9427080d 100644
--- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix
diff --git a/pkgs/development/libraries/libjson/default.nix b/nixpkgs/pkgs/development/libraries/libjson/default.nix
index b62f0f116a0..b62f0f116a0 100644
--- a/pkgs/development/libraries/libjson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjson/default.nix
diff --git a/pkgs/development/libraries/libjson/install-fix.patch b/nixpkgs/pkgs/development/libraries/libjson/install-fix.patch
index f074c8ba3aa..f074c8ba3aa 100644
--- a/pkgs/development/libraries/libjson/install-fix.patch
+++ b/nixpkgs/pkgs/development/libraries/libjson/install-fix.patch
diff --git a/pkgs/development/libraries/libkate/default.nix b/nixpkgs/pkgs/development/libraries/libkate/default.nix
index 7eff302397a..7eff302397a 100644
--- a/pkgs/development/libraries/libkate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libkate/default.nix
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix
index 12205a6a63b..12205a6a63b 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix
diff --git a/pkgs/development/libraries/libksba/default.nix b/nixpkgs/pkgs/development/libraries/libksba/default.nix
index c83a3e40df2..c83a3e40df2 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libksba/default.nix
diff --git a/pkgs/development/libraries/libksi/default.nix b/nixpkgs/pkgs/development/libraries/libksi/default.nix
index f155c0d8506..f155c0d8506 100644
--- a/pkgs/development/libraries/libksi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libksi/default.nix
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/nixpkgs/pkgs/development/libraries/libktorrent/default.nix
index 04dabf14100..04dabf14100 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libktorrent/default.nix
diff --git a/pkgs/development/libraries/liblangtag/default.nix b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix
index 1c5c39ac898..1c5c39ac898 100644
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/nixpkgs/pkgs/development/libraries/liblastfm/default.nix
index ff1a39fc204..ff1a39fc204 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblastfm/default.nix
diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix
index c51cb9baead..c51cb9baead 100644
--- a/pkgs/development/libraries/liblastfmSF/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix
diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/nixpkgs/pkgs/development/libraries/liblaxjson/default.nix
index f185a44380a..f185a44380a 100644
--- a/pkgs/development/libraries/liblaxjson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblaxjson/default.nix
diff --git a/pkgs/development/libraries/liblcf/default.nix b/nixpkgs/pkgs/development/libraries/liblcf/default.nix
index fe513d378cd..fe513d378cd 100644
--- a/pkgs/development/libraries/liblcf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblcf/default.nix
diff --git a/pkgs/development/libraries/liblinear/default.nix b/nixpkgs/pkgs/development/libraries/liblinear/default.nix
index 7b70510dec3..7b70510dec3 100644
--- a/pkgs/development/libraries/liblinear/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblinear/default.nix
diff --git a/pkgs/development/libraries/liblo/default.nix b/nixpkgs/pkgs/development/libraries/liblo/default.nix
index 2ba5750b1bf..2ba5750b1bf 100644
--- a/pkgs/development/libraries/liblo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblo/default.nix
diff --git a/pkgs/development/libraries/liblockfile/default.nix b/nixpkgs/pkgs/development/libraries/liblockfile/default.nix
index bfc9036abe3..bfc9036abe3 100644
--- a/pkgs/development/libraries/liblockfile/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblockfile/default.nix
diff --git a/pkgs/development/libraries/liblogging/default.nix b/nixpkgs/pkgs/development/libraries/liblogging/default.nix
index d0aaebadbaa..d0aaebadbaa 100644
--- a/pkgs/development/libraries/liblogging/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblogging/default.nix
diff --git a/pkgs/development/libraries/liblognorm/default.nix b/nixpkgs/pkgs/development/libraries/liblognorm/default.nix
index d77b452e3e9..d77b452e3e9 100644
--- a/pkgs/development/libraries/liblognorm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblognorm/default.nix
diff --git a/pkgs/development/libraries/liblouis/default.nix b/nixpkgs/pkgs/development/libraries/liblouis/default.nix
index 932edd20e9a..932edd20e9a 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblouis/default.nix
diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix
index aa6922ea342..aa6922ea342 100644
--- a/pkgs/development/libraries/liblqr-1/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix
diff --git a/pkgs/development/libraries/liblscp/default.nix b/nixpkgs/pkgs/development/libraries/liblscp/default.nix
index 471f277fb52..471f277fb52 100644
--- a/pkgs/development/libraries/liblscp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblscp/default.nix
diff --git a/pkgs/development/libraries/libltc/default.nix b/nixpkgs/pkgs/development/libraries/libltc/default.nix
index d6918ef3044..d6918ef3044 100644
--- a/pkgs/development/libraries/libltc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libltc/default.nix
diff --git a/pkgs/development/libraries/libmad/default.nix b/nixpkgs/pkgs/development/libraries/libmad/default.nix
index 24de4aa2e4a..24de4aa2e4a 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmad/default.nix
diff --git a/pkgs/development/libraries/libmanette/default.nix b/nixpkgs/pkgs/development/libraries/libmanette/default.nix
index 2f7f46974b0..2f7f46974b0 100644
--- a/pkgs/development/libraries/libmanette/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmanette/default.nix
diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/nixpkgs/pkgs/development/libraries/libmatchbox/default.nix
index 98875e48f57..98875e48f57 100644
--- a/pkgs/development/libraries/libmatchbox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmatchbox/default.nix
diff --git a/pkgs/development/libraries/libmatheval/default.nix b/nixpkgs/pkgs/development/libraries/libmatheval/default.nix
index 7f5c8b4c4c2..7f5c8b4c4c2 100644
--- a/pkgs/development/libraries/libmatheval/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmatheval/default.nix
diff --git a/pkgs/development/libraries/libmatroska/default.nix b/nixpkgs/pkgs/development/libraries/libmatroska/default.nix
index b10a62fd389..b10a62fd389 100644
--- a/pkgs/development/libraries/libmatroska/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmatroska/default.nix
diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix
index 5cf12ea46ba..5cf12ea46ba 100644
--- a/pkgs/development/libraries/libmaxminddb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix
diff --git a/pkgs/development/libraries/libmbim/default.nix b/nixpkgs/pkgs/development/libraries/libmbim/default.nix
index a49e0eaaac6..a49e0eaaac6 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmbim/default.nix
diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix
index 4a4074e2f22..4a4074e2f22 100644
--- a/pkgs/development/libraries/libmcrypt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix
diff --git a/pkgs/development/libraries/libmd/default.nix b/nixpkgs/pkgs/development/libraries/libmd/default.nix
index a38e71bb540..a38e71bb540 100644
--- a/pkgs/development/libraries/libmd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmd/default.nix
diff --git a/pkgs/development/libraries/libmediaart/default.nix b/nixpkgs/pkgs/development/libraries/libmediaart/default.nix
index 20a63fd6eb0..20a63fd6eb0 100644
--- a/pkgs/development/libraries/libmediaart/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmediaart/default.nix
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix
index 92fe81c73f4..92fe81c73f4 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix
diff --git a/pkgs/development/libraries/libmemcached/default.nix b/nixpkgs/pkgs/development/libraries/libmemcached/default.nix
index 5655bfe968b..5655bfe968b 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmemcached/default.nix
diff --git a/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch b/nixpkgs/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch
index e5e21c43358..e5e21c43358 100644
--- a/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch
+++ b/nixpkgs/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch
diff --git a/pkgs/development/libraries/libmemcached/musl-fixes.patch b/nixpkgs/pkgs/development/libraries/libmemcached/musl-fixes.patch
index eb2a6bc980e..eb2a6bc980e 100644
--- a/pkgs/development/libraries/libmemcached/musl-fixes.patch
+++ b/nixpkgs/pkgs/development/libraries/libmemcached/musl-fixes.patch
diff --git a/pkgs/development/libraries/libmesode/default.nix b/nixpkgs/pkgs/development/libraries/libmesode/default.nix
index de09d142d48..de09d142d48 100644
--- a/pkgs/development/libraries/libmesode/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmesode/default.nix
diff --git a/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch b/nixpkgs/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch
index 1e3a5d680df..1e3a5d680df 100644
--- a/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch
+++ b/nixpkgs/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch
diff --git a/pkgs/development/libraries/libmhash/default.nix b/nixpkgs/pkgs/development/libraries/libmhash/default.nix
index 598f0b7f789..598f0b7f789 100644
--- a/pkgs/development/libraries/libmhash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmhash/default.nix
diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix
index 41d81f1f176..41d81f1f176 100644
--- a/pkgs/development/libraries/libmicrodns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/default.nix
index ba4d74e4d48..ba4d74e4d48 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmicrohttpd/default.nix
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/nixpkgs/pkgs/development/libraries/libmikmod/default.nix
index 284d415454d..284d415454d 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmikmod/default.nix
diff --git a/pkgs/development/libraries/libmilter/default.nix b/nixpkgs/pkgs/development/libraries/libmilter/default.nix
index 3eb688f9572..3eb688f9572 100644
--- a/pkgs/development/libraries/libmilter/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmilter/default.nix
diff --git a/pkgs/development/libraries/libmilter/install.patch b/nixpkgs/pkgs/development/libraries/libmilter/install.patch
index f6d3574ca4c..f6d3574ca4c 100644
--- a/pkgs/development/libraries/libmilter/install.patch
+++ b/nixpkgs/pkgs/development/libraries/libmilter/install.patch
diff --git a/pkgs/development/libraries/libmilter/sharedlib.patch b/nixpkgs/pkgs/development/libraries/libmilter/sharedlib.patch
index bbc69a516ff..bbc69a516ff 100644
--- a/pkgs/development/libraries/libmilter/sharedlib.patch
+++ b/nixpkgs/pkgs/development/libraries/libmilter/sharedlib.patch
diff --git a/pkgs/development/libraries/libminc/default.nix b/nixpkgs/pkgs/development/libraries/libminc/default.nix
index 53b6af40b51..53b6af40b51 100644
--- a/pkgs/development/libraries/libminc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libminc/default.nix
diff --git a/pkgs/development/libraries/libmkv/default.nix b/nixpkgs/pkgs/development/libraries/libmkv/default.nix
index 8b659c46792..8b659c46792 100644
--- a/pkgs/development/libraries/libmkv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmkv/default.nix
diff --git a/pkgs/development/libraries/libmms/default.nix b/nixpkgs/pkgs/development/libraries/libmms/default.nix
index 7f73fb09cd1..7f73fb09cd1 100644
--- a/pkgs/development/libraries/libmms/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmms/default.nix
diff --git a/pkgs/development/libraries/libmng/default.nix b/nixpkgs/pkgs/development/libraries/libmng/default.nix
index 749a5d60e46..749a5d60e46 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmng/default.nix
diff --git a/pkgs/development/libraries/libmnl/default.nix b/nixpkgs/pkgs/development/libraries/libmnl/default.nix
index 7c4b451ae6d..7c4b451ae6d 100644
--- a/pkgs/development/libraries/libmnl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmnl/default.nix
diff --git a/pkgs/development/libraries/libmodbus/default.nix b/nixpkgs/pkgs/development/libraries/libmodbus/default.nix
index e18de4127a4..e18de4127a4 100644
--- a/pkgs/development/libraries/libmodbus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmodbus/default.nix
diff --git a/pkgs/development/libraries/libmodplug/default.nix b/nixpkgs/pkgs/development/libraries/libmodplug/default.nix
index 231f18377e4..231f18377e4 100644
--- a/pkgs/development/libraries/libmodplug/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmodplug/default.nix
diff --git a/pkgs/development/libraries/libmodule/default.nix b/nixpkgs/pkgs/development/libraries/libmodule/default.nix
index 26b81d4d412..26b81d4d412 100644
--- a/pkgs/development/libraries/libmodule/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmodule/default.nix
diff --git a/pkgs/development/libraries/libmodulemd/1.nix b/nixpkgs/pkgs/development/libraries/libmodulemd/1.nix
index 174296375e0..174296375e0 100644
--- a/pkgs/development/libraries/libmodulemd/1.nix
+++ b/nixpkgs/pkgs/development/libraries/libmodulemd/1.nix
diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix
index ba77c7806b5..ba77c7806b5 100644
--- a/pkgs/development/libraries/libmodulemd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix
diff --git a/pkgs/development/libraries/libmodulemd/dont-check-docs.patch b/nixpkgs/pkgs/development/libraries/libmodulemd/dont-check-docs.patch
index 38ad5683692..38ad5683692 100644
--- a/pkgs/development/libraries/libmodulemd/dont-check-docs.patch
+++ b/nixpkgs/pkgs/development/libraries/libmodulemd/dont-check-docs.patch
diff --git a/pkgs/development/libraries/libmodulemd/pygobject-dir.patch b/nixpkgs/pkgs/development/libraries/libmodulemd/pygobject-dir.patch
index a367872eec6..a367872eec6 100644
--- a/pkgs/development/libraries/libmodulemd/pygobject-dir.patch
+++ b/nixpkgs/pkgs/development/libraries/libmodulemd/pygobject-dir.patch
diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/nixpkgs/pkgs/development/libraries/libmongo-client/default.nix
index 30cb8c9df2f..30cb8c9df2f 100644
--- a/pkgs/development/libraries/libmongo-client/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmongo-client/default.nix
diff --git a/pkgs/development/libraries/libmowgli/default.nix b/nixpkgs/pkgs/development/libraries/libmowgli/default.nix
index 99f04bc09de..99f04bc09de 100644
--- a/pkgs/development/libraries/libmowgli/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmowgli/default.nix
diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/nixpkgs/pkgs/development/libraries/libmp3splt/default.nix
index 52072000115..52072000115 100644
--- a/pkgs/development/libraries/libmp3splt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmp3splt/default.nix
diff --git a/pkgs/development/libraries/libmpack/default.nix b/nixpkgs/pkgs/development/libraries/libmpack/default.nix
index e8392f88ac7..e8392f88ac7 100644
--- a/pkgs/development/libraries/libmpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmpack/default.nix
diff --git a/pkgs/development/libraries/libmpc/default.nix b/nixpkgs/pkgs/development/libraries/libmpc/default.nix
index 9ffbc95b1fd..9ffbc95b1fd 100644
--- a/pkgs/development/libraries/libmpc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmpc/default.nix
diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/nixpkgs/pkgs/development/libraries/libmpcdec/default.nix
index a5a4d68ad96..a5a4d68ad96 100644
--- a/pkgs/development/libraries/libmpcdec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmpcdec/default.nix
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix
index 2351ce2b554..2351ce2b554 100644
--- a/pkgs/development/libraries/libmpeg2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix
diff --git a/pkgs/development/libraries/libmrss/default.nix b/nixpkgs/pkgs/development/libraries/libmrss/default.nix
index f1a061e5ab5..f1a061e5ab5 100644
--- a/pkgs/development/libraries/libmrss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmrss/default.nix
diff --git a/pkgs/development/libraries/libmspack/default.nix b/nixpkgs/pkgs/development/libraries/libmspack/default.nix
index 2cb4cd3cd9b..2cb4cd3cd9b 100644
--- a/pkgs/development/libraries/libmspack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmspack/default.nix
diff --git a/pkgs/development/libraries/libmtp/default.nix b/nixpkgs/pkgs/development/libraries/libmtp/default.nix
index e750c2c6c70..e750c2c6c70 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmtp/default.nix
diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix
index 05532df1abd..05532df1abd 100644
--- a/pkgs/development/libraries/libmusicbrainz/5.x.nix
+++ b/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix
diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix
index 5335b6577f0..5335b6577f0 100644
--- a/pkgs/development/libraries/libmusicbrainz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix
diff --git a/pkgs/development/libraries/libmwaw/default.nix b/nixpkgs/pkgs/development/libraries/libmwaw/default.nix
index a7e52376e3f..a7e52376e3f 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmwaw/default.nix
diff --git a/pkgs/development/libraries/libmwaw/default.upstream b/nixpkgs/pkgs/development/libraries/libmwaw/default.upstream
index bcfb53770e1..bcfb53770e1 100644
--- a/pkgs/development/libraries/libmwaw/default.upstream
+++ b/nixpkgs/pkgs/development/libraries/libmwaw/default.upstream
diff --git a/pkgs/development/libraries/libmx/default.nix b/nixpkgs/pkgs/development/libraries/libmx/default.nix
index 483c5ff1ff7..483c5ff1ff7 100644
--- a/pkgs/development/libraries/libmx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmx/default.nix
diff --git a/pkgs/development/libraries/libmypaint/default.nix b/nixpkgs/pkgs/development/libraries/libmypaint/default.nix
index c36633edfff..c36633edfff 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmypaint/default.nix
diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
index 166ff2ef5a0..166ff2ef5a0 100644
--- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
diff --git a/pkgs/development/libraries/libnabo/default.nix b/nixpkgs/pkgs/development/libraries/libnabo/default.nix
index 4c3ceee1e56..4c3ceee1e56 100644
--- a/pkgs/development/libraries/libnabo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnabo/default.nix
diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix
index 695d46ba38f..695d46ba38f 100644
--- a/pkgs/development/libraries/libnatpmp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix
diff --git a/pkgs/development/libraries/libnats-c/default.nix b/nixpkgs/pkgs/development/libraries/libnats-c/default.nix
index 3916ff35f69..3916ff35f69 100644
--- a/pkgs/development/libraries/libnats-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnats-c/default.nix
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/nixpkgs/pkgs/development/libraries/libnatspec/default.nix
index db4f6f5d468..db4f6f5d468 100644
--- a/pkgs/development/libraries/libnatspec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnatspec/default.nix
diff --git a/pkgs/development/libraries/libndctl/default.nix b/nixpkgs/pkgs/development/libraries/libndctl/default.nix
index 613103db69f..613103db69f 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libndctl/default.nix
diff --git a/pkgs/development/libraries/libndp/default.nix b/nixpkgs/pkgs/development/libraries/libndp/default.nix
index 78304246f12..78304246f12 100644
--- a/pkgs/development/libraries/libndp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libndp/default.nix
diff --git a/pkgs/development/libraries/libndtypes/default.nix b/nixpkgs/pkgs/development/libraries/libndtypes/default.nix
index a522c72fc76..a522c72fc76 100644
--- a/pkgs/development/libraries/libndtypes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libndtypes/default.nix
diff --git a/pkgs/development/libraries/libnet/default.nix b/nixpkgs/pkgs/development/libraries/libnet/default.nix
index 75cea004143..75cea004143 100644
--- a/pkgs/development/libraries/libnet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnet/default.nix
diff --git a/pkgs/development/libraries/libnet/fix-includes.patch b/nixpkgs/pkgs/development/libraries/libnet/fix-includes.patch
index 5eb86bc37b7..5eb86bc37b7 100644
--- a/pkgs/development/libraries/libnet/fix-includes.patch
+++ b/nixpkgs/pkgs/development/libraries/libnet/fix-includes.patch
diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix
index 328688612b6..328688612b6 100644
--- a/pkgs/development/libraries/libnetfilter_acct/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 85fbf458ac2..85fbf458ac2 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix
diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix
index 563843cca46..563843cca46 100644
--- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix
diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
index 9f706d619c3..9f706d619c3 100644
--- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix
index 2b932bc0809..2b932bc0809 100644
--- a/pkgs/development/libraries/libnetfilter_log/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix
diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix
index 5f84bc03f82..5f84bc03f82 100644
--- a/pkgs/development/libraries/libnetfilter_queue/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix
diff --git a/pkgs/development/libraries/libnfc/default.nix b/nixpkgs/pkgs/development/libraries/libnfc/default.nix
index 3d069d7a168..3d069d7a168 100644
--- a/pkgs/development/libraries/libnfc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnfc/default.nix
diff --git a/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch b/nixpkgs/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch
index 074bef42b97..074bef42b97 100644
--- a/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch
+++ b/nixpkgs/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch
diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix
index fa6461d8691..fa6461d8691 100644
--- a/pkgs/development/libraries/libnfnetlink/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix
diff --git a/pkgs/development/libraries/libnfs/default.nix b/nixpkgs/pkgs/development/libraries/libnfs/default.nix
index d2848d9a1e9..d2848d9a1e9 100644
--- a/pkgs/development/libraries/libnfs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnfs/default.nix
diff --git a/pkgs/development/libraries/libnftnl/default.nix b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
index a4f98eed417..a4f98eed417 100644
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
diff --git a/pkgs/development/libraries/libngspice/default.nix b/nixpkgs/pkgs/development/libraries/libngspice/default.nix
index ffecfcb61d0..ffecfcb61d0 100644
--- a/pkgs/development/libraries/libngspice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libngspice/default.nix
diff --git a/pkgs/development/libraries/libnice/default.nix b/nixpkgs/pkgs/development/libraries/libnice/default.nix
index 90bdb06bb7f..90bdb06bb7f 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnice/default.nix
diff --git a/pkgs/development/libraries/libnih/default.nix b/nixpkgs/pkgs/development/libraries/libnih/default.nix
index 4049a18145c..4049a18145c 100644
--- a/pkgs/development/libraries/libnih/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnih/default.nix
diff --git a/pkgs/development/libraries/libnotify/default.nix b/nixpkgs/pkgs/development/libraries/libnotify/default.nix
index 59039aadb89..59039aadb89 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnotify/default.nix
diff --git a/pkgs/development/libraries/libnova/default.nix b/nixpkgs/pkgs/development/libraries/libnova/default.nix
index cb70d803ac0..cb70d803ac0 100644
--- a/pkgs/development/libraries/libnova/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnova/default.nix
diff --git a/pkgs/development/libraries/libnsl/default.nix b/nixpkgs/pkgs/development/libraries/libnsl/default.nix
index 79006484743..79006484743 100644
--- a/pkgs/development/libraries/libnsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnsl/default.nix
diff --git a/pkgs/development/libraries/libnxml/default.nix b/nixpkgs/pkgs/development/libraries/libnxml/default.nix
index 0a6c58c8a01..0a6c58c8a01 100644
--- a/pkgs/development/libraries/libnxml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnxml/default.nix
diff --git a/pkgs/development/libraries/liboauth/default.nix b/nixpkgs/pkgs/development/libraries/liboauth/default.nix
index ea792b007ba..ea792b007ba 100644
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liboauth/default.nix
diff --git a/pkgs/development/libraries/libodfgen/default.nix b/nixpkgs/pkgs/development/libraries/libodfgen/default.nix
index 1723219e859..1723219e859 100644
--- a/pkgs/development/libraries/libodfgen/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libodfgen/default.nix
diff --git a/pkgs/development/libraries/libodfgen/default.upstream b/nixpkgs/pkgs/development/libraries/libodfgen/default.upstream
index bd78e974e42..bd78e974e42 100644
--- a/pkgs/development/libraries/libodfgen/default.upstream
+++ b/nixpkgs/pkgs/development/libraries/libodfgen/default.upstream
diff --git a/pkgs/development/libraries/libofa/default.nix b/nixpkgs/pkgs/development/libraries/libofa/default.nix
index 7dc23aa1e8a..7dc23aa1e8a 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libofa/default.nix
diff --git a/pkgs/development/libraries/libofx/default.nix b/nixpkgs/pkgs/development/libraries/libofx/default.nix
index 76276f0ce0f..76276f0ce0f 100644
--- a/pkgs/development/libraries/libofx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libofx/default.nix
diff --git a/pkgs/development/libraries/libogg/default.nix b/nixpkgs/pkgs/development/libraries/libogg/default.nix
index 4f7c5f38123..4f7c5f38123 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libogg/default.nix
diff --git a/pkgs/development/libraries/liboggz/default.nix b/nixpkgs/pkgs/development/libraries/liboggz/default.nix
index d7c3b747924..d7c3b747924 100644
--- a/pkgs/development/libraries/liboggz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liboggz/default.nix
diff --git a/pkgs/development/libraries/liboil/default.nix b/nixpkgs/pkgs/development/libraries/liboil/default.nix
index fb2dad60525..fb2dad60525 100644
--- a/pkgs/development/libraries/liboil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liboil/default.nix
diff --git a/pkgs/development/libraries/liboil/x86_64-cpuid.patch b/nixpkgs/pkgs/development/libraries/liboil/x86_64-cpuid.patch
index d86dd79c3bc..d86dd79c3bc 100644
--- a/pkgs/development/libraries/liboil/x86_64-cpuid.patch
+++ b/nixpkgs/pkgs/development/libraries/liboil/x86_64-cpuid.patch
diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix
index 4d45c6872e4..4d45c6872e4 100644
--- a/pkgs/development/libraries/libomxil-bellagio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix
diff --git a/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch b/nixpkgs/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch
index 2ae3c3c871c..2ae3c3c871c 100644
--- a/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch
+++ b/nixpkgs/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch
diff --git a/pkgs/development/libraries/liboop/default.nix b/nixpkgs/pkgs/development/libraries/liboop/default.nix
index 73d51ec49ff..73d51ec49ff 100644
--- a/pkgs/development/libraries/liboop/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liboop/default.nix
diff --git a/pkgs/development/libraries/libopcodes/default.nix b/nixpkgs/pkgs/development/libraries/libopcodes/default.nix
index aa307f68ca0..aa307f68ca0 100644
--- a/pkgs/development/libraries/libopcodes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libopcodes/default.nix
diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix
index 4ad1e2b7735..4ad1e2b7735 100644
--- a/pkgs/development/libraries/libopenaptx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix
diff --git a/pkgs/development/libraries/liboping/default.nix b/nixpkgs/pkgs/development/libraries/liboping/default.nix
index b2594d7c1d7..b2594d7c1d7 100644
--- a/pkgs/development/libraries/liboping/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liboping/default.nix
diff --git a/pkgs/development/libraries/libopus/default.nix b/nixpkgs/pkgs/development/libraries/libopus/default.nix
index 01da76749ba..01da76749ba 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libopus/default.nix
diff --git a/pkgs/development/libraries/libopusenc/default.nix b/nixpkgs/pkgs/development/libraries/libopusenc/default.nix
index 9b91e32f228..9b91e32f228 100644
--- a/pkgs/development/libraries/libopusenc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libopusenc/default.nix
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix
index a040956f553..a040956f553 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix
diff --git a/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch b/nixpkgs/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch
index 2197eca23d9..2197eca23d9 100644
--- a/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch
+++ b/nixpkgs/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch
diff --git a/pkgs/development/libraries/libosmium/default.nix b/nixpkgs/pkgs/development/libraries/libosmium/default.nix
index e6abe620aaf..e6abe620aaf 100644
--- a/pkgs/development/libraries/libosmium/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libosmium/default.nix
diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix
index 416101cad0a..416101cad0a 100644
--- a/pkgs/development/libraries/libosmpbf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix
index 47d9c4215fd..47d9c4215fd 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix
diff --git a/pkgs/development/libraries/libossp-uuid/shtool.patch b/nixpkgs/pkgs/development/libraries/libossp-uuid/shtool.patch
index f0c7cc485f5..f0c7cc485f5 100644
--- a/pkgs/development/libraries/libossp-uuid/shtool.patch
+++ b/nixpkgs/pkgs/development/libraries/libossp-uuid/shtool.patch
diff --git a/pkgs/development/libraries/libotr/default.nix b/nixpkgs/pkgs/development/libraries/libotr/default.nix
index db79bad745f..db79bad745f 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libotr/default.nix
diff --git a/pkgs/development/libraries/libow/default.nix b/nixpkgs/pkgs/development/libraries/libow/default.nix
index b9eedc4cd95..b9eedc4cd95 100644
--- a/pkgs/development/libraries/libow/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libow/default.nix
diff --git a/pkgs/development/libraries/libowfat/default.nix b/nixpkgs/pkgs/development/libraries/libowfat/default.nix
index 73029c76818..73029c76818 100644
--- a/pkgs/development/libraries/libowfat/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libowfat/default.nix
diff --git a/pkgs/development/libraries/libp11/default.nix b/nixpkgs/pkgs/development/libraries/libp11/default.nix
index 903aa66ce60..903aa66ce60 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libp11/default.nix
diff --git a/pkgs/development/libraries/libpaper/default.nix b/nixpkgs/pkgs/development/libraries/libpaper/default.nix
index 3c37cf82495..3c37cf82495 100644
--- a/pkgs/development/libraries/libpaper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpaper/default.nix
diff --git a/pkgs/development/libraries/libpar2/default.nix b/nixpkgs/pkgs/development/libraries/libpar2/default.nix
index bbdce71bad6..bbdce71bad6 100644
--- a/pkgs/development/libraries/libpar2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpar2/default.nix
diff --git a/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch b/nixpkgs/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch
index 74879c4fe9b..74879c4fe9b 100644
--- a/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch
+++ b/nixpkgs/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch
diff --git a/pkgs/development/libraries/libpcap/default.nix b/nixpkgs/pkgs/development/libraries/libpcap/default.nix
index b704878b164..b704878b164 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpcap/default.nix
diff --git a/pkgs/development/libraries/libpeas/default.nix b/nixpkgs/pkgs/development/libraries/libpeas/default.nix
index cdb1b95935f..cdb1b95935f 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpeas/default.nix
diff --git a/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch b/nixpkgs/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
index 8016939716d..8016939716d 100644
--- a/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
+++ b/nixpkgs/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
diff --git a/pkgs/development/libraries/libpfm/default.nix b/nixpkgs/pkgs/development/libraries/libpfm/default.nix
index 3398d3feb94..3398d3feb94 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpfm/default.nix
diff --git a/pkgs/development/libraries/libpgf/default.nix b/nixpkgs/pkgs/development/libraries/libpgf/default.nix
index b3dae0c60ea..b3dae0c60ea 100644
--- a/pkgs/development/libraries/libpgf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpgf/default.nix
diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix
index c864ccc70ac..c864ccc70ac 100644
--- a/pkgs/development/libraries/libphonenumber/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix
diff --git a/pkgs/development/libraries/libpinyin/default.nix b/nixpkgs/pkgs/development/libraries/libpinyin/default.nix
index 63035f74ea0..63035f74ea0 100644
--- a/pkgs/development/libraries/libpinyin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpinyin/default.nix
diff --git a/pkgs/development/libraries/libpipeline/default.nix b/nixpkgs/pkgs/development/libraries/libpipeline/default.nix
index eabf2d2a106..eabf2d2a106 100644
--- a/pkgs/development/libraries/libpipeline/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpipeline/default.nix
diff --git a/pkgs/development/libraries/libpipeline/fix-on-osx.patch b/nixpkgs/pkgs/development/libraries/libpipeline/fix-on-osx.patch
index c539e2dde97..c539e2dde97 100644
--- a/pkgs/development/libraries/libpipeline/fix-on-osx.patch
+++ b/nixpkgs/pkgs/development/libraries/libpipeline/fix-on-osx.patch
diff --git a/pkgs/development/libraries/libplacebo/default.nix b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix
index cee6d3f1845..cee6d3f1845 100644
--- a/pkgs/development/libraries/libplacebo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix
diff --git a/pkgs/development/libraries/libplist/default.nix b/nixpkgs/pkgs/development/libraries/libplist/default.nix
index 63599c4352d..63599c4352d 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libplist/default.nix
diff --git a/pkgs/development/libraries/libpng/12.nix b/nixpkgs/pkgs/development/libraries/libpng/12.nix
index 14ae1156087..14ae1156087 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/nixpkgs/pkgs/development/libraries/libpng/12.nix
diff --git a/pkgs/development/libraries/libpng/default.nix b/nixpkgs/pkgs/development/libraries/libpng/default.nix
index 95ef6201346..95ef6201346 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpng/default.nix
diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix
index 20b2988417c..20b2988417c 100644
--- a/pkgs/development/libraries/libpointmatcher/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix
diff --git a/pkgs/development/libraries/libpqxx/default.nix b/nixpkgs/pkgs/development/libraries/libpqxx/default.nix
index f6f2412c818..f6f2412c818 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpqxx/default.nix
diff --git a/pkgs/development/libraries/libproxy/default.nix b/nixpkgs/pkgs/development/libraries/libproxy/default.nix
index 8d4febcde28..8d4febcde28 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libproxy/default.nix
diff --git a/pkgs/development/libraries/libpseudo/default.nix b/nixpkgs/pkgs/development/libraries/libpseudo/default.nix
index c04c8d724d0..c04c8d724d0 100644
--- a/pkgs/development/libraries/libpseudo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpseudo/default.nix
diff --git a/pkgs/development/libraries/libpsl/default.nix b/nixpkgs/pkgs/development/libraries/libpsl/default.nix
index d2012760dcf..d2012760dcf 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpsl/default.nix
diff --git a/pkgs/development/libraries/libpst/default.nix b/nixpkgs/pkgs/development/libraries/libpst/default.nix
index 24b94827122..24b94827122 100644
--- a/pkgs/development/libraries/libpst/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpst/default.nix
diff --git a/pkgs/development/libraries/libpwquality/default.nix b/nixpkgs/pkgs/development/libraries/libpwquality/default.nix
index c3ad33173cd..c3ad33173cd 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpwquality/default.nix
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix
index dd6e3cbe952..dd6e3cbe952 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix
diff --git a/pkgs/development/libraries/libqb/default.nix b/nixpkgs/pkgs/development/libraries/libqb/default.nix
index 25b088f99ec..25b088f99ec 100644
--- a/pkgs/development/libraries/libqb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libqb/default.nix
diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix
index 34b396a7102..34b396a7102 100644
--- a/pkgs/development/libraries/libqglviewer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix
diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix
index 41a2a1b669d..41a2a1b669d 100644
--- a/pkgs/development/libraries/libqmatrixclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix
diff --git a/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix
index 6c78eb977c9..6c78eb977c9 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix
diff --git a/pkgs/development/libraries/libqtav/default.nix b/nixpkgs/pkgs/development/libraries/libqtav/default.nix
index dd6318444e7..dd6318444e7 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libqtav/default.nix
diff --git a/pkgs/development/libraries/libr3/default.nix b/nixpkgs/pkgs/development/libraries/libr3/default.nix
index cf848d02a04..cf848d02a04 100644
--- a/pkgs/development/libraries/libr3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libr3/default.nix
diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix
index ec31a29d053..ec31a29d053 100644
--- a/pkgs/development/libraries/libraspberrypi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix
diff --git a/pkgs/development/libraries/libraw/default.nix b/nixpkgs/pkgs/development/libraries/libraw/default.nix
index 00288e359df..00288e359df 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libraw/default.nix
diff --git a/pkgs/development/libraries/libraw1394/default.nix b/nixpkgs/pkgs/development/libraries/libraw1394/default.nix
index a99e4d22077..a99e4d22077 100644
--- a/pkgs/development/libraries/libraw1394/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libraw1394/default.nix
diff --git a/pkgs/development/libraries/librdf/default.nix b/nixpkgs/pkgs/development/libraries/librdf/default.nix
index 5b39940bb3f..5b39940bb3f 100644
--- a/pkgs/development/libraries/librdf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librdf/default.nix
diff --git a/pkgs/development/libraries/librdf/raptor.nix b/nixpkgs/pkgs/development/libraries/librdf/raptor.nix
index 14e3e1891ba..14e3e1891ba 100644
--- a/pkgs/development/libraries/librdf/raptor.nix
+++ b/nixpkgs/pkgs/development/libraries/librdf/raptor.nix
diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix
index 3f436677123..3f436677123 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/nixpkgs/pkgs/development/libraries/librdf/rasqal.nix
index 124fd017818..124fd017818 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/nixpkgs/pkgs/development/libraries/librdf/rasqal.nix
diff --git a/pkgs/development/libraries/librdf/redland.nix b/nixpkgs/pkgs/development/libraries/librdf/redland.nix
index 8835490187d..8835490187d 100644
--- a/pkgs/development/libraries/librdf/redland.nix
+++ b/nixpkgs/pkgs/development/libraries/librdf/redland.nix
diff --git a/pkgs/development/libraries/libre/default.nix b/nixpkgs/pkgs/development/libraries/libre/default.nix
index 6e1d0a8ce3c..6e1d0a8ce3c 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libre/default.nix
diff --git a/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix
index 91c093c991a..91c093c991a 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix
diff --git a/pkgs/development/libraries/librelp/default.nix b/nixpkgs/pkgs/development/libraries/librelp/default.nix
index bcc3e16dae8..bcc3e16dae8 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librelp/default.nix
diff --git a/pkgs/development/libraries/librem/default.nix b/nixpkgs/pkgs/development/libraries/librem/default.nix
index 012ac2a46a7..012ac2a46a7 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librem/default.nix
diff --git a/pkgs/development/libraries/librep/default.nix b/nixpkgs/pkgs/development/libraries/librep/default.nix
index 43f80076328..43f80076328 100644
--- a/pkgs/development/libraries/librep/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librep/default.nix
diff --git a/pkgs/development/libraries/librep/setup-hook.sh b/nixpkgs/pkgs/development/libraries/librep/setup-hook.sh
index 4d875b69330..4d875b69330 100644
--- a/pkgs/development/libraries/librep/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/librep/setup-hook.sh
diff --git a/pkgs/development/libraries/libresample/default.nix b/nixpkgs/pkgs/development/libraries/libresample/default.nix
index 3684fd924f7..3684fd924f7 100644
--- a/pkgs/development/libraries/libresample/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libresample/default.nix
diff --git a/pkgs/development/libraries/libressl/default.nix b/nixpkgs/pkgs/development/libraries/libressl/default.nix
index 285d7b607e7..285d7b607e7 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libressl/default.nix
diff --git a/pkgs/development/libraries/librest/default.nix b/nixpkgs/pkgs/development/libraries/librest/default.nix
index e70ac9a5362..e70ac9a5362 100644
--- a/pkgs/development/libraries/librest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librest/default.nix
diff --git a/pkgs/development/libraries/librevenge/default.nix b/nixpkgs/pkgs/development/libraries/librevenge/default.nix
index 2c6e792ae8c..2c6e792ae8c 100644
--- a/pkgs/development/libraries/librevenge/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librevenge/default.nix
diff --git a/pkgs/development/libraries/librevenge/default.upstream b/nixpkgs/pkgs/development/libraries/librevenge/default.upstream
index 78e47f83433..78e47f83433 100644
--- a/pkgs/development/libraries/librevenge/default.upstream
+++ b/nixpkgs/pkgs/development/libraries/librevenge/default.upstream
diff --git a/pkgs/development/libraries/librevisa/default.nix b/nixpkgs/pkgs/development/libraries/librevisa/default.nix
index d412e1e8ebb..d412e1e8ebb 100644
--- a/pkgs/development/libraries/librevisa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librevisa/default.nix
diff --git a/pkgs/development/libraries/librime/default.nix b/nixpkgs/pkgs/development/libraries/librime/default.nix
index a9a17eca786..a9a17eca786 100644
--- a/pkgs/development/libraries/librime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librime/default.nix
diff --git a/pkgs/development/libraries/libroxml/default.nix b/nixpkgs/pkgs/development/libraries/libroxml/default.nix
index 3993451e19f..3993451e19f 100644
--- a/pkgs/development/libraries/libroxml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libroxml/default.nix
diff --git a/pkgs/development/libraries/librseq/default.nix b/nixpkgs/pkgs/development/libraries/librseq/default.nix
index d4619ba4320..d4619ba4320 100644
--- a/pkgs/development/libraries/librseq/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librseq/default.nix
diff --git a/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix
index 11c7f3fed84..11c7f3fed84 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librsvg/default.nix
diff --git a/pkgs/development/libraries/librsync/0.9.nix b/nixpkgs/pkgs/development/libraries/librsync/0.9.nix
index 3ca84ed2ce5..3ca84ed2ce5 100644
--- a/pkgs/development/libraries/librsync/0.9.nix
+++ b/nixpkgs/pkgs/development/libraries/librsync/0.9.nix
diff --git a/pkgs/development/libraries/librsync/default.nix b/nixpkgs/pkgs/development/libraries/librsync/default.nix
index 02a8abb7c85..02a8abb7c85 100644
--- a/pkgs/development/libraries/librsync/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librsync/default.nix
diff --git a/pkgs/development/libraries/libs3/default.nix b/nixpkgs/pkgs/development/libraries/libs3/default.nix
index dfec4bc4897..dfec4bc4897 100644
--- a/pkgs/development/libraries/libs3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libs3/default.nix
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix
index b23bff415a2..b23bff415a2 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix
diff --git a/pkgs/development/libraries/libsass/default.nix b/nixpkgs/pkgs/development/libraries/libsass/default.nix
index 2092d72c9f8..2092d72c9f8 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsass/default.nix
diff --git a/pkgs/development/libraries/libscrypt/default.nix b/nixpkgs/pkgs/development/libraries/libscrypt/default.nix
index 3083136526b..3083136526b 100644
--- a/pkgs/development/libraries/libscrypt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libscrypt/default.nix
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/nixpkgs/pkgs/development/libraries/libsearpc/default.nix
index 9bf246f556d..9bf246f556d 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsearpc/default.nix
diff --git a/pkgs/development/libraries/libsearpc/libsearpc.pc.patch b/nixpkgs/pkgs/development/libraries/libsearpc/libsearpc.pc.patch
index 6f30932ba6d..6f30932ba6d 100644
--- a/pkgs/development/libraries/libsearpc/libsearpc.pc.patch
+++ b/nixpkgs/pkgs/development/libraries/libsearpc/libsearpc.pc.patch
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix
index 08c276c4d55..08c276c4d55 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix
diff --git a/pkgs/development/libraries/libsecret/default.nix b/nixpkgs/pkgs/development/libraries/libsecret/default.nix
index d62fc1508c0..d62fc1508c0 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsecret/default.nix
diff --git a/pkgs/development/libraries/libserialport/default.nix b/nixpkgs/pkgs/development/libraries/libserialport/default.nix
index 2c34c1d8b7b..2c34c1d8b7b 100644
--- a/pkgs/development/libraries/libserialport/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libserialport/default.nix
diff --git a/pkgs/development/libraries/libshout/default.nix b/nixpkgs/pkgs/development/libraries/libshout/default.nix
index 849c93962f8..849c93962f8 100644
--- a/pkgs/development/libraries/libshout/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libshout/default.nix
diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix
index 970c4aff246..970c4aff246 100644
--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix
diff --git a/pkgs/development/libraries/libsieve/default.nix b/nixpkgs/pkgs/development/libraries/libsieve/default.nix
index bc34318d0a9..bc34318d0a9 100644
--- a/pkgs/development/libraries/libsieve/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsieve/default.nix
diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix
index fa27a80e22e..fa27a80e22e 100644
--- a/pkgs/development/libraries/libsigcxx/1.2.nix
+++ b/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix
diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix
index 434dbfb9f72..434dbfb9f72 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix
diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/nixpkgs/pkgs/development/libraries/libsignal-protocol-c/default.nix
index f3549d52f69..f3549d52f69 100644
--- a/pkgs/development/libraries/libsignal-protocol-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsignal-protocol-c/default.nix
diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix
index c7f49a6f6dc..c7f49a6f6dc 100644
--- a/pkgs/development/libraries/libsignon-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix
diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix
index b50a7c371a7..b50a7c371a7 100644
--- a/pkgs/development/libraries/libsigsegv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix
diff --git a/pkgs/development/libraries/libsigsegv/sigbus_fix.patch b/nixpkgs/pkgs/development/libraries/libsigsegv/sigbus_fix.patch
index 6f1c399041d..6f1c399041d 100644
--- a/pkgs/development/libraries/libsigsegv/sigbus_fix.patch
+++ b/nixpkgs/pkgs/development/libraries/libsigsegv/sigbus_fix.patch
diff --git a/pkgs/development/libraries/libsixel/default.nix b/nixpkgs/pkgs/development/libraries/libsixel/default.nix
index 9973f337398..9973f337398 100644
--- a/pkgs/development/libraries/libsixel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsixel/default.nix
diff --git a/pkgs/development/libraries/libskk/default.nix b/nixpkgs/pkgs/development/libraries/libskk/default.nix
index d0f822a23f5..d0f822a23f5 100644
--- a/pkgs/development/libraries/libskk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libskk/default.nix
diff --git a/pkgs/development/libraries/libsmi/default.nix b/nixpkgs/pkgs/development/libraries/libsmi/default.nix
index 208aa6c9d61..208aa6c9d61 100644
--- a/pkgs/development/libraries/libsmi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsmi/default.nix
diff --git a/pkgs/development/libraries/libsnark/default.nix b/nixpkgs/pkgs/development/libraries/libsnark/default.nix
index 15d8169f102..15d8169f102 100644
--- a/pkgs/development/libraries/libsnark/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsnark/default.nix
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix
index b150dd0f59c..b150dd0f59c 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix
diff --git a/pkgs/development/libraries/libsodium/default.nix b/nixpkgs/pkgs/development/libraries/libsodium/default.nix
index a2b6ba6224e..a2b6ba6224e 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsodium/default.nix
diff --git a/pkgs/development/libraries/libsolv/default.nix b/nixpkgs/pkgs/development/libraries/libsolv/default.nix
index 73b1604f2ee..73b1604f2ee 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsolv/default.nix
diff --git a/pkgs/development/libraries/libsoundio/default.nix b/nixpkgs/pkgs/development/libraries/libsoundio/default.nix
index 62e5601b73c..62e5601b73c 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsoundio/default.nix
diff --git a/pkgs/development/libraries/libsoup/default.nix b/nixpkgs/pkgs/development/libraries/libsoup/default.nix
index 2d2f2da6a39..2d2f2da6a39 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsoup/default.nix
diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix
index d85c9e94ebd..d85c9e94ebd 100644
--- a/pkgs/development/libraries/libspatialindex/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix
diff --git a/pkgs/development/libraries/libspatialite/default.nix b/nixpkgs/pkgs/development/libraries/libspatialite/default.nix
index 7bd22248d87..7bd22248d87 100644
--- a/pkgs/development/libraries/libspatialite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspatialite/default.nix
diff --git a/pkgs/development/libraries/libspectre/default.nix b/nixpkgs/pkgs/development/libraries/libspectre/default.nix
index f1e4169bd48..f1e4169bd48 100644
--- a/pkgs/development/libraries/libspectre/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspectre/default.nix
diff --git a/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch b/nixpkgs/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch
index e9a4eda192b..e9a4eda192b 100644
--- a/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch
+++ b/nixpkgs/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch
diff --git a/pkgs/development/libraries/libspectrum/default.nix b/nixpkgs/pkgs/development/libraries/libspectrum/default.nix
index c09a45abf59..c09a45abf59 100644
--- a/pkgs/development/libraries/libspectrum/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspectrum/default.nix
diff --git a/pkgs/development/libraries/libspf2/default.nix b/nixpkgs/pkgs/development/libraries/libspf2/default.nix
index d4b11270428..d4b11270428 100644
--- a/pkgs/development/libraries/libspf2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspf2/default.nix
diff --git a/pkgs/development/libraries/libspiro/default.nix b/nixpkgs/pkgs/development/libraries/libspiro/default.nix
index 5f547a97370..5f547a97370 100644
--- a/pkgs/development/libraries/libspiro/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspiro/default.nix
diff --git a/pkgs/development/libraries/libspotify/default.nix b/nixpkgs/pkgs/development/libraries/libspotify/default.nix
index 1b0953df4e6..1b0953df4e6 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libspotify/default.nix
diff --git a/pkgs/development/libraries/libsrs2/default.nix b/nixpkgs/pkgs/development/libraries/libsrs2/default.nix
index f8fc6a446d1..f8fc6a446d1 100644
--- a/pkgs/development/libraries/libsrs2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsrs2/default.nix
diff --git a/pkgs/development/libraries/libssh/default.nix b/nixpkgs/pkgs/development/libraries/libssh/default.nix
index 65de6db3b47..65de6db3b47 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libssh/default.nix
diff --git a/pkgs/development/libraries/libssh2/default.nix b/nixpkgs/pkgs/development/libraries/libssh2/default.nix
index d4205981499..d4205981499 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libssh2/default.nix
diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix
index e10dffa96c1..e10dffa96c1 100644
--- a/pkgs/development/libraries/libstatgrab/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix
diff --git a/pkgs/development/libraries/libstemmer/default.nix b/nixpkgs/pkgs/development/libraries/libstemmer/default.nix
index 2f6b2835c4e..2f6b2835c4e 100644
--- a/pkgs/development/libraries/libstemmer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libstemmer/default.nix
diff --git a/pkgs/development/libraries/libstroke/default.nix b/nixpkgs/pkgs/development/libraries/libstroke/default.nix
index 400a107c518..400a107c518 100644
--- a/pkgs/development/libraries/libstroke/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libstroke/default.nix
diff --git a/pkgs/development/libraries/libstrophe/default.nix b/nixpkgs/pkgs/development/libraries/libstrophe/default.nix
index b48bd15909d..b48bd15909d 100644
--- a/pkgs/development/libraries/libstrophe/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libstrophe/default.nix
diff --git a/pkgs/development/libraries/libsvm/default.nix b/nixpkgs/pkgs/development/libraries/libsvm/default.nix
index 99eccc3436f..99eccc3436f 100644
--- a/pkgs/development/libraries/libsvm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsvm/default.nix
diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix
index ecfa3377c99..ecfa3377c99 100644
--- a/pkgs/development/libraries/libsystemtap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix
diff --git a/pkgs/development/libraries/libtap/default.nix b/nixpkgs/pkgs/development/libraries/libtap/default.nix
index ca0407bd0aa..ca0407bd0aa 100644
--- a/pkgs/development/libraries/libtap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtap/default.nix
diff --git a/pkgs/development/libraries/libtar/default.nix b/nixpkgs/pkgs/development/libraries/libtar/default.nix
index c4614103b3f..c4614103b3f 100644
--- a/pkgs/development/libraries/libtar/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtar/default.nix
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/nixpkgs/pkgs/development/libraries/libtasn1/default.nix
index 004d2ef0dd5..004d2ef0dd5 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtasn1/default.nix
diff --git a/pkgs/development/libraries/libtcod/default.nix b/nixpkgs/pkgs/development/libraries/libtcod/default.nix
index d81f3f82001..d81f3f82001 100644
--- a/pkgs/development/libraries/libtcod/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtcod/default.nix
diff --git a/pkgs/development/libraries/libtelnet/default.nix b/nixpkgs/pkgs/development/libraries/libtelnet/default.nix
index 043acee0cfe..043acee0cfe 100644
--- a/pkgs/development/libraries/libtelnet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtelnet/default.nix
diff --git a/pkgs/development/libraries/libtermkey/default.nix b/nixpkgs/pkgs/development/libraries/libtermkey/default.nix
index 989d26b64e1..989d26b64e1 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtermkey/default.nix
diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/nixpkgs/pkgs/development/libraries/libtgvoip/default.nix
index 80c6e7e204e..80c6e7e204e 100644
--- a/pkgs/development/libraries/libtgvoip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtgvoip/default.nix
diff --git a/pkgs/development/libraries/libtheora/default.nix b/nixpkgs/pkgs/development/libraries/libtheora/default.nix
index 81bd35ff293..81bd35ff293 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtheora/default.nix
diff --git a/pkgs/development/libraries/libtiff/default.nix b/nixpkgs/pkgs/development/libraries/libtiff/default.nix
index 795ed439093..795ed439093 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtiff/default.nix
diff --git a/pkgs/development/libraries/libtiger/default.nix b/nixpkgs/pkgs/development/libraries/libtiger/default.nix
index 7a72fa2b7a3..7a72fa2b7a3 100644
--- a/pkgs/development/libraries/libtiger/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtiger/default.nix
diff --git a/pkgs/development/libraries/libtins/default.nix b/nixpkgs/pkgs/development/libraries/libtins/default.nix
index 60bb092c6fa..60bb092c6fa 100644
--- a/pkgs/development/libraries/libtins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtins/default.nix
diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix
index 6520ddd0a9e..6520ddd0a9e 100644
--- a/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix
diff --git a/pkgs/development/libraries/libtommath/default.nix b/nixpkgs/pkgs/development/libraries/libtommath/default.nix
index 0fde422b9aa..0fde422b9aa 100644
--- a/pkgs/development/libraries/libtommath/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtommath/default.nix
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 26605eb41db..26605eb41db 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix
index 76362f8f883..76362f8f883 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix
diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix
index 6cd5f9122a4..6cd5f9122a4 100644
--- a/pkgs/development/libraries/libtoxcore/new-api.nix
+++ b/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix
diff --git a/pkgs/development/libraries/libtsm/darwin.patch b/nixpkgs/pkgs/development/libraries/libtsm/darwin.patch
index d447be456e0..d447be456e0 100644
--- a/pkgs/development/libraries/libtsm/darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/libtsm/darwin.patch
diff --git a/pkgs/development/libraries/libtsm/default.nix b/nixpkgs/pkgs/development/libraries/libtsm/default.nix
index 18ceb530229..18ceb530229 100644
--- a/pkgs/development/libraries/libtsm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtsm/default.nix
diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/nixpkgs/pkgs/development/libraries/libtxc_dxtn/default.nix
index 600b1fb510a..600b1fb510a 100644
--- a/pkgs/development/libraries/libtxc_dxtn/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtxc_dxtn/default.nix
diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/nixpkgs/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
index f9f44f5a653..f9f44f5a653 100644
--- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/nixpkgs/pkgs/development/libraries/libu2f-host/default.nix
index ad0557049e3..ad0557049e3 100644
--- a/pkgs/development/libraries/libu2f-host/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libu2f-host/default.nix
diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/nixpkgs/pkgs/development/libraries/libu2f-server/default.nix
index 6140c13e493..6140c13e493 100644
--- a/pkgs/development/libraries/libu2f-server/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libu2f-server/default.nix
diff --git a/pkgs/development/libraries/libubox/default.nix b/nixpkgs/pkgs/development/libraries/libubox/default.nix
index 71ac22e85a8..71ac22e85a8 100644
--- a/pkgs/development/libraries/libubox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libubox/default.nix
diff --git a/pkgs/development/libraries/libuchardet/default.nix b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix
index 6bfb694a41b..6bfb694a41b 100644
--- a/pkgs/development/libraries/libuchardet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix
diff --git a/pkgs/development/libraries/libuecc/default.nix b/nixpkgs/pkgs/development/libraries/libuecc/default.nix
index 7080edcd738..7080edcd738 100644
--- a/pkgs/development/libraries/libuecc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuecc/default.nix
diff --git a/pkgs/development/libraries/libui/default.nix b/nixpkgs/pkgs/development/libraries/libui/default.nix
index 57385d1b410..57385d1b410 100644
--- a/pkgs/development/libraries/libui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libui/default.nix
diff --git a/pkgs/development/libraries/libui/libui.pc b/nixpkgs/pkgs/development/libraries/libui/libui.pc
index 42ee86fb550..42ee86fb550 100644
--- a/pkgs/development/libraries/libui/libui.pc
+++ b/nixpkgs/pkgs/development/libraries/libui/libui.pc
diff --git a/pkgs/development/libraries/libuinputplus/default.nix b/nixpkgs/pkgs/development/libraries/libuinputplus/default.nix
index 700a4701fc8..700a4701fc8 100644
--- a/pkgs/development/libraries/libuinputplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuinputplus/default.nix
diff --git a/pkgs/development/libraries/libunarr/default.nix b/nixpkgs/pkgs/development/libraries/libunarr/default.nix
index 35ec5dfed7c..35ec5dfed7c 100644
--- a/pkgs/development/libraries/libunarr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunarr/default.nix
diff --git a/pkgs/development/libraries/libunibreak/default.nix b/nixpkgs/pkgs/development/libraries/libunibreak/default.nix
index 7e75954fb45..7e75954fb45 100644
--- a/pkgs/development/libraries/libunibreak/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunibreak/default.nix
diff --git a/pkgs/development/libraries/libunique/1.1.6-G_CONST_RETURN.patch b/nixpkgs/pkgs/development/libraries/libunique/1.1.6-G_CONST_RETURN.patch
index 1cc5b6e01be..1cc5b6e01be 100644
--- a/pkgs/development/libraries/libunique/1.1.6-G_CONST_RETURN.patch
+++ b/nixpkgs/pkgs/development/libraries/libunique/1.1.6-G_CONST_RETURN.patch
diff --git a/pkgs/development/libraries/libunique/1.1.6-compiler-warnings.patch b/nixpkgs/pkgs/development/libraries/libunique/1.1.6-compiler-warnings.patch
index f47e66267d5..f47e66267d5 100644
--- a/pkgs/development/libraries/libunique/1.1.6-compiler-warnings.patch
+++ b/nixpkgs/pkgs/development/libraries/libunique/1.1.6-compiler-warnings.patch
diff --git a/pkgs/development/libraries/libunique/1.1.6-fix-test.patch b/nixpkgs/pkgs/development/libraries/libunique/1.1.6-fix-test.patch
index b2e85e4d71a..b2e85e4d71a 100644
--- a/pkgs/development/libraries/libunique/1.1.6-fix-test.patch
+++ b/nixpkgs/pkgs/development/libraries/libunique/1.1.6-fix-test.patch
diff --git a/pkgs/development/libraries/libunique/1.1.6-include-terminator.patch b/nixpkgs/pkgs/development/libraries/libunique/1.1.6-include-terminator.patch
index 927771e7311..927771e7311 100644
--- a/pkgs/development/libraries/libunique/1.1.6-include-terminator.patch
+++ b/nixpkgs/pkgs/development/libraries/libunique/1.1.6-include-terminator.patch
diff --git a/pkgs/development/libraries/libunique/3.x.nix b/nixpkgs/pkgs/development/libraries/libunique/3.x.nix
index b315d0f16b0..b315d0f16b0 100644
--- a/pkgs/development/libraries/libunique/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/libunique/3.x.nix
diff --git a/pkgs/development/libraries/libunique/default.nix b/nixpkgs/pkgs/development/libraries/libunique/default.nix
index d6566978a6b..d6566978a6b 100644
--- a/pkgs/development/libraries/libunique/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunique/default.nix
diff --git a/pkgs/development/libraries/libunique/gcc7-bug.patch b/nixpkgs/pkgs/development/libraries/libunique/gcc7-bug.patch
index 2b0587510bc..2b0587510bc 100644
--- a/pkgs/development/libraries/libunique/gcc7-bug.patch
+++ b/nixpkgs/pkgs/development/libraries/libunique/gcc7-bug.patch
diff --git a/pkgs/development/libraries/libunistring/default.nix b/nixpkgs/pkgs/development/libraries/libunistring/default.nix
index e02e5228aa4..e02e5228aa4 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunistring/default.nix
diff --git a/pkgs/development/libraries/libunity/default.nix b/nixpkgs/pkgs/development/libraries/libunity/default.nix
index daaf3de6bcc..daaf3de6bcc 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunity/default.nix
diff --git a/pkgs/development/libraries/libunity/fix-vala.patch b/nixpkgs/pkgs/development/libraries/libunity/fix-vala.patch
index ec34229b444..ec34229b444 100644
--- a/pkgs/development/libraries/libunity/fix-vala.patch
+++ b/nixpkgs/pkgs/development/libraries/libunity/fix-vala.patch
diff --git a/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch b/nixpkgs/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch
index 5fcaa72c0c0..5fcaa72c0c0 100644
--- a/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch
+++ b/nixpkgs/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch
diff --git a/pkgs/development/libraries/libunwind/default.nix b/nixpkgs/pkgs/development/libraries/libunwind/default.nix
index 70e6b698ec5..70e6b698ec5 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libunwind/default.nix
diff --git a/pkgs/development/libraries/liburcu/default.nix b/nixpkgs/pkgs/development/libraries/liburcu/default.nix
index 3ed45e788c4..3ed45e788c4 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liburcu/default.nix
diff --git a/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix
index 386354b48e4..386354b48e4 100644
--- a/pkgs/development/libraries/liburing/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix
diff --git a/pkgs/development/libraries/libusb/default.nix b/nixpkgs/pkgs/development/libraries/libusb/default.nix
index adf354c45f2..adf354c45f2 100644
--- a/pkgs/development/libraries/libusb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libusb/default.nix
diff --git a/pkgs/development/libraries/libusb/fix-headers.patch b/nixpkgs/pkgs/development/libraries/libusb/fix-headers.patch
index ea9cbc34978..ea9cbc34978 100644
--- a/pkgs/development/libraries/libusb/fix-headers.patch
+++ b/nixpkgs/pkgs/development/libraries/libusb/fix-headers.patch
diff --git a/pkgs/development/libraries/libusb1/default.nix b/nixpkgs/pkgs/development/libraries/libusb1/default.nix
index 9d90304042c..9d90304042c 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libusb1/default.nix
diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix
index debccb9087d..debccb9087d 100644
--- a/pkgs/development/libraries/libusbmuxd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix
diff --git a/pkgs/development/libraries/libutempter/default.nix b/nixpkgs/pkgs/development/libraries/libutempter/default.nix
index ff2044242b9..ff2044242b9 100644
--- a/pkgs/development/libraries/libutempter/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libutempter/default.nix
diff --git a/pkgs/development/libraries/libutempter/exec_path.patch b/nixpkgs/pkgs/development/libraries/libutempter/exec_path.patch
index bd5f56611ef..bd5f56611ef 100644
--- a/pkgs/development/libraries/libutempter/exec_path.patch
+++ b/nixpkgs/pkgs/development/libraries/libutempter/exec_path.patch
diff --git a/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix
index 524896b8bfd..524896b8bfd 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix
diff --git a/pkgs/development/libraries/libva-utils/default.nix b/nixpkgs/pkgs/development/libraries/libva-utils/default.nix
index c604ce71cb7..c604ce71cb7 100644
--- a/pkgs/development/libraries/libva-utils/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libva-utils/default.nix
diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix
index 9b12f83bcb8..9b12f83bcb8 100644
--- a/pkgs/development/libraries/libva/1.0.0.nix
+++ b/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix
diff --git a/pkgs/development/libraries/libva/default.nix b/nixpkgs/pkgs/development/libraries/libva/default.nix
index 7aba75a1d23..7aba75a1d23 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libva/default.nix
diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix
index 039e3308f88..039e3308f88 100644
--- a/pkgs/development/libraries/libvdpau-va-gl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix
diff --git a/pkgs/development/libraries/libvdpau/default.nix b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix
index e6a57f1e38c..e6a57f1e38c 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix
diff --git a/pkgs/development/libraries/libversion/default.nix b/nixpkgs/pkgs/development/libraries/libversion/default.nix
index 5d1449e3530..5d1449e3530 100644
--- a/pkgs/development/libraries/libversion/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libversion/default.nix
diff --git a/pkgs/development/libraries/libviper/default.nix b/nixpkgs/pkgs/development/libraries/libviper/default.nix
index 6ca3d997e65..6ca3d997e65 100644
--- a/pkgs/development/libraries/libviper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libviper/default.nix
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix
index 7dd874ebc83..7dd874ebc83 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix
diff --git a/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix
index 44cdd9edf52..44cdd9edf52 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix
diff --git a/pkgs/development/libraries/libvisio/default.nix b/nixpkgs/pkgs/development/libraries/libvisio/default.nix
index b807691671f..b807691671f 100644
--- a/pkgs/development/libraries/libvisio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvisio/default.nix
diff --git a/pkgs/development/libraries/libvisual/default.nix b/nixpkgs/pkgs/development/libraries/libvisual/default.nix
index 6e8e2d95b6b..6e8e2d95b6b 100644
--- a/pkgs/development/libraries/libvisual/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvisual/default.nix
diff --git a/pkgs/development/libraries/libvmaf/default.nix b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix
index 82c76f7ea37..82c76f7ea37 100644
--- a/pkgs/development/libraries/libvmaf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix
diff --git a/pkgs/development/libraries/libvmi/default.nix b/nixpkgs/pkgs/development/libraries/libvmi/default.nix
index e49ab9b38a0..e49ab9b38a0 100644
--- a/pkgs/development/libraries/libvmi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvmi/default.nix
diff --git a/pkgs/development/libraries/libvncserver/default.nix b/nixpkgs/pkgs/development/libraries/libvncserver/default.nix
index c9adad6f645..c9adad6f645 100644
--- a/pkgs/development/libraries/libvncserver/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvncserver/default.nix
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/nixpkgs/pkgs/development/libraries/libvorbis/default.nix
index 263fa0a5216..263fa0a5216 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvorbis/default.nix
diff --git a/pkgs/development/libraries/libvpx/default.nix b/nixpkgs/pkgs/development/libraries/libvpx/default.nix
index d80fe6a998c..d80fe6a998c 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvpx/default.nix
diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix
index 0cd1b64c1b9..0cd1b64c1b9 100644
--- a/pkgs/development/libraries/libvterm-neovim/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix
diff --git a/pkgs/development/libraries/libvterm/default.nix b/nixpkgs/pkgs/development/libraries/libvterm/default.nix
index 472539ea24b..472539ea24b 100644
--- a/pkgs/development/libraries/libvterm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvterm/default.nix
diff --git a/pkgs/development/libraries/libwacom/default.nix b/nixpkgs/pkgs/development/libraries/libwacom/default.nix
index 7d7dd94eff4..7d7dd94eff4 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwacom/default.nix
diff --git a/pkgs/development/libraries/libwebp/default.nix b/nixpkgs/pkgs/development/libraries/libwebp/default.nix
index 56c3f638d52..56c3f638d52 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwebp/default.nix
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix
index 732a529c21f..732a529c21f 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix
diff --git a/pkgs/development/libraries/libwhereami/default.nix b/nixpkgs/pkgs/development/libraries/libwhereami/default.nix
index 8e190f998d5..8e190f998d5 100644
--- a/pkgs/development/libraries/libwhereami/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwhereami/default.nix
diff --git a/pkgs/development/libraries/libwmf/default.nix b/nixpkgs/pkgs/development/libraries/libwmf/default.nix
index 5c684c7fd77..5c684c7fd77 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwmf/default.nix
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix
index 29692c41c93..29692c41c93 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix
diff --git a/pkgs/development/libraries/libwnck/default.nix b/nixpkgs/pkgs/development/libraries/libwnck/default.nix
index 2872181a36d..2872181a36d 100644
--- a/pkgs/development/libraries/libwnck/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwnck/default.nix
diff --git a/pkgs/development/libraries/libwnck/fix-pc-file.patch b/nixpkgs/pkgs/development/libraries/libwnck/fix-pc-file.patch
index 42017a993b5..42017a993b5 100644
--- a/pkgs/development/libraries/libwnck/fix-pc-file.patch
+++ b/nixpkgs/pkgs/development/libraries/libwnck/fix-pc-file.patch
diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/nixpkgs/pkgs/development/libraries/libwpd/0.8.nix
index 736b1a45fa2..736b1a45fa2 100644
--- a/pkgs/development/libraries/libwpd/0.8.nix
+++ b/nixpkgs/pkgs/development/libraries/libwpd/0.8.nix
diff --git a/pkgs/development/libraries/libwpd/default.nix b/nixpkgs/pkgs/development/libraries/libwpd/default.nix
index 56c598ca7de..56c598ca7de 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwpd/default.nix
diff --git a/pkgs/development/libraries/libwpd/gcc-0.8.patch b/nixpkgs/pkgs/development/libraries/libwpd/gcc-0.8.patch
index 05eb3293ed7..05eb3293ed7 100644
--- a/pkgs/development/libraries/libwpd/gcc-0.8.patch
+++ b/nixpkgs/pkgs/development/libraries/libwpd/gcc-0.8.patch
diff --git a/pkgs/development/libraries/libwpg/default.nix b/nixpkgs/pkgs/development/libraries/libwpg/default.nix
index e80cefe16e2..e80cefe16e2 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwpg/default.nix
diff --git a/pkgs/development/libraries/libwps/default.nix b/nixpkgs/pkgs/development/libraries/libwps/default.nix
index 61b777a5243..61b777a5243 100644
--- a/pkgs/development/libraries/libwps/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwps/default.nix
diff --git a/pkgs/development/libraries/libx86/constants.patch b/nixpkgs/pkgs/development/libraries/libx86/constants.patch
index 10fc829d674..10fc829d674 100644
--- a/pkgs/development/libraries/libx86/constants.patch
+++ b/nixpkgs/pkgs/development/libraries/libx86/constants.patch
diff --git a/pkgs/development/libraries/libx86/default.nix b/nixpkgs/pkgs/development/libraries/libx86/default.nix
index 271823ace28..271823ace28 100644
--- a/pkgs/development/libraries/libx86/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libx86/default.nix
diff --git a/pkgs/development/libraries/libx86/non-x86.patch b/nixpkgs/pkgs/development/libraries/libx86/non-x86.patch
index 286057c4ba8..286057c4ba8 100644
--- a/pkgs/development/libraries/libx86/non-x86.patch
+++ b/nixpkgs/pkgs/development/libraries/libx86/non-x86.patch
diff --git a/pkgs/development/libraries/libx86/src-for-default.nix b/nixpkgs/pkgs/development/libraries/libx86/src-for-default.nix
index 30be467f9fd..30be467f9fd 100644
--- a/pkgs/development/libraries/libx86/src-for-default.nix
+++ b/nixpkgs/pkgs/development/libraries/libx86/src-for-default.nix
diff --git a/pkgs/development/libraries/libx86/src-info-for-default.nix b/nixpkgs/pkgs/development/libraries/libx86/src-info-for-default.nix
index 9861e21f655..9861e21f655 100644
--- a/pkgs/development/libraries/libx86/src-info-for-default.nix
+++ b/nixpkgs/pkgs/development/libraries/libx86/src-info-for-default.nix
diff --git a/pkgs/development/libraries/libx86emu/default.nix b/nixpkgs/pkgs/development/libraries/libx86emu/default.nix
index cef2c6aeb1b..cef2c6aeb1b 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libx86emu/default.nix
diff --git a/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix
index fede13fcd9b..fede13fcd9b 100644
--- a/pkgs/development/libraries/libxc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/nixpkgs/pkgs/development/libraries/libxcomp/default.nix
index fb1f4b29423..fb1f4b29423 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxcomp/default.nix
diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix
index f0e63efc0d1..f0e63efc0d1 100644
--- a/pkgs/development/libraries/libxdg-basedir/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix
index 44530b38150..44530b38150 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix
diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
index 510955d0af2..510955d0af2 100644
--- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
+++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/nixpkgs/pkgs/development/libraries/libxklavier/default.nix
index b088ba198b2..b088ba198b2 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxklavier/default.nix
diff --git a/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch b/nixpkgs/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch
index 93b768eeb20..93b768eeb20 100644
--- a/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch
+++ b/nixpkgs/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch
diff --git a/pkgs/development/libraries/libxl/default.nix b/nixpkgs/pkgs/development/libraries/libxl/default.nix
index 6f11d4c461f..6f11d4c461f 100644
--- a/pkgs/development/libraries/libxl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxl/default.nix
diff --git a/pkgs/development/libraries/libxls/default.nix b/nixpkgs/pkgs/development/libraries/libxls/default.nix
index c111a13d298..c111a13d298 100644
--- a/pkgs/development/libraries/libxls/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxls/default.nix
diff --git a/pkgs/development/libraries/libxmi/default.nix b/nixpkgs/pkgs/development/libraries/libxmi/default.nix
index aff5f8ac445..aff5f8ac445 100644
--- a/pkgs/development/libraries/libxmi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmi/default.nix
diff --git a/pkgs/development/libraries/libxml2/default.nix b/nixpkgs/pkgs/development/libraries/libxml2/default.nix
index 42515b7373c..42515b7373c 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix
diff --git a/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch b/nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch
index 9f4c99b0934..9f4c99b0934 100644
--- a/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch
+++ b/nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch
diff --git a/pkgs/development/libraries/libxmlb/default.nix b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
index 75fffa83d24..75fffa83d24 100644
--- a/pkgs/development/libraries/libxmlb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
diff --git a/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch
index ab36d9efad8..ab36d9efad8 100644
--- a/pkgs/development/libraries/libxmlb/installed-tests-path.patch
+++ b/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch
diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix
index c80808081ff..c80808081ff 100644
--- a/pkgs/development/libraries/libxmlxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix
diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix
index 94c2ca09582..94c2ca09582 100644
--- a/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix
diff --git a/pkgs/development/libraries/libxmp/default.nix b/nixpkgs/pkgs/development/libraries/libxmp/default.nix
index ca4d7edbf32..ca4d7edbf32 100644
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmp/default.nix
diff --git a/pkgs/development/libraries/libxnd/default.nix b/nixpkgs/pkgs/development/libraries/libxnd/default.nix
index eb031eb2a9d..eb031eb2a9d 100644
--- a/pkgs/development/libraries/libxnd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxnd/default.nix
diff --git a/pkgs/development/libraries/libxslt/default.nix b/nixpkgs/pkgs/development/libraries/libxslt/default.nix
index 6d12329a7f5..6d12329a7f5 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxslt/default.nix
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix
index 0dec9daee6a..0dec9daee6a 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix
diff --git a/pkgs/development/libraries/libyaml/default.nix b/nixpkgs/pkgs/development/libraries/libyaml/default.nix
index 143555137d7..143555137d7 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libyaml/default.nix
diff --git a/pkgs/development/libraries/libykclient/default.nix b/nixpkgs/pkgs/development/libraries/libykclient/default.nix
index e1bf4fca7b5..e1bf4fca7b5 100644
--- a/pkgs/development/libraries/libykclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libykclient/default.nix
diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/nixpkgs/pkgs/development/libraries/libykneomgr/default.nix
index be493828486..be493828486 100644
--- a/pkgs/development/libraries/libykneomgr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libykneomgr/default.nix
diff --git a/pkgs/development/libraries/libytnef/default.nix b/nixpkgs/pkgs/development/libraries/libytnef/default.nix
index e46064ae56e..e46064ae56e 100644
--- a/pkgs/development/libraries/libytnef/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libytnef/default.nix
diff --git a/pkgs/development/libraries/libyubikey/default.nix b/nixpkgs/pkgs/development/libraries/libyubikey/default.nix
index 010eecb0fa9..010eecb0fa9 100644
--- a/pkgs/development/libraries/libyubikey/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libyubikey/default.nix
diff --git a/pkgs/development/libraries/libzapojit/default.nix b/nixpkgs/pkgs/development/libraries/libzapojit/default.nix
index 215535fb8f1..215535fb8f1 100644
--- a/pkgs/development/libraries/libzapojit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libzapojit/default.nix
diff --git a/pkgs/development/libraries/libzdb/default.nix b/nixpkgs/pkgs/development/libraries/libzdb/default.nix
index b16d897fb5f..b16d897fb5f 100644
--- a/pkgs/development/libraries/libzdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libzdb/default.nix
diff --git a/pkgs/development/libraries/libzen/default.nix b/nixpkgs/pkgs/development/libraries/libzen/default.nix
index fbbfb5364b0..fbbfb5364b0 100644
--- a/pkgs/development/libraries/libzen/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libzen/default.nix
diff --git a/pkgs/development/libraries/libzip/default.nix b/nixpkgs/pkgs/development/libraries/libzip/default.nix
index 9f9331b90dd..9f9331b90dd 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libzip/default.nix
diff --git a/pkgs/development/libraries/libzmf/default.nix b/nixpkgs/pkgs/development/libraries/libzmf/default.nix
index 85b9308237f..85b9308237f 100644
--- a/pkgs/development/libraries/libzmf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libzmf/default.nix
diff --git a/pkgs/development/libraries/lief/default.nix b/nixpkgs/pkgs/development/libraries/lief/default.nix
index 410c60bff9f..410c60bff9f 100644
--- a/pkgs/development/libraries/lief/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lief/default.nix
diff --git a/pkgs/development/libraries/lightning/default.nix b/nixpkgs/pkgs/development/libraries/lightning/default.nix
index 24d99e691a2..24d99e691a2 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lightning/default.nix
diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index 7fba3f3baa6..7fba3f3baa6 100644
--- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
diff --git a/pkgs/development/libraries/linbox/default.nix b/nixpkgs/pkgs/development/libraries/linbox/default.nix
index 709a237aed9..709a237aed9 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/linbox/default.nix
diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix
index b105aa64bff..b105aa64bff 100644
--- a/pkgs/development/libraries/linenoise-ng/default.nix
+++ b/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix
diff --git a/pkgs/development/libraries/linenoise/create-pkg-config-file.sh b/nixpkgs/pkgs/development/libraries/linenoise/create-pkg-config-file.sh
index e3c38f05ab4..e3c38f05ab4 100755
--- a/pkgs/development/libraries/linenoise/create-pkg-config-file.sh
+++ b/nixpkgs/pkgs/development/libraries/linenoise/create-pkg-config-file.sh
diff --git a/pkgs/development/libraries/linenoise/default.nix b/nixpkgs/pkgs/development/libraries/linenoise/default.nix
index 0098116563a..0098116563a 100644
--- a/pkgs/development/libraries/linenoise/default.nix
+++ b/nixpkgs/pkgs/development/libraries/linenoise/default.nix
diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix
index 8c691f77591..8c691f77591 100644
--- a/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix
diff --git a/pkgs/development/libraries/liquidfun/default.nix b/nixpkgs/pkgs/development/libraries/liquidfun/default.nix
index 74952456e64..74952456e64 100644
--- a/pkgs/development/libraries/liquidfun/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liquidfun/default.nix
diff --git a/pkgs/development/libraries/lirc/default.nix b/nixpkgs/pkgs/development/libraries/lirc/default.nix
index 13fbe2b55b6..13fbe2b55b6 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lirc/default.nix
diff --git a/pkgs/development/libraries/live555/default.nix b/nixpkgs/pkgs/development/libraries/live555/default.nix
index 84907a42860..84907a42860 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/nixpkgs/pkgs/development/libraries/live555/default.nix
diff --git a/pkgs/development/libraries/lmdb/default.nix b/nixpkgs/pkgs/development/libraries/lmdb/default.nix
index 25bac68faf6..25bac68faf6 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lmdb/default.nix
diff --git a/pkgs/development/libraries/lmdb/hardcoded-compiler.patch b/nixpkgs/pkgs/development/libraries/lmdb/hardcoded-compiler.patch
index ddb247b7f11..ddb247b7f11 100644
--- a/pkgs/development/libraries/lmdb/hardcoded-compiler.patch
+++ b/nixpkgs/pkgs/development/libraries/lmdb/hardcoded-compiler.patch
diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix
index 95d8f45eec4..95d8f45eec4 100644
--- a/pkgs/development/libraries/lmdbxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix
diff --git a/pkgs/development/libraries/loadcaffe/default.nix b/nixpkgs/pkgs/development/libraries/loadcaffe/default.nix
index c4e55b14407..c4e55b14407 100644
--- a/pkgs/development/libraries/loadcaffe/default.nix
+++ b/nixpkgs/pkgs/development/libraries/loadcaffe/default.nix
diff --git a/pkgs/development/libraries/log4cplus/default.nix b/nixpkgs/pkgs/development/libraries/log4cplus/default.nix
index 3a4b182dd94..3a4b182dd94 100644
--- a/pkgs/development/libraries/log4cplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/log4cplus/default.nix
diff --git a/pkgs/development/libraries/log4cpp/default.nix b/nixpkgs/pkgs/development/libraries/log4cpp/default.nix
index d2918c87f33..d2918c87f33 100644
--- a/pkgs/development/libraries/log4cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/log4cpp/default.nix
diff --git a/pkgs/development/libraries/log4cxx/default.nix b/nixpkgs/pkgs/development/libraries/log4cxx/default.nix
index 04b91e5d80f..04b91e5d80f 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/log4cxx/default.nix
diff --git a/pkgs/development/libraries/log4cxx/narrowing-fixes.patch b/nixpkgs/pkgs/development/libraries/log4cxx/narrowing-fixes.patch
index e583e7661d1..e583e7661d1 100644
--- a/pkgs/development/libraries/log4cxx/narrowing-fixes.patch
+++ b/nixpkgs/pkgs/development/libraries/log4cxx/narrowing-fixes.patch
diff --git a/pkgs/development/libraries/log4shib/default.nix b/nixpkgs/pkgs/development/libraries/log4shib/default.nix
index ccf246c044e..ccf246c044e 100644
--- a/pkgs/development/libraries/log4shib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/log4shib/default.nix
diff --git a/pkgs/development/libraries/loki/default.nix b/nixpkgs/pkgs/development/libraries/loki/default.nix
index 631233f0ecb..631233f0ecb 100644
--- a/pkgs/development/libraries/loki/default.nix
+++ b/nixpkgs/pkgs/development/libraries/loki/default.nix
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/nixpkgs/pkgs/development/libraries/loudmouth/default.nix
index e00fc07480e..e00fc07480e 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/loudmouth/default.nix
diff --git a/pkgs/development/libraries/loudmouth/glib-2.32.patch b/nixpkgs/pkgs/development/libraries/loudmouth/glib-2.32.patch
index 87fc170c80d..87fc170c80d 100644
--- a/pkgs/development/libraries/loudmouth/glib-2.32.patch
+++ b/nixpkgs/pkgs/development/libraries/loudmouth/glib-2.32.patch
diff --git a/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch b/nixpkgs/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch
index 7ac495777b5..7ac495777b5 100644
--- a/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch
+++ b/nixpkgs/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch
diff --git a/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch b/nixpkgs/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch
index 6e5fe6aa6f8..6e5fe6aa6f8 100644
--- a/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch
+++ b/nixpkgs/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch
diff --git a/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch b/nixpkgs/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch
index 92e32828a03..92e32828a03 100644
--- a/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch
+++ b/nixpkgs/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch
diff --git a/pkgs/development/libraries/luabind/default.nix b/nixpkgs/pkgs/development/libraries/luabind/default.nix
index 7ca7456f789..7ca7456f789 100644
--- a/pkgs/development/libraries/luabind/default.nix
+++ b/nixpkgs/pkgs/development/libraries/luabind/default.nix
diff --git a/pkgs/development/libraries/lucene++/default.nix b/nixpkgs/pkgs/development/libraries/lucene++/default.nix
index 32eec84e69e..32eec84e69e 100644
--- a/pkgs/development/libraries/lucene++/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lucene++/default.nix
diff --git a/pkgs/development/libraries/lzo/default.nix b/nixpkgs/pkgs/development/libraries/lzo/default.nix
index c7667b554f4..c7667b554f4 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lzo/default.nix
diff --git a/pkgs/development/libraries/mac/default.nix b/nixpkgs/pkgs/development/libraries/mac/default.nix
index 7355248b5c5..7355248b5c5 100644
--- a/pkgs/development/libraries/mac/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mac/default.nix
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/nixpkgs/pkgs/development/libraries/mailcore2/default.nix
index 04f2208a35d..04f2208a35d 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mailcore2/default.nix
diff --git a/pkgs/development/libraries/mapnik/default.nix b/nixpkgs/pkgs/development/libraries/mapnik/default.nix
index 53c4594f535..53c4594f535 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mapnik/default.nix
diff --git a/pkgs/development/libraries/marisa/default.nix b/nixpkgs/pkgs/development/libraries/marisa/default.nix
index 4b06c58af5f..4b06c58af5f 100644
--- a/pkgs/development/libraries/marisa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/marisa/default.nix
diff --git a/pkgs/development/libraries/martyr/default.nix b/nixpkgs/pkgs/development/libraries/martyr/default.nix
index cec9e5adc29..cec9e5adc29 100644
--- a/pkgs/development/libraries/martyr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/martyr/default.nix
diff --git a/pkgs/development/libraries/matio/default.nix b/nixpkgs/pkgs/development/libraries/matio/default.nix
index 9f8f34e0a80..9f8f34e0a80 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/matio/default.nix
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix
index 603b9be610a..603b9be610a 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix
diff --git a/pkgs/development/libraries/mdds/default.nix b/nixpkgs/pkgs/development/libraries/mdds/default.nix
index cdc3dfa5ca0..cdc3dfa5ca0 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mdds/default.nix
diff --git a/pkgs/development/libraries/mdds/default.upstream b/nixpkgs/pkgs/development/libraries/mdds/default.upstream
index 96c5bc35d16..96c5bc35d16 100644
--- a/pkgs/development/libraries/mdds/default.upstream
+++ b/nixpkgs/pkgs/development/libraries/mdds/default.upstream
diff --git a/pkgs/development/libraries/medfile/default.nix b/nixpkgs/pkgs/development/libraries/medfile/default.nix
index 04ebfced52e..04ebfced52e 100644
--- a/pkgs/development/libraries/medfile/default.nix
+++ b/nixpkgs/pkgs/development/libraries/medfile/default.nix
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix
index 0204223d127..0204223d127 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix
index f1e9fc30151..f1e9fc30151 100644
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix
diff --git a/pkgs/development/libraries/mediastreamer/plugins_dir.patch b/nixpkgs/pkgs/development/libraries/mediastreamer/plugins_dir.patch
index e64bfc5a43a..e64bfc5a43a 100644
--- a/pkgs/development/libraries/mediastreamer/plugins_dir.patch
+++ b/nixpkgs/pkgs/development/libraries/mediastreamer/plugins_dir.patch
diff --git a/pkgs/development/libraries/menu-cache/default.nix b/nixpkgs/pkgs/development/libraries/menu-cache/default.nix
index d64b7f12312..d64b7f12312 100644
--- a/pkgs/development/libraries/menu-cache/default.nix
+++ b/nixpkgs/pkgs/development/libraries/menu-cache/default.nix
diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix
index dd2091c8a79..dd2091c8a79 100644
--- a/pkgs/development/libraries/mesa-glu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix
diff --git a/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix
index c041507b2ec..c041507b2ec 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix
diff --git a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
index 8ce3473dd32..8ce3473dd32 100644
--- a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
+++ b/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch
index 18e7d5437b1..18e7d5437b1 100644
--- a/pkgs/development/libraries/mesa/missing-includes.patch
+++ b/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch
diff --git a/pkgs/development/libraries/mesa/opencl-install-dir.patch b/nixpkgs/pkgs/development/libraries/mesa/opencl-install-dir.patch
index fe85d2c90bb..fe85d2c90bb 100644
--- a/pkgs/development/libraries/mesa/opencl-install-dir.patch
+++ b/nixpkgs/pkgs/development/libraries/mesa/opencl-install-dir.patch
diff --git a/pkgs/development/libraries/mesa/stubs.nix b/nixpkgs/pkgs/development/libraries/mesa/stubs.nix
index a53f2dc28e7..a53f2dc28e7 100644
--- a/pkgs/development/libraries/mesa/stubs.nix
+++ b/nixpkgs/pkgs/development/libraries/mesa/stubs.nix
diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix
index a0356497818..a0356497818 100644
--- a/pkgs/development/libraries/microsoft_gsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix
diff --git a/pkgs/development/libraries/mimalloc/default.nix b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix
index b3f63ec7e9b..b3f63ec7e9b 100644
--- a/pkgs/development/libraries/mimalloc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix
diff --git a/pkgs/development/libraries/mimetic/default.nix b/nixpkgs/pkgs/development/libraries/mimetic/default.nix
index 5f4dc5eedde..5f4dc5eedde 100644
--- a/pkgs/development/libraries/mimetic/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mimetic/default.nix
diff --git a/pkgs/development/libraries/miniball/default.nix b/nixpkgs/pkgs/development/libraries/miniball/default.nix
index 287241a75c9..287241a75c9 100644
--- a/pkgs/development/libraries/miniball/default.nix
+++ b/nixpkgs/pkgs/development/libraries/miniball/default.nix
diff --git a/pkgs/development/libraries/minixml/default.nix b/nixpkgs/pkgs/development/libraries/minixml/default.nix
index 73b045aa964..73b045aa964 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/minixml/default.nix
diff --git a/pkgs/development/libraries/minizip/default.nix b/nixpkgs/pkgs/development/libraries/minizip/default.nix
index 5ee1f38ca8b..5ee1f38ca8b 100644
--- a/pkgs/development/libraries/minizip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/minizip/default.nix
diff --git a/pkgs/development/libraries/mlt/default.nix b/nixpkgs/pkgs/development/libraries/mlt/default.nix
index b56e33e4024..b56e33e4024 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mlt/default.nix
diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix
index 4d7ecd92e61..4d7ecd92e61 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix
diff --git a/pkgs/development/libraries/mm-common/default.nix b/nixpkgs/pkgs/development/libraries/mm-common/default.nix
index 9a789a58cca..9a789a58cca 100644
--- a/pkgs/development/libraries/mm-common/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mm-common/default.nix
diff --git a/pkgs/development/libraries/mongoc/default.nix b/nixpkgs/pkgs/development/libraries/mongoc/default.nix
index 49116c349a8..49116c349a8 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mongoc/default.nix
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/nixpkgs/pkgs/development/libraries/mono-addins/default.nix
index 2bba61975f9..2bba61975f9 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mono-addins/default.nix
diff --git a/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch b/nixpkgs/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch
index 84b62dcd4eb..84b62dcd4eb 100644
--- a/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch
+++ b/nixpkgs/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch
diff --git a/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch b/nixpkgs/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch
index 801310ba41c..801310ba41c 100644
--- a/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch
diff --git a/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch b/nixpkgs/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch
index d91e43ba2d3..d91e43ba2d3 100644
--- a/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch
+++ b/nixpkgs/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch
diff --git a/pkgs/development/libraries/motif/default.nix b/nixpkgs/pkgs/development/libraries/motif/default.nix
index ba61cb8414a..ba61cb8414a 100644
--- a/pkgs/development/libraries/motif/default.nix
+++ b/nixpkgs/pkgs/development/libraries/motif/default.nix
diff --git a/pkgs/development/libraries/movit/default.nix b/nixpkgs/pkgs/development/libraries/movit/default.nix
index 8162d3bb911..8162d3bb911 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/movit/default.nix
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/nixpkgs/pkgs/development/libraries/mp4v2/default.nix
index f920f637960..f920f637960 100644
--- a/pkgs/development/libraries/mp4v2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mp4v2/default.nix
diff --git a/pkgs/development/libraries/mpfi/default.nix b/nixpkgs/pkgs/development/libraries/mpfi/default.nix
index fe46336649e..fe46336649e 100644
--- a/pkgs/development/libraries/mpfi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mpfi/default.nix
diff --git a/pkgs/development/libraries/mpfr/default.nix b/nixpkgs/pkgs/development/libraries/mpfr/default.nix
index a91d220be33..a91d220be33 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mpfr/default.nix
diff --git a/pkgs/development/libraries/mpich/default.nix b/nixpkgs/pkgs/development/libraries/mpich/default.nix
index 21803de5e06..21803de5e06 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mpich/default.nix
diff --git a/pkgs/development/libraries/mpir/default.nix b/nixpkgs/pkgs/development/libraries/mpir/default.nix
index 3b40f02c01c..3b40f02c01c 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mpir/default.nix
diff --git a/pkgs/development/libraries/mps/default.nix b/nixpkgs/pkgs/development/libraries/mps/default.nix
index 8c1f3aea466..8c1f3aea466 100644
--- a/pkgs/development/libraries/mps/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mps/default.nix
diff --git a/pkgs/development/libraries/msgpack/default.nix b/nixpkgs/pkgs/development/libraries/msgpack/default.nix
index bf51f895402..bf51f895402 100644
--- a/pkgs/development/libraries/msgpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/msgpack/default.nix
diff --git a/pkgs/development/libraries/msgpack/generic.nix b/nixpkgs/pkgs/development/libraries/msgpack/generic.nix
index c8ea3315f8b..c8ea3315f8b 100644
--- a/pkgs/development/libraries/msgpack/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/msgpack/generic.nix
diff --git a/pkgs/development/libraries/msgpuck/default.nix b/nixpkgs/pkgs/development/libraries/msgpuck/default.nix
index 0ce4870272c..0ce4870272c 100644
--- a/pkgs/development/libraries/msgpuck/default.nix
+++ b/nixpkgs/pkgs/development/libraries/msgpuck/default.nix
diff --git a/pkgs/development/libraries/msilbc/default.nix b/nixpkgs/pkgs/development/libraries/msilbc/default.nix
index 601e70427a1..601e70427a1 100644
--- a/pkgs/development/libraries/msilbc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/msilbc/default.nix
diff --git a/pkgs/development/libraries/mtdev/default.nix b/nixpkgs/pkgs/development/libraries/mtdev/default.nix
index e999ea73ae2..e999ea73ae2 100644
--- a/pkgs/development/libraries/mtdev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mtdev/default.nix
diff --git a/pkgs/development/libraries/mtxclient/default.nix b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix
index da41aceeef5..da41aceeef5 100644
--- a/pkgs/development/libraries/mtxclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix
diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix
index 8808ccefeaf..8808ccefeaf 100644
--- a/pkgs/development/libraries/multipart-parser-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix
diff --git a/pkgs/development/libraries/mumlib/default.nix b/nixpkgs/pkgs/development/libraries/mumlib/default.nix
index f936fc8b3df..f936fc8b3df 100644
--- a/pkgs/development/libraries/mumlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mumlib/default.nix
diff --git a/pkgs/development/libraries/muparser/default.nix b/nixpkgs/pkgs/development/libraries/muparser/default.nix
index 4d3fe41dff8..4d3fe41dff8 100644
--- a/pkgs/development/libraries/muparser/default.nix
+++ b/nixpkgs/pkgs/development/libraries/muparser/default.nix
diff --git a/pkgs/development/libraries/mutest/default.nix b/nixpkgs/pkgs/development/libraries/mutest/default.nix
index 37bfb05c4ee..37bfb05c4ee 100644
--- a/pkgs/development/libraries/mutest/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mutest/default.nix
diff --git a/pkgs/development/libraries/mygui/default.nix b/nixpkgs/pkgs/development/libraries/mygui/default.nix
index c277b7934b9..c277b7934b9 100644
--- a/pkgs/development/libraries/mygui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mygui/default.nix
diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix
index 3dac7c93e84..3dac7c93e84 100644
--- a/pkgs/development/libraries/mypaint-brushes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix
diff --git a/pkgs/development/libraries/mysocketw/default.nix b/nixpkgs/pkgs/development/libraries/mysocketw/default.nix
index 8164f4ec972..8164f4ec972 100644
--- a/pkgs/development/libraries/mysocketw/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mysocketw/default.nix
diff --git a/pkgs/development/libraries/mysocketw/gcc.patch b/nixpkgs/pkgs/development/libraries/mysocketw/gcc.patch
index 7779a18fa52..7779a18fa52 100644
--- a/pkgs/development/libraries/mysocketw/gcc.patch
+++ b/nixpkgs/pkgs/development/libraries/mysocketw/gcc.patch
diff --git a/pkgs/development/libraries/mythes/default.nix b/nixpkgs/pkgs/development/libraries/mythes/default.nix
index 01bf863bbbb..01bf863bbbb 100644
--- a/pkgs/development/libraries/mythes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mythes/default.nix
diff --git a/pkgs/development/libraries/nanoflann/default.nix b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix
index 8480cc868c1..8480cc868c1 100644
--- a/pkgs/development/libraries/nanoflann/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix
diff --git a/pkgs/development/libraries/nanomsg/default.nix b/nixpkgs/pkgs/development/libraries/nanomsg/default.nix
index 94bc8186f30..94bc8186f30 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nanomsg/default.nix
diff --git a/pkgs/development/libraries/nco/default.nix b/nixpkgs/pkgs/development/libraries/nco/default.nix
index 7b03c32ada5..7b03c32ada5 100644
--- a/pkgs/development/libraries/nco/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nco/default.nix
diff --git a/pkgs/development/libraries/ncurses/clang.patch b/nixpkgs/pkgs/development/libraries/ncurses/clang.patch
index ce33049bf40..ce33049bf40 100644
--- a/pkgs/development/libraries/ncurses/clang.patch
+++ b/nixpkgs/pkgs/development/libraries/ncurses/clang.patch
diff --git a/pkgs/development/libraries/ncurses/default.nix b/nixpkgs/pkgs/development/libraries/ncurses/default.nix
index 540ea71abfb..540ea71abfb 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ncurses/default.nix
diff --git a/pkgs/development/libraries/ndi/default.nix b/nixpkgs/pkgs/development/libraries/ndi/default.nix
index fcf9457c691..fcf9457c691 100644
--- a/pkgs/development/libraries/ndi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ndi/default.nix
diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix
index 7f08d0a7535..7f08d0a7535 100644
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix
diff --git a/pkgs/development/libraries/ndpi/default.nix b/nixpkgs/pkgs/development/libraries/ndpi/default.nix
index d813d6c519c..d813d6c519c 100644
--- a/pkgs/development/libraries/ndpi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ndpi/default.nix
diff --git a/pkgs/development/libraries/neardal/default.nix b/nixpkgs/pkgs/development/libraries/neardal/default.nix
index a79c42a1c8f..a79c42a1c8f 100644
--- a/pkgs/development/libraries/neardal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/neardal/default.nix
diff --git a/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch b/nixpkgs/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch
index 87222a9c0ce..87222a9c0ce 100644
--- a/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch
+++ b/nixpkgs/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch
diff --git a/pkgs/development/libraries/neon/0.29.nix b/nixpkgs/pkgs/development/libraries/neon/0.29.nix
index fbffb138e96..fbffb138e96 100644
--- a/pkgs/development/libraries/neon/0.29.nix
+++ b/nixpkgs/pkgs/development/libraries/neon/0.29.nix
diff --git a/pkgs/development/libraries/neon/default.nix b/nixpkgs/pkgs/development/libraries/neon/default.nix
index ffefc8e51c4..ffefc8e51c4 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/neon/default.nix
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix
index 665145a92ac..665145a92ac 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix
index c9c52636a5b..c9c52636a5b 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix
diff --git a/pkgs/development/libraries/netcdf/default.nix b/nixpkgs/pkgs/development/libraries/netcdf/default.nix
index 1436fb02127..1436fb02127 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/netcdf/default.nix
diff --git a/pkgs/development/libraries/nettle/cygwin.patch b/nixpkgs/pkgs/development/libraries/nettle/cygwin.patch
index d5036237c8d..d5036237c8d 100644
--- a/pkgs/development/libraries/nettle/cygwin.patch
+++ b/nixpkgs/pkgs/development/libraries/nettle/cygwin.patch
diff --git a/pkgs/development/libraries/nettle/default.nix b/nixpkgs/pkgs/development/libraries/nettle/default.nix
index 36c9f0e6ac7..36c9f0e6ac7 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nettle/default.nix
diff --git a/pkgs/development/libraries/nettle/generic.nix b/nixpkgs/pkgs/development/libraries/nettle/generic.nix
index 064ef344398..064ef344398 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/nettle/generic.nix
diff --git a/pkgs/development/libraries/newt/default.nix b/nixpkgs/pkgs/development/libraries/newt/default.nix
index 60dc00a335d..60dc00a335d 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/newt/default.nix
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix
index 57ed5891275..57ed5891275 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix
index 442fcf2e761..442fcf2e761 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix
index 43a7cf15c15..43a7cf15c15 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix
diff --git a/pkgs/development/libraries/nlopt/default.nix b/nixpkgs/pkgs/development/libraries/nlopt/default.nix
index e9b89e83907..e9b89e83907 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nlopt/default.nix
diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix
index 403b0326bb5..403b0326bb5 100644
--- a/pkgs/development/libraries/notify-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix
diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix
index 2cbf88633e7..2cbf88633e7 100644
--- a/pkgs/development/libraries/npapi-sdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix
diff --git a/pkgs/development/libraries/npth/default.nix b/nixpkgs/pkgs/development/libraries/npth/default.nix
index c02998184fc..c02998184fc 100644
--- a/pkgs/development/libraries/npth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/npth/default.nix
diff --git a/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch b/nixpkgs/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch
index d7fec73910f..d7fec73910f 100644
--- a/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch
+++ b/nixpkgs/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch
diff --git a/pkgs/development/libraries/nspr/default.nix b/nixpkgs/pkgs/development/libraries/nspr/default.nix
index 44195ce325b..44195ce325b 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nspr/default.nix
diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/nixpkgs/pkgs/development/libraries/nss/85_security_load.patch
index 132d5a96b29..132d5a96b29 100644
--- a/pkgs/development/libraries/nss/85_security_load.patch
+++ b/nixpkgs/pkgs/development/libraries/nss/85_security_load.patch
diff --git a/pkgs/development/libraries/nss/ckpem.patch b/nixpkgs/pkgs/development/libraries/nss/ckpem.patch
index c1a65a6c0b2..c1a65a6c0b2 100644
--- a/pkgs/development/libraries/nss/ckpem.patch
+++ b/nixpkgs/pkgs/development/libraries/nss/ckpem.patch
diff --git a/pkgs/development/libraries/nss/default.nix b/nixpkgs/pkgs/development/libraries/nss/default.nix
index 2e611c8975d..2e611c8975d 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nss/default.nix
diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix
index 40ee4f890d4..40ee4f890d4 100644
--- a/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix
diff --git a/pkgs/development/libraries/nsss/default.nix b/nixpkgs/pkgs/development/libraries/nsss/default.nix
index 5c8bf8dedc1..5c8bf8dedc1 100644
--- a/pkgs/development/libraries/nsss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nsss/default.nix
diff --git a/pkgs/development/libraries/ntbtls/default.nix b/nixpkgs/pkgs/development/libraries/ntbtls/default.nix
index 5ea43097b8c..5ea43097b8c 100644
--- a/pkgs/development/libraries/ntbtls/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ntbtls/default.nix
diff --git a/pkgs/development/libraries/ntdb/default.nix b/nixpkgs/pkgs/development/libraries/ntdb/default.nix
index a310d2f2780..a310d2f2780 100644
--- a/pkgs/development/libraries/ntdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ntdb/default.nix
diff --git a/pkgs/development/libraries/ntl/default.nix b/nixpkgs/pkgs/development/libraries/ntl/default.nix
index a4d1e275a0a..a4d1e275a0a 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ntl/default.nix
diff --git a/pkgs/development/libraries/ntrack/default.nix b/nixpkgs/pkgs/development/libraries/ntrack/default.nix
index 803906b1343..803906b1343 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ntrack/default.nix
diff --git a/pkgs/development/libraries/ntrack/libnl-fix.patch b/nixpkgs/pkgs/development/libraries/ntrack/libnl-fix.patch
index 806a0178ec8..806a0178ec8 100644
--- a/pkgs/development/libraries/ntrack/libnl-fix.patch
+++ b/nixpkgs/pkgs/development/libraries/ntrack/libnl-fix.patch
diff --git a/pkgs/development/libraries/nuspell/default.nix b/nixpkgs/pkgs/development/libraries/nuspell/default.nix
index c1f354a1ac9..c1f354a1ac9 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nuspell/default.nix
diff --git a/pkgs/development/libraries/nuspell/wrapper.nix b/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix
index 4386542ff20..4386542ff20 100644
--- a/pkgs/development/libraries/nuspell/wrapper.nix
+++ b/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix
diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix
index f74030a02df..f74030a02df 100644
--- a/pkgs/development/libraries/nv-codec-headers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix
diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-texture-tools/default.nix
index 70c48631981..70c48631981 100644
--- a/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nvidia-texture-tools/default.nix
diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix
index b7d46cd5537..b7d46cd5537 100644
--- a/pkgs/development/libraries/nvidia-video-sdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix
diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix
index 84205253554..84205253554 100644
--- a/pkgs/development/libraries/ocl-icd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix
diff --git a/pkgs/development/libraries/ode/default.nix b/nixpkgs/pkgs/development/libraries/ode/default.nix
index a540d89ed3b..a540d89ed3b 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ode/default.nix
diff --git a/pkgs/development/libraries/odpic/default.nix b/nixpkgs/pkgs/development/libraries/odpic/default.nix
index 52dbdc10575..52dbdc10575 100644
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/nixpkgs/pkgs/development/libraries/odpic/default.nix
diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix
index b66759524fa..b66759524fa 100644
--- a/pkgs/development/libraries/ogre/1.10.x.nix
+++ b/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix
diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix
index ced01580185..ced01580185 100644
--- a/pkgs/development/libraries/ogre/1.9.x.nix
+++ b/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix
diff --git a/pkgs/development/libraries/ogre/default.nix b/nixpkgs/pkgs/development/libraries/ogre/default.nix
index 235da872392..235da872392 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ogre/default.nix
diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/nixpkgs/pkgs/development/libraries/ogrepaged/default.nix
index 0844c44c8a8..0844c44c8a8 100644
--- a/pkgs/development/libraries/ogrepaged/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ogrepaged/default.nix
diff --git a/pkgs/development/libraries/ois/default.nix b/nixpkgs/pkgs/development/libraries/ois/default.nix
index c1b065dbf2b..c1b065dbf2b 100644
--- a/pkgs/development/libraries/ois/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ois/default.nix
diff --git a/pkgs/development/libraries/olm/default.nix b/nixpkgs/pkgs/development/libraries/olm/default.nix
index f63d1d30f55..f63d1d30f55 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/olm/default.nix
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix
index e4cbfc7f0b4..e4cbfc7f0b4 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix
diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix
index 90da6c19212..90da6c19212 100644
--- a/pkgs/development/libraries/onnxruntime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix
diff --git a/pkgs/development/libraries/opae/default.nix b/nixpkgs/pkgs/development/libraries/opae/default.nix
index 46b03720d16..46b03720d16 100644
--- a/pkgs/development/libraries/opae/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opae/default.nix
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/nixpkgs/pkgs/development/libraries/openal-soft/default.nix
index 20528ac9284..20528ac9284 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openal-soft/default.nix
diff --git a/pkgs/development/libraries/openal-soft/search-out.patch b/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch
index 0f9c2abad3c..0f9c2abad3c 100644
--- a/pkgs/development/libraries/openal-soft/search-out.patch
+++ b/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch
diff --git a/pkgs/development/libraries/openbabel/default.nix b/nixpkgs/pkgs/development/libraries/openbabel/default.nix
index 3838e1103ba..3838e1103ba 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openbabel/default.nix
diff --git a/pkgs/development/libraries/openbr/default.nix b/nixpkgs/pkgs/development/libraries/openbr/default.nix
index 4d4505c3e70..4d4505c3e70 100644
--- a/pkgs/development/libraries/openbr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openbr/default.nix
diff --git a/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch b/nixpkgs/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch
index 77b9e1febdd..77b9e1febdd 100644
--- a/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch
+++ b/nixpkgs/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch
diff --git a/pkgs/development/libraries/openbsm/default.nix b/nixpkgs/pkgs/development/libraries/openbsm/default.nix
index 269b0138091..269b0138091 100644
--- a/pkgs/development/libraries/openbsm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openbsm/default.nix
diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix
index 83b1cfc2add..83b1cfc2add 100644
--- a/pkgs/development/libraries/opencascade-occt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix
diff --git a/pkgs/development/libraries/opencascade/default.nix b/nixpkgs/pkgs/development/libraries/opencascade/default.nix
index 8334bf195f7..8334bf195f7 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencascade/default.nix
diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix
index 50794863def..50794863def 100644
--- a/pkgs/development/libraries/opencl-clang/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix
diff --git a/pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch b/nixpkgs/pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch
index 70343b8ee19..70343b8ee19 100644
--- a/pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch
+++ b/nixpkgs/pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch
diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix
index 5ed2dd5e23d..5ed2dd5e23d 100644
--- a/pkgs/development/libraries/opencl-clhpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix
diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix
index d0cc6396b8d..d0cc6396b8d 100644
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix
diff --git a/pkgs/development/libraries/opencollada/default.nix b/nixpkgs/pkgs/development/libraries/opencollada/default.nix
index 9bd25bfb93a..9bd25bfb93a 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencollada/default.nix
diff --git a/pkgs/development/libraries/opencollada/pcre.patch b/nixpkgs/pkgs/development/libraries/opencollada/pcre.patch
index 39408f5a61e..39408f5a61e 100644
--- a/pkgs/development/libraries/opencollada/pcre.patch
+++ b/nixpkgs/pkgs/development/libraries/opencollada/pcre.patch
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix
index 06eff9d17f3..06eff9d17f3 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix
diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix
index e2d34ae5f07..e2d34ae5f07 100644
--- a/pkgs/development/libraries/opencore-amr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix
diff --git a/pkgs/development/libraries/opencsg/default.nix b/nixpkgs/pkgs/development/libraries/opencsg/default.nix
index cf46077a56c..cf46077a56c 100644
--- a/pkgs/development/libraries/opencsg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencsg/default.nix
diff --git a/pkgs/development/libraries/opencsg/fix-pro-files.patch b/nixpkgs/pkgs/development/libraries/opencsg/fix-pro-files.patch
index 462b44c8f40..462b44c8f40 100644
--- a/pkgs/development/libraries/opencsg/fix-pro-files.patch
+++ b/nixpkgs/pkgs/development/libraries/opencsg/fix-pro-files.patch
diff --git a/pkgs/development/libraries/openct/default.nix b/nixpkgs/pkgs/development/libraries/openct/default.nix
index 5f1c2b5c6f6..5f1c2b5c6f6 100644
--- a/pkgs/development/libraries/openct/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openct/default.nix
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix
index 642facf166a..642facf166a 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix
index 9fffd3d9477..9fffd3d9477 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix
diff --git a/pkgs/development/libraries/opencv/default.nix b/nixpkgs/pkgs/development/libraries/opencv/default.nix
index ad27742d0b4..ad27742d0b4 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencv/default.nix
diff --git a/pkgs/development/libraries/opencv/no-build-info.patch b/nixpkgs/pkgs/development/libraries/opencv/no-build-info.patch
index 4ee9701583a..4ee9701583a 100644
--- a/pkgs/development/libraries/opencv/no-build-info.patch
+++ b/nixpkgs/pkgs/development/libraries/opencv/no-build-info.patch
diff --git a/pkgs/development/libraries/opendbx/default.nix b/nixpkgs/pkgs/development/libraries/opendbx/default.nix
index 16ec6a5c110..16ec6a5c110 100644
--- a/pkgs/development/libraries/opendbx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opendbx/default.nix
diff --git a/pkgs/development/libraries/opendht/default.nix b/nixpkgs/pkgs/development/libraries/opendht/default.nix
index 6bf5ea6023e..6bf5ea6023e 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opendht/default.nix
diff --git a/pkgs/development/libraries/opendkim/default.nix b/nixpkgs/pkgs/development/libraries/opendkim/default.nix
index 66496af12f9..66496af12f9 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opendkim/default.nix
diff --git a/pkgs/development/libraries/opendkim/openssl-1.1.patch b/nixpkgs/pkgs/development/libraries/opendkim/openssl-1.1.patch
index c36559cf16c..c36559cf16c 100644
--- a/pkgs/development/libraries/opendkim/openssl-1.1.patch
+++ b/nixpkgs/pkgs/development/libraries/opendkim/openssl-1.1.patch
diff --git a/pkgs/development/libraries/openexr/bootstrap.patch b/nixpkgs/pkgs/development/libraries/openexr/bootstrap.patch
index af6669c16a4..af6669c16a4 100644
--- a/pkgs/development/libraries/openexr/bootstrap.patch
+++ b/nixpkgs/pkgs/development/libraries/openexr/bootstrap.patch
diff --git a/pkgs/development/libraries/openexr/default.nix b/nixpkgs/pkgs/development/libraries/openexr/default.nix
index 328bce35357..328bce35357 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openexr/default.nix
diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix
index 92cd343cf6a..92cd343cf6a 100644
--- a/pkgs/development/libraries/openexrid-unstable/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix
diff --git a/pkgs/development/libraries/openexrid-unstable/openexrid.patch b/nixpkgs/pkgs/development/libraries/openexrid-unstable/openexrid.patch
index bbbf75b575d..bbbf75b575d 100644
--- a/pkgs/development/libraries/openexrid-unstable/openexrid.patch
+++ b/nixpkgs/pkgs/development/libraries/openexrid-unstable/openexrid.patch
diff --git a/pkgs/development/libraries/openfst/default.nix b/nixpkgs/pkgs/development/libraries/openfst/default.nix
index 51ed495a995..51ed495a995 100644
--- a/pkgs/development/libraries/openfst/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openfst/default.nix
diff --git a/pkgs/development/libraries/openfx/default.nix b/nixpkgs/pkgs/development/libraries/openfx/default.nix
index 4a7927bfcb2..4a7927bfcb2 100644
--- a/pkgs/development/libraries/openfx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openfx/default.nix
diff --git a/pkgs/development/libraries/openh264/default.nix b/nixpkgs/pkgs/development/libraries/openh264/default.nix
index fe46d25421a..fe46d25421a 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openh264/default.nix
diff --git a/pkgs/development/libraries/openhmd/default.nix b/nixpkgs/pkgs/development/libraries/openhmd/default.nix
index 66656a14234..66656a14234 100644
--- a/pkgs/development/libraries/openhmd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openhmd/default.nix
diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/nixpkgs/pkgs/development/libraries/openjpeg/1.x.nix
index beb151f0d2d..beb151f0d2d 100644
--- a/pkgs/development/libraries/openjpeg/1.x.nix
+++ b/nixpkgs/pkgs/development/libraries/openjpeg/1.x.nix
diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/nixpkgs/pkgs/development/libraries/openjpeg/2.x.nix
index 24f3752ef43..24f3752ef43 100644
--- a/pkgs/development/libraries/openjpeg/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/openjpeg/2.x.nix
diff --git a/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch b/nixpkgs/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch
index 6ff720ead4e..6ff720ead4e 100644
--- a/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch
+++ b/nixpkgs/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix
index 64ed6cb58f0..64ed6cb58f0 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix
diff --git a/pkgs/development/libraries/openldap/default.nix b/nixpkgs/pkgs/development/libraries/openldap/default.nix
index fbc9de11e8f..fbc9de11e8f 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openldap/default.nix
diff --git a/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix
index 5996dda1e74..5996dda1e74 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix
diff --git a/pkgs/development/libraries/openpa/default.nix b/nixpkgs/pkgs/development/libraries/openpa/default.nix
index 6d53d23ae0e..6d53d23ae0e 100644
--- a/pkgs/development/libraries/openpa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openpa/default.nix
diff --git a/pkgs/development/libraries/openpam/default.nix b/nixpkgs/pkgs/development/libraries/openpam/default.nix
index b217527269d..b217527269d 100644
--- a/pkgs/development/libraries/openpam/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openpam/default.nix
diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix
index 0edf6dfa728..0edf6dfa728 100644
--- a/pkgs/development/libraries/opensaml-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix
index b12ca67655b..b12ca67655b 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix
diff --git a/pkgs/development/libraries/openslp/CVE-2016-4912.patch b/nixpkgs/pkgs/development/libraries/openslp/CVE-2016-4912.patch
index 06223deda89..06223deda89 100644
--- a/pkgs/development/libraries/openslp/CVE-2016-4912.patch
+++ b/nixpkgs/pkgs/development/libraries/openslp/CVE-2016-4912.patch
diff --git a/pkgs/development/libraries/openslp/default.nix b/nixpkgs/pkgs/development/libraries/openslp/default.nix
index 537b67c5a3c..537b67c5a3c 100644
--- a/pkgs/development/libraries/openslp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openslp/default.nix
diff --git a/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch b/nixpkgs/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
index 5765409fdd5..5765409fdd5 100644
--- a/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
+++ b/nixpkgs/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
diff --git a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch b/nixpkgs/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch
index 3d9ee7e6a82..3d9ee7e6a82 100644
--- a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch
diff --git a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch b/nixpkgs/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch
index 813c6bdf44a..813c6bdf44a 100644
--- a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch
+++ b/nixpkgs/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch
diff --git a/pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch b/nixpkgs/pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch
index 9e871cfb1d3..9e871cfb1d3 100644
--- a/pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch
+++ b/nixpkgs/pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch
diff --git a/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch b/nixpkgs/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch
index 2c98ccfa7ed..2c98ccfa7ed 100644
--- a/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch
diff --git a/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch b/nixpkgs/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch
index 67d199681f9..67d199681f9 100644
--- a/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch
+++ b/nixpkgs/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch
diff --git a/pkgs/development/libraries/openssl/chacha.nix b/nixpkgs/pkgs/development/libraries/openssl/chacha.nix
index e2f64114716..e2f64114716 100644
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ b/nixpkgs/pkgs/development/libraries/openssl/chacha.nix
diff --git a/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix
index 63657cfc5e6..63657cfc5e6 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix
index 81ef6a3bf5d..81ef6a3bf5d 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix
diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix
index f29972a64bd..f29972a64bd 100644
--- a/pkgs/development/libraries/opentracing-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix
diff --git a/pkgs/development/libraries/openvdb/default.nix b/nixpkgs/pkgs/development/libraries/openvdb/default.nix
index 840da046170..840da046170 100644
--- a/pkgs/development/libraries/openvdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openvdb/default.nix
diff --git a/pkgs/development/libraries/openwsman/default.nix b/nixpkgs/pkgs/development/libraries/openwsman/default.nix
index 134ec74d530..134ec74d530 100644
--- a/pkgs/development/libraries/openwsman/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openwsman/default.nix
diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix
index 6cf03bc990c..6cf03bc990c 100644
--- a/pkgs/development/libraries/openxr-loader/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix
diff --git a/pkgs/development/libraries/openzwave/default.nix b/nixpkgs/pkgs/development/libraries/openzwave/default.nix
index a9dbcf9ffb2..a9dbcf9ffb2 100644
--- a/pkgs/development/libraries/openzwave/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openzwave/default.nix
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix
index aba9c75ad46..aba9c75ad46 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix
diff --git a/pkgs/development/libraries/orcania/default.nix b/nixpkgs/pkgs/development/libraries/orcania/default.nix
index 2f8765f9a72..2f8765f9a72 100644
--- a/pkgs/development/libraries/orcania/default.nix
+++ b/nixpkgs/pkgs/development/libraries/orcania/default.nix
diff --git a/pkgs/development/libraries/ortp/default.nix b/nixpkgs/pkgs/development/libraries/ortp/default.nix
index 68e890e3368..68e890e3368 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ortp/default.nix
diff --git a/pkgs/development/libraries/osip/default.nix b/nixpkgs/pkgs/development/libraries/osip/default.nix
index a243b5c0b51..a243b5c0b51 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/osip/default.nix
diff --git a/pkgs/development/libraries/osip/default.upstream b/nixpkgs/pkgs/development/libraries/osip/default.upstream
index ba0ed2a9b29..ba0ed2a9b29 100644
--- a/pkgs/development/libraries/osip/default.upstream
+++ b/nixpkgs/pkgs/development/libraries/osip/default.upstream
diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix
index 14483a12f7e..14483a12f7e 100644
--- a/pkgs/development/libraries/osm-gps-map/default.nix
+++ b/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix
index f13ae141a81..f13ae141a81 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix
diff --git a/pkgs/development/libraries/packr/default.nix b/nixpkgs/pkgs/development/libraries/packr/default.nix
index 4482a9cd312..4482a9cd312 100644
--- a/pkgs/development/libraries/packr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/packr/default.nix
diff --git a/pkgs/development/libraries/pagmo2/default.nix b/nixpkgs/pkgs/development/libraries/pagmo2/default.nix
index 67c4e75c1e1..67c4e75c1e1 100644
--- a/pkgs/development/libraries/pagmo2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pagmo2/default.nix
diff --git a/pkgs/development/libraries/pango/default.nix b/nixpkgs/pkgs/development/libraries/pango/default.nix
index ecb0f16c72c..ecb0f16c72c 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pango/default.nix
diff --git a/pkgs/development/libraries/pangolin/default.nix b/nixpkgs/pkgs/development/libraries/pangolin/default.nix
index d788f1eff34..d788f1eff34 100644
--- a/pkgs/development/libraries/pangolin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pangolin/default.nix
diff --git a/pkgs/development/libraries/pangomm/default.nix b/nixpkgs/pkgs/development/libraries/pangomm/default.nix
index 6cb2c070c94..6cb2c070c94 100644
--- a/pkgs/development/libraries/pangomm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pangomm/default.nix
diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/nixpkgs/pkgs/development/libraries/pangoxsl/default.nix
index b69ded64839..b69ded64839 100644
--- a/pkgs/development/libraries/pangoxsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pangoxsl/default.nix
diff --git a/pkgs/development/libraries/parquet-cpp/api.patch b/nixpkgs/pkgs/development/libraries/parquet-cpp/api.patch
index 3fd567ea098..3fd567ea098 100644
--- a/pkgs/development/libraries/parquet-cpp/api.patch
+++ b/nixpkgs/pkgs/development/libraries/parquet-cpp/api.patch
diff --git a/pkgs/development/libraries/partio/default.nix b/nixpkgs/pkgs/development/libraries/partio/default.nix
index ba042562320..ba042562320 100644
--- a/pkgs/development/libraries/partio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/partio/default.nix
diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix
index 1831d969249..1831d969249 100644
--- a/pkgs/development/libraries/pcaudiolib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix
diff --git a/pkgs/development/libraries/pcg-c/default.nix b/nixpkgs/pkgs/development/libraries/pcg-c/default.nix
index 58fbb26532e..58fbb26532e 100644
--- a/pkgs/development/libraries/pcg-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pcg-c/default.nix
diff --git a/pkgs/development/libraries/pcg-c/prefix-variable.patch b/nixpkgs/pkgs/development/libraries/pcg-c/prefix-variable.patch
index bfdcdfa7b17..bfdcdfa7b17 100644
--- a/pkgs/development/libraries/pcg-c/prefix-variable.patch
+++ b/nixpkgs/pkgs/development/libraries/pcg-c/prefix-variable.patch
diff --git a/pkgs/development/libraries/pcl/default.nix b/nixpkgs/pkgs/development/libraries/pcl/default.nix
index 33158129469..33158129469 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pcl/default.nix
diff --git a/pkgs/development/libraries/pcre/default.nix b/nixpkgs/pkgs/development/libraries/pcre/default.nix
index cf08f989369..cf08f989369 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pcre/default.nix
diff --git a/pkgs/development/libraries/pcre/stacksize-detection.patch b/nixpkgs/pkgs/development/libraries/pcre/stacksize-detection.patch
index 4bc97069b1e..4bc97069b1e 100644
--- a/pkgs/development/libraries/pcre/stacksize-detection.patch
+++ b/nixpkgs/pkgs/development/libraries/pcre/stacksize-detection.patch
diff --git a/pkgs/development/libraries/pcre2/default.nix b/nixpkgs/pkgs/development/libraries/pcre2/default.nix
index b988c4ea02c..b988c4ea02c 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pcre2/default.nix
diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix
index c4cb57f3fa2..c4cb57f3fa2 100644
--- a/pkgs/development/libraries/pdf2xml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix
diff --git a/pkgs/development/libraries/pdf2xml/pdf2xml.patch b/nixpkgs/pkgs/development/libraries/pdf2xml/pdf2xml.patch
index 596a3aea674..596a3aea674 100644
--- a/pkgs/development/libraries/pdf2xml/pdf2xml.patch
+++ b/nixpkgs/pkgs/development/libraries/pdf2xml/pdf2xml.patch
diff --git a/pkgs/development/libraries/phash/default.nix b/nixpkgs/pkgs/development/libraries/phash/default.nix
index 473fb3bfd48..473fb3bfd48 100644
--- a/pkgs/development/libraries/phash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/phash/default.nix
diff --git a/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch b/nixpkgs/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch
index 39c1b9c0d29..39c1b9c0d29 100644
--- a/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix
index d79078c2836..d79078c2836 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix
index 9ed137e4f45..9ed137e4f45 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix
diff --git a/pkgs/development/libraries/phonon/default.nix b/nixpkgs/pkgs/development/libraries/phonon/default.nix
index 86e3caaa148..86e3caaa148 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/phonon/default.nix
diff --git a/pkgs/development/libraries/physfs/default.nix b/nixpkgs/pkgs/development/libraries/physfs/default.nix
index cf9e201b3f6..cf9e201b3f6 100644
--- a/pkgs/development/libraries/physfs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physfs/default.nix
diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix
index 4ebfd6fbfa3..4ebfd6fbfa3 100644
--- a/pkgs/development/libraries/physics/apfel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix
diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix
index 2ba87024bc5..2ba87024bc5 100644
--- a/pkgs/development/libraries/physics/apfelgrid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix
diff --git a/pkgs/development/libraries/physics/applgrid/bad_code.patch b/nixpkgs/pkgs/development/libraries/physics/applgrid/bad_code.patch
index e90000efe2d..e90000efe2d 100644
--- a/pkgs/development/libraries/physics/applgrid/bad_code.patch
+++ b/nixpkgs/pkgs/development/libraries/physics/applgrid/bad_code.patch
diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix
index 3e2a53d81dd..3e2a53d81dd 100644
--- a/pkgs/development/libraries/physics/applgrid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix
diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix
index bd43ae44204..bd43ae44204 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix
diff --git a/pkgs/development/libraries/physics/cernlib/patch b/nixpkgs/pkgs/development/libraries/physics/cernlib/patch
index 2d75b6bf0f8..2d75b6bf0f8 100644
--- a/pkgs/development/libraries/physics/cernlib/patch
+++ b/nixpkgs/pkgs/development/libraries/physics/cernlib/patch
diff --git a/pkgs/development/libraries/physics/cernlib/setup-hook.sh b/nixpkgs/pkgs/development/libraries/physics/cernlib/setup-hook.sh
index d8375932776..d8375932776 100644
--- a/pkgs/development/libraries/physics/cernlib/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/physics/cernlib/setup-hook.sh
diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix
index 2bc5b12dfb7..2bc5b12dfb7 100644
--- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix
diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix
index 96eb13d11cd..96eb13d11cd 100644
--- a/pkgs/development/libraries/physics/fastjet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix
diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix
index 5ef446319a8..5ef446319a8 100644
--- a/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix
diff --git a/pkgs/development/libraries/physics/geant4/datasets-hook.sh b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets-hook.sh
index 8aed8b8832b..8aed8b8832b 100644
--- a/pkgs/development/libraries/physics/geant4/datasets-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets-hook.sh
diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix
index 22fda0cf980..22fda0cf980 100644
--- a/pkgs/development/libraries/physics/geant4/datasets.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix
index 007e4ad0c32..007e4ad0c32 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix
index dddd7078b86..dddd7078b86 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix
diff --git a/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh b/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh
index 8abfb461fc0..8abfb461fc0 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh
diff --git a/pkgs/development/libraries/physics/geant4/geant4-hook.sh b/nixpkgs/pkgs/development/libraries/physics/geant4/geant4-hook.sh
index 0b775d43283..0b775d43283 100644
--- a/pkgs/development/libraries/physics/geant4/geant4-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/physics/geant4/geant4-hook.sh
diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix
index 665cd417dc0..665cd417dc0 100644
--- a/pkgs/development/libraries/physics/hepmc2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix
diff --git a/pkgs/development/libraries/physics/hepmc2/in_source.patch b/nixpkgs/pkgs/development/libraries/physics/hepmc2/in_source.patch
index 836a5655869..836a5655869 100644
--- a/pkgs/development/libraries/physics/hepmc2/in_source.patch
+++ b/nixpkgs/pkgs/development/libraries/physics/hepmc2/in_source.patch
diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix
index d8aff555e55..d8aff555e55 100644
--- a/pkgs/development/libraries/physics/hepmc3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix
index d52f92d9639..d52f92d9639 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix
diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix
index 9e68fbd3fc4..9e68fbd3fc4 100644
--- a/pkgs/development/libraries/physics/hoppet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix
index dff9fb1c1dd..dff9fb1c1dd 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix
diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/nixpkgs/pkgs/development/libraries/physics/lhapdf/maintainer.sh
index 94bf252ec10..94bf252ec10 100755
--- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh
+++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/maintainer.sh
diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
index 8f693a32e35..8f693a32e35 100644
--- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
diff --git a/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh b/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh
index c499d370d86..c499d370d86 100644
--- a/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh
diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/nixpkgs/pkgs/development/libraries/physics/mcgrid/default.nix
index 74b4ba4224e..74b4ba4224e 100644
--- a/pkgs/development/libraries/physics/mcgrid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/mcgrid/default.nix
diff --git a/pkgs/development/libraries/physics/mela/default.nix b/nixpkgs/pkgs/development/libraries/physics/mela/default.nix
index 1518c23718a..1518c23718a 100644
--- a/pkgs/development/libraries/physics/mela/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/mela/default.nix
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix
index 20df49d9ae7..20df49d9ae7 100644
--- a/pkgs/development/libraries/physics/nlojet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix
diff --git a/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch b/nixpkgs/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch
index 917c57e8cb4..917c57e8cb4 100644
--- a/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch
+++ b/nixpkgs/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch
diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix
index c37d4b9d2f1..c37d4b9d2f1 100644
--- a/pkgs/development/libraries/physics/pythia/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix
diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix
index e962303f5f0..e962303f5f0 100644
--- a/pkgs/development/libraries/physics/qcdnum/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix
diff --git a/pkgs/development/libraries/physics/rivet/darwin.patch b/nixpkgs/pkgs/development/libraries/physics/rivet/darwin.patch
index 2d397f1da6c..2d397f1da6c 100644
--- a/pkgs/development/libraries/physics/rivet/darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/physics/rivet/darwin.patch
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
index 7f7260d52c0..7f7260d52c0 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix
index 15c94668581..15c94668581 100644
--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix
index 8ed0a2c4ae3..8ed0a2c4ae3 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix
diff --git a/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix
index 3efbea97c5e..3efbea97c5e 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix
diff --git a/pkgs/development/libraries/pixman/default.nix b/nixpkgs/pkgs/development/libraries/pixman/default.nix
index 1f9996ec213..1f9996ec213 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pixman/default.nix
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix
index ce511544a42..ce511544a42 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix
diff --git a/pkgs/development/libraries/plib/default.nix b/nixpkgs/pkgs/development/libraries/plib/default.nix
index bbc5eb21c27..bbc5eb21c27 100644
--- a/pkgs/development/libraries/plib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/plib/default.nix
diff --git a/pkgs/development/libraries/plplot/default.nix b/nixpkgs/pkgs/development/libraries/plplot/default.nix
index e99ddc3dd08..e99ddc3dd08 100644
--- a/pkgs/development/libraries/plplot/default.nix
+++ b/nixpkgs/pkgs/development/libraries/plplot/default.nix
diff --git a/pkgs/development/libraries/pmdk/default.nix b/nixpkgs/pkgs/development/libraries/pmdk/default.nix
index 27351522789..27351522789 100644
--- a/pkgs/development/libraries/pmdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pmdk/default.nix
diff --git a/pkgs/development/libraries/png++/default.nix b/nixpkgs/pkgs/development/libraries/png++/default.nix
index 8509468f59a..8509468f59a 100644
--- a/pkgs/development/libraries/png++/default.nix
+++ b/nixpkgs/pkgs/development/libraries/png++/default.nix
diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/nixpkgs/pkgs/development/libraries/pocketsphinx/default.nix
index f892540ae5c..f892540ae5c 100644
--- a/pkgs/development/libraries/pocketsphinx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pocketsphinx/default.nix
diff --git a/pkgs/development/libraries/poco/default.nix b/nixpkgs/pkgs/development/libraries/poco/default.nix
index ecd20d545d5..ecd20d545d5 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/nixpkgs/pkgs/development/libraries/poco/default.nix
diff --git a/pkgs/development/libraries/podofo/default.nix b/nixpkgs/pkgs/development/libraries/podofo/default.nix
index 809159b8c2f..809159b8c2f 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/podofo/default.nix
diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix
index b13335561ac..b13335561ac 100644
--- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix
+++ b/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix
diff --git a/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix
index f6cbf7e972b..f6cbf7e972b 100644
--- a/pkgs/development/libraries/polkit-qt-1/qt-5.nix
+++ b/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix
diff --git a/pkgs/development/libraries/polkit/default.nix b/nixpkgs/pkgs/development/libraries/polkit/default.nix
index 17163c2206c..17163c2206c 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/polkit/default.nix
diff --git a/pkgs/development/libraries/polkit/system_bus.conf b/nixpkgs/pkgs/development/libraries/polkit/system_bus.conf
index 435b4740a2f..435b4740a2f 100644
--- a/pkgs/development/libraries/polkit/system_bus.conf
+++ b/nixpkgs/pkgs/development/libraries/polkit/system_bus.conf
diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix
index a3e42b3ae4b..a3e42b3ae4b 100644
--- a/pkgs/development/libraries/poly2tri-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix
diff --git a/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch b/nixpkgs/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch
index 5c2af7a2adc..5c2af7a2adc 100644
--- a/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch
+++ b/nixpkgs/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch
diff --git a/pkgs/development/libraries/poppler/0.61.nix b/nixpkgs/pkgs/development/libraries/poppler/0.61.nix
index cb9cf16531c..cb9cf16531c 100644
--- a/pkgs/development/libraries/poppler/0.61.nix
+++ b/nixpkgs/pkgs/development/libraries/poppler/0.61.nix
diff --git a/pkgs/development/libraries/poppler/default.nix b/nixpkgs/pkgs/development/libraries/poppler/default.nix
index eb1e9ec732f..eb1e9ec732f 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/nixpkgs/pkgs/development/libraries/poppler/default.nix
diff --git a/pkgs/development/libraries/popt/1.16-cygwin.patch b/nixpkgs/pkgs/development/libraries/popt/1.16-cygwin.patch
index 9c084f0b8ea..9c084f0b8ea 100644
--- a/pkgs/development/libraries/popt/1.16-cygwin.patch
+++ b/nixpkgs/pkgs/development/libraries/popt/1.16-cygwin.patch
diff --git a/pkgs/development/libraries/popt/1.16-vpath.patch b/nixpkgs/pkgs/development/libraries/popt/1.16-vpath.patch
index 4cfa1c8fb4d..4cfa1c8fb4d 100644
--- a/pkgs/development/libraries/popt/1.16-vpath.patch
+++ b/nixpkgs/pkgs/development/libraries/popt/1.16-vpath.patch
diff --git a/pkgs/development/libraries/popt/default.nix b/nixpkgs/pkgs/development/libraries/popt/default.nix
index 592a1f1470a..592a1f1470a 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/popt/default.nix
diff --git a/pkgs/development/libraries/portaudio/default.nix b/nixpkgs/pkgs/development/libraries/portaudio/default.nix
index 68daece490f..68daece490f 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/portaudio/default.nix
diff --git a/pkgs/development/libraries/portmidi/default.nix b/nixpkgs/pkgs/development/libraries/portmidi/default.nix
index 37958038601..37958038601 100644
--- a/pkgs/development/libraries/portmidi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/portmidi/default.nix
diff --git a/pkgs/development/libraries/ppl/default.nix b/nixpkgs/pkgs/development/libraries/ppl/default.nix
index 7839547ee92..7839547ee92 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ppl/default.nix
diff --git a/pkgs/development/libraries/precice/0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch b/nixpkgs/pkgs/development/libraries/precice/0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch
index 52a4d0b5ccc..52a4d0b5ccc 100644
--- a/pkgs/development/libraries/precice/0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch
+++ b/nixpkgs/pkgs/development/libraries/precice/0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch
diff --git a/pkgs/development/libraries/precice/default.nix b/nixpkgs/pkgs/development/libraries/precice/default.nix
index a22df8c18e0..a22df8c18e0 100644
--- a/pkgs/development/libraries/precice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/precice/default.nix
diff --git a/pkgs/development/libraries/prison/default.nix b/nixpkgs/pkgs/development/libraries/prison/default.nix
index d40b4442e38..d40b4442e38 100644
--- a/pkgs/development/libraries/prison/default.nix
+++ b/nixpkgs/pkgs/development/libraries/prison/default.nix
diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix
index f1c13e93aec..f1c13e93aec 100644
--- a/pkgs/development/libraries/proj-datumgrid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix
diff --git a/pkgs/development/libraries/proj/5.2.nix b/nixpkgs/pkgs/development/libraries/proj/5.2.nix
index 8fb4515e70d..8fb4515e70d 100644
--- a/pkgs/development/libraries/proj/5.2.nix
+++ b/nixpkgs/pkgs/development/libraries/proj/5.2.nix
diff --git a/pkgs/development/libraries/proj/default.nix b/nixpkgs/pkgs/development/libraries/proj/default.nix
index ea89dbee0f6..ea89dbee0f6 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/nixpkgs/pkgs/development/libraries/proj/default.nix
diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix
index 624b23f4d60..624b23f4d60 100644
--- a/pkgs/development/libraries/prometheus-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix
diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix
index bd20dc540c0..bd20dc540c0 100644
--- a/pkgs/development/libraries/properties-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix
diff --git a/pkgs/development/libraries/protobuf/2.5.nix b/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix
index 550d0b1bace..550d0b1bace 100644
--- a/pkgs/development/libraries/protobuf/2.5.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix
diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.1.nix
index 91ef87512c8..91ef87512c8 100644
--- a/pkgs/development/libraries/protobuf/3.1.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/3.1.nix
diff --git a/pkgs/development/libraries/protobuf/3.10.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.10.nix
index 5ecb8e67f84..5ecb8e67f84 100644
--- a/pkgs/development/libraries/protobuf/3.10.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/3.10.nix
diff --git a/pkgs/development/libraries/protobuf/3.11.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.11.nix
index 7e89463aad6..7e89463aad6 100644
--- a/pkgs/development/libraries/protobuf/3.11.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/3.11.nix
diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.6.nix
index 16decc44e84..16decc44e84 100644
--- a/pkgs/development/libraries/protobuf/3.6.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/3.6.nix
diff --git a/pkgs/development/libraries/protobuf/3.7.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.7.nix
index 9bfb307e328..9bfb307e328 100644
--- a/pkgs/development/libraries/protobuf/3.7.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/3.7.nix
diff --git a/pkgs/development/libraries/protobuf/3.8.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.8.nix
index 2ea03643b3a..2ea03643b3a 100644
--- a/pkgs/development/libraries/protobuf/3.8.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/3.8.nix
diff --git a/pkgs/development/libraries/protobuf/3.9.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.9.nix
index e74d5c527b1..e74d5c527b1 100644
--- a/pkgs/development/libraries/protobuf/3.9.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/3.9.nix
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix
index 01f74bc48eb..01f74bc48eb 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic.nix
index 3c08537db0b..3c08537db0b 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/generic.nix
diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/nixpkgs/pkgs/development/libraries/protobufc/1.3.nix
index 304f9d61f39..304f9d61f39 100644
--- a/pkgs/development/libraries/protobufc/1.3.nix
+++ b/nixpkgs/pkgs/development/libraries/protobufc/1.3.nix
diff --git a/pkgs/development/libraries/protobufc/generic.nix b/nixpkgs/pkgs/development/libraries/protobufc/generic.nix
index 838fa7de826..838fa7de826 100644
--- a/pkgs/development/libraries/protobufc/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/protobufc/generic.nix
diff --git a/pkgs/development/libraries/protolock/default.nix b/nixpkgs/pkgs/development/libraries/protolock/default.nix
index f1eb3ae51f3..f1eb3ae51f3 100644
--- a/pkgs/development/libraries/protolock/default.nix
+++ b/nixpkgs/pkgs/development/libraries/protolock/default.nix
diff --git a/pkgs/development/libraries/prototypejs/default.nix b/nixpkgs/pkgs/development/libraries/prototypejs/default.nix
index a56b14384e5..a56b14384e5 100644
--- a/pkgs/development/libraries/prototypejs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/prototypejs/default.nix
diff --git a/pkgs/development/libraries/protozero/default.nix b/nixpkgs/pkgs/development/libraries/protozero/default.nix
index 0bbfab62fcd..0bbfab62fcd 100644
--- a/pkgs/development/libraries/protozero/default.nix
+++ b/nixpkgs/pkgs/development/libraries/protozero/default.nix
diff --git a/pkgs/development/libraries/psol/default.nix b/nixpkgs/pkgs/development/libraries/psol/default.nix
index 270c24dc01f..270c24dc01f 100644
--- a/pkgs/development/libraries/psol/default.nix
+++ b/nixpkgs/pkgs/development/libraries/psol/default.nix
diff --git a/pkgs/development/libraries/psol/generic.nix b/nixpkgs/pkgs/development/libraries/psol/generic.nix
index c61926fe13f..c61926fe13f 100644
--- a/pkgs/development/libraries/psol/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/psol/generic.nix
diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix
index 2364e0913bc..2364e0913bc 100644
--- a/pkgs/development/libraries/psqlodbc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix
diff --git a/pkgs/development/libraries/pstreams/default.nix b/nixpkgs/pkgs/development/libraries/pstreams/default.nix
index a734ac1e9fd..a734ac1e9fd 100644
--- a/pkgs/development/libraries/pstreams/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pstreams/default.nix
diff --git a/pkgs/development/libraries/ptex/default.nix b/nixpkgs/pkgs/development/libraries/ptex/default.nix
index b4571d07fbf..b4571d07fbf 100644
--- a/pkgs/development/libraries/ptex/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ptex/default.nix
diff --git a/pkgs/development/libraries/pth/default.nix b/nixpkgs/pkgs/development/libraries/pth/default.nix
index b2173ec21ee..b2173ec21ee 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pth/default.nix
diff --git a/pkgs/development/libraries/pugixml/default.nix b/nixpkgs/pkgs/development/libraries/pugixml/default.nix
index d1825171596..d1825171596 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pugixml/default.nix
diff --git a/pkgs/development/libraries/pupnp/default.nix b/nixpkgs/pkgs/development/libraries/pupnp/default.nix
index 66a395801b2..66a395801b2 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pupnp/default.nix
diff --git a/pkgs/development/libraries/pyotherside/default.nix b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix
index 002208dcc0b..002208dcc0b 100644
--- a/pkgs/development/libraries/pyotherside/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix
diff --git a/pkgs/development/libraries/pyotherside/qml-path.patch b/nixpkgs/pkgs/development/libraries/pyotherside/qml-path.patch
index 9f720890997..9f720890997 100644
--- a/pkgs/development/libraries/pyotherside/qml-path.patch
+++ b/nixpkgs/pkgs/development/libraries/pyotherside/qml-path.patch
diff --git a/pkgs/development/libraries/python-qt/default.nix b/nixpkgs/pkgs/development/libraries/python-qt/default.nix
index 2b630de14b2..2b630de14b2 100644
--- a/pkgs/development/libraries/python-qt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/python-qt/default.nix
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix
index 79b105a2d1c..79b105a2d1c 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix
diff --git a/pkgs/development/libraries/qca-qt5/move-project.patch b/nixpkgs/pkgs/development/libraries/qca-qt5/move-project.patch
index dcecb83d7db..dcecb83d7db 100644
--- a/pkgs/development/libraries/qca-qt5/move-project.patch
+++ b/nixpkgs/pkgs/development/libraries/qca-qt5/move-project.patch
diff --git a/pkgs/development/libraries/qca2/default.nix b/nixpkgs/pkgs/development/libraries/qca2/default.nix
index 4894bee9609..4894bee9609 100644
--- a/pkgs/development/libraries/qca2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qca2/default.nix
diff --git a/pkgs/development/libraries/qca2/libressl.patch b/nixpkgs/pkgs/development/libraries/qca2/libressl.patch
index c9b0267f85d..c9b0267f85d 100644
--- a/pkgs/development/libraries/qca2/libressl.patch
+++ b/nixpkgs/pkgs/development/libraries/qca2/libressl.patch
diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix
index 3626e15cfc7..3626e15cfc7 100644
--- a/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix
diff --git a/pkgs/development/libraries/qhull/default.nix b/nixpkgs/pkgs/development/libraries/qhull/default.nix
index 323171212be..323171212be 100644
--- a/pkgs/development/libraries/qhull/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qhull/default.nix
diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix
index 51253676341..51253676341 100644
--- a/pkgs/development/libraries/qimageblitz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix
diff --git a/pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch b/nixpkgs/pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch
index 8692c240f7b..8692c240f7b 100644
--- a/pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch
+++ b/nixpkgs/pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch
diff --git a/pkgs/development/libraries/qjson/default.nix b/nixpkgs/pkgs/development/libraries/qjson/default.nix
index 6d84e609127..6d84e609127 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qjson/default.nix
diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix
index 03247f9d695..03247f9d695 100644
--- a/pkgs/development/libraries/qmlbox2d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix
index b156a1cbf99..b156a1cbf99 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix
diff --git a/pkgs/development/libraries/qoauth/default.nix b/nixpkgs/pkgs/development/libraries/qoauth/default.nix
index 83e904e53eb..83e904e53eb 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qoauth/default.nix
diff --git a/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix
index 68362be596b..68362be596b 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qpdf/default.nix
diff --git a/pkgs/development/libraries/qrencode/default.nix b/nixpkgs/pkgs/development/libraries/qrencode/default.nix
index 9e8d9ce239b..9e8d9ce239b 100644
--- a/pkgs/development/libraries/qrencode/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qrencode/default.nix
diff --git a/pkgs/development/libraries/qrupdate/default.nix b/nixpkgs/pkgs/development/libraries/qrupdate/default.nix
index 3e0dc99f81f..3e0dc99f81f 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qrupdate/default.nix
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/nixpkgs/pkgs/development/libraries/qscintilla/default.nix
index a8be20b73b1..a8be20b73b1 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qscintilla/default.nix
diff --git a/pkgs/development/libraries/qscintilla/fix-qt4-build.patch b/nixpkgs/pkgs/development/libraries/qscintilla/fix-qt4-build.patch
index 520a55b1ea2..520a55b1ea2 100644
--- a/pkgs/development/libraries/qscintilla/fix-qt4-build.patch
+++ b/nixpkgs/pkgs/development/libraries/qscintilla/fix-qt4-build.patch
diff --git a/pkgs/development/libraries/qt-3/builder.sh b/nixpkgs/pkgs/development/libraries/qt-3/builder.sh
index 460ae17766a..460ae17766a 100644
--- a/pkgs/development/libraries/qt-3/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-3/builder.sh
diff --git a/pkgs/development/libraries/qt-3/default.nix b/nixpkgs/pkgs/development/libraries/qt-3/default.nix
index 98519ae294a..98519ae294a 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-3/default.nix
diff --git a/pkgs/development/libraries/qt-3/qt-pwd.patch b/nixpkgs/pkgs/development/libraries/qt-3/qt-pwd.patch
index 763f785726b..763f785726b 100644
--- a/pkgs/development/libraries/qt-3/qt-pwd.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-3/qt-pwd.patch
diff --git a/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch b/nixpkgs/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch
index c1a903c130c..c1a903c130c 100644
--- a/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch
diff --git a/pkgs/development/libraries/qt-3/setup-hook.sh b/nixpkgs/pkgs/development/libraries/qt-3/setup-hook.sh
index db1a2529ff5..db1a2529ff5 100644
--- a/pkgs/development/libraries/qt-3/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-3/setup-hook.sh
diff --git a/pkgs/development/libraries/qt-3/strip.patch b/nixpkgs/pkgs/development/libraries/qt-3/strip.patch
index a0c9fa73889..a0c9fa73889 100644
--- a/pkgs/development/libraries/qt-3/strip.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-3/strip.patch
diff --git a/pkgs/development/libraries/qt-3/xrandr.patch b/nixpkgs/pkgs/development/libraries/qt-3/xrandr.patch
index 0389c7fdd06..0389c7fdd06 100644
--- a/pkgs/development/libraries/qt-3/xrandr.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-3/xrandr.patch
diff --git a/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch
index 7b181f3ad89..7b181f3ad89 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 379f5b3d80e..379f5b3d80e 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix
diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff
index 4c64e9e26e3..4c64e9e26e3 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff
diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff
index a1c9238be1a..a1c9238be1a 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff
diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff
index d2ebbf3b45a..d2ebbf3b45a 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff
diff --git a/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch
index 4593c1b4ba8..4593c1b4ba8 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch
diff --git a/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch
index c1338e98d85..c1338e98d85 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch
diff --git a/pkgs/development/libraries/qt-4.x/4.8/libressl.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/libressl.patch
index 5432610d9dc..5432610d9dc 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/libressl.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/libressl.patch
diff --git a/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch
index b9b9d6d0a68..b9b9d6d0a68 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch
diff --git a/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff
index 53a4c70ac3a..53a4c70ac3a 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff
diff --git a/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh
index f288e99dd12..f288e99dd12 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh
diff --git a/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch
index 229123c54f7..229123c54f7 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch
diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch
index 99a36a24fe4..99a36a24fe4 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch
diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch
index 35380ad6714..35380ad6714 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch
diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch
index 90b9ccda08c..90b9ccda08c 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch
diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch
index dfd1d8b893b..dfd1d8b893b 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch
diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt4-openssl-1.1.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-openssl-1.1.patch
index 1931ceb0c74..1931ceb0c74 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/qt4-openssl-1.1.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-openssl-1.1.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
index 8d27f3a0d4b..8d27f3a0d4b 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh
index 9f99879511e..9f99879511e 100644
--- a/pkgs/development/libraries/qt-5/5.12/fetch.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
index bb535b8a0c0..bb535b8a0c0 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch
index 9f0c6665184..9f0c6665184 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch
index d5d8e70b788..d5d8e70b788 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch
index f2cf54880d4..f2cf54880d4 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch
index 64a88f300d8..64a88f300d8 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-gtk3.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-gtk3.patch
index ed1c61e7678..ed1c61e7678 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-gtk3.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-gtk3.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcursor.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcursor.patch
index 2fd9e9509d6..2fd9e9509d6 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcursor.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcursor.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-xcompose.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-xcompose.patch
index af45be94fec..af45be94fec 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-xcompose.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-xcompose.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-tzdir.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-tzdir.patch
index 03466b69afb..03466b69afb 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-tzdir.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-tzdir.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-qtpluginpath.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-qtpluginpath.patch
index 2c03521286a..2c03521286a 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-qtpluginpath.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-qtpluginpath.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0011-qtbase-assert.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0011-qtbase-assert.patch
index b4e0ab76229..b4e0ab76229 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0011-qtbase-assert.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0011-qtbase-assert.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0012-fix-header_module.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0012-fix-header_module.patch
index 1e2c68688b0..1e2c68688b0 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0012-fix-header_module.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0012-fix-header_module.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
index a43a46d8a69..a43a46d8a69 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch
index 8f5b5d4790f..8f5b5d4790f 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtscript.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtscript.patch
index 5508dec1280..5508dec1280 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtscript.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtscript.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtserialport.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtserialport.patch
index f25524e80bc..f25524e80bc 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtserialport.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtserialport.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qttools.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qttools.patch
index 8ae12198ca2..8ae12198ca2 100644
--- a/pkgs/development/libraries/qt-5/5.12/qttools.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qttools.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch
index 546e753144d..546e753144d 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch
index f332d5e1bb2..f332d5e1bb2 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch
index a7087f51762..a7087f51762 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch
index 26d189d8601..26d189d8601 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit.patch
index b94a4b76cba..b94a4b76cba 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtwebkit.patch
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/srcs.nix
index b4494593fd0..b4494593fd0 100644
--- a/pkgs/development/libraries/qt-5/5.12/srcs.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/srcs.nix
diff --git a/pkgs/development/libraries/qt-5/README.md b/nixpkgs/pkgs/development/libraries/qt-5/README.md
index b2ef74d0aef..b2ef74d0aef 100644
--- a/pkgs/development/libraries/qt-5/README.md
+++ b/nixpkgs/pkgs/development/libraries/qt-5/README.md
diff --git a/pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh
index 5acaeb82446..5acaeb82446 100644
--- a/pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh
diff --git a/pkgs/development/libraries/qt-5/hooks/fix-qt-builtin-paths.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/fix-qt-builtin-paths.sh
index 4ca11a223de..4ca11a223de 100644
--- a/pkgs/development/libraries/qt-5/hooks/fix-qt-builtin-paths.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/fix-qt-builtin-paths.sh
diff --git a/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh
index 33682f6f3c6..33682f6f3c6 100644
--- a/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh
diff --git a/pkgs/development/libraries/qt-5/hooks/move-qt-dev-tools.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/move-qt-dev-tools.sh
index 85489c85105..85489c85105 100644
--- a/pkgs/development/libraries/qt-5/hooks/move-qt-dev-tools.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/move-qt-dev-tools.sh
diff --git a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh
index 7f6ddb76ad5..7f6ddb76ad5 100644
--- a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh
diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh
index 9f2a9f06f1a..9f2a9f06f1a 100644
--- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh
diff --git a/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh
index c320a797447..c320a797447 100644
--- a/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh
diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
index 7356c8ee356..7356c8ee356 100644
--- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix
index 2c6333cb020..2c6333cb020 100644
--- a/pkgs/development/libraries/qt-5/mkDerivation.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 930c59d347b..930c59d347b 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtcharts.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtcharts.nix
index 84d3a17ea8c..84d3a17ea8c 100644
--- a/pkgs/development/libraries/qt-5/modules/qtcharts.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtcharts.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
index 36a736d03dc..36a736d03dc 100644
--- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
index b611282294c..b611282294c 100644
--- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtdoc.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdoc.nix
index 10623962c43..10623962c43 100644
--- a/pkgs/development/libraries/qt-5/modules/qtdoc.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdoc.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix
index d0be6ae7769..d0be6ae7769 100644
--- a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
index 1a7726070be..1a7726070be 100644
--- a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix
index 0eee684a53f..0eee684a53f 100644
--- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
index 11964caf17b..11964caf17b 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
index d0bab88b2f2..d0bab88b2f2 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix
index e6ef428cc3c..e6ef428cc3c 100644
--- a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix
index ba0f20bc0d8..ba0f20bc0d8 100644
--- a/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix
index a9522f4b1f0..a9522f4b1f0 100644
--- a/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtscript.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscript.nix
index 5a1a462a964..5a1a462a964 100644
--- a/pkgs/development/libraries/qt-5/modules/qtscript.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscript.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtsensors.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsensors.nix
index 3b8732b6885..3b8732b6885 100644
--- a/pkgs/development/libraries/qt-5/modules/qtsensors.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsensors.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix
index 516d38340dc..516d38340dc 100644
--- a/pkgs/development/libraries/qt-5/modules/qtserialport.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix
index ddef01a9482..ddef01a9482 100644
--- a/pkgs/development/libraries/qt-5/modules/qtspeech.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtsvg.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsvg.nix
index 3ce68e56e41..3ce68e56e41 100644
--- a/pkgs/development/libraries/qt-5/modules/qtsvg.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsvg.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix
index 573472a8b5a..573472a8b5a 100644
--- a/pkgs/development/libraries/qt-5/modules/qttools.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qttranslations.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix
index 11a6e3fedcb..11a6e3fedcb 100644
--- a/pkgs/development/libraries/qt-5/modules/qttranslations.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix
index 2ba720c8eed..2ba720c8eed 100644
--- a/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix
index c7a7704f283..c7a7704f283 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix
index 84fb88385a3..84fb88385a3 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index df444eee2eb..df444eee2eb 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix
index 444d0c1beae..444d0c1beae 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 1133623483a..1133623483a 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix
index ad5e7625f28..ad5e7625f28 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix
index 906d750c5d3..906d750c5d3 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtx11extras.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtx11extras.nix
index 4d431fee278..4d431fee278 100644
--- a/pkgs/development/libraries/qt-5/modules/qtx11extras.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtx11extras.nix
diff --git a/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix
index 7ac922421f0..7ac922421f0 100644
--- a/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix
diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/nixpkgs/pkgs/development/libraries/qt-5/qt-env.nix
index da56c07779b..da56c07779b 100644
--- a/pkgs/development/libraries/qt-5/qt-env.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/qt-env.nix
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix
index 5003205ef37..5003205ef37 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix
diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix
index b7857372d1c..b7857372d1c 100644
--- a/pkgs/development/libraries/qt-mobility/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix
diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix
index 3c4c192bd4b..3c4c192bd4b 100644
--- a/pkgs/development/libraries/qtinstaller/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix
diff --git a/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch b/nixpkgs/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
index 4cd7214e61e..4cd7214e61e 100644
--- a/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
+++ b/nixpkgs/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
diff --git a/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch b/nixpkgs/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch
index 30d93cd7bf8..30d93cd7bf8 100644
--- a/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix
index 5b963255b65..5b963255b65 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix
diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix
index 5f3f8c4a66a..5f3f8c4a66a 100644
--- a/pkgs/development/libraries/qtpbfimageplugin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix
diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/nixpkgs/pkgs/development/libraries/qtscriptgenerator/default.nix
index 88591e880de..88591e880de 100644
--- a/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtscriptgenerator/default.nix
diff --git a/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch b/nixpkgs/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch
index 8fe643e2c98..8fe643e2c98 100644
--- a/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch
+++ b/nixpkgs/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch
diff --git a/pkgs/development/libraries/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch b/nixpkgs/pkgs/development/libraries/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch
index c0a710efb15..c0a710efb15 100644
--- a/pkgs/development/libraries/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch
+++ b/nixpkgs/pkgs/development/libraries/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch
diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
index 7c2a99804c4..7c2a99804c4 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
index 71ca8e720a4..71ca8e720a4 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix
index 50a1e90588c..50a1e90588c 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix
diff --git a/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix
index 94e83c883c4..94e83c883c4 100644
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix
index 46a9785739a..46a9785739a 100644
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix
diff --git a/pkgs/development/libraries/quazip/default.nix b/nixpkgs/pkgs/development/libraries/quazip/default.nix
index cac861fe224..cac861fe224 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/quazip/default.nix
diff --git a/pkgs/development/libraries/quesoglc/default.nix b/nixpkgs/pkgs/development/libraries/quesoglc/default.nix
index fe24d0fcddf..fe24d0fcddf 100644
--- a/pkgs/development/libraries/quesoglc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/quesoglc/default.nix
diff --git a/pkgs/development/libraries/quickder/default.nix b/nixpkgs/pkgs/development/libraries/quickder/default.nix
index 7e006236080..7e006236080 100644
--- a/pkgs/development/libraries/quickder/default.nix
+++ b/nixpkgs/pkgs/development/libraries/quickder/default.nix
diff --git a/pkgs/development/libraries/qwt/6.nix b/nixpkgs/pkgs/development/libraries/qwt/6.nix
index 6e0fa53aa82..6e0fa53aa82 100644
--- a/pkgs/development/libraries/qwt/6.nix
+++ b/nixpkgs/pkgs/development/libraries/qwt/6.nix
diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix
index b6e0acb603d..b6e0acb603d 100644
--- a/pkgs/development/libraries/qwt/6_qt4.nix
+++ b/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix
diff --git a/pkgs/development/libraries/qwt/default.nix b/nixpkgs/pkgs/development/libraries/qwt/default.nix
index f900de5e578..f900de5e578 100644
--- a/pkgs/development/libraries/qwt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qwt/default.nix
diff --git a/pkgs/development/libraries/qxt/default.nix b/nixpkgs/pkgs/development/libraries/qxt/default.nix
index 79d4d652424..79d4d652424 100644
--- a/pkgs/development/libraries/qxt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qxt/default.nix
diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix
index 487de0976bd..487de0976bd 100644
--- a/pkgs/development/libraries/rabbitmq-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix
diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix
index ff8db94288a..ff8db94288a 100644
--- a/pkgs/development/libraries/rabbitmq-java-client/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix
diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix
index 515fbc602d9..515fbc602d9 100644
--- a/pkgs/development/libraries/raft-canonical/default.nix
+++ b/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix
diff --git a/pkgs/development/libraries/randomx/default.nix b/nixpkgs/pkgs/development/libraries/randomx/default.nix
index 9e6cdfecb95..9e6cdfecb95 100644
--- a/pkgs/development/libraries/randomx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/randomx/default.nix
diff --git a/pkgs/development/libraries/range-v3/default.nix b/nixpkgs/pkgs/development/libraries/range-v3/default.nix
index ca2c7d9b70f..ca2c7d9b70f 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/range-v3/default.nix
diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix
index 92c42d19af6..92c42d19af6 100644
--- a/pkgs/development/libraries/rapidcheck/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix
diff --git a/pkgs/development/libraries/rapidjson/default.nix b/nixpkgs/pkgs/development/libraries/rapidjson/default.nix
index ea91c1507dc..ea91c1507dc 100644
--- a/pkgs/development/libraries/rapidjson/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rapidjson/default.nix
diff --git a/pkgs/development/libraries/rapidxml/default.nix b/nixpkgs/pkgs/development/libraries/rapidxml/default.nix
index ca072f2ca4b..ca072f2ca4b 100644
--- a/pkgs/development/libraries/rapidxml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rapidxml/default.nix
diff --git a/pkgs/development/libraries/rarian/default.nix b/nixpkgs/pkgs/development/libraries/rarian/default.nix
index bd79e3628a1..bd79e3628a1 100644
--- a/pkgs/development/libraries/rarian/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rarian/default.nix
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
index cb1b176ce35..cb1b176ce35 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
diff --git a/pkgs/development/libraries/re2/default.nix b/nixpkgs/pkgs/development/libraries/re2/default.nix
index 2b60c3cbf54..2b60c3cbf54 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/re2/default.nix
diff --git a/pkgs/development/libraries/readline/5.x.nix b/nixpkgs/pkgs/development/libraries/readline/5.x.nix
index 84062408d45..84062408d45 100644
--- a/pkgs/development/libraries/readline/5.x.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/5.x.nix
diff --git a/pkgs/development/libraries/readline/6.2.nix b/nixpkgs/pkgs/development/libraries/readline/6.2.nix
index af59e50ec5e..af59e50ec5e 100644
--- a/pkgs/development/libraries/readline/6.2.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/6.2.nix
diff --git a/pkgs/development/libraries/readline/6.3.nix b/nixpkgs/pkgs/development/libraries/readline/6.3.nix
index 1e5d9a0a664..1e5d9a0a664 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/6.3.nix
diff --git a/pkgs/development/libraries/readline/7.0.nix b/nixpkgs/pkgs/development/libraries/readline/7.0.nix
index 065d6544986..065d6544986 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/7.0.nix
diff --git a/pkgs/development/libraries/readline/8.0.nix b/nixpkgs/pkgs/development/libraries/readline/8.0.nix
index 7fbef9a986a..7fbef9a986a 100644
--- a/pkgs/development/libraries/readline/8.0.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/8.0.nix
diff --git a/pkgs/development/libraries/readline/android.patch b/nixpkgs/pkgs/development/libraries/readline/android.patch
index 7e81774be36..7e81774be36 100644
--- a/pkgs/development/libraries/readline/android.patch
+++ b/nixpkgs/pkgs/development/libraries/readline/android.patch
diff --git a/pkgs/development/libraries/readline/clang.patch b/nixpkgs/pkgs/development/libraries/readline/clang.patch
index 42bb0be09c3..42bb0be09c3 100644
--- a/pkgs/development/libraries/readline/clang.patch
+++ b/nixpkgs/pkgs/development/libraries/readline/clang.patch
diff --git a/pkgs/development/libraries/readline/link-against-ncurses.patch b/nixpkgs/pkgs/development/libraries/readline/link-against-ncurses.patch
index 0fd0598f465..0fd0598f465 100644
--- a/pkgs/development/libraries/readline/link-against-ncurses.patch
+++ b/nixpkgs/pkgs/development/libraries/readline/link-against-ncurses.patch
diff --git a/pkgs/development/libraries/readline/no-arch_only-6.3.patch b/nixpkgs/pkgs/development/libraries/readline/no-arch_only-6.3.patch
index 7c46dbad962..7c46dbad962 100644
--- a/pkgs/development/libraries/readline/no-arch_only-6.3.patch
+++ b/nixpkgs/pkgs/development/libraries/readline/no-arch_only-6.3.patch
diff --git a/pkgs/development/libraries/readline/no-arch_only.patch b/nixpkgs/pkgs/development/libraries/readline/no-arch_only.patch
index b23eab5d9d7..b23eab5d9d7 100644
--- a/pkgs/development/libraries/readline/no-arch_only.patch
+++ b/nixpkgs/pkgs/development/libraries/readline/no-arch_only.patch
diff --git a/pkgs/development/libraries/readline/readline-6.2-patches.nix b/nixpkgs/pkgs/development/libraries/readline/readline-6.2-patches.nix
index 9fdcb3743b7..9fdcb3743b7 100644
--- a/pkgs/development/libraries/readline/readline-6.2-patches.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/readline-6.2-patches.nix
diff --git a/pkgs/development/libraries/readline/readline-6.3-patches.nix b/nixpkgs/pkgs/development/libraries/readline/readline-6.3-patches.nix
index d0aaaf38f70..d0aaaf38f70 100644
--- a/pkgs/development/libraries/readline/readline-6.3-patches.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/readline-6.3-patches.nix
diff --git a/pkgs/development/libraries/readline/readline-7.0-patches.nix b/nixpkgs/pkgs/development/libraries/readline/readline-7.0-patches.nix
index c34ef2bf97b..c34ef2bf97b 100644
--- a/pkgs/development/libraries/readline/readline-7.0-patches.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/readline-7.0-patches.nix
diff --git a/pkgs/development/libraries/readline/readline-8.0-patches.nix b/nixpkgs/pkgs/development/libraries/readline/readline-8.0-patches.nix
index 433da83dab9..433da83dab9 100644
--- a/pkgs/development/libraries/readline/readline-8.0-patches.nix
+++ b/nixpkgs/pkgs/development/libraries/readline/readline-8.0-patches.nix
diff --git a/pkgs/development/libraries/readline/shobj-darwin.patch b/nixpkgs/pkgs/development/libraries/readline/shobj-darwin.patch
index a9199ca3e89..a9199ca3e89 100644
--- a/pkgs/development/libraries/readline/shobj-darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/readline/shobj-darwin.patch
diff --git a/pkgs/development/libraries/readosm/default.nix b/nixpkgs/pkgs/development/libraries/readosm/default.nix
index 1c777e849a4..1c777e849a4 100644
--- a/pkgs/development/libraries/readosm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/readosm/default.nix
diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix
index 7530cc64bf5..7530cc64bf5 100644
--- a/pkgs/development/libraries/rep-gtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix
diff --git a/pkgs/development/libraries/rep-gtk/setup-hook.sh b/nixpkgs/pkgs/development/libraries/rep-gtk/setup-hook.sh
index 4d875b69330..4d875b69330 100644
--- a/pkgs/development/libraries/rep-gtk/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/rep-gtk/setup-hook.sh
diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix
index e221c82edec..e221c82edec 100644
--- a/pkgs/development/libraries/resolv_wrapper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix
diff --git a/pkgs/development/libraries/rlog/default.nix b/nixpkgs/pkgs/development/libraries/rlog/default.nix
index f9188e1294b..f9188e1294b 100644
--- a/pkgs/development/libraries/rlog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rlog/default.nix
diff --git a/pkgs/development/libraries/rnnoise/default.nix b/nixpkgs/pkgs/development/libraries/rnnoise/default.nix
index fe6b75446b2..fe6b75446b2 100644
--- a/pkgs/development/libraries/rnnoise/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rnnoise/default.nix
diff --git a/pkgs/development/libraries/robin-map/default.nix b/nixpkgs/pkgs/development/libraries/robin-map/default.nix
index 4aba29c5830..4aba29c5830 100644
--- a/pkgs/development/libraries/robin-map/default.nix
+++ b/nixpkgs/pkgs/development/libraries/robin-map/default.nix
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix
index 2d3d1e8d722..2d3d1e8d722 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix
diff --git a/pkgs/development/libraries/rote/default.nix b/nixpkgs/pkgs/development/libraries/rote/default.nix
index 82a2998be1e..82a2998be1e 100644
--- a/pkgs/development/libraries/rote/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rote/default.nix
diff --git a/pkgs/development/libraries/rttr/default.nix b/nixpkgs/pkgs/development/libraries/rttr/default.nix
index 74b8e381f93..74b8e381f93 100644
--- a/pkgs/development/libraries/rttr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rttr/default.nix
diff --git a/pkgs/development/libraries/rubberband/default.nix b/nixpkgs/pkgs/development/libraries/rubberband/default.nix
index c9ba339ae0e..c9ba339ae0e 100644
--- a/pkgs/development/libraries/rubberband/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rubberband/default.nix
diff --git a/pkgs/development/libraries/safefile/default.nix b/nixpkgs/pkgs/development/libraries/safefile/default.nix
index ae5ec222c23..ae5ec222c23 100644
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/nixpkgs/pkgs/development/libraries/safefile/default.nix
diff --git a/pkgs/development/libraries/sbc/default.nix b/nixpkgs/pkgs/development/libraries/sbc/default.nix
index ce8db3ee9ea..ce8db3ee9ea 100644
--- a/pkgs/development/libraries/sbc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sbc/default.nix
diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix
index 9ffa2efc376..9ffa2efc376 100644
--- a/pkgs/development/libraries/sblim-sfcc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix
diff --git a/pkgs/development/libraries/schroedinger/default.nix b/nixpkgs/pkgs/development/libraries/schroedinger/default.nix
index 1831161979d..1831161979d 100644
--- a/pkgs/development/libraries/schroedinger/default.nix
+++ b/nixpkgs/pkgs/development/libraries/schroedinger/default.nix
diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix
index 53ae70f5bf8..53ae70f5bf8 100644
--- a/pkgs/development/libraries/science/benchmark/papi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix
diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix
index f4353f51d66..f4353f51d66 100644
--- a/pkgs/development/libraries/science/biology/EBTKS/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix
diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix
index 3c9b8f8257c..3c9b8f8257c 100644
--- a/pkgs/development/libraries/science/biology/bicgl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix
diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix
index 0c634c0f265..0c634c0f265 100644
--- a/pkgs/development/libraries/science/biology/bicpl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix
diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix
index 4cfc07c1cba..4cfc07c1cba 100644
--- a/pkgs/development/libraries/science/biology/elastix/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix
diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix
index cdd56731fa0..cdd56731fa0 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix
diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix
index 4291e11ed33..4291e11ed33 100644
--- a/pkgs/development/libraries/science/biology/mirtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix
diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix
index 8c7da7968f5..8c7da7968f5 100644
--- a/pkgs/development/libraries/science/biology/nifticlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix
diff --git a/pkgs/development/libraries/science/biology/oobicpl/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix
index 8755b7fd2eb..8755b7fd2eb 100644
--- a/pkgs/development/libraries/science/biology/oobicpl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix
diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix
index 69ccbfc26b4..69ccbfc26b4 100644
--- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix
index 89f3aa94247..89f3aa94247 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix
index a14ed4e6a30..a14ed4e6a30 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix
diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix
index 4ffe147b27f..4ffe147b27f 100644
--- a/pkgs/development/libraries/science/math/brial/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix
index a5c373ecde9..a5c373ecde9 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix
diff --git a/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch b/nixpkgs/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch
index f319f20233a..f319f20233a 100644
--- a/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch
+++ b/nixpkgs/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch
diff --git a/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch b/nixpkgs/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch
index d908cb6ba80..d908cb6ba80 100644
--- a/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch
+++ b/nixpkgs/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch
diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix
index 52c775c9a0d..52c775c9a0d 100644
--- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix
diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
index 8a474e06e55..8a474e06e55 100644
--- a/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
diff --git a/pkgs/development/libraries/science/math/clblas/platform.patch b/nixpkgs/pkgs/development/libraries/science/math/clblas/platform.patch
index 87404a426a4..87404a426a4 100644
--- a/pkgs/development/libraries/science/math/clblas/platform.patch
+++ b/nixpkgs/pkgs/development/libraries/science/math/clblas/platform.patch
diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix
index 08f821dcb2c..08f821dcb2c 100644
--- a/pkgs/development/libraries/science/math/cliquer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix
diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix
index b5c59a83277..b5c59a83277 100644
--- a/pkgs/development/libraries/science/math/clmagma/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix
diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix
index 8cd74939959..8cd74939959 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix
diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix
index 5a17e807bd4..5a17e807bd4 100644
--- a/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix
diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix
index 77973a95449..77973a95449 100644
--- a/pkgs/development/libraries/science/math/ecos/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix
diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix
index 2bb284477e6..2bb284477e6 100644
--- a/pkgs/development/libraries/science/math/fenics/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix
diff --git a/pkgs/development/libraries/science/math/fenics/unicode.patch b/nixpkgs/pkgs/development/libraries/science/math/fenics/unicode.patch
index 2ef2709263a..2ef2709263a 100644
--- a/pkgs/development/libraries/science/math/fenics/unicode.patch
+++ b/nixpkgs/pkgs/development/libraries/science/math/fenics/unicode.patch
diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix
index 6fd16535459..6fd16535459 100644
--- a/pkgs/development/libraries/science/math/flintqs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix
diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix
index 1995fb9c85d..1995fb9c85d 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix
index 0f23f08145e..0f23f08145e 100644
--- a/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix
diff --git a/pkgs/development/libraries/science/math/lcalc/makefile.patch b/nixpkgs/pkgs/development/libraries/science/math/lcalc/makefile.patch
index 5c22cf0b84e..5c22cf0b84e 100644
--- a/pkgs/development/libraries/science/math/lcalc/makefile.patch
+++ b/nixpkgs/pkgs/development/libraries/science/math/lcalc/makefile.patch
diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix
index c8f1138d69f..c8f1138d69f 100644
--- a/pkgs/development/libraries/science/math/libbraiding/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix
diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix
index a2c0dd4fa17..a2c0dd4fa17 100644
--- a/pkgs/development/libraries/science/math/libhomfly/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
index a7d01e22d96..a7d01e22d96 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix
index 33e8baada83..33e8baada83 100644
--- a/pkgs/development/libraries/science/math/liblbfgs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix
diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix
index b0cfbca5aa3..b0cfbca5aa3 100644
--- a/pkgs/development/libraries/science/math/lrs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix
diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix
index 50e0c576e69..50e0c576e69 100644
--- a/pkgs/development/libraries/science/math/m4ri/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix
diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix
index 6a7ecdf46fd..6a7ecdf46fd 100644
--- a/pkgs/development/libraries/science/math/m4rie/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix
diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix
index 6a07ebdb862..6a07ebdb862 100644
--- a/pkgs/development/libraries/science/math/magma/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix
diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix
index 3ce94f28ac2..3ce94f28ac2 100644
--- a/pkgs/development/libraries/science/math/metis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix
index 604413c96d8..604413c96d8 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix
diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix
index c9aeb83c469..c9aeb83c469 100644
--- a/pkgs/development/libraries/science/math/nccl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
index a26cf38a9d0..a26cf38a9d0 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
index e4a3241c1f3..e4a3241c1f3 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix
index 3a4c5a78438..3a4c5a78438 100644
--- a/pkgs/development/libraries/science/math/openspecfun/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix
diff --git a/pkgs/development/libraries/science/math/or-tools/build.patch b/nixpkgs/pkgs/development/libraries/science/math/or-tools/build.patch
index a67e137ff4a..a67e137ff4a 100644
--- a/pkgs/development/libraries/science/math/or-tools/build.patch
+++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/build.patch
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix
index 15aea5803bf..15aea5803bf 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix
diff --git a/pkgs/development/libraries/science/math/or-tools/protobuf.patch b/nixpkgs/pkgs/development/libraries/science/math/or-tools/protobuf.patch
index b0cce40434c..b0cce40434c 100644
--- a/pkgs/development/libraries/science/math/or-tools/protobuf.patch
+++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/protobuf.patch
diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix
index 6dc7e746fd3..6dc7e746fd3 100644
--- a/pkgs/development/libraries/science/math/osi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix
diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix
index 3a9ef770459..3a9ef770459 100644
--- a/pkgs/development/libraries/science/math/parmetis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix
diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
index c2eda9dac48..c2eda9dac48 100644
--- a/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix
index e7dfaecf1de..e7dfaecf1de 100644
--- a/pkgs/development/libraries/science/math/planarity/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix
diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
index 46709ff218a..46709ff218a 100644
--- a/pkgs/development/libraries/science/math/primesieve/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix
index ded7b7dc90a..ded7b7dc90a 100644
--- a/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix
index 3b2ddc6f06c..3b2ddc6f06c 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix
index fda902f320c..fda902f320c 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix
diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix
index 51a72585c0c..51a72585c0c 100644
--- a/pkgs/development/libraries/science/math/scs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix
diff --git a/pkgs/development/libraries/science/math/spooles/default.nix b/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix
index 953f5a70b8a..953f5a70b8a 100644
--- a/pkgs/development/libraries/science/math/spooles/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix
diff --git a/pkgs/development/libraries/science/math/spooles/spooles.patch b/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch
index c0c93c9365c..c0c93c9365c 100644
--- a/pkgs/development/libraries/science/math/spooles/spooles.patch
+++ b/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch
diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix
index 48de128edc5..48de128edc5 100644
--- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix
diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix
index 1ce56d1e49f..1ce56d1e49f 100644
--- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix
index a6c803be260..a6c803be260 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix
diff --git a/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch b/nixpkgs/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch
index 29d86238af0..29d86238af0 100644
--- a/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch
+++ b/nixpkgs/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch
diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix
index 570c9814485..570c9814485 100644
--- a/pkgs/development/libraries/science/math/superlu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix
diff --git a/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch b/nixpkgs/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch
index ce7bc6974c9..ce7bc6974c9 100644
--- a/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch
+++ b/nixpkgs/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
index e67f61599b5..e67f61599b5 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix
index f9f300883a1..f9f300883a1 100644
--- a/pkgs/development/libraries/science/math/tensorflow/bin.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix
diff --git a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
index 76f0c5eea7f..76f0c5eea7f 100644
--- a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
diff --git a/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh
index 515f25df4c1..515f25df4c1 100755
--- a/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh
+++ b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh
diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix
index 838fb1f3638..838fb1f3638 100644
--- a/pkgs/development/libraries/science/math/zn_poly/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix
diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix
index 73be2a8ca6c..73be2a8ca6c 100644
--- a/pkgs/development/libraries/science/networking/ns-3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix
diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix
index 640eefbd733..640eefbd733 100644
--- a/pkgs/development/libraries/science/robotics/ispike/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix
diff --git a/pkgs/development/libraries/scmccid/default.nix b/nixpkgs/pkgs/development/libraries/scmccid/default.nix
index ff29ae82c5c..ff29ae82c5c 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/scmccid/default.nix
diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix
index eb8d17c6457..eb8d17c6457 100644
--- a/pkgs/development/libraries/scriptaculous/default.nix
+++ b/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix
diff --git a/pkgs/development/libraries/sdformat/3.nix b/nixpkgs/pkgs/development/libraries/sdformat/3.nix
index b78f1d5624c..b78f1d5624c 100644
--- a/pkgs/development/libraries/sdformat/3.nix
+++ b/nixpkgs/pkgs/development/libraries/sdformat/3.nix
diff --git a/pkgs/development/libraries/sdformat/default.nix b/nixpkgs/pkgs/development/libraries/sdformat/default.nix
index 66ad311387f..66ad311387f 100644
--- a/pkgs/development/libraries/sdformat/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sdformat/default.nix
diff --git a/pkgs/development/libraries/seasocks/default.nix b/nixpkgs/pkgs/development/libraries/seasocks/default.nix
index 9825c0c4035..9825c0c4035 100644
--- a/pkgs/development/libraries/seasocks/default.nix
+++ b/nixpkgs/pkgs/development/libraries/seasocks/default.nix
diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix
index 907e0cc5076..907e0cc5076 100644
--- a/pkgs/development/libraries/sentencepiece/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix
diff --git a/pkgs/development/libraries/serd/default.nix b/nixpkgs/pkgs/development/libraries/serd/default.nix
index 63af0d40781..63af0d40781 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/serd/default.nix
diff --git a/pkgs/development/libraries/serf/default.nix b/nixpkgs/pkgs/development/libraries/serf/default.nix
index 3fd47125bcb..3fd47125bcb 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/serf/default.nix
diff --git a/pkgs/development/libraries/serf/scons.patch b/nixpkgs/pkgs/development/libraries/serf/scons.patch
index a7eefe7d5c1..a7eefe7d5c1 100644
--- a/pkgs/development/libraries/serf/scons.patch
+++ b/nixpkgs/pkgs/development/libraries/serf/scons.patch
diff --git a/pkgs/development/libraries/serialdv/default.nix b/nixpkgs/pkgs/development/libraries/serialdv/default.nix
index 178cee5e69a..178cee5e69a 100644
--- a/pkgs/development/libraries/serialdv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/serialdv/default.nix
diff --git a/pkgs/development/libraries/sfml/default.nix b/nixpkgs/pkgs/development/libraries/sfml/default.nix
index 4726221a40d..4726221a40d 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sfml/default.nix
diff --git a/pkgs/development/libraries/sfsexp/default.nix b/nixpkgs/pkgs/development/libraries/sfsexp/default.nix
index 261658b0547..261658b0547 100644
--- a/pkgs/development/libraries/sfsexp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sfsexp/default.nix
diff --git a/pkgs/development/libraries/shapelib/default.nix b/nixpkgs/pkgs/development/libraries/shapelib/default.nix
index 9da54a37042..9da54a37042 100644
--- a/pkgs/development/libraries/shapelib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/shapelib/default.nix
diff --git a/pkgs/development/libraries/shhmsg/default.nix b/nixpkgs/pkgs/development/libraries/shhmsg/default.nix
index 2790e181ac1..2790e181ac1 100644
--- a/pkgs/development/libraries/shhmsg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/shhmsg/default.nix
diff --git a/pkgs/development/libraries/shhopt/default.nix b/nixpkgs/pkgs/development/libraries/shhopt/default.nix
index 52ba959b615..52ba959b615 100644
--- a/pkgs/development/libraries/shhopt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/shhopt/default.nix
diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix
index 77b9714066d..77b9714066d 100644
--- a/pkgs/development/libraries/shibboleth-sp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix
diff --git a/pkgs/development/libraries/silgraphite/default.nix b/nixpkgs/pkgs/development/libraries/silgraphite/default.nix
index 9d0aca0ab14..9d0aca0ab14 100644
--- a/pkgs/development/libraries/silgraphite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/silgraphite/default.nix
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix
index 6b1c4ca97ba..6b1c4ca97ba 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix
diff --git a/pkgs/development/libraries/silgraphite/macosx.patch b/nixpkgs/pkgs/development/libraries/silgraphite/macosx.patch
index 7929c1967c8..7929c1967c8 100644
--- a/pkgs/development/libraries/silgraphite/macosx.patch
+++ b/nixpkgs/pkgs/development/libraries/silgraphite/macosx.patch
diff --git a/pkgs/development/libraries/simgear/default.nix b/nixpkgs/pkgs/development/libraries/simgear/default.nix
index bdd8dd9d999..bdd8dd9d999 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/nixpkgs/pkgs/development/libraries/simgear/default.nix
diff --git a/pkgs/development/libraries/simpleitk/default.nix b/nixpkgs/pkgs/development/libraries/simpleitk/default.nix
index cbb6a4b64f1..cbb6a4b64f1 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/simpleitk/default.nix
diff --git a/pkgs/development/libraries/skalibs/default.nix b/nixpkgs/pkgs/development/libraries/skalibs/default.nix
index e5443c5d53a..e5443c5d53a 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/skalibs/default.nix
diff --git a/pkgs/development/libraries/slang/default.nix b/nixpkgs/pkgs/development/libraries/slang/default.nix
index d1cafbce117..d1cafbce117 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/nixpkgs/pkgs/development/libraries/slang/default.nix
diff --git a/pkgs/development/libraries/slang/terminfo-dirs.patch b/nixpkgs/pkgs/development/libraries/slang/terminfo-dirs.patch
index 2229b759a3d..2229b759a3d 100644
--- a/pkgs/development/libraries/slang/terminfo-dirs.patch
+++ b/nixpkgs/pkgs/development/libraries/slang/terminfo-dirs.patch
diff --git a/pkgs/development/libraries/slib/catalog-in-library-vicinity.patch b/nixpkgs/pkgs/development/libraries/slib/catalog-in-library-vicinity.patch
index 9b803a35fbd..9b803a35fbd 100644
--- a/pkgs/development/libraries/slib/catalog-in-library-vicinity.patch
+++ b/nixpkgs/pkgs/development/libraries/slib/catalog-in-library-vicinity.patch
diff --git a/pkgs/development/libraries/slib/default.nix b/nixpkgs/pkgs/development/libraries/slib/default.nix
index 665f025ffcf..665f025ffcf 100644
--- a/pkgs/development/libraries/slib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/slib/default.nix
diff --git a/pkgs/development/libraries/slib/setup-hook.sh b/nixpkgs/pkgs/development/libraries/slib/setup-hook.sh
index 3c7e91e8188..3c7e91e8188 100644
--- a/pkgs/development/libraries/slib/setup-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/slib/setup-hook.sh
diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix
index cd1584ac739..cd1584ac739 100644
--- a/pkgs/development/libraries/smarty3-i18n/default.nix
+++ b/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix
diff --git a/pkgs/development/libraries/smarty3/default.nix b/nixpkgs/pkgs/development/libraries/smarty3/default.nix
index b3214cc01df..b3214cc01df 100644
--- a/pkgs/development/libraries/smarty3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/smarty3/default.nix
diff --git a/pkgs/development/libraries/smesh/default.nix b/nixpkgs/pkgs/development/libraries/smesh/default.nix
index 529f910c35a..529f910c35a 100644
--- a/pkgs/development/libraries/smesh/default.nix
+++ b/nixpkgs/pkgs/development/libraries/smesh/default.nix
diff --git a/pkgs/development/libraries/smpeg/default.nix b/nixpkgs/pkgs/development/libraries/smpeg/default.nix
index 4d74ee7ca06..4d74ee7ca06 100644
--- a/pkgs/development/libraries/smpeg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/smpeg/default.nix
diff --git a/pkgs/development/libraries/smpeg/format.patch b/nixpkgs/pkgs/development/libraries/smpeg/format.patch
index 8486dee5cda..8486dee5cda 100644
--- a/pkgs/development/libraries/smpeg/format.patch
+++ b/nixpkgs/pkgs/development/libraries/smpeg/format.patch
diff --git a/pkgs/development/libraries/smpeg/gcc6.patch b/nixpkgs/pkgs/development/libraries/smpeg/gcc6.patch
index 165feb4428c..165feb4428c 100644
--- a/pkgs/development/libraries/smpeg/gcc6.patch
+++ b/nixpkgs/pkgs/development/libraries/smpeg/gcc6.patch
diff --git a/pkgs/development/libraries/smpeg/libx11.patch b/nixpkgs/pkgs/development/libraries/smpeg/libx11.patch
index 8611073780f..8611073780f 100644
--- a/pkgs/development/libraries/smpeg/libx11.patch
+++ b/nixpkgs/pkgs/development/libraries/smpeg/libx11.patch
diff --git a/pkgs/development/libraries/smpeg2/default.nix b/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
index 90043786471..90043786471 100644
--- a/pkgs/development/libraries/smpeg2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
diff --git a/pkgs/development/libraries/smpeg2/gcc6.patch b/nixpkgs/pkgs/development/libraries/smpeg2/gcc6.patch
index 165feb4428c..165feb4428c 100644
--- a/pkgs/development/libraries/smpeg2/gcc6.patch
+++ b/nixpkgs/pkgs/development/libraries/smpeg2/gcc6.patch
diff --git a/pkgs/development/libraries/smpeg2/sdl2.patch b/nixpkgs/pkgs/development/libraries/smpeg2/sdl2.patch
index 63bc352976e..63bc352976e 100644
--- a/pkgs/development/libraries/smpeg2/sdl2.patch
+++ b/nixpkgs/pkgs/development/libraries/smpeg2/sdl2.patch
diff --git a/pkgs/development/libraries/snack/default.nix b/nixpkgs/pkgs/development/libraries/snack/default.nix
index acf10cc497c..acf10cc497c 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/snack/default.nix
diff --git a/pkgs/development/libraries/snappy/default.nix b/nixpkgs/pkgs/development/libraries/snappy/default.nix
index 0ad1a4b2898..0ad1a4b2898 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/snappy/default.nix
diff --git a/pkgs/development/libraries/snappy/disable-benchmark.patch b/nixpkgs/pkgs/development/libraries/snappy/disable-benchmark.patch
index c891c13fe74..c891c13fe74 100644
--- a/pkgs/development/libraries/snappy/disable-benchmark.patch
+++ b/nixpkgs/pkgs/development/libraries/snappy/disable-benchmark.patch
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix
index 2903e79f891..2903e79f891 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix
diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix
index ca2ff666b7a..ca2ff666b7a 100644
--- a/pkgs/development/libraries/sofia-sip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix
diff --git a/pkgs/development/libraries/soil/default.nix b/nixpkgs/pkgs/development/libraries/soil/default.nix
index d9fcea767d5..d9fcea767d5 100644
--- a/pkgs/development/libraries/soil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/soil/default.nix
diff --git a/pkgs/development/libraries/sonic/default.nix b/nixpkgs/pkgs/development/libraries/sonic/default.nix
index 3e93302f3d7..3e93302f3d7 100644
--- a/pkgs/development/libraries/sonic/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sonic/default.nix
diff --git a/pkgs/development/libraries/soprano/default.nix b/nixpkgs/pkgs/development/libraries/soprano/default.nix
index 4739c736397..4739c736397 100644
--- a/pkgs/development/libraries/soprano/default.nix
+++ b/nixpkgs/pkgs/development/libraries/soprano/default.nix
diff --git a/pkgs/development/libraries/soprano/find-virtuoso.patch b/nixpkgs/pkgs/development/libraries/soprano/find-virtuoso.patch
index 95a2c7e9656..95a2c7e9656 100644
--- a/pkgs/development/libraries/soprano/find-virtuoso.patch
+++ b/nixpkgs/pkgs/development/libraries/soprano/find-virtuoso.patch
diff --git a/pkgs/development/libraries/soqt/default.nix b/nixpkgs/pkgs/development/libraries/soqt/default.nix
index 79084ceda1c..79084ceda1c 100644
--- a/pkgs/development/libraries/soqt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/soqt/default.nix
diff --git a/pkgs/development/libraries/sord/default.nix b/nixpkgs/pkgs/development/libraries/sord/default.nix
index 2113d7bd49b..2113d7bd49b 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sord/default.nix
diff --git a/pkgs/development/libraries/soundtouch/default.nix b/nixpkgs/pkgs/development/libraries/soundtouch/default.nix
index 71c7915c2ed..71c7915c2ed 100644
--- a/pkgs/development/libraries/soundtouch/default.nix
+++ b/nixpkgs/pkgs/development/libraries/soundtouch/default.nix
diff --git a/pkgs/development/libraries/soxt/default.nix b/nixpkgs/pkgs/development/libraries/soxt/default.nix
index 4afb310d49a..4afb310d49a 100644
--- a/pkgs/development/libraries/soxt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/soxt/default.nix
diff --git a/pkgs/development/libraries/spandsp/default.nix b/nixpkgs/pkgs/development/libraries/spandsp/default.nix
index 95827ba364a..95827ba364a 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spandsp/default.nix
diff --git a/pkgs/development/libraries/sparsehash/default.nix b/nixpkgs/pkgs/development/libraries/sparsehash/default.nix
index f898152d820..f898152d820 100644
--- a/pkgs/development/libraries/sparsehash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sparsehash/default.nix
diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/nixpkgs/pkgs/development/libraries/spatialite-tools/default.nix
index 83eef355f2d..83eef355f2d 100644
--- a/pkgs/development/libraries/spatialite-tools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spatialite-tools/default.nix
diff --git a/pkgs/development/libraries/spdk/default.nix b/nixpkgs/pkgs/development/libraries/spdk/default.nix
index b1927277455..b1927277455 100644
--- a/pkgs/development/libraries/spdk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spdk/default.nix
diff --git a/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch b/nixpkgs/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch
index 9cc6d89ce50..9cc6d89ce50 100644
--- a/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch
+++ b/nixpkgs/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch
diff --git a/pkgs/development/libraries/spdlog/default.nix b/nixpkgs/pkgs/development/libraries/spdlog/default.nix
index 1839bb7bff1..1839bb7bff1 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spdlog/default.nix
diff --git a/pkgs/development/libraries/speech-tools/default.nix b/nixpkgs/pkgs/development/libraries/speech-tools/default.nix
index 771ad033ed9..771ad033ed9 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/speech-tools/default.nix
diff --git a/pkgs/development/libraries/speechd/default.nix b/nixpkgs/pkgs/development/libraries/speechd/default.nix
index 43360d781cd..43360d781cd 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/speechd/default.nix
diff --git a/pkgs/development/libraries/speex/default.nix b/nixpkgs/pkgs/development/libraries/speex/default.nix
index 7bf3a5faa7d..7bf3a5faa7d 100644
--- a/pkgs/development/libraries/speex/default.nix
+++ b/nixpkgs/pkgs/development/libraries/speex/default.nix
diff --git a/pkgs/development/libraries/speexdsp/build-fix.patch b/nixpkgs/pkgs/development/libraries/speexdsp/build-fix.patch
index 13cd5e7d21a..13cd5e7d21a 100644
--- a/pkgs/development/libraries/speexdsp/build-fix.patch
+++ b/nixpkgs/pkgs/development/libraries/speexdsp/build-fix.patch
diff --git a/pkgs/development/libraries/speexdsp/default.nix b/nixpkgs/pkgs/development/libraries/speexdsp/default.nix
index 4d74c7e0559..4d74c7e0559 100644
--- a/pkgs/development/libraries/speexdsp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/speexdsp/default.nix
diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/nixpkgs/pkgs/development/libraries/sphinxbase/default.nix
index 3e4d64c47ad..3e4d64c47ad 100644
--- a/pkgs/development/libraries/sphinxbase/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sphinxbase/default.nix
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix
index 7ba120d661b..7ba120d661b 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix
diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix
index c32f336939c..c32f336939c 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix
diff --git a/pkgs/development/libraries/spice/correct-meson.patch b/nixpkgs/pkgs/development/libraries/spice/correct-meson.patch
index d3422cb915b..d3422cb915b 100644
--- a/pkgs/development/libraries/spice/correct-meson.patch
+++ b/nixpkgs/pkgs/development/libraries/spice/correct-meson.patch
diff --git a/pkgs/development/libraries/spice/default.nix b/nixpkgs/pkgs/development/libraries/spice/default.nix
index d2c4ddb8631..d2c4ddb8631 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spice/default.nix
diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix
index 86a7ab048fa..86a7ab048fa 100644
--- a/pkgs/development/libraries/spirv-headers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix
diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix
index d187187246b..d187187246b 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix
diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix
index 6de71d066ad..6de71d066ad 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix
diff --git a/pkgs/development/libraries/sqlite/archive-version.nix b/nixpkgs/pkgs/development/libraries/sqlite/archive-version.nix
index 75d70680fbf..75d70680fbf 100644
--- a/pkgs/development/libraries/sqlite/archive-version.nix
+++ b/nixpkgs/pkgs/development/libraries/sqlite/archive-version.nix
diff --git a/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix
index d904637fcd3..d904637fcd3 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix
diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix
index 739dfc3bc5b..739dfc3bc5b 100644
--- a/pkgs/development/libraries/sqlite/sqlar.nix
+++ b/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix
diff --git a/pkgs/development/libraries/srt/default.nix b/nixpkgs/pkgs/development/libraries/srt/default.nix
index 953ba9484fa..953ba9484fa 100644
--- a/pkgs/development/libraries/srt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/srt/default.nix
diff --git a/pkgs/development/libraries/srtp/default.nix b/nixpkgs/pkgs/development/libraries/srtp/default.nix
index a906939f529..a906939f529 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/srtp/default.nix
diff --git a/pkgs/development/libraries/startup-notification/default.nix b/nixpkgs/pkgs/development/libraries/startup-notification/default.nix
index 82cbce8055e..82cbce8055e 100644
--- a/pkgs/development/libraries/startup-notification/default.nix
+++ b/nixpkgs/pkgs/development/libraries/startup-notification/default.nix
diff --git a/pkgs/development/libraries/stb/default.nix b/nixpkgs/pkgs/development/libraries/stb/default.nix
index c2353c7b706..c2353c7b706 100644
--- a/pkgs/development/libraries/stb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/stb/default.nix
diff --git a/pkgs/development/libraries/stfl/default.nix b/nixpkgs/pkgs/development/libraries/stfl/default.nix
index 89261b665f5..89261b665f5 100644
--- a/pkgs/development/libraries/stfl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/stfl/default.nix
diff --git a/pkgs/development/libraries/stlport/default.nix b/nixpkgs/pkgs/development/libraries/stlport/default.nix
index ff1a7b57f4a..ff1a7b57f4a 100644
--- a/pkgs/development/libraries/stlport/default.nix
+++ b/nixpkgs/pkgs/development/libraries/stlport/default.nix
diff --git a/pkgs/development/libraries/strigi/default.nix b/nixpkgs/pkgs/development/libraries/strigi/default.nix
index 8121b7a501f..8121b7a501f 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/strigi/default.nix
diff --git a/pkgs/development/libraries/strigi/export_bufferedstream.patch b/nixpkgs/pkgs/development/libraries/strigi/export_bufferedstream.patch
index 4c6b34fe1be..4c6b34fe1be 100644
--- a/pkgs/development/libraries/strigi/export_bufferedstream.patch
+++ b/nixpkgs/pkgs/development/libraries/strigi/export_bufferedstream.patch
diff --git a/pkgs/development/libraries/strigi/gcc6.patch b/nixpkgs/pkgs/development/libraries/strigi/gcc6.patch
index b46f6c52b82..b46f6c52b82 100644
--- a/pkgs/development/libraries/strigi/gcc6.patch
+++ b/nixpkgs/pkgs/development/libraries/strigi/gcc6.patch
diff --git a/pkgs/development/libraries/stxxl/default.nix b/nixpkgs/pkgs/development/libraries/stxxl/default.nix
index 5589a5560eb..5589a5560eb 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/stxxl/default.nix
diff --git a/pkgs/development/libraries/subunit/default.nix b/nixpkgs/pkgs/development/libraries/subunit/default.nix
index 9a5f4db2deb..9a5f4db2deb 100644
--- a/pkgs/development/libraries/subunit/default.nix
+++ b/nixpkgs/pkgs/development/libraries/subunit/default.nix
diff --git a/pkgs/development/libraries/sundials/3.x.nix b/nixpkgs/pkgs/development/libraries/sundials/3.x.nix
index 879f13e8bf5..879f13e8bf5 100644
--- a/pkgs/development/libraries/sundials/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/sundials/3.x.nix
diff --git a/pkgs/development/libraries/sundials/default.nix b/nixpkgs/pkgs/development/libraries/sundials/default.nix
index d19ecf34ab9..d19ecf34ab9 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sundials/default.nix
diff --git a/pkgs/development/libraries/svrcore/default.nix b/nixpkgs/pkgs/development/libraries/svrcore/default.nix
index 628ab7e28ef..628ab7e28ef 100644
--- a/pkgs/development/libraries/svrcore/default.nix
+++ b/nixpkgs/pkgs/development/libraries/svrcore/default.nix
diff --git a/pkgs/development/libraries/swiften/default.nix b/nixpkgs/pkgs/development/libraries/swiften/default.nix
index c8c60c1f8ea..c8c60c1f8ea 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/nixpkgs/pkgs/development/libraries/swiften/default.nix
diff --git a/pkgs/development/libraries/swiften/scons.patch b/nixpkgs/pkgs/development/libraries/swiften/scons.patch
index d956767696d..d956767696d 100644
--- a/pkgs/development/libraries/swiften/scons.patch
+++ b/nixpkgs/pkgs/development/libraries/swiften/scons.patch
diff --git a/pkgs/development/libraries/sword/default.nix b/nixpkgs/pkgs/development/libraries/sword/default.nix
index 3d146a5a227..3d146a5a227 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sword/default.nix
diff --git a/pkgs/development/libraries/symengine/default.nix b/nixpkgs/pkgs/development/libraries/symengine/default.nix
index a41b086016b..a41b086016b 100644
--- a/pkgs/development/libraries/symengine/default.nix
+++ b/nixpkgs/pkgs/development/libraries/symengine/default.nix
diff --git a/pkgs/development/libraries/szip/default.nix b/nixpkgs/pkgs/development/libraries/szip/default.nix
index f6d4df2eab3..f6d4df2eab3 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/szip/default.nix
diff --git a/pkgs/development/libraries/t1lib/default.nix b/nixpkgs/pkgs/development/libraries/t1lib/default.nix
index 010838efab5..010838efab5 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/t1lib/default.nix
diff --git a/pkgs/development/libraries/tachyon/darwin.patch b/nixpkgs/pkgs/development/libraries/tachyon/darwin.patch
index dbede586f07..dbede586f07 100644
--- a/pkgs/development/libraries/tachyon/darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/tachyon/darwin.patch
diff --git a/pkgs/development/libraries/tachyon/default.nix b/nixpkgs/pkgs/development/libraries/tachyon/default.nix
index d1d4ee806b8..d1d4ee806b8 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tachyon/default.nix
diff --git a/pkgs/development/libraries/tachyon/make-archs.patch b/nixpkgs/pkgs/development/libraries/tachyon/make-archs.patch
index cf83f8c8c31..cf83f8c8c31 100644
--- a/pkgs/development/libraries/tachyon/make-archs.patch
+++ b/nixpkgs/pkgs/development/libraries/tachyon/make-archs.patch
diff --git a/pkgs/development/libraries/tachyon/no-absolute-paths.patch b/nixpkgs/pkgs/development/libraries/tachyon/no-absolute-paths.patch
index faa3810fb5c..faa3810fb5c 100644
--- a/pkgs/development/libraries/tachyon/no-absolute-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/tachyon/no-absolute-paths.patch
diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix
index b667e604740..b667e604740 100644
--- a/pkgs/development/libraries/taglib-extras/default.nix
+++ b/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix
diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix
index 28ce5c60481..28ce5c60481 100644
--- a/pkgs/development/libraries/taglib-sharp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix
diff --git a/pkgs/development/libraries/taglib/default.nix b/nixpkgs/pkgs/development/libraries/taglib/default.nix
index c553405878f..c553405878f 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/taglib/default.nix
diff --git a/pkgs/development/libraries/talloc/default.nix b/nixpkgs/pkgs/development/libraries/talloc/default.nix
index 5a8ebe84ba6..5a8ebe84ba6 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/talloc/default.nix
diff --git a/pkgs/development/libraries/tbb/default.nix b/nixpkgs/pkgs/development/libraries/tbb/default.nix
index 18f9e541acd..18f9e541acd 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tbb/default.nix
diff --git a/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch b/nixpkgs/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch
index 64056ecb146..64056ecb146 100644
--- a/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch
+++ b/nixpkgs/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch
diff --git a/pkgs/development/libraries/tclap/default.nix b/nixpkgs/pkgs/development/libraries/tclap/default.nix
index 293baa492c5..293baa492c5 100644
--- a/pkgs/development/libraries/tclap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tclap/default.nix
diff --git a/pkgs/development/libraries/tcllib/default.nix b/nixpkgs/pkgs/development/libraries/tcllib/default.nix
index b1add708902..b1add708902 100644
--- a/pkgs/development/libraries/tcllib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tcllib/default.nix
diff --git a/pkgs/development/libraries/tcltls/default.nix b/nixpkgs/pkgs/development/libraries/tcltls/default.nix
index f1fd6760c61..f1fd6760c61 100644
--- a/pkgs/development/libraries/tcltls/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tcltls/default.nix
diff --git a/pkgs/development/libraries/tclx/default.nix b/nixpkgs/pkgs/development/libraries/tclx/default.nix
index 1cb06377399..1cb06377399 100644
--- a/pkgs/development/libraries/tclx/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tclx/default.nix
diff --git a/pkgs/development/libraries/tdb/default.nix b/nixpkgs/pkgs/development/libraries/tdb/default.nix
index 9e90e3d3be4..9e90e3d3be4 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tdb/default.nix
diff --git a/pkgs/development/libraries/tdlib/default.nix b/nixpkgs/pkgs/development/libraries/tdlib/default.nix
index 96ae5c1ec9a..96ae5c1ec9a 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tdlib/default.nix
diff --git a/pkgs/development/libraries/tecla/default.nix b/nixpkgs/pkgs/development/libraries/tecla/default.nix
index e835d1d86fd..e835d1d86fd 100644
--- a/pkgs/development/libraries/tecla/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tecla/default.nix
diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/nixpkgs/pkgs/development/libraries/telepathy/farstream/default.nix
index 1247d9ffa84..1247d9ffa84 100644
--- a/pkgs/development/libraries/telepathy/farstream/default.nix
+++ b/nixpkgs/pkgs/development/libraries/telepathy/farstream/default.nix
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix
index 7436da50319..7436da50319 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix
index d14010c857e..d14010c857e 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix
diff --git a/pkgs/development/libraries/template-glib/default.nix b/nixpkgs/pkgs/development/libraries/template-glib/default.nix
index 070953d0bbc..070953d0bbc 100644
--- a/pkgs/development/libraries/template-glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/template-glib/default.nix
diff --git a/pkgs/development/libraries/tepl/default.nix b/nixpkgs/pkgs/development/libraries/tepl/default.nix
index 997b874ac5b..997b874ac5b 100644
--- a/pkgs/development/libraries/tepl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tepl/default.nix
diff --git a/pkgs/development/libraries/termbox/default.nix b/nixpkgs/pkgs/development/libraries/termbox/default.nix
index 8ebf0156be8..8ebf0156be8 100644
--- a/pkgs/development/libraries/termbox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/termbox/default.nix
diff --git a/pkgs/development/libraries/tevent/default.nix b/nixpkgs/pkgs/development/libraries/tevent/default.nix
index 9f94f4f7217..9f94f4f7217 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tevent/default.nix
diff --git a/pkgs/development/libraries/theft/default.nix b/nixpkgs/pkgs/development/libraries/theft/default.nix
index 646cc60406a..646cc60406a 100644
--- a/pkgs/development/libraries/theft/default.nix
+++ b/nixpkgs/pkgs/development/libraries/theft/default.nix
diff --git a/pkgs/development/libraries/thrift/0.10.nix b/nixpkgs/pkgs/development/libraries/thrift/0.10.nix
index d626673a227..d626673a227 100644
--- a/pkgs/development/libraries/thrift/0.10.nix
+++ b/nixpkgs/pkgs/development/libraries/thrift/0.10.nix
diff --git a/pkgs/development/libraries/thrift/default.nix b/nixpkgs/pkgs/development/libraries/thrift/default.nix
index 1879cac96c1..1879cac96c1 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/nixpkgs/pkgs/development/libraries/thrift/default.nix
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix
index d67d7618574..d67d7618574 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix
diff --git a/pkgs/development/libraries/ticpp/default.nix b/nixpkgs/pkgs/development/libraries/ticpp/default.nix
index e46bf2418bc..e46bf2418bc 100644
--- a/pkgs/development/libraries/ticpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ticpp/default.nix
diff --git a/pkgs/development/libraries/tidyp/default.nix b/nixpkgs/pkgs/development/libraries/tidyp/default.nix
index 51dabbd2beb..51dabbd2beb 100644
--- a/pkgs/development/libraries/tidyp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tidyp/default.nix
diff --git a/pkgs/development/libraries/tiledb/default.nix b/nixpkgs/pkgs/development/libraries/tiledb/default.nix
index 395dd6952f6..395dd6952f6 100644
--- a/pkgs/development/libraries/tiledb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tiledb/default.nix
diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix
index 4fc1da1fe0a..4fc1da1fe0a 100644
--- a/pkgs/development/libraries/tinyxml-2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix
diff --git a/pkgs/development/libraries/tinyxml/2.6.2-add-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2-add-pkgconfig.patch
index ca89685a458..ca89685a458 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2-add-pkgconfig.patch
+++ b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2-add-pkgconfig.patch
diff --git a/pkgs/development/libraries/tinyxml/2.6.2-cxx.patch b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2-cxx.patch
index e55d0be43bc..e55d0be43bc 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2-cxx.patch
+++ b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2-cxx.patch
diff --git a/pkgs/development/libraries/tinyxml/2.6.2-entity.patch b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2-entity.patch
index 3164261291b..3164261291b 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2-entity.patch
+++ b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2-entity.patch
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix
index 0cc4038b64e..0cc4038b64e 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix
diff --git a/pkgs/development/libraries/tix/default.nix b/nixpkgs/pkgs/development/libraries/tix/default.nix
index 507f2fb275b..507f2fb275b 100644
--- a/pkgs/development/libraries/tix/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tix/default.nix
diff --git a/pkgs/development/libraries/tk/8.5.nix b/nixpkgs/pkgs/development/libraries/tk/8.5.nix
index 3058af46ab5..3058af46ab5 100644
--- a/pkgs/development/libraries/tk/8.5.nix
+++ b/nixpkgs/pkgs/development/libraries/tk/8.5.nix
diff --git a/pkgs/development/libraries/tk/8.6.nix b/nixpkgs/pkgs/development/libraries/tk/8.6.nix
index c30f9a81947..c30f9a81947 100644
--- a/pkgs/development/libraries/tk/8.6.nix
+++ b/nixpkgs/pkgs/development/libraries/tk/8.6.nix
diff --git a/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch b/nixpkgs/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch
index 528a75e1c91..528a75e1c91 100644
--- a/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch
+++ b/nixpkgs/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch
diff --git a/pkgs/development/libraries/tk/different-prefix-with-tcl.patch b/nixpkgs/pkgs/development/libraries/tk/different-prefix-with-tcl.patch
index aee46e149b1..aee46e149b1 100644
--- a/pkgs/development/libraries/tk/different-prefix-with-tcl.patch
+++ b/nixpkgs/pkgs/development/libraries/tk/different-prefix-with-tcl.patch
diff --git a/pkgs/development/libraries/tk/generic.nix b/nixpkgs/pkgs/development/libraries/tk/generic.nix
index a65c6053f29..a65c6053f29 100644
--- a/pkgs/development/libraries/tk/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/tk/generic.nix
diff --git a/pkgs/development/libraries/tnt/default.nix b/nixpkgs/pkgs/development/libraries/tnt/default.nix
index 13e8f783915..13e8f783915 100644
--- a/pkgs/development/libraries/tnt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tnt/default.nix
diff --git a/pkgs/development/libraries/tntdb/default.nix b/nixpkgs/pkgs/development/libraries/tntdb/default.nix
index 2d6ae3f18ca..2d6ae3f18ca 100644
--- a/pkgs/development/libraries/tntdb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tntdb/default.nix
diff --git a/pkgs/development/libraries/tntnet/default.nix b/nixpkgs/pkgs/development/libraries/tntnet/default.nix
index 86b0080a824..86b0080a824 100644
--- a/pkgs/development/libraries/tntnet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tntnet/default.nix
diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix
index b8969588b3c..b8969588b3c 100644
--- a/pkgs/development/libraries/tokyo-cabinet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix
diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix
index 358da431e1c..358da431e1c 100644
--- a/pkgs/development/libraries/tokyo-tyrant/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix
diff --git a/pkgs/development/libraries/torch-hdf5/default.nix b/nixpkgs/pkgs/development/libraries/torch-hdf5/default.nix
index 6dd51944111..6dd51944111 100644
--- a/pkgs/development/libraries/torch-hdf5/default.nix
+++ b/nixpkgs/pkgs/development/libraries/torch-hdf5/default.nix
diff --git a/pkgs/development/libraries/torch/default.nix b/nixpkgs/pkgs/development/libraries/torch/default.nix
index b5cb0f76e9f..b5cb0f76e9f 100644
--- a/pkgs/development/libraries/torch/default.nix
+++ b/nixpkgs/pkgs/development/libraries/torch/default.nix
diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix
index dd8a300d70f..dd8a300d70f 100644
--- a/pkgs/development/libraries/totem-pl-parser/default.nix
+++ b/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix
index 6195c80e24b..6195c80e24b 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix
diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix
index 3f171f47e79..3f171f47e79 100644
--- a/pkgs/development/libraries/tracker-miners/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix
diff --git a/pkgs/development/libraries/tracker-miners/fix-paths.patch b/nixpkgs/pkgs/development/libraries/tracker-miners/fix-paths.patch
index ce44416055c..ce44416055c 100644
--- a/pkgs/development/libraries/tracker-miners/fix-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/tracker-miners/fix-paths.patch
diff --git a/pkgs/development/libraries/tracker/default.nix b/nixpkgs/pkgs/development/libraries/tracker/default.nix
index 79b0b2e9203..79b0b2e9203 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tracker/default.nix
diff --git a/pkgs/development/libraries/tracker/fix-paths.patch b/nixpkgs/pkgs/development/libraries/tracker/fix-paths.patch
index f5c13c3fcda..f5c13c3fcda 100644
--- a/pkgs/development/libraries/tracker/fix-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/tracker/fix-paths.patch
diff --git a/pkgs/development/libraries/tre/default.nix b/nixpkgs/pkgs/development/libraries/tre/default.nix
index d5ed35694c5..d5ed35694c5 100644
--- a/pkgs/development/libraries/tre/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tre/default.nix
diff --git a/pkgs/development/libraries/tremor/default.nix b/nixpkgs/pkgs/development/libraries/tremor/default.nix
index 91b6d2cb167..91b6d2cb167 100644
--- a/pkgs/development/libraries/tremor/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tremor/default.nix
diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix
index 6984a2694d6..6984a2694d6 100644
--- a/pkgs/development/libraries/trompeloeil/default.nix
+++ b/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix
diff --git a/pkgs/development/libraries/tsocks/default.nix b/nixpkgs/pkgs/development/libraries/tsocks/default.nix
index d5af39d3f2a..d5af39d3f2a 100644
--- a/pkgs/development/libraries/tsocks/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tsocks/default.nix
diff --git a/pkgs/development/libraries/tsocks/poll.patch b/nixpkgs/pkgs/development/libraries/tsocks/poll.patch
index 2bfeb9f779c..2bfeb9f779c 100644
--- a/pkgs/development/libraries/tsocks/poll.patch
+++ b/nixpkgs/pkgs/development/libraries/tsocks/poll.patch
diff --git a/pkgs/development/libraries/twolame/default.nix b/nixpkgs/pkgs/development/libraries/twolame/default.nix
index e1284c39aa3..e1284c39aa3 100644
--- a/pkgs/development/libraries/twolame/default.nix
+++ b/nixpkgs/pkgs/development/libraries/twolame/default.nix
diff --git a/pkgs/development/libraries/ucl/default.nix b/nixpkgs/pkgs/development/libraries/ucl/default.nix
index 933a3afef35..933a3afef35 100644
--- a/pkgs/development/libraries/ucl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ucl/default.nix
diff --git a/pkgs/development/libraries/ucommon/default.nix b/nixpkgs/pkgs/development/libraries/ucommon/default.nix
index 53e10b468ba..53e10b468ba 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ucommon/default.nix
diff --git a/pkgs/development/libraries/udns/default.nix b/nixpkgs/pkgs/development/libraries/udns/default.nix
index 18f270e70db..18f270e70db 100644
--- a/pkgs/development/libraries/udns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/udns/default.nix
diff --git a/pkgs/development/libraries/udunits/default.nix b/nixpkgs/pkgs/development/libraries/udunits/default.nix
index faee73fd393..faee73fd393 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/nixpkgs/pkgs/development/libraries/udunits/default.nix
diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix
index 1b5fbe6c2ca..1b5fbe6c2ca 100644
--- a/pkgs/development/libraries/uhttpmock/default.nix
+++ b/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix
diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix
index 8a79dab45b2..8a79dab45b2 100644
--- a/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix
diff --git a/pkgs/development/libraries/umockdev/default.nix b/nixpkgs/pkgs/development/libraries/umockdev/default.nix
index 1c0b70f6896..1c0b70f6896 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/nixpkgs/pkgs/development/libraries/umockdev/default.nix
diff --git a/pkgs/development/libraries/umockdev/disable-failed-test.patch b/nixpkgs/pkgs/development/libraries/umockdev/disable-failed-test.patch
index 69e74dd38b8..69e74dd38b8 100644
--- a/pkgs/development/libraries/umockdev/disable-failed-test.patch
+++ b/nixpkgs/pkgs/development/libraries/umockdev/disable-failed-test.patch
diff --git a/pkgs/development/libraries/umockdev/fix-test-paths.patch b/nixpkgs/pkgs/development/libraries/umockdev/fix-test-paths.patch
index 53015d66268..53015d66268 100644
--- a/pkgs/development/libraries/umockdev/fix-test-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/umockdev/fix-test-paths.patch
diff --git a/pkgs/development/libraries/unibilium/default.nix b/nixpkgs/pkgs/development/libraries/unibilium/default.nix
index dca24c7f9ea..dca24c7f9ea 100644
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unibilium/default.nix
diff --git a/pkgs/development/libraries/unicap/default.nix b/nixpkgs/pkgs/development/libraries/unicap/default.nix
index 7fa8fe81c11..7fa8fe81c11 100644
--- a/pkgs/development/libraries/unicap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unicap/default.nix
diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/nixpkgs/pkgs/development/libraries/unicorn-emu/default.nix
index 7917b695406..7917b695406 100644
--- a/pkgs/development/libraries/unicorn-emu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unicorn-emu/default.nix
diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix
index 0e5971945f3..0e5971945f3 100644
--- a/pkgs/development/libraries/unittest-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix
diff --git a/pkgs/development/libraries/unixODBC/default.nix b/nixpkgs/pkgs/development/libraries/unixODBC/default.nix
index 3a51e2c986a..3a51e2c986a 100644
--- a/pkgs/development/libraries/unixODBC/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unixODBC/default.nix
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix
index 6cfaef5ef99..6cfaef5ef99 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix
diff --git a/pkgs/development/libraries/uri/default.nix b/nixpkgs/pkgs/development/libraries/uri/default.nix
index 5e5f4c9e8ca..5e5f4c9e8ca 100644
--- a/pkgs/development/libraries/uri/default.nix
+++ b/nixpkgs/pkgs/development/libraries/uri/default.nix
diff --git a/pkgs/development/libraries/uriparser/default.nix b/nixpkgs/pkgs/development/libraries/uriparser/default.nix
index 9c48488bff8..9c48488bff8 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/nixpkgs/pkgs/development/libraries/uriparser/default.nix
diff --git a/pkgs/development/libraries/usbredir/default.nix b/nixpkgs/pkgs/development/libraries/usbredir/default.nix
index 8e43135196c..8e43135196c 100644
--- a/pkgs/development/libraries/usbredir/default.nix
+++ b/nixpkgs/pkgs/development/libraries/usbredir/default.nix
diff --git a/pkgs/development/libraries/ustr/default.nix b/nixpkgs/pkgs/development/libraries/ustr/default.nix
index 18eae87e11c..18eae87e11c 100644
--- a/pkgs/development/libraries/ustr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ustr/default.nix
diff --git a/pkgs/development/libraries/ustr/va_args.patch b/nixpkgs/pkgs/development/libraries/ustr/va_args.patch
index f75b537485d..f75b537485d 100644
--- a/pkgs/development/libraries/ustr/va_args.patch
+++ b/nixpkgs/pkgs/development/libraries/ustr/va_args.patch
diff --git a/pkgs/development/libraries/utf8proc/default.nix b/nixpkgs/pkgs/development/libraries/utf8proc/default.nix
index 91bf7e39378..91bf7e39378 100644
--- a/pkgs/development/libraries/utf8proc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/utf8proc/default.nix
diff --git a/pkgs/development/libraries/uthash/default.nix b/nixpkgs/pkgs/development/libraries/uthash/default.nix
index e6cd0827639..e6cd0827639 100644
--- a/pkgs/development/libraries/uthash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/uthash/default.nix
diff --git a/pkgs/development/libraries/utmps/default.nix b/nixpkgs/pkgs/development/libraries/utmps/default.nix
index 073674f8571..073674f8571 100644
--- a/pkgs/development/libraries/utmps/default.nix
+++ b/nixpkgs/pkgs/development/libraries/utmps/default.nix
diff --git a/pkgs/development/libraries/v8/5_x.nix b/nixpkgs/pkgs/development/libraries/v8/5_x.nix
index 050abe9e81b..050abe9e81b 100644
--- a/pkgs/development/libraries/v8/5_x.nix
+++ b/nixpkgs/pkgs/development/libraries/v8/5_x.nix
diff --git a/pkgs/development/libraries/v8/darwin.patch b/nixpkgs/pkgs/development/libraries/v8/darwin.patch
index 629d5e4dc39..629d5e4dc39 100644
--- a/pkgs/development/libraries/v8/darwin.patch
+++ b/nixpkgs/pkgs/development/libraries/v8/darwin.patch
diff --git a/pkgs/development/libraries/v8/default.nix b/nixpkgs/pkgs/development/libraries/v8/default.nix
index a02e540173d..a02e540173d 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/nixpkgs/pkgs/development/libraries/v8/default.nix
diff --git a/pkgs/development/libraries/v8/libv8-5.4.232.patch b/nixpkgs/pkgs/development/libraries/v8/libv8-5.4.232.patch
index 16c227cfe38..16c227cfe38 100644
--- a/pkgs/development/libraries/v8/libv8-5.4.232.patch
+++ b/nixpkgs/pkgs/development/libraries/v8/libv8-5.4.232.patch
diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix
index 782d324c8be..782d324c8be 100644
--- a/pkgs/development/libraries/v8/plv8_6_x.nix
+++ b/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix
diff --git a/pkgs/development/libraries/v8/update.sh b/nixpkgs/pkgs/development/libraries/v8/update.sh
index f046bb8e688..f046bb8e688 100755
--- a/pkgs/development/libraries/v8/update.sh
+++ b/nixpkgs/pkgs/development/libraries/v8/update.sh
diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
index 678d7dd265c..678d7dd265c 100644
--- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix
index 1775d5fffc5..1775d5fffc5 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix
diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/nixpkgs/pkgs/development/libraries/vaapi-vdpau/default.nix
index 94f96b867d5..94f96b867d5 100644
--- a/pkgs/development/libraries/vaapi-vdpau/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vaapi-vdpau/default.nix
diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index 8a2e3af4791..8a2e3af4791 100644
--- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix
index 0cdbe396a10..0cdbe396a10 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix
diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix
index 196c700af17..196c700af17 100644
--- a/pkgs/development/libraries/vapoursynth/editor.nix
+++ b/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix
diff --git a/pkgs/development/libraries/vc/0.7.nix b/nixpkgs/pkgs/development/libraries/vc/0.7.nix
index 18b2659cc5d..18b2659cc5d 100644
--- a/pkgs/development/libraries/vc/0.7.nix
+++ b/nixpkgs/pkgs/development/libraries/vc/0.7.nix
diff --git a/pkgs/development/libraries/vc/default.nix b/nixpkgs/pkgs/development/libraries/vc/default.nix
index 2194c7be38b..2194c7be38b 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vc/default.nix
diff --git a/pkgs/development/libraries/vcdimager/default.nix b/nixpkgs/pkgs/development/libraries/vcdimager/default.nix
index 480b8f7bcd7..480b8f7bcd7 100644
--- a/pkgs/development/libraries/vcdimager/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vcdimager/default.nix
diff --git a/pkgs/development/libraries/vcg/default.nix b/nixpkgs/pkgs/development/libraries/vcg/default.nix
index eb37d14b532..eb37d14b532 100644
--- a/pkgs/development/libraries/vcg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vcg/default.nix
diff --git a/pkgs/development/libraries/vid-stab/default.nix b/nixpkgs/pkgs/development/libraries/vid-stab/default.nix
index eb88b36a142..eb88b36a142 100644
--- a/pkgs/development/libraries/vid-stab/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vid-stab/default.nix
diff --git a/pkgs/development/libraries/vigra/default.nix b/nixpkgs/pkgs/development/libraries/vigra/default.nix
index 625ec2cee38..625ec2cee38 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vigra/default.nix
diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix
index 71bd608e93a..71bd608e93a 100644
--- a/pkgs/development/libraries/virglrenderer/default.nix
+++ b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix
diff --git a/pkgs/development/libraries/vmime/default.nix b/nixpkgs/pkgs/development/libraries/vmime/default.nix
index a68880c2f95..a68880c2f95 100644
--- a/pkgs/development/libraries/vmime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vmime/default.nix
diff --git a/pkgs/development/libraries/vmmlib/default.nix b/nixpkgs/pkgs/development/libraries/vmmlib/default.nix
index b9eb29422c5..b9eb29422c5 100644
--- a/pkgs/development/libraries/vmmlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vmmlib/default.nix
diff --git a/pkgs/development/libraries/vmmlib/disable-cpack.patch b/nixpkgs/pkgs/development/libraries/vmmlib/disable-cpack.patch
index 8b9a7983a92..8b9a7983a92 100644
--- a/pkgs/development/libraries/vmmlib/disable-cpack.patch
+++ b/nixpkgs/pkgs/development/libraries/vmmlib/disable-cpack.patch
diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix
index 1a900c3135c..1a900c3135c 100644
--- a/pkgs/development/libraries/vo-amrwbenc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix
diff --git a/pkgs/development/libraries/volume-key/default.nix b/nixpkgs/pkgs/development/libraries/volume-key/default.nix
index 2b0a807bfa7..2b0a807bfa7 100644
--- a/pkgs/development/libraries/volume-key/default.nix
+++ b/nixpkgs/pkgs/development/libraries/volume-key/default.nix
diff --git a/pkgs/development/libraries/vrb/default.nix b/nixpkgs/pkgs/development/libraries/vrb/default.nix
index efd60fe66fb..efd60fe66fb 100644
--- a/pkgs/development/libraries/vrb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vrb/default.nix
diff --git a/pkgs/development/libraries/vrb/removed_options.patch b/nixpkgs/pkgs/development/libraries/vrb/removed_options.patch
index eda88e75184..eda88e75184 100644
--- a/pkgs/development/libraries/vrb/removed_options.patch
+++ b/nixpkgs/pkgs/development/libraries/vrb/removed_options.patch
diff --git a/pkgs/development/libraries/vrb/unused-but-set-variable.patch b/nixpkgs/pkgs/development/libraries/vrb/unused-but-set-variable.patch
index 43429255e8c..43429255e8c 100644
--- a/pkgs/development/libraries/vrb/unused-but-set-variable.patch
+++ b/nixpkgs/pkgs/development/libraries/vrb/unused-but-set-variable.patch
diff --git a/pkgs/development/libraries/vrpn/default.nix b/nixpkgs/pkgs/development/libraries/vrpn/default.nix
index 688dc8d451e..688dc8d451e 100644
--- a/pkgs/development/libraries/vrpn/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vrpn/default.nix
diff --git a/pkgs/development/libraries/vsqlite/default.nix b/nixpkgs/pkgs/development/libraries/vsqlite/default.nix
index fd0e90941b8..fd0e90941b8 100644
--- a/pkgs/development/libraries/vsqlite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vsqlite/default.nix
diff --git a/pkgs/development/libraries/vte/2.90.nix b/nixpkgs/pkgs/development/libraries/vte/2.90.nix
index e091f6a3917..e091f6a3917 100644
--- a/pkgs/development/libraries/vte/2.90.nix
+++ b/nixpkgs/pkgs/development/libraries/vte/2.90.nix
diff --git a/pkgs/development/libraries/vte/default.nix b/nixpkgs/pkgs/development/libraries/vte/default.nix
index 8b19e1ee9ae..8b19e1ee9ae 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vte/default.nix
diff --git a/pkgs/development/libraries/vtk/default.nix b/nixpkgs/pkgs/development/libraries/vtk/default.nix
index 482d691fc7c..482d691fc7c 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vtk/default.nix
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix
index 4ea8d69a498..4ea8d69a498 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix
index 3cdf8f08651..3cdf8f08651 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix
diff --git a/pkgs/development/libraries/vxl/default.nix b/nixpkgs/pkgs/development/libraries/vxl/default.nix
index 17d11d4fb74..17d11d4fb74 100644
--- a/pkgs/development/libraries/vxl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vxl/default.nix
diff --git a/pkgs/development/libraries/wasilibc/default.nix b/nixpkgs/pkgs/development/libraries/wasilibc/default.nix
index fb8c0e0fa21..fb8c0e0fa21 100644
--- a/pkgs/development/libraries/wasilibc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wasilibc/default.nix
diff --git a/pkgs/development/libraries/wavpack/default.nix b/nixpkgs/pkgs/development/libraries/wavpack/default.nix
index cd0b8bdb29d..cd0b8bdb29d 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wavpack/default.nix
diff --git a/pkgs/development/libraries/wayland/default.nix b/nixpkgs/pkgs/development/libraries/wayland/default.nix
index 60d240552d4..60d240552d4 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wayland/default.nix
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix
index 0b367f4a930..0b367f4a930 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix
diff --git a/pkgs/development/libraries/waylandpp/default.nix b/nixpkgs/pkgs/development/libraries/waylandpp/default.nix
index 4fd94a29f9c..4fd94a29f9c 100644
--- a/pkgs/development/libraries/waylandpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/waylandpp/default.nix
diff --git a/pkgs/development/libraries/wcslib/default.nix b/nixpkgs/pkgs/development/libraries/wcslib/default.nix
index aa4ceb461f1..aa4ceb461f1 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wcslib/default.nix
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
index 8d1129c1168..8d1129c1168 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
diff --git a/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch b/nixpkgs/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch
index 6485ba0f261..6485ba0f261 100644
--- a/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch
diff --git a/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch b/nixpkgs/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch
index 17264f3b588..17264f3b588 100644
--- a/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch
diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix
index b22d339617c..b22d339617c 100644
--- a/pkgs/development/libraries/webrtc-audio-processing/default.nix
+++ b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix
diff --git a/pkgs/development/libraries/websocket++/default.nix b/nixpkgs/pkgs/development/libraries/websocket++/default.nix
index 84fbda503ea..84fbda503ea 100644
--- a/pkgs/development/libraries/websocket++/default.nix
+++ b/nixpkgs/pkgs/development/libraries/websocket++/default.nix
diff --git a/pkgs/development/libraries/wildmidi/default.nix b/nixpkgs/pkgs/development/libraries/wildmidi/default.nix
index 3b0a447f737..3b0a447f737 100644
--- a/pkgs/development/libraries/wildmidi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wildmidi/default.nix
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix
index 9025abcb3fe..9025abcb3fe 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix
diff --git a/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix
index 9f9c4acb0d8..9f9c4acb0d8 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix
index 438b40d9140..438b40d9140 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix
diff --git a/pkgs/development/libraries/wt/default.nix b/nixpkgs/pkgs/development/libraries/wt/default.nix
index 7c819487a33..7c819487a33 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wt/default.nix
diff --git a/pkgs/development/libraries/wtk/builder.sh b/nixpkgs/pkgs/development/libraries/wtk/builder.sh
index 86f2719537c..86f2719537c 100644
--- a/pkgs/development/libraries/wtk/builder.sh
+++ b/nixpkgs/pkgs/development/libraries/wtk/builder.sh
diff --git a/pkgs/development/libraries/wtk/default.nix b/nixpkgs/pkgs/development/libraries/wtk/default.nix
index 2791c97f5ae..2791c97f5ae 100644
--- a/pkgs/development/libraries/wtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wtk/default.nix
diff --git a/pkgs/development/libraries/wxSVG/default.nix b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix
index e2e227a6327..e2e227a6327 100644
--- a/pkgs/development/libraries/wxSVG/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix
diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix
index a528166f68a..a528166f68a 100644
--- a/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix
diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix
index 9ca15d4977b..9ca15d4977b 100644
--- a/pkgs/development/libraries/wxsqliteplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix
index 73dac47307a..73dac47307a 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix
index 02367e18a95..02367e18a95 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 3bbfb139279..3bbfb139279 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index 5236996199d..5236996199d 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix
diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix
index 0984472e860..0984472e860 100644
--- a/pkgs/development/libraries/wxwidgets/3.1/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix
diff --git a/pkgs/development/libraries/x264/default.nix b/nixpkgs/pkgs/development/libraries/x264/default.nix
index 2757ca7704c..2757ca7704c 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/nixpkgs/pkgs/development/libraries/x264/default.nix
diff --git a/pkgs/development/libraries/x264/disable-arm-neon-default.patch b/nixpkgs/pkgs/development/libraries/x264/disable-arm-neon-default.patch
index 6971944abb4..6971944abb4 100644
--- a/pkgs/development/libraries/x264/disable-arm-neon-default.patch
+++ b/nixpkgs/pkgs/development/libraries/x264/disable-arm-neon-default.patch
diff --git a/pkgs/development/libraries/x265/default.nix b/nixpkgs/pkgs/development/libraries/x265/default.nix
index dbf1a098f1f..dbf1a098f1f 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/nixpkgs/pkgs/development/libraries/x265/default.nix
diff --git a/pkgs/development/libraries/xalanc/default.nix b/nixpkgs/pkgs/development/libraries/xalanc/default.nix
index 92a932a01a4..92a932a01a4 100644
--- a/pkgs/development/libraries/xalanc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xalanc/default.nix
diff --git a/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix
index 971ab485221..971ab485221 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix
diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/nixpkgs/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
index cce96a2762b..cce96a2762b 100644
--- a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
+++ b/nixpkgs/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix
index 6c8eda6358b..6c8eda6358b 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix
diff --git a/pkgs/development/libraries/xavs/default.nix b/nixpkgs/pkgs/development/libraries/xavs/default.nix
index a5536f70a90..a5536f70a90 100644
--- a/pkgs/development/libraries/xavs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xavs/default.nix
diff --git a/pkgs/development/libraries/xbase/default.nix b/nixpkgs/pkgs/development/libraries/xbase/default.nix
index 3dd2cb5b874..3dd2cb5b874 100644
--- a/pkgs/development/libraries/xbase/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xbase/default.nix
diff --git a/pkgs/development/libraries/xbase/xbase-fixes.patch b/nixpkgs/pkgs/development/libraries/xbase/xbase-fixes.patch
index a23658049b9..a23658049b9 100644
--- a/pkgs/development/libraries/xbase/xbase-fixes.patch
+++ b/nixpkgs/pkgs/development/libraries/xbase/xbase-fixes.patch
diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index 4764c1bdb93..4764c1bdb93 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
diff --git a/pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4 b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4
index e22b50fd9fd..e22b50fd9fd 100644
--- a/pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4
+++ b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4
diff --git a/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4 b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4
index f9463d37fca..f9463d37fca 100644
--- a/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4
+++ b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4
diff --git a/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4 b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4
index a3ddce4a706..a3ddce4a706 100644
--- a/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4
+++ b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4
diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix
index d00b5398a19..d00b5398a19 100644
--- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix
diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
index 9b031602371..9b031602371 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix
index d16c5d670e5..d16c5d670e5 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix
diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch
index f4b103eb38b..f4b103eb38b 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch
diff --git a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch
index d970f5636ae..d970f5636ae 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch
+++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch
diff --git a/pkgs/development/libraries/xercesc/default.nix b/nixpkgs/pkgs/development/libraries/xercesc/default.nix
index 704884c23f3..704884c23f3 100644
--- a/pkgs/development/libraries/xercesc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xercesc/default.nix
diff --git a/pkgs/development/libraries/xgboost/default.nix b/nixpkgs/pkgs/development/libraries/xgboost/default.nix
index f4687bd46f8..f4687bd46f8 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xgboost/default.nix
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/nixpkgs/pkgs/development/libraries/xine-lib/default.nix
index adcb2e74b0b..adcb2e74b0b 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xine-lib/default.nix
diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/nixpkgs/pkgs/development/libraries/xlibs-wrapper/default.nix
index 049c54d792b..049c54d792b 100644
--- a/pkgs/development/libraries/xlibs-wrapper/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xlibs-wrapper/default.nix
diff --git a/pkgs/development/libraries/xlslib/default.nix b/nixpkgs/pkgs/development/libraries/xlslib/default.nix
index 3d1b4ea74db..3d1b4ea74db 100644
--- a/pkgs/development/libraries/xlslib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xlslib/default.nix
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix
index 74846c8306d..74846c8306d 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix
diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix
index d5e1eb08fa4..d5e1eb08fa4 100644
--- a/pkgs/development/libraries/xml-tooling-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix
diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix
index 8a0017109bb..8a0017109bb 100644
--- a/pkgs/development/libraries/xmlrpc-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix
index a8c751330b7..a8c751330b7 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix
diff --git a/pkgs/development/libraries/xsd/default.nix b/nixpkgs/pkgs/development/libraries/xsd/default.nix
index bd87d306b96..bd87d306b96 100644
--- a/pkgs/development/libraries/xsd/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xsd/default.nix
diff --git a/pkgs/development/libraries/xsd/xsdcxx.patch b/nixpkgs/pkgs/development/libraries/xsd/xsdcxx.patch
index 88a893c6e60..88a893c6e60 100644
--- a/pkgs/development/libraries/xsd/xsdcxx.patch
+++ b/nixpkgs/pkgs/development/libraries/xsd/xsdcxx.patch
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/nixpkgs/pkgs/development/libraries/xvidcore/default.nix
index 5ec96157a79..5ec96157a79 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xvidcore/default.nix
diff --git a/pkgs/development/libraries/xxHash/default.nix b/nixpkgs/pkgs/development/libraries/xxHash/default.nix
index 1ea25fb7209..1ea25fb7209 100644
--- a/pkgs/development/libraries/xxHash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xxHash/default.nix
diff --git a/pkgs/development/libraries/xylib/default.nix b/nixpkgs/pkgs/development/libraries/xylib/default.nix
index 155e46c8f8c..155e46c8f8c 100644
--- a/pkgs/development/libraries/xylib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xylib/default.nix
diff --git a/pkgs/development/libraries/yajl/default.nix b/nixpkgs/pkgs/development/libraries/yajl/default.nix
index 947b08e7bc5..947b08e7bc5 100644
--- a/pkgs/development/libraries/yajl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/yajl/default.nix
diff --git a/pkgs/development/libraries/yder/default.nix b/nixpkgs/pkgs/development/libraries/yder/default.nix
index 924a06e9551..924a06e9551 100644
--- a/pkgs/development/libraries/yder/default.nix
+++ b/nixpkgs/pkgs/development/libraries/yder/default.nix
diff --git a/pkgs/development/libraries/yder/fix-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch
index 61a67c5897b..61a67c5897b 100644
--- a/pkgs/development/libraries/yder/fix-pkgconfig.patch
+++ b/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch
diff --git a/pkgs/development/libraries/yojimbo/default.nix b/nixpkgs/pkgs/development/libraries/yojimbo/default.nix
index d3df30e03e1..d3df30e03e1 100644
--- a/pkgs/development/libraries/yojimbo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/yojimbo/default.nix
diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix
index e6a3fa9fbe1..e6a3fa9fbe1 100644
--- a/pkgs/development/libraries/yubico-pam/default.nix
+++ b/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix
index 98c94cfecca..98c94cfecca 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix
diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix
index dd983a34f88..dd983a34f88 100644
--- a/pkgs/development/libraries/zeroc-ice/3.6.nix
+++ b/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix
index 3a5b1690f2d..3a5b1690f2d 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix
diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/nixpkgs/pkgs/development/libraries/zeromq/3.x.nix
index 2fcf8bd9179..2fcf8bd9179 100644
--- a/pkgs/development/libraries/zeromq/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/zeromq/3.x.nix
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix
index 1a8f07a3ae0..1a8f07a3ae0 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix
diff --git a/pkgs/development/libraries/zimg/default.nix b/nixpkgs/pkgs/development/libraries/zimg/default.nix
index 75f10f94fb3..75f10f94fb3 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zimg/default.nix
diff --git a/pkgs/development/libraries/zimlib/default.nix b/nixpkgs/pkgs/development/libraries/zimlib/default.nix
index 34a03e56a10..34a03e56a10 100644
--- a/pkgs/development/libraries/zimlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zimlib/default.nix
diff --git a/pkgs/development/libraries/zlib/default.nix b/nixpkgs/pkgs/development/libraries/zlib/default.nix
index 71da686ce48..71da686ce48 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zlib/default.nix
diff --git a/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch b/nixpkgs/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch
index 3de4978c306..3de4978c306 100644
--- a/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch
+++ b/nixpkgs/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch
diff --git a/pkgs/development/libraries/zlog/default.nix b/nixpkgs/pkgs/development/libraries/zlog/default.nix
index 5c601575742..5c601575742 100644
--- a/pkgs/development/libraries/zlog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zlog/default.nix
diff --git a/pkgs/development/libraries/zmqpp/default.nix b/nixpkgs/pkgs/development/libraries/zmqpp/default.nix
index 98211e6e3eb..98211e6e3eb 100644
--- a/pkgs/development/libraries/zmqpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zmqpp/default.nix
diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix
index 127ea4f7162..127ea4f7162 100644
--- a/pkgs/development/libraries/zookeeper_mt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix
diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix
index 78983f09543..78983f09543 100644
--- a/pkgs/development/libraries/zxcvbn-c/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix
diff --git a/pkgs/development/libraries/zziplib/default.nix b/nixpkgs/pkgs/development/libraries/zziplib/default.nix
index 74bfeb09c0d..74bfeb09c0d 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zziplib/default.nix
diff --git a/pkgs/development/lisp-modules/README.txt b/nixpkgs/pkgs/development/lisp-modules/README.txt
index c55fb9b1a7c..c55fb9b1a7c 100644
--- a/pkgs/development/lisp-modules/README.txt
+++ b/nixpkgs/pkgs/development/lisp-modules/README.txt
diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/nixpkgs/pkgs/development/lisp-modules/asdf/2.26.nix
index 2afdf05546f..2afdf05546f 100644
--- a/pkgs/development/lisp-modules/asdf/2.26.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/asdf/2.26.nix
diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/nixpkgs/pkgs/development/lisp-modules/asdf/3.1.nix
index 0e5c6a40087..0e5c6a40087 100644
--- a/pkgs/development/lisp-modules/asdf/3.1.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/asdf/3.1.nix
diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/nixpkgs/pkgs/development/lisp-modules/asdf/default.nix
index 8d316d06fbb..8d316d06fbb 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/asdf/default.nix
diff --git a/pkgs/development/lisp-modules/asdf/default.upstream b/nixpkgs/pkgs/development/lisp-modules/asdf/default.upstream
index d8625182352..d8625182352 100644
--- a/pkgs/development/lisp-modules/asdf/default.upstream
+++ b/nixpkgs/pkgs/development/lisp-modules/asdf/default.upstream
diff --git a/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh b/nixpkgs/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh
index 13965f14c5e..13965f14c5e 100755
--- a/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh
+++ b/nixpkgs/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh
diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
index 9836bbe5642..9836bbe5642 100755
--- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
+++ b/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
diff --git a/pkgs/development/lisp-modules/clwrapper/common-lisp.sh b/nixpkgs/pkgs/development/lisp-modules/clwrapper/common-lisp.sh
index 88948e3253d..88948e3253d 100755
--- a/pkgs/development/lisp-modules/clwrapper/common-lisp.sh
+++ b/nixpkgs/pkgs/development/lisp-modules/clwrapper/common-lisp.sh
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix
index 3cb8219e687..3cb8219e687 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix
diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/nixpkgs/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
index abbbdc3e77a..abbbdc3e77a 100644
--- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
+++ b/nixpkgs/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
diff --git a/pkgs/development/lisp-modules/define-package.nix b/nixpkgs/pkgs/development/lisp-modules/define-package.nix
index 67a688342b2..67a688342b2 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/define-package.nix
diff --git a/pkgs/development/lisp-modules/from-quicklisp/asdf-description.sh b/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/asdf-description.sh
index 6c240d15c76..6c240d15c76 100755
--- a/pkgs/development/lisp-modules/from-quicklisp/asdf-description.sh
+++ b/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/asdf-description.sh
diff --git a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
index d2d846b78f2..d2d846b78f2 100755
--- a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
+++ b/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
diff --git a/pkgs/development/lisp-modules/from-quicklisp/quicklisp-beta-env.sh b/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/quicklisp-beta-env.sh
index 32fbbe4bb2b..32fbbe4bb2b 100755
--- a/pkgs/development/lisp-modules/from-quicklisp/quicklisp-beta-env.sh
+++ b/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/quicklisp-beta-env.sh
diff --git a/pkgs/development/lisp-modules/from-quicklisp/quicklisp-dependencies.sh b/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/quicklisp-dependencies.sh
index 24efbdd3e16..24efbdd3e16 100755
--- a/pkgs/development/lisp-modules/from-quicklisp/quicklisp-dependencies.sh
+++ b/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/quicklisp-dependencies.sh
diff --git a/pkgs/development/lisp-modules/iterate.darcs-context b/nixpkgs/pkgs/development/lisp-modules/iterate.darcs-context
index 533faaec8e7..533faaec8e7 100644
--- a/pkgs/development/lisp-modules/iterate.darcs-context
+++ b/nixpkgs/pkgs/development/lisp-modules/iterate.darcs-context
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix
index d9478c60db8..d9478c60db8 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix
diff --git a/pkgs/development/lisp-modules/openssl-lib-marked.nix b/nixpkgs/pkgs/development/lisp-modules/openssl-lib-marked.nix
index 186ef14b406..186ef14b406 100644
--- a/pkgs/development/lisp-modules/openssl-lib-marked.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/openssl-lib-marked.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
index a5fddd417fa..a5fddd417fa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
index cbfcb6f4361..cbfcb6f4361 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 3ed0c3eca78..3ed0c3eca78 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index 61a07c61ca0..61a07c61ca0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index efa5dc6e769..efa5dc6e769 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
index 482752f2c7f..482752f2c7f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
index 1a56676f036..1a56676f036 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
index 65df45d95a5..65df45d95a5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
index 5251cbc920f..5251cbc920f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index 4cba3e86e06..4cba3e86e06 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index a660882f36b..a660882f36b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index c5305587a02..c5305587a02 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
index 5d7f3f2dd10..5d7f3f2dd10 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
index 0a2e56a9c9b..0a2e56a9c9b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index 6cf81070734..6cf81070734 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index a7d22ac129b..a7d22ac129b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
index 3d246380607..3d246380607 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index b83b1461197..b83b1461197 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index c30c68e53c8..c30c68e53c8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index 41520bf41fb..41520bf41fb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index 2e387d29833..2e387d29833 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 531d429df24..531d429df24 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index 5f93167a114..5f93167a114 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index a413743eb8d..a413743eb8d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index 9b053c920e3..9b053c920e3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index d84233c4342..d84233c4342 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index c13b8b70647..c13b8b70647 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index 363227534a8..363227534a8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index a4a9a9261fd..a4a9a9261fd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
index 36641b73b75..36641b73b75 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 0d0337a65ce..0d0337a65ce 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
index 9b558402ce6..9b558402ce6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index a3aacd0aa8b..a3aacd0aa8b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
index ba295b6e43a..ba295b6e43a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
index 1f20b17672d..1f20b17672d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 9c258021008..9c258021008 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index 1510495a4cb..1510495a4cb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index d032b4768dd..d032b4768dd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index 6a40d0fa8c9..6a40d0fa8c9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index de71e2e299a..de71e2e299a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix
index 72eafacb190..72eafacb190 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
index 61a35f2b58c..61a35f2b58c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
index dde2cc31dd0..dde2cc31dd0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
index b0be8c775a3..b0be8c775a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
index 713aff0ea40..713aff0ea40 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index d8bc535f355..d8bc535f355 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index dfabda0428f..dfabda0428f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index f37e653bc56..f37e653bc56 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index 36d15673427..36d15673427 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
index 9c623c2278e..9c623c2278e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
index 0f3d0c126ff..0f3d0c126ff 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index b1916c27bfd..b1916c27bfd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
index 1590f2536e3..1590f2536e3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index cfca59e3b50..cfca59e3b50 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
index e8034b11c23..e8034b11c23 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
index babdf04e3ec..babdf04e3ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index efd8197bbfb..efd8197bbfb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
index 4c97f03870f..4c97f03870f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index 27887f12497..27887f12497 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index 8bb8fb2478d..8bb8fb2478d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix
index 46805421fa7..46805421fa7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 496a0bd4e56..496a0bd4e56 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
index 046f910a866..046f910a866 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index 916af5b2972..916af5b2972 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 0d58e11b4d2..0d58e11b4d2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index 2aff988dfd2..2aff988dfd2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index add200b09a1..add200b09a1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
index c19a47df6c2..c19a47df6c2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
index cded8dc2d06..cded8dc2d06 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index 353c8210885..353c8210885 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index 56d9b363268..56d9b363268 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
index 358666877a6..358666877a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index 7849acb57c0..7849acb57c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index dbdd53a9346..dbdd53a9346 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index ba8be7927f0..ba8be7927f0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index f44bd0f22e0..f44bd0f22e0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index 3be45384d41..3be45384d41 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
index 223c50f4716..223c50f4716 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index f344dbfa2fe..f344dbfa2fe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
index 6cfd7842409..6cfd7842409 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index da7f15e03c1..da7f15e03c1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index 1792d79f1d8..1792d79f1d8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index 6162f8ffe10..6162f8ffe10 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 1813844e85f..1813844e85f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index ca03207fabd..ca03207fabd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index c1b36b6b653..c1b36b6b653 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
index 7d9d8730f29..7d9d8730f29 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
index 9f4abb8e475..9f4abb8e475 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
index add3a15d27c..add3a15d27c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
index 653adb3d12b..653adb3d12b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
index 8243a337585..8243a337585 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
index 74b8442c0c9..74b8442c0c9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 2f07706a912..2f07706a912 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
index 303d43a964e..303d43a964e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 6b99f99b7ab..6b99f99b7ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
index 7375b8dd709..7375b8dd709 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 1d81acba2dc..1d81acba2dc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index 38ea5aa106c..38ea5aa106c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
index 98c565648dc..98c565648dc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
index fcdb69f3c35..fcdb69f3c35 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
index aa523d6f838..aa523d6f838 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
index ebae32962f1..ebae32962f1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index 68a019fa027..68a019fa027 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
index 1f0b4f9f71b..1f0b4f9f71b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 173a31e9f31..173a31e9f31 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 6668cd4f762..6668cd4f762 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 9b6fde0ea94..9b6fde0ea94 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index 26c5306c06a..26c5306c06a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
index 5043ff2e261..5043ff2e261 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 4d5bc0a2217..4d5bc0a2217 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 3dbacdf0f81..3dbacdf0f81 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 7c25ed9a037..7c25ed9a037 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index aa97f8f7cbe..aa97f8f7cbe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
index 8c318204572..8c318204572 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
index aa2b01e6bcd..aa2b01e6bcd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
index d68fd839bd1..d68fd839bd1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index a024ad3907a..a024ad3907a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index 4fd75234253..4fd75234253 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix
index 5247b169789..5247b169789 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix
index da6c1947902..da6c1947902 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix
index 4af3c19fa67..4af3c19fa67 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix
index fe31fcd5d32..fe31fcd5d32 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix
index d7af897eafb..d7af897eafb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 82c8603d4a4..82c8603d4a4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 89bed83acd5..89bed83acd5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
index 39f2af5430f..39f2af5430f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
index be9648a0da4..be9648a0da4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index d9b25bebddc..d9b25bebddc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 90ce8b83dde..90ce8b83dde 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
index d901df215a6..d901df215a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
index e961aecf854..e961aecf854 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix
index 42cdca06d90..42cdca06d90 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index 3754829ac37..3754829ac37 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
index 1f2700608e3..1f2700608e3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
index 51f4a2d0698..51f4a2d0698 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index e822fb48715..e822fb48715 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index 1b948bcf325..1b948bcf325 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
index 4211dfbc919..4211dfbc919 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
index 1677e5adcde..1677e5adcde 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index c4ae44cd676..c4ae44cd676 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
index 195b52c08c4..195b52c08c4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
index aa650edde02..aa650edde02 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
index c0ec72d4869..c0ec72d4869 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
index 4ba0cfa1ce2..4ba0cfa1ce2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
index 7a1a12243fe..7a1a12243fe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 2c56b5964f9..2c56b5964f9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index f276ec72736..f276ec72736 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
index 9d219f4c193..9d219f4c193 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index 702eb2d05b5..702eb2d05b5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
index e44004a9cf7..e44004a9cf7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index e4b89c382dc..e4b89c382dc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index 0d50e58ff55..0d50e58ff55 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index cadf617bbdf..cadf617bbdf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 08095979989..08095979989 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index 1f6a0709b0f..1f6a0709b0f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index 9dd6baad1bd..9dd6baad1bd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
index 10977c16f83..10977c16f83 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
index 4a5fe87982a..4a5fe87982a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
index 354d6c31507..354d6c31507 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
index 348c71fe966..348c71fe966 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
index 1edb65596a6..1edb65596a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
index 7f88beb974b..7f88beb974b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
index 8d21f88cbf8..8d21f88cbf8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
index 4eb30ef013b..4eb30ef013b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index 5ffa27fcca5..5ffa27fcca5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
index aeb37b15a49..aeb37b15a49 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
index 1a6f217a2f9..1a6f217a2f9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index f64e9ee6a33..f64e9ee6a33 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index 8187c99f94a..8187c99f94a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index 4f6842606b4..4f6842606b4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index 953dd0a58a4..953dd0a58a4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index d72e0839d1e..d72e0839d1e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
index c45a3eff384..c45a3eff384 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index 16609db5c22..16609db5c22 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
index dc63474679a..dc63474679a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
index adb1ad27c45..adb1ad27c45 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
index 974a63c1a73..974a63c1a73 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
index a8cfc070bf9..a8cfc070bf9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index 068d0eba69d..068d0eba69d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index 82d06b1c93b..82d06b1c93b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
index 4e7c84566a0..4e7c84566a0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index ea6adac9e9f..ea6adac9e9f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index 07b86f58fe7..07b86f58fe7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index bf6216dcadd..bf6216dcadd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix
index ea153987c0b..ea153987c0b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index e636df0805e..e636df0805e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
index fe9ccae2886..fe9ccae2886 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index 99e9517e50e..99e9517e50e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
index f0b5fb23d66..f0b5fb23d66 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
index e4fd9f0c4df..e4fd9f0c4df 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
index 16cd9d5f062..16cd9d5f062 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
index cb06b039abd..cb06b039abd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 8757c704c8f..8757c704c8f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
index ed09e3805c0..ed09e3805c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index 8ffcbc784ff..8ffcbc784ff 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
index 583b30f9769..583b30f9769 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index 065c81e11a6..065c81e11a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
index ffa2e595c26..ffa2e595c26 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index 4f694678393..4f694678393 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
index 741929484d8..741929484d8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
index 03d96005935..03d96005935 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 3666dda9bf8..3666dda9bf8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index f6022cb2a1f..f6022cb2a1f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 25d535176a6..25d535176a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
index d5be4be7daf..d5be4be7daf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
index 92fa5779452..92fa5779452 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix
index 1c28ec6e2af..1c28ec6e2af 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix
index ec12dde5223..ec12dde5223 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 9056cfbdcca..9056cfbdcca 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
index 24ac9348005..24ac9348005 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 9f125cfd52a..9f125cfd52a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 63adab55741..63adab55741 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index a22076facd3..a22076facd3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index 57dec7c93ca..57dec7c93ca 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index 1cd4e4c4402..1cd4e4c4402 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
index df63a5c9836..df63a5c9836 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
index d4004f3f8b5..d4004f3f8b5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
index 17a56c09b7e..17a56c09b7e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index e89eb1971d6..e89eb1971d6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
index 50b815425dc..50b815425dc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index f0df3b84f15..f0df3b84f15 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
index 4bae3cc1cee..4bae3cc1cee 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
index 74c84f0520f..74c84f0520f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
index d1237b5ac26..d1237b5ac26 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
index 30f82362537..30f82362537 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
index 13680b8706c..13680b8706c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
index acbcd0b31ec..acbcd0b31ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
index 4b81f2fa7fa..4b81f2fa7fa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
index b82f6089b06..b82f6089b06 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index 683f87357f5..683f87357f5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
index 16d265d465a..16d265d465a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
index a5242030473..a5242030473 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 82d0e4513ab..82d0e4513ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix
index 5b92cf9ec59..5b92cf9ec59 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index c629bb3548d..c629bb3548d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 2aee236ac0c..2aee236ac0c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index 33eedbaa818..33eedbaa818 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix
index 473a41063e7..473a41063e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index f02d9e0dc2c..f02d9e0dc2c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 8cc04c2c64a..8cc04c2c64a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index 00a484f11bf..00a484f11bf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
index 40e718cc10b..40e718cc10b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 1986f7c88f7..1986f7c88f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index 18f1b74edbd..18f1b74edbd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
index 6c456496732..6c456496732 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
index 4af27c449a3..4af27c449a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index c3928cf0e4c..c3928cf0e4c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
index bfd84514622..bfd84514622 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index 6a4751f799e..6a4751f799e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index 59a41a7cf9a..59a41a7cf9a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index f717441068b..f717441068b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
index 9854567fd5b..9854567fd5b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
index 4bfc0678f0f..4bfc0678f0f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index c02e6e24818..c02e6e24818 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
index 3e14a5ba9f0..3e14a5ba9f0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index b9ab71744c3..b9ab71744c3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
index c7031f4aa3f..c7031f4aa3f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index e14a540a178..e14a540a178 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 74e5d7e97e9..74e5d7e97e9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 375c1b6ea1b..375c1b6ea1b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 4df1884efd1..4df1884efd1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 972cb78a885..972cb78a885 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
index 3a0c5cb5fc2..3a0c5cb5fc2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
index ac3387d7b6d..ac3387d7b6d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/parasitic-invocation.emb b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/parasitic-invocation.emb
index bdee1c6dcf1..bdee1c6dcf1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/parasitic-invocation.emb
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/parasitic-invocation.emb
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
index 3824a04826f..3824a04826f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/quicklisp-bootstrap.lisp b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/quicklisp-bootstrap.lisp
index 1c4a682007f..1c4a682007f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/quicklisp-bootstrap.lisp
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/quicklisp-bootstrap.lisp
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
index 0f7941a0115..0f7941a0115 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
index 9ba7a89eb25..9ba7a89eb25 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/util.lisp b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/util.lisp
index 7b404304273..7b404304273 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/util.lisp
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/util.lisp
diff --git a/pkgs/development/lisp-modules/quicklisp.sh b/nixpkgs/pkgs/development/lisp-modules/quicklisp.sh
index 30d14419461..30d14419461 100644
--- a/pkgs/development/lisp-modules/quicklisp.sh
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp.sh
diff --git a/pkgs/development/lisp-modules/shell.nix b/nixpkgs/pkgs/development/lisp-modules/shell.nix
index 4a1f9ded56c..4a1f9ded56c 100644
--- a/pkgs/development/lisp-modules/shell.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/shell.nix
diff --git a/pkgs/development/lua-modules/bit32.patch b/nixpkgs/pkgs/development/lua-modules/bit32.patch
index 544c4d42398..544c4d42398 100644
--- a/pkgs/development/lua-modules/bit32.patch
+++ b/nixpkgs/pkgs/development/lua-modules/bit32.patch
diff --git a/pkgs/development/lua-modules/default.nix b/nixpkgs/pkgs/development/lua-modules/default.nix
index 091b94f58f5..091b94f58f5 100644
--- a/pkgs/development/lua-modules/default.nix
+++ b/nixpkgs/pkgs/development/lua-modules/default.nix
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
index d95ce128b73..d95ce128b73 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
diff --git a/pkgs/development/lua-modules/generic/default.nix b/nixpkgs/pkgs/development/lua-modules/generic/default.nix
index 71e1f7c05e6..71e1f7c05e6 100644
--- a/pkgs/development/lua-modules/generic/default.nix
+++ b/nixpkgs/pkgs/development/lua-modules/generic/default.nix
diff --git a/pkgs/development/lua-modules/luuid.patch b/nixpkgs/pkgs/development/lua-modules/luuid.patch
index 039d522be6d..039d522be6d 100644
--- a/pkgs/development/lua-modules/luuid.patch
+++ b/nixpkgs/pkgs/development/lua-modules/luuid.patch
diff --git a/pkgs/development/lua-modules/overrides.nix b/nixpkgs/pkgs/development/lua-modules/overrides.nix
index fd99a70de3a..fd99a70de3a 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/nixpkgs/pkgs/development/lua-modules/overrides.nix
diff --git a/pkgs/development/lua-modules/zip.patch b/nixpkgs/pkgs/development/lua-modules/zip.patch
index c3f88f451e8..c3f88f451e8 100644
--- a/pkgs/development/lua-modules/zip.patch
+++ b/nixpkgs/pkgs/development/lua-modules/zip.patch
diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix
index e93f904b895..e93f904b895 100644
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix
diff --git a/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch b/nixpkgs/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch
index f474f76f01e..f474f76f01e 100644
--- a/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch
+++ b/nixpkgs/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch
diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix
index a3a4573c0ae..a3a4573c0ae 100644
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix
diff --git a/pkgs/development/misc/amdapp-sdk/gcc-5.patch b/nixpkgs/pkgs/development/misc/amdapp-sdk/gcc-5.patch
index dc8538db4c1..dc8538db4c1 100644
--- a/pkgs/development/misc/amdapp-sdk/gcc-5.patch
+++ b/nixpkgs/pkgs/development/misc/amdapp-sdk/gcc-5.patch
diff --git a/pkgs/development/misc/avr/libc/default.nix b/nixpkgs/pkgs/development/misc/avr/libc/default.nix
index 48ea088a73c..48ea088a73c 100644
--- a/pkgs/development/misc/avr/libc/default.nix
+++ b/nixpkgs/pkgs/development/misc/avr/libc/default.nix
diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix
index c88b780d164..c88b780d164 100644
--- a/pkgs/development/misc/avr8-burn-omat/default.nix
+++ b/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix
diff --git a/pkgs/development/misc/google-clasp/README.md b/nixpkgs/pkgs/development/misc/google-clasp/README.md
index 9adf2255380..9adf2255380 100644
--- a/pkgs/development/misc/google-clasp/README.md
+++ b/nixpkgs/pkgs/development/misc/google-clasp/README.md
diff --git a/pkgs/development/misc/google-clasp/default.nix b/nixpkgs/pkgs/development/misc/google-clasp/default.nix
index db6ade1c85a..db6ade1c85a 100644
--- a/pkgs/development/misc/google-clasp/default.nix
+++ b/nixpkgs/pkgs/development/misc/google-clasp/default.nix
diff --git a/pkgs/development/misc/google-clasp/dotf.patch b/nixpkgs/pkgs/development/misc/google-clasp/dotf.patch
index 0d59cae6125..0d59cae6125 100644
--- a/pkgs/development/misc/google-clasp/dotf.patch
+++ b/nixpkgs/pkgs/development/misc/google-clasp/dotf.patch
diff --git a/pkgs/development/misc/google-clasp/generate.sh b/nixpkgs/pkgs/development/misc/google-clasp/generate.sh
index 4e04231e2b8..4e04231e2b8 100755
--- a/pkgs/development/misc/google-clasp/generate.sh
+++ b/nixpkgs/pkgs/development/misc/google-clasp/generate.sh
diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix
index c2a2412d3d7..c2a2412d3d7 100644
--- a/pkgs/development/misc/google-clasp/google-clasp.nix
+++ b/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix
diff --git a/pkgs/development/misc/google-clasp/node-packages.json b/nixpkgs/pkgs/development/misc/google-clasp/node-packages.json
index b868571d051..b868571d051 100644
--- a/pkgs/development/misc/google-clasp/node-packages.json
+++ b/nixpkgs/pkgs/development/misc/google-clasp/node-packages.json
diff --git a/pkgs/development/misc/google-clasp/node-packages.nix b/nixpkgs/pkgs/development/misc/google-clasp/node-packages.nix
index 6c51318c9eb..6c51318c9eb 100644
--- a/pkgs/development/misc/google-clasp/node-packages.nix
+++ b/nixpkgs/pkgs/development/misc/google-clasp/node-packages.nix
diff --git a/pkgs/development/misc/h3/default.nix b/nixpkgs/pkgs/development/misc/h3/default.nix
index 00e35b64f5f..00e35b64f5f 100644
--- a/pkgs/development/misc/h3/default.nix
+++ b/nixpkgs/pkgs/development/misc/h3/default.nix
diff --git a/pkgs/development/misc/loc/default.nix b/nixpkgs/pkgs/development/misc/loc/default.nix
index 557d6f17609..557d6f17609 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/nixpkgs/pkgs/development/misc/loc/default.nix
diff --git a/pkgs/development/misc/msp430/gcc-support.nix b/nixpkgs/pkgs/development/misc/msp430/gcc-support.nix
index 36dbce6bdfd..36dbce6bdfd 100644
--- a/pkgs/development/misc/msp430/gcc-support.nix
+++ b/nixpkgs/pkgs/development/misc/msp430/gcc-support.nix
diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix
index b84f358cbee..b84f358cbee 100644
--- a/pkgs/development/misc/msp430/mspdebug.nix
+++ b/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix
diff --git a/pkgs/development/misc/msp430/newlib.nix b/nixpkgs/pkgs/development/misc/msp430/newlib.nix
index 4ea98bfc8b2..4ea98bfc8b2 100644
--- a/pkgs/development/misc/msp430/newlib.nix
+++ b/nixpkgs/pkgs/development/misc/msp430/newlib.nix
diff --git a/pkgs/development/misc/newlib/default.nix b/nixpkgs/pkgs/development/misc/newlib/default.nix
index df0ef999dd6..df0ef999dd6 100644
--- a/pkgs/development/misc/newlib/default.nix
+++ b/nixpkgs/pkgs/development/misc/newlib/default.nix
diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix
index 38b1df3ca3b..38b1df3ca3b 100644
--- a/pkgs/development/misc/qmk_firmware/default.nix
+++ b/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix
diff --git a/pkgs/development/misc/rappel/default.nix b/nixpkgs/pkgs/development/misc/rappel/default.nix
index 761d2ea98ba..761d2ea98ba 100644
--- a/pkgs/development/misc/rappel/default.nix
+++ b/nixpkgs/pkgs/development/misc/rappel/default.nix
diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/nixpkgs/pkgs/development/misc/rpiboot/unstable.nix
index c89d2f11e95..c89d2f11e95 100644
--- a/pkgs/development/misc/rpiboot/unstable.nix
+++ b/nixpkgs/pkgs/development/misc/rpiboot/unstable.nix
diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix
index ee424d18f15..ee424d18f15 100644
--- a/pkgs/development/misc/stm32/betaflight/default.nix
+++ b/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix
diff --git a/pkgs/development/misc/stm32/inav/default.nix b/nixpkgs/pkgs/development/misc/stm32/inav/default.nix
index 27e96b067b4..27e96b067b4 100644
--- a/pkgs/development/misc/stm32/inav/default.nix
+++ b/nixpkgs/pkgs/development/misc/stm32/inav/default.nix
diff --git a/pkgs/development/misc/vc4/newlib.nix b/nixpkgs/pkgs/development/misc/vc4/newlib.nix
index e1a8b2eeaa6..e1a8b2eeaa6 100644
--- a/pkgs/development/misc/vc4/newlib.nix
+++ b/nixpkgs/pkgs/development/misc/vc4/newlib.nix
diff --git a/pkgs/development/misc/yelp-tools/default.nix b/nixpkgs/pkgs/development/misc/yelp-tools/default.nix
index 75754bec7a1..75754bec7a1 100644
--- a/pkgs/development/misc/yelp-tools/default.nix
+++ b/nixpkgs/pkgs/development/misc/yelp-tools/default.nix
diff --git a/pkgs/development/mobile/abootimg/default.nix b/nixpkgs/pkgs/development/mobile/abootimg/default.nix
index eed4b43d6a3..eed4b43d6a3 100644
--- a/pkgs/development/mobile/abootimg/default.nix
+++ b/nixpkgs/pkgs/development/mobile/abootimg/default.nix
diff --git a/pkgs/development/mobile/adb-sync/default.nix b/nixpkgs/pkgs/development/mobile/adb-sync/default.nix
index ebba63353da..ebba63353da 100644
--- a/pkgs/development/mobile/adb-sync/default.nix
+++ b/nixpkgs/pkgs/development/mobile/adb-sync/default.nix
diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix
index 2033fa78ae5..2033fa78ae5 100644
--- a/pkgs/development/mobile/adbfs-rootless/default.nix
+++ b/nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix
diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/nixpkgs/pkgs/development/mobile/androidenv/build-app.nix
index 6f4b32b486b..6f4b32b486b 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/build-app.nix
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix
index 9e273468cd3..9e273468cd3 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix
diff --git a/pkgs/development/mobile/androidenv/cmake.nix b/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix
index 1aeef467642..1aeef467642 100644
--- a/pkgs/development/mobile/androidenv/cmake.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
index fb548bf3f9f..fb548bf3f9f 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
diff --git a/pkgs/development/mobile/androidenv/convertaddons.xsl b/nixpkgs/pkgs/development/mobile/androidenv/convertaddons.xsl
index 73f58ff5cde..73f58ff5cde 100644
--- a/pkgs/development/mobile/androidenv/convertaddons.xsl
+++ b/nixpkgs/pkgs/development/mobile/androidenv/convertaddons.xsl
diff --git a/pkgs/development/mobile/androidenv/convertpackages.xsl b/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl
index 9623e01abcd..9623e01abcd 100644
--- a/pkgs/development/mobile/androidenv/convertpackages.xsl
+++ b/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl
diff --git a/pkgs/development/mobile/androidenv/convertsystemimages.xsl b/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl
index 42d19cb6965..42d19cb6965 100644
--- a/pkgs/development/mobile/androidenv/convertsystemimages.xsl
+++ b/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl
diff --git a/pkgs/development/mobile/androidenv/default.nix b/nixpkgs/pkgs/development/mobile/androidenv/default.nix
index 14882bc2243..14882bc2243 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/default.nix
diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix b/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix
index 839a14f7033..839a14f7033 100644
--- a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix
diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix
index fa9a56fadba..fa9a56fadba 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix
diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix
index 7ba74eb900f..7ba74eb900f 100644
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix
diff --git a/pkgs/development/mobile/androidenv/generate.sh b/nixpkgs/pkgs/development/mobile/androidenv/generate.sh
index 1c55734f5f4..1c55734f5f4 100644
--- a/pkgs/development/mobile/androidenv/generate.sh
+++ b/nixpkgs/pkgs/development/mobile/androidenv/generate.sh
diff --git a/pkgs/development/mobile/androidenv/generated/addons.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix
index d902b111665..d902b111665 100644
--- a/pkgs/development/mobile/androidenv/generated/addons.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix
diff --git a/pkgs/development/mobile/androidenv/generated/packages.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/packages.nix
index db1f7f1b8d3..db1f7f1b8d3 100644
--- a/pkgs/development/mobile/androidenv/generated/packages.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/generated/packages.nix
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix
index 1aa49545254..1aa49545254 100644
--- a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix
index 372a751f41c..372a751f41c 100644
--- a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix
index 0c45a1162fe..0c45a1162fe 100644
--- a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android.nix
index 915cceec546..915cceec546 100644
--- a/pkgs/development/mobile/androidenv/generated/system-images-android.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-android.nix
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix
index 3b0303b86b4..3b0303b86b4 100644
--- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix
index a8bea61ff54..a8bea61ff54 100644
--- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix
diff --git a/pkgs/development/mobile/androidenv/lldb.nix b/nixpkgs/pkgs/development/mobile/androidenv/lldb.nix
index e8a158c01ec..e8a158c01ec 100644
--- a/pkgs/development/mobile/androidenv/lldb.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/lldb.nix
diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
index b81fab1ed76..b81fab1ed76 100644
--- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch
index 7af2d44a0f2..7af2d44a0f2 100644
--- a/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch
+++ b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/nixpkgs/pkgs/development/mobile/androidenv/platform-tools.nix
index c39d966959a..c39d966959a 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/platform-tools.nix
diff --git a/pkgs/development/mobile/androidenv/querypackages.sh b/nixpkgs/pkgs/development/mobile/androidenv/querypackages.sh
index 0f31396b876..0f31396b876 100644
--- a/pkgs/development/mobile/androidenv/querypackages.sh
+++ b/nixpkgs/pkgs/development/mobile/androidenv/querypackages.sh
diff --git a/pkgs/development/mobile/androidenv/tools.nix b/nixpkgs/pkgs/development/mobile/androidenv/tools.nix
index 92f53e5a7c2..92f53e5a7c2 100644
--- a/pkgs/development/mobile/androidenv/tools.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/tools.nix
diff --git a/pkgs/development/mobile/androidenv/tools/25.nix b/nixpkgs/pkgs/development/mobile/androidenv/tools/25.nix
index 80b5858031d..80b5858031d 100644
--- a/pkgs/development/mobile/androidenv/tools/25.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/tools/25.nix
diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix
index 0234c9f3d04..0234c9f3d04 100644
--- a/pkgs/development/mobile/androidenv/tools/26.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix
diff --git a/pkgs/development/mobile/cocoapods/Gemfile b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile
index 329b51518e4..329b51518e4 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile
diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta
index dd4b350b437..dd4b350b437 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile-beta
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta
diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
index 83237fd5fc7..83237fd5fc7 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock
index 958f36192f9..958f36192f9 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock
diff --git a/pkgs/development/mobile/cocoapods/default.nix b/nixpkgs/pkgs/development/mobile/cocoapods/default.nix
index c235b9e9a12..c235b9e9a12 100644
--- a/pkgs/development/mobile/cocoapods/default.nix
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/default.nix
diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
index 68c251481e9..68c251481e9 100644
--- a/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
index 2f268a60c94..2f268a60c94 100644
--- a/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
diff --git a/pkgs/development/mobile/cocoapods/update b/nixpkgs/pkgs/development/mobile/cocoapods/update
index 309142e0e1d..309142e0e1d 100755
--- a/pkgs/development/mobile/cocoapods/update
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/update
diff --git a/pkgs/development/mobile/flashtool/default.nix b/nixpkgs/pkgs/development/mobile/flashtool/default.nix
index f78a10d8266..f78a10d8266 100644
--- a/pkgs/development/mobile/flashtool/default.nix
+++ b/nixpkgs/pkgs/development/mobile/flashtool/default.nix
diff --git a/pkgs/development/mobile/genymotion/default.nix b/nixpkgs/pkgs/development/mobile/genymotion/default.nix
index 0ea74377a5f..0ea74377a5f 100644
--- a/pkgs/development/mobile/genymotion/default.nix
+++ b/nixpkgs/pkgs/development/mobile/genymotion/default.nix
diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix
index 706fa2c6599..706fa2c6599 100644
--- a/pkgs/development/mobile/imgpatchtools/default.nix
+++ b/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix
index a7e158bd3bb..a7e158bd3bb 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix
index c85eab108ff..c85eab108ff 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
index 5c1cd0a265a..5c1cd0a265a 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
+++ b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
index 45523fad908..45523fad908 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
+++ b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix
index cd58ea4e20c..cd58ea4e20c 100644
--- a/pkgs/development/mobile/webos/cmake-modules.nix
+++ b/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix
diff --git a/pkgs/development/mobile/webos/cmake-setup-hook.sh b/nixpkgs/pkgs/development/mobile/webos/cmake-setup-hook.sh
index 7e52681e9a9..7e52681e9a9 100644
--- a/pkgs/development/mobile/webos/cmake-setup-hook.sh
+++ b/nixpkgs/pkgs/development/mobile/webos/cmake-setup-hook.sh
diff --git a/pkgs/development/mobile/webos/novacom.nix b/nixpkgs/pkgs/development/mobile/webos/novacom.nix
index e7afdb32137..e7afdb32137 100644
--- a/pkgs/development/mobile/webos/novacom.nix
+++ b/nixpkgs/pkgs/development/mobile/webos/novacom.nix
diff --git a/pkgs/development/mobile/webos/novacomd.nix b/nixpkgs/pkgs/development/mobile/webos/novacomd.nix
index 4d62dd305d3..4d62dd305d3 100644
--- a/pkgs/development/mobile/webos/novacomd.nix
+++ b/nixpkgs/pkgs/development/mobile/webos/novacomd.nix
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix
index fa108c8e470..fa108c8e470 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix
diff --git a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/nixpkgs/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
index 0a469da418a..0a469da418a 100644
--- a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
+++ b/nixpkgs/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/nixpkgs/pkgs/development/mobile/xcodeenv/default.nix
index 47686e6d69e..47686e6d69e 100644
--- a/pkgs/development/mobile/xcodeenv/default.nix
+++ b/nixpkgs/pkgs/development/mobile/xcodeenv/default.nix
diff --git a/pkgs/development/mobile/xcodeenv/install.html.template b/nixpkgs/pkgs/development/mobile/xcodeenv/install.html.template
index d48fda7f38b..d48fda7f38b 100644
--- a/pkgs/development/mobile/xcodeenv/install.html.template
+++ b/nixpkgs/pkgs/development/mobile/xcodeenv/install.html.template
diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/nixpkgs/pkgs/development/mobile/xcodeenv/simulate-app.nix
index 1a55f8366a3..1a55f8366a3 100644
--- a/pkgs/development/mobile/xcodeenv/simulate-app.nix
+++ b/nixpkgs/pkgs/development/mobile/xcodeenv/simulate-app.nix
diff --git a/pkgs/development/mobile/xpwn/default.nix b/nixpkgs/pkgs/development/mobile/xpwn/default.nix
index 9ec5977d594..9ec5977d594 100644
--- a/pkgs/development/mobile/xpwn/default.nix
+++ b/nixpkgs/pkgs/development/mobile/xpwn/default.nix
diff --git a/pkgs/development/node-packages/README.md b/nixpkgs/pkgs/development/node-packages/README.md
index 9760285a915..9760285a915 100644
--- a/pkgs/development/node-packages/README.md
+++ b/nixpkgs/pkgs/development/node-packages/README.md
diff --git a/pkgs/development/node-packages/composition-v10.nix b/nixpkgs/pkgs/development/node-packages/composition-v10.nix
index fa4b4c3be56..fa4b4c3be56 100644
--- a/pkgs/development/node-packages/composition-v10.nix
+++ b/nixpkgs/pkgs/development/node-packages/composition-v10.nix
diff --git a/pkgs/development/node-packages/composition-v12.nix b/nixpkgs/pkgs/development/node-packages/composition-v12.nix
index 880d72efd35..880d72efd35 100644
--- a/pkgs/development/node-packages/composition-v12.nix
+++ b/nixpkgs/pkgs/development/node-packages/composition-v12.nix
diff --git a/pkgs/development/node-packages/composition-v13.nix b/nixpkgs/pkgs/development/node-packages/composition-v13.nix
index c79053e020e..c79053e020e 100644
--- a/pkgs/development/node-packages/composition-v13.nix
+++ b/nixpkgs/pkgs/development/node-packages/composition-v13.nix
diff --git a/pkgs/development/node-packages/default-v10.nix b/nixpkgs/pkgs/development/node-packages/default-v10.nix
index f79696207d3..f79696207d3 100644
--- a/pkgs/development/node-packages/default-v10.nix
+++ b/nixpkgs/pkgs/development/node-packages/default-v10.nix
diff --git a/pkgs/development/node-packages/default-v12.nix b/nixpkgs/pkgs/development/node-packages/default-v12.nix
index c5db060989e..c5db060989e 100644
--- a/pkgs/development/node-packages/default-v12.nix
+++ b/nixpkgs/pkgs/development/node-packages/default-v12.nix
diff --git a/pkgs/development/node-packages/default-v13.nix b/nixpkgs/pkgs/development/node-packages/default-v13.nix
index 242aaa70d66..242aaa70d66 100644
--- a/pkgs/development/node-packages/default-v13.nix
+++ b/nixpkgs/pkgs/development/node-packages/default-v13.nix
diff --git a/pkgs/development/node-packages/generate.sh b/nixpkgs/pkgs/development/node-packages/generate.sh
index ca6e0628642..ca6e0628642 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/nixpkgs/pkgs/development/node-packages/generate.sh
diff --git a/pkgs/development/node-packages/node-env.nix b/nixpkgs/pkgs/development/node-packages/node-env.nix
index 7cc212c41bd..7cc212c41bd 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/nixpkgs/pkgs/development/node-packages/node-env.nix
diff --git a/pkgs/development/node-packages/node-packages-v10.json b/nixpkgs/pkgs/development/node-packages/node-packages-v10.json
index d5f7b95ab97..d5f7b95ab97 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/nixpkgs/pkgs/development/node-packages/node-packages-v10.json
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix
index d5bc3f18c43..d5bc3f18c43 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix
diff --git a/pkgs/development/node-packages/node-packages-v12.json b/nixpkgs/pkgs/development/node-packages/node-packages-v12.json
index 01f36b015ca..01f36b015ca 100644
--- a/pkgs/development/node-packages/node-packages-v12.json
+++ b/nixpkgs/pkgs/development/node-packages/node-packages-v12.json
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/nixpkgs/pkgs/development/node-packages/node-packages-v12.nix
index 08122a11ee2..08122a11ee2 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/nixpkgs/pkgs/development/node-packages/node-packages-v12.nix
diff --git a/pkgs/development/node-packages/node-packages-v13.json b/nixpkgs/pkgs/development/node-packages/node-packages-v13.json
index 1c7b22c3c7e..1c7b22c3c7e 100644
--- a/pkgs/development/node-packages/node-packages-v13.json
+++ b/nixpkgs/pkgs/development/node-packages/node-packages-v13.json
diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/nixpkgs/pkgs/development/node-packages/node-packages-v13.nix
index 71b35957832..71b35957832 100644
--- a/pkgs/development/node-packages/node-packages-v13.nix
+++ b/nixpkgs/pkgs/development/node-packages/node-packages-v13.nix
diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/nixpkgs/pkgs/development/ocaml-modules/alcotest/default.nix
index 8415dc751d5..8415dc751d5 100644
--- a/pkgs/development/ocaml-modules/alcotest/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/alcotest/default.nix
diff --git a/pkgs/development/ocaml-modules/alcotest/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix
index f005421a6fc..f005421a6fc 100644
--- a/pkgs/development/ocaml-modules/alcotest/lwt.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix
diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix
index ac900a8dd18..ac900a8dd18 100644
--- a/pkgs/development/ocaml-modules/angstrom-async/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix
diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
index d249c451291..d249c451291 100644
--- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix
index 0d4ab400dd3..0d4ab400dd3 100644
--- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix
diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix
index af12ea544cc..af12ea544cc 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix
diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ansiterminal/default.nix
index 7b9f0175151..7b9f0175151 100644
--- a/pkgs/development/ocaml-modules/ansiterminal/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ansiterminal/default.nix
diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix
index 0e73c6a73d3..0e73c6a73d3 100644
--- a/pkgs/development/ocaml-modules/apron/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix
diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index 49fcdbd261a..49fcdbd261a 100644
--- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix
diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix
index 7410c19b247..7410c19b247 100644
--- a/pkgs/development/ocaml-modules/astring/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix
diff --git a/pkgs/development/ocaml-modules/async/default.nix b/nixpkgs/pkgs/development/ocaml-modules/async/default.nix
index 498315f9cbf..498315f9cbf 100644
--- a/pkgs/development/ocaml-modules/async/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/async/default.nix
diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/nixpkgs/pkgs/development/ocaml-modules/async_extra/default.nix
index 80addcfc3bb..80addcfc3bb 100644
--- a/pkgs/development/ocaml-modules/async_extra/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/async_extra/default.nix
diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/nixpkgs/pkgs/development/ocaml-modules/async_find/default.nix
index d0e89940433..d0e89940433 100644
--- a/pkgs/development/ocaml-modules/async_find/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/async_find/default.nix
diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/nixpkgs/pkgs/development/ocaml-modules/async_kernel/default.nix
index 43fde1631ac..43fde1631ac 100644
--- a/pkgs/development/ocaml-modules/async_kernel/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/async_kernel/default.nix
diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/nixpkgs/pkgs/development/ocaml-modules/async_shell/default.nix
index 6b1e772bc7d..6b1e772bc7d 100644
--- a/pkgs/development/ocaml-modules/async_shell/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/async_shell/default.nix
diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/async_unix/default.nix
index 6119bcac876..6119bcac876 100644
--- a/pkgs/development/ocaml-modules/async_unix/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/async_unix/default.nix
diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix
index c6047f4ea1b..c6047f4ea1b 100644
--- a/pkgs/development/ocaml-modules/atd/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix
diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix
index d8ef2fec999..d8ef2fec999 100644
--- a/pkgs/development/ocaml-modules/atdgen/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix
index a988582ce6c..a988582ce6c 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix
diff --git a/pkgs/development/ocaml-modules/base64/2.0.nix b/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix
index 4606ebd5172..4606ebd5172 100644
--- a/pkgs/development/ocaml-modules/base64/2.0.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix
diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix
index 2633d43c104..2633d43c104 100644
--- a/pkgs/development/ocaml-modules/base64/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix
index 1b3bb9a7981..1b3bb9a7981 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix
diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix
index de2010275ef..de2010275ef 100644
--- a/pkgs/development/ocaml-modules/benchmark/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix
diff --git a/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix
index 6d833b48f26..6d833b48f26 100644
--- a/pkgs/development/ocaml-modules/bigarray-compat/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix
diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix
index 0544ebbe685..0544ebbe685 100644
--- a/pkgs/development/ocaml-modules/bigstringaf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix
diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bin_prot/default.nix
index bc075295cf3..bc075295cf3 100644
--- a/pkgs/development/ocaml-modules/bin_prot/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bin_prot/default.nix
diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix
index ed216d8236a..ed216d8236a 100644
--- a/pkgs/development/ocaml-modules/biniou/1.0.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix
diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix
index b97c78a399b..b97c78a399b 100644
--- a/pkgs/development/ocaml-modules/biniou/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix
diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix
index 4f97594fb7c..4f97594fb7c 100644
--- a/pkgs/development/ocaml-modules/biocaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix
diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
index 6a98267d89a..6a98267d89a 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix
index 9999cd06fca..9999cd06fca 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix
diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix
index d6a1cac1719..d6a1cac1719 100644
--- a/pkgs/development/ocaml-modules/bistro/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix
diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix
index 3d1a554b330..3d1a554b330 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix
diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix
index 359d83b4762..359d83b4762 100644
--- a/pkgs/development/ocaml-modules/bitv/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix
diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix
index 7b8103efac8..7b8103efac8 100644
--- a/pkgs/development/ocaml-modules/bolt/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix
diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix
index 6b37cf1aed3..6b37cf1aed3 100644
--- a/pkgs/development/ocaml-modules/bos/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix
diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix
index 22d000a5fd3..22d000a5fd3 100644
--- a/pkgs/development/ocaml-modules/cairo2/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix
diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix
index c33deec9c78..c33deec9c78 100644
--- a/pkgs/development/ocaml-modules/calendar/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix
diff --git a/pkgs/development/ocaml-modules/camlimages/4.0.nix b/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.0.nix
index 0ec3a26d051..0ec3a26d051 100644
--- a/pkgs/development/ocaml-modules/camlimages/4.0.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.0.nix
diff --git a/pkgs/development/ocaml-modules/camlimages/4.1.nix b/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.1.nix
index 31b4047efc8..31b4047efc8 100644
--- a/pkgs/development/ocaml-modules/camlimages/4.1.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.1.nix
diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix
index 8b0b70cae60..8b0b70cae60 100644
--- a/pkgs/development/ocaml-modules/camlimages/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix
diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix
index e1e213eca78..e1e213eca78 100644
--- a/pkgs/development/ocaml-modules/camlpdf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix
diff --git a/pkgs/development/ocaml-modules/camlzip/META b/nixpkgs/pkgs/development/ocaml-modules/camlzip/META
index 44c5168ae51..44c5168ae51 100644
--- a/pkgs/development/ocaml-modules/camlzip/META
+++ b/nixpkgs/pkgs/development/ocaml-modules/camlzip/META
diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix
index 7de8968e061..7de8968e061 100644
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix
diff --git a/pkgs/development/ocaml-modules/camlzip/makefile_1_05.patch b/nixpkgs/pkgs/development/ocaml-modules/camlzip/makefile_1_05.patch
index 87d0c8bec33..87d0c8bec33 100644
--- a/pkgs/development/ocaml-modules/camlzip/makefile_1_05.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/camlzip/makefile_1_05.patch
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix
index d206cbf9421..d206cbf9421 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix
index dc2049769f3..dc2049769f3 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix
diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
index ff0cb4aa3fe..ff0cb4aa3fe 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix
index db6d2b1d440..db6d2b1d440 100644
--- a/pkgs/development/ocaml-modules/cfstream/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix
diff --git a/pkgs/development/ocaml-modules/cfstream/git_commit.patch b/nixpkgs/pkgs/development/ocaml-modules/cfstream/git_commit.patch
index 5f8d8f5ce31..5f8d8f5ce31 100644
--- a/pkgs/development/ocaml-modules/cfstream/git_commit.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/cfstream/git_commit.patch
diff --git a/pkgs/development/ocaml-modules/charInfo_width/default.nix b/nixpkgs/pkgs/development/ocaml-modules/charInfo_width/default.nix
index 7a78573412f..7a78573412f 100644
--- a/pkgs/development/ocaml-modules/charInfo_width/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/charInfo_width/default.nix
diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix
index 731dd476c5d..731dd476c5d 100644
--- a/pkgs/development/ocaml-modules/checkseum/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix
diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix
index 5fbb141b6cc..5fbb141b6cc 100644
--- a/pkgs/development/ocaml-modules/cil/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix
diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix
index 34d57b403b0..34d57b403b0 100644
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix
diff --git a/pkgs/development/ocaml-modules/cohttp/0.19.3.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/0.19.3.nix
index 24547a03a08..24547a03a08 100644
--- a/pkgs/development/ocaml-modules/cohttp/0.19.3.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/0.19.3.nix
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix
index 22a4e6371a9..22a4e6371a9 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
index 588ba6711cb..588ba6711cb 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix
index 748b970477e..748b970477e 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix
diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix
index 8192fced97b..8192fced97b 100644
--- a/pkgs/development/ocaml-modules/comparelib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix
diff --git a/pkgs/development/ocaml-modules/conduit/0.10.0.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/0.10.0.nix
index 4d1c43e0ae1..4d1c43e0ae1 100644
--- a/pkgs/development/ocaml-modules/conduit/0.10.0.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/0.10.0.nix
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix
index 22538b87f6a..22538b87f6a 100644
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix
diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
index 51fb369e66f..51fb369e66f 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix
index 2eb225d88b6..2eb225d88b6 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix
diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix
index 4ca9d4a30e0..4ca9d4a30e0 100644
--- a/pkgs/development/ocaml-modules/config-file/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix
diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix
index b12b6e8c265..b12b6e8c265 100644
--- a/pkgs/development/ocaml-modules/containers/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix
diff --git a/pkgs/development/ocaml-modules/core/default.nix b/nixpkgs/pkgs/development/ocaml-modules/core/default.nix
index 4da4d16df7d..4da4d16df7d 100644
--- a/pkgs/development/ocaml-modules/core/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/core/default.nix
diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/nixpkgs/pkgs/development/ocaml-modules/core_extended/default.nix
index fe4fc5d87ab..fe4fc5d87ab 100644
--- a/pkgs/development/ocaml-modules/core_extended/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/core_extended/default.nix
diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/nixpkgs/pkgs/development/ocaml-modules/core_kernel/default.nix
index 75b248a6a5e..75b248a6a5e 100644
--- a/pkgs/development/ocaml-modules/core_kernel/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/core_kernel/default.nix
diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix
index 2a4d7004faa..2a4d7004faa 100644
--- a/pkgs/development/ocaml-modules/cow/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix
index 5df15316e32..5df15316e32 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix
diff --git a/pkgs/development/ocaml-modules/cpu/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix
index 716e40e16e9..716e40e16e9 100644
--- a/pkgs/development/ocaml-modules/cpu/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix
diff --git a/pkgs/development/ocaml-modules/cpuid/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cpuid/default.nix
index 6c7ecaa4b7a..6c7ecaa4b7a 100644
--- a/pkgs/development/ocaml-modules/cpuid/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cpuid/default.nix
diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix
index f6d22100873..f6d22100873 100644
--- a/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix
index 1c7a0ccb0fa..1c7a0ccb0fa 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix
diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/1.9.0.nix
index 0122ec9ff61..0122ec9ff61 100644
--- a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/1.9.0.nix
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix
index 01a32fc09a2..01a32fc09a2 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix
diff --git a/pkgs/development/ocaml-modules/cstruct/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix
index 5a10d7cae48..5a10d7cae48 100644
--- a/pkgs/development/ocaml-modules/cstruct/lwt.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix
diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix
index b5c39533e73..b5c39533e73 100644
--- a/pkgs/development/ocaml-modules/cstruct/ppx.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix
diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix
index 9a1ef0dd301..9a1ef0dd301 100644
--- a/pkgs/development/ocaml-modules/cstruct/sexp.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix
diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix
index 7cb5d665869..7cb5d665869 100644
--- a/pkgs/development/ocaml-modules/cstruct/unix.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix
diff --git a/pkgs/development/ocaml-modules/csv/1.5.nix b/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix
index a7505f6f51c..a7505f6f51c 100644
--- a/pkgs/development/ocaml-modules/csv/1.5.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix
diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/nixpkgs/pkgs/development/ocaml-modules/csv/default.nix
index 05a18612804..05a18612804 100644
--- a/pkgs/development/ocaml-modules/csv/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/csv/default.nix
diff --git a/pkgs/development/ocaml-modules/csv/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/csv/lwt.nix
index 2fa9296d7e4..2fa9296d7e4 100644
--- a/pkgs/development/ocaml-modules/csv/lwt.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/csv/lwt.nix
diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix
index bc76cfcd64c..bc76cfcd64c 100644
--- a/pkgs/development/ocaml-modules/ctypes/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix
diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix
index 9bcf4fc411f..9bcf4fc411f 100644
--- a/pkgs/development/ocaml-modules/curses/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix
diff --git a/pkgs/development/ocaml-modules/custom_printf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/custom_printf/default.nix
index 16c31fc3861..16c31fc3861 100644
--- a/pkgs/development/ocaml-modules/custom_printf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/custom_printf/default.nix
diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix
index 753f894e085..753f894e085 100644
--- a/pkgs/development/ocaml-modules/decompress/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix
diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix
index f0a98249d6d..f0a98249d6d 100644
--- a/pkgs/development/ocaml-modules/digestif/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix
diff --git a/pkgs/development/ocaml-modules/dispatch/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix
index 5de61169c36..5de61169c36 100644
--- a/pkgs/development/ocaml-modules/dispatch/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix
diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix
index 824da303068..824da303068 100644
--- a/pkgs/development/ocaml-modules/dolmen/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix
diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix
index 9239d2543ee..9239d2543ee 100644
--- a/pkgs/development/ocaml-modules/dolog/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix
diff --git a/pkgs/development/ocaml-modules/domain-name/default.nix b/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix
index cb0105ff46f..cb0105ff46f 100644
--- a/pkgs/development/ocaml-modules/domain-name/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix
diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix
index 16a9f96798c..16a9f96798c 100644
--- a/pkgs/development/ocaml-modules/dtoa/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix
diff --git a/pkgs/development/ocaml-modules/duff/default.nix b/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix
index 1c6b59961ef..1c6b59961ef 100644
--- a/pkgs/development/ocaml-modules/duff/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix
diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix
index 37c00f6b31e..37c00f6b31e 100644
--- a/pkgs/development/ocaml-modules/dum/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix
diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix
index d84c21565db..d84c21565db 100644
--- a/pkgs/development/ocaml-modules/dune-configurator/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix
diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix
index 1c3503f11a1..1c3503f11a1 100644
--- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix
diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix
index 62e63592566..62e63592566 100644
--- a/pkgs/development/ocaml-modules/dypgen/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix
diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/nixpkgs/pkgs/development/ocaml-modules/earley/default.nix
index ab3011361e1..ab3011361e1 100644
--- a/pkgs/development/ocaml-modules/earley/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/earley/default.nix
diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix
index 1a98c748e45..1a98c748e45 100644
--- a/pkgs/development/ocaml-modules/earlybird/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix
diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/nixpkgs/pkgs/development/ocaml-modules/easy-format/default.nix
index 5c1155a723b..5c1155a723b 100644
--- a/pkgs/development/ocaml-modules/easy-format/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/easy-format/default.nix
diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix
index 7c1ec79f7da..7c1ec79f7da 100644
--- a/pkgs/development/ocaml-modules/eigen/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix
diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix
index b41743f542d..b41743f542d 100644
--- a/pkgs/development/ocaml-modules/elina/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
index 9a9ea28da53..9a9ea28da53 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
diff --git a/pkgs/development/ocaml-modules/eliom/setup-hook.sh b/nixpkgs/pkgs/development/ocaml-modules/eliom/setup-hook.sh
index 9868ab93f79..9868ab93f79 100644
--- a/pkgs/development/ocaml-modules/eliom/setup-hook.sh
+++ b/nixpkgs/pkgs/development/ocaml-modules/eliom/setup-hook.sh
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix
index b69a4900f6f..b69a4900f6f 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix
diff --git a/pkgs/development/ocaml-modules/encore/default.nix b/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix
index ab91117ac08..ab91117ac08 100644
--- a/pkgs/development/ocaml-modules/encore/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix
diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix
index 4f0c182726d..4f0c182726d 100644
--- a/pkgs/development/ocaml-modules/enumerate/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix
diff --git a/pkgs/development/ocaml-modules/eqaf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix
index 966fe30197d..966fe30197d 100644
--- a/pkgs/development/ocaml-modules/eqaf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix
diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix
index 35b5c73b578..35b5c73b578 100644
--- a/pkgs/development/ocaml-modules/erm_xml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix
diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix
index a6bb75e61c2..a6bb75e61c2 100644
--- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix
diff --git a/pkgs/development/ocaml-modules/estring/default.nix b/nixpkgs/pkgs/development/ocaml-modules/estring/default.nix
index 9f04dac343c..9f04dac343c 100644
--- a/pkgs/development/ocaml-modules/estring/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/estring/default.nix
diff --git a/pkgs/development/ocaml-modules/expat/0.9.nix b/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix
index 98ab04beb57..98ab04beb57 100644
--- a/pkgs/development/ocaml-modules/expat/0.9.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix
diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix
index 6058c87e7bd..6058c87e7bd 100644
--- a/pkgs/development/ocaml-modules/expat/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix
diff --git a/pkgs/development/ocaml-modules/expat/unittest.patch b/nixpkgs/pkgs/development/ocaml-modules/expat/unittest.patch
index 489b745c503..489b745c503 100644
--- a/pkgs/development/ocaml-modules/expat/unittest.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/expat/unittest.patch
diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix
index df0bd9133d3..df0bd9133d3 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix
diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ezjsonm/default.nix
index fc1936c2b47..fc1936c2b47 100644
--- a/pkgs/development/ocaml-modules/ezjsonm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ezjsonm/default.nix
diff --git a/pkgs/development/ocaml-modules/ezxmlm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ezxmlm/default.nix
index 1740bd77fdb..1740bd77fdb 100644
--- a/pkgs/development/ocaml-modules/ezxmlm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ezxmlm/default.nix
diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/nixpkgs/pkgs/development/ocaml-modules/facile/default.nix
index 8834de53a8f..8834de53a8f 100644
--- a/pkgs/development/ocaml-modules/facile/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/facile/default.nix
diff --git a/pkgs/development/ocaml-modules/faillib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/faillib/default.nix
index 9b80433b6d1..9b80433b6d1 100644
--- a/pkgs/development/ocaml-modules/faillib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/faillib/default.nix
diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix
index 0c3eb5459cb..0c3eb5459cb 100644
--- a/pkgs/development/ocaml-modules/faraday/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix
diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix
index 96423a213a1..96423a213a1 100644
--- a/pkgs/development/ocaml-modules/farfadet/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix
diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fieldslib/default.nix
index 36c1342e61f..36c1342e61f 100644
--- a/pkgs/development/ocaml-modules/fieldslib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/fieldslib/default.nix
diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix
index 8c9aa46d9a0..8c9aa46d9a0 100644
--- a/pkgs/development/ocaml-modules/fileutils/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix
diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix
index 76cb6d08844..76cb6d08844 100644
--- a/pkgs/development/ocaml-modules/fix/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix
diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix
index d136ec092c2..d136ec092c2 100644
--- a/pkgs/development/ocaml-modules/fmt/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix
diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix
index ce17cc60ebf..ce17cc60ebf 100644
--- a/pkgs/development/ocaml-modules/fontconfig/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix
diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix
index bcd877f2be2..bcd877f2be2 100644
--- a/pkgs/development/ocaml-modules/fpath/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix
diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix
index 979c364e496..979c364e496 100644
--- a/pkgs/development/ocaml-modules/frontc/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix
diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix
index cc99b726e6e..cc99b726e6e 100644
--- a/pkgs/development/ocaml-modules/functoria/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix
diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix
index 18b5fb39776..18b5fb39776 100644
--- a/pkgs/development/ocaml-modules/functory/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix
diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index 25f5e35492b..25f5e35492b 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix
index 626e6321acf..626e6321acf 100644
--- a/pkgs/development/ocaml-modules/gen/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix
diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix
index d4c28be2f79..d4c28be2f79 100644
--- a/pkgs/development/ocaml-modules/gg/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix
diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix
index 89a1803b520..89a1803b520 100644
--- a/pkgs/development/ocaml-modules/git-http/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix
diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix
index 50e6f1d3bce..50e6f1d3bce 100644
--- a/pkgs/development/ocaml-modules/git-unix/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/nixpkgs/pkgs/development/ocaml-modules/git/default.nix
index 741e004979c..741e004979c 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/git/default.nix
diff --git a/pkgs/development/ocaml-modules/gmap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix
index 2585dfcaa96..2585dfcaa96 100644
--- a/pkgs/development/ocaml-modules/gmap/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix
diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix
index 1d5aabf3004..1d5aabf3004 100644
--- a/pkgs/development/ocaml-modules/gmetadom/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix
diff --git a/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.dpatch b/nixpkgs/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.dpatch
index d8d1d463163..d8d1d463163 100644
--- a/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.dpatch
+++ b/nixpkgs/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.dpatch
diff --git a/pkgs/development/ocaml-modules/gnuplot/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gnuplot/default.nix
index e473273b8da..e473273b8da 100644
--- a/pkgs/development/ocaml-modules/gnuplot/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gnuplot/default.nix
diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix
index c6e85da77f3..c6e85da77f3 100644
--- a/pkgs/development/ocaml-modules/graphql/cohttp.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix
diff --git a/pkgs/development/ocaml-modules/graphql/default.nix b/nixpkgs/pkgs/development/ocaml-modules/graphql/default.nix
index 22b7bf35f8e..22b7bf35f8e 100644
--- a/pkgs/development/ocaml-modules/graphql/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/graphql/default.nix
diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/graphql/lwt.nix
index 37d75f9e22e..37d75f9e22e 100644
--- a/pkgs/development/ocaml-modules/graphql/lwt.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/graphql/lwt.nix
diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/nixpkgs/pkgs/development/ocaml-modules/graphql/parser.nix
index 4172ccd8d04..4172ccd8d04 100644
--- a/pkgs/development/ocaml-modules/graphql/parser.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/graphql/parser.nix
diff --git a/pkgs/development/ocaml-modules/gtktop/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gtktop/default.nix
index 07420693005..07420693005 100644
--- a/pkgs/development/ocaml-modules/gtktop/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gtktop/default.nix
diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix
index c9a40b61437..c9a40b61437 100644
--- a/pkgs/development/ocaml-modules/herelib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix
diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/hex/default.nix
index 11e1b5dc670..11e1b5dc670 100644
--- a/pkgs/development/ocaml-modules/hex/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/hex/default.nix
diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/nixpkgs/pkgs/development/ocaml-modules/higlo/default.nix
index 93e2b3b8429..93e2b3b8429 100644
--- a/pkgs/development/ocaml-modules/higlo/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/higlo/default.nix
diff --git a/pkgs/development/ocaml-modules/higlo/install.patch b/nixpkgs/pkgs/development/ocaml-modules/higlo/install.patch
index bbdaace293b..bbdaace293b 100644
--- a/pkgs/development/ocaml-modules/higlo/install.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/higlo/install.patch
diff --git a/pkgs/development/ocaml-modules/hmap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix
index 563d39909c8..563d39909c8 100644
--- a/pkgs/development/ocaml-modules/hmap/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix
diff --git a/pkgs/development/ocaml-modules/http/default.nix b/nixpkgs/pkgs/development/ocaml-modules/http/default.nix
index 4a8b3906336..4a8b3906336 100644
--- a/pkgs/development/ocaml-modules/http/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/http/default.nix
diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix
index 42e7c1eac1b..42e7c1eac1b 100644
--- a/pkgs/development/ocaml-modules/httpaf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix
diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix
index 12b8a757e16..12b8a757e16 100644
--- a/pkgs/development/ocaml-modules/imagelib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix
diff --git a/pkgs/development/ocaml-modules/imagelib/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/imagelib/unix.nix
index 48986b15a8f..48986b15a8f 100644
--- a/pkgs/development/ocaml-modules/imagelib/unix.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/imagelib/unix.nix
diff --git a/pkgs/development/ocaml-modules/index/default.nix b/nixpkgs/pkgs/development/ocaml-modules/index/default.nix
index b1141f814a8..b1141f814a8 100644
--- a/pkgs/development/ocaml-modules/index/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/index/default.nix
diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix
index 1860e585b59..1860e585b59 100644
--- a/pkgs/development/ocaml-modules/inifiles/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix
diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix
index e2993077521..e2993077521 100644
--- a/pkgs/development/ocaml-modules/inotify/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix
diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix
index 14d6506ad13..14d6506ad13 100644
--- a/pkgs/development/ocaml-modules/integers/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix
diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix
index e0f02456962..e0f02456962 100644
--- a/pkgs/development/ocaml-modules/io-page/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix
diff --git a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix b/nixpkgs/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix
index cdc273d6ecf..cdc273d6ecf 100644
--- a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix
diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix
index be76e413c36..be76e413c36 100644
--- a/pkgs/development/ocaml-modules/ipaddr/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix
diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix
index 15f3a5613b5..15f3a5613b5 100644
--- a/pkgs/development/ocaml-modules/iri/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix
diff --git a/pkgs/development/ocaml-modules/irmin-watcher/default.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin-watcher/default.nix
index 55dc9ca866b..55dc9ca866b 100644
--- a/pkgs/development/ocaml-modules/irmin-watcher/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/irmin-watcher/default.nix
diff --git a/pkgs/development/ocaml-modules/irmin/1.4.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/1.4.nix
index 878160f4b0a..878160f4b0a 100644
--- a/pkgs/development/ocaml-modules/irmin/1.4.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/1.4.nix
diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix
index 2db57671177..2db57671177 100644
--- a/pkgs/development/ocaml-modules/irmin/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix
diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix
index b1987aa7cbc..b1987aa7cbc 100644
--- a/pkgs/development/ocaml-modules/irmin/fs.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix
diff --git a/pkgs/development/ocaml-modules/irmin/git.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix
index bb28042a1f6..bb28042a1f6 100644
--- a/pkgs/development/ocaml-modules/irmin/git.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix
diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix
index abcdc3d58dd..abcdc3d58dd 100644
--- a/pkgs/development/ocaml-modules/irmin/graphql.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix
diff --git a/pkgs/development/ocaml-modules/irmin/http.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix
index c8db6d563c9..c8db6d563c9 100644
--- a/pkgs/development/ocaml-modules/irmin/http.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix
diff --git a/pkgs/development/ocaml-modules/irmin/mem.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix
index b7040b9db0d..b7040b9db0d 100644
--- a/pkgs/development/ocaml-modules/irmin/mem.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix
diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix
index 4eacc719cec..4eacc719cec 100644
--- a/pkgs/development/ocaml-modules/irmin/pack.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix
diff --git a/pkgs/development/ocaml-modules/irmin/test.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix
index 57e33e2db8a..57e33e2db8a 100644
--- a/pkgs/development/ocaml-modules/irmin/test.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix
diff --git a/pkgs/development/ocaml-modules/irmin/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix
index 5793678bfcf..5793678bfcf 100644
--- a/pkgs/development/ocaml-modules/irmin/unix.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix
diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix
index 96f0205aa79..96f0205aa79 100644
--- a/pkgs/development/ocaml-modules/iso8601/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix
diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix
index 964a7c6f5a3..964a7c6f5a3 100644
--- a/pkgs/development/ocaml-modules/iter/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix
index 4585a3b8596..4585a3b8596 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.12.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-extra.nix
index ff923bbd467..ff923bbd467 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-extra.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
index 49f38136c4f..49f38136c4f 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
index 83a7e13a5d0..83a7e13a5d0 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-unix.nix
index 0d0f26134f2..0d0f26134f2 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-unix.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-unix.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async.nix
index fe01e47426d..fe01e47426d 100644
--- a/pkgs/development/ocaml-modules/janestreet/async.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
index e8f42ef71d1..e8f42ef71d1 100644
--- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
index c47fcd2fea6..c47fcd2fea6 100644
--- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
index fdb0d8034e6..fdb0d8034e6 100644
--- a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix
index c7c69beedb7..c7c69beedb7 100644
--- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core.nix
index f6a7ba5b0db..f6a7ba5b0db 100644
--- a/pkgs/development/ocaml-modules/janestreet/core.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_bench.nix
index b279318dd93..b279318dd93 100644
--- a/pkgs/development/ocaml-modules/janestreet/core_bench.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_bench.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
index 53e92a95c23..53e92a95c23 100644
--- a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix
index a8fff893d5c..a8fff893d5c 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
index 8ce1ca6c505..8ce1ca6c505 100644
--- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix
index b3ffecb38ce..b3ffecb38ce 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
index 5b7d9c3210d..5b7d9c3210d 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch b/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch
index 8878b4be68b..8878b4be68b 100644
--- a/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch
diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
index f77b793bcaa..f77b793bcaa 100644
--- a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/old.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/old.nix
index 447a9cdf71f..447a9cdf71f 100644
--- a/pkgs/development/ocaml-modules/janestreet/old.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/old.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
index 3ed7106e7b6..3ed7106e7b6 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
index 9e5df431e04..9e5df431e04 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
index d7f333d4cf4..d7f333d4cf4 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
index 0bfdd7bd540..0bfdd7bd540 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-core.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-core.nix
index c5789ee9cfb..c5789ee9cfb 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-core.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-core.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
index c652afa5fbf..c652afa5fbf 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix
index b4fb9ec7602..b4fb9ec7602 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
index 2fdfede0f23..2fdfede0f23 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
index f78f93ee120..f78f93ee120 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix
index 4f55a6c4eac..4f55a6c4eac 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
index 551738573b3..551738573b3 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
index ea3ac5e8e5a..ea3ac5e8e5a 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
index d0e4c84158c..d0e4c84158c 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
index 1086059b19f..1086059b19f 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
index 8c8b87d7112..8c8b87d7112 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
index 61fa66b77cc..61fa66b77cc 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
index 209638f97b7..209638f97b7 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
index 00361ee81eb..00361ee81eb 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
index 2a8bf44bfab..2a8bf44bfab 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
index 64fbe4bd9bb..64fbe4bd9bb 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix
index bf36dfab5cb..bf36dfab5cb 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
index 472ec19b558..472ec19b558 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
index 1d01b0bc321..1d01b0bc321 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/re2.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/re2.nix
index 9153d336b22..9153d336b22 100644
--- a/pkgs/development/ocaml-modules/janestreet/re2.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/re2.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexplib.nix
index f4a86f80b04..f4a86f80b04 100644
--- a/pkgs/development/ocaml-modules/janestreet/sexplib.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexplib.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/textutils.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/textutils.nix
index 6b3dba5aac8..6b3dba5aac8 100644
--- a/pkgs/development/ocaml-modules/janestreet/textutils.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/textutils.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/typerep.nix
index 2e8fcde1d0d..2e8fcde1d0d 100644
--- a/pkgs/development/ocaml-modules/janestreet/typerep.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/typerep.nix
diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix
index 7b3af8a080e..7b3af8a080e 100644
--- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix
diff --git a/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch b/nixpkgs/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch
index c06144a75c0..c06144a75c0 100644
--- a/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch
diff --git a/pkgs/development/ocaml-modules/javalib/configure.sh.patch b/nixpkgs/pkgs/development/ocaml-modules/javalib/configure.sh.patch
index 67e019b277a..67e019b277a 100644
--- a/pkgs/development/ocaml-modules/javalib/configure.sh.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/javalib/configure.sh.patch
diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix
index c7586ad23e4..c7586ad23e4 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix
diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix
index 30aea547cbd..30aea547cbd 100644
--- a/pkgs/development/ocaml-modules/jingoo/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix
diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix
index d1f5cabb32d..d1f5cabb32d 100644
--- a/pkgs/development/ocaml-modules/jsonm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix
diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix
index 4eeb8d975fd..4eeb8d975fd 100644
--- a/pkgs/development/ocaml-modules/kafka/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix
diff --git a/pkgs/development/ocaml-modules/ke/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix
index e1b68a1d2da..e1b68a1d2da 100644
--- a/pkgs/development/ocaml-modules/ke/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix
diff --git a/pkgs/development/ocaml-modules/lablgl/META.patch b/nixpkgs/pkgs/development/ocaml-modules/lablgl/META.patch
index bf5b2184ac0..bf5b2184ac0 100644
--- a/pkgs/development/ocaml-modules/lablgl/META.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgl/META.patch
diff --git a/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch b/nixpkgs/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch
index 3d880c00947..3d880c00947 100644
--- a/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch
diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix
index 847322b1a10..847322b1a10 100644
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix
diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix
index dae81f1df16..dae81f1df16 100644
--- a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix
diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
index 9e6013b9083..9e6013b9083 100644
--- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
index e2ebb76397c..e2ebb76397c 100644
--- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix
index 46b76abd268..46b76abd268 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix
diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix
index d49208ede60..d49208ede60 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix
diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
index be57c7e7146..be57c7e7146 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
index 0e8ba3ef3ff..0e8ba3ef3ff 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtkmathview/default.nix
index b5bcb0de1ee..b5bcb0de1ee 100644
--- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtkmathview/default.nix
diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix
index 0677202fab9..0677202fab9 100644
--- a/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix
diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix
index 4b35ce25fde..4b35ce25fde 100644
--- a/pkgs/development/ocaml-modules/lacaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix
index 1b5594d5565..1b5594d5565 100644
--- a/pkgs/development/ocaml-modules/lambda-term/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix
diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix
index b4980240c90..b4980240c90 100644
--- a/pkgs/development/ocaml-modules/lambdasoup/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix
diff --git a/pkgs/development/ocaml-modules/lens/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix
index 27a753ae81a..27a753ae81a 100644
--- a/pkgs/development/ocaml-modules/lens/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix
diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix
index b6b9b4163ff..b6b9b4163ff 100644
--- a/pkgs/development/ocaml-modules/linenoise/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix
diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix
index b74501fdd68..b74501fdd68 100644
--- a/pkgs/development/ocaml-modules/llvm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix
diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix
index 50d68520fab..50d68520fab 100644
--- a/pkgs/development/ocaml-modules/logs/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix
diff --git a/pkgs/development/ocaml-modules/lru/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix
index e5c7937b27a..e5c7937b27a 100644
--- a/pkgs/development/ocaml-modules/lru/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix
diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix
index a0db995827a..a0db995827a 100644
--- a/pkgs/development/ocaml-modules/lua-ml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix
diff --git a/pkgs/development/ocaml-modules/lwt/4.x.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/4.x.nix
index 3ec3574ea09..3ec3574ea09 100644
--- a/pkgs/development/ocaml-modules/lwt/4.x.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/4.x.nix
diff --git a/pkgs/development/ocaml-modules/lwt/camlp4.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/camlp4.nix
index fbf920d9621..fbf920d9621 100644
--- a/pkgs/development/ocaml-modules/lwt/camlp4.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/camlp4.nix
diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/legacy.nix
index c540124d104..c540124d104 100644
--- a/pkgs/development/ocaml-modules/lwt/legacy.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/legacy.nix
diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix
index 3cf4541aa01..3cf4541aa01 100644
--- a/pkgs/development/ocaml-modules/lwt/ppx.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix
diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix
index 8286ee16619..8286ee16619 100644
--- a/pkgs/development/ocaml-modules/lwt_log/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix
diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt_react/default.nix
index 41276668ecc..41276668ecc 100644
--- a/pkgs/development/ocaml-modules/lwt_react/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt_react/default.nix
diff --git a/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix
index 49c2b7de398..49c2b7de398 100644
--- a/pkgs/development/ocaml-modules/lwt_ssl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix
diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix
index 7061fdf5d5b..7061fdf5d5b 100644
--- a/pkgs/development/ocaml-modules/macaddr/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix
diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix
index 3d015e26275..3d015e26275 100644
--- a/pkgs/development/ocaml-modules/macaque/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix
diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix
index 16e37addd45..16e37addd45 100644
--- a/pkgs/development/ocaml-modules/magic-mime/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix
diff --git a/pkgs/development/ocaml-modules/magick/default.nix b/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix
index ca6ab458fff..ca6ab458fff 100644
--- a/pkgs/development/ocaml-modules/magick/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix
diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix
index 2c5c674425b..2c5c674425b 100644
--- a/pkgs/development/ocaml-modules/markup/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix
diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix
index 43c6c8e41fa..43c6c8e41fa 100644
--- a/pkgs/development/ocaml-modules/mdx/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix
diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/nixpkgs/pkgs/development/ocaml-modules/menhir/default.nix
index 23e31e75779..23e31e75779 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/menhir/default.nix
diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix
index fad11ccedaa..fad11ccedaa 100644
--- a/pkgs/development/ocaml-modules/menhir/generic.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix
diff --git a/pkgs/development/ocaml-modules/merlin-extend/default.nix b/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix
index ad3b1337977..ad3b1337977 100644
--- a/pkgs/development/ocaml-modules/merlin-extend/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix
diff --git a/pkgs/development/ocaml-modules/metrics/default.nix b/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix
index 893b667f836..893b667f836 100644
--- a/pkgs/development/ocaml-modules/metrics/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix
diff --git a/pkgs/development/ocaml-modules/metrics/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix
index 47b91e430c6..47b91e430c6 100644
--- a/pkgs/development/ocaml-modules/metrics/lwt.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix
diff --git a/pkgs/development/ocaml-modules/metrics/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix
index 45a92f10803..45a92f10803 100644
--- a/pkgs/development/ocaml-modules/metrics/unix.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix
diff --git a/pkgs/development/ocaml-modules/minisat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/minisat/default.nix
index 79820b16e6c..79820b16e6c 100644
--- a/pkgs/development/ocaml-modules/minisat/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/minisat/default.nix
diff --git a/pkgs/development/ocaml-modules/mlgmp/META b/nixpkgs/pkgs/development/ocaml-modules/mlgmp/META
index e132e179b33..e132e179b33 100644
--- a/pkgs/development/ocaml-modules/mlgmp/META
+++ b/nixpkgs/pkgs/development/ocaml-modules/mlgmp/META
diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix
index 20455cc6016..20455cc6016 100644
--- a/pkgs/development/ocaml-modules/mlgmp/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix
diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix
index 2733ad2b0fb..2733ad2b0fb 100644
--- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix
diff --git a/pkgs/development/ocaml-modules/mmap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mmap/default.nix
index 8ae1f4a9d47..8ae1f4a9d47 100644
--- a/pkgs/development/ocaml-modules/mmap/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mmap/default.nix
diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mparser/default.nix
index 0e4d593482b..0e4d593482b 100644
--- a/pkgs/development/ocaml-modules/mparser/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mparser/default.nix
diff --git a/pkgs/development/ocaml-modules/mstruct/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mstruct/default.nix
index ae26f879ef8..ae26f879ef8 100644
--- a/pkgs/development/ocaml-modules/mstruct/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mstruct/default.nix
diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix
index 02d6380715b..02d6380715b 100644
--- a/pkgs/development/ocaml-modules/mtime/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix
diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix
index 9be5ebf8a7b..9be5ebf8a7b 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix
diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix
index 833da3bb67c..833da3bb67c 100644
--- a/pkgs/development/ocaml-modules/nocrypto/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix
diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix
index f273f28a71e..f273f28a71e 100644
--- a/pkgs/development/ocaml-modules/notty/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix
diff --git a/pkgs/development/ocaml-modules/num/default.nix b/nixpkgs/pkgs/development/ocaml-modules/num/default.nix
index 022b7af9629..022b7af9629 100644
--- a/pkgs/development/ocaml-modules/num/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/num/default.nix
diff --git a/pkgs/development/ocaml-modules/num/enable-static.patch b/nixpkgs/pkgs/development/ocaml-modules/num/enable-static.patch
index be3ca197f4e..be3ca197f4e 100644
--- a/pkgs/development/ocaml-modules/num/enable-static.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/num/enable-static.patch
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/META.patch b/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/META.patch
index ba6e5927b00..ba6e5927b00 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/META.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/META.patch
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index da68c811df1..da68c811df1 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
index 014525ef2b4..014525ef2b4 100644
--- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index 11405c0ebe5..11405c0ebe5 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
index f633d17252c..f633d17252c 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
diff --git a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
index 0420e95b12b..0420e95b12b 100644
--- a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
diff --git a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix
index 1ef7b6c2d40..1ef7b6c2d40 100644
--- a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix
diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix
index f6dee5ce3ce..f6dee5ce3ce 100644
--- a/pkgs/development/ocaml-modules/ocaml-result/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix
diff --git a/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
index 12f1440118a..12f1440118a 100644
--- a/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-text/default.nix
index e210ffa1152..e210ffa1152 100644
--- a/pkgs/development/ocaml-modules/ocaml-text/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-text/default.nix
diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix
index 45761e98049..45761e98049 100644
--- a/pkgs/development/ocaml-modules/ocaml-version/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix
diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index 27442075064..27442075064 100644
--- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index a39e72d3880..a39e72d3880 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch b/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch
index 38fca1c491f..38fca1c491f 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch
diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix
index 8063f284728..8063f284728 100644
--- a/pkgs/development/ocaml-modules/ocamlmake/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix
diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
index 6d950437016..6d950437016 100644
--- a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix
index d6281e00fde..d6281e00fde 100644
--- a/pkgs/development/ocaml-modules/ocamlnat/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix
index fe276ac6e94..fe276ac6e94 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix
diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix
index 8cfe43a5d32..8cfe43a5d32 100644
--- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix
diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix
index 29fa20d460d..29fa20d460d 100644
--- a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix
diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch b/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch
index d86b3f8da9f..d86b3f8da9f 100644
--- a/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch
diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocf/default.nix
index 0452b1b7dfe..0452b1b7dfe 100644
--- a/pkgs/development/ocaml-modules/ocf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocf/default.nix
diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
index 6410eb29628..6410eb29628 100644
--- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-endian/default.nix
index 084d70a8e79..084d70a8e79 100644
--- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocplib-endian/default.nix
diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
index af3341e7e59..af3341e7e59 100644
--- a/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix
index 350c31a3819..350c31a3819 100644
--- a/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix
diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
index 6a1b906d7f2..6a1b906d7f2 100644
--- a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
index 50c63ef718a..50c63ef718a 100644
--- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
index 0263d3284ff..0263d3284ff 100644
--- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 9b0b8c433c2..9b0b8c433c2 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix
diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index a8eea5b0c07..a8eea5b0c07 100644
--- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix
diff --git a/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch
index 38365a26b99..38365a26b99 100644
--- a/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch
diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
index 6c9e72f95d7..6c9e72f95d7 100644
--- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/nixpkgs/pkgs/development/ocaml-modules/octavius/default.nix
index 72e22e5722d..72e22e5722d 100644
--- a/pkgs/development/ocaml-modules/octavius/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/octavius/default.nix
diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix
index a1e524a8642..a1e524a8642 100644
--- a/pkgs/development/ocaml-modules/ocurl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix
diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix
index 62644c1e971..62644c1e971 100644
--- a/pkgs/development/ocaml-modules/odn/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix
diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix
index 75a2dab970e..75a2dab970e 100644
--- a/pkgs/development/ocaml-modules/odoc/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix
diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix
index 874893d6297..874893d6297 100644
--- a/pkgs/development/ocaml-modules/omd/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix
diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix
index 0ca332a2a06..0ca332a2a06 100644
--- a/pkgs/development/ocaml-modules/opam-file-format/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix
diff --git a/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch b/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch
index 5501fdd0c6c..5501fdd0c6c 100644
--- a/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch
diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix
index cbd3a14541f..cbd3a14541f 100644
--- a/pkgs/development/ocaml-modules/opium/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix
diff --git a/pkgs/development/ocaml-modules/opium_kernel/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opium_kernel/default.nix
index 8388e108fef..8388e108fef 100644
--- a/pkgs/development/ocaml-modules/opium_kernel/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/opium_kernel/default.nix
diff --git a/pkgs/development/ocaml-modules/optcomp/META b/nixpkgs/pkgs/development/ocaml-modules/optcomp/META
index 8a942288f75..8a942288f75 100644
--- a/pkgs/development/ocaml-modules/optcomp/META
+++ b/nixpkgs/pkgs/development/ocaml-modules/optcomp/META
diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/optcomp/default.nix
index 5b566137747..5b566137747 100644
--- a/pkgs/development/ocaml-modules/optcomp/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/optcomp/default.nix
diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opti/default.nix
index f6552d57683..f6552d57683 100644
--- a/pkgs/development/ocaml-modules/opti/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/opti/default.nix
diff --git a/pkgs/development/ocaml-modules/optint/default.nix b/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix
index 508bbfba605..508bbfba605 100644
--- a/pkgs/development/ocaml-modules/optint/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix
diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix
index 8d5bf290c6e..8d5bf290c6e 100644
--- a/pkgs/development/ocaml-modules/otfm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix
diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/nixpkgs/pkgs/development/ocaml-modules/otr/default.nix
index ba192b3c24b..ba192b3c24b 100644
--- a/pkgs/development/ocaml-modules/otr/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/otr/default.nix
diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix
index 6f4536f2e8b..6f4536f2e8b 100644
--- a/pkgs/development/ocaml-modules/ounit/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix
diff --git a/pkgs/development/ocaml-modules/owee/default.nix b/nixpkgs/pkgs/development/ocaml-modules/owee/default.nix
index 9eb81003d47..9eb81003d47 100644
--- a/pkgs/development/ocaml-modules/owee/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/owee/default.nix
diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix
index 12cd5436308..12cd5436308 100644
--- a/pkgs/development/ocaml-modules/owl-base/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix
diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix
index 0cc1c1db42a..0cc1c1db42a 100644
--- a/pkgs/development/ocaml-modules/owl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix
diff --git a/pkgs/development/ocaml-modules/pa_bench/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pa_bench/default.nix
index 2b821cd6dd6..2b821cd6dd6 100644
--- a/pkgs/development/ocaml-modules/pa_bench/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pa_bench/default.nix
diff --git a/pkgs/development/ocaml-modules/pa_ounit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pa_ounit/default.nix
index 2471c855cf5..2471c855cf5 100644
--- a/pkgs/development/ocaml-modules/pa_ounit/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pa_ounit/default.nix
diff --git a/pkgs/development/ocaml-modules/pa_test/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pa_test/default.nix
index 5acf931b2ea..5acf931b2ea 100644
--- a/pkgs/development/ocaml-modules/pa_test/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pa_test/default.nix
diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix
index 0a4fc9ecea4..0a4fc9ecea4 100644
--- a/pkgs/development/ocaml-modules/parany/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix
diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix
index 7559fc35d8e..7559fc35d8e 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix
diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix
index 8896675f63c..8896675f63c 100644
--- a/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix
diff --git a/pkgs/development/ocaml-modules/pgsolver/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pgsolver/default.nix
index 5045cb6a0ee..5045cb6a0ee 100644
--- a/pkgs/development/ocaml-modules/pgsolver/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pgsolver/default.nix
diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix
index e665a323578..e665a323578 100644
--- a/pkgs/development/ocaml-modules/phylogenetics/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix
diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix
index 1ab1c5fa7bc..1ab1c5fa7bc 100644
--- a/pkgs/development/ocaml-modules/pipebang/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index 83d47fbb3af..83d47fbb3af 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix
index fb06820f196..fb06820f196 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix
diff --git a/pkgs/development/ocaml-modules/piqi/no-ocamlpath-override.patch b/nixpkgs/pkgs/development/ocaml-modules/piqi/no-ocamlpath-override.patch
index bf85a42551c..bf85a42551c 100644
--- a/pkgs/development/ocaml-modules/piqi/no-ocamlpath-override.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/piqi/no-ocamlpath-override.patch
diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix
index d618f90e541..d618f90e541 100644
--- a/pkgs/development/ocaml-modules/pprint/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix
diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix
index 3b72853e782..3b72853e782 100644
--- a/pkgs/development/ocaml-modules/ppx_blob/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix
diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix
index 20b78870f93..20b78870f93 100644
--- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix
diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix
index d45298972cc..d45298972cc 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix
index 4af711ce395..4af711ce395 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
index 92d73e540f4..92d73e540f4 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index d8a8f22ae70..d8a8f22ae70 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
index b09ff9c7f22..b09ff9c7f22 100644
--- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix
index bdcc6568ffe..bdcc6568ffe 100644
--- a/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix
diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 984906342bc..984906342bc 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix
diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
index 03cadad7ff4..03cadad7ff4 100644
--- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
diff --git a/pkgs/development/ocaml-modules/ppxfind/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix
index 75d1e57765e..75d1e57765e 100644
--- a/pkgs/development/ocaml-modules/ppxfind/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix
index 644e1c98c48..644e1c98c48 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix
diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix
index 555ccef3495..555ccef3495 100644
--- a/pkgs/development/ocaml-modules/printbox/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix
diff --git a/pkgs/development/ocaml-modules/process/default.nix b/nixpkgs/pkgs/development/ocaml-modules/process/default.nix
index 92fb1837803..92fb1837803 100644
--- a/pkgs/development/ocaml-modules/process/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/process/default.nix
diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
index 485620514e4..485620514e4 100644
--- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
diff --git a/pkgs/development/ocaml-modules/psq/default.nix b/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix
index ff9c52c50a7..ff9c52c50a7 100644
--- a/pkgs/development/ocaml-modules/psq/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix
diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix
index de3d940b3bb..de3d940b3bb 100644
--- a/pkgs/development/ocaml-modules/ptime/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix
diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix
index d6637d23052..d6637d23052 100644
--- a/pkgs/development/ocaml-modules/ptmap/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix
diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix
index 46453f30d3b..46453f30d3b 100644
--- a/pkgs/development/ocaml-modules/pycaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix
diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix
index dfe7ec84d63..dfe7ec84d63 100644
--- a/pkgs/development/ocaml-modules/qcheck/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix
diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix
index ecc1a89a804..ecc1a89a804 100644
--- a/pkgs/development/ocaml-modules/qtest/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix
diff --git a/pkgs/development/ocaml-modules/re/default.nix b/nixpkgs/pkgs/development/ocaml-modules/re/default.nix
index 29fb4fd09b2..29fb4fd09b2 100644
--- a/pkgs/development/ocaml-modules/re/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/re/default.nix
diff --git a/pkgs/development/ocaml-modules/re2/Makefile.patch b/nixpkgs/pkgs/development/ocaml-modules/re2/Makefile.patch
index fcb6eefe62b..fcb6eefe62b 100644
--- a/pkgs/development/ocaml-modules/re2/Makefile.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/re2/Makefile.patch
diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/nixpkgs/pkgs/development/ocaml-modules/re2/default.nix
index 2b7d9855665..2b7d9855665 100644
--- a/pkgs/development/ocaml-modules/re2/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/re2/default.nix
diff --git a/pkgs/development/ocaml-modules/re2/myocamlbuild.patch b/nixpkgs/pkgs/development/ocaml-modules/re2/myocamlbuild.patch
index 46ad6fa801b..46ad6fa801b 100644
--- a/pkgs/development/ocaml-modules/re2/myocamlbuild.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/re2/myocamlbuild.patch
diff --git a/pkgs/development/ocaml-modules/react/default.nix b/nixpkgs/pkgs/development/ocaml-modules/react/default.nix
index 7baf8b743be..7baf8b743be 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/react/default.nix
diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix
index 05bfe2c0934..05bfe2c0934 100644
--- a/pkgs/development/ocaml-modules/reactivedata/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix
diff --git a/pkgs/development/ocaml-modules/resource-pooling/default.nix b/nixpkgs/pkgs/development/ocaml-modules/resource-pooling/default.nix
index 9a053d4e9a2..9a053d4e9a2 100644
--- a/pkgs/development/ocaml-modules/resource-pooling/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/resource-pooling/default.nix
diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix
index 0223d4f59ff..0223d4f59ff 100644
--- a/pkgs/development/ocaml-modules/rope/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix
diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix
index a4134f592b3..a4134f592b3 100644
--- a/pkgs/development/ocaml-modules/rpclib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix
diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix
index 579d3da81e3..579d3da81e3 100644
--- a/pkgs/development/ocaml-modules/rresult/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix
diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/nixpkgs/pkgs/development/ocaml-modules/safepass/default.nix
index 214789e52b4..214789e52b4 100644
--- a/pkgs/development/ocaml-modules/safepass/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/safepass/default.nix
diff --git a/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch b/nixpkgs/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch
index 4f2cc99e76b..4f2cc99e76b 100644
--- a/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch
diff --git a/pkgs/development/ocaml-modules/sawja/configure.sh.patch b/nixpkgs/pkgs/development/ocaml-modules/sawja/configure.sh.patch
index 8165de242f5..8165de242f5 100644
--- a/pkgs/development/ocaml-modules/sawja/configure.sh.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/sawja/configure.sh.patch
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix
index d0dba6c2cee..d0dba6c2cee 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix
diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix
index 64f05b26dd8..64f05b26dd8 100644
--- a/pkgs/development/ocaml-modules/secp256k1/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix
diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/nixpkgs/pkgs/development/ocaml-modules/sedlex/2.nix
index 09390a27343..09390a27343 100644
--- a/pkgs/development/ocaml-modules/sedlex/2.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sedlex/2.nix
diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix
index 653f4532585..653f4532585 100644
--- a/pkgs/development/ocaml-modules/sedlex/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix
diff --git a/pkgs/development/ocaml-modules/seq/default.nix b/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix
index 7a50d1517db..7a50d1517db 100644
--- a/pkgs/development/ocaml-modules/seq/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix
diff --git a/pkgs/development/ocaml-modules/seq/src-base/META b/nixpkgs/pkgs/development/ocaml-modules/seq/src-base/META
index 06b95eff3f8..06b95eff3f8 100644
--- a/pkgs/development/ocaml-modules/seq/src-base/META
+++ b/nixpkgs/pkgs/development/ocaml-modules/seq/src-base/META
diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/nixpkgs/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
index 685f2afb0b4..685f2afb0b4 100644
--- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/nixpkgs/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
index e98a2ecdb30..e98a2ecdb30 100644
--- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/nixpkgs/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
index 24cdb497189..24cdb497189 100644
--- a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix
index 8c8895d4520..8c8895d4520 100644
--- a/pkgs/development/ocaml-modules/sodium/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix
diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix
index 6b1b45cb2fb..6b1b45cb2fb 100644
--- a/pkgs/development/ocaml-modules/spacetime_lib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix
diff --git a/pkgs/development/ocaml-modules/spelll/default.nix b/nixpkgs/pkgs/development/ocaml-modules/spelll/default.nix
index 5901dcb896a..5901dcb896a 100644
--- a/pkgs/development/ocaml-modules/spelll/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/spelll/default.nix
diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/default.nix
index df6b6f0854d..df6b6f0854d 100644
--- a/pkgs/development/ocaml-modules/sqlexpr/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/default.nix
diff --git a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
index 7cc455b0195..7cc455b0195 100644
--- a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix
index f47d7d37631..f47d7d37631 100644
--- a/pkgs/development/ocaml-modules/sqlite3/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix
diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
index e8f248ee4a1..e8f248ee4a1 100644
--- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix
index 3086558e3eb..3086558e3eb 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix
diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix
index bffef61956e..bffef61956e 100644
--- a/pkgs/development/ocaml-modules/stdint/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix
diff --git a/pkgs/development/ocaml-modules/stdlib-shims/default.nix b/nixpkgs/pkgs/development/ocaml-modules/stdlib-shims/default.nix
index d76ec29e63a..d76ec29e63a 100644
--- a/pkgs/development/ocaml-modules/stdlib-shims/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/stdlib-shims/default.nix
diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix
index c932bc3a46a..c932bc3a46a 100644
--- a/pkgs/development/ocaml-modules/stringext/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix
diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix
index 117277fe1b6..117277fe1b6 100644
--- a/pkgs/development/ocaml-modules/syslog/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix
diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tcslib/default.nix
index 9d1d5a8096c..9d1d5a8096c 100644
--- a/pkgs/development/ocaml-modules/tcslib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/tcslib/default.nix
diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/nixpkgs/pkgs/development/ocaml-modules/textutils/default.nix
index 6f35b970228..6f35b970228 100644
--- a/pkgs/development/ocaml-modules/textutils/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/textutils/default.nix
diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix
index 80d9933f8b6..80d9933f8b6 100644
--- a/pkgs/development/ocaml-modules/tls/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix
diff --git a/pkgs/development/ocaml-modules/toml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix
index 0e25d9bc6b6..0e25d9bc6b6 100644
--- a/pkgs/development/ocaml-modules/toml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix
diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix
index edbbec3dcb3..edbbec3dcb3 100644
--- a/pkgs/development/ocaml-modules/topkg/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix
diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix
index 1bac71d301f..1bac71d301f 100644
--- a/pkgs/development/ocaml-modules/tsdl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix
diff --git a/pkgs/development/ocaml-modules/tuntap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix
index 3a3e90c9d0f..3a3e90c9d0f 100644
--- a/pkgs/development/ocaml-modules/tuntap/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix
diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix
index 940f6cf5107..940f6cf5107 100644
--- a/pkgs/development/ocaml-modules/twt/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix
diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
index f2e272ed395..f2e272ed395 100644
--- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
index 706554bc027..706554bc027 100644
--- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
index f6c1ec9ad06..f6c1ec9ad06 100644
--- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
diff --git a/pkgs/development/ocaml-modules/typerep/default.nix b/nixpkgs/pkgs/development/ocaml-modules/typerep/default.nix
index 9500579e245..9500579e245 100644
--- a/pkgs/development/ocaml-modules/typerep/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/typerep/default.nix
diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix
index 94bcdb45f32..94bcdb45f32 100644
--- a/pkgs/development/ocaml-modules/tyxml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix
diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix
index b5b2170e56a..b5b2170e56a 100644
--- a/pkgs/development/ocaml-modules/uchar/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix
diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix
index d32fcf07b6c..d32fcf07b6c 100644
--- a/pkgs/development/ocaml-modules/ulex/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix
diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix
index e17e99cdc67..e17e99cdc67 100644
--- a/pkgs/development/ocaml-modules/uri/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix
diff --git a/pkgs/development/ocaml-modules/uri/legacy.nix b/nixpkgs/pkgs/development/ocaml-modules/uri/legacy.nix
index f08ee7fc2fc..f08ee7fc2fc 100644
--- a/pkgs/development/ocaml-modules/uri/legacy.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uri/legacy.nix
diff --git a/pkgs/development/ocaml-modules/uri/sexp.nix b/nixpkgs/pkgs/development/ocaml-modules/uri/sexp.nix
index c6f979e5a3e..c6f979e5a3e 100644
--- a/pkgs/development/ocaml-modules/uri/sexp.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uri/sexp.nix
diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix
index 097676e8abb..097676e8abb 100644
--- a/pkgs/development/ocaml-modules/uucd/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix
diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix
index d657a6f0205..d657a6f0205 100644
--- a/pkgs/development/ocaml-modules/uucp/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix
diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix
index 497b2df88b1..497b2df88b1 100644
--- a/pkgs/development/ocaml-modules/uuidm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix
diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix
index c8eb8ea532c..c8eb8ea532c 100644
--- a/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix
diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix
index 8fb9d207576..8fb9d207576 100644
--- a/pkgs/development/ocaml-modules/uuseg/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix
diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix
index f289781b422..f289781b422 100644
--- a/pkgs/development/ocaml-modules/uutf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix
diff --git a/pkgs/development/ocaml-modules/variantslib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/variantslib/default.nix
index 425383a6485..425383a6485 100644
--- a/pkgs/development/ocaml-modules/variantslib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/variantslib/default.nix
diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix
index 0a127e49fdc..0a127e49fdc 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix
diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix
index 36205c7c1ff..36205c7c1ff 100644
--- a/pkgs/development/ocaml-modules/visitors/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix
diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix
index e10a67a50a0..e10a67a50a0 100644
--- a/pkgs/development/ocaml-modules/wasm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix
diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix
index 79e36b66d11..79e36b66d11 100644
--- a/pkgs/development/ocaml-modules/webmachine/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix
diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix
index 420cb30bb94..420cb30bb94 100644
--- a/pkgs/development/ocaml-modules/wtf8/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix
diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix
index 63ddc6e67bd..63ddc6e67bd 100644
--- a/pkgs/development/ocaml-modules/x509/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix
diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix
index 83e4451e668..83e4451e668 100644
--- a/pkgs/development/ocaml-modules/xml-light/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix
diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix
index bb05b89d7be..bb05b89d7be 100644
--- a/pkgs/development/ocaml-modules/xmlm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix
diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix
index 2c4cf4928db..2c4cf4928db 100644
--- a/pkgs/development/ocaml-modules/xtmpl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix
diff --git a/pkgs/development/ocaml-modules/xtmpl/jsoo.patch b/nixpkgs/pkgs/development/ocaml-modules/xtmpl/jsoo.patch
index 7546dbca924..7546dbca924 100644
--- a/pkgs/development/ocaml-modules/xtmpl/jsoo.patch
+++ b/nixpkgs/pkgs/development/ocaml-modules/xtmpl/jsoo.patch
diff --git a/pkgs/development/ocaml-modules/yaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix
index 31790755357..31790755357 100644
--- a/pkgs/development/ocaml-modules/yaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix
diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix
index dca97a53cbf..dca97a53cbf 100644
--- a/pkgs/development/ocaml-modules/yojson/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix
diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix
index f0cb5a59485..f0cb5a59485 100644
--- a/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix
diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix
index 9fa42e68c56..9fa42e68c56 100644
--- a/pkgs/development/ocaml-modules/zed/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix
diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix
index d454d244959..d454d244959 100644
--- a/pkgs/development/ocaml-modules/zmq/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix
diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix
index f8fc06791b1..f8fc06791b1 100644
--- a/pkgs/development/ocaml-modules/zmq/lwt.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix
diff --git a/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch b/nixpkgs/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch
index af7dc0db7e5..af7dc0db7e5 100644
--- a/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch
+++ b/nixpkgs/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch
diff --git a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch b/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch
index 5aafa461d94..5aafa461d94 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch
+++ b/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch
diff --git a/pkgs/development/perl-modules/Device-OUI-1.04-hash.patch b/nixpkgs/pkgs/development/perl-modules/Device-OUI-1.04-hash.patch
index 6133ab67475..6133ab67475 100644
--- a/pkgs/development/perl-modules/Device-OUI-1.04-hash.patch
+++ b/nixpkgs/pkgs/development/perl-modules/Device-OUI-1.04-hash.patch
diff --git a/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch b/nixpkgs/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch
index 6b634d0d242..6b634d0d242 100644
--- a/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch
+++ b/nixpkgs/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch
diff --git a/pkgs/development/perl-modules/MNI/default.nix b/nixpkgs/pkgs/development/perl-modules/MNI/default.nix
index 7057883e637..7057883e637 100644
--- a/pkgs/development/perl-modules/MNI/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/MNI/default.nix
diff --git a/pkgs/development/perl-modules/MNI/no-stdin.patch b/nixpkgs/pkgs/development/perl-modules/MNI/no-stdin.patch
index 1e9e791257e..1e9e791257e 100644
--- a/pkgs/development/perl-modules/MNI/no-stdin.patch
+++ b/nixpkgs/pkgs/development/perl-modules/MNI/no-stdin.patch
diff --git a/pkgs/development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch b/nixpkgs/pkgs/development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch
index 161f79a637b..161f79a637b 100644
--- a/pkgs/development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch
+++ b/nixpkgs/pkgs/development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch
diff --git a/pkgs/development/perl-modules/Mozilla-LDAP/default.nix b/nixpkgs/pkgs/development/perl-modules/Mozilla-LDAP/default.nix
index 6c3d01a3462..6c3d01a3462 100644
--- a/pkgs/development/perl-modules/Mozilla-LDAP/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/Mozilla-LDAP/default.nix
diff --git a/pkgs/development/perl-modules/Paranoid-blessed-path.patch b/nixpkgs/pkgs/development/perl-modules/Paranoid-blessed-path.patch
index 5e800250110..5e800250110 100644
--- a/pkgs/development/perl-modules/Paranoid-blessed-path.patch
+++ b/nixpkgs/pkgs/development/perl-modules/Paranoid-blessed-path.patch
diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix
index 3b19b64367d..3b19b64367d 100644
--- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix
diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix
index 94d83845e29..94d83845e29 100644
--- a/pkgs/development/perl-modules/Po4a/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix
diff --git a/pkgs/development/perl-modules/Socket6-sv_undef.patch b/nixpkgs/pkgs/development/perl-modules/Socket6-sv_undef.patch
index 3ed4b61b6d3..3ed4b61b6d3 100644
--- a/pkgs/development/perl-modules/Socket6-sv_undef.patch
+++ b/nixpkgs/pkgs/development/perl-modules/Socket6-sv_undef.patch
diff --git a/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch b/nixpkgs/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch
index 34221c0d20c..34221c0d20c 100644
--- a/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch
+++ b/nixpkgs/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch
diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
index 6a3ed466e8f..6a3ed466e8f 100644
--- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
diff --git a/pkgs/development/perl-modules/alien-sdl.patch b/nixpkgs/pkgs/development/perl-modules/alien-sdl.patch
index b00f7dcce81..b00f7dcce81 100644
--- a/pkgs/development/perl-modules/alien-sdl.patch
+++ b/nixpkgs/pkgs/development/perl-modules/alien-sdl.patch
diff --git a/pkgs/development/perl-modules/boost-geometry-utils-fix-oom.patch b/nixpkgs/pkgs/development/perl-modules/boost-geometry-utils-fix-oom.patch
index cbcce381989..cbcce381989 100644
--- a/pkgs/development/perl-modules/boost-geometry-utils-fix-oom.patch
+++ b/nixpkgs/pkgs/development/perl-modules/boost-geometry-utils-fix-oom.patch
diff --git a/pkgs/development/perl-modules/catalyst-plugin-static-simple-etag.patch b/nixpkgs/pkgs/development/perl-modules/catalyst-plugin-static-simple-etag.patch
index 06207a8b733..06207a8b733 100644
--- a/pkgs/development/perl-modules/catalyst-plugin-static-simple-etag.patch
+++ b/nixpkgs/pkgs/development/perl-modules/catalyst-plugin-static-simple-etag.patch
diff --git a/pkgs/development/perl-modules/expression-generator/filtered-requirements.sh b/nixpkgs/pkgs/development/perl-modules/expression-generator/filtered-requirements.sh
index 98c01508fd5..98c01508fd5 100755
--- a/pkgs/development/perl-modules/expression-generator/filtered-requirements.sh
+++ b/nixpkgs/pkgs/development/perl-modules/expression-generator/filtered-requirements.sh
diff --git a/pkgs/development/perl-modules/expression-generator/full-requirements.sh b/nixpkgs/pkgs/development/perl-modules/expression-generator/full-requirements.sh
index 29ed83668ed..29ed83668ed 100755
--- a/pkgs/development/perl-modules/expression-generator/full-requirements.sh
+++ b/nixpkgs/pkgs/development/perl-modules/expression-generator/full-requirements.sh
diff --git a/pkgs/development/perl-modules/expression-generator/grab-url.sh b/nixpkgs/pkgs/development/perl-modules/expression-generator/grab-url.sh
index 809cf87fceb..809cf87fceb 100755
--- a/pkgs/development/perl-modules/expression-generator/grab-url.sh
+++ b/nixpkgs/pkgs/development/perl-modules/expression-generator/grab-url.sh
diff --git a/pkgs/development/perl-modules/expression-generator/lib-cache.sh b/nixpkgs/pkgs/development/perl-modules/expression-generator/lib-cache.sh
index 7473e2d1c15..7473e2d1c15 100644
--- a/pkgs/development/perl-modules/expression-generator/lib-cache.sh
+++ b/nixpkgs/pkgs/development/perl-modules/expression-generator/lib-cache.sh
diff --git a/pkgs/development/perl-modules/expression-generator/make-clean-dir.sh b/nixpkgs/pkgs/development/perl-modules/expression-generator/make-clean-dir.sh
index 996cb92e695..996cb92e695 100755
--- a/pkgs/development/perl-modules/expression-generator/make-clean-dir.sh
+++ b/nixpkgs/pkgs/development/perl-modules/expression-generator/make-clean-dir.sh
diff --git a/pkgs/development/perl-modules/expression-generator/requirements.sh b/nixpkgs/pkgs/development/perl-modules/expression-generator/requirements.sh
index 60ee68d99ad..60ee68d99ad 100755
--- a/pkgs/development/perl-modules/expression-generator/requirements.sh
+++ b/nixpkgs/pkgs/development/perl-modules/expression-generator/requirements.sh
diff --git a/pkgs/development/perl-modules/expression-generator/retrieve-file-link.sh b/nixpkgs/pkgs/development/perl-modules/expression-generator/retrieve-file-link.sh
index a9cf0d94e0d..a9cf0d94e0d 100755
--- a/pkgs/development/perl-modules/expression-generator/retrieve-file-link.sh
+++ b/nixpkgs/pkgs/development/perl-modules/expression-generator/retrieve-file-link.sh
diff --git a/pkgs/development/perl-modules/expression-generator/retrieve-meta-yaml.sh b/nixpkgs/pkgs/development/perl-modules/expression-generator/retrieve-meta-yaml.sh
index 2c85d45691f..2c85d45691f 100755
--- a/pkgs/development/perl-modules/expression-generator/retrieve-meta-yaml.sh
+++ b/nixpkgs/pkgs/development/perl-modules/expression-generator/retrieve-meta-yaml.sh
diff --git a/pkgs/development/perl-modules/expression-generator/retrieve-modulepage.sh b/nixpkgs/pkgs/development/perl-modules/expression-generator/retrieve-modulepage.sh
index 866dfa13f94..866dfa13f94 100755
--- a/pkgs/development/perl-modules/expression-generator/retrieve-modulepage.sh
+++ b/nixpkgs/pkgs/development/perl-modules/expression-generator/retrieve-modulepage.sh
diff --git a/pkgs/development/perl-modules/expression-generator/source-download-link.sh b/nixpkgs/pkgs/development/perl-modules/expression-generator/source-download-link.sh
index 575f47629c2..575f47629c2 100755
--- a/pkgs/development/perl-modules/expression-generator/source-download-link.sh
+++ b/nixpkgs/pkgs/development/perl-modules/expression-generator/source-download-link.sh
diff --git a/pkgs/development/perl-modules/expression-generator/usage.txt b/nixpkgs/pkgs/development/perl-modules/expression-generator/usage.txt
index 1aa0737afdb..1aa0737afdb 100644
--- a/pkgs/development/perl-modules/expression-generator/usage.txt
+++ b/nixpkgs/pkgs/development/perl-modules/expression-generator/usage.txt
diff --git a/pkgs/development/perl-modules/expression-generator/write-nix-expression.sh b/nixpkgs/pkgs/development/perl-modules/expression-generator/write-nix-expression.sh
index cfe1506640b..cfe1506640b 100755
--- a/pkgs/development/perl-modules/expression-generator/write-nix-expression.sh
+++ b/nixpkgs/pkgs/development/perl-modules/expression-generator/write-nix-expression.sh
diff --git a/pkgs/development/perl-modules/generic/builder.sh b/nixpkgs/pkgs/development/perl-modules/generic/builder.sh
index 9b42401fc4d..9b42401fc4d 100644
--- a/pkgs/development/perl-modules/generic/builder.sh
+++ b/nixpkgs/pkgs/development/perl-modules/generic/builder.sh
diff --git a/pkgs/development/perl-modules/generic/default.nix b/nixpkgs/pkgs/development/perl-modules/generic/default.nix
index 79c7919a354..79c7919a354 100644
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/generic/default.nix
diff --git a/pkgs/development/perl-modules/ham/default.nix b/nixpkgs/pkgs/development/perl-modules/ham/default.nix
index 637e6ac22dd..637e6ac22dd 100644
--- a/pkgs/development/perl-modules/ham/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/ham/default.nix
diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/nixpkgs/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
index e9b501c29e2..e9b501c29e2 100644
--- a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
+++ b/nixpkgs/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix
index b23b7afa7a3..b23b7afa7a3 100644
--- a/pkgs/development/perl-modules/maatkit/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix
diff --git a/pkgs/development/perl-modules/mhonarc.patch b/nixpkgs/pkgs/development/perl-modules/mhonarc.patch
index 12b8cc2931b..12b8cc2931b 100644
--- a/pkgs/development/perl-modules/mhonarc.patch
+++ b/nixpkgs/pkgs/development/perl-modules/mhonarc.patch
diff --git a/pkgs/development/perl-modules/module-pluggable.patch b/nixpkgs/pkgs/development/perl-modules/module-pluggable.patch
index 51a029c106b..51a029c106b 100644
--- a/pkgs/development/perl-modules/module-pluggable.patch
+++ b/nixpkgs/pkgs/development/perl-modules/module-pluggable.patch
diff --git a/pkgs/development/perl-modules/net-amazon-mechanicalturk.patch b/nixpkgs/pkgs/development/perl-modules/net-amazon-mechanicalturk.patch
index dde13b9b0fc..dde13b9b0fc 100644
--- a/pkgs/development/perl-modules/net-amazon-mechanicalturk.patch
+++ b/nixpkgs/pkgs/development/perl-modules/net-amazon-mechanicalturk.patch
diff --git a/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch b/nixpkgs/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch
index e2f604985be..e2f604985be 100644
--- a/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch
+++ b/nixpkgs/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch
diff --git a/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch b/nixpkgs/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch
index 097a7677e51..097a7677e51 100644
--- a/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch
+++ b/nixpkgs/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch
diff --git a/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt b/nixpkgs/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt
index 42df14c4096..42df14c4096 100644
--- a/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt
+++ b/nixpkgs/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt
diff --git a/pkgs/development/perl-modules/perl-opengl.patch b/nixpkgs/pkgs/development/perl-modules/perl-opengl.patch
index a44dc4f2e42..a44dc4f2e42 100644
--- a/pkgs/development/perl-modules/perl-opengl.patch
+++ b/nixpkgs/pkgs/development/perl-modules/perl-opengl.patch
diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix
index 7ac0b82ed10..7ac0b82ed10 100644
--- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix
diff --git a/pkgs/development/perl-modules/timedate-2020.patch b/nixpkgs/pkgs/development/perl-modules/timedate-2020.patch
index ea4d8307f03..ea4d8307f03 100644
--- a/pkgs/development/perl-modules/timedate-2020.patch
+++ b/nixpkgs/pkgs/development/perl-modules/timedate-2020.patch
diff --git a/pkgs/development/perl-modules/xml-grove-utf8.patch b/nixpkgs/pkgs/development/perl-modules/xml-grove-utf8.patch
index d0b913090be..d0b913090be 100644
--- a/pkgs/development/perl-modules/xml-grove-utf8.patch
+++ b/nixpkgs/pkgs/development/perl-modules/xml-grove-utf8.patch
diff --git a/pkgs/development/pharo/launcher/default.nix b/nixpkgs/pkgs/development/pharo/launcher/default.nix
index 5bccd0946c3..5bccd0946c3 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/nixpkgs/pkgs/development/pharo/launcher/default.nix
diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix
index e76b1802c23..e76b1802c23 100644
--- a/pkgs/development/pharo/vm/build-vm-legacy.nix
+++ b/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/nixpkgs/pkgs/development/pharo/vm/build-vm.nix
index 38516cc1914..38516cc1914 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/nixpkgs/pkgs/development/pharo/vm/build-vm.nix
diff --git a/pkgs/development/pharo/vm/default.nix b/nixpkgs/pkgs/development/pharo/vm/default.nix
index a60afcd59ed..a60afcd59ed 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/nixpkgs/pkgs/development/pharo/vm/default.nix
diff --git a/pkgs/development/pharo/vm/share.nix b/nixpkgs/pkgs/development/pharo/vm/share.nix
index ec4168508a7..ec4168508a7 100644
--- a/pkgs/development/pharo/vm/share.nix
+++ b/nixpkgs/pkgs/development/pharo/vm/share.nix
diff --git a/pkgs/development/pharo/vm/vms.nix b/nixpkgs/pkgs/development/pharo/vm/vms.nix
index 080da830af6..080da830af6 100644
--- a/pkgs/development/pharo/vm/vms.nix
+++ b/nixpkgs/pkgs/development/pharo/vm/vms.nix
diff --git a/pkgs/development/pharo/wrapper/default.nix b/nixpkgs/pkgs/development/pharo/wrapper/default.nix
index 084c46cd5b5..084c46cd5b5 100644
--- a/pkgs/development/pharo/wrapper/default.nix
+++ b/nixpkgs/pkgs/development/pharo/wrapper/default.nix
diff --git a/pkgs/development/pharo/wrapper/magic b/nixpkgs/pkgs/development/pharo/wrapper/magic
index 3870ef2dd01..3870ef2dd01 100644
--- a/pkgs/development/pharo/wrapper/magic
+++ b/nixpkgs/pkgs/development/pharo/wrapper/magic
diff --git a/pkgs/development/pharo/wrapper/pharo-vm.sh b/nixpkgs/pkgs/development/pharo/wrapper/pharo-vm.sh
index d5bd1a2d801..d5bd1a2d801 100644
--- a/pkgs/development/pharo/wrapper/pharo-vm.sh
+++ b/nixpkgs/pkgs/development/pharo/wrapper/pharo-vm.sh
diff --git a/pkgs/development/pure-modules/audio/default.nix b/nixpkgs/pkgs/development/pure-modules/audio/default.nix
index cd1435d6599..cd1435d6599 100644
--- a/pkgs/development/pure-modules/audio/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/audio/default.nix
diff --git a/pkgs/development/pure-modules/avahi/default.nix b/nixpkgs/pkgs/development/pure-modules/avahi/default.nix
index 8ce33e67efe..8ce33e67efe 100644
--- a/pkgs/development/pure-modules/avahi/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/avahi/default.nix
diff --git a/pkgs/development/pure-modules/csv/default.nix b/nixpkgs/pkgs/development/pure-modules/csv/default.nix
index 7524823a5dc..7524823a5dc 100644
--- a/pkgs/development/pure-modules/csv/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/csv/default.nix
diff --git a/pkgs/development/pure-modules/doc/default.nix b/nixpkgs/pkgs/development/pure-modules/doc/default.nix
index 1a006c9eb8f..1a006c9eb8f 100644
--- a/pkgs/development/pure-modules/doc/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/doc/default.nix
diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/nixpkgs/pkgs/development/pure-modules/fastcgi/default.nix
index e41110386d7..e41110386d7 100644
--- a/pkgs/development/pure-modules/fastcgi/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/fastcgi/default.nix
diff --git a/pkgs/development/pure-modules/faust/default.nix b/nixpkgs/pkgs/development/pure-modules/faust/default.nix
index e1c1b4d2d4b..e1c1b4d2d4b 100644
--- a/pkgs/development/pure-modules/faust/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/faust/default.nix
diff --git a/pkgs/development/pure-modules/ffi/default.nix b/nixpkgs/pkgs/development/pure-modules/ffi/default.nix
index 4d019b5b699..4d019b5b699 100644
--- a/pkgs/development/pure-modules/ffi/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/ffi/default.nix
diff --git a/pkgs/development/pure-modules/gen/default.nix b/nixpkgs/pkgs/development/pure-modules/gen/default.nix
index 54ac78fd6c4..54ac78fd6c4 100644
--- a/pkgs/development/pure-modules/gen/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/gen/default.nix
diff --git a/pkgs/development/pure-modules/generic-setup-hook.sh b/nixpkgs/pkgs/development/pure-modules/generic-setup-hook.sh
index efaa2211ae6..efaa2211ae6 100644
--- a/pkgs/development/pure-modules/generic-setup-hook.sh
+++ b/nixpkgs/pkgs/development/pure-modules/generic-setup-hook.sh
diff --git a/pkgs/development/pure-modules/gl/default.nix b/nixpkgs/pkgs/development/pure-modules/gl/default.nix
index 34c13f99f92..34c13f99f92 100644
--- a/pkgs/development/pure-modules/gl/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/gl/default.nix
diff --git a/pkgs/development/pure-modules/glpk/default.nix b/nixpkgs/pkgs/development/pure-modules/glpk/default.nix
index 838e81b20ba..838e81b20ba 100644
--- a/pkgs/development/pure-modules/glpk/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/glpk/default.nix
diff --git a/pkgs/development/pure-modules/gplot/default.nix b/nixpkgs/pkgs/development/pure-modules/gplot/default.nix
index c45f51509b7..c45f51509b7 100644
--- a/pkgs/development/pure-modules/gplot/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/gplot/default.nix
diff --git a/pkgs/development/pure-modules/gsl/default.nix b/nixpkgs/pkgs/development/pure-modules/gsl/default.nix
index 847fe7538e9..847fe7538e9 100644
--- a/pkgs/development/pure-modules/gsl/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/gsl/default.nix
diff --git a/pkgs/development/pure-modules/gtk/default.nix b/nixpkgs/pkgs/development/pure-modules/gtk/default.nix
index 1e7957ae382..1e7957ae382 100644
--- a/pkgs/development/pure-modules/gtk/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/gtk/default.nix
diff --git a/pkgs/development/pure-modules/liblo/default.nix b/nixpkgs/pkgs/development/pure-modules/liblo/default.nix
index 94ceef78908..94ceef78908 100644
--- a/pkgs/development/pure-modules/liblo/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/liblo/default.nix
diff --git a/pkgs/development/pure-modules/lilv/default.nix b/nixpkgs/pkgs/development/pure-modules/lilv/default.nix
index c0f50812946..c0f50812946 100644
--- a/pkgs/development/pure-modules/lilv/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/lilv/default.nix
diff --git a/pkgs/development/pure-modules/lv2/default.nix b/nixpkgs/pkgs/development/pure-modules/lv2/default.nix
index b4a63eb7020..b4a63eb7020 100644
--- a/pkgs/development/pure-modules/lv2/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/lv2/default.nix
diff --git a/pkgs/development/pure-modules/midi/default.nix b/nixpkgs/pkgs/development/pure-modules/midi/default.nix
index e55d4994455..e55d4994455 100644
--- a/pkgs/development/pure-modules/midi/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/midi/default.nix
diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/nixpkgs/pkgs/development/pure-modules/mpfr/default.nix
index 59617beb461..59617beb461 100644
--- a/pkgs/development/pure-modules/mpfr/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/mpfr/default.nix
diff --git a/pkgs/development/pure-modules/octave/default.nix b/nixpkgs/pkgs/development/pure-modules/octave/default.nix
index e117d04a4cc..e117d04a4cc 100644
--- a/pkgs/development/pure-modules/octave/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/octave/default.nix
diff --git a/pkgs/development/pure-modules/odbc/default.nix b/nixpkgs/pkgs/development/pure-modules/odbc/default.nix
index 69808d1aaf0..69808d1aaf0 100644
--- a/pkgs/development/pure-modules/odbc/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/odbc/default.nix
diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/nixpkgs/pkgs/development/pure-modules/pandoc/default.nix
index 17a16229b57..17a16229b57 100644
--- a/pkgs/development/pure-modules/pandoc/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/pandoc/default.nix
diff --git a/pkgs/development/pure-modules/rational/default.nix b/nixpkgs/pkgs/development/pure-modules/rational/default.nix
index 547610fdf01..547610fdf01 100644
--- a/pkgs/development/pure-modules/rational/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/rational/default.nix
diff --git a/pkgs/development/pure-modules/readline/default.nix b/nixpkgs/pkgs/development/pure-modules/readline/default.nix
index d145788c552..d145788c552 100644
--- a/pkgs/development/pure-modules/readline/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/readline/default.nix
diff --git a/pkgs/development/pure-modules/sockets/default.nix b/nixpkgs/pkgs/development/pure-modules/sockets/default.nix
index aa8245bb12d..aa8245bb12d 100644
--- a/pkgs/development/pure-modules/sockets/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/sockets/default.nix
diff --git a/pkgs/development/pure-modules/sql3/default.nix b/nixpkgs/pkgs/development/pure-modules/sql3/default.nix
index aa3b2544af0..aa3b2544af0 100644
--- a/pkgs/development/pure-modules/sql3/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/sql3/default.nix
diff --git a/pkgs/development/pure-modules/stldict/default.nix b/nixpkgs/pkgs/development/pure-modules/stldict/default.nix
index b248a0084ff..b248a0084ff 100644
--- a/pkgs/development/pure-modules/stldict/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/stldict/default.nix
diff --git a/pkgs/development/pure-modules/stllib/default.nix b/nixpkgs/pkgs/development/pure-modules/stllib/default.nix
index d29719891d2..d29719891d2 100644
--- a/pkgs/development/pure-modules/stllib/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/stllib/default.nix
diff --git a/pkgs/development/pure-modules/tk/default.nix b/nixpkgs/pkgs/development/pure-modules/tk/default.nix
index d939a3b3ad4..d939a3b3ad4 100644
--- a/pkgs/development/pure-modules/tk/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/tk/default.nix
diff --git a/pkgs/development/pure-modules/xml/default.nix b/nixpkgs/pkgs/development/pure-modules/xml/default.nix
index 73753a5d34f..73753a5d34f 100644
--- a/pkgs/development/pure-modules/xml/default.nix
+++ b/nixpkgs/pkgs/development/pure-modules/xml/default.nix
diff --git a/pkgs/development/python-modules/3to2/default.nix b/nixpkgs/pkgs/development/python-modules/3to2/default.nix
index 4e6c0f9214c..4e6c0f9214c 100644
--- a/pkgs/development/python-modules/3to2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/3to2/default.nix
diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
index 1f2a89c5e0c..1f2a89c5e0c 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
diff --git a/pkgs/development/python-modules/Babel/default.nix b/nixpkgs/pkgs/development/python-modules/Babel/default.nix
index 1aafee5bec4..1aafee5bec4 100644
--- a/pkgs/development/python-modules/Babel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Babel/default.nix
diff --git a/pkgs/development/python-modules/Cython/default.nix b/nixpkgs/pkgs/development/python-modules/Cython/default.nix
index aff4e0b62b3..aff4e0b62b3 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Cython/default.nix
diff --git a/pkgs/development/python-modules/Fabric/default.nix b/nixpkgs/pkgs/development/python-modules/Fabric/default.nix
index b0c81a62e33..b0c81a62e33 100644
--- a/pkgs/development/python-modules/Fabric/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Fabric/default.nix
diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/nixpkgs/pkgs/development/python-modules/Flask-PyMongo/default.nix
index 3a01c9ba983..3a01c9ba983 100644
--- a/pkgs/development/python-modules/Flask-PyMongo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Flask-PyMongo/default.nix
diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix
index 72086a3487f..72086a3487f 100644
--- a/pkgs/development/python-modules/FormEncode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix
diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/nixpkgs/pkgs/development/python-modules/GeoIP/default.nix
index 550fa1da3ed..550fa1da3ed 100644
--- a/pkgs/development/python-modules/GeoIP/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/GeoIP/default.nix
diff --git a/pkgs/development/python-modules/GitPython/default.nix b/nixpkgs/pkgs/development/python-modules/GitPython/default.nix
index be2526ffcd4..be2526ffcd4 100644
--- a/pkgs/development/python-modules/GitPython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/GitPython/default.nix
diff --git a/pkgs/development/python-modules/GitPython/hardcode-git-path.patch b/nixpkgs/pkgs/development/python-modules/GitPython/hardcode-git-path.patch
index 93747995992..93747995992 100644
--- a/pkgs/development/python-modules/GitPython/hardcode-git-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/GitPython/hardcode-git-path.patch
diff --git a/pkgs/development/python-modules/HTSeq/default.nix b/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix
index 7cbe523ba1e..7cbe523ba1e 100644
--- a/pkgs/development/python-modules/HTSeq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix
diff --git a/pkgs/development/python-modules/IPy/default.nix b/nixpkgs/pkgs/development/python-modules/IPy/default.nix
index 7f258780d1c..7f258780d1c 100644
--- a/pkgs/development/python-modules/IPy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/IPy/default.nix
diff --git a/pkgs/development/python-modules/JPype1/default.nix b/nixpkgs/pkgs/development/python-modules/JPype1/default.nix
index 22093f0258a..22093f0258a 100644
--- a/pkgs/development/python-modules/JPype1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/JPype1/default.nix
diff --git a/pkgs/development/python-modules/JayDeBeApi/default.nix b/nixpkgs/pkgs/development/python-modules/JayDeBeApi/default.nix
index dd1cc819ad6..dd1cc819ad6 100644
--- a/pkgs/development/python-modules/JayDeBeApi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/JayDeBeApi/default.nix
diff --git a/pkgs/development/python-modules/Logbook/default.nix b/nixpkgs/pkgs/development/python-modules/Logbook/default.nix
index 97befe7190a..97befe7190a 100644
--- a/pkgs/development/python-modules/Logbook/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Logbook/default.nix
diff --git a/pkgs/development/python-modules/Mako/default.nix b/nixpkgs/pkgs/development/python-modules/Mako/default.nix
index 2e7cb74a06c..2e7cb74a06c 100644
--- a/pkgs/development/python-modules/Mako/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Mako/default.nix
diff --git a/pkgs/development/python-modules/Markups/default.nix b/nixpkgs/pkgs/development/python-modules/Markups/default.nix
index 6fe41e40419..6fe41e40419 100644
--- a/pkgs/development/python-modules/Markups/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Markups/default.nix
diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/nixpkgs/pkgs/development/python-modules/MechanicalSoup/default.nix
index 7882685df4c..7882685df4c 100644
--- a/pkgs/development/python-modules/MechanicalSoup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/MechanicalSoup/default.nix
diff --git a/pkgs/development/python-modules/Nikola/default.nix b/nixpkgs/pkgs/development/python-modules/Nikola/default.nix
index d36a47c331c..d36a47c331c 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Nikola/default.nix
diff --git a/pkgs/development/python-modules/Pmw/default.nix b/nixpkgs/pkgs/development/python-modules/Pmw/default.nix
index a666cad1fc6..a666cad1fc6 100644
--- a/pkgs/development/python-modules/Pmw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Pmw/default.nix
diff --git a/pkgs/development/python-modules/PyLD/default.nix b/nixpkgs/pkgs/development/python-modules/PyLD/default.nix
index df8738ce247..df8738ce247 100644
--- a/pkgs/development/python-modules/PyLD/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/PyLD/default.nix
diff --git a/pkgs/development/python-modules/Pygments/default.nix b/nixpkgs/pkgs/development/python-modules/Pygments/default.nix
index ca9181fc068..ca9181fc068 100644
--- a/pkgs/development/python-modules/Pygments/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Pygments/default.nix
diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix
index 310e84a918d..310e84a918d 100644
--- a/pkgs/development/python-modules/ROPGadget/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix
diff --git a/pkgs/development/python-modules/Rtree/default.nix b/nixpkgs/pkgs/development/python-modules/Rtree/default.nix
index 867c771350c..867c771350c 100644
--- a/pkgs/development/python-modules/Rtree/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Rtree/default.nix
diff --git a/pkgs/development/python-modules/Theano/default.nix b/nixpkgs/pkgs/development/python-modules/Theano/default.nix
index 67600a6e5fd..67600a6e5fd 100644
--- a/pkgs/development/python-modules/Theano/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Theano/default.nix
diff --git a/pkgs/development/python-modules/TurboCheetah/default.nix b/nixpkgs/pkgs/development/python-modules/TurboCheetah/default.nix
index 45c42a7b43f..45c42a7b43f 100644
--- a/pkgs/development/python-modules/TurboCheetah/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/TurboCheetah/default.nix
diff --git a/pkgs/development/python-modules/WSME/default.nix b/nixpkgs/pkgs/development/python-modules/WSME/default.nix
index adad2051292..adad2051292 100644
--- a/pkgs/development/python-modules/WSME/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/WSME/default.nix
diff --git a/pkgs/development/python-modules/Wand/default.nix b/nixpkgs/pkgs/development/python-modules/Wand/default.nix
index a7fe193c62f..a7fe193c62f 100644
--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Wand/default.nix
diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix
index 34757f0e29c..34757f0e29c 100644
--- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix
diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix
index f9730eb61ae..f9730eb61ae 100644
--- a/pkgs/development/python-modules/XlsxWriter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix
diff --git a/pkgs/development/python-modules/aafigure/default.nix b/nixpkgs/pkgs/development/python-modules/aafigure/default.nix
index d75511f8d4c..d75511f8d4c 100644
--- a/pkgs/development/python-modules/aafigure/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aafigure/default.nix
diff --git a/pkgs/development/python-modules/absl-py/default.nix b/nixpkgs/pkgs/development/python-modules/absl-py/default.nix
index e7a2f120c1b..e7a2f120c1b 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/absl-py/default.nix
diff --git a/pkgs/development/python-modules/accupy/default.nix b/nixpkgs/pkgs/development/python-modules/accupy/default.nix
index 07c2bcfeb5e..07c2bcfeb5e 100644
--- a/pkgs/development/python-modules/accupy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/accupy/default.nix
diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix
index 51b4b15cd18..51b4b15cd18 100644
--- a/pkgs/development/python-modules/acme-tiny/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix
diff --git a/pkgs/development/python-modules/acme/default.nix b/nixpkgs/pkgs/development/python-modules/acme/default.nix
index e9156b5c6af..e9156b5c6af 100644
--- a/pkgs/development/python-modules/acme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/acme/default.nix
diff --git a/pkgs/development/python-modules/acoustics/default.nix b/nixpkgs/pkgs/development/python-modules/acoustics/default.nix
index 85ce02be1c3..85ce02be1c3 100644
--- a/pkgs/development/python-modules/acoustics/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/acoustics/default.nix
diff --git a/pkgs/development/python-modules/actdiag/default.nix b/nixpkgs/pkgs/development/python-modules/actdiag/default.nix
index 34d4c2a37a7..34d4c2a37a7 100644
--- a/pkgs/development/python-modules/actdiag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/actdiag/default.nix
diff --git a/pkgs/development/python-modules/adal/default.nix b/nixpkgs/pkgs/development/python-modules/adal/default.nix
index a2e4d015b2a..a2e4d015b2a 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/adal/default.nix
diff --git a/pkgs/development/python-modules/adb-homeassistant/default.nix b/nixpkgs/pkgs/development/python-modules/adb-homeassistant/default.nix
index 4e37d18a9f3..4e37d18a9f3 100644
--- a/pkgs/development/python-modules/adb-homeassistant/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/adb-homeassistant/default.nix
diff --git a/pkgs/development/python-modules/addic7ed-cli/default.nix b/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix
index b87a084fd8c..b87a084fd8c 100644
--- a/pkgs/development/python-modules/addic7ed-cli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix
diff --git a/pkgs/development/python-modules/aenum/default.nix b/nixpkgs/pkgs/development/python-modules/aenum/default.nix
index d64bd672ca0..d64bd672ca0 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aenum/default.nix
diff --git a/pkgs/development/python-modules/affine/default.nix b/nixpkgs/pkgs/development/python-modules/affine/default.nix
index ba137ed5178..ba137ed5178 100644
--- a/pkgs/development/python-modules/affine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/affine/default.nix
diff --git a/pkgs/development/python-modules/affinity/default.nix b/nixpkgs/pkgs/development/python-modules/affinity/default.nix
index 4eaaf56b441..4eaaf56b441 100644
--- a/pkgs/development/python-modules/affinity/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/affinity/default.nix
diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix
index f070dcb258e..f070dcb258e 100644
--- a/pkgs/development/python-modules/agate-dbf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix
diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix
index ced0ff28090..ced0ff28090 100644
--- a/pkgs/development/python-modules/agate-excel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix
diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix
index 82da607b3ef..82da607b3ef 100644
--- a/pkgs/development/python-modules/agate-sql/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix
diff --git a/pkgs/development/python-modules/agate/default.nix b/nixpkgs/pkgs/development/python-modules/agate/default.nix
index b0992141faa..b0992141faa 100644
--- a/pkgs/development/python-modules/agate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/agate/default.nix
diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix
index 8db47220543..8db47220543 100644
--- a/pkgs/development/python-modules/aioamqp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix
diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix
index 36a1c1b76e4..36a1c1b76e4 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix
diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix
index 38fdf14164e..38fdf14164e 100644
--- a/pkgs/development/python-modules/aiocontextvars/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix
diff --git a/pkgs/development/python-modules/aiodns/default.nix b/nixpkgs/pkgs/development/python-modules/aiodns/default.nix
index a8287df10f6..a8287df10f6 100644
--- a/pkgs/development/python-modules/aiodns/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiodns/default.nix
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
index dee85117406..dee85117406 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
diff --git a/pkgs/development/python-modules/aioeventlet/default.nix b/nixpkgs/pkgs/development/python-modules/aioeventlet/default.nix
index 0582a59eae8..0582a59eae8 100644
--- a/pkgs/development/python-modules/aioeventlet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioeventlet/default.nix
diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix
index 4728d819f05..4728d819f05 100644
--- a/pkgs/development/python-modules/aiofiles/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix
diff --git a/pkgs/development/python-modules/aioftp/default.nix b/nixpkgs/pkgs/development/python-modules/aioftp/default.nix
index 1d2b32a73b9..1d2b32a73b9 100644
--- a/pkgs/development/python-modules/aioftp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioftp/default.nix
diff --git a/pkgs/development/python-modules/aioh2/default.nix b/nixpkgs/pkgs/development/python-modules/aioh2/default.nix
index fdeb5fb0082..fdeb5fb0082 100644
--- a/pkgs/development/python-modules/aioh2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioh2/default.nix
diff --git a/pkgs/development/python-modules/aiohttp-cors/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-cors/default.nix
index 00198cd27cf..00198cd27cf 100644
--- a/pkgs/development/python-modules/aiohttp-cors/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp-cors/default.nix
diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix
index 58f62b9b0f3..58f62b9b0f3 100644
--- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix
diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix
index 51120d07121..51120d07121 100644
--- a/pkgs/development/python-modules/aiohttp-remotes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix
diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix
index 782238c3f83..782238c3f83 100644
--- a/pkgs/development/python-modules/aiohttp-socks/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix
diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-swagger/default.nix
index e01e3ce30bc..e01e3ce30bc 100644
--- a/pkgs/development/python-modules/aiohttp-swagger/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp-swagger/default.nix
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
index 0cecdb0291e..0cecdb0291e 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
diff --git a/pkgs/development/python-modules/aiohue/default.nix b/nixpkgs/pkgs/development/python-modules/aiohue/default.nix
index ede51da9ef1..ede51da9ef1 100644
--- a/pkgs/development/python-modules/aiohue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohue/default.nix
diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix
index 9003618a0fd..9003618a0fd 100644
--- a/pkgs/development/python-modules/aioimaplib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix
diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix
index b31f83dc136..b31f83dc136 100644
--- a/pkgs/development/python-modules/aiokafka/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix
diff --git a/pkgs/development/python-modules/aiolifx-effects/default.nix b/nixpkgs/pkgs/development/python-modules/aiolifx-effects/default.nix
index bbe2b538ac5..bbe2b538ac5 100644
--- a/pkgs/development/python-modules/aiolifx-effects/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiolifx-effects/default.nix
diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix
index 0afaa65e40c..0afaa65e40c 100644
--- a/pkgs/development/python-modules/aiolifx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix
diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix
index 891e9f216ce..891e9f216ce 100644
--- a/pkgs/development/python-modules/aiomysql/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix
diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix
index f2f95911268..f2f95911268 100644
--- a/pkgs/development/python-modules/aioprocessing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix
diff --git a/pkgs/development/python-modules/aioredis/default.nix b/nixpkgs/pkgs/development/python-modules/aioredis/default.nix
index 7769f543754..7769f543754 100644
--- a/pkgs/development/python-modules/aioredis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioredis/default.nix
diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix
index 446bb9e6379..446bb9e6379 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix
diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix
index eba64f46559..eba64f46559 100644
--- a/pkgs/development/python-modules/aiorpcx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix
diff --git a/pkgs/development/python-modules/aiorun/default.nix b/nixpkgs/pkgs/development/python-modules/aiorun/default.nix
index 7e38bb76873..7e38bb76873 100644
--- a/pkgs/development/python-modules/aiorun/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiorun/default.nix
diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix
index 77d7cf653d1..77d7cf653d1 100644
--- a/pkgs/development/python-modules/aiosmtpd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix
diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix
index 1032485e980..1032485e980 100644
--- a/pkgs/development/python-modules/aiosqlite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix
diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix
index e86fc222eea..e86fc222eea 100644
--- a/pkgs/development/python-modules/aiounifi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix
diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix
index 743600a0d3b..743600a0d3b 100644
--- a/pkgs/development/python-modules/aiounittest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix
diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix
index 78b1c215c2b..78b1c215c2b 100644
--- a/pkgs/development/python-modules/aiozeroconf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix
diff --git a/pkgs/development/python-modules/ajpy/default.nix b/nixpkgs/pkgs/development/python-modules/ajpy/default.nix
index 373c3544062..373c3544062 100644
--- a/pkgs/development/python-modules/ajpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ajpy/default.nix
diff --git a/pkgs/development/python-modules/alabaster/default.nix b/nixpkgs/pkgs/development/python-modules/alabaster/default.nix
index e5aaa9a6c76..e5aaa9a6c76 100644
--- a/pkgs/development/python-modules/alabaster/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/alabaster/default.nix
diff --git a/pkgs/development/python-modules/alembic/default.nix b/nixpkgs/pkgs/development/python-modules/alembic/default.nix
index 72e7ae6417a..72e7ae6417a 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/alembic/default.nix
diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix
index 55674b660c0..55674b660c0 100644
--- a/pkgs/development/python-modules/alerta-server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix
diff --git a/pkgs/development/python-modules/alerta/default.nix b/nixpkgs/pkgs/development/python-modules/alerta/default.nix
index fe44b88bc8a..fe44b88bc8a 100644
--- a/pkgs/development/python-modules/alerta/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/alerta/default.nix
diff --git a/pkgs/development/python-modules/algebraic-data-types/default.nix b/nixpkgs/pkgs/development/python-modules/algebraic-data-types/default.nix
index 4b4986795ce..4b4986795ce 100644
--- a/pkgs/development/python-modules/algebraic-data-types/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/algebraic-data-types/default.nix
diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix
index 0ab69aef71e..0ab69aef71e 100644
--- a/pkgs/development/python-modules/allpairspy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix
diff --git a/pkgs/development/python-modules/alot/default.nix b/nixpkgs/pkgs/development/python-modules/alot/default.nix
index fa21b66e3ab..fa21b66e3ab 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/alot/default.nix
diff --git a/pkgs/development/python-modules/altair/default.nix b/nixpkgs/pkgs/development/python-modules/altair/default.nix
index db3c2d27c8b..db3c2d27c8b 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/altair/default.nix
diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix
index a405b575b25..a405b575b25 100644
--- a/pkgs/development/python-modules/amazon_kclpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix
diff --git a/pkgs/development/python-modules/amqp/default.nix b/nixpkgs/pkgs/development/python-modules/amqp/default.nix
index 8dad26bbb2b..8dad26bbb2b 100644
--- a/pkgs/development/python-modules/amqp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/amqp/default.nix
diff --git a/pkgs/development/python-modules/amqplib/default.nix b/nixpkgs/pkgs/development/python-modules/amqplib/default.nix
index 682dee00014..682dee00014 100644
--- a/pkgs/development/python-modules/amqplib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/amqplib/default.nix
diff --git a/pkgs/development/python-modules/androguard/default.nix b/nixpkgs/pkgs/development/python-modules/androguard/default.nix
index 7525df60575..7525df60575 100644
--- a/pkgs/development/python-modules/androguard/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/androguard/default.nix
diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix
index e5222b64e9b..e5222b64e9b 100644
--- a/pkgs/development/python-modules/aniso8601/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix
diff --git a/pkgs/development/python-modules/annexremote/default.nix b/nixpkgs/pkgs/development/python-modules/annexremote/default.nix
index f07f05b9884..f07f05b9884 100644
--- a/pkgs/development/python-modules/annexremote/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/annexremote/default.nix
diff --git a/pkgs/development/python-modules/annoy/default.nix b/nixpkgs/pkgs/development/python-modules/annoy/default.nix
index 5041ee54e4f..5041ee54e4f 100644
--- a/pkgs/development/python-modules/annoy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/annoy/default.nix
diff --git a/pkgs/development/python-modules/anonip/default.nix b/nixpkgs/pkgs/development/python-modules/anonip/default.nix
index de9048bde34..de9048bde34 100644
--- a/pkgs/development/python-modules/anonip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/anonip/default.nix
diff --git a/pkgs/development/python-modules/ansi/default.nix b/nixpkgs/pkgs/development/python-modules/ansi/default.nix
index 77b93ce890e..77b93ce890e 100644
--- a/pkgs/development/python-modules/ansi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansi/default.nix
diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix
index 18a2b0dde7f..18a2b0dde7f 100644
--- a/pkgs/development/python-modules/ansi2html/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix
diff --git a/pkgs/development/python-modules/ansible-kernel/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix
index 42438b31c21..42438b31c21 100644
--- a/pkgs/development/python-modules/ansible-kernel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix
diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix
index 62c9b33d5e3..62c9b33d5e3 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix
diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix
index 62f95c3cefc..62f95c3cefc 100644
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix
diff --git a/pkgs/development/python-modules/ansible/default.nix b/nixpkgs/pkgs/development/python-modules/ansible/default.nix
index df9c5e82cd1..df9c5e82cd1 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansible/default.nix
diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix
index 5960e7b4133..5960e7b4133 100644
--- a/pkgs/development/python-modules/ansicolor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix
diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix
index a737cb06ea2..a737cb06ea2 100644
--- a/pkgs/development/python-modules/ansicolors/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix
diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix
index 08f93134b32..08f93134b32 100644
--- a/pkgs/development/python-modules/ansiconv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix
diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix
index 517083a0621..517083a0621 100644
--- a/pkgs/development/python-modules/ansiwrap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix
diff --git a/pkgs/development/python-modules/antlr4-python2-runtime/default.nix b/nixpkgs/pkgs/development/python-modules/antlr4-python2-runtime/default.nix
index aa18a0fe290..aa18a0fe290 100644
--- a/pkgs/development/python-modules/antlr4-python2-runtime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/antlr4-python2-runtime/default.nix
diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
index 0fade1362c9..0fade1362c9 100644
--- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
diff --git a/pkgs/development/python-modules/anyjson/default.nix b/nixpkgs/pkgs/development/python-modules/anyjson/default.nix
index 65476b47f8f..65476b47f8f 100644
--- a/pkgs/development/python-modules/anyjson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/anyjson/default.nix
diff --git a/pkgs/development/python-modules/anytree/default.nix b/nixpkgs/pkgs/development/python-modules/anytree/default.nix
index 712944568f2..712944568f2 100644
--- a/pkgs/development/python-modules/anytree/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/anytree/default.nix
diff --git a/pkgs/development/python-modules/anytree/graphviz.patch b/nixpkgs/pkgs/development/python-modules/anytree/graphviz.patch
index 583b60444e3..583b60444e3 100644
--- a/pkgs/development/python-modules/anytree/graphviz.patch
+++ b/nixpkgs/pkgs/development/python-modules/anytree/graphviz.patch
diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix
index 7bb805e4f35..7bb805e4f35 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/nixpkgs/pkgs/development/python-modules/apipkg/default.nix
index 22bddb252c8..22bddb252c8 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/apipkg/default.nix
diff --git a/pkgs/development/python-modules/apispec/default.nix b/nixpkgs/pkgs/development/python-modules/apispec/default.nix
index 1ed984fc718..1ed984fc718 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/apispec/default.nix
diff --git a/pkgs/development/python-modules/aplpy/default.nix b/nixpkgs/pkgs/development/python-modules/aplpy/default.nix
index 9710dc9f9a6..9710dc9f9a6 100644
--- a/pkgs/development/python-modules/aplpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aplpy/default.nix
diff --git a/pkgs/development/python-modules/appdirs/default.nix b/nixpkgs/pkgs/development/python-modules/appdirs/default.nix
index 8716f007b87..8716f007b87 100644
--- a/pkgs/development/python-modules/appdirs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/appdirs/default.nix
diff --git a/pkgs/development/python-modules/application/default.nix b/nixpkgs/pkgs/development/python-modules/application/default.nix
index 654567cc23f..654567cc23f 100644
--- a/pkgs/development/python-modules/application/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/application/default.nix
diff --git a/pkgs/development/python-modules/applicationinsights/default.nix b/nixpkgs/pkgs/development/python-modules/applicationinsights/default.nix
index 10f66b24d14..10f66b24d14 100644
--- a/pkgs/development/python-modules/applicationinsights/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/applicationinsights/default.nix
diff --git a/pkgs/development/python-modules/appnope/default.nix b/nixpkgs/pkgs/development/python-modules/appnope/default.nix
index 08f6fa529ca..08f6fa529ca 100644
--- a/pkgs/development/python-modules/appnope/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/appnope/default.nix
diff --git a/pkgs/development/python-modules/apprise/default.nix b/nixpkgs/pkgs/development/python-modules/apprise/default.nix
index 38157e13615..38157e13615 100644
--- a/pkgs/development/python-modules/apprise/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/apprise/default.nix
diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix
index 2cf9bf1f177..2cf9bf1f177 100644
--- a/pkgs/development/python-modules/approvaltests/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix
diff --git a/pkgs/development/python-modules/apsw/default.nix b/nixpkgs/pkgs/development/python-modules/apsw/default.nix
index 48e3b20c7c1..48e3b20c7c1 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/apsw/default.nix
diff --git a/pkgs/development/python-modules/area/default.nix b/nixpkgs/pkgs/development/python-modules/area/default.nix
index 37d7369dbee..37d7369dbee 100644
--- a/pkgs/development/python-modules/area/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/area/default.nix
diff --git a/pkgs/development/python-modules/arelle/default.nix b/nixpkgs/pkgs/development/python-modules/arelle/default.nix
index 85033a1846f..85033a1846f 100644
--- a/pkgs/development/python-modules/arelle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/arelle/default.nix
diff --git a/pkgs/development/python-modules/arelle/tests.patch b/nixpkgs/pkgs/development/python-modules/arelle/tests.patch
index e34cda99b25..e34cda99b25 100644
--- a/pkgs/development/python-modules/arelle/tests.patch
+++ b/nixpkgs/pkgs/development/python-modules/arelle/tests.patch
diff --git a/pkgs/development/python-modules/aresponses/default.nix b/nixpkgs/pkgs/development/python-modules/aresponses/default.nix
index 472911340ad..472911340ad 100644
--- a/pkgs/development/python-modules/aresponses/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aresponses/default.nix
diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix
index 6f978778f7d..6f978778f7d 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix
diff --git a/pkgs/development/python-modules/argh/default.nix b/nixpkgs/pkgs/development/python-modules/argh/default.nix
index 8c6afb099f9..8c6afb099f9 100644
--- a/pkgs/development/python-modules/argh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/argh/default.nix
diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix
index 130a2c18917..130a2c18917 100644
--- a/pkgs/development/python-modules/argon2_cffi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix
diff --git a/pkgs/development/python-modules/args/default.nix b/nixpkgs/pkgs/development/python-modules/args/default.nix
index 943f129031e..943f129031e 100644
--- a/pkgs/development/python-modules/args/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/args/default.nix
diff --git a/pkgs/development/python-modules/aria2p/default.nix b/nixpkgs/pkgs/development/python-modules/aria2p/default.nix
index 51b523c010a..51b523c010a 100644
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aria2p/default.nix
diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix
index 42d1ce0a219..42d1ce0a219 100644
--- a/pkgs/development/python-modules/arpeggio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix
diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/nixpkgs/pkgs/development/python-modules/arrayqueues/default.nix
index 82c8fc93267..82c8fc93267 100644
--- a/pkgs/development/python-modules/arrayqueues/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/arrayqueues/default.nix
diff --git a/pkgs/development/python-modules/arrow/default.nix b/nixpkgs/pkgs/development/python-modules/arrow/default.nix
index af3e4547628..af3e4547628 100644
--- a/pkgs/development/python-modules/arrow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/arrow/default.nix
diff --git a/pkgs/development/python-modules/arviz/default.nix b/nixpkgs/pkgs/development/python-modules/arviz/default.nix
index ba941503548..ba941503548 100644
--- a/pkgs/development/python-modules/arviz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/arviz/default.nix
diff --git a/pkgs/development/python-modules/arxiv2bib/default.nix b/nixpkgs/pkgs/development/python-modules/arxiv2bib/default.nix
index 99725bcfa61..99725bcfa61 100644
--- a/pkgs/development/python-modules/arxiv2bib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/arxiv2bib/default.nix
diff --git a/pkgs/development/python-modules/asana/default.nix b/nixpkgs/pkgs/development/python-modules/asana/default.nix
index 26a667bea4d..26a667bea4d 100644
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asana/default.nix
diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix
index d71f0b640f9..d71f0b640f9 100644
--- a/pkgs/development/python-modules/asciimatics/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix
diff --git a/pkgs/development/python-modules/asciitree/default.nix b/nixpkgs/pkgs/development/python-modules/asciitree/default.nix
index 74b78d4a166..74b78d4a166 100644
--- a/pkgs/development/python-modules/asciitree/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asciitree/default.nix
diff --git a/pkgs/development/python-modules/asdf/default.nix b/nixpkgs/pkgs/development/python-modules/asdf/default.nix
index 384421c8966..384421c8966 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asdf/default.nix
diff --git a/pkgs/development/python-modules/ase/3.17.nix b/nixpkgs/pkgs/development/python-modules/ase/3.17.nix
index 3a466170c77..3a466170c77 100644
--- a/pkgs/development/python-modules/ase/3.17.nix
+++ b/nixpkgs/pkgs/development/python-modules/ase/3.17.nix
diff --git a/pkgs/development/python-modules/ase/default.nix b/nixpkgs/pkgs/development/python-modules/ase/default.nix
index 3aa5a432c4b..3aa5a432c4b 100644
--- a/pkgs/development/python-modules/ase/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ase/default.nix
diff --git a/pkgs/development/python-modules/asgiref/default.nix b/nixpkgs/pkgs/development/python-modules/asgiref/default.nix
index e75be31c85f..e75be31c85f 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asgiref/default.nix
diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/nixpkgs/pkgs/development/python-modules/asn1ate/default.nix
index 6af5b3da880..6af5b3da880 100644
--- a/pkgs/development/python-modules/asn1ate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asn1ate/default.nix
diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix
index dc6df10803f..dc6df10803f 100644
--- a/pkgs/development/python-modules/asn1crypto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix
diff --git a/pkgs/development/python-modules/aspy.yaml/default.nix b/nixpkgs/pkgs/development/python-modules/aspy.yaml/default.nix
index 1a910338232..1a910338232 100644
--- a/pkgs/development/python-modules/aspy.yaml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aspy.yaml/default.nix
diff --git a/pkgs/development/python-modules/astor/default.nix b/nixpkgs/pkgs/development/python-modules/astor/default.nix
index e8ea8c37cd9..e8ea8c37cd9 100644
--- a/pkgs/development/python-modules/astor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/astor/default.nix
diff --git a/pkgs/development/python-modules/astral/default.nix b/nixpkgs/pkgs/development/python-modules/astral/default.nix
index 5338b67b50d..5338b67b50d 100644
--- a/pkgs/development/python-modules/astral/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/astral/default.nix
diff --git a/pkgs/development/python-modules/astroid/1.6.nix b/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix
index cdbbe547aec..cdbbe547aec 100644
--- a/pkgs/development/python-modules/astroid/1.6.nix
+++ b/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix
diff --git a/pkgs/development/python-modules/astroid/default.nix b/nixpkgs/pkgs/development/python-modules/astroid/default.nix
index 5d24a05aa54..5d24a05aa54 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/astroid/default.nix
diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix
index 4300165470c..4300165470c 100644
--- a/pkgs/development/python-modules/astropy-healpix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix
diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/nixpkgs/pkgs/development/python-modules/astropy-helpers/default.nix
index 93b2784902f..93b2784902f 100644
--- a/pkgs/development/python-modules/astropy-helpers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/astropy-helpers/default.nix
diff --git a/pkgs/development/python-modules/astropy/default.nix b/nixpkgs/pkgs/development/python-modules/astropy/default.nix
index c23c15e1d4d..c23c15e1d4d 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/astropy/default.nix
diff --git a/pkgs/development/python-modules/astroquery/default.nix b/nixpkgs/pkgs/development/python-modules/astroquery/default.nix
index 461d8801e60..461d8801e60 100644
--- a/pkgs/development/python-modules/astroquery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/astroquery/default.nix
diff --git a/pkgs/development/python-modules/asttokens/default.nix b/nixpkgs/pkgs/development/python-modules/asttokens/default.nix
index 8c8a1b76b1a..8c8a1b76b1a 100644
--- a/pkgs/development/python-modules/asttokens/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asttokens/default.nix
diff --git a/pkgs/development/python-modules/astunparse/default.nix b/nixpkgs/pkgs/development/python-modules/astunparse/default.nix
index 56570295dee..56570295dee 100644
--- a/pkgs/development/python-modules/astunparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/astunparse/default.nix
diff --git a/pkgs/development/python-modules/async_generator/default.nix b/nixpkgs/pkgs/development/python-modules/async_generator/default.nix
index b8ec2f54476..b8ec2f54476 100644
--- a/pkgs/development/python-modules/async_generator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/async_generator/default.nix
diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/nixpkgs/pkgs/development/python-modules/async_timeout/default.nix
index aabf30183d5..aabf30183d5 100644
--- a/pkgs/development/python-modules/async_timeout/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/async_timeout/default.nix
diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix
index 2a47f13fe4b..2a47f13fe4b 100644
--- a/pkgs/development/python-modules/asyncpg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix
diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
index 3d225079441..3d225079441 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
diff --git a/pkgs/development/python-modules/asyncssh/fix-sftp-chmod-test-nixos.patch b/nixpkgs/pkgs/development/python-modules/asyncssh/fix-sftp-chmod-test-nixos.patch
index 845139a4fec..845139a4fec 100644
--- a/pkgs/development/python-modules/asyncssh/fix-sftp-chmod-test-nixos.patch
+++ b/nixpkgs/pkgs/development/python-modules/asyncssh/fix-sftp-chmod-test-nixos.patch
diff --git a/pkgs/development/python-modules/asynctest/default.nix b/nixpkgs/pkgs/development/python-modules/asynctest/default.nix
index a9c012ba831..a9c012ba831 100644
--- a/pkgs/development/python-modules/asynctest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asynctest/default.nix
diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix
index 3de3277a72d..3de3277a72d 100755
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix
diff --git a/pkgs/development/python-modules/atom/default.nix b/nixpkgs/pkgs/development/python-modules/atom/default.nix
index fdaebda089f..fdaebda089f 100644
--- a/pkgs/development/python-modules/atom/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/atom/default.nix
diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/nixpkgs/pkgs/development/python-modules/atomiclong/default.nix
index 8f3aae7b19d..8f3aae7b19d 100644
--- a/pkgs/development/python-modules/atomiclong/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/atomiclong/default.nix
diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix
index eed9591d7bd..eed9591d7bd 100644
--- a/pkgs/development/python-modules/atomicwrites/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix
diff --git a/pkgs/development/python-modules/atomman/default.nix b/nixpkgs/pkgs/development/python-modules/atomman/default.nix
index d873700f32a..d873700f32a 100644
--- a/pkgs/development/python-modules/atomman/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/atomman/default.nix
diff --git a/pkgs/development/python-modules/atpublic/default.nix b/nixpkgs/pkgs/development/python-modules/atpublic/default.nix
index 6657b41cc78..6657b41cc78 100644
--- a/pkgs/development/python-modules/atpublic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/atpublic/default.nix
diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix
index 5d664e77d29..5d664e77d29 100644
--- a/pkgs/development/python-modules/atsim_potentials/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix
diff --git a/pkgs/development/python-modules/attrdict/default.nix b/nixpkgs/pkgs/development/python-modules/attrdict/default.nix
index 29e3ca09cc5..29e3ca09cc5 100644
--- a/pkgs/development/python-modules/attrdict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/attrdict/default.nix
diff --git a/pkgs/development/python-modules/attrs/default.nix b/nixpkgs/pkgs/development/python-modules/attrs/default.nix
index e3691a5dc32..e3691a5dc32 100644
--- a/pkgs/development/python-modules/attrs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/attrs/default.nix
diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix
index d1ccef1ece4..d1ccef1ece4 100644
--- a/pkgs/development/python-modules/audio-metadata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix
diff --git a/pkgs/development/python-modules/audioread/default.nix b/nixpkgs/pkgs/development/python-modules/audioread/default.nix
index addd187abeb..addd187abeb 100644
--- a/pkgs/development/python-modules/audioread/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/audioread/default.nix
diff --git a/pkgs/development/python-modules/audiotools/default.nix b/nixpkgs/pkgs/development/python-modules/audiotools/default.nix
index ee029726d1c..ee029726d1c 100644
--- a/pkgs/development/python-modules/audiotools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/audiotools/default.nix
diff --git a/pkgs/development/python-modules/augeas/default.nix b/nixpkgs/pkgs/development/python-modules/augeas/default.nix
index 12a3529f864..12a3529f864 100644
--- a/pkgs/development/python-modules/augeas/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/augeas/default.nix
diff --git a/pkgs/development/python-modules/authheaders/default.nix b/nixpkgs/pkgs/development/python-modules/authheaders/default.nix
index fdb478bc143..fdb478bc143 100644
--- a/pkgs/development/python-modules/authheaders/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/authheaders/default.nix
diff --git a/pkgs/development/python-modules/authlib/default.nix b/nixpkgs/pkgs/development/python-modules/authlib/default.nix
index 579652c3f95..579652c3f95 100644
--- a/pkgs/development/python-modules/authlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/authlib/default.nix
diff --git a/pkgs/development/python-modules/authres/default.nix b/nixpkgs/pkgs/development/python-modules/authres/default.nix
index d2a72461b17..d2a72461b17 100644
--- a/pkgs/development/python-modules/authres/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/authres/default.nix
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/nixpkgs/pkgs/development/python-modules/autobahn/default.nix
index c3d95f8915c..c3d95f8915c 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/autobahn/default.nix
diff --git a/pkgs/development/python-modules/autograd/default.nix b/nixpkgs/pkgs/development/python-modules/autograd/default.nix
index 68dc9339ce4..68dc9339ce4 100644
--- a/pkgs/development/python-modules/autograd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/autograd/default.nix
diff --git a/pkgs/development/python-modules/autologging/default.nix b/nixpkgs/pkgs/development/python-modules/autologging/default.nix
index 1d028eeb187..1d028eeb187 100644
--- a/pkgs/development/python-modules/autologging/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/autologging/default.nix
diff --git a/pkgs/development/python-modules/automat/default.nix b/nixpkgs/pkgs/development/python-modules/automat/default.nix
index fb6ac1daa1f..fb6ac1daa1f 100644
--- a/pkgs/development/python-modules/automat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/automat/default.nix
diff --git a/pkgs/development/python-modules/autopep8/default.nix b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix
index d6b751034c6..d6b751034c6 100644
--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix
diff --git a/pkgs/development/python-modules/av/default.nix b/nixpkgs/pkgs/development/python-modules/av/default.nix
index 8998abd6986..8998abd6986 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/av/default.nix
diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix
index 46272a5418d..46272a5418d 100644
--- a/pkgs/development/python-modules/avro-python3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix
diff --git a/pkgs/development/python-modules/avro/default.nix b/nixpkgs/pkgs/development/python-modules/avro/default.nix
index 839c7fa45be..839c7fa45be 100644
--- a/pkgs/development/python-modules/avro/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/avro/default.nix
diff --git a/pkgs/development/python-modules/avro3k/default.nix b/nixpkgs/pkgs/development/python-modules/avro3k/default.nix
index 3a5b34ebb85..3a5b34ebb85 100644
--- a/pkgs/development/python-modules/avro3k/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/avro3k/default.nix
diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix
index 945c941dec4..945c941dec4 100644
--- a/pkgs/development/python-modules/awesome-slugify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix
diff --git a/pkgs/development/python-modules/awesome-slugify/slugify_filename_test.patch b/nixpkgs/pkgs/development/python-modules/awesome-slugify/slugify_filename_test.patch
index 3283d76eae0..3283d76eae0 100644
--- a/pkgs/development/python-modules/awesome-slugify/slugify_filename_test.patch
+++ b/nixpkgs/pkgs/development/python-modules/awesome-slugify/slugify_filename_test.patch
diff --git a/pkgs/development/python-modules/awkward/default.nix b/nixpkgs/pkgs/development/python-modules/awkward/default.nix
index 1d2ebdf2655..1d2ebdf2655 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/awkward/default.nix
diff --git a/pkgs/development/python-modules/awkward1/default.nix b/nixpkgs/pkgs/development/python-modules/awkward1/default.nix
index a35a97c5e02..a35a97c5e02 100644
--- a/pkgs/development/python-modules/awkward1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/awkward1/default.nix
diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix
index 1f03ef8cb3b..1f03ef8cb3b 100644
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix
diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix
index d9c90cfa049..d9c90cfa049 100644
--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix
diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix
index 732d5fba528..732d5fba528 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix
diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix
index c0ca6908586..c0ca6908586 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix
diff --git a/pkgs/development/python-modules/azure-applicationinsights/default.nix b/nixpkgs/pkgs/development/python-modules/azure-applicationinsights/default.nix
index f0e70b8d86c..f0e70b8d86c 100644
--- a/pkgs/development/python-modules/azure-applicationinsights/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-applicationinsights/default.nix
diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix
index f772d16942f..f772d16942f 100644
--- a/pkgs/development/python-modules/azure-batch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix
diff --git a/pkgs/development/python-modules/azure-common/default.nix b/nixpkgs/pkgs/development/python-modules/azure-common/default.nix
index b842a66cd27..b842a66cd27 100644
--- a/pkgs/development/python-modules/azure-common/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-common/default.nix
diff --git a/pkgs/development/python-modules/azure-core/default.nix b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix
index ee134762149..ee134762149 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix
diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix
index 5716b1254af..5716b1254af 100644
--- a/pkgs/development/python-modules/azure-cosmos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix
diff --git a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix b/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
index 7a7c0e7215d..7a7c0e7215d 100644
--- a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
diff --git a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
index c11ffae1e3d..c11ffae1e3d 100644
--- a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix
index 5c45b843c76..5c45b843c76 100644
--- a/pkgs/development/python-modules/azure-datalake-store/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix
diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix
index 19a0210cc5e..19a0210cc5e 100644
--- a/pkgs/development/python-modules/azure-eventgrid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix
diff --git a/pkgs/development/python-modules/azure-functions-devops-build/default.nix b/nixpkgs/pkgs/development/python-modules/azure-functions-devops-build/default.nix
index 03007ae3c23..03007ae3c23 100644
--- a/pkgs/development/python-modules/azure-functions-devops-build/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-functions-devops-build/default.nix
diff --git a/pkgs/development/python-modules/azure-graphrbac/default.nix b/nixpkgs/pkgs/development/python-modules/azure-graphrbac/default.nix
index 57fec6ff525..57fec6ff525 100644
--- a/pkgs/development/python-modules/azure-graphrbac/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-graphrbac/default.nix
diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix
index e4b894eca64..e4b894eca64 100644
--- a/pkgs/development/python-modules/azure-identity/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix
diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix
index 34629e6eb48..34629e6eb48 100644
--- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix
diff --git a/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix
index fd3f3c0284f..fd3f3c0284f 100644
--- a/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix
diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix
index e2b40c29d85..e2b40c29d85 100644
--- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix
diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix
index b6f7f1d70d4..b6f7f1d70d4 100644
--- a/pkgs/development/python-modules/azure-keyvault/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix
diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/nixpkgs/pkgs/development/python-modules/azure-loganalytics/default.nix
index 4bfda9a9342..4bfda9a9342 100644
--- a/pkgs/development/python-modules/azure-loganalytics/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-loganalytics/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
index 83ca8809fc2..83ca8809fc2 100644
--- a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
index 9f5c04adb26..9f5c04adb26 100644
--- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
index 1cacd988157..1cacd988157 100644
--- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
index 0a485f05f91..0a485f05f91 100644
--- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
index 994886afc70..994886afc70 100644
--- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix
index 91936af014f..91936af014f 100644
--- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
index 6da0cf2210c..6da0cf2210c 100644
--- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix
index 8c658145d7e..8c658145d7e 100644
--- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix
index d9375942b4d..d9375942b4d 100644
--- a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
index da6d1639a13..da6d1639a13 100644
--- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
index c535971c7bf..c535971c7bf 100644
--- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
index 2be5d27f82a..2be5d27f82a 100644
--- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix
index da8dc95dad0..da8dc95dad0 100644
--- a/pkgs/development/python-modules/azure-mgmt-common/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index afe57ee6204..afe57ee6204 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
index de4a1338611..de4a1338611 100644
--- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
index 5bf67fc6787..5bf67fc6787 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
index 821c7db0d32..821c7db0d32 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index 41124e44854..41124e44854 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
index 45542c8e9d5..45542c8e9d5 100644
--- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index 0d610eebe9c..0d610eebe9c 100644
--- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix
index ad77a75fe83..ad77a75fe83 100644
--- a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix
index ce4f623657e..ce4f623657e 100644
--- a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
index 5d2db3c2112..5d2db3c2112 100644
--- a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
index 93c294e4be9..93c294e4be9 100644
--- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix
index 276cc86ad8f..276cc86ad8f 100644
--- a/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix
index 08cdcd72182..08cdcd72182 100644
--- a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
index 756af164a71..756af164a71 100644
--- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix
index 0f1527f688b..0f1527f688b 100644
--- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
index f5ddbf0fcc7..f5ddbf0fcc7 100644
--- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
index c780d07c7ce..c780d07c7ce 100644
--- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
index 789784babfb..789784babfb 100644
--- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
index 4b8aef08f1c..4b8aef08f1c 100644
--- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
index f5b04c36b0d..f5b04c36b0d 100644
--- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
index 29069d71b88..29069d71b88 100644
--- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
index cdb20167b9c..cdb20167b9c 100644
--- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
index c72ca47cff9..c72ca47cff9 100644
--- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
index 26918fbd7db..26918fbd7db 100644
--- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix
index 9f5c04adb26..9f5c04adb26 100644
--- a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
index 53aeff46c58..53aeff46c58 100644
--- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
index a5e2829a930..a5e2829a930 100644
--- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-logic/default.nix
index 345f11f8626..345f11f8626 100644
--- a/pkgs/development/python-modules/azure-mgmt-logic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-logic/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix
index 47e91ecf49f..47e91ecf49f 100644
--- a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix
index 4d059480c44..4d059480c44 100644
--- a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
index 080647bae96..080647bae96 100644
--- a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix
index c546a7eeba3..c546a7eeba3 100644
--- a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix
index b18c0267236..b18c0267236 100644
--- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
index db30d30d755..db30d30d755 100644
--- a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix
index f3dfaba6d9c..f3dfaba6d9c 100644
--- a/pkgs/development/python-modules/azure-mgmt-media/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
index 252760950e5..252760950e5 100644
--- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix
index 328e81c8fe7..328e81c8fe7 100644
--- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index 6bf207c6e4c..6bf207c6e4c 100644
--- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix
index 4663b9fa035..4663b9fa035 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
index a8ebba57648..a8ebba57648 100644
--- a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
index fd2664b0ec0..fd2664b0ec0 100644
--- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
index 4df00abc806..4df00abc806 100644
--- a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix
index 537e576b2b5..537e576b2b5 100644
--- a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix
index 98855730ba3..98855730ba3 100644
--- a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
index ae4a5fee2c9..ae4a5fee2c9 100644
--- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
index 5747881fd4e..5747881fd4e 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
index 990f494eced..990f494eced 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix
index 9274bd53cf6..9274bd53cf6 100644
--- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix
index b60a82a7b1a..b60a82a7b1a 100644
--- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
index 5d13acb6ec8..5d13acb6ec8 100644
--- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index 8f9128a62a0..8f9128a62a0 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix
index 366e8df9a75..366e8df9a75 100644
--- a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix
index 936a1b4269c..936a1b4269c 100644
--- a/pkgs/development/python-modules/azure-mgmt-search/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix
index 5a9d8849f8d..5a9d8849f8d 100644
--- a/pkgs/development/python-modules/azure-mgmt-security/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
index 72c363b3e66..72c363b3e66 100644
--- a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
index 03084e11cf3..03084e11cf3 100644
--- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
index 2ccb773c105..2ccb773c105 100644
--- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix
index 0929ca3ff5c..0929ca3ff5c 100644
--- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix
index a34ebae2b81..a34ebae2b81 100644
--- a/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 552b1c88792..552b1c88792 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
index 92dcc7cd952..92dcc7cd952 100644
--- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
index 946be6f34ca..946be6f34ca 100644
--- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix
index ea6c1502123..ea6c1502123 100644
--- a/pkgs/development/python-modules/azure-mgmt-web/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix
diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix
index dc4a011e078..dc4a011e078 100644
--- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix
diff --git a/pkgs/development/python-modules/azure-nspkg/default.nix b/nixpkgs/pkgs/development/python-modules/azure-nspkg/default.nix
index 5be90194194..5be90194194 100644
--- a/pkgs/development/python-modules/azure-nspkg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-nspkg/default.nix
diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix
index 02460b27952..02460b27952 100644
--- a/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix
diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix
index 19420b0526d..19420b0526d 100644
--- a/pkgs/development/python-modules/azure-servicefabric/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix
diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
index dbd4c1c040f..dbd4c1c040f 100644
--- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix
index 5ec0dc9f6eb..5ec0dc9f6eb 100644
--- a/pkgs/development/python-modules/azure-storage-blob/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix
diff --git a/pkgs/development/python-modules/azure-storage-common/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-common/default.nix
index 50fb3450d84..50fb3450d84 100644
--- a/pkgs/development/python-modules/azure-storage-common/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-storage-common/default.nix
diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
index 78950d2971e..78950d2971e 100644
--- a/pkgs/development/python-modules/azure-storage-file-share/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
diff --git a/pkgs/development/python-modules/azure-storage-file/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-file/default.nix
index 088b5260e65..088b5260e65 100644
--- a/pkgs/development/python-modules/azure-storage-file/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-storage-file/default.nix
diff --git a/pkgs/development/python-modules/azure-storage-nspkg/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-nspkg/default.nix
index b8e243c9b6a..b8e243c9b6a 100644
--- a/pkgs/development/python-modules/azure-storage-nspkg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-storage-nspkg/default.nix
diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix
index 515b3f398df..515b3f398df 100644
--- a/pkgs/development/python-modules/azure-storage-queue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix
diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix
index c199fbbeb36..c199fbbeb36 100644
--- a/pkgs/development/python-modules/azure-storage/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix
diff --git a/pkgs/development/python-modules/azure/default.nix b/nixpkgs/pkgs/development/python-modules/azure/default.nix
index 0a2e733ea1a..0a2e733ea1a 100644
--- a/pkgs/development/python-modules/azure/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/azure/default.nix
diff --git a/pkgs/development/python-modules/babelfish/default.nix b/nixpkgs/pkgs/development/python-modules/babelfish/default.nix
index c8245a15c7f..c8245a15c7f 100644
--- a/pkgs/development/python-modules/babelfish/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/babelfish/default.nix
diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/nixpkgs/pkgs/development/python-modules/babelgladeextractor/default.nix
index 4ed52d333d6..4ed52d333d6 100644
--- a/pkgs/development/python-modules/babelgladeextractor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/babelgladeextractor/default.nix
diff --git a/pkgs/development/python-modules/backcall/default.nix b/nixpkgs/pkgs/development/python-modules/backcall/default.nix
index 2eb44cb3624..2eb44cb3624 100644
--- a/pkgs/development/python-modules/backcall/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backcall/default.nix
diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix
index 1b8b8f2ba47..1b8b8f2ba47 100644
--- a/pkgs/development/python-modules/backports-shutil-which/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix
diff --git a/pkgs/development/python-modules/backports_abc/default.nix b/nixpkgs/pkgs/development/python-modules/backports_abc/default.nix
index ab34d376de0..ab34d376de0 100644
--- a/pkgs/development/python-modules/backports_abc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_abc/default.nix
diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix
index ce5d15c212a..ce5d15c212a 100644
--- a/pkgs/development/python-modules/backports_csv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix
diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix
index 8cb84c02b37..8cb84c02b37 100644
--- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix
diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/nixpkgs/pkgs/development/python-modules/backports_lzma/default.nix
index 997e4930ac7..997e4930ac7 100644
--- a/pkgs/development/python-modules/backports_lzma/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_lzma/default.nix
diff --git a/pkgs/development/python-modules/backports_os/default.nix b/nixpkgs/pkgs/development/python-modules/backports_os/default.nix
index 9d0ddc2cad9..9d0ddc2cad9 100644
--- a/pkgs/development/python-modules/backports_os/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_os/default.nix
diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
index 14365747971..14365747971 100644
--- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
diff --git a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix b/nixpkgs/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
index 013fe9f446f..013fe9f446f 100644
--- a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
diff --git a/pkgs/development/python-modules/backports_tempfile/default.nix b/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix
index c2dbb0e6fa8..c2dbb0e6fa8 100644
--- a/pkgs/development/python-modules/backports_tempfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix
diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix
index 57d2cad281e..57d2cad281e 100644
--- a/pkgs/development/python-modules/backports_unittest-mock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix
diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix
index 8b818398ec9..8b818398ec9 100644
--- a/pkgs/development/python-modules/backports_weakref/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix
diff --git a/pkgs/development/python-modules/bandit/default.nix b/nixpkgs/pkgs/development/python-modules/bandit/default.nix
index 64ef8ec53fa..64ef8ec53fa 100644
--- a/pkgs/development/python-modules/bandit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bandit/default.nix
diff --git a/pkgs/development/python-modules/bap/default.nix b/nixpkgs/pkgs/development/python-modules/bap/default.nix
index e0492a7d1c4..e0492a7d1c4 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bap/default.nix
diff --git a/pkgs/development/python-modules/base58/default.nix b/nixpkgs/pkgs/development/python-modules/base58/default.nix
index aafd73b8d8d..aafd73b8d8d 100644
--- a/pkgs/development/python-modules/base58/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/base58/default.nix
diff --git a/pkgs/development/python-modules/baselines/default.nix b/nixpkgs/pkgs/development/python-modules/baselines/default.nix
index 56a60de5979..56a60de5979 100644
--- a/pkgs/development/python-modules/baselines/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/baselines/default.nix
diff --git a/pkgs/development/python-modules/basemap/default.nix b/nixpkgs/pkgs/development/python-modules/basemap/default.nix
index a06bcebc8e6..a06bcebc8e6 100644
--- a/pkgs/development/python-modules/basemap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/basemap/default.nix
diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/nixpkgs/pkgs/development/python-modules/bash_kernel/default.nix
index 191f0342674..191f0342674 100644
--- a/pkgs/development/python-modules/bash_kernel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bash_kernel/default.nix
diff --git a/pkgs/development/python-modules/bashlex/default.nix b/nixpkgs/pkgs/development/python-modules/bashlex/default.nix
index c575dc516ff..c575dc516ff 100644
--- a/pkgs/development/python-modules/bashlex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bashlex/default.nix
diff --git a/pkgs/development/python-modules/basiciw/default.nix b/nixpkgs/pkgs/development/python-modules/basiciw/default.nix
index 0d25d7cdbe9..0d25d7cdbe9 100644
--- a/pkgs/development/python-modules/basiciw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/basiciw/default.nix
diff --git a/pkgs/development/python-modules/batinfo/default.nix b/nixpkgs/pkgs/development/python-modules/batinfo/default.nix
index 3e21fae1de6..3e21fae1de6 100644
--- a/pkgs/development/python-modules/batinfo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/batinfo/default.nix
diff --git a/pkgs/development/python-modules/bayespy/default.nix b/nixpkgs/pkgs/development/python-modules/bayespy/default.nix
index 210fbbe2176..210fbbe2176 100644
--- a/pkgs/development/python-modules/bayespy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bayespy/default.nix
diff --git a/pkgs/development/python-modules/bcdoc/default.nix b/nixpkgs/pkgs/development/python-modules/bcdoc/default.nix
index b8cbf8537dc..b8cbf8537dc 100644
--- a/pkgs/development/python-modules/bcdoc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bcdoc/default.nix
diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix
index c32fefbbdfe..c32fefbbdfe 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix
diff --git a/pkgs/development/python-modules/beaker/default.nix b/nixpkgs/pkgs/development/python-modules/beaker/default.nix
index 09e0b8b3f3e..09e0b8b3f3e 100644
--- a/pkgs/development/python-modules/beaker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/beaker/default.nix
diff --git a/pkgs/development/python-modules/beancount/default.nix b/nixpkgs/pkgs/development/python-modules/beancount/default.nix
index 9405e3489d4..9405e3489d4 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/beancount/default.nix
diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/nixpkgs/pkgs/development/python-modules/beanstalkc/default.nix
index e83a9f67789..e83a9f67789 100644
--- a/pkgs/development/python-modules/beanstalkc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/beanstalkc/default.nix
diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix
index 1720738b169..1720738b169 100644
--- a/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix
diff --git a/pkgs/development/python-modules/bedup/default.nix b/nixpkgs/pkgs/development/python-modules/bedup/default.nix
index 13aa48f7f8f..13aa48f7f8f 100644
--- a/pkgs/development/python-modules/bedup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bedup/default.nix
diff --git a/pkgs/development/python-modules/behave/default.nix b/nixpkgs/pkgs/development/python-modules/behave/default.nix
index 6d0364676f9..6d0364676f9 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/behave/default.nix
diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix
index 762154ac45d..762154ac45d 100644
--- a/pkgs/development/python-modules/betamax-matchers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix
diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/nixpkgs/pkgs/development/python-modules/betamax-serializers/default.nix
index 41341c24481..41341c24481 100644
--- a/pkgs/development/python-modules/betamax-serializers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/betamax-serializers/default.nix
diff --git a/pkgs/development/python-modules/betamax/default.nix b/nixpkgs/pkgs/development/python-modules/betamax/default.nix
index 8051ed0beff..8051ed0beff 100644
--- a/pkgs/development/python-modules/betamax/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/betamax/default.nix
diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix
index 849b6e8b240..849b6e8b240 100644
--- a/pkgs/development/python-modules/bibtexparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix
diff --git a/pkgs/development/python-modules/bidict/default.nix b/nixpkgs/pkgs/development/python-modules/bidict/default.nix
index e96e59dd7cf..e96e59dd7cf 100644
--- a/pkgs/development/python-modules/bidict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bidict/default.nix
diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix
index 6b7bad58bc4..6b7bad58bc4 100644
--- a/pkgs/development/python-modules/bids-validator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix
diff --git a/pkgs/development/python-modules/billiard/default.nix b/nixpkgs/pkgs/development/python-modules/billiard/default.nix
index e53aa40446e..e53aa40446e 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/billiard/default.nix
diff --git a/pkgs/development/python-modules/binaryornot/default.nix b/nixpkgs/pkgs/development/python-modules/binaryornot/default.nix
index 77f1ff7cbd0..77f1ff7cbd0 100644
--- a/pkgs/development/python-modules/binaryornot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/binaryornot/default.nix
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix
index 97c6b957a43..97c6b957a43 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix
diff --git a/pkgs/development/python-modules/biopython/default.nix b/nixpkgs/pkgs/development/python-modules/biopython/default.nix
index 727687c5e70..727687c5e70 100644
--- a/pkgs/development/python-modules/biopython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/biopython/default.nix
diff --git a/pkgs/development/python-modules/bitarray/default.nix b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
index d89ab9c3107..d89ab9c3107 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/nixpkgs/pkgs/development/python-modules/bitbucket-api/default.nix
index 0d1ac109179..0d1ac109179 100644
--- a/pkgs/development/python-modules/bitbucket-api/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitbucket-api/default.nix
diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/nixpkgs/pkgs/development/python-modules/bitbucket-cli/default.nix
index 0a54c0ed17c..0a54c0ed17c 100644
--- a/pkgs/development/python-modules/bitbucket-cli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitbucket-cli/default.nix
diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/nixpkgs/pkgs/development/python-modules/bitcoin-price-api/default.nix
index d9ddc842642..d9ddc842642 100644
--- a/pkgs/development/python-modules/bitcoin-price-api/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitcoin-price-api/default.nix
diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix
index dd85789c59e..dd85789c59e 100644
--- a/pkgs/development/python-modules/bitcoinlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix
diff --git a/pkgs/development/python-modules/bitmath/default.nix b/nixpkgs/pkgs/development/python-modules/bitmath/default.nix
index 092ad6c1003..092ad6c1003 100644
--- a/pkgs/development/python-modules/bitmath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitmath/default.nix
diff --git a/pkgs/development/python-modules/bitstring/default.nix b/nixpkgs/pkgs/development/python-modules/bitstring/default.nix
index 23f4257a357..23f4257a357 100644
--- a/pkgs/development/python-modules/bitstring/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitstring/default.nix
diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix
index 3e546d38697..3e546d38697 100644
--- a/pkgs/development/python-modules/bitstruct/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix
diff --git a/pkgs/development/python-modules/bjoern/default.nix b/nixpkgs/pkgs/development/python-modules/bjoern/default.nix
index 08caabef3bd..08caabef3bd 100644
--- a/pkgs/development/python-modules/bjoern/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bjoern/default.nix
diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/nixpkgs/pkgs/development/python-modules/bkcharts/default.nix
index 270015a423b..270015a423b 100644
--- a/pkgs/development/python-modules/bkcharts/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bkcharts/default.nix
diff --git a/pkgs/development/python-modules/black/default.nix b/nixpkgs/pkgs/development/python-modules/black/default.nix
index 315e891030e..315e891030e 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/black/default.nix
diff --git a/pkgs/development/python-modules/blaze/default.nix b/nixpkgs/pkgs/development/python-modules/blaze/default.nix
index b3c56a618e8..b3c56a618e8 100644
--- a/pkgs/development/python-modules/blaze/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blaze/default.nix
diff --git a/pkgs/development/python-modules/bleach/default.nix b/nixpkgs/pkgs/development/python-modules/bleach/default.nix
index 1033f9def76..1033f9def76 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bleach/default.nix
diff --git a/pkgs/development/python-modules/blessed/default.nix b/nixpkgs/pkgs/development/python-modules/blessed/default.nix
index 164848aeac9..164848aeac9 100644
--- a/pkgs/development/python-modules/blessed/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blessed/default.nix
diff --git a/pkgs/development/python-modules/blessings/default.nix b/nixpkgs/pkgs/development/python-modules/blessings/default.nix
index 23e9067ea33..23e9067ea33 100644
--- a/pkgs/development/python-modules/blessings/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blessings/default.nix
diff --git a/pkgs/development/python-modules/blinker/default.nix b/nixpkgs/pkgs/development/python-modules/blinker/default.nix
index 441d1250e0a..441d1250e0a 100644
--- a/pkgs/development/python-modules/blinker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blinker/default.nix
diff --git a/pkgs/development/python-modules/blinkstick/default.nix b/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix
index 96f7bfebdeb..96f7bfebdeb 100644
--- a/pkgs/development/python-modules/blinkstick/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix
diff --git a/pkgs/development/python-modules/blis/default.nix b/nixpkgs/pkgs/development/python-modules/blis/default.nix
index ca6d5d62442..ca6d5d62442 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blis/default.nix
diff --git a/pkgs/development/python-modules/blist/default.nix b/nixpkgs/pkgs/development/python-modules/blist/default.nix
index 90a4b99cda3..90a4b99cda3 100644
--- a/pkgs/development/python-modules/blist/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blist/default.nix
diff --git a/pkgs/development/python-modules/blivet/default.nix b/nixpkgs/pkgs/development/python-modules/blivet/default.nix
index 4b96e86193d..4b96e86193d 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blivet/default.nix
diff --git a/pkgs/development/python-modules/block-io/default.nix b/nixpkgs/pkgs/development/python-modules/block-io/default.nix
index f6bd3178bba..f6bd3178bba 100644
--- a/pkgs/development/python-modules/block-io/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/block-io/default.nix
diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix
index 7b67997fa08..7b67997fa08 100644
--- a/pkgs/development/python-modules/blockdiag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix
diff --git a/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix b/nixpkgs/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix
index 6190adcba5f..6190adcba5f 100644
--- a/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix
diff --git a/pkgs/development/python-modules/bokeh/default.nix b/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
index 18f59b05288..18f59b05288 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
diff --git a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/nixpkgs/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
index f8f33c0021f..f8f33c0021f 100644
--- a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
+++ b/nixpkgs/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
diff --git a/pkgs/development/python-modules/boltons/default.nix b/nixpkgs/pkgs/development/python-modules/boltons/default.nix
index 6470b7da859..6470b7da859 100644
--- a/pkgs/development/python-modules/boltons/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/boltons/default.nix
diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix
index d89cf3c615d..d89cf3c615d 100644
--- a/pkgs/development/python-modules/boltztrap2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix
diff --git a/pkgs/development/python-modules/boolean-py/default.nix b/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix
index 8f5ef73c7e2..8f5ef73c7e2 100644
--- a/pkgs/development/python-modules/boolean-py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 8bb713b7641..8bb713b7641 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix
diff --git a/pkgs/development/python-modules/boto/default.nix b/nixpkgs/pkgs/development/python-modules/boto/default.nix
index 8452e05becc..8452e05becc 100644
--- a/pkgs/development/python-modules/boto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/boto/default.nix
diff --git a/pkgs/development/python-modules/boto3/default.nix b/nixpkgs/pkgs/development/python-modules/boto3/default.nix
index 724fc80f141..724fc80f141 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/boto3/default.nix
diff --git a/pkgs/development/python-modules/botocore/default.nix b/nixpkgs/pkgs/development/python-modules/botocore/default.nix
index 50504257c64..50504257c64 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/botocore/default.nix
diff --git a/pkgs/development/python-modules/bottle/default.nix b/nixpkgs/pkgs/development/python-modules/bottle/default.nix
index c0de6eecae9..c0de6eecae9 100644
--- a/pkgs/development/python-modules/bottle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bottle/default.nix
diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix
index f45eea2c5df..f45eea2c5df 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix
diff --git a/pkgs/development/python-modules/box2d/default.nix b/nixpkgs/pkgs/development/python-modules/box2d/default.nix
index 5870bdcdb73..5870bdcdb73 100644
--- a/pkgs/development/python-modules/box2d/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/box2d/default.nix
diff --git a/pkgs/development/python-modules/bpython/default.nix b/nixpkgs/pkgs/development/python-modules/bpython/default.nix
index a91be0e13dd..a91be0e13dd 100644
--- a/pkgs/development/python-modules/bpython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bpython/default.nix
diff --git a/pkgs/development/python-modules/braintree/default.nix b/nixpkgs/pkgs/development/python-modules/braintree/default.nix
index b96e0b7874a..b96e0b7874a 100644
--- a/pkgs/development/python-modules/braintree/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/braintree/default.nix
diff --git a/pkgs/development/python-modules/branca/default.nix b/nixpkgs/pkgs/development/python-modules/branca/default.nix
index 447a5230c7f..447a5230c7f 100644
--- a/pkgs/development/python-modules/branca/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/branca/default.nix
diff --git a/pkgs/development/python-modules/breathe/default.nix b/nixpkgs/pkgs/development/python-modules/breathe/default.nix
index d2b19ae8650..d2b19ae8650 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/breathe/default.nix
diff --git a/pkgs/development/python-modules/broadlink/default.nix b/nixpkgs/pkgs/development/python-modules/broadlink/default.nix
index 99d7641c07e..99d7641c07e 100644
--- a/pkgs/development/python-modules/broadlink/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/broadlink/default.nix
diff --git a/pkgs/development/python-modules/brotli/default.nix b/nixpkgs/pkgs/development/python-modules/brotli/default.nix
index bec205676ba..bec205676ba 100644
--- a/pkgs/development/python-modules/brotli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/brotli/default.nix
diff --git a/pkgs/development/python-modules/brotlipy/default.nix b/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix
index 1dd2a070480..1dd2a070480 100644
--- a/pkgs/development/python-modules/brotlipy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix
diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix
index 13eea3e21fd..13eea3e21fd 100644
--- a/pkgs/development/python-modules/browser-cookie3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix
diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/nixpkgs/pkgs/development/python-modules/browsermob-proxy/default.nix
index b5da73a32d2..b5da73a32d2 100644
--- a/pkgs/development/python-modules/browsermob-proxy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/browsermob-proxy/default.nix
diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix
index a286249ea0f..a286249ea0f 100644
--- a/pkgs/development/python-modules/bsddb3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix
diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix
index f998ebca06d..f998ebca06d 100644
--- a/pkgs/development/python-modules/bt-proximity/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix
diff --git a/pkgs/development/python-modules/btchip/default.nix b/nixpkgs/pkgs/development/python-modules/btchip/default.nix
index 069358a4d6d..069358a4d6d 100644
--- a/pkgs/development/python-modules/btchip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/btchip/default.nix
diff --git a/pkgs/development/python-modules/btrees/default.nix b/nixpkgs/pkgs/development/python-modules/btrees/default.nix
index 4b17b5046aa..4b17b5046aa 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/btrees/default.nix
diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix
index 190598942c7..190598942c7 100644
--- a/pkgs/development/python-modules/bugwarrior/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix
diff --git a/pkgs/development/python-modules/bugz/default.nix b/nixpkgs/pkgs/development/python-modules/bugz/default.nix
index abfde52ef5f..abfde52ef5f 100644
--- a/pkgs/development/python-modules/bugz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bugz/default.nix
diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix
index a342ac99943..a342ac99943 100644
--- a/pkgs/development/python-modules/bugzilla/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix
diff --git a/pkgs/development/python-modules/buildbot/default.nix b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
index 611cb5ad5ff..611cb5ad5ff 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix
index 4f3a0ea04b8..4f3a0ea04b8 100644
--- a/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix
diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
index 4bb82b59856..4bb82b59856 100644
--- a/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
diff --git a/pkgs/development/python-modules/buildbot/skip_test_linux_distro.patch b/nixpkgs/pkgs/development/python-modules/buildbot/skip_test_linux_distro.patch
index 8fe5c7b56b4..8fe5c7b56b4 100644
--- a/pkgs/development/python-modules/buildbot/skip_test_linux_distro.patch
+++ b/nixpkgs/pkgs/development/python-modules/buildbot/skip_test_linux_distro.patch
diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix
index 6352b22b55d..6352b22b55d 100644
--- a/pkgs/development/python-modules/buildbot/worker.nix
+++ b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix
diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix
index c33006377df..c33006377df 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix
diff --git a/pkgs/development/python-modules/buildout-nix/nix.patch b/nixpkgs/pkgs/development/python-modules/buildout-nix/nix.patch
index 49f3c6d90f0..49f3c6d90f0 100644
--- a/pkgs/development/python-modules/buildout-nix/nix.patch
+++ b/nixpkgs/pkgs/development/python-modules/buildout-nix/nix.patch
diff --git a/pkgs/development/python-modules/buildout/default.nix b/nixpkgs/pkgs/development/python-modules/buildout/default.nix
index 419e8dce212..419e8dce212 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/buildout/default.nix
diff --git a/pkgs/development/python-modules/bumps/default.nix b/nixpkgs/pkgs/development/python-modules/bumps/default.nix
index c1e19eb8560..c1e19eb8560 100644
--- a/pkgs/development/python-modules/bumps/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bumps/default.nix
diff --git a/pkgs/development/python-modules/bunch/default.nix b/nixpkgs/pkgs/development/python-modules/bunch/default.nix
index 42918f02339..42918f02339 100644
--- a/pkgs/development/python-modules/bunch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bunch/default.nix
diff --git a/pkgs/development/python-modules/bx-python/default.nix b/nixpkgs/pkgs/development/python-modules/bx-python/default.nix
index 57a3609bad0..57a3609bad0 100644
--- a/pkgs/development/python-modules/bx-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bx-python/default.nix
diff --git a/pkgs/development/python-modules/bz2file/default.nix b/nixpkgs/pkgs/development/python-modules/bz2file/default.nix
index 8efb1c083f2..8efb1c083f2 100644
--- a/pkgs/development/python-modules/bz2file/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bz2file/default.nix
diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix
index 693646c80a4..693646c80a4 100644
--- a/pkgs/development/python-modules/cachecontrol/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix
diff --git a/pkgs/development/python-modules/cached-property/default.nix b/nixpkgs/pkgs/development/python-modules/cached-property/default.nix
index 3a3e6d1e6dd..3a3e6d1e6dd 100644
--- a/pkgs/development/python-modules/cached-property/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cached-property/default.nix
diff --git a/pkgs/development/python-modules/cachelib/default.nix b/nixpkgs/pkgs/development/python-modules/cachelib/default.nix
index 703f3797d1b..703f3797d1b 100644
--- a/pkgs/development/python-modules/cachelib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cachelib/default.nix
diff --git a/pkgs/development/python-modules/cachetools/default.nix b/nixpkgs/pkgs/development/python-modules/cachetools/default.nix
index 30f0d9132bb..30f0d9132bb 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cachetools/default.nix
diff --git a/pkgs/development/python-modules/cachy/default.nix b/nixpkgs/pkgs/development/python-modules/cachy/default.nix
index e66bef51d03..e66bef51d03 100644
--- a/pkgs/development/python-modules/cachy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cachy/default.nix
diff --git a/pkgs/development/python-modules/cadquery/default.nix b/nixpkgs/pkgs/development/python-modules/cadquery/default.nix
index 6f3632f743b..6f3632f743b 100644
--- a/pkgs/development/python-modules/cadquery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cadquery/default.nix
diff --git a/pkgs/development/python-modules/cairocffi/0_9.nix b/nixpkgs/pkgs/development/python-modules/cairocffi/0_9.nix
index bd7bde42901..bd7bde42901 100644
--- a/pkgs/development/python-modules/cairocffi/0_9.nix
+++ b/nixpkgs/pkgs/development/python-modules/cairocffi/0_9.nix
diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix
index 574aeefa7fc..574aeefa7fc 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch b/nixpkgs/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
index 307cb428c07..307cb428c07 100644
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
+++ b/nixpkgs/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/nixpkgs/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
index 6542b4367eb..6542b4367eb 100644
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
+++ b/nixpkgs/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
diff --git a/pkgs/development/python-modules/cairocffi/fix_test_scaled_font.patch b/nixpkgs/pkgs/development/python-modules/cairocffi/fix_test_scaled_font.patch
index 39ba63cc94d..39ba63cc94d 100644
--- a/pkgs/development/python-modules/cairocffi/fix_test_scaled_font.patch
+++ b/nixpkgs/pkgs/development/python-modules/cairocffi/fix_test_scaled_font.patch
diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/nixpkgs/pkgs/development/python-modules/cairocffi/generic.nix
index cf1618a865b..cf1618a865b 100644
--- a/pkgs/development/python-modules/cairocffi/generic.nix
+++ b/nixpkgs/pkgs/development/python-modules/cairocffi/generic.nix
diff --git a/pkgs/development/python-modules/cairosvg/1_x.nix b/nixpkgs/pkgs/development/python-modules/cairosvg/1_x.nix
index b6d40a5fdb7..b6d40a5fdb7 100644
--- a/pkgs/development/python-modules/cairosvg/1_x.nix
+++ b/nixpkgs/pkgs/development/python-modules/cairosvg/1_x.nix
diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
index 77c5c21befe..77c5c21befe 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
diff --git a/pkgs/development/python-modules/caldav/default.nix b/nixpkgs/pkgs/development/python-modules/caldav/default.nix
index 895775eb87f..895775eb87f 100644
--- a/pkgs/development/python-modules/caldav/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/caldav/default.nix
diff --git a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix b/nixpkgs/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
index a12a12547e9..a12a12547e9 100644
--- a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
diff --git a/pkgs/development/python-modules/can/default.nix b/nixpkgs/pkgs/development/python-modules/can/default.nix
index b9d2b4b7751..b9d2b4b7751 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/can/default.nix
diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix
index 004669d605b..004669d605b 100644
--- a/pkgs/development/python-modules/canmatrix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix
diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix
index 7457002929a..7457002929a 100644
--- a/pkgs/development/python-modules/canonicaljson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix
diff --git a/pkgs/development/python-modules/canopen/default.nix b/nixpkgs/pkgs/development/python-modules/canopen/default.nix
index a76e05332f1..a76e05332f1 100644
--- a/pkgs/development/python-modules/canopen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/canopen/default.nix
diff --git a/pkgs/development/python-modules/capstone/default.nix b/nixpkgs/pkgs/development/python-modules/capstone/default.nix
index 035632f9cf2..035632f9cf2 100644
--- a/pkgs/development/python-modules/capstone/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/capstone/default.nix
diff --git a/pkgs/development/python-modules/capturer/default.nix b/nixpkgs/pkgs/development/python-modules/capturer/default.nix
index 86062d28a85..86062d28a85 100644
--- a/pkgs/development/python-modules/capturer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/capturer/default.nix
diff --git a/pkgs/development/python-modules/carbon/default.nix b/nixpkgs/pkgs/development/python-modules/carbon/default.nix
index c471240c87a..c471240c87a 100644
--- a/pkgs/development/python-modules/carbon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/carbon/default.nix
diff --git a/pkgs/development/python-modules/carrot/default.nix b/nixpkgs/pkgs/development/python-modules/carrot/default.nix
index 3b976fb7ad9..3b976fb7ad9 100644
--- a/pkgs/development/python-modules/carrot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/carrot/default.nix
diff --git a/pkgs/development/python-modules/cartopy/default.nix b/nixpkgs/pkgs/development/python-modules/cartopy/default.nix
index a3f90b3282a..a3f90b3282a 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cartopy/default.nix
diff --git a/pkgs/development/python-modules/casbin/default.nix b/nixpkgs/pkgs/development/python-modules/casbin/default.nix
index 114625c397c..114625c397c 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/casbin/default.nix
diff --git a/pkgs/development/python-modules/case/default.nix b/nixpkgs/pkgs/development/python-modules/case/default.nix
index 0f1bba36def..0f1bba36def 100644
--- a/pkgs/development/python-modules/case/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/case/default.nix
diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix
index 6fe80e16e12..6fe80e16e12 100644
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix
diff --git a/pkgs/development/python-modules/casttube/default.nix b/nixpkgs/pkgs/development/python-modules/casttube/default.nix
index 5d3b80aeb16..5d3b80aeb16 100644
--- a/pkgs/development/python-modules/casttube/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/casttube/default.nix
diff --git a/pkgs/development/python-modules/catalogue/default.nix b/nixpkgs/pkgs/development/python-modules/catalogue/default.nix
index 2b46368381c..2b46368381c 100644
--- a/pkgs/development/python-modules/catalogue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/catalogue/default.nix
diff --git a/pkgs/development/python-modules/cbor/default.nix b/nixpkgs/pkgs/development/python-modules/cbor/default.nix
index 360872c0f89..360872c0f89 100644
--- a/pkgs/development/python-modules/cbor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cbor/default.nix
diff --git a/pkgs/development/python-modules/cbor2/default.nix b/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
index 5d044b4199c..5d044b4199c 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix
index 9751dcd2f3e..9751dcd2f3e 100644
--- a/pkgs/development/python-modules/cccolutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix
diff --git a/pkgs/development/python-modules/cchardet/default.nix b/nixpkgs/pkgs/development/python-modules/cchardet/default.nix
index 1fb506682ba..1fb506682ba 100644
--- a/pkgs/development/python-modules/cchardet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cchardet/default.nix
diff --git a/pkgs/development/python-modules/cddb/default.nix b/nixpkgs/pkgs/development/python-modules/cddb/default.nix
index f40ff08fcf4..f40ff08fcf4 100644
--- a/pkgs/development/python-modules/cddb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cddb/default.nix
diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/nixpkgs/pkgs/development/python-modules/cdecimal/default.nix
index 0c636e12088..0c636e12088 100644
--- a/pkgs/development/python-modules/cdecimal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cdecimal/default.nix
diff --git a/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix
index 4522379fa64..4522379fa64 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix
diff --git a/pkgs/development/python-modules/cement/default.nix b/nixpkgs/pkgs/development/python-modules/cement/default.nix
index edcb4086cf2..edcb4086cf2 100644
--- a/pkgs/development/python-modules/cement/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cement/default.nix
diff --git a/pkgs/development/python-modules/cerberus/default.nix b/nixpkgs/pkgs/development/python-modules/cerberus/default.nix
index 5218a55078d..5218a55078d 100644
--- a/pkgs/development/python-modules/cerberus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cerberus/default.nix
diff --git a/pkgs/development/python-modules/certifi/default.nix b/nixpkgs/pkgs/development/python-modules/certifi/default.nix
index 7ffc50ea520..7ffc50ea520 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/certifi/default.nix
diff --git a/pkgs/development/python-modules/certipy/default.nix b/nixpkgs/pkgs/development/python-modules/certipy/default.nix
index ce96bce5bc7..ce96bce5bc7 100644
--- a/pkgs/development/python-modules/certipy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/certipy/default.nix
diff --git a/pkgs/development/python-modules/cffi/default.nix b/nixpkgs/pkgs/development/python-modules/cffi/default.nix
index b05aeebf9d4..b05aeebf9d4 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cffi/default.nix
diff --git a/pkgs/development/python-modules/cfgv/default.nix b/nixpkgs/pkgs/development/python-modules/cfgv/default.nix
index 2487caea608..2487caea608 100644
--- a/pkgs/development/python-modules/cfgv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cfgv/default.nix
diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix
index ab6abc4cd6f..ab6abc4cd6f 100644
--- a/pkgs/development/python-modules/cfn-flip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix
diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix
index 7b1ef63767d..7b1ef63767d 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix
diff --git a/pkgs/development/python-modules/cftime/default.nix b/nixpkgs/pkgs/development/python-modules/cftime/default.nix
index 5046017a94d..5046017a94d 100644
--- a/pkgs/development/python-modules/cftime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cftime/default.nix
diff --git a/pkgs/development/python-modules/cgen/default.nix b/nixpkgs/pkgs/development/python-modules/cgen/default.nix
index f6cf985349b..f6cf985349b 100644
--- a/pkgs/development/python-modules/cgen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cgen/default.nix
diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix
index 7496e7e1fcc..7496e7e1fcc 100644
--- a/pkgs/development/python-modules/cgroup-utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix
diff --git a/pkgs/development/python-modules/chai/default.nix b/nixpkgs/pkgs/development/python-modules/chai/default.nix
index 16166d2db80..16166d2db80 100644
--- a/pkgs/development/python-modules/chai/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chai/default.nix
diff --git a/pkgs/development/python-modules/chainer/default.nix b/nixpkgs/pkgs/development/python-modules/chainer/default.nix
index 9585004a89a..9585004a89a 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chainer/default.nix
diff --git a/pkgs/development/python-modules/chainmap/default.nix b/nixpkgs/pkgs/development/python-modules/chainmap/default.nix
index eb769ed4623..eb769ed4623 100644
--- a/pkgs/development/python-modules/chainmap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chainmap/default.nix
diff --git a/pkgs/development/python-modules/chalice/default.nix b/nixpkgs/pkgs/development/python-modules/chalice/default.nix
index d354c523949..d354c523949 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chalice/default.nix
diff --git a/pkgs/development/python-modules/chameleon/default.nix b/nixpkgs/pkgs/development/python-modules/chameleon/default.nix
index a7e51a6513f..a7e51a6513f 100644
--- a/pkgs/development/python-modules/chameleon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chameleon/default.nix
diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix
index 8812e4097ab..8812e4097ab 100644
--- a/pkgs/development/python-modules/channels-redis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix
diff --git a/pkgs/development/python-modules/channels/default.nix b/nixpkgs/pkgs/development/python-modules/channels/default.nix
index b7c83b3b3ff..b7c83b3b3ff 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/channels/default.nix
diff --git a/pkgs/development/python-modules/characteristic/default.nix b/nixpkgs/pkgs/development/python-modules/characteristic/default.nix
index f082510713a..f082510713a 100644
--- a/pkgs/development/python-modules/characteristic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/characteristic/default.nix
diff --git a/pkgs/development/python-modules/chardet/default.nix b/nixpkgs/pkgs/development/python-modules/chardet/default.nix
index 829ae0b0f14..829ae0b0f14 100644
--- a/pkgs/development/python-modules/chardet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chardet/default.nix
diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix
index 0eed42dc286..0eed42dc286 100644
--- a/pkgs/development/python-modules/chart-studio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix
diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix
index eaae8f3d099..eaae8f3d099 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix
diff --git a/pkgs/development/python-modules/cheetah/default.nix b/nixpkgs/pkgs/development/python-modules/cheetah/default.nix
index 98af2f10a0b..98af2f10a0b 100644
--- a/pkgs/development/python-modules/cheetah/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cheetah/default.nix
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
index 971d8848b37..971d8848b37 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix
index d9b9166e0f0..d9b9166e0f0 100644
--- a/pkgs/development/python-modules/cherrypy/17.nix
+++ b/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
index 17531f1406d..17531f1406d 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
diff --git a/pkgs/development/python-modules/chevron/default.nix b/nixpkgs/pkgs/development/python-modules/chevron/default.nix
index 7fa3a2b471d..7fa3a2b471d 100644
--- a/pkgs/development/python-modules/chevron/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/chevron/default.nix
diff --git a/pkgs/development/python-modules/cjson/default.nix b/nixpkgs/pkgs/development/python-modules/cjson/default.nix
index c9b5be5e604..c9b5be5e604 100644
--- a/pkgs/development/python-modules/cjson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cjson/default.nix
diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix
index 599f91f2d07..599f91f2d07 100644
--- a/pkgs/development/python-modules/ckcc-protocol/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix
diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/nixpkgs/pkgs/development/python-modules/cld2-cffi/default.nix
index 7775fee5ba0..7775fee5ba0 100644
--- a/pkgs/development/python-modules/cld2-cffi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cld2-cffi/default.nix
diff --git a/pkgs/development/python-modules/cleo/default.nix b/nixpkgs/pkgs/development/python-modules/cleo/default.nix
index 13a91837a6c..13a91837a6c 100644
--- a/pkgs/development/python-modules/cleo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cleo/default.nix
diff --git a/pkgs/development/python-modules/clf/default.nix b/nixpkgs/pkgs/development/python-modules/clf/default.nix
index 9303f90141d..9303f90141d 100644
--- a/pkgs/development/python-modules/clf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clf/default.nix
diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix
index 2ebc6f44b44..2ebc6f44b44 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix
diff --git a/pkgs/development/python-modules/cliapp/default.nix b/nixpkgs/pkgs/development/python-modules/cliapp/default.nix
index c3e6a120ae7..c3e6a120ae7 100644
--- a/pkgs/development/python-modules/cliapp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cliapp/default.nix
diff --git a/pkgs/development/python-modules/click-completion/default.nix b/nixpkgs/pkgs/development/python-modules/click-completion/default.nix
index 79d85a81c37..79d85a81c37 100644
--- a/pkgs/development/python-modules/click-completion/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-completion/default.nix
diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/nixpkgs/pkgs/development/python-modules/click-default-group/default.nix
index 6bc092dcd4e..6bc092dcd4e 100644
--- a/pkgs/development/python-modules/click-default-group/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-default-group/default.nix
diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix
index 4cd2ea15029..4cd2ea15029 100644
--- a/pkgs/development/python-modules/click-didyoumean/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix
diff --git a/pkgs/development/python-modules/click-log/default.nix b/nixpkgs/pkgs/development/python-modules/click-log/default.nix
index f5626859d06..f5626859d06 100644
--- a/pkgs/development/python-modules/click-log/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-log/default.nix
diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix
index 8039d0cb4c7..8039d0cb4c7 100644
--- a/pkgs/development/python-modules/click-plugins/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix
diff --git a/pkgs/development/python-modules/click-repl/default.nix b/nixpkgs/pkgs/development/python-modules/click-repl/default.nix
index 8a487ab2410..8a487ab2410 100644
--- a/pkgs/development/python-modules/click-repl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-repl/default.nix
diff --git a/pkgs/development/python-modules/click-threading/default.nix b/nixpkgs/pkgs/development/python-modules/click-threading/default.nix
index 3fe2af19fef..3fe2af19fef 100644
--- a/pkgs/development/python-modules/click-threading/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click-threading/default.nix
diff --git a/pkgs/development/python-modules/click/default.nix b/nixpkgs/pkgs/development/python-modules/click/default.nix
index 9951b1711b3..9951b1711b3 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/click/default.nix
diff --git a/pkgs/development/python-modules/clickclick/default.nix b/nixpkgs/pkgs/development/python-modules/clickclick/default.nix
index 93cd5c7a1d7..93cd5c7a1d7 100644
--- a/pkgs/development/python-modules/clickclick/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clickclick/default.nix
diff --git a/pkgs/development/python-modules/cliff/default.nix b/nixpkgs/pkgs/development/python-modules/cliff/default.nix
index 46ac5be03ce..46ac5be03ce 100644
--- a/pkgs/development/python-modules/cliff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cliff/default.nix
diff --git a/pkgs/development/python-modules/clifford/default.nix b/nixpkgs/pkgs/development/python-modules/clifford/default.nix
index 961f6b5bc1d..961f6b5bc1d 100644
--- a/pkgs/development/python-modules/clifford/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clifford/default.nix
diff --git a/pkgs/development/python-modules/cligj/default.nix b/nixpkgs/pkgs/development/python-modules/cligj/default.nix
index 0ec82efed8b..0ec82efed8b 100644
--- a/pkgs/development/python-modules/cligj/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cligj/default.nix
diff --git a/pkgs/development/python-modules/clikit/default.nix b/nixpkgs/pkgs/development/python-modules/clikit/default.nix
index 94f3fa08b13..94f3fa08b13 100644
--- a/pkgs/development/python-modules/clikit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clikit/default.nix
diff --git a/pkgs/development/python-modules/clint/default.nix b/nixpkgs/pkgs/development/python-modules/clint/default.nix
index 602ab00b084..602ab00b084 100644
--- a/pkgs/development/python-modules/clint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clint/default.nix
diff --git a/pkgs/development/python-modules/clize/default.nix b/nixpkgs/pkgs/development/python-modules/clize/default.nix
index 72b6a2fa30a..72b6a2fa30a 100644
--- a/pkgs/development/python-modules/clize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clize/default.nix
diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix
index b814455da3f..b814455da3f 100644
--- a/pkgs/development/python-modules/closure-linter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix
diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix
index a24fc074408..a24fc074408 100644
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix
diff --git a/pkgs/development/python-modules/clustershell/default.nix b/nixpkgs/pkgs/development/python-modules/clustershell/default.nix
index 75a77d4c63c..75a77d4c63c 100644
--- a/pkgs/development/python-modules/clustershell/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/clustershell/default.nix
diff --git a/pkgs/development/python-modules/cma/default.nix b/nixpkgs/pkgs/development/python-modules/cma/default.nix
index 1743e23942f..1743e23942f 100644
--- a/pkgs/development/python-modules/cma/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cma/default.nix
diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
index b2f58887ffb..b2f58887ffb 100644
--- a/pkgs/development/python-modules/cmarkgfm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
index 6cc91f4b74c..6cc91f4b74c 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
diff --git a/pkgs/development/python-modules/cmdline/default.nix b/nixpkgs/pkgs/development/python-modules/cmdline/default.nix
index cf0cff1f155..cf0cff1f155 100644
--- a/pkgs/development/python-modules/cmdline/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cmdline/default.nix
diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix
index 0d0bc368295..0d0bc368295 100644
--- a/pkgs/development/python-modules/cmdtest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix
diff --git a/pkgs/development/python-modules/cntk/default.nix b/nixpkgs/pkgs/development/python-modules/cntk/default.nix
index ce388bb1d5d..ce388bb1d5d 100644
--- a/pkgs/development/python-modules/cntk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cntk/default.nix
diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix
index 054e302dfe7..054e302dfe7 100644
--- a/pkgs/development/python-modules/cnvkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix
diff --git a/pkgs/development/python-modules/cocotb/default.nix b/nixpkgs/pkgs/development/python-modules/cocotb/default.nix
index e10ecd8e840..e10ecd8e840 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cocotb/default.nix
diff --git a/pkgs/development/python-modules/codecov/default.nix b/nixpkgs/pkgs/development/python-modules/codecov/default.nix
index 6b2063f4992..6b2063f4992 100644
--- a/pkgs/development/python-modules/codecov/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/codecov/default.nix
diff --git a/pkgs/development/python-modules/codespell/default.nix b/nixpkgs/pkgs/development/python-modules/codespell/default.nix
index dc531c77fb5..dc531c77fb5 100644
--- a/pkgs/development/python-modules/codespell/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/codespell/default.nix
diff --git a/pkgs/development/python-modules/cogapp/default.nix b/nixpkgs/pkgs/development/python-modules/cogapp/default.nix
index f894380fa49..f894380fa49 100644
--- a/pkgs/development/python-modules/cogapp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cogapp/default.nix
diff --git a/pkgs/development/python-modules/coilmq/default.nix b/nixpkgs/pkgs/development/python-modules/coilmq/default.nix
index 8b103b55171..8b103b55171 100644
--- a/pkgs/development/python-modules/coilmq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/coilmq/default.nix
diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/nixpkgs/pkgs/development/python-modules/coinmarketcap/default.nix
index bcf32714796..bcf32714796 100644
--- a/pkgs/development/python-modules/coinmarketcap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/coinmarketcap/default.nix
diff --git a/pkgs/development/python-modules/colander/default.nix b/nixpkgs/pkgs/development/python-modules/colander/default.nix
index a3e613652db..a3e613652db 100644
--- a/pkgs/development/python-modules/colander/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colander/default.nix
diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix
index 686608445ab..686608445ab 100644
--- a/pkgs/development/python-modules/colanderalchemy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix
diff --git a/pkgs/development/python-modules/colorama/default.nix b/nixpkgs/pkgs/development/python-modules/colorama/default.nix
index d6f84ca8748..d6f84ca8748 100644
--- a/pkgs/development/python-modules/colorama/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colorama/default.nix
diff --git a/pkgs/development/python-modules/colorcet/default.nix b/nixpkgs/pkgs/development/python-modules/colorcet/default.nix
index e4288745d96..e4288745d96 100644
--- a/pkgs/development/python-modules/colorcet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colorcet/default.nix
diff --git a/pkgs/development/python-modules/colorclass/default.nix b/nixpkgs/pkgs/development/python-modules/colorclass/default.nix
index b035bb9b57c..b035bb9b57c 100644
--- a/pkgs/development/python-modules/colorclass/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colorclass/default.nix
diff --git a/pkgs/development/python-modules/colored/default.nix b/nixpkgs/pkgs/development/python-modules/colored/default.nix
index b62d80600c7..b62d80600c7 100644
--- a/pkgs/development/python-modules/colored/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colored/default.nix
diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix
index f27cf5abe75..f27cf5abe75 100644
--- a/pkgs/development/python-modules/coloredlogs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix
diff --git a/pkgs/development/python-modules/colorlog/default.nix b/nixpkgs/pkgs/development/python-modules/colorlog/default.nix
index edcd040b066..edcd040b066 100644
--- a/pkgs/development/python-modules/colorlog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colorlog/default.nix
diff --git a/pkgs/development/python-modules/colorlover/default.nix b/nixpkgs/pkgs/development/python-modules/colorlover/default.nix
index 2e57ea538c9..2e57ea538c9 100644
--- a/pkgs/development/python-modules/colorlover/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colorlover/default.nix
diff --git a/pkgs/development/python-modules/colormath/default.nix b/nixpkgs/pkgs/development/python-modules/colormath/default.nix
index 80f58250be4..80f58250be4 100644
--- a/pkgs/development/python-modules/colormath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colormath/default.nix
diff --git a/pkgs/development/python-modules/colorspacious/default.nix b/nixpkgs/pkgs/development/python-modules/colorspacious/default.nix
index 3ce0bddf1de..3ce0bddf1de 100644
--- a/pkgs/development/python-modules/colorspacious/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colorspacious/default.nix
diff --git a/pkgs/development/python-modules/colour/default.nix b/nixpkgs/pkgs/development/python-modules/colour/default.nix
index a162b21b083..a162b21b083 100644
--- a/pkgs/development/python-modules/colour/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/colour/default.nix
diff --git a/pkgs/development/python-modules/commonmark/default.nix b/nixpkgs/pkgs/development/python-modules/commonmark/default.nix
index 0f381d50261..0f381d50261 100644
--- a/pkgs/development/python-modules/commonmark/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/commonmark/default.nix
diff --git a/pkgs/development/python-modules/compiledb/default.nix b/nixpkgs/pkgs/development/python-modules/compiledb/default.nix
index f2741c615b8..f2741c615b8 100644
--- a/pkgs/development/python-modules/compiledb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/compiledb/default.nix
diff --git a/pkgs/development/python-modules/conda/default.nix b/nixpkgs/pkgs/development/python-modules/conda/default.nix
index a240ea21e3e..a240ea21e3e 100644
--- a/pkgs/development/python-modules/conda/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/conda/default.nix
diff --git a/pkgs/development/python-modules/configargparse/default.nix b/nixpkgs/pkgs/development/python-modules/configargparse/default.nix
index e2532f23709..e2532f23709 100644
--- a/pkgs/development/python-modules/configargparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/configargparse/default.nix
diff --git a/pkgs/development/python-modules/configobj/default.nix b/nixpkgs/pkgs/development/python-modules/configobj/default.nix
index 029f35ac87a..029f35ac87a 100644
--- a/pkgs/development/python-modules/configobj/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/configobj/default.nix
diff --git a/pkgs/development/python-modules/configparser/default.nix b/nixpkgs/pkgs/development/python-modules/configparser/default.nix
index 4c05ec29359..4c05ec29359 100644
--- a/pkgs/development/python-modules/configparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/configparser/default.nix
diff --git a/pkgs/development/python-modules/configshell/default.nix b/nixpkgs/pkgs/development/python-modules/configshell/default.nix
index fed5a71fd17..fed5a71fd17 100644
--- a/pkgs/development/python-modules/configshell/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/configshell/default.nix
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix
index f32a6bfd1ac..f32a6bfd1ac 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix
diff --git a/pkgs/development/python-modules/connexion/default.nix b/nixpkgs/pkgs/development/python-modules/connexion/default.nix
index 4f2af55f208..4f2af55f208 100644
--- a/pkgs/development/python-modules/connexion/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/connexion/default.nix
diff --git a/pkgs/development/python-modules/consonance/default.nix b/nixpkgs/pkgs/development/python-modules/consonance/default.nix
index 3940686f18c..3940686f18c 100644
--- a/pkgs/development/python-modules/consonance/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/consonance/default.nix
diff --git a/pkgs/development/python-modules/constantly/default.nix b/nixpkgs/pkgs/development/python-modules/constantly/default.nix
index 4766a1285ac..4766a1285ac 100644
--- a/pkgs/development/python-modules/constantly/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/constantly/default.nix
diff --git a/pkgs/development/python-modules/construct/default.nix b/nixpkgs/pkgs/development/python-modules/construct/default.nix
index 1009727c29c..1009727c29c 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/construct/default.nix
diff --git a/pkgs/development/python-modules/consul/default.nix b/nixpkgs/pkgs/development/python-modules/consul/default.nix
index 5c9e83b8d20..5c9e83b8d20 100644
--- a/pkgs/development/python-modules/consul/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/consul/default.nix
diff --git a/pkgs/development/python-modules/contexter/default.nix b/nixpkgs/pkgs/development/python-modules/contexter/default.nix
index 0fa72dfa687..0fa72dfa687 100644
--- a/pkgs/development/python-modules/contexter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/contexter/default.nix
diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix
index e23964f1a2b..e23964f1a2b 100644
--- a/pkgs/development/python-modules/contextlib2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix
diff --git a/pkgs/development/python-modules/contextvars/default.nix b/nixpkgs/pkgs/development/python-modules/contextvars/default.nix
index b378c901fad..b378c901fad 100644
--- a/pkgs/development/python-modules/contextvars/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/contextvars/default.nix
diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix
index 4010eb5ec5a..4010eb5ec5a 100644
--- a/pkgs/development/python-modules/cookiecutter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix
diff --git a/pkgs/development/python-modules/cookies/default.nix b/nixpkgs/pkgs/development/python-modules/cookies/default.nix
index 1b8e5b6061d..1b8e5b6061d 100644
--- a/pkgs/development/python-modules/cookies/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cookies/default.nix
diff --git a/pkgs/development/python-modules/coordinates/default.nix b/nixpkgs/pkgs/development/python-modules/coordinates/default.nix
index 8c08021a823..8c08021a823 100644
--- a/pkgs/development/python-modules/coordinates/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/coordinates/default.nix
diff --git a/pkgs/development/python-modules/coreapi/default.nix b/nixpkgs/pkgs/development/python-modules/coreapi/default.nix
index 216d1ee6985..216d1ee6985 100644
--- a/pkgs/development/python-modules/coreapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/coreapi/default.nix
diff --git a/pkgs/development/python-modules/coreschema/default.nix b/nixpkgs/pkgs/development/python-modules/coreschema/default.nix
index 949fa31df95..949fa31df95 100644
--- a/pkgs/development/python-modules/coreschema/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/coreschema/default.nix
diff --git a/pkgs/development/python-modules/cornice/default.nix b/nixpkgs/pkgs/development/python-modules/cornice/default.nix
index 598c3bd1c08..598c3bd1c08 100644
--- a/pkgs/development/python-modules/cornice/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cornice/default.nix
diff --git a/pkgs/development/python-modules/cov-core/default.nix b/nixpkgs/pkgs/development/python-modules/cov-core/default.nix
index ad85218709e..ad85218709e 100644
--- a/pkgs/development/python-modules/cov-core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cov-core/default.nix
diff --git a/pkgs/development/python-modules/coverage/default.nix b/nixpkgs/pkgs/development/python-modules/coverage/default.nix
index dfe86b36065..dfe86b36065 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/coverage/default.nix
diff --git a/pkgs/development/python-modules/coveralls/default.nix b/nixpkgs/pkgs/development/python-modules/coveralls/default.nix
index dbf6616c22d..dbf6616c22d 100644
--- a/pkgs/development/python-modules/coveralls/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/coveralls/default.nix
diff --git a/pkgs/development/python-modules/cozy/default.nix b/nixpkgs/pkgs/development/python-modules/cozy/default.nix
index 7515891456e..7515891456e 100644
--- a/pkgs/development/python-modules/cozy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cozy/default.nix
diff --git a/pkgs/development/python-modules/cram/default.nix b/nixpkgs/pkgs/development/python-modules/cram/default.nix
index f27cfc44e57..f27cfc44e57 100644
--- a/pkgs/development/python-modules/cram/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cram/default.nix
diff --git a/pkgs/development/python-modules/crayons/default.nix b/nixpkgs/pkgs/development/python-modules/crayons/default.nix
index 97c33821547..97c33821547 100644
--- a/pkgs/development/python-modules/crayons/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/crayons/default.nix
diff --git a/pkgs/development/python-modules/crc16/default.nix b/nixpkgs/pkgs/development/python-modules/crc16/default.nix
index 01f5bb8a7e5..01f5bb8a7e5 100644
--- a/pkgs/development/python-modules/crc16/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/crc16/default.nix
diff --git a/pkgs/development/python-modules/crc32c/default.nix b/nixpkgs/pkgs/development/python-modules/crc32c/default.nix
index 6fd31d007f6..6fd31d007f6 100644
--- a/pkgs/development/python-modules/crc32c/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/crc32c/default.nix
diff --git a/pkgs/development/python-modules/crccheck/default.nix b/nixpkgs/pkgs/development/python-modules/crccheck/default.nix
index 92a4cc8a841..92a4cc8a841 100644
--- a/pkgs/development/python-modules/crccheck/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/crccheck/default.nix
diff --git a/pkgs/development/python-modules/crcmod/default.nix b/nixpkgs/pkgs/development/python-modules/crcmod/default.nix
index f85e045d525..f85e045d525 100644
--- a/pkgs/development/python-modules/crcmod/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/crcmod/default.nix
diff --git a/pkgs/development/python-modules/credstash/default.nix b/nixpkgs/pkgs/development/python-modules/credstash/default.nix
index 495311c0972..495311c0972 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/credstash/default.nix
diff --git a/pkgs/development/python-modules/croniter/default.nix b/nixpkgs/pkgs/development/python-modules/croniter/default.nix
index a538721c9b9..a538721c9b9 100644
--- a/pkgs/development/python-modules/croniter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/croniter/default.nix
diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix
index 5ec1ccacae9..5ec1ccacae9 100644
--- a/pkgs/development/python-modules/cryptacular/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
index 82d0b43bc35..82d0b43bc35 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
index 86cc195b05b..86cc195b05b 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
diff --git a/pkgs/development/python-modules/css-parser/default.nix b/nixpkgs/pkgs/development/python-modules/css-parser/default.nix
index 8b2fe0929c7..8b2fe0929c7 100644
--- a/pkgs/development/python-modules/css-parser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/css-parser/default.nix
diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/nixpkgs/pkgs/development/python-modules/csscompressor/default.nix
index a6c294456fa..a6c294456fa 100644
--- a/pkgs/development/python-modules/csscompressor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/csscompressor/default.nix
diff --git a/pkgs/development/python-modules/cssmin/default.nix b/nixpkgs/pkgs/development/python-modules/cssmin/default.nix
index 2d1ffaccd6f..2d1ffaccd6f 100644
--- a/pkgs/development/python-modules/cssmin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cssmin/default.nix
diff --git a/pkgs/development/python-modules/cssselect/default.nix b/nixpkgs/pkgs/development/python-modules/cssselect/default.nix
index 00e6c0f7a62..00e6c0f7a62 100644
--- a/pkgs/development/python-modules/cssselect/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cssselect/default.nix
diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix
index ff56e2a2f47..ff56e2a2f47 100644
--- a/pkgs/development/python-modules/cssselect2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix
diff --git a/pkgs/development/python-modules/cssutils/default.nix b/nixpkgs/pkgs/development/python-modules/cssutils/default.nix
index 1db154ac1b8..1db154ac1b8 100644
--- a/pkgs/development/python-modules/cssutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cssutils/default.nix
diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix
index 0e5e902be2e..0e5e902be2e 100644
--- a/pkgs/development/python-modules/csvs-to-sqlite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix
diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix
index ed25c2c7371..ed25c2c7371 100644
--- a/pkgs/development/python-modules/cufflinks/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix
diff --git a/pkgs/development/python-modules/cupy/default.nix b/nixpkgs/pkgs/development/python-modules/cupy/default.nix
index 5426a609449..5426a609449 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cupy/default.nix
diff --git a/pkgs/development/python-modules/curio/default.nix b/nixpkgs/pkgs/development/python-modules/curio/default.nix
index 31dc8327fc4..31dc8327fc4 100644
--- a/pkgs/development/python-modules/curio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/curio/default.nix
diff --git a/pkgs/development/python-modules/curtsies/default.nix b/nixpkgs/pkgs/development/python-modules/curtsies/default.nix
index b0e9fee93d4..b0e9fee93d4 100644
--- a/pkgs/development/python-modules/curtsies/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/curtsies/default.nix
diff --git a/pkgs/development/python-modules/curve25519-donna/default.nix b/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix
index 789fc7488fa..789fc7488fa 100644
--- a/pkgs/development/python-modules/curve25519-donna/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix
diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix
index a842baca228..a842baca228 100644
--- a/pkgs/development/python-modules/cvxopt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix
diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
index dae3e032a39..dae3e032a39 100644
--- a/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
index 6ba8f338638..6ba8f338638 100644
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
diff --git a/pkgs/development/python-modules/cycler/default.nix b/nixpkgs/pkgs/development/python-modules/cycler/default.nix
index 3d220535404..3d220535404 100644
--- a/pkgs/development/python-modules/cycler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cycler/default.nix
diff --git a/pkgs/development/python-modules/cymem/default.nix b/nixpkgs/pkgs/development/python-modules/cymem/default.nix
index 1ca86f3d9d0..1ca86f3d9d0 100644
--- a/pkgs/development/python-modules/cymem/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cymem/default.nix
diff --git a/pkgs/development/python-modules/cypari2/default.nix b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
index 6c3e20b3f70..6c3e20b3f70 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
diff --git a/pkgs/development/python-modules/cysignals/default.nix b/nixpkgs/pkgs/development/python-modules/cysignals/default.nix
index e69fbce2158..e69fbce2158 100644
--- a/pkgs/development/python-modules/cysignals/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cysignals/default.nix
diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix
index 1a142cae0f0..1a142cae0f0 100644
--- a/pkgs/development/python-modules/cytoolz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix
diff --git a/pkgs/development/python-modules/d2to1/default.nix b/nixpkgs/pkgs/development/python-modules/d2to1/default.nix
index 70b0da89d5b..70b0da89d5b 100644
--- a/pkgs/development/python-modules/d2to1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/d2to1/default.nix
diff --git a/pkgs/development/python-modules/daemonize/default.nix b/nixpkgs/pkgs/development/python-modules/daemonize/default.nix
index 2f7992e860f..2f7992e860f 100644
--- a/pkgs/development/python-modules/daemonize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/daemonize/default.nix
diff --git a/pkgs/development/python-modules/daphne/default.nix b/nixpkgs/pkgs/development/python-modules/daphne/default.nix
index e577617c478..e577617c478 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/daphne/default.nix
diff --git a/pkgs/development/python-modules/darcsver/default.nix b/nixpkgs/pkgs/development/python-modules/darcsver/default.nix
index 753b592a4c5..753b592a4c5 100644
--- a/pkgs/development/python-modules/darcsver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/darcsver/default.nix
diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix
index dfcbb9b6404..dfcbb9b6404 100644
--- a/pkgs/development/python-modules/dash-core-components/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix
diff --git a/pkgs/development/python-modules/dash-html-components/default.nix b/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix
index 4e9ef39b411..4e9ef39b411 100644
--- a/pkgs/development/python-modules/dash-html-components/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix
diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix
index 97942a13043..97942a13043 100644
--- a/pkgs/development/python-modules/dash-renderer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix
diff --git a/pkgs/development/python-modules/dash-table/default.nix b/nixpkgs/pkgs/development/python-modules/dash-table/default.nix
index 4a9a6c42ff4..4a9a6c42ff4 100644
--- a/pkgs/development/python-modules/dash-table/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dash-table/default.nix
diff --git a/pkgs/development/python-modules/dash/default.nix b/nixpkgs/pkgs/development/python-modules/dash/default.nix
index 2106235230f..2106235230f 100644
--- a/pkgs/development/python-modules/dash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dash/default.nix
diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix
index 73705d9982a..73705d9982a 100644
--- a/pkgs/development/python-modules/dask-glm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix
diff --git a/pkgs/development/python-modules/dask-image/default.nix b/nixpkgs/pkgs/development/python-modules/dask-image/default.nix
index 7b12d1fcc22..7b12d1fcc22 100644
--- a/pkgs/development/python-modules/dask-image/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask-image/default.nix
diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix
index f9af247bc80..f9af247bc80 100644
--- a/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix
diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
index c5fafa495aa..c5fafa495aa 100644
--- a/pkgs/development/python-modules/dask-ml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix
index cd538afa15a..cd538afa15a 100644
--- a/pkgs/development/python-modules/dask-mpi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix
diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix
index d5f4de4efaa..d5f4de4efaa 100644
--- a/pkgs/development/python-modules/dask-xgboost/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix
diff --git a/pkgs/development/python-modules/dask/default.nix b/nixpkgs/pkgs/development/python-modules/dask/default.nix
index beef26ec5be..beef26ec5be 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dask/default.nix
diff --git a/pkgs/development/python-modules/databases/default.nix b/nixpkgs/pkgs/development/python-modules/databases/default.nix
index e4129ed9bbf..e4129ed9bbf 100644
--- a/pkgs/development/python-modules/databases/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/databases/default.nix
diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix
index a1159d49b81..a1159d49b81 100644
--- a/pkgs/development/python-modules/dataclasses/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix
diff --git a/pkgs/development/python-modules/datadiff/default.nix b/nixpkgs/pkgs/development/python-modules/datadiff/default.nix
index 72964e3d1f6..72964e3d1f6 100644
--- a/pkgs/development/python-modules/datadiff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/datadiff/default.nix
diff --git a/pkgs/development/python-modules/datadog/default.nix b/nixpkgs/pkgs/development/python-modules/datadog/default.nix
index 6dc19a17462..6dc19a17462 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/datadog/default.nix
diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix
index d23ecec169a..d23ecec169a 100644
--- a/pkgs/development/python-modules/datamodeldict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix
diff --git a/pkgs/development/python-modules/datasette/default.nix b/nixpkgs/pkgs/development/python-modules/datasette/default.nix
index 7210aa6b1e3..7210aa6b1e3 100644
--- a/pkgs/development/python-modules/datasette/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/datasette/default.nix
diff --git a/pkgs/development/python-modules/datashader/default.nix b/nixpkgs/pkgs/development/python-modules/datashader/default.nix
index 789e488e461..789e488e461 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/datashader/default.nix
diff --git a/pkgs/development/python-modules/datashape/default.nix b/nixpkgs/pkgs/development/python-modules/datashape/default.nix
index 27665c689c4..27665c689c4 100644
--- a/pkgs/development/python-modules/datashape/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/datashape/default.nix
diff --git a/pkgs/development/python-modules/datatable/default.nix b/nixpkgs/pkgs/development/python-modules/datatable/default.nix
index 81a53ac15f4..81a53ac15f4 100644
--- a/pkgs/development/python-modules/datatable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/datatable/default.nix
diff --git a/pkgs/development/python-modules/datatable/hardcode-library-paths.patch b/nixpkgs/pkgs/development/python-modules/datatable/hardcode-library-paths.patch
index 76c2f0e1dd7..76c2f0e1dd7 100644
--- a/pkgs/development/python-modules/datatable/hardcode-library-paths.patch
+++ b/nixpkgs/pkgs/development/python-modules/datatable/hardcode-library-paths.patch
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/nixpkgs/pkgs/development/python-modules/dateparser/default.nix
index 9c406671f78..9c406671f78 100644
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dateparser/default.nix
diff --git a/pkgs/development/python-modules/dateutil/default.nix b/nixpkgs/pkgs/development/python-modules/dateutil/default.nix
index 9c5f6145d8f..9c5f6145d8f 100644
--- a/pkgs/development/python-modules/dateutil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dateutil/default.nix
diff --git a/pkgs/development/python-modules/datrie/default.nix b/nixpkgs/pkgs/development/python-modules/datrie/default.nix
index 7cb30937e0d..7cb30937e0d 100644
--- a/pkgs/development/python-modules/datrie/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/datrie/default.nix
diff --git a/pkgs/development/python-modules/dbf/default.nix b/nixpkgs/pkgs/development/python-modules/dbf/default.nix
index a2f7b603b84..a2f7b603b84 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dbf/default.nix
diff --git a/pkgs/development/python-modules/dbfread/default.nix b/nixpkgs/pkgs/development/python-modules/dbfread/default.nix
index 6c50313a518..6c50313a518 100644
--- a/pkgs/development/python-modules/dbfread/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dbfread/default.nix
diff --git a/pkgs/development/python-modules/dbus/default.nix b/nixpkgs/pkgs/development/python-modules/dbus/default.nix
index 855ee930b77..855ee930b77 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dbus/default.nix
diff --git a/pkgs/development/python-modules/dbus/fix-includedir.patch b/nixpkgs/pkgs/development/python-modules/dbus/fix-includedir.patch
index e3bb0682b5c..e3bb0682b5c 100644
--- a/pkgs/development/python-modules/dbus/fix-includedir.patch
+++ b/nixpkgs/pkgs/development/python-modules/dbus/fix-includedir.patch
diff --git a/pkgs/development/python-modules/ddt/default.nix b/nixpkgs/pkgs/development/python-modules/ddt/default.nix
index dac72fb72b7..dac72fb72b7 100644
--- a/pkgs/development/python-modules/ddt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ddt/default.nix
diff --git a/pkgs/development/python-modules/deap/default.nix b/nixpkgs/pkgs/development/python-modules/deap/default.nix
index 9c49057398c..9c49057398c 100644
--- a/pkgs/development/python-modules/deap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/deap/default.nix
diff --git a/pkgs/development/python-modules/debian/default.nix b/nixpkgs/pkgs/development/python-modules/debian/default.nix
index 4399e6bc83e..4399e6bc83e 100644
--- a/pkgs/development/python-modules/debian/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/debian/default.nix
diff --git a/pkgs/development/python-modules/decorator/default.nix b/nixpkgs/pkgs/development/python-modules/decorator/default.nix
index f23d5929192..f23d5929192 100644
--- a/pkgs/development/python-modules/decorator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/decorator/default.nix
diff --git a/pkgs/development/python-modules/deeptoolsintervals/default.nix b/nixpkgs/pkgs/development/python-modules/deeptoolsintervals/default.nix
index eef8d51ae91..eef8d51ae91 100644
--- a/pkgs/development/python-modules/deeptoolsintervals/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/deeptoolsintervals/default.nix
diff --git a/pkgs/development/python-modules/deform/default.nix b/nixpkgs/pkgs/development/python-modules/deform/default.nix
index 8ebd3ef47bd..8ebd3ef47bd 100644
--- a/pkgs/development/python-modules/deform/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/deform/default.nix
diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/nixpkgs/pkgs/development/python-modules/defusedxml/default.nix
index 581a6cce9b2..581a6cce9b2 100644
--- a/pkgs/development/python-modules/defusedxml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/defusedxml/default.nix
diff --git a/pkgs/development/python-modules/delegator-py/default.nix b/nixpkgs/pkgs/development/python-modules/delegator-py/default.nix
index 3521e8ce129..3521e8ce129 100644
--- a/pkgs/development/python-modules/delegator-py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/delegator-py/default.nix
diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/nixpkgs/pkgs/development/python-modules/deluge-client/default.nix
index a2a986828b5..a2a986828b5 100644
--- a/pkgs/development/python-modules/deluge-client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/deluge-client/default.nix
diff --git a/pkgs/development/python-modules/demjson/default.nix b/nixpkgs/pkgs/development/python-modules/demjson/default.nix
index 58f2012aea7..58f2012aea7 100644
--- a/pkgs/development/python-modules/demjson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/demjson/default.nix
diff --git a/pkgs/development/python-modules/dendropy/default.nix b/nixpkgs/pkgs/development/python-modules/dendropy/default.nix
index c0055580c40..c0055580c40 100644
--- a/pkgs/development/python-modules/dendropy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dendropy/default.nix
diff --git a/pkgs/development/python-modules/denonavr/default.nix b/nixpkgs/pkgs/development/python-modules/denonavr/default.nix
index 33c1570060e..33c1570060e 100644
--- a/pkgs/development/python-modules/denonavr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/denonavr/default.nix
diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
index b5a3a869b69..b5a3a869b69 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
diff --git a/pkgs/development/python-modules/deprecated/default.nix b/nixpkgs/pkgs/development/python-modules/deprecated/default.nix
index 2af9d020c95..2af9d020c95 100644
--- a/pkgs/development/python-modules/deprecated/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/deprecated/default.nix
diff --git a/pkgs/development/python-modules/deprecation/default.nix b/nixpkgs/pkgs/development/python-modules/deprecation/default.nix
index e01433d90c5..e01433d90c5 100644
--- a/pkgs/development/python-modules/deprecation/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/deprecation/default.nix
diff --git a/pkgs/development/python-modules/derpconf/default.nix b/nixpkgs/pkgs/development/python-modules/derpconf/default.nix
index 84f30b7edf6..84f30b7edf6 100644
--- a/pkgs/development/python-modules/derpconf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/derpconf/default.nix
diff --git a/pkgs/development/python-modules/descartes/default.nix b/nixpkgs/pkgs/development/python-modules/descartes/default.nix
index 996cd22e263..996cd22e263 100644
--- a/pkgs/development/python-modules/descartes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/descartes/default.nix
diff --git a/pkgs/development/python-modules/deskcon/default.nix b/nixpkgs/pkgs/development/python-modules/deskcon/default.nix
index 2e205ce6955..2e205ce6955 100644
--- a/pkgs/development/python-modules/deskcon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/deskcon/default.nix
diff --git a/pkgs/development/python-modules/detox/default.nix b/nixpkgs/pkgs/development/python-modules/detox/default.nix
index 9fbeef2488c..9fbeef2488c 100644
--- a/pkgs/development/python-modules/detox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/detox/default.nix
diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix
index 72db5d1b0ec..72db5d1b0ec 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix
diff --git a/pkgs/development/python-modules/dftfit/default.nix b/nixpkgs/pkgs/development/python-modules/dftfit/default.nix
index 9095eb962fe..9095eb962fe 100644
--- a/pkgs/development/python-modules/dftfit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dftfit/default.nix
diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/nixpkgs/pkgs/development/python-modules/dict2xml/default.nix
index 88cbee2649d..88cbee2649d 100644
--- a/pkgs/development/python-modules/dict2xml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dict2xml/default.nix
diff --git a/pkgs/development/python-modules/dictionaries/default.nix b/nixpkgs/pkgs/development/python-modules/dictionaries/default.nix
index 0deab276255..0deab276255 100644
--- a/pkgs/development/python-modules/dictionaries/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dictionaries/default.nix
diff --git a/pkgs/development/python-modules/dicttoxml/default.nix b/nixpkgs/pkgs/development/python-modules/dicttoxml/default.nix
index 7d30aad69c4..7d30aad69c4 100644
--- a/pkgs/development/python-modules/dicttoxml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dicttoxml/default.nix
diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix
index ba33eeda386..ba33eeda386 100644
--- a/pkgs/development/python-modules/diff-match-patch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix
diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix
index 7066a188c77..7066a188c77 100644
--- a/pkgs/development/python-modules/diff_cover/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix
diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix
index e81caa66e5f..e81caa66e5f 100644
--- a/pkgs/development/python-modules/digitalocean/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix
diff --git a/pkgs/development/python-modules/dill/default.nix b/nixpkgs/pkgs/development/python-modules/dill/default.nix
index 88ffbd32e9d..88ffbd32e9d 100644
--- a/pkgs/development/python-modules/dill/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dill/default.nix
diff --git a/pkgs/development/python-modules/diofant/default.nix b/nixpkgs/pkgs/development/python-modules/diofant/default.nix
index c473f2fb420..c473f2fb420 100644
--- a/pkgs/development/python-modules/diofant/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/diofant/default.nix
diff --git a/pkgs/development/python-modules/discid/default.nix b/nixpkgs/pkgs/development/python-modules/discid/default.nix
index 2684d4a06a9..2684d4a06a9 100644
--- a/pkgs/development/python-modules/discid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/discid/default.nix
diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix
index c39bede9e09..c39bede9e09 100644
--- a/pkgs/development/python-modules/discogs_client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix
diff --git a/pkgs/development/python-modules/discordpy/default.nix b/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
index 971b811a221..971b811a221 100644
--- a/pkgs/development/python-modules/discordpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
diff --git a/pkgs/development/python-modules/diskcache/default.nix b/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
index a420fc037bb..a420fc037bb 100644
--- a/pkgs/development/python-modules/diskcache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
diff --git a/pkgs/development/python-modules/dissononce/default.nix b/nixpkgs/pkgs/development/python-modules/dissononce/default.nix
index 80655e6aa08..80655e6aa08 100644
--- a/pkgs/development/python-modules/dissononce/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dissononce/default.nix
diff --git a/pkgs/development/python-modules/distlib/default.nix b/nixpkgs/pkgs/development/python-modules/distlib/default.nix
index 81575058b15..81575058b15 100644
--- a/pkgs/development/python-modules/distlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distlib/default.nix
diff --git a/pkgs/development/python-modules/distorm3/default.nix b/nixpkgs/pkgs/development/python-modules/distorm3/default.nix
index e21e6270b91..e21e6270b91 100644
--- a/pkgs/development/python-modules/distorm3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distorm3/default.nix
diff --git a/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix
index 951593bac97..951593bac97 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distributed/default.nix
diff --git a/pkgs/development/python-modules/distro/default.nix b/nixpkgs/pkgs/development/python-modules/distro/default.nix
index ad8da4255d6..ad8da4255d6 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distro/default.nix
diff --git a/pkgs/development/python-modules/distro/nixos.patch b/nixpkgs/pkgs/development/python-modules/distro/nixos.patch
index 21aa4827b63..21aa4827b63 100644
--- a/pkgs/development/python-modules/distro/nixos.patch
+++ b/nixpkgs/pkgs/development/python-modules/distro/nixos.patch
diff --git a/pkgs/development/python-modules/distutils-cfg/default.nix b/nixpkgs/pkgs/development/python-modules/distutils-cfg/default.nix
index cbf12c17582..cbf12c17582 100644
--- a/pkgs/development/python-modules/distutils-cfg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distutils-cfg/default.nix
diff --git a/pkgs/development/python-modules/distutils_extra/default.nix b/nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix
index 42e7fe6e9f4..42e7fe6e9f4 100644
--- a/pkgs/development/python-modules/distutils_extra/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix
diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix
index f334b7efeac..f334b7efeac 100644
--- a/pkgs/development/python-modules/dj-database-url/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix
diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix
index de052b67ecf..de052b67ecf 100644
--- a/pkgs/development/python-modules/dj-email-url/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix
diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix
index 68fe4c913d6..68fe4c913d6 100644
--- a/pkgs/development/python-modules/dj-search-url/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix
index 10fe8cde826..10fe8cde826 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix
diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix
index f0de263f130..f0de263f130 100644
--- a/pkgs/development/python-modules/django-auth-ldap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix
diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix
index 6b8aac33139..6b8aac33139 100644
--- a/pkgs/development/python-modules/django-cache-url/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix
diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix
index 6484fb8c555..6484fb8c555 100644
--- a/pkgs/development/python-modules/django-cleanup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix
diff --git a/pkgs/development/python-modules/django-compat/default.nix b/nixpkgs/pkgs/development/python-modules/django-compat/default.nix
index 32d85cfadd7..32d85cfadd7 100644
--- a/pkgs/development/python-modules/django-compat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-compat/default.nix
diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix
index c31036c1814..c31036c1814 100644
--- a/pkgs/development/python-modules/django-configurations/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix
diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix
index 005dc65a499..005dc65a499 100644
--- a/pkgs/development/python-modules/django-cors-headers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix
diff --git a/pkgs/development/python-modules/django-csp/default.nix b/nixpkgs/pkgs/development/python-modules/django-csp/default.nix
index 1eed9578a8a..1eed9578a8a 100644
--- a/pkgs/development/python-modules/django-csp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-csp/default.nix
diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix
index 82895f76473..82895f76473 100644
--- a/pkgs/development/python-modules/django-discover-runner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix
diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix
index cea5a7976bb..cea5a7976bb 100644
--- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix
diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix
index d6254253676..d6254253676 100644
--- a/pkgs/development/python-modules/django-extensions/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix
diff --git a/pkgs/development/python-modules/django-filter/default.nix b/nixpkgs/pkgs/development/python-modules/django-filter/default.nix
index 496ccd268f9..496ccd268f9 100644
--- a/pkgs/development/python-modules/django-filter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-filter/default.nix
diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/nixpkgs/pkgs/development/python-modules/django-gravatar2/default.nix
index be153feb2a7..be153feb2a7 100644
--- a/pkgs/development/python-modules/django-gravatar2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-gravatar2/default.nix
diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix
index 381624e5719..381624e5719 100644
--- a/pkgs/development/python-modules/django-haystack/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix
diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix
index 005d61acab9..005d61acab9 100644
--- a/pkgs/development/python-modules/django-hijack-admin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix
diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix
index f41e7d146c9..f41e7d146c9 100644
--- a/pkgs/development/python-modules/django-hijack/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix
diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix
index 89147db63a8..89147db63a8 100644
--- a/pkgs/development/python-modules/django-ipware/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix
diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix
index 338af16b2e9..338af16b2e9 100644
--- a/pkgs/development/python-modules/django-jinja2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix
diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix
index d9734ff4a22..d9734ff4a22 100644
--- a/pkgs/development/python-modules/django-logentry-admin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix
diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
index 01ae357677b..01ae357677b 100644
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/nixpkgs/pkgs/development/python-modules/django-multiselectfield/default.nix
index a4dcb57fe43..a4dcb57fe43 100644
--- a/pkgs/development/python-modules/django-multiselectfield/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-multiselectfield/default.nix
diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index 1927e4e9954..1927e4e9954 100644
--- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix
diff --git a/pkgs/development/python-modules/django-paintstore/default.nix b/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix
index 096215a70ab..096215a70ab 100644
--- a/pkgs/development/python-modules/django-paintstore/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix
diff --git a/pkgs/development/python-modules/django-pglocks/default.nix b/nixpkgs/pkgs/development/python-modules/django-pglocks/default.nix
index da1dfe21df2..da1dfe21df2 100644
--- a/pkgs/development/python-modules/django-pglocks/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-pglocks/default.nix
diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix
index 4bcd767bd63..4bcd767bd63 100644
--- a/pkgs/development/python-modules/django-picklefield/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix
diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/nixpkgs/pkgs/development/python-modules/django-pipeline/default.nix
index acb5587186d..acb5587186d 100644
--- a/pkgs/development/python-modules/django-pipeline/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-pipeline/default.nix
diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix
index 443f793f37b..443f793f37b 100644
--- a/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix
diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index 35be6f76147..35be6f76147 100644
--- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix
diff --git a/pkgs/development/python-modules/django-q/default.nix b/nixpkgs/pkgs/development/python-modules/django-q/default.nix
index 7ceee27e6f4..7ceee27e6f4 100644
--- a/pkgs/development/python-modules/django-q/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-q/default.nix
diff --git a/pkgs/development/python-modules/django-ranged-response/default.nix b/nixpkgs/pkgs/development/python-modules/django-ranged-response/default.nix
index 29b2baf89cd..29b2baf89cd 100644
--- a/pkgs/development/python-modules/django-ranged-response/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-ranged-response/default.nix
diff --git a/pkgs/development/python-modules/django-raster/default.nix b/nixpkgs/pkgs/development/python-modules/django-raster/default.nix
index dca1942f9d2..dca1942f9d2 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-raster/default.nix
diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix
index a6edc98b0cb..a6edc98b0cb 100644
--- a/pkgs/development/python-modules/django-rest-auth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix
diff --git a/pkgs/development/python-modules/django-sampledatahelper/default.nix b/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix
index e08c296e807..e08c296e807 100644
--- a/pkgs/development/python-modules/django-sampledatahelper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix
diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix
index e7de9c824a1..e7de9c824a1 100644
--- a/pkgs/development/python-modules/django-sesame/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix
diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix
index 67977caf9ec..67977caf9ec 100644
--- a/pkgs/development/python-modules/django-simple-captcha/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix
diff --git a/pkgs/development/python-modules/django-sites/default.nix b/nixpkgs/pkgs/development/python-modules/django-sites/default.nix
index 2882e1dc2b9..2882e1dc2b9 100644
--- a/pkgs/development/python-modules/django-sites/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-sites/default.nix
diff --git a/pkgs/development/python-modules/django-sr/default.nix b/nixpkgs/pkgs/development/python-modules/django-sr/default.nix
index b8924b37bfd..b8924b37bfd 100644
--- a/pkgs/development/python-modules/django-sr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-sr/default.nix
diff --git a/pkgs/development/python-modules/django-storages/default.nix b/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
index 5756d0ab5e6..5756d0ab5e6 100644
--- a/pkgs/development/python-modules/django-storages/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix
index 90993db4c5b..90993db4c5b 100644
--- a/pkgs/development/python-modules/django-versatileimagefield/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix
diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix
index af3404b2f88..af3404b2f88 100644
--- a/pkgs/development/python-modules/django-webpack-loader/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix
diff --git a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch b/nixpkgs/pkgs/development/python-modules/django/1.10-gis-libs.template.patch
index da154554d1b..da154554d1b 100644
--- a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch
+++ b/nixpkgs/pkgs/development/python-modules/django/1.10-gis-libs.template.patch
diff --git a/pkgs/development/python-modules/django/1_11.nix b/nixpkgs/pkgs/development/python-modules/django/1_11.nix
index cbfeb4288cf..cbfeb4288cf 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/nixpkgs/pkgs/development/python-modules/django/1_11.nix
diff --git a/pkgs/development/python-modules/django/1_8.nix b/nixpkgs/pkgs/development/python-modules/django/1_8.nix
index d575599cbe1..d575599cbe1 100644
--- a/pkgs/development/python-modules/django/1_8.nix
+++ b/nixpkgs/pkgs/development/python-modules/django/1_8.nix
diff --git a/pkgs/development/python-modules/django/2_2.nix b/nixpkgs/pkgs/development/python-modules/django/2_2.nix
index bc8ae39433d..bc8ae39433d 100644
--- a/pkgs/development/python-modules/django/2_2.nix
+++ b/nixpkgs/pkgs/development/python-modules/django/2_2.nix
diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix
index 67345cd8d6a..67345cd8d6a 100644
--- a/pkgs/development/python-modules/django_appconf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix
diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix
index 62efa667800..62efa667800 100644
--- a/pkgs/development/python-modules/django_classytags/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix
diff --git a/pkgs/development/python-modules/django_colorful/default.nix b/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix
index 84dca56b22b..84dca56b22b 100644
--- a/pkgs/development/python-modules/django_colorful/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix
diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix
index 0ee392756d3..0ee392756d3 100644
--- a/pkgs/development/python-modules/django_compressor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix
diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix
index 12d8c220aff..12d8c220aff 100644
--- a/pkgs/development/python-modules/django_contrib_comments/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix
diff --git a/pkgs/development/python-modules/django_environ/default.nix b/nixpkgs/pkgs/development/python-modules/django_environ/default.nix
index f95babfe233..f95babfe233 100644
--- a/pkgs/development/python-modules/django_environ/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_environ/default.nix
diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix
index 7d53d458043..7d53d458043 100644
--- a/pkgs/development/python-modules/django_evolution/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix
diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix
index db11817186e..db11817186e 100644
--- a/pkgs/development/python-modules/django_guardian/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix
diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix
index 943f9491498..943f9491498 100644
--- a/pkgs/development/python-modules/django_modelcluster/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix
diff --git a/pkgs/development/python-modules/django_nose/default.nix b/nixpkgs/pkgs/development/python-modules/django_nose/default.nix
index cf9516ce23a..cf9516ce23a 100644
--- a/pkgs/development/python-modules/django_nose/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_nose/default.nix
diff --git a/pkgs/development/python-modules/django_redis/default.nix b/nixpkgs/pkgs/development/python-modules/django_redis/default.nix
index c19ca255319..c19ca255319 100644
--- a/pkgs/development/python-modules/django_redis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_redis/default.nix
diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix
index 5a4faf5f24e..5a4faf5f24e 100644
--- a/pkgs/development/python-modules/django_reversion/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix
diff --git a/pkgs/development/python-modules/django_silk/default.nix b/nixpkgs/pkgs/development/python-modules/django_silk/default.nix
index 85e5f8f02f0..85e5f8f02f0 100644
--- a/pkgs/development/python-modules/django_silk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_silk/default.nix
diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/nixpkgs/pkgs/development/python-modules/django_tagging/default.nix
index fa06117a644..fa06117a644 100644
--- a/pkgs/development/python-modules/django_tagging/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_tagging/default.nix
diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix
index 2851894b6b6..2851894b6b6 100644
--- a/pkgs/development/python-modules/django_taggit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix
diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix
index d4b3464b6ae..d4b3464b6ae 100644
--- a/pkgs/development/python-modules/django_treebeard/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix
diff --git a/pkgs/development/python-modules/djangoql/default.nix b/nixpkgs/pkgs/development/python-modules/djangoql/default.nix
index df8d62e9bdc..df8d62e9bdc 100644
--- a/pkgs/development/python-modules/djangoql/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/djangoql/default.nix
diff --git a/pkgs/development/python-modules/djangorestframework-jwt/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-jwt/default.nix
index f50fd3ff9b6..f50fd3ff9b6 100644
--- a/pkgs/development/python-modules/djangorestframework-jwt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-jwt/default.nix
diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
index 626d704f1d8..626d704f1d8 100644
--- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix
index 60e5760b524..60e5760b524 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix
diff --git a/pkgs/development/python-modules/djmail/default.nix b/nixpkgs/pkgs/development/python-modules/djmail/default.nix
index 1659d46abbc..1659d46abbc 100644
--- a/pkgs/development/python-modules/djmail/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/djmail/default.nix
diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix
index c65fdfec953..c65fdfec953 100644
--- a/pkgs/development/python-modules/dkimpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix
diff --git a/pkgs/development/python-modules/dlib/build-cores.patch b/nixpkgs/pkgs/development/python-modules/dlib/build-cores.patch
index eebc69a330f..eebc69a330f 100644
--- a/pkgs/development/python-modules/dlib/build-cores.patch
+++ b/nixpkgs/pkgs/development/python-modules/dlib/build-cores.patch
diff --git a/pkgs/development/python-modules/dlib/default.nix b/nixpkgs/pkgs/development/python-modules/dlib/default.nix
index a57d8307551..a57d8307551 100644
--- a/pkgs/development/python-modules/dlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dlib/default.nix
diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix
index 4ce61680f03..4ce61680f03 100644
--- a/pkgs/development/python-modules/dm-sonnet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix
diff --git a/pkgs/development/python-modules/dmenu/default.nix b/nixpkgs/pkgs/development/python-modules/dmenu/default.nix
index 7897138d59f..7897138d59f 100644
--- a/pkgs/development/python-modules/dmenu/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dmenu/default.nix
diff --git a/pkgs/development/python-modules/dnslib/default.nix b/nixpkgs/pkgs/development/python-modules/dnslib/default.nix
index e6ec04bb79e..e6ec04bb79e 100644
--- a/pkgs/development/python-modules/dnslib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dnslib/default.nix
diff --git a/pkgs/development/python-modules/dnspython/default.nix b/nixpkgs/pkgs/development/python-modules/dnspython/default.nix
index 74b49d1fa5a..74b49d1fa5a 100644
--- a/pkgs/development/python-modules/dnspython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dnspython/default.nix
diff --git a/pkgs/development/python-modules/doc8/default.nix b/nixpkgs/pkgs/development/python-modules/doc8/default.nix
index 307496cc65c..307496cc65c 100644
--- a/pkgs/development/python-modules/doc8/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/doc8/default.nix
diff --git a/pkgs/development/python-modules/docker-py/default.nix b/nixpkgs/pkgs/development/python-modules/docker-py/default.nix
index 84dba75e404..84dba75e404 100644
--- a/pkgs/development/python-modules/docker-py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/docker-py/default.nix
diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix
index e47196df07a..e47196df07a 100644
--- a/pkgs/development/python-modules/docker-pycreds/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix
diff --git a/pkgs/development/python-modules/docker/default.nix b/nixpkgs/pkgs/development/python-modules/docker/default.nix
index 3d4a73bc969..3d4a73bc969 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/docker/default.nix
diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix
index 2f9e32f088e..2f9e32f088e 100644
--- a/pkgs/development/python-modules/dockerfile-parse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix
diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/nixpkgs/pkgs/development/python-modules/dockerpty/default.nix
index f7a64481c66..f7a64481c66 100644
--- a/pkgs/development/python-modules/dockerpty/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dockerpty/default.nix
diff --git a/pkgs/development/python-modules/docopt/default.nix b/nixpkgs/pkgs/development/python-modules/docopt/default.nix
index 61c71d87c53..61c71d87c53 100644
--- a/pkgs/development/python-modules/docopt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/docopt/default.nix
diff --git a/pkgs/development/python-modules/docrep/default.nix b/nixpkgs/pkgs/development/python-modules/docrep/default.nix
index 8e6b00d808c..8e6b00d808c 100644
--- a/pkgs/development/python-modules/docrep/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/docrep/default.nix
diff --git a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/nixpkgs/pkgs/development/python-modules/doctest-ignore-unicode/default.nix
index f3be8898760..f3be8898760 100644
--- a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/doctest-ignore-unicode/default.nix
diff --git a/pkgs/development/python-modules/docutils/default.nix b/nixpkgs/pkgs/development/python-modules/docutils/default.nix
index 31dd58cdf6a..31dd58cdf6a 100644
--- a/pkgs/development/python-modules/docutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/docutils/default.nix
diff --git a/pkgs/development/python-modules/dodgy/default.nix b/nixpkgs/pkgs/development/python-modules/dodgy/default.nix
index ecd3cc6ce75..ecd3cc6ce75 100644
--- a/pkgs/development/python-modules/dodgy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dodgy/default.nix
diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix
index 414e9b065c7..414e9b065c7 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix
diff --git a/pkgs/development/python-modules/dogpile.core/default.nix b/nixpkgs/pkgs/development/python-modules/dogpile.core/default.nix
index 622954f6144..622954f6144 100644
--- a/pkgs/development/python-modules/dogpile.core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dogpile.core/default.nix
diff --git a/pkgs/development/python-modules/dogtail/default.nix b/nixpkgs/pkgs/development/python-modules/dogtail/default.nix
index a12a63c46f1..a12a63c46f1 100644
--- a/pkgs/development/python-modules/dogtail/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dogtail/default.nix
diff --git a/pkgs/development/python-modules/dogtail/nix-support.patch b/nixpkgs/pkgs/development/python-modules/dogtail/nix-support.patch
index e8a65bbc87b..e8a65bbc87b 100644
--- a/pkgs/development/python-modules/dogtail/nix-support.patch
+++ b/nixpkgs/pkgs/development/python-modules/dogtail/nix-support.patch
diff --git a/pkgs/development/python-modules/dominate/default.nix b/nixpkgs/pkgs/development/python-modules/dominate/default.nix
index 7288dee7763..7288dee7763 100644
--- a/pkgs/development/python-modules/dominate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dominate/default.nix
diff --git a/pkgs/development/python-modules/dopy/default.nix b/nixpkgs/pkgs/development/python-modules/dopy/default.nix
index 538a861c9f4..538a861c9f4 100644
--- a/pkgs/development/python-modules/dopy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dopy/default.nix
diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix
index f671cdc9642..f671cdc9642 100644
--- a/pkgs/development/python-modules/dot2tex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix
diff --git a/pkgs/development/python-modules/dotnetcore2/default.nix b/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix
index 4d3edf0906a..4d3edf0906a 100644
--- a/pkgs/development/python-modules/dotnetcore2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix
diff --git a/pkgs/development/python-modules/dotnetcore2/runtime.patch b/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch
index 28cf10e21d1..28cf10e21d1 100644
--- a/pkgs/development/python-modules/dotnetcore2/runtime.patch
+++ b/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch
diff --git a/pkgs/development/python-modules/dpath/default.nix b/nixpkgs/pkgs/development/python-modules/dpath/default.nix
index 3b878f7d5e4..3b878f7d5e4 100644
--- a/pkgs/development/python-modules/dpath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dpath/default.nix
diff --git a/pkgs/development/python-modules/dpkt/default.nix b/nixpkgs/pkgs/development/python-modules/dpkt/default.nix
index 567cd85fa94..567cd85fa94 100644
--- a/pkgs/development/python-modules/dpkt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dpkt/default.nix
diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix
index 707b1e5bc6e..707b1e5bc6e 100644
--- a/pkgs/development/python-modules/drf-yasg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix
diff --git a/pkgs/development/python-modules/drms/default.nix b/nixpkgs/pkgs/development/python-modules/drms/default.nix
index 975ec8400b2..975ec8400b2 100644
--- a/pkgs/development/python-modules/drms/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/drms/default.nix
diff --git a/pkgs/development/python-modules/dropbox/default.nix b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
index ade485c91dc..ade485c91dc 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
diff --git a/pkgs/development/python-modules/ds4drv/default.nix b/nixpkgs/pkgs/development/python-modules/ds4drv/default.nix
index ccc5c574689..ccc5c574689 100644
--- a/pkgs/development/python-modules/ds4drv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ds4drv/default.nix
diff --git a/pkgs/development/python-modules/dtopt/default.nix b/nixpkgs/pkgs/development/python-modules/dtopt/default.nix
index 601ebf6d9a9..601ebf6d9a9 100644
--- a/pkgs/development/python-modules/dtopt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dtopt/default.nix
diff --git a/pkgs/development/python-modules/dugong/default.nix b/nixpkgs/pkgs/development/python-modules/dugong/default.nix
index 09a0f25e18f..09a0f25e18f 100644
--- a/pkgs/development/python-modules/dugong/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dugong/default.nix
diff --git a/pkgs/development/python-modules/dulwich/default.nix b/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
index 785f37144be..785f37144be 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
diff --git a/pkgs/development/python-modules/dyn/default.nix b/nixpkgs/pkgs/development/python-modules/dyn/default.nix
index 6e03a33f29b..6e03a33f29b 100644
--- a/pkgs/development/python-modules/dyn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dyn/default.nix
diff --git a/pkgs/development/python-modules/dynd/default.nix b/nixpkgs/pkgs/development/python-modules/dynd/default.nix
index f3e4e0a8b73..f3e4e0a8b73 100644
--- a/pkgs/development/python-modules/dynd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dynd/default.nix
diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix
index 894363237f5..894363237f5 100644
--- a/pkgs/development/python-modules/easy-thumbnails/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix
diff --git a/pkgs/development/python-modules/easydict/default.nix b/nixpkgs/pkgs/development/python-modules/easydict/default.nix
index 4179306b8d9..4179306b8d9 100644
--- a/pkgs/development/python-modules/easydict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/easydict/default.nix
diff --git a/pkgs/development/python-modules/easygui/default.nix b/nixpkgs/pkgs/development/python-modules/easygui/default.nix
index 3a7046c50b3..3a7046c50b3 100644
--- a/pkgs/development/python-modules/easygui/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/easygui/default.nix
diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix
index 32acb1213a8..32acb1213a8 100644
--- a/pkgs/development/python-modules/easyprocess/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix
diff --git a/pkgs/development/python-modules/easysnmp/default.nix b/nixpkgs/pkgs/development/python-modules/easysnmp/default.nix
index 2602fba7713..2602fba7713 100644
--- a/pkgs/development/python-modules/easysnmp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/easysnmp/default.nix
diff --git a/pkgs/development/python-modules/easywatch/default.nix b/nixpkgs/pkgs/development/python-modules/easywatch/default.nix
index 96301996fe8..96301996fe8 100644
--- a/pkgs/development/python-modules/easywatch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/easywatch/default.nix
diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix
index aa69b7e2fcd..aa69b7e2fcd 100644
--- a/pkgs/development/python-modules/ecdsa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix
diff --git a/pkgs/development/python-modules/ecpy/default.nix b/nixpkgs/pkgs/development/python-modules/ecpy/default.nix
index 62111721ad1..62111721ad1 100644
--- a/pkgs/development/python-modules/ecpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ecpy/default.nix
diff --git a/pkgs/development/python-modules/ed25519/default.nix b/nixpkgs/pkgs/development/python-modules/ed25519/default.nix
index cd3c98e9cce..cd3c98e9cce 100644
--- a/pkgs/development/python-modules/ed25519/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ed25519/default.nix
diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix
index 28eff473199..28eff473199 100644
--- a/pkgs/development/python-modules/editorconfig/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix
diff --git a/pkgs/development/python-modules/edward/default.nix b/nixpkgs/pkgs/development/python-modules/edward/default.nix
index 1ad5ea1ab3b..1ad5ea1ab3b 100644
--- a/pkgs/development/python-modules/edward/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/edward/default.nix
diff --git a/pkgs/development/python-modules/effect/default.nix b/nixpkgs/pkgs/development/python-modules/effect/default.nix
index fec5518f0e8..fec5518f0e8 100644
--- a/pkgs/development/python-modules/effect/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/effect/default.nix
diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/nixpkgs/pkgs/development/python-modules/eggdeps/default.nix
index c837e46066f..c837e46066f 100644
--- a/pkgs/development/python-modules/eggdeps/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eggdeps/default.nix
diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix
index 382a9965293..382a9965293 100644
--- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix
diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix
index ccef465eca1..ccef465eca1 100644
--- a/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix
diff --git a/pkgs/development/python-modules/elementpath/default.nix b/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
index 093a30d29da..093a30d29da 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
diff --git a/pkgs/development/python-modules/email-validator/default.nix b/nixpkgs/pkgs/development/python-modules/email-validator/default.nix
index 99859ac1517..99859ac1517 100644
--- a/pkgs/development/python-modules/email-validator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/email-validator/default.nix
diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix
index 0e5db1de3e9..0e5db1de3e9 100644
--- a/pkgs/development/python-modules/emailthreads/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix
diff --git a/pkgs/development/python-modules/emcee/default.nix b/nixpkgs/pkgs/development/python-modules/emcee/default.nix
index ed513579457..ed513579457 100644
--- a/pkgs/development/python-modules/emcee/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/emcee/default.nix
diff --git a/pkgs/development/python-modules/emoji/default.nix b/nixpkgs/pkgs/development/python-modules/emoji/default.nix
index 5f3d14e73c7..5f3d14e73c7 100644
--- a/pkgs/development/python-modules/emoji/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/emoji/default.nix
diff --git a/pkgs/development/python-modules/entrance/default.nix b/nixpkgs/pkgs/development/python-modules/entrance/default.nix
index 67005d577cd..67005d577cd 100644
--- a/pkgs/development/python-modules/entrance/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/entrance/default.nix
diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix
index 77d20876fe1..77d20876fe1 100644
--- a/pkgs/development/python-modules/entrypoints/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix
diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/nixpkgs/pkgs/development/python-modules/enum-compat/default.nix
index e95eb089bc4..e95eb089bc4 100644
--- a/pkgs/development/python-modules/enum-compat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/enum-compat/default.nix
diff --git a/pkgs/development/python-modules/enum/default.nix b/nixpkgs/pkgs/development/python-modules/enum/default.nix
index 8aec63689d9..8aec63689d9 100644
--- a/pkgs/development/python-modules/enum/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/enum/default.nix
diff --git a/pkgs/development/python-modules/enum34/default.nix b/nixpkgs/pkgs/development/python-modules/enum34/default.nix
index a5175eba49d..a5175eba49d 100644
--- a/pkgs/development/python-modules/enum34/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/enum34/default.nix
diff --git a/pkgs/development/python-modules/envs/default.nix b/nixpkgs/pkgs/development/python-modules/envs/default.nix
index 600cb3b0320..600cb3b0320 100644
--- a/pkgs/development/python-modules/envs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/envs/default.nix
diff --git a/pkgs/development/python-modules/enzyme/default.nix b/nixpkgs/pkgs/development/python-modules/enzyme/default.nix
index d776bfd62aa..d776bfd62aa 100644
--- a/pkgs/development/python-modules/enzyme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/enzyme/default.nix
diff --git a/pkgs/development/python-modules/epc/default.nix b/nixpkgs/pkgs/development/python-modules/epc/default.nix
index fe3cc4420c4..fe3cc4420c4 100644
--- a/pkgs/development/python-modules/epc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/epc/default.nix
diff --git a/pkgs/development/python-modules/ephem/default.nix b/nixpkgs/pkgs/development/python-modules/ephem/default.nix
index 2b7815c6978..2b7815c6978 100644
--- a/pkgs/development/python-modules/ephem/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ephem/default.nix
diff --git a/pkgs/development/python-modules/eradicate/default.nix b/nixpkgs/pkgs/development/python-modules/eradicate/default.nix
index 6b3909a5b45..6b3909a5b45 100644
--- a/pkgs/development/python-modules/eradicate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eradicate/default.nix
diff --git a/pkgs/development/python-modules/escapism/default.nix b/nixpkgs/pkgs/development/python-modules/escapism/default.nix
index b2ac3658235..b2ac3658235 100644
--- a/pkgs/development/python-modules/escapism/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/escapism/default.nix
diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix
index 09475329c1b..09475329c1b 100644
--- a/pkgs/development/python-modules/et_xmlfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix
diff --git a/pkgs/development/python-modules/etcd/default.nix b/nixpkgs/pkgs/development/python-modules/etcd/default.nix
index 1e6e1e70944..1e6e1e70944 100644
--- a/pkgs/development/python-modules/etcd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/etcd/default.nix
diff --git a/pkgs/development/python-modules/etelemetry/default.nix b/nixpkgs/pkgs/development/python-modules/etelemetry/default.nix
index 2323a4dcd57..2323a4dcd57 100644
--- a/pkgs/development/python-modules/etelemetry/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/etelemetry/default.nix
diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix
index ce5fce1b1cb..ce5fce1b1cb 100644
--- a/pkgs/development/python-modules/eth-hash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix
diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix
index 0fcf7731ee0..0fcf7731ee0 100644
--- a/pkgs/development/python-modules/eth-typing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix
diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix
index 116fa0273e5..116fa0273e5 100644
--- a/pkgs/development/python-modules/eth-utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix
diff --git a/pkgs/development/python-modules/evdev/default.nix b/nixpkgs/pkgs/development/python-modules/evdev/default.nix
index 1711131be2d..1711131be2d 100644
--- a/pkgs/development/python-modules/evdev/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/evdev/default.nix
diff --git a/pkgs/development/python-modules/eve/default.nix b/nixpkgs/pkgs/development/python-modules/eve/default.nix
index a8ac610855d..a8ac610855d 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eve/default.nix
diff --git a/pkgs/development/python-modules/eventlet/default.nix b/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
index 0436f3cbdb1..0436f3cbdb1 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
diff --git a/pkgs/development/python-modules/eventlib/default.nix b/nixpkgs/pkgs/development/python-modules/eventlib/default.nix
index 4f684612f18..4f684612f18 100644
--- a/pkgs/development/python-modules/eventlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eventlib/default.nix
diff --git a/pkgs/development/python-modules/events/default.nix b/nixpkgs/pkgs/development/python-modules/events/default.nix
index 93c2165ce01..93c2165ce01 100644
--- a/pkgs/development/python-modules/events/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/events/default.nix
diff --git a/pkgs/development/python-modules/evernote/default.nix b/nixpkgs/pkgs/development/python-modules/evernote/default.nix
index 189f282b02d..189f282b02d 100644
--- a/pkgs/development/python-modules/evernote/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/evernote/default.nix
diff --git a/pkgs/development/python-modules/ewmh/default.nix b/nixpkgs/pkgs/development/python-modules/ewmh/default.nix
index a24d049fc22..a24d049fc22 100644
--- a/pkgs/development/python-modules/ewmh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ewmh/default.nix
diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix
index ed2a7d69da8..ed2a7d69da8 100644
--- a/pkgs/development/python-modules/exchangelib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix
diff --git a/pkgs/development/python-modules/exchangelib/skip_failing_test.patch b/nixpkgs/pkgs/development/python-modules/exchangelib/skip_failing_test.patch
index 6c070acaf75..6c070acaf75 100644
--- a/pkgs/development/python-modules/exchangelib/skip_failing_test.patch
+++ b/nixpkgs/pkgs/development/python-modules/exchangelib/skip_failing_test.patch
diff --git a/pkgs/development/python-modules/execnet/default.nix b/nixpkgs/pkgs/development/python-modules/execnet/default.nix
index bc7b67f52d4..bc7b67f52d4 100644
--- a/pkgs/development/python-modules/execnet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/execnet/default.nix
diff --git a/pkgs/development/python-modules/executor/default.nix b/nixpkgs/pkgs/development/python-modules/executor/default.nix
index 8c71d63ef5c..8c71d63ef5c 100644
--- a/pkgs/development/python-modules/executor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/executor/default.nix
diff --git a/pkgs/development/python-modules/exifread/default.nix b/nixpkgs/pkgs/development/python-modules/exifread/default.nix
index 61593b625f7..61593b625f7 100644
--- a/pkgs/development/python-modules/exifread/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/exifread/default.nix
diff --git a/pkgs/development/python-modules/extras/default.nix b/nixpkgs/pkgs/development/python-modules/extras/default.nix
index ff8432ab2d2..ff8432ab2d2 100644
--- a/pkgs/development/python-modules/extras/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/extras/default.nix
diff --git a/pkgs/development/python-modules/eyed3/default.nix b/nixpkgs/pkgs/development/python-modules/eyed3/default.nix
index 47602afa07d..47602afa07d 100644
--- a/pkgs/development/python-modules/eyed3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/eyed3/default.nix
diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix
index 94fca96b455..94fca96b455 100644
--- a/pkgs/development/python-modules/ezdxf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix
diff --git a/pkgs/development/python-modules/face/default.nix b/nixpkgs/pkgs/development/python-modules/face/default.nix
index 948236b3f01..948236b3f01 100644
--- a/pkgs/development/python-modules/face/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/face/default.nix
diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix
index 2856eeeab1b..2856eeeab1b 100644
--- a/pkgs/development/python-modules/face_recognition/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix
diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/nixpkgs/pkgs/development/python-modules/face_recognition_models/default.nix
index 12587e6792d..12587e6792d 100644
--- a/pkgs/development/python-modules/face_recognition_models/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/face_recognition_models/default.nix
diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/facebook-sdk/default.nix
index d74c6e57470..d74c6e57470 100644
--- a/pkgs/development/python-modules/facebook-sdk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/facebook-sdk/default.nix
diff --git a/pkgs/development/python-modules/facedancer/default.nix b/nixpkgs/pkgs/development/python-modules/facedancer/default.nix
index 47147bdb01b..47147bdb01b 100644
--- a/pkgs/development/python-modules/facedancer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/facedancer/default.nix
diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix
index becf1cc1972..becf1cc1972 100644
--- a/pkgs/development/python-modules/factory_boy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix
diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix
index f17af02ee0f..f17af02ee0f 100644
--- a/pkgs/development/python-modules/fake_factory/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix
diff --git a/pkgs/development/python-modules/faker/default.nix b/nixpkgs/pkgs/development/python-modules/faker/default.nix
index 0d8c77f557f..0d8c77f557f 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/faker/default.nix
diff --git a/pkgs/development/python-modules/falcon/default.nix b/nixpkgs/pkgs/development/python-modules/falcon/default.nix
index 20a76777413..20a76777413 100644
--- a/pkgs/development/python-modules/falcon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/falcon/default.nix
diff --git a/pkgs/development/python-modules/fastapi/default.nix b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix
index 75edf5dc424..75edf5dc424 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix
diff --git a/pkgs/development/python-modules/fastcache/default.nix b/nixpkgs/pkgs/development/python-modules/fastcache/default.nix
index f50eb8f53bb..f50eb8f53bb 100644
--- a/pkgs/development/python-modules/fastcache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastcache/default.nix
diff --git a/pkgs/development/python-modules/fasteners/default.nix b/nixpkgs/pkgs/development/python-modules/fasteners/default.nix
index 50a6dbf40df..50a6dbf40df 100644
--- a/pkgs/development/python-modules/fasteners/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fasteners/default.nix
diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix
index e2e0a4d4d92..e2e0a4d4d92 100644
--- a/pkgs/development/python-modules/fastentrypoints/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix
diff --git a/pkgs/development/python-modules/fastimport/default.nix b/nixpkgs/pkgs/development/python-modules/fastimport/default.nix
index 02c1ea60e61..02c1ea60e61 100644
--- a/pkgs/development/python-modules/fastimport/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastimport/default.nix
diff --git a/pkgs/development/python-modules/fastpair/default.nix b/nixpkgs/pkgs/development/python-modules/fastpair/default.nix
index e9e6316bb61..e9e6316bb61 100644
--- a/pkgs/development/python-modules/fastpair/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastpair/default.nix
diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix
index 046fc530969..046fc530969 100644
--- a/pkgs/development/python-modules/fastparquet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix
diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix
index 63a7565cf55..63a7565cf55 100644
--- a/pkgs/development/python-modules/fastpbkdf2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix
diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix
index 9b553e65db6..9b553e65db6 100644
--- a/pkgs/development/python-modules/fastrlock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix
diff --git a/pkgs/development/python-modules/fasttext/default.nix b/nixpkgs/pkgs/development/python-modules/fasttext/default.nix
index 9f1a8b18d7b..9f1a8b18d7b 100644
--- a/pkgs/development/python-modules/fasttext/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fasttext/default.nix
diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/nixpkgs/pkgs/development/python-modules/faulthandler/default.nix
index d69c320ccaa..d69c320ccaa 100644
--- a/pkgs/development/python-modules/faulthandler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/faulthandler/default.nix
diff --git a/pkgs/development/python-modules/favicon/default.nix b/nixpkgs/pkgs/development/python-modules/favicon/default.nix
index 16eac939e1e..16eac939e1e 100644
--- a/pkgs/development/python-modules/favicon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/favicon/default.nix
diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix
index 25aae4591eb..25aae4591eb 100644
--- a/pkgs/development/python-modules/fb-re2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix
diff --git a/pkgs/development/python-modules/fdint/default.nix b/nixpkgs/pkgs/development/python-modules/fdint/default.nix
index 869e26d675a..869e26d675a 100644
--- a/pkgs/development/python-modules/fdint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fdint/default.nix
diff --git a/pkgs/development/python-modules/feedgen/default.nix b/nixpkgs/pkgs/development/python-modules/feedgen/default.nix
index d59f0a702aa..d59f0a702aa 100644
--- a/pkgs/development/python-modules/feedgen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/feedgen/default.nix
diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix
index c8ea6df7ae0..c8ea6df7ae0 100644
--- a/pkgs/development/python-modules/feedgenerator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix
diff --git a/pkgs/development/python-modules/feedparser/default.nix b/nixpkgs/pkgs/development/python-modules/feedparser/default.nix
index c36fd2b1943..c36fd2b1943 100644
--- a/pkgs/development/python-modules/feedparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/feedparser/default.nix
diff --git a/pkgs/development/python-modules/fido2/default.nix b/nixpkgs/pkgs/development/python-modules/fido2/default.nix
index 96019f61cac..96019f61cac 100644
--- a/pkgs/development/python-modules/fido2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fido2/default.nix
diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix
index d0d324fb977..d0d324fb977 100644
--- a/pkgs/development/python-modules/filebrowser_safe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix
diff --git a/pkgs/development/python-modules/filebytes/default.nix b/nixpkgs/pkgs/development/python-modules/filebytes/default.nix
index e3f638276c2..e3f638276c2 100644
--- a/pkgs/development/python-modules/filebytes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/filebytes/default.nix
diff --git a/pkgs/development/python-modules/filelock/default.nix b/nixpkgs/pkgs/development/python-modules/filelock/default.nix
index 3592a1f28c7..3592a1f28c7 100644
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/filelock/default.nix
diff --git a/pkgs/development/python-modules/filemagic/default.nix b/nixpkgs/pkgs/development/python-modules/filemagic/default.nix
index cbb5ca56fed..cbb5ca56fed 100644
--- a/pkgs/development/python-modules/filemagic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/filemagic/default.nix
diff --git a/pkgs/development/python-modules/filetype/default.nix b/nixpkgs/pkgs/development/python-modules/filetype/default.nix
index 34f7ac4e4a9..34f7ac4e4a9 100644
--- a/pkgs/development/python-modules/filetype/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/filetype/default.nix
diff --git a/pkgs/development/python-modules/filterpy/default.nix b/nixpkgs/pkgs/development/python-modules/filterpy/default.nix
index 076a3a72b89..076a3a72b89 100644
--- a/pkgs/development/python-modules/filterpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/filterpy/default.nix
diff --git a/pkgs/development/python-modules/fints/default.nix b/nixpkgs/pkgs/development/python-modules/fints/default.nix
index d3f796ab950..d3f796ab950 100644
--- a/pkgs/development/python-modules/fints/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fints/default.nix
diff --git a/pkgs/development/python-modules/fiona/default.nix b/nixpkgs/pkgs/development/python-modules/fiona/default.nix
index abc0853b4c7..abc0853b4c7 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fiona/default.nix
diff --git a/pkgs/development/python-modules/fipy/default.nix b/nixpkgs/pkgs/development/python-modules/fipy/default.nix
index 7fbf14cf7de..7fbf14cf7de 100644
--- a/pkgs/development/python-modules/fipy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fipy/default.nix
diff --git a/pkgs/development/python-modules/fire/default.nix b/nixpkgs/pkgs/development/python-modules/fire/default.nix
index 7af8d29fce7..7af8d29fce7 100644
--- a/pkgs/development/python-modules/fire/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fire/default.nix
diff --git a/pkgs/development/python-modules/firetv/default.nix b/nixpkgs/pkgs/development/python-modules/firetv/default.nix
index 21e44bb4581..21e44bb4581 100644
--- a/pkgs/development/python-modules/firetv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/firetv/default.nix
diff --git a/pkgs/development/python-modules/first/default.nix b/nixpkgs/pkgs/development/python-modules/first/default.nix
index de7342d67ca..de7342d67ca 100644
--- a/pkgs/development/python-modules/first/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/first/default.nix
diff --git a/pkgs/development/python-modules/fitbit/default.nix b/nixpkgs/pkgs/development/python-modules/fitbit/default.nix
index ef4859a749a..ef4859a749a 100644
--- a/pkgs/development/python-modules/fitbit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fitbit/default.nix
diff --git a/pkgs/development/python-modules/fixtures/default.nix b/nixpkgs/pkgs/development/python-modules/fixtures/default.nix
index 35bf7cb90df..35bf7cb90df 100644
--- a/pkgs/development/python-modules/fixtures/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fixtures/default.nix
diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-blind-except/default.nix
index f999bab8932..f999bab8932 100644
--- a/pkgs/development/python-modules/flake8-blind-except/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flake8-blind-except/default.nix
diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-debugger/default.nix
index e6ac743396a..e6ac743396a 100644
--- a/pkgs/development/python-modules/flake8-debugger/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flake8-debugger/default.nix
diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix
index c9cf3fe4ca8..c9cf3fe4ca8 100644
--- a/pkgs/development/python-modules/flake8-future-import/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix
diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix
index 8099f3318e8..8099f3318e8 100644
--- a/pkgs/development/python-modules/flake8-import-order/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix
diff --git a/pkgs/development/python-modules/flake8-polyfill/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix
index 070e6997010..070e6997010 100644
--- a/pkgs/development/python-modules/flake8-polyfill/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix
diff --git a/pkgs/development/python-modules/flake8/default.nix b/nixpkgs/pkgs/development/python-modules/flake8/default.nix
index e76b7cdf269..e76b7cdf269 100644
--- a/pkgs/development/python-modules/flake8/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flake8/default.nix
diff --git a/pkgs/development/python-modules/flaky/default.nix b/nixpkgs/pkgs/development/python-modules/flaky/default.nix
index c4e803245d5..c4e803245d5 100644
--- a/pkgs/development/python-modules/flaky/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flaky/default.nix
diff --git a/pkgs/development/python-modules/flammkuchen/default.nix b/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix
index 3a3d82cd8bb..3a3d82cd8bb 100644
--- a/pkgs/development/python-modules/flammkuchen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix
diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix
index 3a2c1fe5e9b..3a2c1fe5e9b 100644
--- a/pkgs/development/python-modules/flask-admin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix
diff --git a/pkgs/development/python-modules/flask-api/default.nix b/nixpkgs/pkgs/development/python-modules/flask-api/default.nix
index 8bb6a472c9f..8bb6a472c9f 100644
--- a/pkgs/development/python-modules/flask-api/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-api/default.nix
diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix
index 46841f68d60..46841f68d60 100644
--- a/pkgs/development/python-modules/flask-appbuilder/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix
diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/nixpkgs/pkgs/development/python-modules/flask-assets/default.nix
index a8e454f4a2c..a8e454f4a2c 100644
--- a/pkgs/development/python-modules/flask-assets/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-assets/default.nix
diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix
index afd3db60ffc..afd3db60ffc 100644
--- a/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix
diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix
index caaf0a61152..caaf0a61152 100644
--- a/pkgs/development/python-modules/flask-babel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix
diff --git a/pkgs/development/python-modules/flask-babelex/default.nix b/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix
index c61967af6bc..c61967af6bc 100644
--- a/pkgs/development/python-modules/flask-babelex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix
diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix
index dfcdad18f9c..dfcdad18f9c 100644
--- a/pkgs/development/python-modules/flask-bcrypt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix
diff --git a/pkgs/development/python-modules/flask-bootstrap/default.nix b/nixpkgs/pkgs/development/python-modules/flask-bootstrap/default.nix
index 7c12b79bb2f..7c12b79bb2f 100644
--- a/pkgs/development/python-modules/flask-bootstrap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-bootstrap/default.nix
diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix
index 64c3e3384dc..64c3e3384dc 100644
--- a/pkgs/development/python-modules/flask-caching/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix
diff --git a/pkgs/development/python-modules/flask-common/default.nix b/nixpkgs/pkgs/development/python-modules/flask-common/default.nix
index 05385e08d05..05385e08d05 100644
--- a/pkgs/development/python-modules/flask-common/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-common/default.nix
diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix
index b602fcfd494..b602fcfd494 100644
--- a/pkgs/development/python-modules/flask-compress/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix
diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix
index c532802a7f4..c532802a7f4 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix
diff --git a/pkgs/development/python-modules/flask-elastic/default.nix b/nixpkgs/pkgs/development/python-modules/flask-elastic/default.nix
index 9f8e27ea20f..9f8e27ea20f 100644
--- a/pkgs/development/python-modules/flask-elastic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-elastic/default.nix
diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix
index 051b83d1c3d..051b83d1c3d 100644
--- a/pkgs/development/python-modules/flask-httpauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix
diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
index 1fcb7e3cd87..1fcb7e3cd87 100644
--- a/pkgs/development/python-modules/flask-jwt-extended/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/nixpkgs/pkgs/development/python-modules/flask-ldap-login/default.nix
index 99b57dac816..99b57dac816 100644
--- a/pkgs/development/python-modules/flask-ldap-login/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-ldap-login/default.nix
diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix
index 01b340a2847..01b340a2847 100644
--- a/pkgs/development/python-modules/flask-limiter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix
diff --git a/pkgs/development/python-modules/flask-login/default.nix b/nixpkgs/pkgs/development/python-modules/flask-login/default.nix
index d466a78a681..d466a78a681 100644
--- a/pkgs/development/python-modules/flask-login/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-login/default.nix
diff --git a/pkgs/development/python-modules/flask-mail/default.nix b/nixpkgs/pkgs/development/python-modules/flask-mail/default.nix
index a1732d3ccbf..a1732d3ccbf 100644
--- a/pkgs/development/python-modules/flask-mail/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-mail/default.nix
diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix
index b03f3307d08..b03f3307d08 100644
--- a/pkgs/development/python-modules/flask-marshmallow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix
diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
index d7fbec5715d..d7fbec5715d 100644
--- a/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix
index 5e61a2415b7..5e61a2415b7 100644
--- a/pkgs/development/python-modules/flask-mongoengine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix
diff --git a/pkgs/development/python-modules/flask-openid/default.nix b/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix
index c1f9a51a225..c1f9a51a225 100644
--- a/pkgs/development/python-modules/flask-openid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix
diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix
index ba1c0b10d15..ba1c0b10d15 100644
--- a/pkgs/development/python-modules/flask-paginate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix
diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/nixpkgs/pkgs/development/python-modules/flask-principal/default.nix
index cbdbd989211..cbdbd989211 100644
--- a/pkgs/development/python-modules/flask-principal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-principal/default.nix
diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix
index 89cc47cbcfb..89cc47cbcfb 100644
--- a/pkgs/development/python-modules/flask-restful/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix
diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/nixpkgs/pkgs/development/python-modules/flask-restplus/default.nix
index 2fc0fa8569b..2fc0fa8569b 100644
--- a/pkgs/development/python-modules/flask-restplus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-restplus/default.nix
diff --git a/pkgs/development/python-modules/flask-script/default.nix b/nixpkgs/pkgs/development/python-modules/flask-script/default.nix
index 51ba7ce4d7c..51ba7ce4d7c 100644
--- a/pkgs/development/python-modules/flask-script/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-script/default.nix
diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix
index 653e39b1740..653e39b1740 100644
--- a/pkgs/development/python-modules/flask-silk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix
diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix
index 5ec462a45e0..5ec462a45e0 100644
--- a/pkgs/development/python-modules/flask-socketio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix
diff --git a/pkgs/development/python-modules/flask-sockets/default.nix b/nixpkgs/pkgs/development/python-modules/flask-sockets/default.nix
index aa29fd4fbc9..aa29fd4fbc9 100644
--- a/pkgs/development/python-modules/flask-sockets/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-sockets/default.nix
diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix
index 02d8d25bafe..02d8d25bafe 100644
--- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix
diff --git a/pkgs/development/python-modules/flask-swagger-ui/default.nix b/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix
index a281864117b..a281864117b 100644
--- a/pkgs/development/python-modules/flask-swagger-ui/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix
diff --git a/pkgs/development/python-modules/flask-swagger/default.nix b/nixpkgs/pkgs/development/python-modules/flask-swagger/default.nix
index c690e4e64ae..c690e4e64ae 100644
--- a/pkgs/development/python-modules/flask-swagger/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-swagger/default.nix
diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix
index 04c083a3263..04c083a3263 100644
--- a/pkgs/development/python-modules/flask-testing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix
diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix
index 96828dcdce2..96828dcdce2 100644
--- a/pkgs/development/python-modules/flask-wtf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix
diff --git a/pkgs/development/python-modules/flask/default.nix b/nixpkgs/pkgs/development/python-modules/flask/default.nix
index a330b9dd8a6..a330b9dd8a6 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask/default.nix
diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix
index d3a46143e6e..d3a46143e6e 100644
--- a/pkgs/development/python-modules/flaskbabel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix
diff --git a/pkgs/development/python-modules/flexmock/default.nix b/nixpkgs/pkgs/development/python-modules/flexmock/default.nix
index e4da4ce7926..e4da4ce7926 100644
--- a/pkgs/development/python-modules/flexmock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flexmock/default.nix
diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix
index 88dfff3aa8f..88dfff3aa8f 100644
--- a/pkgs/development/python-modules/flickrapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix
diff --git a/pkgs/development/python-modules/flit/default.nix b/nixpkgs/pkgs/development/python-modules/flit/default.nix
index 22bba39ff01..22bba39ff01 100644
--- a/pkgs/development/python-modules/flit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flit/default.nix
diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix
index 4064fc494b1..4064fc494b1 100644
--- a/pkgs/development/python-modules/flowlogs_reader/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix
diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/nixpkgs/pkgs/development/python-modules/fluent-logger/default.nix
index dab4ce30f6f..dab4ce30f6f 100644
--- a/pkgs/development/python-modules/fluent-logger/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fluent-logger/default.nix
diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix
index 0a2e8dff1b7..0a2e8dff1b7 100644
--- a/pkgs/development/python-modules/flufl/bounce.nix
+++ b/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix
diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix
index 6e8d77bf4f8..6e8d77bf4f8 100644
--- a/pkgs/development/python-modules/flufl/i18n.nix
+++ b/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix
diff --git a/pkgs/development/python-modules/flufl/lock.nix b/nixpkgs/pkgs/development/python-modules/flufl/lock.nix
index 1be5d9a7c4c..1be5d9a7c4c 100644
--- a/pkgs/development/python-modules/flufl/lock.nix
+++ b/nixpkgs/pkgs/development/python-modules/flufl/lock.nix
diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/nixpkgs/pkgs/development/python-modules/fluidasserts/default.nix
index 78405ed8a66..78405ed8a66 100644
--- a/pkgs/development/python-modules/fluidasserts/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fluidasserts/default.nix
diff --git a/pkgs/development/python-modules/flup/default.nix b/nixpkgs/pkgs/development/python-modules/flup/default.nix
index a6ef4d421df..a6ef4d421df 100644
--- a/pkgs/development/python-modules/flup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flup/default.nix
diff --git a/pkgs/development/python-modules/flux-led/default.nix b/nixpkgs/pkgs/development/python-modules/flux-led/default.nix
index 1cbfca78462..1cbfca78462 100644
--- a/pkgs/development/python-modules/flux-led/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flux-led/default.nix
diff --git a/pkgs/development/python-modules/fn/default.nix b/nixpkgs/pkgs/development/python-modules/fn/default.nix
index 550c4a71101..550c4a71101 100644
--- a/pkgs/development/python-modules/fn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fn/default.nix
diff --git a/pkgs/development/python-modules/folium/default.nix b/nixpkgs/pkgs/development/python-modules/folium/default.nix
index 967e7cf09c1..967e7cf09c1 100644
--- a/pkgs/development/python-modules/folium/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/folium/default.nix
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/nixpkgs/pkgs/development/python-modules/fonttools/default.nix
index f85afa77021..f85afa77021 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fonttools/default.nix
diff --git a/pkgs/development/python-modules/foolscap/default.nix b/nixpkgs/pkgs/development/python-modules/foolscap/default.nix
index a9ab0db1ed9..a9ab0db1ed9 100644
--- a/pkgs/development/python-modules/foolscap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/foolscap/default.nix
diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix
index 534f2cd7bb7..534f2cd7bb7 100644
--- a/pkgs/development/python-modules/forbiddenfruit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix
diff --git a/pkgs/development/python-modules/foxdot/default.nix b/nixpkgs/pkgs/development/python-modules/foxdot/default.nix
index ae4e32291c3..ae4e32291c3 100644
--- a/pkgs/development/python-modules/foxdot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/foxdot/default.nix
diff --git a/pkgs/development/python-modules/fpdf/default.nix b/nixpkgs/pkgs/development/python-modules/fpdf/default.nix
index a528244cb0f..a528244cb0f 100644
--- a/pkgs/development/python-modules/fpdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fpdf/default.nix
diff --git a/pkgs/development/python-modules/fpylll/default.nix b/nixpkgs/pkgs/development/python-modules/fpylll/default.nix
index e23351d3da6..e23351d3da6 100644
--- a/pkgs/development/python-modules/fpylll/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fpylll/default.nix
diff --git a/pkgs/development/python-modules/freezegun/default.nix b/nixpkgs/pkgs/development/python-modules/freezegun/default.nix
index 3f0fd31d8a1..3f0fd31d8a1 100644
--- a/pkgs/development/python-modules/freezegun/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/freezegun/default.nix
diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix
index 32e9e9393ce..32e9e9393ce 100644
--- a/pkgs/development/python-modules/fritzconnection/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix
diff --git a/pkgs/development/python-modules/frozendict/default.nix b/nixpkgs/pkgs/development/python-modules/frozendict/default.nix
index 94d42206d63..94d42206d63 100644
--- a/pkgs/development/python-modules/frozendict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/frozendict/default.nix
diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/nixpkgs/pkgs/development/python-modules/fs-s3fs/default.nix
index cb9723742dc..cb9723742dc 100644
--- a/pkgs/development/python-modules/fs-s3fs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fs-s3fs/default.nix
diff --git a/pkgs/development/python-modules/fs/default.nix b/nixpkgs/pkgs/development/python-modules/fs/default.nix
index fee20021e1a..fee20021e1a 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fs/default.nix
diff --git a/pkgs/development/python-modules/fsspec/default.nix b/nixpkgs/pkgs/development/python-modules/fsspec/default.nix
index 7e0ed8b9712..7e0ed8b9712 100644
--- a/pkgs/development/python-modules/fsspec/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fsspec/default.nix
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/nixpkgs/pkgs/development/python-modules/ftfy/default.nix
index d7a9fd2a0b0..d7a9fd2a0b0 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ftfy/default.nix
diff --git a/pkgs/development/python-modules/ftputil/default.nix b/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
index d3d338a2c8d..d3d338a2c8d 100644
--- a/pkgs/development/python-modules/ftputil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
diff --git a/pkgs/development/python-modules/fudge/default.nix b/nixpkgs/pkgs/development/python-modules/fudge/default.nix
index de45a1404f5..de45a1404f5 100644
--- a/pkgs/development/python-modules/fudge/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fudge/default.nix
diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix
index 3a9503419ec..3a9503419ec 100644
--- a/pkgs/development/python-modules/funcparserlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix
diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix
index 5a4701df9c3..5a4701df9c3 100644
--- a/pkgs/development/python-modules/funcsigs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix
diff --git a/pkgs/development/python-modules/funcsigs/fix-pypy3-tests.patch b/nixpkgs/pkgs/development/python-modules/funcsigs/fix-pypy3-tests.patch
index f4ecec3b613..f4ecec3b613 100644
--- a/pkgs/development/python-modules/funcsigs/fix-pypy3-tests.patch
+++ b/nixpkgs/pkgs/development/python-modules/funcsigs/fix-pypy3-tests.patch
diff --git a/pkgs/development/python-modules/functools32/default.nix b/nixpkgs/pkgs/development/python-modules/functools32/default.nix
index fea79db3d05..fea79db3d05 100644
--- a/pkgs/development/python-modules/functools32/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/functools32/default.nix
diff --git a/pkgs/development/python-modules/funcy/default.nix b/nixpkgs/pkgs/development/python-modules/funcy/default.nix
index 87a3b830bf8..87a3b830bf8 100644
--- a/pkgs/development/python-modules/funcy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/funcy/default.nix
diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix
index 0ac33be3899..0ac33be3899 100644
--- a/pkgs/development/python-modules/fuse-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix
diff --git a/pkgs/development/python-modules/fusepy/default.nix b/nixpkgs/pkgs/development/python-modules/fusepy/default.nix
index 80ca5099f34..80ca5099f34 100644
--- a/pkgs/development/python-modules/fusepy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fusepy/default.nix
diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix
index c9b49fee4cb..c9b49fee4cb 100644
--- a/pkgs/development/python-modules/future-fstrings/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix
diff --git a/pkgs/development/python-modules/future/default.nix b/nixpkgs/pkgs/development/python-modules/future/default.nix
index dad0372a8c1..dad0372a8c1 100644
--- a/pkgs/development/python-modules/future/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/future/default.nix
diff --git a/pkgs/development/python-modules/futures/default.nix b/nixpkgs/pkgs/development/python-modules/futures/default.nix
index bc19a31927a..bc19a31927a 100644
--- a/pkgs/development/python-modules/futures/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/futures/default.nix
diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix
index 7091799deca..7091799deca 100644
--- a/pkgs/development/python-modules/fuzzywuzzy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix
diff --git a/pkgs/development/python-modules/fx2/default.nix b/nixpkgs/pkgs/development/python-modules/fx2/default.nix
index 2d47e0669d8..2d47e0669d8 100644
--- a/pkgs/development/python-modules/fx2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fx2/default.nix
diff --git a/pkgs/development/python-modules/gast/default.nix b/nixpkgs/pkgs/development/python-modules/gast/default.nix
index b0f90f7ce17..b0f90f7ce17 100644
--- a/pkgs/development/python-modules/gast/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gast/default.nix
diff --git a/pkgs/development/python-modules/gateone/default.nix b/nixpkgs/pkgs/development/python-modules/gateone/default.nix
index 7a6aa659ace..7a6aa659ace 100644
--- a/pkgs/development/python-modules/gateone/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gateone/default.nix
diff --git a/pkgs/development/python-modules/gcovr/default.nix b/nixpkgs/pkgs/development/python-modules/gcovr/default.nix
index 278bd381ca6..278bd381ca6 100644
--- a/pkgs/development/python-modules/gcovr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gcovr/default.nix
diff --git a/pkgs/development/python-modules/gdata/default.nix b/nixpkgs/pkgs/development/python-modules/gdata/default.nix
index 182fdc402a6..182fdc402a6 100644
--- a/pkgs/development/python-modules/gdata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gdata/default.nix
diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix
index 0b2d0fbc91d..0b2d0fbc91d 100644
--- a/pkgs/development/python-modules/gdrivefs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix
diff --git a/pkgs/development/python-modules/geeknote/default.nix b/nixpkgs/pkgs/development/python-modules/geeknote/default.nix
index c8ff60b318b..c8ff60b318b 100644
--- a/pkgs/development/python-modules/geeknote/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geeknote/default.nix
diff --git a/pkgs/development/python-modules/genanki/default.nix b/nixpkgs/pkgs/development/python-modules/genanki/default.nix
index bab5b26635d..bab5b26635d 100644
--- a/pkgs/development/python-modules/genanki/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/genanki/default.nix
diff --git a/pkgs/development/python-modules/genpy/default.nix b/nixpkgs/pkgs/development/python-modules/genpy/default.nix
index c8bbeefd6ac..c8bbeefd6ac 100644
--- a/pkgs/development/python-modules/genpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/genpy/default.nix
diff --git a/pkgs/development/python-modules/genshi/default.nix b/nixpkgs/pkgs/development/python-modules/genshi/default.nix
index c86fae5d0e9..c86fae5d0e9 100644
--- a/pkgs/development/python-modules/genshi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/genshi/default.nix
diff --git a/pkgs/development/python-modules/gensim/default.nix b/nixpkgs/pkgs/development/python-modules/gensim/default.nix
index 592db824f3f..592db824f3f 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gensim/default.nix
diff --git a/pkgs/development/python-modules/gentools/default.nix b/nixpkgs/pkgs/development/python-modules/gentools/default.nix
index 57105f87a7c..57105f87a7c 100644
--- a/pkgs/development/python-modules/gentools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gentools/default.nix
diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/nixpkgs/pkgs/development/python-modules/genzshcomp/default.nix
index d7b73071b0c..d7b73071b0c 100644
--- a/pkgs/development/python-modules/genzshcomp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/genzshcomp/default.nix
diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix
index 250942a8488..250942a8488 100644
--- a/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix
diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix
index 0c275b672ab..0c275b672ab 100644
--- a/pkgs/development/python-modules/geographiclib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix
diff --git a/pkgs/development/python-modules/geoip2/default.nix b/nixpkgs/pkgs/development/python-modules/geoip2/default.nix
index 1f03b1dd725..1f03b1dd725 100644
--- a/pkgs/development/python-modules/geoip2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geoip2/default.nix
diff --git a/pkgs/development/python-modules/geojson/default.nix b/nixpkgs/pkgs/development/python-modules/geojson/default.nix
index a41cdada4be..a41cdada4be 100644
--- a/pkgs/development/python-modules/geojson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geojson/default.nix
diff --git a/pkgs/development/python-modules/geopandas/default.nix b/nixpkgs/pkgs/development/python-modules/geopandas/default.nix
index 5a6313be583..5a6313be583 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geopandas/default.nix
diff --git a/pkgs/development/python-modules/geopy/2.nix b/nixpkgs/pkgs/development/python-modules/geopy/2.nix
index 49876872724..49876872724 100644
--- a/pkgs/development/python-modules/geopy/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/geopy/2.nix
diff --git a/pkgs/development/python-modules/geopy/default.nix b/nixpkgs/pkgs/development/python-modules/geopy/default.nix
index 817c1e38418..817c1e38418 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geopy/default.nix
diff --git a/pkgs/development/python-modules/getmac/default.nix b/nixpkgs/pkgs/development/python-modules/getmac/default.nix
index 51ce0ef0503..51ce0ef0503 100644
--- a/pkgs/development/python-modules/getmac/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/getmac/default.nix
diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix
index e95519a346c..e95519a346c 100644
--- a/pkgs/development/python-modules/gevent-socketio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix
diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix
index 6c9df6b571b..6c9df6b571b 100644
--- a/pkgs/development/python-modules/gevent-websocket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix
diff --git a/pkgs/development/python-modules/gevent/default.nix b/nixpkgs/pkgs/development/python-modules/gevent/default.nix
index a8caf650016..a8caf650016 100644
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gevent/default.nix
diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
index 6a78d60544d..6a78d60544d 100644
--- a/pkgs/development/python-modules/geventhttpclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
diff --git a/pkgs/development/python-modules/gflags/default.nix b/nixpkgs/pkgs/development/python-modules/gflags/default.nix
index 9eb8e3b2d6c..9eb8e3b2d6c 100644
--- a/pkgs/development/python-modules/gflags/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gflags/default.nix
diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix
index 3a5fbe8433c..3a5fbe8433c 100644
--- a/pkgs/development/python-modules/ghdiff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix
diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix
index 341d08d95ed..341d08d95ed 100644
--- a/pkgs/development/python-modules/gidgethub/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix
diff --git a/pkgs/development/python-modules/gin-config/default.nix b/nixpkgs/pkgs/development/python-modules/gin-config/default.nix
index 5e8343a4b0c..5e8343a4b0c 100644
--- a/pkgs/development/python-modules/gin-config/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gin-config/default.nix
diff --git a/pkgs/development/python-modules/gipc/default.nix b/nixpkgs/pkgs/development/python-modules/gipc/default.nix
index 8255668de1c..8255668de1c 100644
--- a/pkgs/development/python-modules/gipc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gipc/default.nix
diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix
index a7bac0fd762..a7bac0fd762 100644
--- a/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix
diff --git a/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch b/nixpkgs/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch
index 8b1b854058b..8b1b854058b 100644
--- a/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch
diff --git a/pkgs/development/python-modules/git-revise/default.nix b/nixpkgs/pkgs/development/python-modules/git-revise/default.nix
index dfc0b4afb8a..dfc0b4afb8a 100644
--- a/pkgs/development/python-modules/git-revise/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/git-revise/default.nix
diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/nixpkgs/pkgs/development/python-modules/git-sweep/default.nix
index e2182892e85..e2182892e85 100644
--- a/pkgs/development/python-modules/git-sweep/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/git-sweep/default.nix
diff --git a/pkgs/development/python-modules/gitdb/default.nix b/nixpkgs/pkgs/development/python-modules/gitdb/default.nix
index ceca6e3719b..ceca6e3719b 100644
--- a/pkgs/development/python-modules/gitdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gitdb/default.nix
diff --git a/pkgs/development/python-modules/gitdb2/default.nix b/nixpkgs/pkgs/development/python-modules/gitdb2/default.nix
index ff4cc913f03..ff4cc913f03 100644
--- a/pkgs/development/python-modules/gitdb2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gitdb2/default.nix
diff --git a/pkgs/development/python-modules/github-webhook/default.nix b/nixpkgs/pkgs/development/python-modules/github-webhook/default.nix
index c9814b94d82..c9814b94d82 100644
--- a/pkgs/development/python-modules/github-webhook/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/github-webhook/default.nix
diff --git a/pkgs/development/python-modules/github3_py/default.nix b/nixpkgs/pkgs/development/python-modules/github3_py/default.nix
index d0d82adf491..d0d82adf491 100644
--- a/pkgs/development/python-modules/github3_py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/github3_py/default.nix
diff --git a/pkgs/development/python-modules/glances/default.nix b/nixpkgs/pkgs/development/python-modules/glances/default.nix
index 0a0864e52b6..0a0864e52b6 100644
--- a/pkgs/development/python-modules/glances/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/glances/default.nix
diff --git a/pkgs/development/python-modules/glances/skip-failing-tests.patch b/nixpkgs/pkgs/development/python-modules/glances/skip-failing-tests.patch
index e3116af6a2c..e3116af6a2c 100644
--- a/pkgs/development/python-modules/glances/skip-failing-tests.patch
+++ b/nixpkgs/pkgs/development/python-modules/glances/skip-failing-tests.patch
diff --git a/pkgs/development/python-modules/glasgow/default.nix b/nixpkgs/pkgs/development/python-modules/glasgow/default.nix
index 7717682afda..7717682afda 100644
--- a/pkgs/development/python-modules/glasgow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/glasgow/default.nix
diff --git a/pkgs/development/python-modules/glob2/default.nix b/nixpkgs/pkgs/development/python-modules/glob2/default.nix
index bce69bffff2..bce69bffff2 100644
--- a/pkgs/development/python-modules/glob2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/glob2/default.nix
diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix
index 45ae5fe00de..45ae5fe00de 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix
diff --git a/pkgs/development/python-modules/glom/default.nix b/nixpkgs/pkgs/development/python-modules/glom/default.nix
index 739ef7d95e4..739ef7d95e4 100644
--- a/pkgs/development/python-modules/glom/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/glom/default.nix
diff --git a/pkgs/development/python-modules/glymur/default.nix b/nixpkgs/pkgs/development/python-modules/glymur/default.nix
index 3da367c445f..3da367c445f 100644
--- a/pkgs/development/python-modules/glymur/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/glymur/default.nix
diff --git a/pkgs/development/python-modules/gmpy/default.nix b/nixpkgs/pkgs/development/python-modules/gmpy/default.nix
index 73f1175e0bd..73f1175e0bd 100644
--- a/pkgs/development/python-modules/gmpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gmpy/default.nix
diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix
index fc554906409..fc554906409 100644
--- a/pkgs/development/python-modules/gmpy2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix
diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix
index 2b57ce37a7f..2b57ce37a7f 100644
--- a/pkgs/development/python-modules/gmusicapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix
diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix
index 2e802e05c07..2e802e05c07 100644
--- a/pkgs/development/python-modules/gnureadline/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix
diff --git a/pkgs/development/python-modules/gnutls/default.nix b/nixpkgs/pkgs/development/python-modules/gnutls/default.nix
index 61c799589a9..61c799589a9 100644
--- a/pkgs/development/python-modules/gnutls/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gnutls/default.nix
diff --git a/pkgs/development/python-modules/goobook/default.nix b/nixpkgs/pkgs/development/python-modules/goobook/default.nix
index a04bf6250e9..a04bf6250e9 100644
--- a/pkgs/development/python-modules/goobook/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/goobook/default.nix
diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/nixpkgs/pkgs/development/python-modules/goocalendar/default.nix
index 9fc0acc30af..9fc0acc30af 100644
--- a/pkgs/development/python-modules/goocalendar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/goocalendar/default.nix
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
index e81f8274086..e81f8274086 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix
index 99c9945ea66..99c9945ea66 100644
--- a/pkgs/development/python-modules/google-auth-httplib2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix
diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index 54498ba1a85..54498ba1a85 100644
--- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix
diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix
index d7bf6d082f8..d7bf6d082f8 100644
--- a/pkgs/development/python-modules/google-i18n-address/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix
diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix
index d3f41880784..d3f41880784 100644
--- a/pkgs/development/python-modules/google-music-proto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix
diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/nixpkgs/pkgs/development/python-modules/google-music-utils/default.nix
index 84f677d4d4e..84f677d4d4e 100644
--- a/pkgs/development/python-modules/google-music-utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-music-utils/default.nix
diff --git a/pkgs/development/python-modules/google-music/default.nix b/nixpkgs/pkgs/development/python-modules/google-music/default.nix
index 0a3f145f131..0a3f145f131 100644
--- a/pkgs/development/python-modules/google-music/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-music/default.nix
diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/nixpkgs/pkgs/development/python-modules/google-pasta/default.nix
index fc4fb5a46d8..fc4fb5a46d8 100644
--- a/pkgs/development/python-modules/google-pasta/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google-pasta/default.nix
diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix
index 6bfc10f0a09..6bfc10f0a09 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix
diff --git a/pkgs/development/python-modules/google_apputils/default.nix b/nixpkgs/pkgs/development/python-modules/google_apputils/default.nix
index c7b386623ef..c7b386623ef 100644
--- a/pkgs/development/python-modules/google_apputils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_apputils/default.nix
diff --git a/pkgs/development/python-modules/google_auth/default.nix b/nixpkgs/pkgs/development/python-modules/google_auth/default.nix
index 01797673fba..01797673fba 100644
--- a/pkgs/development/python-modules/google_auth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_auth/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix
index 934af49462b..934af49462b 100644
--- a/pkgs/development/python-modules/google_cloud_asset/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix
index 3fc0fc8598d..3fc0fc8598d 100644
--- a/pkgs/development/python-modules/google_cloud_automl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix
index e361b4436ee..e361b4436ee 100644
--- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
index 3da3fbfdf85..3da3fbfdf85 100644
--- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix
index a71d2e493dd..a71d2e493dd 100644
--- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix
index d0994ce5e0b..d0994ce5e0b 100644
--- a/pkgs/development/python-modules/google_cloud_container/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix
index 139ce85a319..139ce85a319 100644
--- a/pkgs/development/python-modules/google_cloud_core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix
index becc2678dc1..becc2678dc1 100644
--- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix
index 7f47725cde3..7f47725cde3 100644
--- a/pkgs/development/python-modules/google_cloud_datastore/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix
index 30990938435..30990938435 100644
--- a/pkgs/development/python-modules/google_cloud_dlp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_dns/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix
index 3ed34303a72..3ed34303a72 100644
--- a/pkgs/development/python-modules/google_cloud_dns/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
index ef07bf1a3ce..ef07bf1a3ce 100644
--- a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix
index e6211d844fa..e6211d844fa 100644
--- a/pkgs/development/python-modules/google_cloud_firestore/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_iot/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_iot/default.nix
index 6f6cd3262f8..6f6cd3262f8 100644
--- a/pkgs/development/python-modules/google_cloud_iot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_iot/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix
index e3e9ed58eba..e3e9ed58eba 100644
--- a/pkgs/development/python-modules/google_cloud_kms/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_language/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_language/default.nix
index 44a3456607d..44a3456607d 100644
--- a/pkgs/development/python-modules/google_cloud_language/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_language/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix
index c4d9a1cb8d5..c4d9a1cb8d5 100644
--- a/pkgs/development/python-modules/google_cloud_logging/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_monitoring/default.nix
index a556fb95568..a556fb95568 100644
--- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_monitoring/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix
index 99723450866..99723450866 100644
--- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_redis/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_redis/default.nix
index 1eb2b9e08e9..1eb2b9e08e9 100644
--- a/pkgs/development/python-modules/google_cloud_redis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_redis/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
index 70dd5475c21..70dd5475c21 100644
--- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
index a1628b99140..a1628b99140 100644
--- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix
index 5ace3fad011..5ace3fad011 100644
--- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix
index 80e88d53f1f..80e88d53f1f 100644
--- a/pkgs/development/python-modules/google_cloud_spanner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_speech/default.nix
index c00ea653900..c00ea653900 100644
--- a/pkgs/development/python-modules/google_cloud_speech/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_speech/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix
index ff750602465..ff750602465 100644
--- a/pkgs/development/python-modules/google_cloud_storage/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_tasks/default.nix
index 95bcb0d4d57..95bcb0d4d57 100644
--- a/pkgs/development/python-modules/google_cloud_tasks/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_tasks/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix
index 311815ef331..311815ef331 100644
--- a/pkgs/development/python-modules/google_cloud_testutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
index e8ed28ab267..e8ed28ab267 100644
--- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_trace/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix
index 8e79759dfff..8e79759dfff 100644
--- a/pkgs/development/python-modules/google_cloud_trace/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix
index 99494b6886c..99494b6886c 100644
--- a/pkgs/development/python-modules/google_cloud_translate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix
index 57e106fcfbe..57e106fcfbe 100644
--- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_vision/default.nix
index 39dfc123650..39dfc123650 100644
--- a/pkgs/development/python-modules/google_cloud_vision/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_vision/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
index 3318ab03238..3318ab03238 100644
--- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix
index 8486eba68c1..8486eba68c1 100644
--- a/pkgs/development/python-modules/google_resumable_media/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix
diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix
index 5c8f1767dca..5c8f1767dca 100644
--- a/pkgs/development/python-modules/googleapis_common_protos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix
diff --git a/pkgs/development/python-modules/gpapi/default.nix b/nixpkgs/pkgs/development/python-modules/gpapi/default.nix
index c6afce2f9ba..c6afce2f9ba 100644
--- a/pkgs/development/python-modules/gpapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gpapi/default.nix
diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix
index 9d760b37d37..9d760b37d37 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix
diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix
index 074d41aab94..074d41aab94 100644
--- a/pkgs/development/python-modules/gplaycli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix
diff --git a/pkgs/development/python-modules/gprof2dot/default.nix b/nixpkgs/pkgs/development/python-modules/gprof2dot/default.nix
index 28609919098..28609919098 100644
--- a/pkgs/development/python-modules/gprof2dot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gprof2dot/default.nix
diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix
index 57130a7aa52..57130a7aa52 100644
--- a/pkgs/development/python-modules/gpsoauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix
diff --git a/pkgs/development/python-modules/gpxpy/default.nix b/nixpkgs/pkgs/development/python-modules/gpxpy/default.nix
index 028ca365423..028ca365423 100644
--- a/pkgs/development/python-modules/gpxpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gpxpy/default.nix
diff --git a/pkgs/development/python-modules/gpy/default.nix b/nixpkgs/pkgs/development/python-modules/gpy/default.nix
index a6390261204..a6390261204 100644
--- a/pkgs/development/python-modules/gpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gpy/default.nix
diff --git a/pkgs/development/python-modules/gpyopt/default.nix b/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix
index 3ad5cb7d89b..3ad5cb7d89b 100644
--- a/pkgs/development/python-modules/gpyopt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix
diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/nixpkgs/pkgs/development/python-modules/grammalecte/default.nix
index 01c052bfdce..01c052bfdce 100644
--- a/pkgs/development/python-modules/grammalecte/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grammalecte/default.nix
diff --git a/pkgs/development/python-modules/grandalf/default.nix b/nixpkgs/pkgs/development/python-modules/grandalf/default.nix
index 79413b26544..79413b26544 100644
--- a/pkgs/development/python-modules/grandalf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grandalf/default.nix
diff --git a/pkgs/development/python-modules/grandalf/no-setup-requires-pytestrunner.patch b/nixpkgs/pkgs/development/python-modules/grandalf/no-setup-requires-pytestrunner.patch
index 80e12e246eb..80e12e246eb 100644
--- a/pkgs/development/python-modules/grandalf/no-setup-requires-pytestrunner.patch
+++ b/nixpkgs/pkgs/development/python-modules/grandalf/no-setup-requires-pytestrunner.patch
diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix
index e069c8f8c7b..e069c8f8c7b 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix
diff --git a/pkgs/development/python-modules/graph_nets/default.nix b/nixpkgs/pkgs/development/python-modules/graph_nets/default.nix
index 6b2536d37b3..6b2536d37b3 100644
--- a/pkgs/development/python-modules/graph_nets/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/graph_nets/default.nix
diff --git a/pkgs/development/python-modules/graphite-api/default.nix b/nixpkgs/pkgs/development/python-modules/graphite-api/default.nix
index 7f1726a2c4b..7f1726a2c4b 100644
--- a/pkgs/development/python-modules/graphite-api/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/graphite-api/default.nix
diff --git a/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch b/nixpkgs/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch
index 2d4a2f29bc4..2d4a2f29bc4 100644
--- a/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch
+++ b/nixpkgs/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch
diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix
index 88e3118d456..88e3118d456 100644
--- a/pkgs/development/python-modules/graphite-web/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix
diff --git a/pkgs/development/python-modules/graphite_beacon/default.nix b/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix
index b94a92bc02f..b94a92bc02f 100644
--- a/pkgs/development/python-modules/graphite_beacon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix
diff --git a/pkgs/development/python-modules/graphitepager/default.nix b/nixpkgs/pkgs/development/python-modules/graphitepager/default.nix
index d2ab8d547fd..d2ab8d547fd 100644
--- a/pkgs/development/python-modules/graphitepager/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/graphitepager/default.nix
diff --git a/pkgs/development/python-modules/graphviz/default.nix b/nixpkgs/pkgs/development/python-modules/graphviz/default.nix
index 572fdcaee51..572fdcaee51 100644
--- a/pkgs/development/python-modules/graphviz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/graphviz/default.nix
diff --git a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch b/nixpkgs/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch
index ad632974c28..ad632974c28 100644
--- a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch
diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix
index 5a845f733f5..5a845f733f5 100644
--- a/pkgs/development/python-modules/grappelli_safe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix
diff --git a/pkgs/development/python-modules/greatfet/default.nix b/nixpkgs/pkgs/development/python-modules/greatfet/default.nix
index c6fddd1554c..c6fddd1554c 100644
--- a/pkgs/development/python-modules/greatfet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/greatfet/default.nix
diff --git a/pkgs/development/python-modules/green/default.nix b/nixpkgs/pkgs/development/python-modules/green/default.nix
index a1167f24035..a1167f24035 100644
--- a/pkgs/development/python-modules/green/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/green/default.nix
diff --git a/pkgs/development/python-modules/greenlet/default.nix b/nixpkgs/pkgs/development/python-modules/greenlet/default.nix
index 3754f08c28b..3754f08c28b 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/greenlet/default.nix
diff --git a/pkgs/development/python-modules/grequests/default.nix b/nixpkgs/pkgs/development/python-modules/grequests/default.nix
index 0557fe787e8..0557fe787e8 100644
--- a/pkgs/development/python-modules/grequests/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grequests/default.nix
diff --git a/pkgs/development/python-modules/grip/default.nix b/nixpkgs/pkgs/development/python-modules/grip/default.nix
index d812d58b74c..d812d58b74c 100644
--- a/pkgs/development/python-modules/grip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grip/default.nix
diff --git a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
index 843c1b32f49..843c1b32f49 100644
--- a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
diff --git a/pkgs/development/python-modules/grpcio-gcp/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix
index 067b27c8ffd..067b27c8ffd 100644
--- a/pkgs/development/python-modules/grpcio-gcp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
index 8b84af18729..8b84af18729 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
index 60bfae8dca5..60bfae8dca5 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix
index 311c4aba732..311c4aba732 100644
--- a/pkgs/development/python-modules/gsd/1.7.nix
+++ b/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix
diff --git a/pkgs/development/python-modules/gsd/default.nix b/nixpkgs/pkgs/development/python-modules/gsd/default.nix
index 8eefb1f4318..8eefb1f4318 100644
--- a/pkgs/development/python-modules/gsd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gsd/default.nix
diff --git a/pkgs/development/python-modules/gspread/default.nix b/nixpkgs/pkgs/development/python-modules/gspread/default.nix
index 2a20d610485..2a20d610485 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gspread/default.nix
diff --git a/pkgs/development/python-modules/gssapi/default.nix b/nixpkgs/pkgs/development/python-modules/gssapi/default.nix
index 00c9b86c5eb..00c9b86c5eb 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gssapi/default.nix
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
index a26b02ee030..a26b02ee030 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix
index 17dc8dea4f8..17dc8dea4f8 100644
--- a/pkgs/development/python-modules/gtimelog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix
diff --git a/pkgs/development/python-modules/gtts-token/default.nix b/nixpkgs/pkgs/development/python-modules/gtts-token/default.nix
index 62d709aa921..62d709aa921 100644
--- a/pkgs/development/python-modules/gtts-token/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gtts-token/default.nix
diff --git a/pkgs/development/python-modules/guessit/default.nix b/nixpkgs/pkgs/development/python-modules/guessit/default.nix
index 509488ebfa4..509488ebfa4 100644
--- a/pkgs/development/python-modules/guessit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/guessit/default.nix
diff --git a/pkgs/development/python-modules/guestfs/default.nix b/nixpkgs/pkgs/development/python-modules/guestfs/default.nix
index 238a1e9980b..238a1e9980b 100644
--- a/pkgs/development/python-modules/guestfs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/guestfs/default.nix
diff --git a/pkgs/development/python-modules/gumath/default.nix b/nixpkgs/pkgs/development/python-modules/gumath/default.nix
index 2937b876dec..2937b876dec 100644
--- a/pkgs/development/python-modules/gumath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gumath/default.nix
diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix
index 75a3d745a3f..75a3d745a3f 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix
diff --git a/pkgs/development/python-modules/gurobipy/darwin.nix b/nixpkgs/pkgs/development/python-modules/gurobipy/darwin.nix
index 3bd3b3b2a32..3bd3b3b2a32 100644
--- a/pkgs/development/python-modules/gurobipy/darwin.nix
+++ b/nixpkgs/pkgs/development/python-modules/gurobipy/darwin.nix
diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/nixpkgs/pkgs/development/python-modules/gurobipy/linux.nix
index d572b10fd62..d572b10fd62 100644
--- a/pkgs/development/python-modules/gurobipy/linux.nix
+++ b/nixpkgs/pkgs/development/python-modules/gurobipy/linux.nix
diff --git a/pkgs/development/python-modules/gurobipy/no-clever-setup.patch b/nixpkgs/pkgs/development/python-modules/gurobipy/no-clever-setup.patch
index c71ac7d6863..c71ac7d6863 100644
--- a/pkgs/development/python-modules/gurobipy/no-clever-setup.patch
+++ b/nixpkgs/pkgs/development/python-modules/gurobipy/no-clever-setup.patch
diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
index 08b42b80799..08b42b80799 100644
--- a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
diff --git a/pkgs/development/python-modules/gym/default.nix b/nixpkgs/pkgs/development/python-modules/gym/default.nix
index d90ded1fb5f..d90ded1fb5f 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gym/default.nix
diff --git a/pkgs/development/python-modules/gyp/default.nix b/nixpkgs/pkgs/development/python-modules/gyp/default.nix
index db828eb222d..db828eb222d 100644
--- a/pkgs/development/python-modules/gyp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gyp/default.nix
diff --git a/pkgs/development/python-modules/gyp/no-darwin-cflags.patch b/nixpkgs/pkgs/development/python-modules/gyp/no-darwin-cflags.patch
index 798d0f0b16d..798d0f0b16d 100644
--- a/pkgs/development/python-modules/gyp/no-darwin-cflags.patch
+++ b/nixpkgs/pkgs/development/python-modules/gyp/no-darwin-cflags.patch
diff --git a/pkgs/development/python-modules/gyp/no-xcode.patch b/nixpkgs/pkgs/development/python-modules/gyp/no-xcode.patch
index d202b722474..d202b722474 100644
--- a/pkgs/development/python-modules/gyp/no-xcode.patch
+++ b/nixpkgs/pkgs/development/python-modules/gyp/no-xcode.patch
diff --git a/pkgs/development/python-modules/h11/default.nix b/nixpkgs/pkgs/development/python-modules/h11/default.nix
index 361ac0c59d1..361ac0c59d1 100644
--- a/pkgs/development/python-modules/h11/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/h11/default.nix
diff --git a/pkgs/development/python-modules/h2/default.nix b/nixpkgs/pkgs/development/python-modules/h2/default.nix
index c267b6d4726..c267b6d4726 100644
--- a/pkgs/development/python-modules/h2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/h2/default.nix
diff --git a/pkgs/development/python-modules/h3/default.nix b/nixpkgs/pkgs/development/python-modules/h3/default.nix
index d98a053c418..d98a053c418 100644
--- a/pkgs/development/python-modules/h3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/h3/default.nix
diff --git a/pkgs/development/python-modules/h3/disable-custom-install.patch b/nixpkgs/pkgs/development/python-modules/h3/disable-custom-install.patch
index 981e3b6e2fc..981e3b6e2fc 100644
--- a/pkgs/development/python-modules/h3/disable-custom-install.patch
+++ b/nixpkgs/pkgs/development/python-modules/h3/disable-custom-install.patch
diff --git a/pkgs/development/python-modules/h3/hardcode-h3-path.patch b/nixpkgs/pkgs/development/python-modules/h3/hardcode-h3-path.patch
index 87549f298d7..87549f298d7 100644
--- a/pkgs/development/python-modules/h3/hardcode-h3-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/h3/hardcode-h3-path.patch
diff --git a/pkgs/development/python-modules/h5py/default.nix b/nixpkgs/pkgs/development/python-modules/h5py/default.nix
index 23e659ea7ae..23e659ea7ae 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/h5py/default.nix
diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix
index 717c8a95453..717c8a95453 100644
--- a/pkgs/development/python-modules/ha-ffmpeg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix
diff --git a/pkgs/development/python-modules/habanero/default.nix b/nixpkgs/pkgs/development/python-modules/habanero/default.nix
index b58d4a30020..b58d4a30020 100644
--- a/pkgs/development/python-modules/habanero/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/habanero/default.nix
diff --git a/pkgs/development/python-modules/handout/default.nix b/nixpkgs/pkgs/development/python-modules/handout/default.nix
index c5c111845d1..c5c111845d1 100644
--- a/pkgs/development/python-modules/handout/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/handout/default.nix
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix
index e14b97d94ce..e14b97d94ce 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix
diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix
index 46e49ba6b88..46e49ba6b88 100644
--- a/pkgs/development/python-modules/hawkauthlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix
diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix
index 90c6444da4c..90c6444da4c 100644
--- a/pkgs/development/python-modules/hbmqtt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix
diff --git a/pkgs/development/python-modules/hcloud/default.nix b/nixpkgs/pkgs/development/python-modules/hcloud/default.nix
index bb57c0fbf96..bb57c0fbf96 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hcloud/default.nix
diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix
index 51d42e5c8b7..51d42e5c8b7 100644
--- a/pkgs/development/python-modules/hcs_utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix
diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix
index 7351b274210..7351b274210 100644
--- a/pkgs/development/python-modules/hdbscan/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix
diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix
index 3a573f69c70..3a573f69c70 100644
--- a/pkgs/development/python-modules/hdmedians/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix
diff --git a/pkgs/development/python-modules/heapdict/default.nix b/nixpkgs/pkgs/development/python-modules/heapdict/default.nix
index 841c3a45259..841c3a45259 100644
--- a/pkgs/development/python-modules/heapdict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/heapdict/default.nix
diff --git a/pkgs/development/python-modules/helper/default.nix b/nixpkgs/pkgs/development/python-modules/helper/default.nix
index 8aa6e1e921f..8aa6e1e921f 100644
--- a/pkgs/development/python-modules/helper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/helper/default.nix
diff --git a/pkgs/development/python-modules/hetzner/default.nix b/nixpkgs/pkgs/development/python-modules/hetzner/default.nix
index 2909d2c2a6c..2909d2c2a6c 100644
--- a/pkgs/development/python-modules/hetzner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hetzner/default.nix
diff --git a/pkgs/development/python-modules/hg-git/default.nix b/nixpkgs/pkgs/development/python-modules/hg-git/default.nix
index 452b946a042..452b946a042 100644
--- a/pkgs/development/python-modules/hg-git/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hg-git/default.nix
diff --git a/pkgs/development/python-modules/hglib/default.nix b/nixpkgs/pkgs/development/python-modules/hglib/default.nix
index eab8ffe2bfd..eab8ffe2bfd 100644
--- a/pkgs/development/python-modules/hglib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hglib/default.nix
diff --git a/pkgs/development/python-modules/hglib/hgpath.patch b/nixpkgs/pkgs/development/python-modules/hglib/hgpath.patch
index 2141aa32a13..2141aa32a13 100644
--- a/pkgs/development/python-modules/hglib/hgpath.patch
+++ b/nixpkgs/pkgs/development/python-modules/hglib/hgpath.patch
diff --git a/pkgs/development/python-modules/hgsvn/default.nix b/nixpkgs/pkgs/development/python-modules/hgsvn/default.nix
index 056415df4f6..056415df4f6 100644
--- a/pkgs/development/python-modules/hgsvn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hgsvn/default.nix
diff --git a/pkgs/development/python-modules/hidapi/default.nix b/nixpkgs/pkgs/development/python-modules/hidapi/default.nix
index 2d78a45da8c..2d78a45da8c 100644
--- a/pkgs/development/python-modules/hidapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hidapi/default.nix
diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix
index 9fa28126452..9fa28126452 100644
--- a/pkgs/development/python-modules/hieroglyph/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix
diff --git a/pkgs/development/python-modules/hiredis/default.nix b/nixpkgs/pkgs/development/python-modules/hiredis/default.nix
index c22de6d8a66..c22de6d8a66 100644
--- a/pkgs/development/python-modules/hiredis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hiredis/default.nix
diff --git a/pkgs/development/python-modules/hiro/default.nix b/nixpkgs/pkgs/development/python-modules/hiro/default.nix
index ea6cb6d34e3..ea6cb6d34e3 100644
--- a/pkgs/development/python-modules/hiro/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hiro/default.nix
diff --git a/pkgs/development/python-modules/hkdf/default.nix b/nixpkgs/pkgs/development/python-modules/hkdf/default.nix
index 347cd94c8f5..347cd94c8f5 100644
--- a/pkgs/development/python-modules/hkdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hkdf/default.nix
diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix
index e29c31e6fa7..e29c31e6fa7 100644
--- a/pkgs/development/python-modules/hmmlearn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix
diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix
index 810d9ee6148..810d9ee6148 100644
--- a/pkgs/development/python-modules/hocr-tools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix
diff --git a/pkgs/development/python-modules/holidays/default.nix b/nixpkgs/pkgs/development/python-modules/holidays/default.nix
index ebde21a4821..ebde21a4821 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/holidays/default.nix
diff --git a/pkgs/development/python-modules/holoviews/default.nix b/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
index b12ef64c602..b12ef64c602 100644
--- a/pkgs/development/python-modules/holoviews/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
diff --git a/pkgs/development/python-modules/homeassistant-pyozw/default.nix b/nixpkgs/pkgs/development/python-modules/homeassistant-pyozw/default.nix
index 5674db53e5a..5674db53e5a 100644
--- a/pkgs/development/python-modules/homeassistant-pyozw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/homeassistant-pyozw/default.nix
diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix
index 59528723d80..59528723d80 100644
--- a/pkgs/development/python-modules/hoomd-blue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix
diff --git a/pkgs/development/python-modules/hopcroftkarp/default.nix b/nixpkgs/pkgs/development/python-modules/hopcroftkarp/default.nix
index e6033aa347e..e6033aa347e 100644
--- a/pkgs/development/python-modules/hopcroftkarp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hopcroftkarp/default.nix
diff --git a/pkgs/development/python-modules/howdoi/default.nix b/nixpkgs/pkgs/development/python-modules/howdoi/default.nix
index 293ad51e302..293ad51e302 100644
--- a/pkgs/development/python-modules/howdoi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/howdoi/default.nix
diff --git a/pkgs/development/python-modules/hpack/default.nix b/nixpkgs/pkgs/development/python-modules/hpack/default.nix
index a10882417fc..a10882417fc 100644
--- a/pkgs/development/python-modules/hpack/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hpack/default.nix
diff --git a/pkgs/development/python-modules/hsaudiotag/default.nix b/nixpkgs/pkgs/development/python-modules/hsaudiotag/default.nix
index d08d9e06b71..d08d9e06b71 100644
--- a/pkgs/development/python-modules/hsaudiotag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hsaudiotag/default.nix
diff --git a/pkgs/development/python-modules/hsaudiotag3k/default.nix b/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix
index 06f89f73333..06f89f73333 100644
--- a/pkgs/development/python-modules/hsaudiotag3k/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix
diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix
index 918ed268afa..918ed268afa 100644
--- a/pkgs/development/python-modules/hstspreload/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix
diff --git a/pkgs/development/python-modules/html2text/2018.nix b/nixpkgs/pkgs/development/python-modules/html2text/2018.nix
index cac88c55794..cac88c55794 100644
--- a/pkgs/development/python-modules/html2text/2018.nix
+++ b/nixpkgs/pkgs/development/python-modules/html2text/2018.nix
diff --git a/pkgs/development/python-modules/html2text/default.nix b/nixpkgs/pkgs/development/python-modules/html2text/default.nix
index a0462795d23..a0462795d23 100644
--- a/pkgs/development/python-modules/html2text/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/html2text/default.nix
diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix
index db59bb49cf2..db59bb49cf2 100644
--- a/pkgs/development/python-modules/html5-parser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix
diff --git a/pkgs/development/python-modules/html5lib/default.nix b/nixpkgs/pkgs/development/python-modules/html5lib/default.nix
index 82b48180709..82b48180709 100644
--- a/pkgs/development/python-modules/html5lib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/html5lib/default.nix
diff --git a/pkgs/development/python-modules/htmllaundry/default.nix b/nixpkgs/pkgs/development/python-modules/htmllaundry/default.nix
index 787163d477e..787163d477e 100644
--- a/pkgs/development/python-modules/htmllaundry/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/htmllaundry/default.nix
diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/nixpkgs/pkgs/development/python-modules/htmlmin/default.nix
index 538b75c3dd0..538b75c3dd0 100644
--- a/pkgs/development/python-modules/htmlmin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/htmlmin/default.nix
diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/nixpkgs/pkgs/development/python-modules/htmltreediff/default.nix
index c2c7f4e12f4..c2c7f4e12f4 100644
--- a/pkgs/development/python-modules/htmltreediff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/htmltreediff/default.nix
diff --git a/pkgs/development/python-modules/httmock/default.nix b/nixpkgs/pkgs/development/python-modules/httmock/default.nix
index 53447544ca9..53447544ca9 100644
--- a/pkgs/development/python-modules/httmock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httmock/default.nix
diff --git a/pkgs/development/python-modules/http-ece/default.nix b/nixpkgs/pkgs/development/python-modules/http-ece/default.nix
index 1f50608d3d1..1f50608d3d1 100644
--- a/pkgs/development/python-modules/http-ece/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/http-ece/default.nix
diff --git a/pkgs/development/python-modules/http_signature/default.nix b/nixpkgs/pkgs/development/python-modules/http_signature/default.nix
index 48f06db1ba5..48f06db1ba5 100644
--- a/pkgs/development/python-modules/http_signature/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/http_signature/default.nix
diff --git a/pkgs/development/python-modules/httpauth/default.nix b/nixpkgs/pkgs/development/python-modules/httpauth/default.nix
index f1afd41ebed..f1afd41ebed 100644
--- a/pkgs/development/python-modules/httpauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httpauth/default.nix
diff --git a/pkgs/development/python-modules/httpbin/default.nix b/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
index 77dc27f1096..77dc27f1096 100644
--- a/pkgs/development/python-modules/httpbin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
diff --git a/pkgs/development/python-modules/httplib2/default.nix b/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
index c40f3453d6b..c40f3453d6b 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
diff --git a/pkgs/development/python-modules/httpretty/default.nix b/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
index 86b8ef13a7a..86b8ef13a7a 100644
--- a/pkgs/development/python-modules/httpretty/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
diff --git a/pkgs/development/python-modules/httpserver/default.nix b/nixpkgs/pkgs/development/python-modules/httpserver/default.nix
index 3bd61ec8afa..3bd61ec8afa 100644
--- a/pkgs/development/python-modules/httpserver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httpserver/default.nix
diff --git a/pkgs/development/python-modules/httpsig/default.nix b/nixpkgs/pkgs/development/python-modules/httpsig/default.nix
index 24ba9be1382..24ba9be1382 100644
--- a/pkgs/development/python-modules/httpsig/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httpsig/default.nix
diff --git a/pkgs/development/python-modules/httptools/default.nix b/nixpkgs/pkgs/development/python-modules/httptools/default.nix
index fc83675fd65..fc83675fd65 100644
--- a/pkgs/development/python-modules/httptools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httptools/default.nix
diff --git a/pkgs/development/python-modules/httpx/default.nix b/nixpkgs/pkgs/development/python-modules/httpx/default.nix
index 04a0592d750..04a0592d750 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httpx/default.nix
diff --git a/pkgs/development/python-modules/hug/default.nix b/nixpkgs/pkgs/development/python-modules/hug/default.nix
index bb38c738760..bb38c738760 100644
--- a/pkgs/development/python-modules/hug/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hug/default.nix
diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix
index bef32f947c3..bef32f947c3 100644
--- a/pkgs/development/python-modules/humanfriendly/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix
diff --git a/pkgs/development/python-modules/humanize/default.nix b/nixpkgs/pkgs/development/python-modules/humanize/default.nix
index f1fac28dd93..f1fac28dd93 100644
--- a/pkgs/development/python-modules/humanize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/humanize/default.nix
diff --git a/pkgs/development/python-modules/hupper/default.nix b/nixpkgs/pkgs/development/python-modules/hupper/default.nix
index 33f76f0a248..33f76f0a248 100644
--- a/pkgs/development/python-modules/hupper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hupper/default.nix
diff --git a/pkgs/development/python-modules/hvac/default.nix b/nixpkgs/pkgs/development/python-modules/hvac/default.nix
index 3b5484dcbcb..3b5484dcbcb 100644
--- a/pkgs/development/python-modules/hvac/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hvac/default.nix
diff --git a/pkgs/development/python-modules/hvplot/default.nix b/nixpkgs/pkgs/development/python-modules/hvplot/default.nix
index 2079f849769..2079f849769 100644
--- a/pkgs/development/python-modules/hvplot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hvplot/default.nix
diff --git a/pkgs/development/python-modules/hydra/default.nix b/nixpkgs/pkgs/development/python-modules/hydra/default.nix
index 9087be43f95..9087be43f95 100644
--- a/pkgs/development/python-modules/hydra/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hydra/default.nix
diff --git a/pkgs/development/python-modules/hypchat/default.nix b/nixpkgs/pkgs/development/python-modules/hypchat/default.nix
index 8337fd2230b..8337fd2230b 100644
--- a/pkgs/development/python-modules/hypchat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hypchat/default.nix
diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix
index a8f847c53bb..a8f847c53bb 100644
--- a/pkgs/development/python-modules/hyperframe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix
diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix
index 1fc49017821..1fc49017821 100644
--- a/pkgs/development/python-modules/hyperlink/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix
index 9e3b0cdc894..9e3b0cdc894 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix
diff --git a/pkgs/development/python-modules/i3-py/default.nix b/nixpkgs/pkgs/development/python-modules/i3-py/default.nix
index ea6e449947c..ea6e449947c 100644
--- a/pkgs/development/python-modules/i3-py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/i3-py/default.nix
diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix
index 482a51a099e..482a51a099e 100644
--- a/pkgs/development/python-modules/i3ipc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix
diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix
index 56aaf6ec71a..56aaf6ec71a 100644
--- a/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix
diff --git a/pkgs/development/python-modules/ibis/default.nix b/nixpkgs/pkgs/development/python-modules/ibis/default.nix
index 6b405366c7e..6b405366c7e 100644
--- a/pkgs/development/python-modules/ibis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ibis/default.nix
diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/nixpkgs/pkgs/development/python-modules/ibmquantumexperience/default.nix
index dcf39dd24f0..dcf39dd24f0 100644
--- a/pkgs/development/python-modules/ibmquantumexperience/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ibmquantumexperience/default.nix
diff --git a/pkgs/development/python-modules/icalendar/default.nix b/nixpkgs/pkgs/development/python-modules/icalendar/default.nix
index 1d445f83b08..1d445f83b08 100644
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/icalendar/default.nix
diff --git a/pkgs/development/python-modules/ics/default.nix b/nixpkgs/pkgs/development/python-modules/ics/default.nix
index b642bdf311e..b642bdf311e 100644
--- a/pkgs/development/python-modules/ics/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ics/default.nix
diff --git a/pkgs/development/python-modules/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix
index 86d1617852b..86d1617852b 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/identify/default.nix
diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/nixpkgs/pkgs/development/python-modules/idna-ssl/default.nix
index a8a040d39e2..a8a040d39e2 100644
--- a/pkgs/development/python-modules/idna-ssl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/idna-ssl/default.nix
diff --git a/pkgs/development/python-modules/idna/default.nix b/nixpkgs/pkgs/development/python-modules/idna/default.nix
index 5e5d623ff10..5e5d623ff10 100644
--- a/pkgs/development/python-modules/idna/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/idna/default.nix
diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix
index e5087a10536..e5087a10536 100644
--- a/pkgs/development/python-modules/ifaddr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix
diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix
index 5df5e6b18cd..5df5e6b18cd 100644
--- a/pkgs/development/python-modules/ihatemoney/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix
diff --git a/pkgs/development/python-modules/ijson/default.nix b/nixpkgs/pkgs/development/python-modules/ijson/default.nix
index 8729de427d9..8729de427d9 100644
--- a/pkgs/development/python-modules/ijson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ijson/default.nix
diff --git a/pkgs/development/python-modules/image-match/default.nix b/nixpkgs/pkgs/development/python-modules/image-match/default.nix
index 49d1062abc3..49d1062abc3 100644
--- a/pkgs/development/python-modules/image-match/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/image-match/default.nix
diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix
index 861a0ed0db3..861a0ed0db3 100644
--- a/pkgs/development/python-modules/imagecodecs-lite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix
diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix
index 5d07024656e..5d07024656e 100644
--- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix
diff --git a/pkgs/development/python-modules/imageio/default.nix b/nixpkgs/pkgs/development/python-modules/imageio/default.nix
index 0e5134eeb26..0e5134eeb26 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imageio/default.nix
diff --git a/pkgs/development/python-modules/imagesize/default.nix b/nixpkgs/pkgs/development/python-modules/imagesize/default.nix
index 6be9f76d380..6be9f76d380 100644
--- a/pkgs/development/python-modules/imagesize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imagesize/default.nix
diff --git a/pkgs/development/python-modules/imapclient/default.nix b/nixpkgs/pkgs/development/python-modules/imapclient/default.nix
index e45cdb3eab8..e45cdb3eab8 100644
--- a/pkgs/development/python-modules/imapclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imapclient/default.nix
diff --git a/pkgs/development/python-modules/imaplib2/default.nix b/nixpkgs/pkgs/development/python-modules/imaplib2/default.nix
index 0ceff353f9a..0ceff353f9a 100644
--- a/pkgs/development/python-modules/imaplib2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imaplib2/default.nix
diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix
index e7d2c2f3714..e7d2c2f3714 100644
--- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix
+++ b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix
diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix
index 568fc825ab6..568fc825ab6 100644
--- a/pkgs/development/python-modules/imbalanced-learn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix
diff --git a/pkgs/development/python-modules/imgaug/default.nix b/nixpkgs/pkgs/development/python-modules/imgaug/default.nix
index 48ea6004426..48ea6004426 100644
--- a/pkgs/development/python-modules/imgaug/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imgaug/default.nix
diff --git a/pkgs/development/python-modules/immutables/default.nix b/nixpkgs/pkgs/development/python-modules/immutables/default.nix
index 8ca0fe6df9f..8ca0fe6df9f 100644
--- a/pkgs/development/python-modules/immutables/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/immutables/default.nix
diff --git a/pkgs/development/python-modules/impacket/default.nix b/nixpkgs/pkgs/development/python-modules/impacket/default.nix
index 1d71b15137c..1d71b15137c 100644
--- a/pkgs/development/python-modules/impacket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/impacket/default.nix
diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix
index 5b7a249d65a..5b7a249d65a 100644
--- a/pkgs/development/python-modules/importlib-metadata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix
diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix
index f5769bf0b2d..f5769bf0b2d 100644
--- a/pkgs/development/python-modules/importlib-resources/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix
diff --git a/pkgs/development/python-modules/importmagic/default.nix b/nixpkgs/pkgs/development/python-modules/importmagic/default.nix
index 0aa4a295f5d..0aa4a295f5d 100644
--- a/pkgs/development/python-modules/importmagic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/importmagic/default.nix
diff --git a/pkgs/development/python-modules/imread/default.nix b/nixpkgs/pkgs/development/python-modules/imread/default.nix
index 0711283a1b8..0711283a1b8 100644
--- a/pkgs/development/python-modules/imread/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imread/default.nix
diff --git a/pkgs/development/python-modules/imutils/default.nix b/nixpkgs/pkgs/development/python-modules/imutils/default.nix
index 45e795cd616..45e795cd616 100644
--- a/pkgs/development/python-modules/imutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/imutils/default.nix
diff --git a/pkgs/development/python-modules/incremental/default.nix b/nixpkgs/pkgs/development/python-modules/incremental/default.nix
index a97a98b207a..a97a98b207a 100644
--- a/pkgs/development/python-modules/incremental/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/incremental/default.nix
diff --git a/pkgs/development/python-modules/inflect/default.nix b/nixpkgs/pkgs/development/python-modules/inflect/default.nix
index 2b856b35f7c..2b856b35f7c 100644
--- a/pkgs/development/python-modules/inflect/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/inflect/default.nix
diff --git a/pkgs/development/python-modules/inflection/default.nix b/nixpkgs/pkgs/development/python-modules/inflection/default.nix
index bccf49c56ad..bccf49c56ad 100644
--- a/pkgs/development/python-modules/inflection/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/inflection/default.nix
diff --git a/pkgs/development/python-modules/influxdb/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix
index d624ebd60e5..d624ebd60e5 100644
--- a/pkgs/development/python-modules/influxdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix
diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix
index eeb27b14080..eeb27b14080 100644
--- a/pkgs/development/python-modules/influxgraph/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix
diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix
index ce265d01378..ce265d01378 100644
--- a/pkgs/development/python-modules/infoqscraper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix
diff --git a/pkgs/development/python-modules/inifile/default.nix b/nixpkgs/pkgs/development/python-modules/inifile/default.nix
index e64ef76356d..e64ef76356d 100644
--- a/pkgs/development/python-modules/inifile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/inifile/default.nix
diff --git a/pkgs/development/python-modules/iniparse/default.nix b/nixpkgs/pkgs/development/python-modules/iniparse/default.nix
index 1fdae967a42..1fdae967a42 100644
--- a/pkgs/development/python-modules/iniparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/iniparse/default.nix
diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/nixpkgs/pkgs/development/python-modules/inotify-simple/default.nix
index 10c64fa6b3f..10c64fa6b3f 100644
--- a/pkgs/development/python-modules/inotify-simple/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/inotify-simple/default.nix
diff --git a/pkgs/development/python-modules/inquirer/default.nix b/nixpkgs/pkgs/development/python-modules/inquirer/default.nix
index 58e7f61b676..58e7f61b676 100644
--- a/pkgs/development/python-modules/inquirer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/inquirer/default.nix
diff --git a/pkgs/development/python-modules/intake/default.nix b/nixpkgs/pkgs/development/python-modules/intake/default.nix
index 487ffc35b1a..487ffc35b1a 100644
--- a/pkgs/development/python-modules/intake/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/intake/default.nix
diff --git a/pkgs/development/python-modules/intelhex/default.nix b/nixpkgs/pkgs/development/python-modules/intelhex/default.nix
index 20098485ad4..20098485ad4 100644
--- a/pkgs/development/python-modules/intelhex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/intelhex/default.nix
diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix
index 6b393aea1e7..6b393aea1e7 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix
diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/nixpkgs/pkgs/development/python-modules/interruptingcow/default.nix
index ee81c40febc..ee81c40febc 100644
--- a/pkgs/development/python-modules/interruptingcow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/interruptingcow/default.nix
diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix
index b60eb0c7327..b60eb0c7327 100644
--- a/pkgs/development/python-modules/intervaltree/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix
diff --git a/pkgs/development/python-modules/intreehooks/default.nix b/nixpkgs/pkgs/development/python-modules/intreehooks/default.nix
index be8d3927c9f..be8d3927c9f 100644
--- a/pkgs/development/python-modules/intreehooks/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/intreehooks/default.nix
diff --git a/pkgs/development/python-modules/invoke/default.nix b/nixpkgs/pkgs/development/python-modules/invoke/default.nix
index a07dd9e727c..a07dd9e727c 100644
--- a/pkgs/development/python-modules/invoke/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/invoke/default.nix
diff --git a/pkgs/development/python-modules/iocapture/default.nix b/nixpkgs/pkgs/development/python-modules/iocapture/default.nix
index 1e333d923a0..1e333d923a0 100644
--- a/pkgs/development/python-modules/iocapture/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/iocapture/default.nix
diff --git a/pkgs/development/python-modules/iowait/default.nix b/nixpkgs/pkgs/development/python-modules/iowait/default.nix
index c67d56b153e..c67d56b153e 100644
--- a/pkgs/development/python-modules/iowait/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/iowait/default.nix
diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/nixpkgs/pkgs/development/python-modules/ipaddr/default.nix
index e76aa6ee2a5..e76aa6ee2a5 100644
--- a/pkgs/development/python-modules/ipaddr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipaddr/default.nix
diff --git a/pkgs/development/python-modules/ipaddress/default.nix b/nixpkgs/pkgs/development/python-modules/ipaddress/default.nix
index d5611959275..d5611959275 100644
--- a/pkgs/development/python-modules/ipaddress/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipaddress/default.nix
diff --git a/pkgs/development/python-modules/ipdb/default.nix b/nixpkgs/pkgs/development/python-modules/ipdb/default.nix
index 49b0991f1fd..49b0991f1fd 100644
--- a/pkgs/development/python-modules/ipdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipdb/default.nix
diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix
index b092a9fa2ae..b092a9fa2ae 100644
--- a/pkgs/development/python-modules/ipdbplugin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix
diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix
index 1778e5a81af..1778e5a81af 100644
--- a/pkgs/development/python-modules/ipfsapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix
diff --git a/pkgs/development/python-modules/iptools/default.nix b/nixpkgs/pkgs/development/python-modules/iptools/default.nix
index 6b33edfca3c..6b33edfca3c 100644
--- a/pkgs/development/python-modules/iptools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/iptools/default.nix
diff --git a/pkgs/development/python-modules/ipykernel/4.nix b/nixpkgs/pkgs/development/python-modules/ipykernel/4.nix
index 9ef4a96366d..9ef4a96366d 100644
--- a/pkgs/development/python-modules/ipykernel/4.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipykernel/4.nix
diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix
index 5202483ab32..5202483ab32 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix
diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix
index 3fa1acb875a..3fa1acb875a 100644
--- a/pkgs/development/python-modules/ipyparallel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix
diff --git a/pkgs/development/python-modules/ipython/5.nix b/nixpkgs/pkgs/development/python-modules/ipython/5.nix
index dd0c97fc3c5..dd0c97fc3c5 100644
--- a/pkgs/development/python-modules/ipython/5.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipython/5.nix
diff --git a/pkgs/development/python-modules/ipython/7.9.nix b/nixpkgs/pkgs/development/python-modules/ipython/7.9.nix
index c097bdbe9e1..c097bdbe9e1 100644
--- a/pkgs/development/python-modules/ipython/7.9.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipython/7.9.nix
diff --git a/pkgs/development/python-modules/ipython/default.nix b/nixpkgs/pkgs/development/python-modules/ipython/default.nix
index 6b9da6e882f..6b9da6e882f 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipython/default.nix
diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/nixpkgs/pkgs/development/python-modules/ipython_genutils/default.nix
index 0f3504780c2..0f3504780c2 100644
--- a/pkgs/development/python-modules/ipython_genutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipython_genutils/default.nix
diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix
index 20f91f5e806..20f91f5e806 100644
--- a/pkgs/development/python-modules/ipywidgets/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix
diff --git a/pkgs/development/python-modules/irc/default.nix b/nixpkgs/pkgs/development/python-modules/irc/default.nix
index 5828ada7a61..5828ada7a61 100644
--- a/pkgs/development/python-modules/irc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/irc/default.nix
diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix
index af12ba587d4..af12ba587d4 100644
--- a/pkgs/development/python-modules/isbnlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix
diff --git a/pkgs/development/python-modules/islpy/default.nix b/nixpkgs/pkgs/development/python-modules/islpy/default.nix
index 6edf9a77186..6edf9a77186 100644
--- a/pkgs/development/python-modules/islpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/islpy/default.nix
diff --git a/pkgs/development/python-modules/iso-639/default.nix b/nixpkgs/pkgs/development/python-modules/iso-639/default.nix
index 59d0d27b8b6..59d0d27b8b6 100644
--- a/pkgs/development/python-modules/iso-639/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/iso-639/default.nix
diff --git a/pkgs/development/python-modules/iso3166/default.nix b/nixpkgs/pkgs/development/python-modules/iso3166/default.nix
index 54d9aff280f..54d9aff280f 100644
--- a/pkgs/development/python-modules/iso3166/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/iso3166/default.nix
diff --git a/pkgs/development/python-modules/iso8601/default.nix b/nixpkgs/pkgs/development/python-modules/iso8601/default.nix
index 4f9ff70556b..4f9ff70556b 100644
--- a/pkgs/development/python-modules/iso8601/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/iso8601/default.nix
diff --git a/pkgs/development/python-modules/isodate/default.nix b/nixpkgs/pkgs/development/python-modules/isodate/default.nix
index 425a295e5a5..425a295e5a5 100644
--- a/pkgs/development/python-modules/isodate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/isodate/default.nix
diff --git a/pkgs/development/python-modules/isort/default.nix b/nixpkgs/pkgs/development/python-modules/isort/default.nix
index 8e292ba7cd5..8e292ba7cd5 100644
--- a/pkgs/development/python-modules/isort/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/isort/default.nix
diff --git a/pkgs/development/python-modules/isoweek/default.nix b/nixpkgs/pkgs/development/python-modules/isoweek/default.nix
index 65de70b20b5..65de70b20b5 100644
--- a/pkgs/development/python-modules/isoweek/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/isoweek/default.nix
diff --git a/pkgs/development/python-modules/itanium_demangler/default.nix b/nixpkgs/pkgs/development/python-modules/itanium_demangler/default.nix
index c67259eee0f..c67259eee0f 100644
--- a/pkgs/development/python-modules/itanium_demangler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/itanium_demangler/default.nix
diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix
index 4761a98dc30..4761a98dc30 100644
--- a/pkgs/development/python-modules/itsdangerous/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix
diff --git a/pkgs/development/python-modules/itypes/default.nix b/nixpkgs/pkgs/development/python-modules/itypes/default.nix
index 1386ba39a26..1386ba39a26 100644
--- a/pkgs/development/python-modules/itypes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/itypes/default.nix
diff --git a/pkgs/development/python-modules/j2cli/default.nix b/nixpkgs/pkgs/development/python-modules/j2cli/default.nix
index 98725ca4767..98725ca4767 100644
--- a/pkgs/development/python-modules/j2cli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/j2cli/default.nix
diff --git a/pkgs/development/python-modules/jabberbot/default.nix b/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix
index 6c04e6945de..6c04e6945de 100644
--- a/pkgs/development/python-modules/jabberbot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix
diff --git a/pkgs/development/python-modules/janus/default.nix b/nixpkgs/pkgs/development/python-modules/janus/default.nix
index da0f43811f2..da0f43811f2 100644
--- a/pkgs/development/python-modules/janus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/janus/default.nix
diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix
index 8e5458509c4..8e5458509c4 100644
--- a/pkgs/development/python-modules/jaraco_classes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix
diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix
index ceaa46a7847..ceaa46a7847 100644
--- a/pkgs/development/python-modules/jaraco_collections/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix
diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix
index 7fc90d63f69..7fc90d63f69 100644
--- a/pkgs/development/python-modules/jaraco_functools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix
diff --git a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch b/nixpkgs/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch
index 43530fcc328..43530fcc328 100644
--- a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch
+++ b/nixpkgs/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch
diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix
index 59d8538bb1e..59d8538bb1e 100644
--- a/pkgs/development/python-modules/jaraco_itertools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix
diff --git a/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch b/nixpkgs/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch
index aab9604b9ce..aab9604b9ce 100644
--- a/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch
+++ b/nixpkgs/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch
diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix
index ae05a76da1d..ae05a76da1d 100644
--- a/pkgs/development/python-modules/jaraco_logging/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix
diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_stream/default.nix
index 324eb625014..324eb625014 100644
--- a/pkgs/development/python-modules/jaraco_stream/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jaraco_stream/default.nix
diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix
index 9b3821edd7a..9b3821edd7a 100644
--- a/pkgs/development/python-modules/jaraco_text/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix
diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/nixpkgs/pkgs/development/python-modules/javaobj-py3/default.nix
index 54656e1ea99..54656e1ea99 100644
--- a/pkgs/development/python-modules/javaobj-py3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/javaobj-py3/default.nix
diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix
index a03aa9ec18b..a03aa9ec18b 100644
--- a/pkgs/development/python-modules/javaproperties/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix
diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix
index 1fbdd510e71..1fbdd510e71 100644
--- a/pkgs/development/python-modules/jdatetime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix
diff --git a/pkgs/development/python-modules/jdcal/default.nix b/nixpkgs/pkgs/development/python-modules/jdcal/default.nix
index 4fd89c83abc..4fd89c83abc 100644
--- a/pkgs/development/python-modules/jdcal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jdcal/default.nix
diff --git a/pkgs/development/python-modules/jedi/default.nix b/nixpkgs/pkgs/development/python-modules/jedi/default.nix
index eb3cdfaadd8..eb3cdfaadd8 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jedi/default.nix
diff --git a/pkgs/development/python-modules/jeepney/default.nix b/nixpkgs/pkgs/development/python-modules/jeepney/default.nix
index 04e47ff6b58..04e47ff6b58 100644
--- a/pkgs/development/python-modules/jeepney/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jeepney/default.nix
diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix
index fa8ce7b6298..fa8ce7b6298 100644
--- a/pkgs/development/python-modules/jellyfish/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix
diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
index a5015f4d326..a5015f4d326 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix
index bf5877c9f08..bf5877c9f08 100644
--- a/pkgs/development/python-modules/jenkinsapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix
diff --git a/pkgs/development/python-modules/jieba/default.nix b/nixpkgs/pkgs/development/python-modules/jieba/default.nix
index 75520384ff3..75520384ff3 100644
--- a/pkgs/development/python-modules/jieba/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jieba/default.nix
diff --git a/pkgs/development/python-modules/jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/jinja2/default.nix
index 862e5a7802e..862e5a7802e 100644
--- a/pkgs/development/python-modules/jinja2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jinja2/default.nix
diff --git a/pkgs/development/python-modules/jinja2_pluralize/default.nix b/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix
index 5f80f4e4b20..5f80f4e4b20 100644
--- a/pkgs/development/python-modules/jinja2_pluralize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix
diff --git a/pkgs/development/python-modules/jinja2_time/default.nix b/nixpkgs/pkgs/development/python-modules/jinja2_time/default.nix
index 69fbffa92b2..69fbffa92b2 100644
--- a/pkgs/development/python-modules/jinja2_time/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jinja2_time/default.nix
diff --git a/pkgs/development/python-modules/jira/default.nix b/nixpkgs/pkgs/development/python-modules/jira/default.nix
index 78aaadf690e..78aaadf690e 100644
--- a/pkgs/development/python-modules/jira/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jira/default.nix
diff --git a/pkgs/development/python-modules/jira/sphinx-fix.patch b/nixpkgs/pkgs/development/python-modules/jira/sphinx-fix.patch
index ccc47ac4b9c..ccc47ac4b9c 100644
--- a/pkgs/development/python-modules/jira/sphinx-fix.patch
+++ b/nixpkgs/pkgs/development/python-modules/jira/sphinx-fix.patch
diff --git a/pkgs/development/python-modules/jmespath/default.nix b/nixpkgs/pkgs/development/python-modules/jmespath/default.nix
index cc0a78872b2..cc0a78872b2 100644
--- a/pkgs/development/python-modules/jmespath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jmespath/default.nix
diff --git a/pkgs/development/python-modules/joblib/default.nix b/nixpkgs/pkgs/development/python-modules/joblib/default.nix
index d0c875cfa3b..d0c875cfa3b 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/joblib/default.nix
diff --git a/pkgs/development/python-modules/josepy/default.nix b/nixpkgs/pkgs/development/python-modules/josepy/default.nix
index d3b5ad79d6c..d3b5ad79d6c 100644
--- a/pkgs/development/python-modules/josepy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/josepy/default.nix
diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix
index 0d6398a768a..0d6398a768a 100644
--- a/pkgs/development/python-modules/jpylyzer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix
diff --git a/pkgs/development/python-modules/jq/default.nix b/nixpkgs/pkgs/development/python-modules/jq/default.nix
index adcdd2b9d82..adcdd2b9d82 100644
--- a/pkgs/development/python-modules/jq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jq/default.nix
diff --git a/pkgs/development/python-modules/jq/jq-py-setup.patch b/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch
index 53092b8a1f5..53092b8a1f5 100644
--- a/pkgs/development/python-modules/jq/jq-py-setup.patch
+++ b/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch
diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix
index 4c77a07da02..4c77a07da02 100644
--- a/pkgs/development/python-modules/jsbeautifier/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix
diff --git a/pkgs/development/python-modules/jsmin/default.nix b/nixpkgs/pkgs/development/python-modules/jsmin/default.nix
index f11fccb086b..f11fccb086b 100644
--- a/pkgs/development/python-modules/jsmin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsmin/default.nix
diff --git a/pkgs/development/python-modules/json-merge-patch/default.nix b/nixpkgs/pkgs/development/python-modules/json-merge-patch/default.nix
index b0bc2a835c4..b0bc2a835c4 100644
--- a/pkgs/development/python-modules/json-merge-patch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/json-merge-patch/default.nix
diff --git a/pkgs/development/python-modules/jsondate/default.nix b/nixpkgs/pkgs/development/python-modules/jsondate/default.nix
index 7888a6df23c..7888a6df23c 100644
--- a/pkgs/development/python-modules/jsondate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsondate/default.nix
diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/nixpkgs/pkgs/development/python-modules/jsondiff/default.nix
index 6b254a7221a..6b254a7221a 100644
--- a/pkgs/development/python-modules/jsondiff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsondiff/default.nix
diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix
index eec4c6b3846..eec4c6b3846 100644
--- a/pkgs/development/python-modules/jsonlines/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix
diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix
index 9379abcc604..9379abcc604 100644
--- a/pkgs/development/python-modules/jsonmerge/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix
diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix
index 7345c8f723a..7345c8f723a 100644
--- a/pkgs/development/python-modules/jsonpatch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix
diff --git a/pkgs/development/python-modules/jsonpath_rw/default.nix b/nixpkgs/pkgs/development/python-modules/jsonpath_rw/default.nix
index a109404c06f..a109404c06f 100644
--- a/pkgs/development/python-modules/jsonpath_rw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonpath_rw/default.nix
diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix
index d21864d2682..d21864d2682 100644
--- a/pkgs/development/python-modules/jsonpickle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix
diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix
index 6971393b80c..6971393b80c 100644
--- a/pkgs/development/python-modules/jsonpointer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix
diff --git a/pkgs/development/python-modules/jsonref/default.nix b/nixpkgs/pkgs/development/python-modules/jsonref/default.nix
index c174a011b5f..c174a011b5f 100644
--- a/pkgs/development/python-modules/jsonref/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonref/default.nix
diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix
index e18f3bc9b3d..e18f3bc9b3d 100644
--- a/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix
diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix
index a26a040eedd..a26a040eedd 100644
--- a/pkgs/development/python-modules/jsonrpc-base/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix
diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix
index c0c2fe2a8ee..c0c2fe2a8ee 100644
--- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix
diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
index 2d017ca1101..2d017ca1101 100644
--- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
diff --git a/pkgs/development/python-modules/jsonrpclib/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpclib/default.nix
index 81dcdc07473..81dcdc07473 100644
--- a/pkgs/development/python-modules/jsonrpclib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonrpclib/default.nix
diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix
index 9ff267b6fce..9ff267b6fce 100644
--- a/pkgs/development/python-modules/jsonschema/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix
diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix
index 1b859e21e90..1b859e21e90 100644
--- a/pkgs/development/python-modules/jsonwatch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix
diff --git a/pkgs/development/python-modules/jug/default.nix b/nixpkgs/pkgs/development/python-modules/jug/default.nix
index ad26b62931d..ad26b62931d 100644
--- a/pkgs/development/python-modules/jug/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jug/default.nix
diff --git a/pkgs/development/python-modules/junit-xml/default.nix b/nixpkgs/pkgs/development/python-modules/junit-xml/default.nix
index dcd26fabee7..dcd26fabee7 100644
--- a/pkgs/development/python-modules/junit-xml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/junit-xml/default.nix
diff --git a/pkgs/development/python-modules/junitparser/default.nix b/nixpkgs/pkgs/development/python-modules/junitparser/default.nix
index 11bd1d60ab0..11bd1d60ab0 100644
--- a/pkgs/development/python-modules/junitparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/junitparser/default.nix
diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix
index 77b56e01b0c..77b56e01b0c 100644
--- a/pkgs/development/python-modules/junos-eznc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix
diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix
index 44c0a3514f5..44c0a3514f5 100644
--- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix
diff --git a/pkgs/development/python-modules/jupyter/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter/default.nix
index b6d2a5e5a90..b6d2a5e5a90 100644
--- a/pkgs/development/python-modules/jupyter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyter/default.nix
diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix
index e5dec4c98e2..e5dec4c98e2 100644
--- a/pkgs/development/python-modules/jupyter_client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix
diff --git a/pkgs/development/python-modules/jupyter_console/5.nix b/nixpkgs/pkgs/development/python-modules/jupyter_console/5.nix
index 440f22b1332..440f22b1332 100644
--- a/pkgs/development/python-modules/jupyter_console/5.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyter_console/5.nix
diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix
index 42f50c203e3..42f50c203e3 100644
--- a/pkgs/development/python-modules/jupyter_console/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix
diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix
index 535afa31ee1..535afa31ee1 100644
--- a/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix
diff --git a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch b/nixpkgs/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch
index 7e7e9ae93a0..7e7e9ae93a0 100644
--- a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch
+++ b/nixpkgs/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch
diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
index 8a228bebb0b..8a228bebb0b 100644
--- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix
index 952e5b781a1..952e5b781a1 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix
diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix
index ece3b4e3ed5..ece3b4e3ed5 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix
diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab_launcher/default.nix
index 15b53f523b5..15b53f523b5 100644
--- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyterlab_launcher/default.nix
diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix
index edfe01728a4..edfe01728a4 100644
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix
diff --git a/pkgs/development/python-modules/jupytext/default.nix b/nixpkgs/pkgs/development/python-modules/jupytext/default.nix
index 41eb2b58ca8..41eb2b58ca8 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jupytext/default.nix
diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix
index 9b219127069..9b219127069 100644
--- a/pkgs/development/python-modules/jwcrypto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix
diff --git a/pkgs/development/python-modules/k5test/default.nix b/nixpkgs/pkgs/development/python-modules/k5test/default.nix
index d3937300a5e..d3937300a5e 100644
--- a/pkgs/development/python-modules/k5test/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/k5test/default.nix
diff --git a/pkgs/development/python-modules/k5test/fix-paths.patch b/nixpkgs/pkgs/development/python-modules/k5test/fix-paths.patch
index f99835b5f2a..f99835b5f2a 100644
--- a/pkgs/development/python-modules/k5test/fix-paths.patch
+++ b/nixpkgs/pkgs/development/python-modules/k5test/fix-paths.patch
diff --git a/pkgs/development/python-modules/kaa-base/default.nix b/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix
index f0994cebe11..f0994cebe11 100644
--- a/pkgs/development/python-modules/kaa-base/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix
diff --git a/pkgs/development/python-modules/kaa-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix
index d78adf7fd39..d78adf7fd39 100644
--- a/pkgs/development/python-modules/kaa-metadata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix
diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix
index 52c6e64aa10..52c6e64aa10 100644
--- a/pkgs/development/python-modules/kafka-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix
diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix
index a1e795421b0..a1e795421b0 100644
--- a/pkgs/development/python-modules/kaitaistruct/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix
diff --git a/pkgs/development/python-modules/kajiki/default.nix b/nixpkgs/pkgs/development/python-modules/kajiki/default.nix
index 8643e562fa0..8643e562fa0 100644
--- a/pkgs/development/python-modules/kajiki/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kajiki/default.nix
diff --git a/pkgs/development/python-modules/kaptan/default.nix b/nixpkgs/pkgs/development/python-modules/kaptan/default.nix
index 5a6cf80a835..5a6cf80a835 100644
--- a/pkgs/development/python-modules/kaptan/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kaptan/default.nix
diff --git a/pkgs/development/python-modules/kazoo/default.nix b/nixpkgs/pkgs/development/python-modules/kazoo/default.nix
index 7d384ba7cc3..7d384ba7cc3 100644
--- a/pkgs/development/python-modules/kazoo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kazoo/default.nix
diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/nixpkgs/pkgs/development/python-modules/kconfiglib/default.nix
index b4d647c6075..b4d647c6075 100644
--- a/pkgs/development/python-modules/kconfiglib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kconfiglib/default.nix
diff --git a/pkgs/development/python-modules/keepalive/default.nix b/nixpkgs/pkgs/development/python-modules/keepalive/default.nix
index c53bc25d198..c53bc25d198 100644
--- a/pkgs/development/python-modules/keepalive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keepalive/default.nix
diff --git a/pkgs/development/python-modules/keepkey/default.nix b/nixpkgs/pkgs/development/python-modules/keepkey/default.nix
index bbe72befb6d..bbe72befb6d 100644
--- a/pkgs/development/python-modules/keepkey/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keepkey/default.nix
diff --git a/pkgs/development/python-modules/keepkey_agent/default.nix b/nixpkgs/pkgs/development/python-modules/keepkey_agent/default.nix
index c2361043e41..c2361043e41 100644
--- a/pkgs/development/python-modules/keepkey_agent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keepkey_agent/default.nix
diff --git a/pkgs/development/python-modules/keras-applications/default.nix b/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix
index 54509f04e71..54509f04e71 100644
--- a/pkgs/development/python-modules/keras-applications/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix
diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix
index 01a0cf0dfb7..01a0cf0dfb7 100644
--- a/pkgs/development/python-modules/keras-preprocessing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix
diff --git a/pkgs/development/python-modules/keras/default.nix b/nixpkgs/pkgs/development/python-modules/keras/default.nix
index 0c1f6f35d54..0c1f6f35d54 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keras/default.nix
diff --git a/pkgs/development/python-modules/kerberos/default.nix b/nixpkgs/pkgs/development/python-modules/kerberos/default.nix
index 3d581d763a5..3d581d763a5 100644
--- a/pkgs/development/python-modules/kerberos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kerberos/default.nix
diff --git a/pkgs/development/python-modules/keyring/2.nix b/nixpkgs/pkgs/development/python-modules/keyring/2.nix
index ce4aa145e8e..ce4aa145e8e 100644
--- a/pkgs/development/python-modules/keyring/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/keyring/2.nix
diff --git a/pkgs/development/python-modules/keyring/default.nix b/nixpkgs/pkgs/development/python-modules/keyring/default.nix
index 8f7ae56de04..8f7ae56de04 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keyring/default.nix
diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix
index aa873b63ab9..aa873b63ab9 100644
--- a/pkgs/development/python-modules/keyrings-alt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix
diff --git a/pkgs/development/python-modules/keyutils/default.nix b/nixpkgs/pkgs/development/python-modules/keyutils/default.nix
index a109659ebdd..a109659ebdd 100644
--- a/pkgs/development/python-modules/keyutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keyutils/default.nix
diff --git a/pkgs/development/python-modules/kitchen/default.nix b/nixpkgs/pkgs/development/python-modules/kitchen/default.nix
index 494a4f8fc06..494a4f8fc06 100644
--- a/pkgs/development/python-modules/kitchen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kitchen/default.nix
diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix
index e41c4bbeee0..e41c4bbeee0 100644
--- a/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix
diff --git a/pkgs/development/python-modules/klaus/default.nix b/nixpkgs/pkgs/development/python-modules/klaus/default.nix
index d1218ab49b7..d1218ab49b7 100644
--- a/pkgs/development/python-modules/klaus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/klaus/default.nix
diff --git a/pkgs/development/python-modules/klein/default.nix b/nixpkgs/pkgs/development/python-modules/klein/default.nix
index 9b96ae038ca..9b96ae038ca 100644
--- a/pkgs/development/python-modules/klein/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/klein/default.nix
diff --git a/pkgs/development/python-modules/kmapper/default.nix b/nixpkgs/pkgs/development/python-modules/kmapper/default.nix
index 67b9343ecca..67b9343ecca 100644
--- a/pkgs/development/python-modules/kmapper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kmapper/default.nix
diff --git a/pkgs/development/python-modules/knack/default.nix b/nixpkgs/pkgs/development/python-modules/knack/default.nix
index c3025311e10..c3025311e10 100644
--- a/pkgs/development/python-modules/knack/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/knack/default.nix
diff --git a/pkgs/development/python-modules/koji/default.nix b/nixpkgs/pkgs/development/python-modules/koji/default.nix
index aec1916c1ff..aec1916c1ff 100644
--- a/pkgs/development/python-modules/koji/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/koji/default.nix
diff --git a/pkgs/development/python-modules/kombu/default.nix b/nixpkgs/pkgs/development/python-modules/kombu/default.nix
index 5caab5a377e..5caab5a377e 100644
--- a/pkgs/development/python-modules/kombu/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kombu/default.nix
diff --git a/pkgs/development/python-modules/konfig/default.nix b/nixpkgs/pkgs/development/python-modules/konfig/default.nix
index e7062bad5ee..e7062bad5ee 100644
--- a/pkgs/development/python-modules/konfig/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/konfig/default.nix
diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix
index 153398bdd8e..153398bdd8e 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix
diff --git a/pkgs/development/python-modules/labelbox/default.nix b/nixpkgs/pkgs/development/python-modules/labelbox/default.nix
index c8279835c92..c8279835c92 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/labelbox/default.nix
diff --git a/pkgs/development/python-modules/lammps-cython/default.nix b/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix
index df2a122d068..df2a122d068 100644
--- a/pkgs/development/python-modules/lammps-cython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix
diff --git a/pkgs/development/python-modules/langcodes/default.nix b/nixpkgs/pkgs/development/python-modules/langcodes/default.nix
index d73940e56a6..d73940e56a6 100644
--- a/pkgs/development/python-modules/langcodes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/langcodes/default.nix
diff --git a/pkgs/development/python-modules/langdetect/default.nix b/nixpkgs/pkgs/development/python-modules/langdetect/default.nix
index dcd90dd89bd..dcd90dd89bd 100644
--- a/pkgs/development/python-modules/langdetect/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/langdetect/default.nix
diff --git a/pkgs/development/python-modules/larch/default.nix b/nixpkgs/pkgs/development/python-modules/larch/default.nix
index 9942168607e..9942168607e 100644
--- a/pkgs/development/python-modules/larch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/larch/default.nix
diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix
index 1ba7df00ea3..1ba7df00ea3 100644
--- a/pkgs/development/python-modules/lark-parser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix
diff --git a/pkgs/development/python-modules/lasagne/default.nix b/nixpkgs/pkgs/development/python-modules/lasagne/default.nix
index febd38acc63..febd38acc63 100644
--- a/pkgs/development/python-modules/lasagne/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lasagne/default.nix
diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix
index 2873c8f9622..2873c8f9622 100644
--- a/pkgs/development/python-modules/latexcodec/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix
diff --git a/pkgs/development/python-modules/lazr/config.nix b/nixpkgs/pkgs/development/python-modules/lazr/config.nix
index d8a895c8357..d8a895c8357 100644
--- a/pkgs/development/python-modules/lazr/config.nix
+++ b/nixpkgs/pkgs/development/python-modules/lazr/config.nix
diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/nixpkgs/pkgs/development/python-modules/lazr/delegates.nix
index 40e2e47d517..40e2e47d517 100644
--- a/pkgs/development/python-modules/lazr/delegates.nix
+++ b/nixpkgs/pkgs/development/python-modules/lazr/delegates.nix
diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix
index f174aa1066c..f174aa1066c 100644
--- a/pkgs/development/python-modules/lazy-object-proxy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix
diff --git a/pkgs/development/python-modules/ldap/default.nix b/nixpkgs/pkgs/development/python-modules/ldap/default.nix
index 8f5cd7e7e88..8f5cd7e7e88 100644
--- a/pkgs/development/python-modules/ldap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ldap/default.nix
diff --git a/pkgs/development/python-modules/ldap3/default.nix b/nixpkgs/pkgs/development/python-modules/ldap3/default.nix
index 58acc263eff..58acc263eff 100644
--- a/pkgs/development/python-modules/ldap3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ldap3/default.nix
diff --git a/pkgs/development/python-modules/ldappool/default.nix b/nixpkgs/pkgs/development/python-modules/ldappool/default.nix
index e22ab22d5a7..e22ab22d5a7 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ldappool/default.nix
diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
index 49dc9a9b25b..49dc9a9b25b 100644
--- a/pkgs/development/python-modules/ldaptor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
diff --git a/pkgs/development/python-modules/le/default.nix b/nixpkgs/pkgs/development/python-modules/le/default.nix
index cb0a8bc6348..cb0a8bc6348 100644
--- a/pkgs/development/python-modules/le/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/le/default.nix
diff --git a/pkgs/development/python-modules/leather/default.nix b/nixpkgs/pkgs/development/python-modules/leather/default.nix
index 98cc3a42074..98cc3a42074 100644
--- a/pkgs/development/python-modules/leather/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/leather/default.nix
diff --git a/pkgs/development/python-modules/ledger_agent/default.nix b/nixpkgs/pkgs/development/python-modules/ledger_agent/default.nix
index 4aaecf6bc76..4aaecf6bc76 100644
--- a/pkgs/development/python-modules/ledger_agent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ledger_agent/default.nix
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
index 8d50f9846cc..8d50f9846cc 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
diff --git a/pkgs/development/python-modules/lektor/default.nix b/nixpkgs/pkgs/development/python-modules/lektor/default.nix
index 0fe3a11ae26..0fe3a11ae26 100644
--- a/pkgs/development/python-modules/lektor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lektor/default.nix
diff --git a/pkgs/development/python-modules/leveldb/default.nix b/nixpkgs/pkgs/development/python-modules/leveldb/default.nix
index 212f13d00cf..212f13d00cf 100644
--- a/pkgs/development/python-modules/leveldb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/leveldb/default.nix
diff --git a/pkgs/development/python-modules/libagent/default.nix b/nixpkgs/pkgs/development/python-modules/libagent/default.nix
index e55887a49f5..e55887a49f5 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libagent/default.nix
diff --git a/pkgs/development/python-modules/libais/default.nix b/nixpkgs/pkgs/development/python-modules/libais/default.nix
index 2fbe7207f4f..2fbe7207f4f 100644
--- a/pkgs/development/python-modules/libais/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libais/default.nix
diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix
index 8488343362d..8488343362d 100644
--- a/pkgs/development/python-modules/libarchive-c/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/nixpkgs/pkgs/development/python-modules/libarcus/default.nix
index 97fd448f183..97fd448f183 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libarcus/default.nix
diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix
index aed76728d7e..aed76728d7e 100644
--- a/pkgs/development/python-modules/libasyncns/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix
diff --git a/pkgs/development/python-modules/libasyncns/libasyncns-fix-res-consts.patch b/nixpkgs/pkgs/development/python-modules/libasyncns/libasyncns-fix-res-consts.patch
index 62877300a27..62877300a27 100644
--- a/pkgs/development/python-modules/libasyncns/libasyncns-fix-res-consts.patch
+++ b/nixpkgs/pkgs/development/python-modules/libasyncns/libasyncns-fix-res-consts.patch
diff --git a/pkgs/development/python-modules/libcloud/default.nix b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix
index 3d505166e4a..3d505166e4a 100644
--- a/pkgs/development/python-modules/libcloud/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix
diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix
index 40a4f6f7429..40a4f6f7429 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix
diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/nixpkgs/pkgs/development/python-modules/libkeepass/default.nix
index 09177f16bc6..09177f16bc6 100644
--- a/pkgs/development/python-modules/libkeepass/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libkeepass/default.nix
diff --git a/pkgs/development/python-modules/libmr/default.nix b/nixpkgs/pkgs/development/python-modules/libmr/default.nix
index c258b8dd865..c258b8dd865 100644
--- a/pkgs/development/python-modules/libmr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libmr/default.nix
diff --git a/pkgs/development/python-modules/libnacl/default.nix b/nixpkgs/pkgs/development/python-modules/libnacl/default.nix
index 893789d961d..893789d961d 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libnacl/default.nix
diff --git a/pkgs/development/python-modules/librosa/default.nix b/nixpkgs/pkgs/development/python-modules/librosa/default.nix
index 8920fecf3da..8920fecf3da 100644
--- a/pkgs/development/python-modules/librosa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/librosa/default.nix
diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix
index b43468bdf9c..b43468bdf9c 100644
--- a/pkgs/development/python-modules/libsavitar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix
diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix
index e89b606879b..e89b606879b 100644
--- a/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix
diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix
index 6c9987a5b8e..6c9987a5b8e 100644
--- a/pkgs/development/python-modules/libthumbor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix
diff --git a/pkgs/development/python-modules/libtmux/default.nix b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix
index d1220a6abbf..d1220a6abbf 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix
diff --git a/pkgs/development/python-modules/libusb1/default.nix b/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
index b63704bf8e0..b63704bf8e0 100644
--- a/pkgs/development/python-modules/libusb1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
diff --git a/pkgs/development/python-modules/libversion/default.nix b/nixpkgs/pkgs/development/python-modules/libversion/default.nix
index 775d1a9ef85..775d1a9ef85 100644
--- a/pkgs/development/python-modules/libversion/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libversion/default.nix
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix
index f4a07b9635f..f4a07b9635f 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix
diff --git a/pkgs/development/python-modules/license-expression/default.nix b/nixpkgs/pkgs/development/python-modules/license-expression/default.nix
index e934c519428..e934c519428 100644
--- a/pkgs/development/python-modules/license-expression/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/license-expression/default.nix
diff --git a/pkgs/development/python-modules/lightblue/default.nix b/nixpkgs/pkgs/development/python-modules/lightblue/default.nix
index f826bbecb0a..f826bbecb0a 100644
--- a/pkgs/development/python-modules/lightblue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lightblue/default.nix
diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
index 0a711b31d1a..0a711b31d1a 100644
--- a/pkgs/development/python-modules/lightgbm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
diff --git a/pkgs/development/python-modules/lightning/default.nix b/nixpkgs/pkgs/development/python-modules/lightning/default.nix
index d0e1a10ae00..d0e1a10ae00 100644
--- a/pkgs/development/python-modules/lightning/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lightning/default.nix
diff --git a/pkgs/development/python-modules/lightparam/default.nix b/nixpkgs/pkgs/development/python-modules/lightparam/default.nix
index 6681b528b8c..6681b528b8c 100644
--- a/pkgs/development/python-modules/lightparam/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lightparam/default.nix
diff --git a/pkgs/development/python-modules/limitlessled/default.nix b/nixpkgs/pkgs/development/python-modules/limitlessled/default.nix
index c2029aa6d6b..c2029aa6d6b 100644
--- a/pkgs/development/python-modules/limitlessled/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/limitlessled/default.nix
diff --git a/pkgs/development/python-modules/limits/default.nix b/nixpkgs/pkgs/development/python-modules/limits/default.nix
index 614945d1364..614945d1364 100644
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/limits/default.nix
diff --git a/pkgs/development/python-modules/limnoria/default.nix b/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
index 7cd3ef85822..7cd3ef85822 100644
--- a/pkgs/development/python-modules/limnoria/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix
index 00ea8dba663..00ea8dba663 100644
--- a/pkgs/development/python-modules/line_profiler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix
diff --git a/pkgs/development/python-modules/line_profiler/python37.patch b/nixpkgs/pkgs/development/python-modules/line_profiler/python37.patch
index 0b6e93732c4..0b6e93732c4 100644
--- a/pkgs/development/python-modules/line_profiler/python37.patch
+++ b/nixpkgs/pkgs/development/python-modules/line_profiler/python37.patch
diff --git a/pkgs/development/python-modules/linecache2/default.nix b/nixpkgs/pkgs/development/python-modules/linecache2/default.nix
index 9890d382742..9890d382742 100644
--- a/pkgs/development/python-modules/linecache2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/linecache2/default.nix
diff --git a/pkgs/development/python-modules/linode-api/default.nix b/nixpkgs/pkgs/development/python-modules/linode-api/default.nix
index 4689050ba6c..4689050ba6c 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/linode-api/default.nix
diff --git a/pkgs/development/python-modules/linode/default.nix b/nixpkgs/pkgs/development/python-modules/linode/default.nix
index d0c8b0ff794..d0c8b0ff794 100644
--- a/pkgs/development/python-modules/linode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/linode/default.nix
diff --git a/pkgs/development/python-modules/linuxfd/default.nix b/nixpkgs/pkgs/development/python-modules/linuxfd/default.nix
index e5b8fe6f34c..e5b8fe6f34c 100644
--- a/pkgs/development/python-modules/linuxfd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/linuxfd/default.nix
diff --git a/pkgs/development/python-modules/livereload/default.nix b/nixpkgs/pkgs/development/python-modules/livereload/default.nix
index e329f36a716..e329f36a716 100644
--- a/pkgs/development/python-modules/livereload/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/livereload/default.nix
diff --git a/pkgs/development/python-modules/livestreamer-curses/default.nix b/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix
index bf3b2cc1164..bf3b2cc1164 100644
--- a/pkgs/development/python-modules/livestreamer-curses/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix
diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix
index fb8f74d7219..fb8f74d7219 100644
--- a/pkgs/development/python-modules/livestreamer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix
diff --git a/pkgs/development/python-modules/llfuse/default.nix b/nixpkgs/pkgs/development/python-modules/llfuse/default.nix
index 02adb5a8d16..02adb5a8d16 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/llfuse/default.nix
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix
index 29dfe3320d6..29dfe3320d6 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix
diff --git a/pkgs/development/python-modules/lmdb/default.nix b/nixpkgs/pkgs/development/python-modules/lmdb/default.nix
index 5f31511451d..5f31511451d 100644
--- a/pkgs/development/python-modules/lmdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lmdb/default.nix
diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix
index d05acd21c10..d05acd21c10 100644
--- a/pkgs/development/python-modules/lmtpd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix
diff --git a/pkgs/development/python-modules/locket/default.nix b/nixpkgs/pkgs/development/python-modules/locket/default.nix
index a4d7a8ce706..a4d7a8ce706 100644
--- a/pkgs/development/python-modules/locket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/locket/default.nix
diff --git a/pkgs/development/python-modules/lockfile/default.nix b/nixpkgs/pkgs/development/python-modules/lockfile/default.nix
index 15cfee67f84..15cfee67f84 100644
--- a/pkgs/development/python-modules/lockfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lockfile/default.nix
diff --git a/pkgs/development/python-modules/locustio/default.nix b/nixpkgs/pkgs/development/python-modules/locustio/default.nix
index 2203fa4c6ad..2203fa4c6ad 100644
--- a/pkgs/development/python-modules/locustio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/locustio/default.nix
diff --git a/pkgs/development/python-modules/logfury/default.nix b/nixpkgs/pkgs/development/python-modules/logfury/default.nix
index a52f194b8be..a52f194b8be 100644
--- a/pkgs/development/python-modules/logfury/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/logfury/default.nix
diff --git a/pkgs/development/python-modules/logilab/common.nix b/nixpkgs/pkgs/development/python-modules/logilab/common.nix
index 8a23b69cf67..8a23b69cf67 100644
--- a/pkgs/development/python-modules/logilab/common.nix
+++ b/nixpkgs/pkgs/development/python-modules/logilab/common.nix
diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix
index aa26f21820b..aa26f21820b 100644
--- a/pkgs/development/python-modules/logilab/constraint.nix
+++ b/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix
diff --git a/pkgs/development/python-modules/logilab_astng/default.nix b/nixpkgs/pkgs/development/python-modules/logilab_astng/default.nix
index 53284d12228..53284d12228 100644
--- a/pkgs/development/python-modules/logilab_astng/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/logilab_astng/default.nix
diff --git a/pkgs/development/python-modules/logster/default.nix b/nixpkgs/pkgs/development/python-modules/logster/default.nix
index e4b57e4ce40..e4b57e4ce40 100644
--- a/pkgs/development/python-modules/logster/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/logster/default.nix
diff --git a/pkgs/development/python-modules/loguru/default.nix b/nixpkgs/pkgs/development/python-modules/loguru/default.nix
index c12084f008e..c12084f008e 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/loguru/default.nix
diff --git a/pkgs/development/python-modules/logutils/default.nix b/nixpkgs/pkgs/development/python-modules/logutils/default.nix
index 8b4cb4e69c5..8b4cb4e69c5 100644
--- a/pkgs/development/python-modules/logutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/logutils/default.nix
diff --git a/pkgs/development/python-modules/logzero/default.nix b/nixpkgs/pkgs/development/python-modules/logzero/default.nix
index 098d9f3e06d..098d9f3e06d 100644
--- a/pkgs/development/python-modules/logzero/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/logzero/default.nix
diff --git a/pkgs/development/python-modules/loo-py/default.nix b/nixpkgs/pkgs/development/python-modules/loo-py/default.nix
index fe765f5ff0a..fe765f5ff0a 100644
--- a/pkgs/development/python-modules/loo-py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/loo-py/default.nix
diff --git a/pkgs/development/python-modules/lpod/default.nix b/nixpkgs/pkgs/development/python-modules/lpod/default.nix
index 9b262007706..9b262007706 100644
--- a/pkgs/development/python-modules/lpod/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lpod/default.nix
diff --git a/pkgs/development/python-modules/lsi/default.nix b/nixpkgs/pkgs/development/python-modules/lsi/default.nix
index 2277a2be92f..2277a2be92f 100644
--- a/pkgs/development/python-modules/lsi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lsi/default.nix
diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix
index f0b3aa60f17..f0b3aa60f17 100644
--- a/pkgs/development/python-modules/ludios_wpull/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix
diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix
index 9784d3af61f..9784d3af61f 100644
--- a/pkgs/development/python-modules/luftdaten/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix
diff --git a/pkgs/development/python-modules/lxc/default.nix b/nixpkgs/pkgs/development/python-modules/lxc/default.nix
index 26be7020c66..26be7020c66 100644
--- a/pkgs/development/python-modules/lxc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lxc/default.nix
diff --git a/pkgs/development/python-modules/lxml/default.nix b/nixpkgs/pkgs/development/python-modules/lxml/default.nix
index db3bf692556..db3bf692556 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lxml/default.nix
diff --git a/pkgs/development/python-modules/lzstring/default.nix b/nixpkgs/pkgs/development/python-modules/lzstring/default.nix
index cfd30082c1c..cfd30082c1c 100644
--- a/pkgs/development/python-modules/lzstring/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lzstring/default.nix
diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix
index 0ccf55e5bc4..0ccf55e5bc4 100644
--- a/pkgs/development/python-modules/m2crypto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix
diff --git a/pkgs/development/python-modules/m2r/default.nix b/nixpkgs/pkgs/development/python-modules/m2r/default.nix
index 612e2fd76b2..612e2fd76b2 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/m2r/default.nix
diff --git a/pkgs/development/python-modules/m3u8/default.nix b/nixpkgs/pkgs/development/python-modules/m3u8/default.nix
index e558b893dfd..e558b893dfd 100644
--- a/pkgs/development/python-modules/m3u8/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/m3u8/default.nix
diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/nixpkgs/pkgs/development/python-modules/macfsevents/default.nix
index 8dfa0038cdd..8dfa0038cdd 100644
--- a/pkgs/development/python-modules/macfsevents/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/macfsevents/default.nix
diff --git a/pkgs/development/python-modules/macropy/default.nix b/nixpkgs/pkgs/development/python-modules/macropy/default.nix
index 952740d7837..952740d7837 100644
--- a/pkgs/development/python-modules/macropy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/macropy/default.nix
diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
index 28d09672584..28d09672584 100644
--- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
index d6e3ac2b153..d6e3ac2b153 100644
--- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix
index 5db5c28a4cb..5db5c28a4cb 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix
diff --git a/pkgs/development/python-modules/magic/default.nix b/nixpkgs/pkgs/development/python-modules/magic/default.nix
index ee2c38fed53..ee2c38fed53 100644
--- a/pkgs/development/python-modules/magic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/magic/default.nix
diff --git a/pkgs/development/python-modules/mahotas/default.nix b/nixpkgs/pkgs/development/python-modules/mahotas/default.nix
index dc18f5ac405..dc18f5ac405 100644
--- a/pkgs/development/python-modules/mahotas/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mahotas/default.nix
diff --git a/pkgs/development/python-modules/mahotas/disable-impure-tests.patch b/nixpkgs/pkgs/development/python-modules/mahotas/disable-impure-tests.patch
index f19bd329e66..f19bd329e66 100644
--- a/pkgs/development/python-modules/mahotas/disable-impure-tests.patch
+++ b/nixpkgs/pkgs/development/python-modules/mahotas/disable-impure-tests.patch
diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/nixpkgs/pkgs/development/python-modules/mail-parser/default.nix
index 1f06f7f250a..1f06f7f250a 100644
--- a/pkgs/development/python-modules/mail-parser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mail-parser/default.nix
diff --git a/pkgs/development/python-modules/mailcap-fix/default.nix b/nixpkgs/pkgs/development/python-modules/mailcap-fix/default.nix
index 886a3ed66b3..886a3ed66b3 100644
--- a/pkgs/development/python-modules/mailcap-fix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mailcap-fix/default.nix
diff --git a/pkgs/development/python-modules/mailchimp/default.nix b/nixpkgs/pkgs/development/python-modules/mailchimp/default.nix
index b9640a4ab5d..b9640a4ab5d 100644
--- a/pkgs/development/python-modules/mailchimp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mailchimp/default.nix
diff --git a/pkgs/development/python-modules/maildir-deduplicate/default.nix b/nixpkgs/pkgs/development/python-modules/maildir-deduplicate/default.nix
index 33728ef4113..33728ef4113 100644
--- a/pkgs/development/python-modules/maildir-deduplicate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/maildir-deduplicate/default.nix
diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix
index fd89260ab94..fd89260ab94 100644
--- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix
diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix
index afce4521d5b..afce4521d5b 100644
--- a/pkgs/development/python-modules/mailman-rss/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix
diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix
index 247a7ed1b00..247a7ed1b00 100644
--- a/pkgs/development/python-modules/mailmanclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix
diff --git a/pkgs/development/python-modules/managesieve/default.nix b/nixpkgs/pkgs/development/python-modules/managesieve/default.nix
index e23c3621c2e..e23c3621c2e 100644
--- a/pkgs/development/python-modules/managesieve/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/managesieve/default.nix
diff --git a/pkgs/development/python-modules/manhole/default.nix b/nixpkgs/pkgs/development/python-modules/manhole/default.nix
index c8b77e9668f..c8b77e9668f 100644
--- a/pkgs/development/python-modules/manhole/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/manhole/default.nix
diff --git a/pkgs/development/python-modules/manuel/default.nix b/nixpkgs/pkgs/development/python-modules/manuel/default.nix
index e08c61140d6..e08c61140d6 100644
--- a/pkgs/development/python-modules/manuel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/manuel/default.nix
diff --git a/pkgs/development/python-modules/mapbox/default.nix b/nixpkgs/pkgs/development/python-modules/mapbox/default.nix
index 1eec58919d5..1eec58919d5 100644
--- a/pkgs/development/python-modules/mapbox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mapbox/default.nix
diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/mapsplotlib/default.nix
index eb02941c1a1..eb02941c1a1 100644
--- a/pkgs/development/python-modules/mapsplotlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mapsplotlib/default.nix
diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/default.nix
index 4a9e0113c68..4a9e0113c68 100644
--- a/pkgs/development/python-modules/marionette-harness/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/default.nix
diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/manifestparser.nix
index 7316526aa28..7316526aa28 100644
--- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/manifestparser.nix
diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
index 4567d34932b..4567d34932b 100644
--- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozcrash.nix
index c5d91fbfef7..c5d91fbfef7 100644
--- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozcrash.nix
diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozdevice.nix
index 9f1a682c2ce..9f1a682c2ce 100644
--- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozdevice.nix
diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozfile.nix
index 9ca8ea0b789..9ca8ea0b789 100644
--- a/pkgs/development/python-modules/marionette-harness/mozfile.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozfile.nix
diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
index 6862967e420..6862967e420 100644
--- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozinfo.nix
index 080be7e04ef..080be7e04ef 100644
--- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozinfo.nix
diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozlog.nix
index 834bf48adbd..834bf48adbd 100644
--- a/pkgs/development/python-modules/marionette-harness/mozlog.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozlog.nix
diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/moznetwork.nix
index 106a94b50e2..106a94b50e2 100644
--- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/moznetwork.nix
diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozprocess.nix
index cfa0f766620..cfa0f766620 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozprocess.nix
diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozprofile.nix
index dda9e07d5e5..dda9e07d5e5 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozprofile.nix
diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozrunner.nix
index 8cabe18e3c6..8cabe18e3c6 100644
--- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozrunner.nix
diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/moztest.nix
index 2ff50e1fa92..2ff50e1fa92 100644
--- a/pkgs/development/python-modules/marionette-harness/moztest.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/moztest.nix
diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozversion.nix
index 12925f3575a..12925f3575a 100644
--- a/pkgs/development/python-modules/marionette-harness/mozversion.nix
+++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozversion.nix
diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix
index 71be4f5726d..71be4f5726d 100644
--- a/pkgs/development/python-modules/marisa-trie/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix
diff --git a/pkgs/development/python-modules/marisa/default.nix b/nixpkgs/pkgs/development/python-modules/marisa/default.nix
index 006e3a9051b..006e3a9051b 100644
--- a/pkgs/development/python-modules/marisa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/marisa/default.nix
diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix
index 98dce913046..98dce913046 100644
--- a/pkgs/development/python-modules/markdown-macros/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix
diff --git a/pkgs/development/python-modules/markdown/default.nix b/nixpkgs/pkgs/development/python-modules/markdown/default.nix
index 1438391dc40..1438391dc40 100644
--- a/pkgs/development/python-modules/markdown/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/markdown/default.nix
diff --git a/pkgs/development/python-modules/markdown2/default.nix b/nixpkgs/pkgs/development/python-modules/markdown2/default.nix
index a07e0b14fdc..a07e0b14fdc 100644
--- a/pkgs/development/python-modules/markdown2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/markdown2/default.nix
diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix
index 1212651aec8..1212651aec8 100644
--- a/pkgs/development/python-modules/markdownsuperscript/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix
diff --git a/pkgs/development/python-modules/markerlib/default.nix b/nixpkgs/pkgs/development/python-modules/markerlib/default.nix
index 640b11a6f28..640b11a6f28 100644
--- a/pkgs/development/python-modules/markerlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/markerlib/default.nix
diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix
index d15aa82c3a9..d15aa82c3a9 100644
--- a/pkgs/development/python-modules/markupsafe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix
diff --git a/pkgs/development/python-modules/marshmallow-enum/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix
index 9d68e66c91a..9d68e66c91a 100644
--- a/pkgs/development/python-modules/marshmallow-enum/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix
diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index 2f85c33e757..2f85c33e757 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix
index 7b7cadc9889..7b7cadc9889 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix
diff --git a/pkgs/development/python-modules/matchpy/default.nix b/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
index 2a0544cf6d8..2a0544cf6d8 100644
--- a/pkgs/development/python-modules/matchpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
diff --git a/pkgs/development/python-modules/mathics/default.nix b/nixpkgs/pkgs/development/python-modules/mathics/default.nix
index b20cc070909..b20cc070909 100644
--- a/pkgs/development/python-modules/mathics/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mathics/default.nix
diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix
index 8ea530489e2..8ea530489e2 100644
--- a/pkgs/development/python-modules/matplotlib/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix
diff --git a/pkgs/development/python-modules/matplotlib/basedirlist.patch b/nixpkgs/pkgs/development/python-modules/matplotlib/basedirlist.patch
index 0a84a05bbae..0a84a05bbae 100644
--- a/pkgs/development/python-modules/matplotlib/basedirlist.patch
+++ b/nixpkgs/pkgs/development/python-modules/matplotlib/basedirlist.patch
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
index 44d2bf67247..44d2bf67247 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix
index 19c4baca8b2..19c4baca8b2 100644
--- a/pkgs/development/python-modules/matrix-client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix
diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix
index 9f5a086f2ee..9f5a086f2ee 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix
diff --git a/pkgs/development/python-modules/mautrix/default.nix b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
index 7f908aad6e6..7f908aad6e6 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix
index 6556ade818a..6556ade818a 100644
--- a/pkgs/development/python-modules/maxminddb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix
diff --git a/pkgs/development/python-modules/maya/default.nix b/nixpkgs/pkgs/development/python-modules/maya/default.nix
index 9c6cb241fea..9c6cb241fea 100644
--- a/pkgs/development/python-modules/maya/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/maya/default.nix
diff --git a/pkgs/development/python-modules/mccabe/default.nix b/nixpkgs/pkgs/development/python-modules/mccabe/default.nix
index 520e872c91e..520e872c91e 100644
--- a/pkgs/development/python-modules/mccabe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mccabe/default.nix
diff --git a/pkgs/development/python-modules/mdp/default.nix b/nixpkgs/pkgs/development/python-modules/mdp/default.nix
index 9fbaced9b65..9fbaced9b65 100644
--- a/pkgs/development/python-modules/mdp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mdp/default.nix
diff --git a/pkgs/development/python-modules/measurement/default.nix b/nixpkgs/pkgs/development/python-modules/measurement/default.nix
index b3a0430a93b..b3a0430a93b 100644
--- a/pkgs/development/python-modules/measurement/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/measurement/default.nix
diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix
index 263a71254ed..263a71254ed 100644
--- a/pkgs/development/python-modules/mecab-python3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix
diff --git a/pkgs/development/python-modules/mechanize/default.nix b/nixpkgs/pkgs/development/python-modules/mechanize/default.nix
index 1d63a6e2b6a..1d63a6e2b6a 100644
--- a/pkgs/development/python-modules/mechanize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mechanize/default.nix
diff --git a/pkgs/development/python-modules/meinheld/default.nix b/nixpkgs/pkgs/development/python-modules/meinheld/default.nix
index f1291a14f3f..f1291a14f3f 100644
--- a/pkgs/development/python-modules/meinheld/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/meinheld/default.nix
diff --git a/pkgs/development/python-modules/meld3/default.nix b/nixpkgs/pkgs/development/python-modules/meld3/default.nix
index a1729ecb04e..a1729ecb04e 100644
--- a/pkgs/development/python-modules/meld3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/meld3/default.nix
diff --git a/pkgs/development/python-modules/meliae/default.nix b/nixpkgs/pkgs/development/python-modules/meliae/default.nix
index b0cdbd60c3e..b0cdbd60c3e 100644
--- a/pkgs/development/python-modules/meliae/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/meliae/default.nix
diff --git a/pkgs/development/python-modules/memcached/default.nix b/nixpkgs/pkgs/development/python-modules/memcached/default.nix
index 854f7440daa..854f7440daa 100644
--- a/pkgs/development/python-modules/memcached/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/memcached/default.nix
diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix
index e0367e6c505..e0367e6c505 100644
--- a/pkgs/development/python-modules/memory_profiler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix
diff --git a/pkgs/development/python-modules/merkletools/default.nix b/nixpkgs/pkgs/development/python-modules/merkletools/default.nix
index 92acdaf58ed..92acdaf58ed 100644
--- a/pkgs/development/python-modules/merkletools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/merkletools/default.nix
diff --git a/pkgs/development/python-modules/mesa/default.nix b/nixpkgs/pkgs/development/python-modules/mesa/default.nix
index f8fc43808fb..f8fc43808fb 100644
--- a/pkgs/development/python-modules/mesa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mesa/default.nix
diff --git a/pkgs/development/python-modules/mesonpep517/default.nix b/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix
index ec63526070a..ec63526070a 100644
--- a/pkgs/development/python-modules/mesonpep517/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix
diff --git a/pkgs/development/python-modules/metaphone/default.nix b/nixpkgs/pkgs/development/python-modules/metaphone/default.nix
index e167ee494a8..e167ee494a8 100644
--- a/pkgs/development/python-modules/metaphone/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/metaphone/default.nix
diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix
index a831618134b..a831618134b 100644
--- a/pkgs/development/python-modules/mezzanine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix
diff --git a/pkgs/development/python-modules/micawber/default.nix b/nixpkgs/pkgs/development/python-modules/micawber/default.nix
index 003234c2adf..003234c2adf 100644
--- a/pkgs/development/python-modules/micawber/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/micawber/default.nix
diff --git a/pkgs/development/python-modules/midiutil/default.nix b/nixpkgs/pkgs/development/python-modules/midiutil/default.nix
index 0b9945f97d3..0b9945f97d3 100644
--- a/pkgs/development/python-modules/midiutil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/midiutil/default.nix
diff --git a/pkgs/development/python-modules/milksnake/default.nix b/nixpkgs/pkgs/development/python-modules/milksnake/default.nix
index 014bb223225..014bb223225 100644
--- a/pkgs/development/python-modules/milksnake/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/milksnake/default.nix
diff --git a/pkgs/development/python-modules/minidb/default.nix b/nixpkgs/pkgs/development/python-modules/minidb/default.nix
index 3a65ef1028a..3a65ef1028a 100644
--- a/pkgs/development/python-modules/minidb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/minidb/default.nix
diff --git a/pkgs/development/python-modules/minimock/default.nix b/nixpkgs/pkgs/development/python-modules/minimock/default.nix
index 856f7b45adf..856f7b45adf 100644
--- a/pkgs/development/python-modules/minimock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/minimock/default.nix
diff --git a/pkgs/development/python-modules/minio/default.nix b/nixpkgs/pkgs/development/python-modules/minio/default.nix
index a27867467ed..a27867467ed 100644
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/minio/default.nix
diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix
index d267cb6a976..d267cb6a976 100644
--- a/pkgs/development/python-modules/miniupnpc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix
diff --git a/pkgs/development/python-modules/misaka/default.nix b/nixpkgs/pkgs/development/python-modules/misaka/default.nix
index 07f251f75b5..07f251f75b5 100644
--- a/pkgs/development/python-modules/misaka/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/misaka/default.nix
diff --git a/pkgs/development/python-modules/mistune/default.nix b/nixpkgs/pkgs/development/python-modules/mistune/default.nix
index 75011a8219f..75011a8219f 100644
--- a/pkgs/development/python-modules/mistune/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mistune/default.nix
diff --git a/pkgs/development/python-modules/mixpanel/default.nix b/nixpkgs/pkgs/development/python-modules/mixpanel/default.nix
index fac1afe2c97..fac1afe2c97 100644
--- a/pkgs/development/python-modules/mixpanel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mixpanel/default.nix
diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix
index ad3f30a66da..ad3f30a66da 100644
--- a/pkgs/development/python-modules/mkl-service/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix
diff --git a/pkgs/development/python-modules/mlrose/default.nix b/nixpkgs/pkgs/development/python-modules/mlrose/default.nix
index 5fd39d9b347..5fd39d9b347 100644
--- a/pkgs/development/python-modules/mlrose/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mlrose/default.nix
diff --git a/pkgs/development/python-modules/mmpython/default.nix b/nixpkgs/pkgs/development/python-modules/mmpython/default.nix
index 0a41b6e3c87..0a41b6e3c87 100644
--- a/pkgs/development/python-modules/mmpython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mmpython/default.nix
diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix
index ca41917744a..ca41917744a 100644
--- a/pkgs/development/python-modules/mnemonic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix
diff --git a/pkgs/development/python-modules/mnist/default.nix b/nixpkgs/pkgs/development/python-modules/mnist/default.nix
index 022cd3a2e02..022cd3a2e02 100644
--- a/pkgs/development/python-modules/mnist/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mnist/default.nix
diff --git a/pkgs/development/python-modules/mock-open/default.nix b/nixpkgs/pkgs/development/python-modules/mock-open/default.nix
index edb3407270f..edb3407270f 100644
--- a/pkgs/development/python-modules/mock-open/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mock-open/default.nix
diff --git a/pkgs/development/python-modules/mock/default.nix b/nixpkgs/pkgs/development/python-modules/mock/default.nix
index 6978bee000a..6978bee000a 100644
--- a/pkgs/development/python-modules/mock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mock/default.nix
diff --git a/pkgs/development/python-modules/mockito/default.nix b/nixpkgs/pkgs/development/python-modules/mockito/default.nix
index f0673b64ef3..f0673b64ef3 100644
--- a/pkgs/development/python-modules/mockito/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mockito/default.nix
diff --git a/pkgs/development/python-modules/modeled/default.nix b/nixpkgs/pkgs/development/python-modules/modeled/default.nix
index 298c69194f2..298c69194f2 100644
--- a/pkgs/development/python-modules/modeled/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/modeled/default.nix
diff --git a/pkgs/development/python-modules/moderngl/default.nix b/nixpkgs/pkgs/development/python-modules/moderngl/default.nix
index 5802b33041f..5802b33041f 100644
--- a/pkgs/development/python-modules/moderngl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/moderngl/default.nix
diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix
index a3c93978ff6..a3c93978ff6 100644
--- a/pkgs/development/python-modules/moderngl_window/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix
diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix
index b25e6f5644e..b25e6f5644e 100644
--- a/pkgs/development/python-modules/modestmaps/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix
diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/nixpkgs/pkgs/development/python-modules/moinmoin/default.nix
index cc00643b71a..cc00643b71a 100644
--- a/pkgs/development/python-modules/moinmoin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/moinmoin/default.nix
diff --git a/pkgs/development/python-modules/moinmoin/fix_tests.patch b/nixpkgs/pkgs/development/python-modules/moinmoin/fix_tests.patch
index e9856eeffca..e9856eeffca 100644
--- a/pkgs/development/python-modules/moinmoin/fix_tests.patch
+++ b/nixpkgs/pkgs/development/python-modules/moinmoin/fix_tests.patch
diff --git a/pkgs/development/python-modules/mongodict/default.nix b/nixpkgs/pkgs/development/python-modules/mongodict/default.nix
index 932160bb9fa..932160bb9fa 100644
--- a/pkgs/development/python-modules/mongodict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mongodict/default.nix
diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix
index db20d9442ef..db20d9442ef 100644
--- a/pkgs/development/python-modules/mongoengine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix
diff --git a/pkgs/development/python-modules/monkeyhex/default.nix b/nixpkgs/pkgs/development/python-modules/monkeyhex/default.nix
index 715665f1b1b..715665f1b1b 100644
--- a/pkgs/development/python-modules/monkeyhex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/monkeyhex/default.nix
diff --git a/pkgs/development/python-modules/monotonic/default.nix b/nixpkgs/pkgs/development/python-modules/monotonic/default.nix
index c784730da6e..c784730da6e 100644
--- a/pkgs/development/python-modules/monotonic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/monotonic/default.nix
diff --git a/pkgs/development/python-modules/monty/default.nix b/nixpkgs/pkgs/development/python-modules/monty/default.nix
index 427f0af4573..427f0af4573 100644
--- a/pkgs/development/python-modules/monty/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/monty/default.nix
diff --git a/pkgs/development/python-modules/more-itertools/2.7.nix b/nixpkgs/pkgs/development/python-modules/more-itertools/2.7.nix
index e0786aefa2c..e0786aefa2c 100644
--- a/pkgs/development/python-modules/more-itertools/2.7.nix
+++ b/nixpkgs/pkgs/development/python-modules/more-itertools/2.7.nix
diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix
index 37152b3a502..37152b3a502 100644
--- a/pkgs/development/python-modules/more-itertools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix
diff --git a/pkgs/development/python-modules/moretools/default.nix b/nixpkgs/pkgs/development/python-modules/moretools/default.nix
index 061eedfe7b0..061eedfe7b0 100644
--- a/pkgs/development/python-modules/moretools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/moretools/default.nix
diff --git a/pkgs/development/python-modules/moto/default.nix b/nixpkgs/pkgs/development/python-modules/moto/default.nix
index cb1bb6dd980..cb1bb6dd980 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/moto/default.nix
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/nixpkgs/pkgs/development/python-modules/moviepy/default.nix
index 681a5d3b1c5..681a5d3b1c5 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/moviepy/default.nix
diff --git a/pkgs/development/python-modules/mox/default.nix b/nixpkgs/pkgs/development/python-modules/mox/default.nix
index 3537d936bb6..3537d936bb6 100644
--- a/pkgs/development/python-modules/mox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mox/default.nix
diff --git a/pkgs/development/python-modules/mox3/default.nix b/nixpkgs/pkgs/development/python-modules/mox3/default.nix
index 480e28dffcb..480e28dffcb 100644
--- a/pkgs/development/python-modules/mox3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mox3/default.nix
diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/nixpkgs/pkgs/development/python-modules/mozsvc/default.nix
index a7b3984b912..a7b3984b912 100644
--- a/pkgs/development/python-modules/mozsvc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mozsvc/default.nix
diff --git a/pkgs/development/python-modules/mozterm/default.nix b/nixpkgs/pkgs/development/python-modules/mozterm/default.nix
index c7f2b4cbc34..c7f2b4cbc34 100644
--- a/pkgs/development/python-modules/mozterm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mozterm/default.nix
diff --git a/pkgs/development/python-modules/mpd/default.nix b/nixpkgs/pkgs/development/python-modules/mpd/default.nix
index 48693293458..48693293458 100644
--- a/pkgs/development/python-modules/mpd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mpd/default.nix
diff --git a/pkgs/development/python-modules/mpd2/default.nix b/nixpkgs/pkgs/development/python-modules/mpd2/default.nix
index 95ee5c5001a..95ee5c5001a 100644
--- a/pkgs/development/python-modules/mpd2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mpd2/default.nix
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix
index c16c4719a34..c16c4719a34 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix
diff --git a/pkgs/development/python-modules/mpi4py/tests.patch b/nixpkgs/pkgs/development/python-modules/mpi4py/tests.patch
index 168e3b4b38d..168e3b4b38d 100644
--- a/pkgs/development/python-modules/mpi4py/tests.patch
+++ b/nixpkgs/pkgs/development/python-modules/mpi4py/tests.patch
diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/nixpkgs/pkgs/development/python-modules/mplleaflet/default.nix
index 62c5282b335..62c5282b335 100644
--- a/pkgs/development/python-modules/mplleaflet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mplleaflet/default.nix
diff --git a/pkgs/development/python-modules/mpmath/default.nix b/nixpkgs/pkgs/development/python-modules/mpmath/default.nix
index 1cbb8b04130..1cbb8b04130 100644
--- a/pkgs/development/python-modules/mpmath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mpmath/default.nix
diff --git a/pkgs/development/python-modules/mps-youtube/default.nix b/nixpkgs/pkgs/development/python-modules/mps-youtube/default.nix
index 753a0d24d0a..753a0d24d0a 100644
--- a/pkgs/development/python-modules/mps-youtube/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mps-youtube/default.nix
diff --git a/pkgs/development/python-modules/mpv/default.nix b/nixpkgs/pkgs/development/python-modules/mpv/default.nix
index a74150f971b..a74150f971b 100644
--- a/pkgs/development/python-modules/mpv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mpv/default.nix
diff --git a/pkgs/development/python-modules/mpyq/default.nix b/nixpkgs/pkgs/development/python-modules/mpyq/default.nix
index 5660e1b0dc5..5660e1b0dc5 100644
--- a/pkgs/development/python-modules/mpyq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mpyq/default.nix
diff --git a/pkgs/development/python-modules/mrbob/default.nix b/nixpkgs/pkgs/development/python-modules/mrbob/default.nix
index dd255d4d004..dd255d4d004 100644
--- a/pkgs/development/python-modules/mrbob/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mrbob/default.nix
diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix
index c866382b103..c866382b103 100644
--- a/pkgs/development/python-modules/msal-extensions/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix
diff --git a/pkgs/development/python-modules/msal/default.nix b/nixpkgs/pkgs/development/python-modules/msal/default.nix
index 6f2566c2c1c..6f2566c2c1c 100644
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/msal/default.nix
diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix
index c23f0b6572e..c23f0b6572e 100644
--- a/pkgs/development/python-modules/msgpack-numpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix
diff --git a/pkgs/development/python-modules/msgpack/default.nix b/nixpkgs/pkgs/development/python-modules/msgpack/default.nix
index 20be837782a..20be837782a 100644
--- a/pkgs/development/python-modules/msgpack/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/msgpack/default.nix
diff --git a/pkgs/development/python-modules/msrest/default.nix b/nixpkgs/pkgs/development/python-modules/msrest/default.nix
index 70fa6f361ca..70fa6f361ca 100644
--- a/pkgs/development/python-modules/msrest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/msrest/default.nix
diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix
index 04f7428e6b6..04f7428e6b6 100644
--- a/pkgs/development/python-modules/msrestazure/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix
diff --git a/pkgs/development/python-modules/msrplib/default.nix b/nixpkgs/pkgs/development/python-modules/msrplib/default.nix
index bba72ea62bb..bba72ea62bb 100644
--- a/pkgs/development/python-modules/msrplib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/msrplib/default.nix
diff --git a/pkgs/development/python-modules/mt-940/default.nix b/nixpkgs/pkgs/development/python-modules/mt-940/default.nix
index f31bb4c064e..f31bb4c064e 100644
--- a/pkgs/development/python-modules/mt-940/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mt-940/default.nix
diff --git a/pkgs/development/python-modules/multi_key_dict/default.nix b/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix
index a094b373f8f..a094b373f8f 100644
--- a/pkgs/development/python-modules/multi_key_dict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix
diff --git a/pkgs/development/python-modules/multidict/default.nix b/nixpkgs/pkgs/development/python-modules/multidict/default.nix
index 4673f841ee3..4673f841ee3 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/multidict/default.nix
diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/nixpkgs/pkgs/development/python-modules/multipledispatch/default.nix
index 8b2de6c5af1..8b2de6c5af1 100644
--- a/pkgs/development/python-modules/multipledispatch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/multipledispatch/default.nix
diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix
index 51fe7a83c9d..51fe7a83c9d 100644
--- a/pkgs/development/python-modules/multiprocess/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix
diff --git a/pkgs/development/python-modules/multiset/default.nix b/nixpkgs/pkgs/development/python-modules/multiset/default.nix
index 5cc159dc205..5cc159dc205 100644
--- a/pkgs/development/python-modules/multiset/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/multiset/default.nix
diff --git a/pkgs/development/python-modules/munch/default.nix b/nixpkgs/pkgs/development/python-modules/munch/default.nix
index 764523e0cf7..764523e0cf7 100644
--- a/pkgs/development/python-modules/munch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/munch/default.nix
diff --git a/pkgs/development/python-modules/munkres/default.nix b/nixpkgs/pkgs/development/python-modules/munkres/default.nix
index 5e83818a014..5e83818a014 100644
--- a/pkgs/development/python-modules/munkres/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/munkres/default.nix
diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix
index 2e826ab61e8..2e826ab61e8 100644
--- a/pkgs/development/python-modules/murmurhash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix
diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/nixpkgs/pkgs/development/python-modules/musicbrainzngs/default.nix
index 7ae3445377e..7ae3445377e 100644
--- a/pkgs/development/python-modules/musicbrainzngs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/musicbrainzngs/default.nix
diff --git a/pkgs/development/python-modules/mutag/default.nix b/nixpkgs/pkgs/development/python-modules/mutag/default.nix
index 0d5d8d75a36..0d5d8d75a36 100644
--- a/pkgs/development/python-modules/mutag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mutag/default.nix
diff --git a/pkgs/development/python-modules/mutagen/default.nix b/nixpkgs/pkgs/development/python-modules/mutagen/default.nix
index 0bd08a82b93..0bd08a82b93 100644
--- a/pkgs/development/python-modules/mutagen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mutagen/default.nix
diff --git a/pkgs/development/python-modules/muttils/default.nix b/nixpkgs/pkgs/development/python-modules/muttils/default.nix
index 868700b6223..868700b6223 100644
--- a/pkgs/development/python-modules/muttils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/muttils/default.nix
diff --git a/pkgs/development/python-modules/mwclient/default.nix b/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
index ce987311a74..ce987311a74 100644
--- a/pkgs/development/python-modules/mwclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
diff --git a/pkgs/development/python-modules/mwlib-ext/default.nix b/nixpkgs/pkgs/development/python-modules/mwlib-ext/default.nix
index cfcbdc2d0ac..cfcbdc2d0ac 100644
--- a/pkgs/development/python-modules/mwlib-ext/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mwlib-ext/default.nix
diff --git a/pkgs/development/python-modules/mwlib-rl/default.nix b/nixpkgs/pkgs/development/python-modules/mwlib-rl/default.nix
index 21820d95c7f..21820d95c7f 100644
--- a/pkgs/development/python-modules/mwlib-rl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mwlib-rl/default.nix
diff --git a/pkgs/development/python-modules/mwlib/default.nix b/nixpkgs/pkgs/development/python-modules/mwlib/default.nix
index 55a19e1a6da..55a19e1a6da 100644
--- a/pkgs/development/python-modules/mwlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mwlib/default.nix
diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix
index 778a081992c..778a081992c 100644
--- a/pkgs/development/python-modules/mwoauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix
diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix
index e52e033cdb0..e52e033cdb0 100644
--- a/pkgs/development/python-modules/mwparserfromhell/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix
diff --git a/pkgs/development/python-modules/mxnet/default.nix b/nixpkgs/pkgs/development/python-modules/mxnet/default.nix
index 65eb2d44ffc..65eb2d44ffc 100644
--- a/pkgs/development/python-modules/mxnet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mxnet/default.nix
diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix
index 570d0c3e749..570d0c3e749 100644
--- a/pkgs/development/python-modules/myfitnesspal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix
diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix
index 5f30316eb71..5f30316eb71 100644
--- a/pkgs/development/python-modules/mygpoclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix
diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix
index 954e913c9cf..954e913c9cf 100644
--- a/pkgs/development/python-modules/mypy-protobuf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix
diff --git a/pkgs/development/python-modules/mypy/default.nix b/nixpkgs/pkgs/development/python-modules/mypy/default.nix
index 90b00ba1717..90b00ba1717 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mypy/default.nix
diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix
index b3bb68a53b7..b3bb68a53b7 100644
--- a/pkgs/development/python-modules/mypy/extensions.nix
+++ b/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix
diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix
index 61a055b5ea8..61a055b5ea8 100644
--- a/pkgs/development/python-modules/mysql-connector/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix
diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix
index 72bf06893ed..72bf06893ed 100644
--- a/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix
diff --git a/pkgs/development/python-modules/nagiosplugin/default.nix b/nixpkgs/pkgs/development/python-modules/nagiosplugin/default.nix
index ef46e7ccafd..ef46e7ccafd 100644
--- a/pkgs/development/python-modules/nagiosplugin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nagiosplugin/default.nix
diff --git a/pkgs/development/python-modules/namebench/default.nix b/nixpkgs/pkgs/development/python-modules/namebench/default.nix
index 44b590bae2c..44b590bae2c 100644
--- a/pkgs/development/python-modules/namebench/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/namebench/default.nix
diff --git a/pkgs/development/python-modules/namedlist/default.nix b/nixpkgs/pkgs/development/python-modules/namedlist/default.nix
index ae07076bb05..ae07076bb05 100644
--- a/pkgs/development/python-modules/namedlist/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/namedlist/default.nix
diff --git a/pkgs/development/python-modules/nameparser/default.nix b/nixpkgs/pkgs/development/python-modules/nameparser/default.nix
index 984304e9ccb..984304e9ccb 100644
--- a/pkgs/development/python-modules/nameparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nameparser/default.nix
diff --git a/pkgs/development/python-modules/names/default.nix b/nixpkgs/pkgs/development/python-modules/names/default.nix
index b65bb463475..b65bb463475 100644
--- a/pkgs/development/python-modules/names/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/names/default.nix
diff --git a/pkgs/development/python-modules/nanoleaf/default.nix b/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix
index ccf0be4ae6d..ccf0be4ae6d 100644
--- a/pkgs/development/python-modules/nanoleaf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix
diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix
index 31662cd3941..31662cd3941 100644
--- a/pkgs/development/python-modules/nanomsg-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix
diff --git a/pkgs/development/python-modules/nanotime/default.nix b/nixpkgs/pkgs/development/python-modules/nanotime/default.nix
index 8dd520a04e9..8dd520a04e9 100644
--- a/pkgs/development/python-modules/nanotime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nanotime/default.nix
diff --git a/pkgs/development/python-modules/natsort/default.nix b/nixpkgs/pkgs/development/python-modules/natsort/default.nix
index 8bdfdb9d720..8bdfdb9d720 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/natsort/default.nix
diff --git a/pkgs/development/python-modules/naturalsort/default.nix b/nixpkgs/pkgs/development/python-modules/naturalsort/default.nix
index f7dcbe4d827..f7dcbe4d827 100644
--- a/pkgs/development/python-modules/naturalsort/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/naturalsort/default.nix
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix
index b0357c16165..b0357c16165 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix
diff --git a/pkgs/development/python-modules/nbdime/default.nix b/nixpkgs/pkgs/development/python-modules/nbdime/default.nix
index f641c017384..f641c017384 100644
--- a/pkgs/development/python-modules/nbdime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbdime/default.nix
diff --git a/pkgs/development/python-modules/nbformat/default.nix b/nixpkgs/pkgs/development/python-modules/nbformat/default.nix
index fbc71202d28..fbc71202d28 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbformat/default.nix
diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/nixpkgs/pkgs/development/python-modules/nbmerge/default.nix
index 79900197133..79900197133 100644
--- a/pkgs/development/python-modules/nbmerge/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbmerge/default.nix
diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix
index 6fff7857565..6fff7857565 100644
--- a/pkgs/development/python-modules/nbsmoke/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix
diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix
index 788a8f73ab8..788a8f73ab8 100644
--- a/pkgs/development/python-modules/nbsphinx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix
diff --git a/pkgs/development/python-modules/nbval/default.nix b/nixpkgs/pkgs/development/python-modules/nbval/default.nix
index ff9d6f134e0..ff9d6f134e0 100644
--- a/pkgs/development/python-modules/nbval/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbval/default.nix
diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix
index 0f84486674e..0f84486674e 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix
diff --git a/pkgs/development/python-modules/ncclient/default.nix b/nixpkgs/pkgs/development/python-modules/ncclient/default.nix
index ca0a9d34b3e..ca0a9d34b3e 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ncclient/default.nix
diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix
index d9c7e41c576..d9c7e41c576 100644
--- a/pkgs/development/python-modules/ndg-httpsclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix
diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix
index 0d5923820d2..0d5923820d2 100644
--- a/pkgs/development/python-modules/ndtypes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix
diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix
index 334edd0cf1e..334edd0cf1e 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix
diff --git a/pkgs/development/python-modules/netaddr/default.nix b/nixpkgs/pkgs/development/python-modules/netaddr/default.nix
index ed56e6803f4..ed56e6803f4 100644
--- a/pkgs/development/python-modules/netaddr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/netaddr/default.nix
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
index 17d1cd59675..17d1cd59675 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
diff --git a/pkgs/development/python-modules/netdisco/default.nix b/nixpkgs/pkgs/development/python-modules/netdisco/default.nix
index 1c9af258995..1c9af258995 100644
--- a/pkgs/development/python-modules/netdisco/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/netdisco/default.nix
diff --git a/pkgs/development/python-modules/netifaces/default.nix b/nixpkgs/pkgs/development/python-modules/netifaces/default.nix
index 1f1cc3857e4..1f1cc3857e4 100644
--- a/pkgs/development/python-modules/netifaces/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/netifaces/default.nix
diff --git a/pkgs/development/python-modules/networkx/2.2.nix b/nixpkgs/pkgs/development/python-modules/networkx/2.2.nix
index a4c66048953..a4c66048953 100644
--- a/pkgs/development/python-modules/networkx/2.2.nix
+++ b/nixpkgs/pkgs/development/python-modules/networkx/2.2.nix
diff --git a/pkgs/development/python-modules/networkx/default.nix b/nixpkgs/pkgs/development/python-modules/networkx/default.nix
index 6075daf5846..6075daf5846 100644
--- a/pkgs/development/python-modules/networkx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/networkx/default.nix
diff --git a/pkgs/development/python-modules/neuronpy/default.nix b/nixpkgs/pkgs/development/python-modules/neuronpy/default.nix
index 1d258effda7..1d258effda7 100644
--- a/pkgs/development/python-modules/neuronpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/neuronpy/default.nix
diff --git a/pkgs/development/python-modules/nevow/default.nix b/nixpkgs/pkgs/development/python-modules/nevow/default.nix
index 6054e6d3a73..6054e6d3a73 100644
--- a/pkgs/development/python-modules/nevow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nevow/default.nix
diff --git a/pkgs/development/python-modules/nibabel/default.nix b/nixpkgs/pkgs/development/python-modules/nibabel/default.nix
index 979f12c8d98..979f12c8d98 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nibabel/default.nix
diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix
index 937e6c1c91b..937e6c1c91b 100644
--- a/pkgs/development/python-modules/nidaqmx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix
diff --git a/pkgs/development/python-modules/nilearn/default.nix b/nixpkgs/pkgs/development/python-modules/nilearn/default.nix
index 9158ee77e50..9158ee77e50 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nilearn/default.nix
diff --git a/pkgs/development/python-modules/nimfa/default.nix b/nixpkgs/pkgs/development/python-modules/nimfa/default.nix
index bd3e92e90db..bd3e92e90db 100644
--- a/pkgs/development/python-modules/nimfa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nimfa/default.nix
diff --git a/pkgs/development/python-modules/nine/default.nix b/nixpkgs/pkgs/development/python-modules/nine/default.nix
index 8882b6ae745..8882b6ae745 100644
--- a/pkgs/development/python-modules/nine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nine/default.nix
diff --git a/pkgs/development/python-modules/nipy/default.nix b/nixpkgs/pkgs/development/python-modules/nipy/default.nix
index 5b8c1e5185d..5b8c1e5185d 100644
--- a/pkgs/development/python-modules/nipy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nipy/default.nix
diff --git a/pkgs/development/python-modules/nipype/default.nix b/nixpkgs/pkgs/development/python-modules/nipype/default.nix
index ab81b2b190b..ab81b2b190b 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nipype/default.nix
diff --git a/pkgs/development/python-modules/nipype/neurdflib.nix b/nixpkgs/pkgs/development/python-modules/nipype/neurdflib.nix
index 33526bebd55..33526bebd55 100644
--- a/pkgs/development/python-modules/nipype/neurdflib.nix
+++ b/nixpkgs/pkgs/development/python-modules/nipype/neurdflib.nix
diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix
index f73fb6dac33..f73fb6dac33 100644
--- a/pkgs/development/python-modules/nix-prefetch-github/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix
diff --git a/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix
index ebb8b7c70eb..ebb8b7c70eb 100644
--- a/pkgs/development/python-modules/nixpkgs-pytools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix
diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix
index 66e8bb2a735..66e8bb2a735 100644
--- a/pkgs/development/python-modules/nixpkgs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix
diff --git a/pkgs/development/python-modules/nltk/default.nix b/nixpkgs/pkgs/development/python-modules/nltk/default.nix
index ef6d51cb19a..ef6d51cb19a 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nltk/default.nix
diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix
index 6e51ae07731..6e51ae07731 100644
--- a/pkgs/development/python-modules/nmigen-boards/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix
diff --git a/pkgs/development/python-modules/nmigen/default.nix b/nixpkgs/pkgs/development/python-modules/nmigen/default.nix
index 8269c07cba0..8269c07cba0 100644
--- a/pkgs/development/python-modules/nmigen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nmigen/default.nix
diff --git a/pkgs/development/python-modules/node-semver/default.nix b/nixpkgs/pkgs/development/python-modules/node-semver/default.nix
index 1c38918c147..1c38918c147 100644
--- a/pkgs/development/python-modules/node-semver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/node-semver/default.nix
diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix
index 042ee1e3e61..042ee1e3e61 100644
--- a/pkgs/development/python-modules/nodeenv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix
diff --git a/pkgs/development/python-modules/noise/default.nix b/nixpkgs/pkgs/development/python-modules/noise/default.nix
index d136c41aa37..d136c41aa37 100644
--- a/pkgs/development/python-modules/noise/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/noise/default.nix
diff --git a/pkgs/development/python-modules/nose-cov/default.nix b/nixpkgs/pkgs/development/python-modules/nose-cov/default.nix
index 1d3d6179ae6..1d3d6179ae6 100644
--- a/pkgs/development/python-modules/nose-cov/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-cov/default.nix
diff --git a/pkgs/development/python-modules/nose-cover3/default.nix b/nixpkgs/pkgs/development/python-modules/nose-cover3/default.nix
index 273c0ab042f..273c0ab042f 100644
--- a/pkgs/development/python-modules/nose-cover3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-cover3/default.nix
diff --git a/pkgs/development/python-modules/nose-cprof/default.nix b/nixpkgs/pkgs/development/python-modules/nose-cprof/default.nix
index c8bc7dbaf68..c8bc7dbaf68 100644
--- a/pkgs/development/python-modules/nose-cprof/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-cprof/default.nix
diff --git a/pkgs/development/python-modules/nose-exclude/default.nix b/nixpkgs/pkgs/development/python-modules/nose-exclude/default.nix
index 7f679e545e7..7f679e545e7 100644
--- a/pkgs/development/python-modules/nose-exclude/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-exclude/default.nix
diff --git a/pkgs/development/python-modules/nose-focus/default.nix b/nixpkgs/pkgs/development/python-modules/nose-focus/default.nix
index ef86a35b304..ef86a35b304 100644
--- a/pkgs/development/python-modules/nose-focus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-focus/default.nix
diff --git a/pkgs/development/python-modules/nose-of-yeti/default.nix b/nixpkgs/pkgs/development/python-modules/nose-of-yeti/default.nix
index 7a783da3117..7a783da3117 100644
--- a/pkgs/development/python-modules/nose-of-yeti/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-of-yeti/default.nix
diff --git a/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix
index 24d74b938af..24d74b938af 100644
--- a/pkgs/development/python-modules/nose-pattern-exclude/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix
diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix
index 23315f9531b..23315f9531b 100644
--- a/pkgs/development/python-modules/nose-randomly/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix
diff --git a/pkgs/development/python-modules/nose/default.nix b/nixpkgs/pkgs/development/python-modules/nose/default.nix
index bec5156d22e..bec5156d22e 100644
--- a/pkgs/development/python-modules/nose/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose/default.nix
diff --git a/pkgs/development/python-modules/nose2/default.nix b/nixpkgs/pkgs/development/python-modules/nose2/default.nix
index 749a4d4618b..749a4d4618b 100644
--- a/pkgs/development/python-modules/nose2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose2/default.nix
diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/nixpkgs/pkgs/development/python-modules/nose_progressive/default.nix
index 6d9d98f27ab..6d9d98f27ab 100644
--- a/pkgs/development/python-modules/nose_progressive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose_progressive/default.nix
diff --git a/pkgs/development/python-modules/nose_warnings_filters/default.nix b/nixpkgs/pkgs/development/python-modules/nose_warnings_filters/default.nix
index 2b1ee207cfe..2b1ee207cfe 100644
--- a/pkgs/development/python-modules/nose_warnings_filters/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nose_warnings_filters/default.nix
diff --git a/pkgs/development/python-modules/nosejs/default.nix b/nixpkgs/pkgs/development/python-modules/nosejs/default.nix
index c2d3ee94c7b..c2d3ee94c7b 100644
--- a/pkgs/development/python-modules/nosejs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nosejs/default.nix
diff --git a/pkgs/development/python-modules/nosexcover/default.nix b/nixpkgs/pkgs/development/python-modules/nosexcover/default.nix
index 2fb69838879..2fb69838879 100644
--- a/pkgs/development/python-modules/nosexcover/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nosexcover/default.nix
diff --git a/pkgs/development/python-modules/notebook/2.nix b/nixpkgs/pkgs/development/python-modules/notebook/2.nix
index d081a5a92fb..d081a5a92fb 100644
--- a/pkgs/development/python-modules/notebook/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/notebook/2.nix
diff --git a/pkgs/development/python-modules/notebook/default.nix b/nixpkgs/pkgs/development/python-modules/notebook/default.nix
index 3c174288b82..3c174288b82 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/notebook/default.nix
diff --git a/pkgs/development/python-modules/notedown/default.nix b/nixpkgs/pkgs/development/python-modules/notedown/default.nix
index c1dacc84da0..c1dacc84da0 100644
--- a/pkgs/development/python-modules/notedown/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/notedown/default.nix
diff --git a/pkgs/development/python-modules/notify/default.nix b/nixpkgs/pkgs/development/python-modules/notify/default.nix
index f3a1d6514eb..f3a1d6514eb 100644
--- a/pkgs/development/python-modules/notify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/notify/default.nix
diff --git a/pkgs/development/python-modules/notify2/default.nix b/nixpkgs/pkgs/development/python-modules/notify2/default.nix
index 2d585192907..2d585192907 100644
--- a/pkgs/development/python-modules/notify2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/notify2/default.nix
diff --git a/pkgs/development/python-modules/notmuch/default.nix b/nixpkgs/pkgs/development/python-modules/notmuch/default.nix
index 567977a84f5..567977a84f5 100644
--- a/pkgs/development/python-modules/notmuch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/notmuch/default.nix
diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix
index e4bbe0fb430..e4bbe0fb430 100644
--- a/pkgs/development/python-modules/ntlm-auth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix
diff --git a/pkgs/development/python-modules/ntplib/default.nix b/nixpkgs/pkgs/development/python-modules/ntplib/default.nix
index d6506ae4b4a..d6506ae4b4a 100644
--- a/pkgs/development/python-modules/ntplib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ntplib/default.nix
diff --git a/pkgs/development/python-modules/nuitka/default.nix b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix
index 0413d224bcd..0413d224bcd 100644
--- a/pkgs/development/python-modules/nuitka/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix
diff --git a/pkgs/development/python-modules/num2words/default.nix b/nixpkgs/pkgs/development/python-modules/num2words/default.nix
index bce4c0426e4..bce4c0426e4 100644
--- a/pkgs/development/python-modules/num2words/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/num2words/default.nix
diff --git a/pkgs/development/python-modules/numba/default.nix b/nixpkgs/pkgs/development/python-modules/numba/default.nix
index f452b7fae73..f452b7fae73 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/numba/default.nix
diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix
index 9725f131111..9725f131111 100644
--- a/pkgs/development/python-modules/numcodecs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix
diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix
index 3f041ef698e..3f041ef698e 100644
--- a/pkgs/development/python-modules/numericalunits/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix
diff --git a/pkgs/development/python-modules/numexpr/default.nix b/nixpkgs/pkgs/development/python-modules/numexpr/default.nix
index d0bb0a88cff..d0bb0a88cff 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/numexpr/default.nix
diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix
index 4c2af8a0081..4c2af8a0081 100644
--- a/pkgs/development/python-modules/numpy-stl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix
diff --git a/pkgs/development/python-modules/numpy/default.nix b/nixpkgs/pkgs/development/python-modules/numpy/default.nix
index bdd76696885..bdd76696885 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/numpy/default.nix
diff --git a/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch b/nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
index 771da8cf3ff..771da8cf3ff 100644
--- a/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
+++ b/nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix
index fb3b9af76f6..fb3b9af76f6 100644
--- a/pkgs/development/python-modules/numpydoc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix
diff --git a/pkgs/development/python-modules/numtraits/default.nix b/nixpkgs/pkgs/development/python-modules/numtraits/default.nix
index a0262c77595..a0262c77595 100644
--- a/pkgs/development/python-modules/numtraits/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/numtraits/default.nix
diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
index 641db7008f8..641db7008f8 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix
index 7e34f3897bc..7e34f3897bc 100644
--- a/pkgs/development/python-modules/nwdiag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix
diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix
index 8e294f290cb..8e294f290cb 100644
--- a/pkgs/development/python-modules/nxt-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix
diff --git a/pkgs/development/python-modules/oath/default.nix b/nixpkgs/pkgs/development/python-modules/oath/default.nix
index a64eeb8e103..a64eeb8e103 100644
--- a/pkgs/development/python-modules/oath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oath/default.nix
diff --git a/pkgs/development/python-modules/oauth/default.nix b/nixpkgs/pkgs/development/python-modules/oauth/default.nix
index f4a8e3a62c2..f4a8e3a62c2 100644
--- a/pkgs/development/python-modules/oauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oauth/default.nix
diff --git a/pkgs/development/python-modules/oauth2/default.nix b/nixpkgs/pkgs/development/python-modules/oauth2/default.nix
index 8233b132344..8233b132344 100644
--- a/pkgs/development/python-modules/oauth2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oauth2/default.nix
diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/nixpkgs/pkgs/development/python-modules/oauth2client/default.nix
index 8500b53b244..8500b53b244 100644
--- a/pkgs/development/python-modules/oauth2client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oauth2client/default.nix
diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix
index d8a97692976..d8a97692976 100644
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix
diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix
index b8b85f606a9..b8b85f606a9 100644
--- a/pkgs/development/python-modules/oauthlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix
diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/nixpkgs/pkgs/development/python-modules/obfsproxy/default.nix
index 8abd3f22ea3..8abd3f22ea3 100644
--- a/pkgs/development/python-modules/obfsproxy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/obfsproxy/default.nix
diff --git a/pkgs/development/python-modules/objgraph/default.nix b/nixpkgs/pkgs/development/python-modules/objgraph/default.nix
index c0e0cddb2c8..c0e0cddb2c8 100644
--- a/pkgs/development/python-modules/objgraph/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/objgraph/default.nix
diff --git a/pkgs/development/python-modules/objgraph/hardcode-graphviz-path.patch b/nixpkgs/pkgs/development/python-modules/objgraph/hardcode-graphviz-path.patch
index c5be5de64ee..c5be5de64ee 100644
--- a/pkgs/development/python-modules/objgraph/hardcode-graphviz-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/objgraph/hardcode-graphviz-path.patch
diff --git a/pkgs/development/python-modules/od/default.nix b/nixpkgs/pkgs/development/python-modules/od/default.nix
index 0aaa40e1758..0aaa40e1758 100644
--- a/pkgs/development/python-modules/od/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/od/default.nix
diff --git a/pkgs/development/python-modules/odfpy/default.nix b/nixpkgs/pkgs/development/python-modules/odfpy/default.nix
index c62f6ae681c..c62f6ae681c 100644
--- a/pkgs/development/python-modules/odfpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/odfpy/default.nix
diff --git a/pkgs/development/python-modules/odo/default.nix b/nixpkgs/pkgs/development/python-modules/odo/default.nix
index 6c19bf0a0fd..6c19bf0a0fd 100644
--- a/pkgs/development/python-modules/odo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/odo/default.nix
diff --git a/pkgs/development/python-modules/offtrac/default.nix b/nixpkgs/pkgs/development/python-modules/offtrac/default.nix
index e098ecc8c31..e098ecc8c31 100644
--- a/pkgs/development/python-modules/offtrac/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/offtrac/default.nix
diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/nixpkgs/pkgs/development/python-modules/ofxclient/default.nix
index 2bde7b174d3..2bde7b174d3 100644
--- a/pkgs/development/python-modules/ofxclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ofxclient/default.nix
diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix
index 518c34951fc..518c34951fc 100644
--- a/pkgs/development/python-modules/ofxhome/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix
diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix
index fbdafc291dc..fbdafc291dc 100644
--- a/pkgs/development/python-modules/ofxparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix
diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix
index 1aa6b75e8bf..1aa6b75e8bf 100644
--- a/pkgs/development/python-modules/ofxtools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix
diff --git a/pkgs/development/python-modules/olefile/default.nix b/nixpkgs/pkgs/development/python-modules/olefile/default.nix
index ff4aba83bc8..ff4aba83bc8 100644
--- a/pkgs/development/python-modules/olefile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/olefile/default.nix
diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix
index 4219aad3865..4219aad3865 100644
--- a/pkgs/development/python-modules/omegaconf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix
diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/nixpkgs/pkgs/development/python-modules/onkyo-eiscp/default.nix
index 39c98706060..39c98706060 100644
--- a/pkgs/development/python-modules/onkyo-eiscp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/onkyo-eiscp/default.nix
diff --git a/pkgs/development/python-modules/onnx/default.nix b/nixpkgs/pkgs/development/python-modules/onnx/default.nix
index 3f3cf38f333..3f3cf38f333 100644
--- a/pkgs/development/python-modules/onnx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/onnx/default.nix
diff --git a/pkgs/development/python-modules/openant/default.nix b/nixpkgs/pkgs/development/python-modules/openant/default.nix
index a9598825dd0..a9598825dd0 100644
--- a/pkgs/development/python-modules/openant/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/openant/default.nix
diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix
index 02664326685..02664326685 100644
--- a/pkgs/development/python-modules/openapi-spec-validator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix
diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/nixpkgs/pkgs/development/python-modules/openidc-client/default.nix
index e0eb1ac8d79..e0eb1ac8d79 100644
--- a/pkgs/development/python-modules/openidc-client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/openidc-client/default.nix
diff --git a/pkgs/development/python-modules/openpyxl/2.nix b/nixpkgs/pkgs/development/python-modules/openpyxl/2.nix
index d58192c0666..d58192c0666 100644
--- a/pkgs/development/python-modules/openpyxl/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/openpyxl/2.nix
diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix
index a3f74f00093..a3f74f00093 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix
diff --git a/pkgs/development/python-modules/openrazer/common.nix b/nixpkgs/pkgs/development/python-modules/openrazer/common.nix
index eac2751ce3e..eac2751ce3e 100644
--- a/pkgs/development/python-modules/openrazer/common.nix
+++ b/nixpkgs/pkgs/development/python-modules/openrazer/common.nix
diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix
index fb7b48e2266..fb7b48e2266 100644
--- a/pkgs/development/python-modules/openrazer/daemon.nix
+++ b/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix
diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix
index 2f9ff467b2d..2f9ff467b2d 100644
--- a/pkgs/development/python-modules/openrazer/pylib.nix
+++ b/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix
diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix
index f9394efe398..f9394efe398 100644
--- a/pkgs/development/python-modules/opentimestamps/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix
diff --git a/pkgs/development/python-modules/opentracing/default.nix b/nixpkgs/pkgs/development/python-modules/opentracing/default.nix
index f20ca7285e6..f20ca7285e6 100644
--- a/pkgs/development/python-modules/opentracing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/opentracing/default.nix
diff --git a/pkgs/development/python-modules/opt-einsum/2.nix b/nixpkgs/pkgs/development/python-modules/opt-einsum/2.nix
index 41c4df89f4f..41c4df89f4f 100644
--- a/pkgs/development/python-modules/opt-einsum/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/opt-einsum/2.nix
diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/nixpkgs/pkgs/development/python-modules/opt-einsum/default.nix
index 1d8c9d9531a..1d8c9d9531a 100644
--- a/pkgs/development/python-modules/opt-einsum/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/opt-einsum/default.nix
diff --git a/pkgs/development/python-modules/optuna/default.nix b/nixpkgs/pkgs/development/python-modules/optuna/default.nix
index 26c72899317..26c72899317 100644
--- a/pkgs/development/python-modules/optuna/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/optuna/default.nix
diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/nixpkgs/pkgs/development/python-modules/ordered-set/default.nix
index 924a2d31b76..924a2d31b76 100644
--- a/pkgs/development/python-modules/ordered-set/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ordered-set/default.nix
diff --git a/pkgs/development/python-modules/ordereddict/default.nix b/nixpkgs/pkgs/development/python-modules/ordereddict/default.nix
index 9c028777fc9..9c028777fc9 100644
--- a/pkgs/development/python-modules/ordereddict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ordereddict/default.nix
diff --git a/pkgs/development/python-modules/orderedset/default.nix b/nixpkgs/pkgs/development/python-modules/orderedset/default.nix
index f1e6f1bf918..f1e6f1bf918 100644
--- a/pkgs/development/python-modules/orderedset/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/orderedset/default.nix
diff --git a/pkgs/development/python-modules/orm/default.nix b/nixpkgs/pkgs/development/python-modules/orm/default.nix
index c2f6bc4fc57..c2f6bc4fc57 100644
--- a/pkgs/development/python-modules/orm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/orm/default.nix
diff --git a/pkgs/development/python-modules/osc/default.nix b/nixpkgs/pkgs/development/python-modules/osc/default.nix
index c9ce8324b18..c9ce8324b18 100644
--- a/pkgs/development/python-modules/osc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/osc/default.nix
diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix
index 6012398db98..6012398db98 100644
--- a/pkgs/development/python-modules/oscrypto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix
diff --git a/pkgs/development/python-modules/oset/default.nix b/nixpkgs/pkgs/development/python-modules/oset/default.nix
index aa435b403e8..aa435b403e8 100644
--- a/pkgs/development/python-modules/oset/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oset/default.nix
diff --git a/pkgs/development/python-modules/osmnx/default.nix b/nixpkgs/pkgs/development/python-modules/osmnx/default.nix
index ae4e8a03971..ae4e8a03971 100755
--- a/pkgs/development/python-modules/osmnx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/osmnx/default.nix
diff --git a/pkgs/development/python-modules/outcome/default.nix b/nixpkgs/pkgs/development/python-modules/outcome/default.nix
index ff97ca15a92..ff97ca15a92 100644
--- a/pkgs/development/python-modules/outcome/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/outcome/default.nix
diff --git a/pkgs/development/python-modules/ovh/default.nix b/nixpkgs/pkgs/development/python-modules/ovh/default.nix
index 22e82141cdc..22e82141cdc 100644
--- a/pkgs/development/python-modules/ovh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ovh/default.nix
diff --git a/pkgs/development/python-modules/ovito/default.nix b/nixpkgs/pkgs/development/python-modules/ovito/default.nix
index 694b87581cd..694b87581cd 100644
--- a/pkgs/development/python-modules/ovito/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ovito/default.nix
diff --git a/pkgs/development/python-modules/owslib/default.nix b/nixpkgs/pkgs/development/python-modules/owslib/default.nix
index 1e79a764147..1e79a764147 100644
--- a/pkgs/development/python-modules/owslib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/owslib/default.nix
diff --git a/pkgs/development/python-modules/oyaml/default.nix b/nixpkgs/pkgs/development/python-modules/oyaml/default.nix
index e445086d0c7..e445086d0c7 100644
--- a/pkgs/development/python-modules/oyaml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/oyaml/default.nix
diff --git a/pkgs/development/python-modules/packaging/default.nix b/nixpkgs/pkgs/development/python-modules/packaging/default.nix
index cb1b4bb0a7d..cb1b4bb0a7d 100644
--- a/pkgs/development/python-modules/packaging/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/packaging/default.nix
diff --git a/pkgs/development/python-modules/packet-python/default.nix b/nixpkgs/pkgs/development/python-modules/packet-python/default.nix
index 2c56372c2fa..2c56372c2fa 100644
--- a/pkgs/development/python-modules/packet-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/packet-python/default.nix
diff --git a/pkgs/development/python-modules/pafy/default.nix b/nixpkgs/pkgs/development/python-modules/pafy/default.nix
index 53218146557..53218146557 100644
--- a/pkgs/development/python-modules/pafy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pafy/default.nix
diff --git a/pkgs/development/python-modules/pagerduty/default.nix b/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix
index d3f47dad3ca..d3f47dad3ca 100644
--- a/pkgs/development/python-modules/pagerduty/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix
diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix
index 886307b7104..886307b7104 100644
--- a/pkgs/development/python-modules/paho-mqtt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix
diff --git a/pkgs/development/python-modules/palettable/default.nix b/nixpkgs/pkgs/development/python-modules/palettable/default.nix
index 6313e759e6b..6313e759e6b 100644
--- a/pkgs/development/python-modules/palettable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/palettable/default.nix
diff --git a/pkgs/development/python-modules/pamela/default.nix b/nixpkgs/pkgs/development/python-modules/pamela/default.nix
index 9a55719d77f..9a55719d77f 100644
--- a/pkgs/development/python-modules/pamela/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pamela/default.nix
diff --git a/pkgs/development/python-modules/pamqp/default.nix b/nixpkgs/pkgs/development/python-modules/pamqp/default.nix
index 07eab3b7bc9..07eab3b7bc9 100644
--- a/pkgs/development/python-modules/pamqp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pamqp/default.nix
diff --git a/pkgs/development/python-modules/pandas/2.nix b/nixpkgs/pkgs/development/python-modules/pandas/2.nix
index e4f65a94dc5..e4f65a94dc5 100644
--- a/pkgs/development/python-modules/pandas/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/pandas/2.nix
diff --git a/pkgs/development/python-modules/pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix
index fc5841ba796..fc5841ba796 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pandas/default.nix
diff --git a/pkgs/development/python-modules/pandoc-attributes/default.nix b/nixpkgs/pkgs/development/python-modules/pandoc-attributes/default.nix
index 8b5652bfb54..8b5652bfb54 100644
--- a/pkgs/development/python-modules/pandoc-attributes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pandoc-attributes/default.nix
diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix
index a6edb89dcab..a6edb89dcab 100644
--- a/pkgs/development/python-modules/pandocfilters/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix
diff --git a/pkgs/development/python-modules/panel/default.nix b/nixpkgs/pkgs/development/python-modules/panel/default.nix
index 0047548779c..0047548779c 100644
--- a/pkgs/development/python-modules/panel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/panel/default.nix
diff --git a/pkgs/development/python-modules/papermill/default.nix b/nixpkgs/pkgs/development/python-modules/papermill/default.nix
index ffe0fbc5da5..ffe0fbc5da5 100644
--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/papermill/default.nix
diff --git a/pkgs/development/python-modules/paperspace/default.nix b/nixpkgs/pkgs/development/python-modules/paperspace/default.nix
index 7999ce03efe..7999ce03efe 100644
--- a/pkgs/development/python-modules/paperspace/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/paperspace/default.nix
diff --git a/pkgs/development/python-modules/papis-python-rofi/default.nix b/nixpkgs/pkgs/development/python-modules/papis-python-rofi/default.nix
index 1344e1588cd..1344e1588cd 100644
--- a/pkgs/development/python-modules/papis-python-rofi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/papis-python-rofi/default.nix
diff --git a/pkgs/development/python-modules/papis/default.nix b/nixpkgs/pkgs/development/python-modules/papis/default.nix
index f770fecd5e5..f770fecd5e5 100644
--- a/pkgs/development/python-modules/papis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/papis/default.nix
diff --git a/pkgs/development/python-modules/param/default.nix b/nixpkgs/pkgs/development/python-modules/param/default.nix
index d6b35725c76..d6b35725c76 100644
--- a/pkgs/development/python-modules/param/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/param/default.nix
diff --git a/pkgs/development/python-modules/parameterized/default.nix b/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
index f5dd38cc743..f5dd38cc743 100644
--- a/pkgs/development/python-modules/parameterized/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
diff --git a/pkgs/development/python-modules/paramiko/default.nix b/nixpkgs/pkgs/development/python-modules/paramiko/default.nix
index 2fefbde7448..2fefbde7448 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/paramiko/default.nix
diff --git a/pkgs/development/python-modules/paramz/default.nix b/nixpkgs/pkgs/development/python-modules/paramz/default.nix
index 029ce4a1712..029ce4a1712 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/paramz/default.nix
diff --git a/pkgs/development/python-modules/parfive/default.nix b/nixpkgs/pkgs/development/python-modules/parfive/default.nix
index 26a3a613be4..26a3a613be4 100644
--- a/pkgs/development/python-modules/parfive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parfive/default.nix
diff --git a/pkgs/development/python-modules/parse-type/default.nix b/nixpkgs/pkgs/development/python-modules/parse-type/default.nix
index 04ad3ba9c18..04ad3ba9c18 100644
--- a/pkgs/development/python-modules/parse-type/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parse-type/default.nix
diff --git a/pkgs/development/python-modules/parse/default.nix b/nixpkgs/pkgs/development/python-modules/parse/default.nix
index d79badd66c9..d79badd66c9 100644
--- a/pkgs/development/python-modules/parse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parse/default.nix
diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix
index 914d5e2680f..914d5e2680f 100644
--- a/pkgs/development/python-modules/parsedatetime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix
diff --git a/pkgs/development/python-modules/parsel/default.nix b/nixpkgs/pkgs/development/python-modules/parsel/default.nix
index daaf845cdf0..daaf845cdf0 100644
--- a/pkgs/development/python-modules/parsel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parsel/default.nix
diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix
index 69e6d1d2bb2..69e6d1d2bb2 100644
--- a/pkgs/development/python-modules/parsimonious/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix
diff --git a/pkgs/development/python-modules/parsley/default.nix b/nixpkgs/pkgs/development/python-modules/parsley/default.nix
index 17e05b6027f..17e05b6027f 100644
--- a/pkgs/development/python-modules/parsley/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parsley/default.nix
diff --git a/pkgs/development/python-modules/parso/default.nix b/nixpkgs/pkgs/development/python-modules/parso/default.nix
index 24fc5789405..24fc5789405 100644
--- a/pkgs/development/python-modules/parso/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parso/default.nix
diff --git a/pkgs/development/python-modules/parsy/default.nix b/nixpkgs/pkgs/development/python-modules/parsy/default.nix
index c7ee17f8c8d..c7ee17f8c8d 100644
--- a/pkgs/development/python-modules/parsy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parsy/default.nix
diff --git a/pkgs/development/python-modules/partd/default.nix b/nixpkgs/pkgs/development/python-modules/partd/default.nix
index e8a148edb23..e8a148edb23 100644
--- a/pkgs/development/python-modules/partd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/partd/default.nix
diff --git a/pkgs/development/python-modules/parver/default.nix b/nixpkgs/pkgs/development/python-modules/parver/default.nix
index c71e39ca111..c71e39ca111 100644
--- a/pkgs/development/python-modules/parver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/parver/default.nix
diff --git a/pkgs/development/python-modules/passlib/default.nix b/nixpkgs/pkgs/development/python-modules/passlib/default.nix
index e49ad50d91f..e49ad50d91f 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/passlib/default.nix
diff --git a/pkgs/development/python-modules/paste/default.nix b/nixpkgs/pkgs/development/python-modules/paste/default.nix
index 210996123a3..210996123a3 100644
--- a/pkgs/development/python-modules/paste/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/paste/default.nix
diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix
index 3301521b085..3301521b085 100644
--- a/pkgs/development/python-modules/pastedeploy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix
diff --git a/pkgs/development/python-modules/pastel/default.nix b/nixpkgs/pkgs/development/python-modules/pastel/default.nix
index 532970c62c2..532970c62c2 100644
--- a/pkgs/development/python-modules/pastel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pastel/default.nix
diff --git a/pkgs/development/python-modules/pastescript/default.nix b/nixpkgs/pkgs/development/python-modules/pastescript/default.nix
index dd93bd404d0..dd93bd404d0 100644
--- a/pkgs/development/python-modules/pastescript/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pastescript/default.nix
diff --git a/pkgs/development/python-modules/patator/default.nix b/nixpkgs/pkgs/development/python-modules/patator/default.nix
index 46601c16755..46601c16755 100644
--- a/pkgs/development/python-modules/patator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/patator/default.nix
diff --git a/pkgs/development/python-modules/patch/default.nix b/nixpkgs/pkgs/development/python-modules/patch/default.nix
index 1a7ce953947..1a7ce953947 100644
--- a/pkgs/development/python-modules/patch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/patch/default.nix
diff --git a/pkgs/development/python-modules/path-and-address/default.nix b/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix
index 55d7afd9fa4..55d7afd9fa4 100644
--- a/pkgs/development/python-modules/path-and-address/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix
diff --git a/pkgs/development/python-modules/path.py/2.nix b/nixpkgs/pkgs/development/python-modules/path.py/2.nix
index 318642a393a..318642a393a 100644
--- a/pkgs/development/python-modules/path.py/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/path.py/2.nix
diff --git a/pkgs/development/python-modules/path.py/default.nix b/nixpkgs/pkgs/development/python-modules/path.py/default.nix
index 272c34df429..272c34df429 100644
--- a/pkgs/development/python-modules/path.py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/path.py/default.nix
diff --git a/pkgs/development/python-modules/pathlib/default.nix b/nixpkgs/pkgs/development/python-modules/pathlib/default.nix
index d70178dac85..d70178dac85 100644
--- a/pkgs/development/python-modules/pathlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pathlib/default.nix
diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix
index a81c652075c..a81c652075c 100644
--- a/pkgs/development/python-modules/pathlib2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix
diff --git a/pkgs/development/python-modules/pathos/default.nix b/nixpkgs/pkgs/development/python-modules/pathos/default.nix
index e575aa333eb..e575aa333eb 100644
--- a/pkgs/development/python-modules/pathos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pathos/default.nix
diff --git a/pkgs/development/python-modules/pathspec/default.nix b/nixpkgs/pkgs/development/python-modules/pathspec/default.nix
index caef384d279..caef384d279 100644
--- a/pkgs/development/python-modules/pathspec/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pathspec/default.nix
diff --git a/pkgs/development/python-modules/pathtools/default.nix b/nixpkgs/pkgs/development/python-modules/pathtools/default.nix
index 8709662e6a1..8709662e6a1 100644
--- a/pkgs/development/python-modules/pathtools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pathtools/default.nix
diff --git a/pkgs/development/python-modules/patsy/default.nix b/nixpkgs/pkgs/development/python-modules/patsy/default.nix
index a21b4027bbb..a21b4027bbb 100644
--- a/pkgs/development/python-modules/patsy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/patsy/default.nix
diff --git a/pkgs/development/python-modules/paver/default.nix b/nixpkgs/pkgs/development/python-modules/paver/default.nix
index 17ae2428b87..17ae2428b87 100644
--- a/pkgs/development/python-modules/paver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/paver/default.nix
diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix
index dbc918e6c0d..dbc918e6c0d 100644
--- a/pkgs/development/python-modules/paypalrestsdk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix
diff --git a/pkgs/development/python-modules/pbkdf2/default.nix b/nixpkgs/pkgs/development/python-modules/pbkdf2/default.nix
index c83cada08f2..c83cada08f2 100644
--- a/pkgs/development/python-modules/pbkdf2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pbkdf2/default.nix
diff --git a/pkgs/development/python-modules/pbr/default.nix b/nixpkgs/pkgs/development/python-modules/pbr/default.nix
index 310d16026a9..310d16026a9 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pbr/default.nix
diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
index d21d9d07150..d21d9d07150 100644
--- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
diff --git a/pkgs/development/python-modules/pcpp/default.nix b/nixpkgs/pkgs/development/python-modules/pcpp/default.nix
index 1c032ea62b4..1c032ea62b4 100644
--- a/pkgs/development/python-modules/pcpp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pcpp/default.nix
diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix
index 41009a4b7a2..41009a4b7a2 100644
--- a/pkgs/development/python-modules/pdf2image/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix
diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/nixpkgs/pkgs/development/python-modules/pdfkit/default.nix
index 0d6edcbd3f4..0d6edcbd3f4 100644
--- a/pkgs/development/python-modules/pdfkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pdfkit/default.nix
diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix
index 5f3cc06b5af..5f3cc06b5af 100644
--- a/pkgs/development/python-modules/pdfminer_six/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix
diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix
index 0a2427283f4..0a2427283f4 100644
--- a/pkgs/development/python-modules/pdftotext/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix
diff --git a/pkgs/development/python-modules/pdfx/default.nix b/nixpkgs/pkgs/development/python-modules/pdfx/default.nix
index d2397fb5c82..d2397fb5c82 100644
--- a/pkgs/development/python-modules/pdfx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pdfx/default.nix
diff --git a/pkgs/development/python-modules/pecan/default.nix b/nixpkgs/pkgs/development/python-modules/pecan/default.nix
index 9f3c009f8c1..9f3c009f8c1 100644
--- a/pkgs/development/python-modules/pecan/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pecan/default.nix
diff --git a/pkgs/development/python-modules/peewee/default.nix b/nixpkgs/pkgs/development/python-modules/peewee/default.nix
index 2c7832f6ab4..2c7832f6ab4 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/peewee/default.nix
diff --git a/pkgs/development/python-modules/pefile/default.nix b/nixpkgs/pkgs/development/python-modules/pefile/default.nix
index 92a0d064f49..92a0d064f49 100644
--- a/pkgs/development/python-modules/pefile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pefile/default.nix
diff --git a/pkgs/development/python-modules/pelican/default.nix b/nixpkgs/pkgs/development/python-modules/pelican/default.nix
index 7066ecd3a52..7066ecd3a52 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pelican/default.nix
diff --git a/pkgs/development/python-modules/pendulum/default.nix b/nixpkgs/pkgs/development/python-modules/pendulum/default.nix
index 354bded7b8c..354bded7b8c 100644
--- a/pkgs/development/python-modules/pendulum/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pendulum/default.nix
diff --git a/pkgs/development/python-modules/pep257/default.nix b/nixpkgs/pkgs/development/python-modules/pep257/default.nix
index fc1028a0d1c..fc1028a0d1c 100644
--- a/pkgs/development/python-modules/pep257/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pep257/default.nix
diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix
index 5c66eb6cad0..5c66eb6cad0 100644
--- a/pkgs/development/python-modules/pep8-naming/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix
diff --git a/pkgs/development/python-modules/pep8/default.nix b/nixpkgs/pkgs/development/python-modules/pep8/default.nix
index 12176b97380..12176b97380 100644
--- a/pkgs/development/python-modules/pep8/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pep8/default.nix
diff --git a/pkgs/development/python-modules/peppercorn/default.nix b/nixpkgs/pkgs/development/python-modules/peppercorn/default.nix
index 1fb661d53e7..1fb661d53e7 100644
--- a/pkgs/development/python-modules/peppercorn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/peppercorn/default.nix
diff --git a/pkgs/development/python-modules/percol/default.nix b/nixpkgs/pkgs/development/python-modules/percol/default.nix
index 2d113049009..2d113049009 100644
--- a/pkgs/development/python-modules/percol/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/percol/default.nix
diff --git a/pkgs/development/python-modules/perfplot/default.nix b/nixpkgs/pkgs/development/python-modules/perfplot/default.nix
index 4e451e816c0..4e451e816c0 100644
--- a/pkgs/development/python-modules/perfplot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/perfplot/default.nix
diff --git a/pkgs/development/python-modules/periodictable/default.nix b/nixpkgs/pkgs/development/python-modules/periodictable/default.nix
index c88da3ff07f..c88da3ff07f 100644
--- a/pkgs/development/python-modules/periodictable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/periodictable/default.nix
diff --git a/pkgs/development/python-modules/persim/default.nix b/nixpkgs/pkgs/development/python-modules/persim/default.nix
index d5e656c7b8f..d5e656c7b8f 100644
--- a/pkgs/development/python-modules/persim/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/persim/default.nix
diff --git a/pkgs/development/python-modules/persistent/default.nix b/nixpkgs/pkgs/development/python-modules/persistent/default.nix
index 76d5441c048..76d5441c048 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/persistent/default.nix
diff --git a/pkgs/development/python-modules/persisting-theory/default.nix b/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix
index 3e729c2149e..3e729c2149e 100644
--- a/pkgs/development/python-modules/persisting-theory/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix
diff --git a/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix
index 10001d1d602..10001d1d602 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pex/default.nix
diff --git a/pkgs/development/python-modules/pexif/default.nix b/nixpkgs/pkgs/development/python-modules/pexif/default.nix
index ac1c7de8682..ac1c7de8682 100644
--- a/pkgs/development/python-modules/pexif/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pexif/default.nix
diff --git a/pkgs/development/python-modules/pexpect/default.nix b/nixpkgs/pkgs/development/python-modules/pexpect/default.nix
index 01b16d5bd63..01b16d5bd63 100644
--- a/pkgs/development/python-modules/pexpect/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pexpect/default.nix
diff --git a/pkgs/development/python-modules/pg8000/1_12.nix b/nixpkgs/pkgs/development/python-modules/pg8000/1_12.nix
index efeee5e077f..efeee5e077f 100644
--- a/pkgs/development/python-modules/pg8000/1_12.nix
+++ b/nixpkgs/pkgs/development/python-modules/pg8000/1_12.nix
diff --git a/pkgs/development/python-modules/pg8000/default.nix b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
index 33790b97c4e..33790b97c4e 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
diff --git a/pkgs/development/python-modules/pglast/default.nix b/nixpkgs/pkgs/development/python-modules/pglast/default.nix
index bc54c18ac81..bc54c18ac81 100644
--- a/pkgs/development/python-modules/pglast/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pglast/default.nix
diff --git a/pkgs/development/python-modules/pgpdump/default.nix b/nixpkgs/pkgs/development/python-modules/pgpdump/default.nix
index ea9ef0a156f..ea9ef0a156f 100644
--- a/pkgs/development/python-modules/pgpdump/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pgpdump/default.nix
diff --git a/pkgs/development/python-modules/pgpy/default.nix b/nixpkgs/pkgs/development/python-modules/pgpy/default.nix
index 50220bb3993..50220bb3993 100644
--- a/pkgs/development/python-modules/pgpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pgpy/default.nix
diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix
index f7212493e59..f7212493e59 100644
--- a/pkgs/development/python-modules/pgsanity/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix
diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix
index ccca0dd155e..ccca0dd155e 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix
diff --git a/pkgs/development/python-modules/phe/default.nix b/nixpkgs/pkgs/development/python-modules/phe/default.nix
index b016a9bd92c..b016a9bd92c 100644
--- a/pkgs/development/python-modules/phe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/phe/default.nix
diff --git a/pkgs/development/python-modules/phik/default.nix b/nixpkgs/pkgs/development/python-modules/phik/default.nix
index cef6173af3d..cef6173af3d 100644
--- a/pkgs/development/python-modules/phik/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/phik/default.nix
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix
index c0e86dd3751..c0e86dd3751 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix
diff --git a/pkgs/development/python-modules/phonopy/default.nix b/nixpkgs/pkgs/development/python-modules/phonopy/default.nix
index e67932f4a88..e67932f4a88 100644
--- a/pkgs/development/python-modules/phonopy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/phonopy/default.nix
diff --git a/pkgs/development/python-modules/phpserialize/default.nix b/nixpkgs/pkgs/development/python-modules/phpserialize/default.nix
index 0ddeb99f10b..0ddeb99f10b 100644
--- a/pkgs/development/python-modules/phpserialize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/phpserialize/default.nix
diff --git a/pkgs/development/python-modules/piccata/default.nix b/nixpkgs/pkgs/development/python-modules/piccata/default.nix
index f1cfb362a80..f1cfb362a80 100644
--- a/pkgs/development/python-modules/piccata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/piccata/default.nix
diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/nixpkgs/pkgs/development/python-modules/pickleshare/default.nix
index b46207ae33d..b46207ae33d 100644
--- a/pkgs/development/python-modules/pickleshare/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pickleshare/default.nix
diff --git a/pkgs/development/python-modules/picos/default.nix b/nixpkgs/pkgs/development/python-modules/picos/default.nix
index 57fbe099071..57fbe099071 100644
--- a/pkgs/development/python-modules/picos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/picos/default.nix
diff --git a/pkgs/development/python-modules/pid/default.nix b/nixpkgs/pkgs/development/python-modules/pid/default.nix
index 20e9390861d..20e9390861d 100644
--- a/pkgs/development/python-modules/pid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pid/default.nix
diff --git a/pkgs/development/python-modules/piep/default.nix b/nixpkgs/pkgs/development/python-modules/piep/default.nix
index 0ef44f98175..0ef44f98175 100644
--- a/pkgs/development/python-modules/piep/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/piep/default.nix
diff --git a/pkgs/development/python-modules/piexif/default.nix b/nixpkgs/pkgs/development/python-modules/piexif/default.nix
index 595e246f777..595e246f777 100644
--- a/pkgs/development/python-modules/piexif/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/piexif/default.nix
diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/nixpkgs/pkgs/development/python-modules/pika-pool/default.nix
index 5007fc78d10..5007fc78d10 100644
--- a/pkgs/development/python-modules/pika-pool/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pika-pool/default.nix
diff --git a/pkgs/development/python-modules/pika/default.nix b/nixpkgs/pkgs/development/python-modules/pika/default.nix
index b09c4a240e5..b09c4a240e5 100644
--- a/pkgs/development/python-modules/pika/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pika/default.nix
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix
index ec99edcc0c1..ec99edcc0c1 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix
diff --git a/pkgs/development/python-modules/pilkit/default.nix b/nixpkgs/pkgs/development/python-modules/pilkit/default.nix
index 0f2a2bb4a8b..0f2a2bb4a8b 100644
--- a/pkgs/development/python-modules/pilkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pilkit/default.nix
diff --git a/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix
index 7dc6ce9051b..7dc6ce9051b 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix
diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix
index 879ebe252d7..879ebe252d7 100644
--- a/pkgs/development/python-modules/pillowfight/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix
diff --git a/pkgs/development/python-modules/pims/default.nix b/nixpkgs/pkgs/development/python-modules/pims/default.nix
index 4504886d03d..4504886d03d 100644
--- a/pkgs/development/python-modules/pims/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pims/default.nix
diff --git a/pkgs/development/python-modules/pint/default.nix b/nixpkgs/pkgs/development/python-modules/pint/default.nix
index 8bbda8bd51f..8bbda8bd51f 100644
--- a/pkgs/development/python-modules/pint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pint/default.nix
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix
index 0a8d679ae5f..0a8d679ae5f 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix
diff --git a/pkgs/development/python-modules/pip/default.nix b/nixpkgs/pkgs/development/python-modules/pip/default.nix
index e1af281b9e9..e1af281b9e9 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pip/default.nix
diff --git a/pkgs/development/python-modules/pip2nix/default.nix b/nixpkgs/pkgs/development/python-modules/pip2nix/default.nix
index 8854e7d5678..8854e7d5678 100644
--- a/pkgs/development/python-modules/pip2nix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pip2nix/default.nix
diff --git a/pkgs/development/python-modules/pipdate/default.nix b/nixpkgs/pkgs/development/python-modules/pipdate/default.nix
index 93f38fb3779..93f38fb3779 100644
--- a/pkgs/development/python-modules/pipdate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pipdate/default.nix
diff --git a/pkgs/development/python-modules/pivy/default.nix b/nixpkgs/pkgs/development/python-modules/pivy/default.nix
index 4206b58032f..4206b58032f 100644
--- a/pkgs/development/python-modules/pivy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pivy/default.nix
diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix
index 791905aef0f..791905aef0f 100644
--- a/pkgs/development/python-modules/pkgconfig/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix
diff --git a/pkgs/development/python-modules/pkgconfig/executable.patch b/nixpkgs/pkgs/development/python-modules/pkgconfig/executable.patch
index 79fca7a44f1..79fca7a44f1 100644
--- a/pkgs/development/python-modules/pkgconfig/executable.patch
+++ b/nixpkgs/pkgs/development/python-modules/pkgconfig/executable.patch
diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix
index 879274a16c3..879274a16c3 100644
--- a/pkgs/development/python-modules/pkginfo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix
diff --git a/pkgs/development/python-modules/plac/default.nix b/nixpkgs/pkgs/development/python-modules/plac/default.nix
index 77bcf6cf4fc..77bcf6cf4fc 100644
--- a/pkgs/development/python-modules/plac/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plac/default.nix
diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix
index 428d88d1831..428d88d1831 100644
--- a/pkgs/development/python-modules/plaid-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix
diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix
index e794b53950e..e794b53950e 100644
--- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix
diff --git a/pkgs/development/python-modules/plaster/default.nix b/nixpkgs/pkgs/development/python-modules/plaster/default.nix
index 82aaebb1003..82aaebb1003 100644
--- a/pkgs/development/python-modules/plaster/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plaster/default.nix
diff --git a/pkgs/development/python-modules/plexapi/default.nix b/nixpkgs/pkgs/development/python-modules/plexapi/default.nix
index ed95de9ffde..ed95de9ffde 100644
--- a/pkgs/development/python-modules/plexapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plexapi/default.nix
diff --git a/pkgs/development/python-modules/plexauth/default.nix b/nixpkgs/pkgs/development/python-modules/plexauth/default.nix
index 91407a907a4..91407a907a4 100644
--- a/pkgs/development/python-modules/plexauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plexauth/default.nix
diff --git a/pkgs/development/python-modules/plexwebsocket/default.nix b/nixpkgs/pkgs/development/python-modules/plexwebsocket/default.nix
index 383a37cee3f..383a37cee3f 100644
--- a/pkgs/development/python-modules/plexwebsocket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plexwebsocket/default.nix
diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/nixpkgs/pkgs/development/python-modules/plone-testing/default.nix
index 91592596ed4..91592596ed4 100644
--- a/pkgs/development/python-modules/plone-testing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plone-testing/default.nix
diff --git a/pkgs/development/python-modules/plotly/default.nix b/nixpkgs/pkgs/development/python-modules/plotly/default.nix
index a71506c6197..a71506c6197 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plotly/default.nix
diff --git a/pkgs/development/python-modules/pluggy/default.nix b/nixpkgs/pkgs/development/python-modules/pluggy/default.nix
index ecb01f252f4..ecb01f252f4 100644
--- a/pkgs/development/python-modules/pluggy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pluggy/default.nix
diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix
index c0d44e2851e..c0d44e2851e 100644
--- a/pkgs/development/python-modules/pluginbase/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix
diff --git a/pkgs/development/python-modules/plumbum/default.nix b/nixpkgs/pkgs/development/python-modules/plumbum/default.nix
index d24b2dcafda..d24b2dcafda 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plumbum/default.nix
diff --git a/pkgs/development/python-modules/ply/default.nix b/nixpkgs/pkgs/development/python-modules/ply/default.nix
index ae55cac642f..ae55cac642f 100644
--- a/pkgs/development/python-modules/ply/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ply/default.nix
diff --git a/pkgs/development/python-modules/plyfile/default.nix b/nixpkgs/pkgs/development/python-modules/plyfile/default.nix
index 0aa891cd5ac..0aa891cd5ac 100644
--- a/pkgs/development/python-modules/plyfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plyfile/default.nix
diff --git a/pkgs/development/python-modules/plyplus/default.nix b/nixpkgs/pkgs/development/python-modules/plyplus/default.nix
index 41327c6fc48..41327c6fc48 100644
--- a/pkgs/development/python-modules/plyplus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plyplus/default.nix
diff --git a/pkgs/development/python-modules/plyvel/default.nix b/nixpkgs/pkgs/development/python-modules/plyvel/default.nix
index 26c9a8af5e6..26c9a8af5e6 100644
--- a/pkgs/development/python-modules/plyvel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plyvel/default.nix
diff --git a/pkgs/development/python-modules/pocket/default.nix b/nixpkgs/pkgs/development/python-modules/pocket/default.nix
index e351d26ca48..e351d26ca48 100644
--- a/pkgs/development/python-modules/pocket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pocket/default.nix
diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/nixpkgs/pkgs/development/python-modules/podcastparser/default.nix
index d2fc1093844..d2fc1093844 100644
--- a/pkgs/development/python-modules/podcastparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/podcastparser/default.nix
diff --git a/pkgs/development/python-modules/podcats/default.nix b/nixpkgs/pkgs/development/python-modules/podcats/default.nix
index 8af9e759c95..8af9e759c95 100644
--- a/pkgs/development/python-modules/podcats/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/podcats/default.nix
diff --git a/pkgs/development/python-modules/poetry/default.nix b/nixpkgs/pkgs/development/python-modules/poetry/default.nix
index 8f1136c4654..8f1136c4654 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/poetry/default.nix
diff --git a/pkgs/development/python-modules/poetry/glob2.nix b/nixpkgs/pkgs/development/python-modules/poetry/glob2.nix
index ca7d203492d..ca7d203492d 100644
--- a/pkgs/development/python-modules/poetry/glob2.nix
+++ b/nixpkgs/pkgs/development/python-modules/poetry/glob2.nix
diff --git a/pkgs/development/python-modules/polib/default.nix b/nixpkgs/pkgs/development/python-modules/polib/default.nix
index 2e3928b742c..2e3928b742c 100644
--- a/pkgs/development/python-modules/polib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/polib/default.nix
diff --git a/pkgs/development/python-modules/polyline/default.nix b/nixpkgs/pkgs/development/python-modules/polyline/default.nix
index 6a5df880fd6..6a5df880fd6 100644
--- a/pkgs/development/python-modules/polyline/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/polyline/default.nix
diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix
index 5f0c8cd8dad..5f0c8cd8dad 100644
--- a/pkgs/development/python-modules/pomegranate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix
diff --git a/pkgs/development/python-modules/pony/default.nix b/nixpkgs/pkgs/development/python-modules/pony/default.nix
index ebda1976e2a..ebda1976e2a 100644
--- a/pkgs/development/python-modules/pony/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pony/default.nix
diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix
index 7a893384996..7a893384996 100644
--- a/pkgs/development/python-modules/poppler-qt5/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix
diff --git a/pkgs/development/python-modules/poppler-qt5/poppler-include-dir.patch b/nixpkgs/pkgs/development/python-modules/poppler-qt5/poppler-include-dir.patch
index 7106c1d6352..7106c1d6352 100644
--- a/pkgs/development/python-modules/poppler-qt5/poppler-include-dir.patch
+++ b/nixpkgs/pkgs/development/python-modules/poppler-qt5/poppler-include-dir.patch
diff --git a/pkgs/development/python-modules/portalocker/default.nix b/nixpkgs/pkgs/development/python-modules/portalocker/default.nix
index b3b98b2b2ec..b3b98b2b2ec 100644
--- a/pkgs/development/python-modules/portalocker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/portalocker/default.nix
diff --git a/pkgs/development/python-modules/portend/black-19.10b0.patch b/nixpkgs/pkgs/development/python-modules/portend/black-19.10b0.patch
index e781139e319..e781139e319 100644
--- a/pkgs/development/python-modules/portend/black-19.10b0.patch
+++ b/nixpkgs/pkgs/development/python-modules/portend/black-19.10b0.patch
diff --git a/pkgs/development/python-modules/portend/default.nix b/nixpkgs/pkgs/development/python-modules/portend/default.nix
index 6d7d7b2563d..6d7d7b2563d 100644
--- a/pkgs/development/python-modules/portend/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/portend/default.nix
diff --git a/pkgs/development/python-modules/portpicker/default.nix b/nixpkgs/pkgs/development/python-modules/portpicker/default.nix
index 30ac0015560..30ac0015560 100644
--- a/pkgs/development/python-modules/portpicker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/portpicker/default.nix
diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/nixpkgs/pkgs/development/python-modules/posix_ipc/default.nix
index c152b1537ec..c152b1537ec 100644
--- a/pkgs/development/python-modules/posix_ipc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/posix_ipc/default.nix
diff --git a/pkgs/development/python-modules/poster3/default.nix b/nixpkgs/pkgs/development/python-modules/poster3/default.nix
index 175faa343ca..175faa343ca 100644
--- a/pkgs/development/python-modules/poster3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/poster3/default.nix
diff --git a/pkgs/development/python-modules/potr/default.nix b/nixpkgs/pkgs/development/python-modules/potr/default.nix
index adcb7110467..adcb7110467 100644
--- a/pkgs/development/python-modules/potr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/potr/default.nix
diff --git a/pkgs/development/python-modules/power/default.nix b/nixpkgs/pkgs/development/python-modules/power/default.nix
index a54bd025dc7..a54bd025dc7 100644
--- a/pkgs/development/python-modules/power/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/power/default.nix
diff --git a/pkgs/development/python-modules/powerline/default.nix b/nixpkgs/pkgs/development/python-modules/powerline/default.nix
index f8db636520f..f8db636520f 100644
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/powerline/default.nix
diff --git a/pkgs/development/python-modules/pox/default.nix b/nixpkgs/pkgs/development/python-modules/pox/default.nix
index 3ae276ca28e..3ae276ca28e 100644
--- a/pkgs/development/python-modules/pox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pox/default.nix
diff --git a/pkgs/development/python-modules/poyo/default.nix b/nixpkgs/pkgs/development/python-modules/poyo/default.nix
index b6d2eb3bda9..b6d2eb3bda9 100644
--- a/pkgs/development/python-modules/poyo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/poyo/default.nix
diff --git a/pkgs/development/python-modules/ppft/default.nix b/nixpkgs/pkgs/development/python-modules/ppft/default.nix
index 8731c997aa7..8731c997aa7 100644
--- a/pkgs/development/python-modules/ppft/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ppft/default.nix
diff --git a/pkgs/development/python-modules/pplpy/default.nix b/nixpkgs/pkgs/development/python-modules/pplpy/default.nix
index a693c8cad4c..a693c8cad4c 100644
--- a/pkgs/development/python-modules/pplpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pplpy/default.nix
diff --git a/pkgs/development/python-modules/pprintpp/default.nix b/nixpkgs/pkgs/development/python-modules/pprintpp/default.nix
index daf9d0062fb..daf9d0062fb 100644
--- a/pkgs/development/python-modules/pprintpp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pprintpp/default.nix
diff --git a/pkgs/development/python-modules/prance/default.nix b/nixpkgs/pkgs/development/python-modules/prance/default.nix
index 972520793a4..972520793a4 100644
--- a/pkgs/development/python-modules/prance/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/prance/default.nix
diff --git a/pkgs/development/python-modules/praw/6.3.nix b/nixpkgs/pkgs/development/python-modules/praw/6.3.nix
index 6c2201d1f1d..6c2201d1f1d 100644
--- a/pkgs/development/python-modules/praw/6.3.nix
+++ b/nixpkgs/pkgs/development/python-modules/praw/6.3.nix
diff --git a/pkgs/development/python-modules/praw/default.nix b/nixpkgs/pkgs/development/python-modules/praw/default.nix
index 47715b9e567..47715b9e567 100644
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/praw/default.nix
diff --git a/pkgs/development/python-modules/prawcore/default.nix b/nixpkgs/pkgs/development/python-modules/prawcore/default.nix
index f16937692c2..f16937692c2 100644
--- a/pkgs/development/python-modules/prawcore/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/prawcore/default.nix
diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix
index d3808bbb911..d3808bbb911 100644
--- a/pkgs/development/python-modules/pre-commit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix
diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix
index 4c50aaee706..4c50aaee706 100644
--- a/pkgs/development/python-modules/precis-i18n/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix
diff --git a/pkgs/development/python-modules/preggy/default.nix b/nixpkgs/pkgs/development/python-modules/preggy/default.nix
index cf2867322f7..cf2867322f7 100644
--- a/pkgs/development/python-modules/preggy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/preggy/default.nix
diff --git a/pkgs/development/python-modules/premailer/default.nix b/nixpkgs/pkgs/development/python-modules/premailer/default.nix
index df9d5801302..df9d5801302 100644
--- a/pkgs/development/python-modules/premailer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/premailer/default.nix
diff --git a/pkgs/development/python-modules/preshed/default.nix b/nixpkgs/pkgs/development/python-modules/preshed/default.nix
index 60f551bec16..60f551bec16 100644
--- a/pkgs/development/python-modules/preshed/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/preshed/default.nix
diff --git a/pkgs/development/python-modules/pretend/default.nix b/nixpkgs/pkgs/development/python-modules/pretend/default.nix
index fed0499624a..fed0499624a 100644
--- a/pkgs/development/python-modules/pretend/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pretend/default.nix
diff --git a/pkgs/development/python-modules/prettytable/default.nix b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
index be0fb7e4023..be0fb7e4023 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
diff --git a/pkgs/development/python-modules/priority/deadline.patch b/nixpkgs/pkgs/development/python-modules/priority/deadline.patch
index 174dbc2b199..174dbc2b199 100644
--- a/pkgs/development/python-modules/priority/deadline.patch
+++ b/nixpkgs/pkgs/development/python-modules/priority/deadline.patch
diff --git a/pkgs/development/python-modules/priority/default.nix b/nixpkgs/pkgs/development/python-modules/priority/default.nix
index f6e7efb78c2..f6e7efb78c2 100644
--- a/pkgs/development/python-modules/priority/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/priority/default.nix
diff --git a/pkgs/development/python-modules/prison/default.nix b/nixpkgs/pkgs/development/python-modules/prison/default.nix
index 4993976b51d..4993976b51d 100644
--- a/pkgs/development/python-modules/prison/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/prison/default.nix
diff --git a/pkgs/development/python-modules/proboscis/default.nix b/nixpkgs/pkgs/development/python-modules/proboscis/default.nix
index 3d99d9530f3..3d99d9530f3 100644
--- a/pkgs/development/python-modules/proboscis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/proboscis/default.nix
diff --git a/pkgs/development/python-modules/process-tests/default.nix b/nixpkgs/pkgs/development/python-modules/process-tests/default.nix
index 5ab27b67da4..5ab27b67da4 100644
--- a/pkgs/development/python-modules/process-tests/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/process-tests/default.nix
diff --git a/pkgs/development/python-modules/proglog/default.nix b/nixpkgs/pkgs/development/python-modules/proglog/default.nix
index d6fe22e1754..d6fe22e1754 100644
--- a/pkgs/development/python-modules/proglog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/proglog/default.nix
diff --git a/pkgs/development/python-modules/progress/default.nix b/nixpkgs/pkgs/development/python-modules/progress/default.nix
index d6c8d9125d1..d6c8d9125d1 100644
--- a/pkgs/development/python-modules/progress/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/progress/default.nix
diff --git a/pkgs/development/python-modules/progressbar/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar/default.nix
index fcd802b3487..fcd802b3487 100644
--- a/pkgs/development/python-modules/progressbar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/progressbar/default.nix
diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix
index aa6c9b70926..aa6c9b70926 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix
diff --git a/pkgs/development/python-modules/progressbar231/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar231/default.nix
index f9825961754..f9825961754 100644
--- a/pkgs/development/python-modules/progressbar231/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/progressbar231/default.nix
diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar33/default.nix
index f3b94436d45..f3b94436d45 100644
--- a/pkgs/development/python-modules/progressbar33/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/progressbar33/default.nix
diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/nixpkgs/pkgs/development/python-modules/prometheus_client/default.nix
index 17c04df814f..17c04df814f 100644
--- a/pkgs/development/python-modules/prometheus_client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/prometheus_client/default.nix
diff --git a/pkgs/development/python-modules/prompt_toolkit/1.nix b/nixpkgs/pkgs/development/python-modules/prompt_toolkit/1.nix
index c296af18de9..c296af18de9 100644
--- a/pkgs/development/python-modules/prompt_toolkit/1.nix
+++ b/nixpkgs/pkgs/development/python-modules/prompt_toolkit/1.nix
diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix
index dd3c8d16a51..dd3c8d16a51 100644
--- a/pkgs/development/python-modules/prompt_toolkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix
diff --git a/pkgs/development/python-modules/property-manager/default.nix b/nixpkgs/pkgs/development/python-modules/property-manager/default.nix
index 30c720927e7..30c720927e7 100644
--- a/pkgs/development/python-modules/property-manager/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/property-manager/default.nix
diff --git a/pkgs/development/python-modules/protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
index e414dff8aa1..e414dff8aa1 100644
--- a/pkgs/development/python-modules/protobuf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
diff --git a/pkgs/development/python-modules/prov/default.nix b/nixpkgs/pkgs/development/python-modules/prov/default.nix
index c6cb98e33b2..c6cb98e33b2 100644
--- a/pkgs/development/python-modules/prov/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/prov/default.nix
diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix
index 2568620f539..2568620f539 100644
--- a/pkgs/development/python-modules/prox-tv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix
diff --git a/pkgs/development/python-modules/prox-tv/use-openblas.patch b/nixpkgs/pkgs/development/python-modules/prox-tv/use-openblas.patch
index e96faa4d600..e96faa4d600 100644
--- a/pkgs/development/python-modules/prox-tv/use-openblas.patch
+++ b/nixpkgs/pkgs/development/python-modules/prox-tv/use-openblas.patch
diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix
index edf502171e7..edf502171e7 100644
--- a/pkgs/development/python-modules/psd-tools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix
diff --git a/pkgs/development/python-modules/psutil/default.nix b/nixpkgs/pkgs/development/python-modules/psutil/default.nix
index 388716cb700..388716cb700 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/psutil/default.nix
diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix
index 2c78a66d86a..2c78a66d86a 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix
diff --git a/pkgs/development/python-modules/ptable/default.nix b/nixpkgs/pkgs/development/python-modules/ptable/default.nix
index f1118325610..f1118325610 100644
--- a/pkgs/development/python-modules/ptable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ptable/default.nix
diff --git a/pkgs/development/python-modules/ptest/default.nix b/nixpkgs/pkgs/development/python-modules/ptest/default.nix
index bdd9fc5c47e..bdd9fc5c47e 100644
--- a/pkgs/development/python-modules/ptest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ptest/default.nix
diff --git a/pkgs/development/python-modules/ptpython/default.nix b/nixpkgs/pkgs/development/python-modules/ptpython/default.nix
index 01f9dda8f2c..01f9dda8f2c 100644
--- a/pkgs/development/python-modules/ptpython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ptpython/default.nix
diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/nixpkgs/pkgs/development/python-modules/ptyprocess/default.nix
index 5de528ccd40..5de528ccd40 100644
--- a/pkgs/development/python-modules/ptyprocess/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ptyprocess/default.nix
diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix
index 061ad685861..061ad685861 100644
--- a/pkgs/development/python-modules/publicsuffix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix
diff --git a/pkgs/development/python-modules/pudb/default.nix b/nixpkgs/pkgs/development/python-modules/pudb/default.nix
index 789a9484d73..789a9484d73 100644
--- a/pkgs/development/python-modules/pudb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pudb/default.nix
diff --git a/pkgs/development/python-modules/pulp/default.nix b/nixpkgs/pkgs/development/python-modules/pulp/default.nix
index 414c21b263c..414c21b263c 100644
--- a/pkgs/development/python-modules/pulp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pulp/default.nix
diff --git a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix b/nixpkgs/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix
index 51db9783555..51db9783555 100644
--- a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix
diff --git a/pkgs/development/python-modules/purepng/default.nix b/nixpkgs/pkgs/development/python-modules/purepng/default.nix
index c6f28067bf6..c6f28067bf6 100644
--- a/pkgs/development/python-modules/purepng/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/purepng/default.nix
diff --git a/pkgs/development/python-modules/purl/default.nix b/nixpkgs/pkgs/development/python-modules/purl/default.nix
index 43fd5b71ca6..43fd5b71ca6 100644
--- a/pkgs/development/python-modules/purl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/purl/default.nix
diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix
index 74c0f66b91e..74c0f66b91e 100644
--- a/pkgs/development/python-modules/pushbullet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix
diff --git a/pkgs/development/python-modules/pushover/default.nix b/nixpkgs/pkgs/development/python-modules/pushover/default.nix
index 3ff449037ea..3ff449037ea 100644
--- a/pkgs/development/python-modules/pushover/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pushover/default.nix
diff --git a/pkgs/development/python-modules/pvlib/default.nix b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix
index e04a2a62d49..e04a2a62d49 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix
diff --git a/pkgs/development/python-modules/pweave/default.nix b/nixpkgs/pkgs/development/python-modules/pweave/default.nix
index 13f237750de..13f237750de 100644
--- a/pkgs/development/python-modules/pweave/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pweave/default.nix
diff --git a/pkgs/development/python-modules/pwntools/default.nix b/nixpkgs/pkgs/development/python-modules/pwntools/default.nix
index 72ab1b5c405..72ab1b5c405 100644
--- a/pkgs/development/python-modules/pwntools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pwntools/default.nix
diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix
index c90f81ae28f..c90f81ae28f 100644
--- a/pkgs/development/python-modules/py-cpuinfo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix
diff --git a/pkgs/development/python-modules/py-lru-cache/default.nix b/nixpkgs/pkgs/development/python-modules/py-lru-cache/default.nix
index b1d8c4f2946..b1d8c4f2946 100644
--- a/pkgs/development/python-modules/py-lru-cache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py-lru-cache/default.nix
diff --git a/pkgs/development/python-modules/py-radix/default.nix b/nixpkgs/pkgs/development/python-modules/py-radix/default.nix
index b06de3a27a7..b06de3a27a7 100644
--- a/pkgs/development/python-modules/py-radix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py-radix/default.nix
diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix
index b0ca5c262cf..b0ca5c262cf 100644
--- a/pkgs/development/python-modules/py-vapid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix
diff --git a/pkgs/development/python-modules/py/default.nix b/nixpkgs/pkgs/development/python-modules/py/default.nix
index 7b84d72fde4..7b84d72fde4 100644
--- a/pkgs/development/python-modules/py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py/default.nix
diff --git a/pkgs/development/python-modules/py2bit/default.nix b/nixpkgs/pkgs/development/python-modules/py2bit/default.nix
index 7699ccab3a2..7699ccab3a2 100644
--- a/pkgs/development/python-modules/py2bit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py2bit/default.nix
diff --git a/pkgs/development/python-modules/py3buddy/default.nix b/nixpkgs/pkgs/development/python-modules/py3buddy/default.nix
index 459922c9baf..459922c9baf 100644
--- a/pkgs/development/python-modules/py3buddy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py3buddy/default.nix
diff --git a/pkgs/development/python-modules/py3dns/default.nix b/nixpkgs/pkgs/development/python-modules/py3dns/default.nix
index 5a28a045c3e..5a28a045c3e 100644
--- a/pkgs/development/python-modules/py3dns/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py3dns/default.nix
diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix
index fe0827c4f8f..fe0827c4f8f 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix
diff --git a/pkgs/development/python-modules/py3exiv2/setup.patch b/nixpkgs/pkgs/development/python-modules/py3exiv2/setup.patch
index 8b0619c5bc5..8b0619c5bc5 100644
--- a/pkgs/development/python-modules/py3exiv2/setup.patch
+++ b/nixpkgs/pkgs/development/python-modules/py3exiv2/setup.patch
diff --git a/pkgs/development/python-modules/py3status/default.nix b/nixpkgs/pkgs/development/python-modules/py3status/default.nix
index d2a2b50d3c0..d2a2b50d3c0 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py3status/default.nix
diff --git a/pkgs/development/python-modules/py4j/default.nix b/nixpkgs/pkgs/development/python-modules/py4j/default.nix
index a442dfa097b..a442dfa097b 100644
--- a/pkgs/development/python-modules/py4j/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py4j/default.nix
diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix
index 3f5d3a5bd8c..3f5d3a5bd8c 100644
--- a/pkgs/development/python-modules/pyGithub/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix
diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index cb91196fc7e..cb91196fc7e 100644
--- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix
index 0c2d5eb5c02..0c2d5eb5c02 100644
--- a/pkgs/development/python-modules/py_scrypt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix
diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix
index 16b98320e8e..16b98320e8e 100644
--- a/pkgs/development/python-modules/py_stringmatching/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix
diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix
index 29cdfbc6599..29cdfbc6599 100644
--- a/pkgs/development/python-modules/pyacoustid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix
diff --git a/pkgs/development/python-modules/pyaes/default.nix b/nixpkgs/pkgs/development/python-modules/pyaes/default.nix
index 5ca837cdee4..5ca837cdee4 100644
--- a/pkgs/development/python-modules/pyaes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyaes/default.nix
diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix
index 010c2805d2b..010c2805d2b 100644
--- a/pkgs/development/python-modules/pyairvisual/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix
diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/nixpkgs/pkgs/development/python-modules/pyalgotrade/default.nix
index 7602caf24cf..7602caf24cf 100644
--- a/pkgs/development/python-modules/pyalgotrade/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyalgotrade/default.nix
diff --git a/pkgs/development/python-modules/pyamf/default.nix b/nixpkgs/pkgs/development/python-modules/pyamf/default.nix
index 5ac6ef82964..5ac6ef82964 100644
--- a/pkgs/development/python-modules/pyamf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyamf/default.nix
diff --git a/pkgs/development/python-modules/pyamg/default.nix b/nixpkgs/pkgs/development/python-modules/pyamg/default.nix
index b299e44f3e3..b299e44f3e3 100644
--- a/pkgs/development/python-modules/pyamg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyamg/default.nix
diff --git a/pkgs/development/python-modules/pyaml/default.nix b/nixpkgs/pkgs/development/python-modules/pyaml/default.nix
index 6aeb37cfff6..6aeb37cfff6 100644
--- a/pkgs/development/python-modules/pyaml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyaml/default.nix
diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix
index 06dcdf83bcc..06dcdf83bcc 100644
--- a/pkgs/development/python-modules/pyannotate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix
index 5590337951b..5590337951b 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix
diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix
index 4ed93f63551..4ed93f63551 100644
--- a/pkgs/development/python-modules/pyasn1-modules/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix
diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix
index e1d61866f90..e1d61866f90 100644
--- a/pkgs/development/python-modules/pyasn1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix
diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix
index 5036307982b..5036307982b 100644
--- a/pkgs/development/python-modules/pyatmo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix
diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix
index 693477d20c0..693477d20c0 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix
diff --git a/pkgs/development/python-modules/pyatv/default.nix b/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
index ae2780e1dc3..ae2780e1dc3 100644
--- a/pkgs/development/python-modules/pyatv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix
index 62fec908a4d..62fec908a4d 100644
--- a/pkgs/development/python-modules/pyaudio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix
diff --git a/pkgs/development/python-modules/pyavm/default.nix b/nixpkgs/pkgs/development/python-modules/pyavm/default.nix
index 2279f792818..2279f792818 100644
--- a/pkgs/development/python-modules/pyavm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyavm/default.nix
diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix
index 85140d3db49..85140d3db49 100644
--- a/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix
diff --git a/pkgs/development/python-modules/pybase64/default.nix b/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
index 6c32de593c1..6c32de593c1 100644
--- a/pkgs/development/python-modules/pybase64/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
diff --git a/pkgs/development/python-modules/pybfd/default.nix b/nixpkgs/pkgs/development/python-modules/pybfd/default.nix
index 29ae5ed3c5c..29ae5ed3c5c 100644
--- a/pkgs/development/python-modules/pybfd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybfd/default.nix
diff --git a/pkgs/development/python-modules/pybids/default.nix b/nixpkgs/pkgs/development/python-modules/pybids/default.nix
index dc9cbefe0b5..dc9cbefe0b5 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybids/default.nix
diff --git a/pkgs/development/python-modules/pybigwig/default.nix b/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix
index be54a38cd99..be54a38cd99 100644
--- a/pkgs/development/python-modules/pybigwig/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix
diff --git a/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch b/nixpkgs/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch
index d5b669dab7a..d5b669dab7a 100644
--- a/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch
+++ b/nixpkgs/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch
diff --git a/pkgs/development/python-modules/pybind11/default.nix b/nixpkgs/pkgs/development/python-modules/pybind11/default.nix
index a8c66a49fb8..a8c66a49fb8 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybind11/default.nix
diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix
index 79c015576a5..79c015576a5 100644
--- a/pkgs/development/python-modules/pybindgen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix
diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/nixpkgs/pkgs/development/python-modules/pyblake2/default.nix
index e106ee3f3f1..e106ee3f3f1 100644
--- a/pkgs/development/python-modules/pyblake2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyblake2/default.nix
diff --git a/pkgs/development/python-modules/pyblock/default.nix b/nixpkgs/pkgs/development/python-modules/pyblock/default.nix
index 4dcc3434025..4dcc3434025 100644
--- a/pkgs/development/python-modules/pyblock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyblock/default.nix
diff --git a/pkgs/development/python-modules/pyblosxom/default.nix b/nixpkgs/pkgs/development/python-modules/pyblosxom/default.nix
index dfb3e94ba27..dfb3e94ba27 100644
--- a/pkgs/development/python-modules/pyblosxom/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyblosxom/default.nix
diff --git a/pkgs/development/python-modules/pybluez/default.nix b/nixpkgs/pkgs/development/python-modules/pybluez/default.nix
index 47c70758e4c..47c70758e4c 100644
--- a/pkgs/development/python-modules/pybluez/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybluez/default.nix
diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix
index e7ad1ef2d35..e7ad1ef2d35 100644
--- a/pkgs/development/python-modules/pybotvac/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix
diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix
index 946fb1a054f..946fb1a054f 100644
--- a/pkgs/development/python-modules/pybrowserid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix
diff --git a/pkgs/development/python-modules/pybtex-docutils/default.nix b/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix
index 878654cef16..878654cef16 100644
--- a/pkgs/development/python-modules/pybtex-docutils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix
diff --git a/pkgs/development/python-modules/pybtex/default.nix b/nixpkgs/pkgs/development/python-modules/pybtex/default.nix
index dd258f42718..dd258f42718 100644
--- a/pkgs/development/python-modules/pybtex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybtex/default.nix
diff --git a/pkgs/development/python-modules/pybullet/default.nix b/nixpkgs/pkgs/development/python-modules/pybullet/default.nix
index d7b46f07749..d7b46f07749 100644
--- a/pkgs/development/python-modules/pybullet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pybullet/default.nix
diff --git a/pkgs/development/python-modules/pybullet/static-libs.patch b/nixpkgs/pkgs/development/python-modules/pybullet/static-libs.patch
index 08a68b81486..08a68b81486 100644
--- a/pkgs/development/python-modules/pybullet/static-libs.patch
+++ b/nixpkgs/pkgs/development/python-modules/pybullet/static-libs.patch
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/nixpkgs/pkgs/development/python-modules/pycairo/default.nix
index c38366894dc..c38366894dc 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycairo/default.nix
diff --git a/pkgs/development/python-modules/pycallgraph/default.nix b/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix
index 9a6a3f4be2e..9a6a3f4be2e 100644
--- a/pkgs/development/python-modules/pycallgraph/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix
diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix
index b3e31a9bc78..b3e31a9bc78 100644
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix
diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix
index 629fdd0114d..629fdd0114d 100644
--- a/pkgs/development/python-modules/pycapnp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix
diff --git a/pkgs/development/python-modules/pycaption/default.nix b/nixpkgs/pkgs/development/python-modules/pycaption/default.nix
index a9864a0f095..a9864a0f095 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycaption/default.nix
diff --git a/pkgs/development/python-modules/pycarddav/default.nix b/nixpkgs/pkgs/development/python-modules/pycarddav/default.nix
index c5c6182e4e0..c5c6182e4e0 100644
--- a/pkgs/development/python-modules/pycarddav/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycarddav/default.nix
diff --git a/pkgs/development/python-modules/pycares/default.nix b/nixpkgs/pkgs/development/python-modules/pycares/default.nix
index 22f519c0486..22f519c0486 100644
--- a/pkgs/development/python-modules/pycares/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycares/default.nix
diff --git a/pkgs/development/python-modules/pycassa/default.nix b/nixpkgs/pkgs/development/python-modules/pycassa/default.nix
index d5b6805c2bb..d5b6805c2bb 100644
--- a/pkgs/development/python-modules/pycassa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycassa/default.nix
diff --git a/pkgs/development/python-modules/pycategories/default.nix b/nixpkgs/pkgs/development/python-modules/pycategories/default.nix
index 55f30f9e55a..55f30f9e55a 100644
--- a/pkgs/development/python-modules/pycategories/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycategories/default.nix
diff --git a/pkgs/development/python-modules/pycategories/infix.nix b/nixpkgs/pkgs/development/python-modules/pycategories/infix.nix
index f3b4d254818..f3b4d254818 100644
--- a/pkgs/development/python-modules/pycategories/infix.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycategories/infix.nix
diff --git a/pkgs/development/python-modules/pycdio/default.nix b/nixpkgs/pkgs/development/python-modules/pycdio/default.nix
index 5b1d774c169..5b1d774c169 100644
--- a/pkgs/development/python-modules/pycdio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycdio/default.nix
diff --git a/pkgs/development/python-modules/pychart/default.nix b/nixpkgs/pkgs/development/python-modules/pychart/default.nix
index 259c87347d7..259c87347d7 100644
--- a/pkgs/development/python-modules/pychart/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pychart/default.nix
diff --git a/pkgs/development/python-modules/pychef/default.nix b/nixpkgs/pkgs/development/python-modules/pychef/default.nix
index 51ce6241bb9..51ce6241bb9 100644
--- a/pkgs/development/python-modules/pychef/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pychef/default.nix
diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix
index e1c5df1c31c..e1c5df1c31c 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix
diff --git a/pkgs/development/python-modules/pycm/default.nix b/nixpkgs/pkgs/development/python-modules/pycm/default.nix
index e8daa382076..e8daa382076 100644
--- a/pkgs/development/python-modules/pycm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycm/default.nix
diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/nixpkgs/pkgs/development/python-modules/pycodestyle/default.nix
index acaf78cc4d2..acaf78cc4d2 100644
--- a/pkgs/development/python-modules/pycodestyle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycodestyle/default.nix
diff --git a/pkgs/development/python-modules/pycollada/default.nix b/nixpkgs/pkgs/development/python-modules/pycollada/default.nix
index fd3eb1b4c18..fd3eb1b4c18 100644
--- a/pkgs/development/python-modules/pycollada/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycollada/default.nix
diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix
index 7594c7c1e57..7594c7c1e57 100644
--- a/pkgs/development/python-modules/pycontracts/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix
diff --git a/pkgs/development/python-modules/pycosat/default.nix b/nixpkgs/pkgs/development/python-modules/pycosat/default.nix
index ad49e38d065..ad49e38d065 100644
--- a/pkgs/development/python-modules/pycosat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycosat/default.nix
diff --git a/pkgs/development/python-modules/pycountry/default.nix b/nixpkgs/pkgs/development/python-modules/pycountry/default.nix
index aec477d36a0..aec477d36a0 100644
--- a/pkgs/development/python-modules/pycountry/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycountry/default.nix
diff --git a/pkgs/development/python-modules/pycparser/default.nix b/nixpkgs/pkgs/development/python-modules/pycparser/default.nix
index 4845c625652..4845c625652 100644
--- a/pkgs/development/python-modules/pycparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycparser/default.nix
diff --git a/pkgs/development/python-modules/pycrc/default.nix b/nixpkgs/pkgs/development/python-modules/pycrc/default.nix
index e9ea8646b41..e9ea8646b41 100644
--- a/pkgs/development/python-modules/pycrc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycrc/default.nix
diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/nixpkgs/pkgs/development/python-modules/pycrypto/default.nix
index e7858888d36..e7858888d36 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycrypto/default.nix
diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix
index 17bb7c9dcd0..17bb7c9dcd0 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix
diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix
index bf6ac65fc7f..bf6ac65fc7f 100644
--- a/pkgs/development/python-modules/pycryptodomex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix
diff --git a/pkgs/development/python-modules/pycryptopp/default.nix b/nixpkgs/pkgs/development/python-modules/pycryptopp/default.nix
index 25ac99082c0..25ac99082c0 100644
--- a/pkgs/development/python-modules/pycryptopp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycryptopp/default.nix
diff --git a/pkgs/development/python-modules/pyct/default.nix b/nixpkgs/pkgs/development/python-modules/pyct/default.nix
index fc61d689329..fc61d689329 100644
--- a/pkgs/development/python-modules/pyct/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyct/default.nix
diff --git a/pkgs/development/python-modules/pycuda/compyte.nix b/nixpkgs/pkgs/development/python-modules/pycuda/compyte.nix
index cfa685c1ac9..cfa685c1ac9 100644
--- a/pkgs/development/python-modules/pycuda/compyte.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycuda/compyte.nix
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/nixpkgs/pkgs/development/python-modules/pycuda/default.nix
index 225c605a57f..225c605a57f 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycuda/default.nix
diff --git a/pkgs/development/python-modules/pycups/default.nix b/nixpkgs/pkgs/development/python-modules/pycups/default.nix
index 28dff352e38..28dff352e38 100644
--- a/pkgs/development/python-modules/pycups/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycups/default.nix
diff --git a/pkgs/development/python-modules/pycurl/default.nix b/nixpkgs/pkgs/development/python-modules/pycurl/default.nix
index 36e5b96319e..36e5b96319e 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycurl/default.nix
diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/nixpkgs/pkgs/development/python-modules/pycurl2/default.nix
index 478f4451cf7..478f4451cf7 100644
--- a/pkgs/development/python-modules/pycurl2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycurl2/default.nix
diff --git a/pkgs/development/python-modules/pydantic/default.nix b/nixpkgs/pkgs/development/python-modules/pydantic/default.nix
index 088c6636fdc..088c6636fdc 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydantic/default.nix
diff --git a/pkgs/development/python-modules/pydbus/default.nix b/nixpkgs/pkgs/development/python-modules/pydbus/default.nix
index 27b2d237cfc..27b2d237cfc 100644
--- a/pkgs/development/python-modules/pydbus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydbus/default.nix
diff --git a/pkgs/development/python-modules/pydenticon/default.nix b/nixpkgs/pkgs/development/python-modules/pydenticon/default.nix
index 9b650181e8c..9b650181e8c 100644
--- a/pkgs/development/python-modules/pydenticon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydenticon/default.nix
diff --git a/pkgs/development/python-modules/pydicom/default.nix b/nixpkgs/pkgs/development/python-modules/pydicom/default.nix
index d281193be23..d281193be23 100644
--- a/pkgs/development/python-modules/pydicom/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydicom/default.nix
diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix
index 68772cab306..68772cab306 100644
--- a/pkgs/development/python-modules/pydispatcher/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix
diff --git a/pkgs/development/python-modules/pydns/default.nix b/nixpkgs/pkgs/development/python-modules/pydns/default.nix
index 48bc3c3fa00..48bc3c3fa00 100644
--- a/pkgs/development/python-modules/pydns/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydns/default.nix
diff --git a/pkgs/development/python-modules/pydocstyle/2.nix b/nixpkgs/pkgs/development/python-modules/pydocstyle/2.nix
index a2f2daa2fe9..a2f2daa2fe9 100644
--- a/pkgs/development/python-modules/pydocstyle/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydocstyle/2.nix
diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix
index 39d9f9f9a23..39d9f9f9a23 100644
--- a/pkgs/development/python-modules/pydocstyle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix
diff --git a/pkgs/development/python-modules/pydocumentdb/default.nix b/nixpkgs/pkgs/development/python-modules/pydocumentdb/default.nix
index 659997d7158..659997d7158 100644
--- a/pkgs/development/python-modules/pydocumentdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydocumentdb/default.nix
diff --git a/pkgs/development/python-modules/pydot/default.nix b/nixpkgs/pkgs/development/python-modules/pydot/default.nix
index 021043d9e9d..021043d9e9d 100644
--- a/pkgs/development/python-modules/pydot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydot/default.nix
diff --git a/pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch b/nixpkgs/pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch
index e862f1e7c2c..e862f1e7c2c 100644
--- a/pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch
diff --git a/pkgs/development/python-modules/pydot_ng/default.nix b/nixpkgs/pkgs/development/python-modules/pydot_ng/default.nix
index d48ddaccd58..d48ddaccd58 100644
--- a/pkgs/development/python-modules/pydot_ng/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydot_ng/default.nix
diff --git a/pkgs/development/python-modules/pydotplus/default.nix b/nixpkgs/pkgs/development/python-modules/pydotplus/default.nix
index 03b594a131a..03b594a131a 100644
--- a/pkgs/development/python-modules/pydotplus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydotplus/default.nix
diff --git a/pkgs/development/python-modules/pydrive/default.nix b/nixpkgs/pkgs/development/python-modules/pydrive/default.nix
index aa0515323e2..aa0515323e2 100644
--- a/pkgs/development/python-modules/pydrive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydrive/default.nix
diff --git a/pkgs/development/python-modules/pydub/default.nix b/nixpkgs/pkgs/development/python-modules/pydub/default.nix
index 669d798312b..669d798312b 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydub/default.nix
diff --git a/pkgs/development/python-modules/pydy/default.nix b/nixpkgs/pkgs/development/python-modules/pydy/default.nix
index 8bdb2affc53..8bdb2affc53 100644
--- a/pkgs/development/python-modules/pydy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydy/default.nix
diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/nixpkgs/pkgs/development/python-modules/pyechonest/default.nix
index 33e8d9c3fa9..33e8d9c3fa9 100644
--- a/pkgs/development/python-modules/pyechonest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyechonest/default.nix
diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix
index c619df297fe..c619df297fe 100644
--- a/pkgs/development/python-modules/pyelftools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix
diff --git a/pkgs/development/python-modules/pyemd/default.nix b/nixpkgs/pkgs/development/python-modules/pyemd/default.nix
index 28c74487c96..28c74487c96 100644
--- a/pkgs/development/python-modules/pyemd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyemd/default.nix
diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix
index f144cf55552..f144cf55552 100644
--- a/pkgs/development/python-modules/pyenchant/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix
diff --git a/pkgs/development/python-modules/pyepsg/default.nix b/nixpkgs/pkgs/development/python-modules/pyepsg/default.nix
index 4822e528dee..4822e528dee 100644
--- a/pkgs/development/python-modules/pyepsg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyepsg/default.nix
diff --git a/pkgs/development/python-modules/pyexcelerator/default.nix b/nixpkgs/pkgs/development/python-modules/pyexcelerator/default.nix
index 2dfb5831f7f..2dfb5831f7f 100644
--- a/pkgs/development/python-modules/pyexcelerator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyexcelerator/default.nix
diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/nixpkgs/pkgs/development/python-modules/pyexiv2/default.nix
index cca8b552de1..cca8b552de1 100644
--- a/pkgs/development/python-modules/pyexiv2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyexiv2/default.nix
diff --git a/pkgs/development/python-modules/pyext/default.nix b/nixpkgs/pkgs/development/python-modules/pyext/default.nix
index 2e4c639465b..2e4c639465b 100644
--- a/pkgs/development/python-modules/pyext/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyext/default.nix
diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix
index 7188ac8ce4a..7188ac8ce4a 100644
--- a/pkgs/development/python-modules/pyfaidx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix
diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix
index 6bc2be39fd3..6bc2be39fd3 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix
diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix
index b9e15d376b5..b9e15d376b5 100644
--- a/pkgs/development/python-modules/pyfantom/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix
diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix
index bed1dffa5c7..bed1dffa5c7 100644
--- a/pkgs/development/python-modules/pyfftw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix
diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/nixpkgs/pkgs/development/python-modules/pyfiglet/default.nix
index d8256e9632a..d8256e9632a 100644
--- a/pkgs/development/python-modules/pyfiglet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfiglet/default.nix
diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix
index 036872e23e3..036872e23e3 100644
--- a/pkgs/development/python-modules/pyflakes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix
diff --git a/pkgs/development/python-modules/pyfma/default.nix b/nixpkgs/pkgs/development/python-modules/pyfma/default.nix
index 6c7038b9488..6c7038b9488 100644
--- a/pkgs/development/python-modules/pyfma/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfma/default.nix
diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/nixpkgs/pkgs/development/python-modules/pyfribidi/default.nix
index 50a0bfa1e22..50a0bfa1e22 100644
--- a/pkgs/development/python-modules/pyfribidi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfribidi/default.nix
diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix
index 76c7ea9b5bc..76c7ea9b5bc 100644
--- a/pkgs/development/python-modules/pyftdi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix
diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix
index 90fd7903808..90fd7903808 100644
--- a/pkgs/development/python-modules/pyftgl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix
diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix
index 9fc654292ab..9fc654292ab 100644
--- a/pkgs/development/python-modules/pyftpdlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix
diff --git a/pkgs/development/python-modules/pyfttt/default.nix b/nixpkgs/pkgs/development/python-modules/pyfttt/default.nix
index 44d6679e47c..44d6679e47c 100644
--- a/pkgs/development/python-modules/pyfttt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfttt/default.nix
diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix
index 4bde8e9997a..4bde8e9997a 100644
--- a/pkgs/development/python-modules/pyfxa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix
diff --git a/pkgs/development/python-modules/pygal/default.nix b/nixpkgs/pkgs/development/python-modules/pygal/default.nix
index a3d6f6e4c21..a3d6f6e4c21 100644
--- a/pkgs/development/python-modules/pygal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygal/default.nix
diff --git a/pkgs/development/python-modules/pygame/default.nix b/nixpkgs/pkgs/development/python-modules/pygame/default.nix
index b9c45ce8967..b9c45ce8967 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygame/default.nix
diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix
index ab46a5670ee..ab46a5670ee 100644
--- a/pkgs/development/python-modules/pygame_sdl2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix
diff --git a/pkgs/development/python-modules/pygbm/default.nix b/nixpkgs/pkgs/development/python-modules/pygbm/default.nix
index 702dbf70ee9..702dbf70ee9 100644
--- a/pkgs/development/python-modules/pygbm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygbm/default.nix
diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix
index d4c46d6b835..d4c46d6b835 100644
--- a/pkgs/development/python-modules/pygccxml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix
diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix
index c294b02c31d..c294b02c31d 100644
--- a/pkgs/development/python-modules/pygdbmi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix
diff --git a/pkgs/development/python-modules/pygeoip/default.nix b/nixpkgs/pkgs/development/python-modules/pygeoip/default.nix
index 0b0e8f55fa7..0b0e8f55fa7 100644
--- a/pkgs/development/python-modules/pygeoip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygeoip/default.nix
diff --git a/pkgs/development/python-modules/pygit2/default.nix b/nixpkgs/pkgs/development/python-modules/pygit2/default.nix
index 313a3e5ab18..313a3e5ab18 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygit2/default.nix
diff --git a/pkgs/development/python-modules/pyglet/default.nix b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix
index e6be92c0efb..e6be92c0efb 100644
--- a/pkgs/development/python-modules/pyglet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix
diff --git a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/nixpkgs/pkgs/development/python-modules/pygments-markdown-lexer/default.nix
index 65688cf17bb..65688cf17bb 100644
--- a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygments-markdown-lexer/default.nix
diff --git a/pkgs/development/python-modules/pygmo/default.nix b/nixpkgs/pkgs/development/python-modules/pygmo/default.nix
index c7dfdef4be4..c7dfdef4be4 100644
--- a/pkgs/development/python-modules/pygmo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygmo/default.nix
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/nixpkgs/pkgs/development/python-modules/pygobject/3.nix
index 8372adc9bdb..8372adc9bdb 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygobject/3.nix
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/nixpkgs/pkgs/development/python-modules/pygobject/default.nix
index a7b25e57a33..a7b25e57a33 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygobject/default.nix
diff --git a/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch b/nixpkgs/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch
index 7fef05262f4..7fef05262f4 100644
--- a/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch
+++ b/nixpkgs/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch
diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix
index 4322e76e3e7..4322e76e3e7 100644
--- a/pkgs/development/python-modules/pygpgme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix
diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
index 706284b56db..706284b56db 100644
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
diff --git a/pkgs/development/python-modules/pygraphviz/graphviz-path.patch b/nixpkgs/pkgs/development/python-modules/pygraphviz/graphviz-path.patch
index e4ff925009d..e4ff925009d 100644
--- a/pkgs/development/python-modules/pygraphviz/graphviz-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/pygraphviz/graphviz-path.patch
diff --git a/pkgs/development/python-modules/pygreat/default.nix b/nixpkgs/pkgs/development/python-modules/pygreat/default.nix
index 103e215f047..103e215f047 100644
--- a/pkgs/development/python-modules/pygreat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygreat/default.nix
diff --git a/pkgs/development/python-modules/pygtail/default.nix b/nixpkgs/pkgs/development/python-modules/pygtail/default.nix
index 503dad717c2..503dad717c2 100644
--- a/pkgs/development/python-modules/pygtail/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygtail/default.nix
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/nixpkgs/pkgs/development/python-modules/pygtk/default.nix
index 4779f76aed4..4779f76aed4 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygtk/default.nix
diff --git a/pkgs/development/python-modules/pygtksourceview/codegendir.patch b/nixpkgs/pkgs/development/python-modules/pygtksourceview/codegendir.patch
index 783c5e2d467..783c5e2d467 100644
--- a/pkgs/development/python-modules/pygtksourceview/codegendir.patch
+++ b/nixpkgs/pkgs/development/python-modules/pygtksourceview/codegendir.patch
diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/nixpkgs/pkgs/development/python-modules/pygtksourceview/default.nix
index 947b5733a7e..947b5733a7e 100644
--- a/pkgs/development/python-modules/pygtksourceview/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygtksourceview/default.nix
diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix
index 18540aca50e..18540aca50e 100644
--- a/pkgs/development/python-modules/pyhamcrest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix
diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix
index 73de6ba0839..73de6ba0839 100644
--- a/pkgs/development/python-modules/pyhaversion/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix
diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/nixpkgs/pkgs/development/python-modules/pyhcl/default.nix
index e409282980d..e409282980d 100644
--- a/pkgs/development/python-modules/pyhcl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyhcl/default.nix
diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix
index 26a91a313ee..26a91a313ee 100644
--- a/pkgs/development/python-modules/pyhepmc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix
diff --git a/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch b/nixpkgs/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch
index 5c6e56566a3..5c6e56566a3 100644
--- a/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch
+++ b/nixpkgs/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch
diff --git a/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch b/nixpkgs/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch
index 85e26a1a160..85e26a1a160 100644
--- a/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch
+++ b/nixpkgs/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch
diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix
index f0e50895d83..f0e50895d83 100644
--- a/pkgs/development/python-modules/pyhocon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix
diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix
index 33df2985cfc..33df2985cfc 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix
diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix
index 50dd1a09890..50dd1a09890 100644
--- a/pkgs/development/python-modules/pyicloud/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix
diff --git a/pkgs/development/python-modules/pyicu/default.nix b/nixpkgs/pkgs/development/python-modules/pyicu/default.nix
index a9523826b11..a9523826b11 100644
--- a/pkgs/development/python-modules/pyicu/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyicu/default.nix
diff --git a/pkgs/development/python-modules/pyinotify/default.nix b/nixpkgs/pkgs/development/python-modules/pyinotify/default.nix
index 0e070d8a89d..0e070d8a89d 100644
--- a/pkgs/development/python-modules/pyinotify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyinotify/default.nix
diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix
index 90d13ae0787..90d13ae0787 100644
--- a/pkgs/development/python-modules/pyinputevent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix
diff --git a/pkgs/development/python-modules/pyinsane2/default.nix b/nixpkgs/pkgs/development/python-modules/pyinsane2/default.nix
index 8f96ebe915a..8f96ebe915a 100644
--- a/pkgs/development/python-modules/pyinsane2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyinsane2/default.nix
diff --git a/pkgs/development/python-modules/pyjade/default.nix b/nixpkgs/pkgs/development/python-modules/pyjade/default.nix
index ad6742f5deb..ad6742f5deb 100644
--- a/pkgs/development/python-modules/pyjade/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyjade/default.nix
diff --git a/pkgs/development/python-modules/pyjet/default.nix b/nixpkgs/pkgs/development/python-modules/pyjet/default.nix
index 4a20b5142b6..4a20b5142b6 100644
--- a/pkgs/development/python-modules/pyjet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyjet/default.nix
diff --git a/pkgs/development/python-modules/pyjks/default.nix b/nixpkgs/pkgs/development/python-modules/pyjks/default.nix
index d9e2074fb28..d9e2074fb28 100644
--- a/pkgs/development/python-modules/pyjks/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyjks/default.nix
diff --git a/pkgs/development/python-modules/pyjson5/default.nix b/nixpkgs/pkgs/development/python-modules/pyjson5/default.nix
index 232bafd3ba7..232bafd3ba7 100644
--- a/pkgs/development/python-modules/pyjson5/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyjson5/default.nix
diff --git a/pkgs/development/python-modules/pyjwkest/default.nix b/nixpkgs/pkgs/development/python-modules/pyjwkest/default.nix
index 3c5b96af2ad..3c5b96af2ad 100644
--- a/pkgs/development/python-modules/pyjwkest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyjwkest/default.nix
diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix
index e91fbe2b3e4..e91fbe2b3e4 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix
diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix
index 2dd014821e6..2dd014821e6 100644
--- a/pkgs/development/python-modules/pykdtree/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix
diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix
index a8fff00ae15..a8fff00ae15 100644
--- a/pkgs/development/python-modules/pykeepass/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix
diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix
index 07db7e7002b..07db7e7002b 100644
--- a/pkgs/development/python-modules/pykerberos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix
diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix
index 6461f0391ca..6461f0391ca 100644
--- a/pkgs/development/python-modules/pykickstart/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix
diff --git a/pkgs/development/python-modules/pykka/default.nix b/nixpkgs/pkgs/development/python-modules/pykka/default.nix
index c07f1b46cbe..c07f1b46cbe 100644
--- a/pkgs/development/python-modules/pykka/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pykka/default.nix
diff --git a/pkgs/development/python-modules/pylama/default.nix b/nixpkgs/pkgs/development/python-modules/pylama/default.nix
index 3073f55ca3a..3073f55ca3a 100644
--- a/pkgs/development/python-modules/pylama/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylama/default.nix
diff --git a/pkgs/development/python-modules/pylast/default.nix b/nixpkgs/pkgs/development/python-modules/pylast/default.nix
index 6d58fbfb21a..6d58fbfb21a 100644
--- a/pkgs/development/python-modules/pylast/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylast/default.nix
diff --git a/pkgs/development/python-modules/pylev/default.nix b/nixpkgs/pkgs/development/python-modules/pylev/default.nix
index f198d214172..f198d214172 100644
--- a/pkgs/development/python-modules/pylev/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylev/default.nix
diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/nixpkgs/pkgs/development/python-modules/pylibacl/default.nix
index 08d598c72db..08d598c72db 100644
--- a/pkgs/development/python-modules/pylibacl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylibacl/default.nix
diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/nixpkgs/pkgs/development/python-modules/pylibconfig2/default.nix
index 6cea70c5708..6cea70c5708 100644
--- a/pkgs/development/python-modules/pylibconfig2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylibconfig2/default.nix
diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/nixpkgs/pkgs/development/python-modules/pylibgen/default.nix
index 559b75eec41..559b75eec41 100644
--- a/pkgs/development/python-modules/pylibgen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylibgen/default.nix
diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix
index 3c637ffced3..3c637ffced3 100644
--- a/pkgs/development/python-modules/pyliblo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix
diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix
index 053d73af1a3..053d73af1a3 100644
--- a/pkgs/development/python-modules/pylibmc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix
diff --git a/pkgs/development/python-modules/pylint-celery/default.nix b/nixpkgs/pkgs/development/python-modules/pylint-celery/default.nix
index 6bc7a93049e..6bc7a93049e 100644
--- a/pkgs/development/python-modules/pylint-celery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylint-celery/default.nix
diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix
index 04010098807..04010098807 100644
--- a/pkgs/development/python-modules/pylint-django/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix
diff --git a/pkgs/development/python-modules/pylint-flask/default.nix b/nixpkgs/pkgs/development/python-modules/pylint-flask/default.nix
index 5077d07a936..5077d07a936 100644
--- a/pkgs/development/python-modules/pylint-flask/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylint-flask/default.nix
diff --git a/pkgs/development/python-modules/pylint-plugin-utils/default.nix b/nixpkgs/pkgs/development/python-modules/pylint-plugin-utils/default.nix
index 2d48ef7fea7..2d48ef7fea7 100644
--- a/pkgs/development/python-modules/pylint-plugin-utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylint-plugin-utils/default.nix
diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix
index b1253c65b33..b1253c65b33 100644
--- a/pkgs/development/python-modules/pylint/1.9.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix
diff --git a/pkgs/development/python-modules/pylint/default.nix b/nixpkgs/pkgs/development/python-modules/pylint/default.nix
index 95f86e31c04..95f86e31c04 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylint/default.nix
diff --git a/pkgs/development/python-modules/pylru/default.nix b/nixpkgs/pkgs/development/python-modules/pylru/default.nix
index 8ca565834d4..8ca565834d4 100644
--- a/pkgs/development/python-modules/pylru/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylru/default.nix
diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix
index bd27de6eba7..bd27de6eba7 100644
--- a/pkgs/development/python-modules/pyls-black/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix
diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/nixpkgs/pkgs/development/python-modules/pyls-isort/default.nix
index fa94441e200..fa94441e200 100644
--- a/pkgs/development/python-modules/pyls-isort/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyls-isort/default.nix
diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix
index 414c2cccbea..414c2cccbea 100644
--- a/pkgs/development/python-modules/pyls-mypy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix
diff --git a/pkgs/development/python-modules/pylti/default.nix b/nixpkgs/pkgs/development/python-modules/pylti/default.nix
index 752755700b2..752755700b2 100644
--- a/pkgs/development/python-modules/pylti/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylti/default.nix
diff --git a/pkgs/development/python-modules/pymacaroons/default.nix b/nixpkgs/pkgs/development/python-modules/pymacaroons/default.nix
index 96023c01e1e..96023c01e1e 100644
--- a/pkgs/development/python-modules/pymacaroons/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymacaroons/default.nix
diff --git a/pkgs/development/python-modules/pymaging/default.nix b/nixpkgs/pkgs/development/python-modules/pymaging/default.nix
index 81100a8e214..81100a8e214 100644
--- a/pkgs/development/python-modules/pymaging/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymaging/default.nix
diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix
index 61239f1cbe3..61239f1cbe3 100644
--- a/pkgs/development/python-modules/pymaging_png/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix
diff --git a/pkgs/development/python-modules/pymatgen-lammps/default.nix b/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix
index c38f56885d1..c38f56885d1 100644
--- a/pkgs/development/python-modules/pymatgen-lammps/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
index 4f99d0021e0..4f99d0021e0 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix
index b909886ddb5..b909886ddb5 100644
--- a/pkgs/development/python-modules/pymavlink/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix
diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix
index 2411abc5ac4..2411abc5ac4 100644
--- a/pkgs/development/python-modules/pymbolic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix
diff --git a/pkgs/development/python-modules/pymc3/default.nix b/nixpkgs/pkgs/development/python-modules/pymc3/default.nix
index 39472bb3177..39472bb3177 100644
--- a/pkgs/development/python-modules/pymc3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymc3/default.nix
diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix
index dbed3c7f037..dbed3c7f037 100644
--- a/pkgs/development/python-modules/pymediainfo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix
diff --git a/pkgs/development/python-modules/pymemoize/default.nix b/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix
index 4efafeaaca4..4efafeaaca4 100644
--- a/pkgs/development/python-modules/pymemoize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix
diff --git a/pkgs/development/python-modules/pyment/default.nix b/nixpkgs/pkgs/development/python-modules/pyment/default.nix
index bb27e5b3c3d..bb27e5b3c3d 100644
--- a/pkgs/development/python-modules/pyment/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyment/default.nix
diff --git a/pkgs/development/python-modules/pymetar/default.nix b/nixpkgs/pkgs/development/python-modules/pymetar/default.nix
index 2baf3181ac6..2baf3181ac6 100644
--- a/pkgs/development/python-modules/pymetar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymetar/default.nix
diff --git a/pkgs/development/python-modules/pymongo/default.nix b/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
index a10bb9169ed..a10bb9169ed 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
diff --git a/pkgs/development/python-modules/pympler/default.nix b/nixpkgs/pkgs/development/python-modules/pympler/default.nix
index 85be0b4309c..85be0b4309c 100644
--- a/pkgs/development/python-modules/pympler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pympler/default.nix
diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix
index 38cc411f54d..38cc411f54d 100644
--- a/pkgs/development/python-modules/pymsgbox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix
diff --git a/pkgs/development/python-modules/pymssql/default.nix b/nixpkgs/pkgs/development/python-modules/pymssql/default.nix
index 954be3f40e2..954be3f40e2 100644
--- a/pkgs/development/python-modules/pymssql/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymssql/default.nix
diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
index 4ff50ad7b96..4ff50ad7b96 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/nixpkgs/pkgs/development/python-modules/pymvglive/default.nix
index 3b7011fa748..3b7011fa748 100644
--- a/pkgs/development/python-modules/pymvglive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymvglive/default.nix
diff --git a/pkgs/development/python-modules/pymysql/default.nix b/nixpkgs/pkgs/development/python-modules/pymysql/default.nix
index 4529a736f13..4529a736f13 100644
--- a/pkgs/development/python-modules/pymysql/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymysql/default.nix
diff --git a/pkgs/development/python-modules/pymysqlsa/default.nix b/nixpkgs/pkgs/development/python-modules/pymysqlsa/default.nix
index 11813d3d1bc..11813d3d1bc 100644
--- a/pkgs/development/python-modules/pymysqlsa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymysqlsa/default.nix
diff --git a/pkgs/development/python-modules/pymystem3/default.nix b/nixpkgs/pkgs/development/python-modules/pymystem3/default.nix
index 5311d981752..5311d981752 100644
--- a/pkgs/development/python-modules/pymystem3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pymystem3/default.nix
diff --git a/pkgs/development/python-modules/pynac/default.nix b/nixpkgs/pkgs/development/python-modules/pynac/default.nix
index 755dda341c9..755dda341c9 100644
--- a/pkgs/development/python-modules/pynac/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynac/default.nix
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/nixpkgs/pkgs/development/python-modules/pynacl/default.nix
index 1561c3c4d6d..1561c3c4d6d 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynacl/default.nix
diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix
index 5016cfb741c..5016cfb741c 100644
--- a/pkgs/development/python-modules/pynamodb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix
diff --git a/pkgs/development/python-modules/pync/default.nix b/nixpkgs/pkgs/development/python-modules/pync/default.nix
index 24d285423f1..24d285423f1 100644
--- a/pkgs/development/python-modules/pync/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pync/default.nix
diff --git a/pkgs/development/python-modules/pynisher/default.nix b/nixpkgs/pkgs/development/python-modules/pynisher/default.nix
index 5f877fd90d2..5f877fd90d2 100644
--- a/pkgs/development/python-modules/pynisher/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynisher/default.nix
diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix
index f950c7798b8..f950c7798b8 100644
--- a/pkgs/development/python-modules/pynmea2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix
diff --git a/pkgs/development/python-modules/pynrrd/default.nix b/nixpkgs/pkgs/development/python-modules/pynrrd/default.nix
index 02361fe84de..02361fe84de 100644
--- a/pkgs/development/python-modules/pynrrd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynrrd/default.nix
diff --git a/pkgs/development/python-modules/pynvim/default.nix b/nixpkgs/pkgs/development/python-modules/pynvim/default.nix
index 93cba65ae5e..93cba65ae5e 100644
--- a/pkgs/development/python-modules/pynvim/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynvim/default.nix
diff --git a/pkgs/development/python-modules/pynzb/default.nix b/nixpkgs/pkgs/development/python-modules/pynzb/default.nix
index 4225d30c6fe..4225d30c6fe 100644
--- a/pkgs/development/python-modules/pynzb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pynzb/default.nix
diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix
index 8576de1b379..8576de1b379 100644
--- a/pkgs/development/python-modules/pyobjc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix
diff --git a/pkgs/development/python-modules/pyocr/default.nix b/nixpkgs/pkgs/development/python-modules/pyocr/default.nix
index ca606767f4d..ca606767f4d 100644
--- a/pkgs/development/python-modules/pyocr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyocr/default.nix
diff --git a/pkgs/development/python-modules/pyocr/paths.patch b/nixpkgs/pkgs/development/python-modules/pyocr/paths.patch
index 9350d4050da..9350d4050da 100644
--- a/pkgs/development/python-modules/pyocr/paths.patch
+++ b/nixpkgs/pkgs/development/python-modules/pyocr/paths.patch
diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix
index bef4969d7d2..bef4969d7d2 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix
diff --git a/pkgs/development/python-modules/pyogg/default.nix b/nixpkgs/pkgs/development/python-modules/pyogg/default.nix
index 88fdc960a2b..88fdc960a2b 100644
--- a/pkgs/development/python-modules/pyogg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyogg/default.nix
diff --git a/pkgs/development/python-modules/pyogg/pyogg-paths.patch b/nixpkgs/pkgs/development/python-modules/pyogg/pyogg-paths.patch
index c7f1933878b..c7f1933878b 100644
--- a/pkgs/development/python-modules/pyogg/pyogg-paths.patch
+++ b/nixpkgs/pkgs/development/python-modules/pyogg/pyogg-paths.patch
diff --git a/pkgs/development/python-modules/pyomo/default.nix b/nixpkgs/pkgs/development/python-modules/pyomo/default.nix
index 14ccdaa64c3..14ccdaa64c3 100644
--- a/pkgs/development/python-modules/pyomo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyomo/default.nix
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix
index 0fd6253e5fd..0fd6253e5fd 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix
diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix
index a425fcf5be9..a425fcf5be9 100644
--- a/pkgs/development/python-modules/pyopengl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
index 8d5f6291c26..8d5f6291c26 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
diff --git a/pkgs/development/python-modules/pyotp/default.nix b/nixpkgs/pkgs/development/python-modules/pyotp/default.nix
index 6c1dcadaccf..6c1dcadaccf 100644
--- a/pkgs/development/python-modules/pyotp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyotp/default.nix
diff --git a/pkgs/development/python-modules/pyowm/default.nix b/nixpkgs/pkgs/development/python-modules/pyowm/default.nix
index 1b8fffa1d29..1b8fffa1d29 100644
--- a/pkgs/development/python-modules/pyowm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyowm/default.nix
diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix
index 41576c5ad1f..41576c5ad1f 100644
--- a/pkgs/development/python-modules/pypandoc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix
diff --git a/pkgs/development/python-modules/pyparser/default.nix b/nixpkgs/pkgs/development/python-modules/pyparser/default.nix
index 1c00d726ead..1c00d726ead 100644
--- a/pkgs/development/python-modules/pyparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyparser/default.nix
diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix
index f1f43a5f495..f1f43a5f495 100644
--- a/pkgs/development/python-modules/pyparsing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix
diff --git a/pkgs/development/python-modules/pyparted/default.nix b/nixpkgs/pkgs/development/python-modules/pyparted/default.nix
index 3defe979d37..3defe979d37 100644
--- a/pkgs/development/python-modules/pyparted/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyparted/default.nix
diff --git a/pkgs/development/python-modules/pypcap/default.nix b/nixpkgs/pkgs/development/python-modules/pypcap/default.nix
index 620b1d81160..620b1d81160 100644
--- a/pkgs/development/python-modules/pypcap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypcap/default.nix
diff --git a/pkgs/development/python-modules/pypdf/default.nix b/nixpkgs/pkgs/development/python-modules/pypdf/default.nix
index 5842e1c510a..5842e1c510a 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypdf/default.nix
diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix
index 1c3b908396e..1c3b908396e 100644
--- a/pkgs/development/python-modules/pypdf2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix
diff --git a/pkgs/development/python-modules/pypeg2/default.nix b/nixpkgs/pkgs/development/python-modules/pypeg2/default.nix
index de2ddc98a8e..de2ddc98a8e 100644
--- a/pkgs/development/python-modules/pypeg2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypeg2/default.nix
diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/nixpkgs/pkgs/development/python-modules/pyperclip/default.nix
index 9709aea1d18..9709aea1d18 100644
--- a/pkgs/development/python-modules/pyperclip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyperclip/default.nix
diff --git a/pkgs/development/python-modules/pyperf/default.nix b/nixpkgs/pkgs/development/python-modules/pyperf/default.nix
index 4b14e2e5cc6..4b14e2e5cc6 100644
--- a/pkgs/development/python-modules/pyperf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyperf/default.nix
diff --git a/pkgs/development/python-modules/pyphen/default.nix b/nixpkgs/pkgs/development/python-modules/pyphen/default.nix
index 7a182b6be4a..7a182b6be4a 100644
--- a/pkgs/development/python-modules/pyphen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyphen/default.nix
diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix
index feb1f9451bc..feb1f9451bc 100644
--- a/pkgs/development/python-modules/pypillowfight/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix
diff --git a/pkgs/development/python-modules/pyplatec/default.nix b/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix
index a17c650e0f0..a17c650e0f0 100644
--- a/pkgs/development/python-modules/pyplatec/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix
diff --git a/pkgs/development/python-modules/pypoppler/default.nix b/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix
index ccda4f2631d..ccda4f2631d 100644
--- a/pkgs/development/python-modules/pypoppler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix
diff --git a/pkgs/development/python-modules/pypoppler/pypoppler-0.39.0.patch b/nixpkgs/pkgs/development/python-modules/pypoppler/pypoppler-0.39.0.patch
index b9e02242e00..b9e02242e00 100644
--- a/pkgs/development/python-modules/pypoppler/pypoppler-0.39.0.patch
+++ b/nixpkgs/pkgs/development/python-modules/pypoppler/pypoppler-0.39.0.patch
diff --git a/pkgs/development/python-modules/pypoppler/pypoppler-poppler.c.patch b/nixpkgs/pkgs/development/python-modules/pypoppler/pypoppler-poppler.c.patch
index 1104097cd3e..1104097cd3e 100644
--- a/pkgs/development/python-modules/pypoppler/pypoppler-poppler.c.patch
+++ b/nixpkgs/pkgs/development/python-modules/pypoppler/pypoppler-poppler.c.patch
diff --git a/pkgs/development/python-modules/pyprind/default.nix b/nixpkgs/pkgs/development/python-modules/pyprind/default.nix
index de1b17be739..de1b17be739 100644
--- a/pkgs/development/python-modules/pyprind/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyprind/default.nix
diff --git a/pkgs/development/python-modules/pyprof2calltree/default.nix b/nixpkgs/pkgs/development/python-modules/pyprof2calltree/default.nix
index 198445177c4..198445177c4 100644
--- a/pkgs/development/python-modules/pyprof2calltree/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyprof2calltree/default.nix
diff --git a/pkgs/development/python-modules/pyproj/001.proj.patch b/nixpkgs/pkgs/development/python-modules/pyproj/001.proj.patch
index b024c28156c..b024c28156c 100644
--- a/pkgs/development/python-modules/pyproj/001.proj.patch
+++ b/nixpkgs/pkgs/development/python-modules/pyproj/001.proj.patch
diff --git a/pkgs/development/python-modules/pyproj/default.nix b/nixpkgs/pkgs/development/python-modules/pyproj/default.nix
index 0f2763faf60..0f2763faf60 100644
--- a/pkgs/development/python-modules/pyproj/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyproj/default.nix
diff --git a/pkgs/development/python-modules/pyptlib/default.nix b/nixpkgs/pkgs/development/python-modules/pyptlib/default.nix
index 6349b56b474..6349b56b474 100644
--- a/pkgs/development/python-modules/pyptlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyptlib/default.nix
diff --git a/pkgs/development/python-modules/pyqrcode/default.nix b/nixpkgs/pkgs/development/python-modules/pyqrcode/default.nix
index 4313f700ae1..4313f700ae1 100644
--- a/pkgs/development/python-modules/pyqrcode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyqrcode/default.nix
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix
index 9f7c75a02d3..9f7c75a02d3 100644
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix
index f3578459b9d..f3578459b9d 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix
diff --git a/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch b/nixpkgs/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch
index faa36fa1913..faa36fa1913 100644
--- a/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch
+++ b/nixpkgs/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch
diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix
index a2c4a9491b6..a2c4a9491b6 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix
diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix
index b48f21b9e78..b48f21b9e78 100644
--- a/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix
diff --git a/pkgs/development/python-modules/pyquery/default.nix b/nixpkgs/pkgs/development/python-modules/pyquery/default.nix
index 70f144b6258..70f144b6258 100644
--- a/pkgs/development/python-modules/pyquery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyquery/default.nix
diff --git a/pkgs/development/python-modules/pyrabbit2/default.nix b/nixpkgs/pkgs/development/python-modules/pyrabbit2/default.nix
index 36182e9986b..36182e9986b 100644
--- a/pkgs/development/python-modules/pyrabbit2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyrabbit2/default.nix
diff --git a/pkgs/development/python-modules/pyramid/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix
index a851344b4ce..a851344b4ce 100644
--- a/pkgs/development/python-modules/pyramid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix
diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix
index 19b26a30ad7..19b26a30ad7 100644
--- a/pkgs/development/python-modules/pyramid_beaker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix
diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix
index 398869e467b..398869e467b 100644
--- a/pkgs/development/python-modules/pyramid_chameleon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix
diff --git a/pkgs/development/python-modules/pyramid_chameleon/test-renderers-pyramid-import.patch b/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/test-renderers-pyramid-import.patch
index 635ed3510fc..635ed3510fc 100644
--- a/pkgs/development/python-modules/pyramid_chameleon/test-renderers-pyramid-import.patch
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/test-renderers-pyramid-import.patch
diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix
index 912fb06c11b..912fb06c11b 100644
--- a/pkgs/development/python-modules/pyramid_exclog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix
diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix
index a2723255057..a2723255057 100644
--- a/pkgs/development/python-modules/pyramid_hawkauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix
diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix
index 216fb57c221..216fb57c221 100644
--- a/pkgs/development/python-modules/pyramid_jinja2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix
diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix
index 80546ee768e..80546ee768e 100644
--- a/pkgs/development/python-modules/pyramid_mako/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix
diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix
index 7c01e3e093b..7c01e3e093b 100644
--- a/pkgs/development/python-modules/pyramid_multiauth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix
diff --git a/pkgs/development/python-modules/pyreadability/default.nix b/nixpkgs/pkgs/development/python-modules/pyreadability/default.nix
index 60bdbf01167..60bdbf01167 100644
--- a/pkgs/development/python-modules/pyreadability/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyreadability/default.nix
diff --git a/pkgs/development/python-modules/pyregion/default.nix b/nixpkgs/pkgs/development/python-modules/pyregion/default.nix
index a2b0423e558..a2b0423e558 100644
--- a/pkgs/development/python-modules/pyregion/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyregion/default.nix
diff --git a/pkgs/development/python-modules/pyreport/default.nix b/nixpkgs/pkgs/development/python-modules/pyreport/default.nix
index d75119b6e32..d75119b6e32 100644
--- a/pkgs/development/python-modules/pyreport/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyreport/default.nix
diff --git a/pkgs/development/python-modules/pyres/default.nix b/nixpkgs/pkgs/development/python-modules/pyres/default.nix
index 99c4b7116d5..99c4b7116d5 100644
--- a/pkgs/development/python-modules/pyres/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyres/default.nix
diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix
index ba72bf4be94..ba72bf4be94 100644
--- a/pkgs/development/python-modules/pyrfc3339/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix
diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix
index a0545ece74a..a0545ece74a 100644
--- a/pkgs/development/python-modules/pyro-ppl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix
diff --git a/pkgs/development/python-modules/pyro4/default.nix b/nixpkgs/pkgs/development/python-modules/pyro4/default.nix
index fdeed665623..fdeed665623 100644
--- a/pkgs/development/python-modules/pyro4/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyro4/default.nix
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix
index 3563edce792..3563edce792 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix
diff --git a/pkgs/development/python-modules/pyrr/default.nix b/nixpkgs/pkgs/development/python-modules/pyrr/default.nix
index 3380cf1205c..3380cf1205c 100644
--- a/pkgs/development/python-modules/pyrr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyrr/default.nix
diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix
index bbed677dfaf..bbed677dfaf 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix
diff --git a/pkgs/development/python-modules/pyrss2gen/default.nix b/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix
index 1c65d7ca5c7..1c65d7ca5c7 100644
--- a/pkgs/development/python-modules/pyrss2gen/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix
diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/nixpkgs/pkgs/development/python-modules/pyrtlsdr/default.nix
index 0bb24031084..0bb24031084 100644
--- a/pkgs/development/python-modules/pyrtlsdr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyrtlsdr/default.nix
diff --git a/pkgs/development/python-modules/pysam/default.nix b/nixpkgs/pkgs/development/python-modules/pysam/default.nix
index 46dd54c62e2..46dd54c62e2 100644
--- a/pkgs/development/python-modules/pysam/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysam/default.nix
diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix
index 8c0513b0b51..8c0513b0b51 100644
--- a/pkgs/development/python-modules/pysaml2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix
diff --git a/pkgs/development/python-modules/pysaml2/hardcode-xmlsec1-path.patch b/nixpkgs/pkgs/development/python-modules/pysaml2/hardcode-xmlsec1-path.patch
index d984c55a8a7..d984c55a8a7 100644
--- a/pkgs/development/python-modules/pysaml2/hardcode-xmlsec1-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/pysaml2/hardcode-xmlsec1-path.patch
diff --git a/pkgs/development/python-modules/pysc2/default.nix b/nixpkgs/pkgs/development/python-modules/pysc2/default.nix
index d02c85fb4ff..d02c85fb4ff 100644
--- a/pkgs/development/python-modules/pysc2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysc2/default.nix
diff --git a/pkgs/development/python-modules/pysc2/fix-setup-for-py3.patch b/nixpkgs/pkgs/development/python-modules/pysc2/fix-setup-for-py3.patch
index b1a2b4e2350..b1a2b4e2350 100644
--- a/pkgs/development/python-modules/pysc2/fix-setup-for-py3.patch
+++ b/nixpkgs/pkgs/development/python-modules/pysc2/fix-setup-for-py3.patch
diff --git a/pkgs/development/python-modules/pysc2/parameterize-runconfig-sc2path.patch b/nixpkgs/pkgs/development/python-modules/pysc2/parameterize-runconfig-sc2path.patch
index be667503d47..be667503d47 100644
--- a/pkgs/development/python-modules/pysc2/parameterize-runconfig-sc2path.patch
+++ b/nixpkgs/pkgs/development/python-modules/pysc2/parameterize-runconfig-sc2path.patch
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/nixpkgs/pkgs/development/python-modules/pyscard/default.nix
index ddd8b0ce295..ddd8b0ce295 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyscard/default.nix
diff --git a/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch b/nixpkgs/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch
index 62b20477c9f..62b20477c9f 100644
--- a/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch
+++ b/nixpkgs/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch
diff --git a/pkgs/development/python-modules/pyschedule/default.nix b/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix
index 5fbabdc0988..5fbabdc0988 100644
--- a/pkgs/development/python-modules/pyschedule/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix
diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix
index 2865380076a..2865380076a 100644
--- a/pkgs/development/python-modules/pyscreenshot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix
diff --git a/pkgs/development/python-modules/pyscss/default.nix b/nixpkgs/pkgs/development/python-modules/pyscss/default.nix
index 2dfa1f22962..2dfa1f22962 100644
--- a/pkgs/development/python-modules/pyscss/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyscss/default.nix
diff --git a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch b/nixpkgs/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
index ca723a0e573..ca723a0e573 100644
--- a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
+++ b/nixpkgs/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix
index 1ffc546cfa1..1ffc546cfa1 100644
--- a/pkgs/development/python-modules/pysdl2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix
diff --git a/pkgs/development/python-modules/pysendfile/default.nix b/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix
index b49ec5030f9..b49ec5030f9 100644
--- a/pkgs/development/python-modules/pysendfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix
diff --git a/pkgs/development/python-modules/pysensors/default.nix b/nixpkgs/pkgs/development/python-modules/pysensors/default.nix
index 3f55a015991..3f55a015991 100644
--- a/pkgs/development/python-modules/pysensors/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysensors/default.nix
diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix
index c299ad8acae..c299ad8acae 100644
--- a/pkgs/development/python-modules/pyserial-asyncio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix
diff --git a/pkgs/development/python-modules/pyserial/default.nix b/nixpkgs/pkgs/development/python-modules/pyserial/default.nix
index 98ffbe5ad9e..98ffbe5ad9e 100644
--- a/pkgs/development/python-modules/pyserial/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyserial/default.nix
diff --git a/pkgs/development/python-modules/pysftp/default.nix b/nixpkgs/pkgs/development/python-modules/pysftp/default.nix
index 0ed5790a519..0ed5790a519 100644
--- a/pkgs/development/python-modules/pysftp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysftp/default.nix
diff --git a/pkgs/development/python-modules/pysha3/default.nix b/nixpkgs/pkgs/development/python-modules/pysha3/default.nix
index d459be25a86..d459be25a86 100644
--- a/pkgs/development/python-modules/pysha3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysha3/default.nix
diff --git a/pkgs/development/python-modules/pyshp/default.nix b/nixpkgs/pkgs/development/python-modules/pyshp/default.nix
index 17d60f7507d..17d60f7507d 100644
--- a/pkgs/development/python-modules/pyshp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyshp/default.nix
diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix
index d9168f291c0..d9168f291c0 100644
--- a/pkgs/development/python-modules/pyside/apiextractor.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix
diff --git a/pkgs/development/python-modules/pyside/default.nix b/nixpkgs/pkgs/development/python-modules/pyside/default.nix
index df309c5c68a..df309c5c68a 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside/default.nix
diff --git a/pkgs/development/python-modules/pyside/gcc6.patch b/nixpkgs/pkgs/development/python-modules/pyside/gcc6.patch
index 440e94508c5..440e94508c5 100644
--- a/pkgs/development/python-modules/pyside/gcc6.patch
+++ b/nixpkgs/pkgs/development/python-modules/pyside/gcc6.patch
diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix
index feeeda812f9..feeeda812f9 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix
diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
index a968935dc06..a968935dc06 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
diff --git a/pkgs/development/python-modules/pyside/shiboken_py35.patch b/nixpkgs/pkgs/development/python-modules/pyside/shiboken_py35.patch
index fb095cf991c..fb095cf991c 100644
--- a/pkgs/development/python-modules/pyside/shiboken_py35.patch
+++ b/nixpkgs/pkgs/development/python-modules/pyside/shiboken_py35.patch
diff --git a/pkgs/development/python-modules/pyside/tools.nix b/nixpkgs/pkgs/development/python-modules/pyside/tools.nix
index 6c2b357c566..6c2b357c566 100644
--- a/pkgs/development/python-modules/pyside/tools.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside/tools.nix
diff --git a/pkgs/development/python-modules/pyside2-tools/default.nix b/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix
index a96ea5d32ff..a96ea5d32ff 100644
--- a/pkgs/development/python-modules/pyside2-tools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix
diff --git a/pkgs/development/python-modules/pyside2/default.nix b/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
index afa48569e2a..afa48569e2a 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
diff --git a/pkgs/development/python-modules/pyside2/dont_ignore_optional_modules.patch b/nixpkgs/pkgs/development/python-modules/pyside2/dont_ignore_optional_modules.patch
index 681e16a2bfd..681e16a2bfd 100644
--- a/pkgs/development/python-modules/pyside2/dont_ignore_optional_modules.patch
+++ b/nixpkgs/pkgs/development/python-modules/pyside2/dont_ignore_optional_modules.patch
diff --git a/pkgs/development/python-modules/pysigset/default.nix b/nixpkgs/pkgs/development/python-modules/pysigset/default.nix
index 85bcf56f062..85bcf56f062 100644
--- a/pkgs/development/python-modules/pysigset/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysigset/default.nix
diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix
index 7b0fba1a5ae..7b0fba1a5ae 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix
diff --git a/pkgs/development/python-modules/pysmb/default.nix b/nixpkgs/pkgs/development/python-modules/pysmb/default.nix
index 07de522f796..07de522f796 100644
--- a/pkgs/development/python-modules/pysmb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysmb/default.nix
diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix
index 18ee419e8e5..18ee419e8e5 100644
--- a/pkgs/development/python-modules/pysmbc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix
diff --git a/pkgs/development/python-modules/pysmf/default.nix b/nixpkgs/pkgs/development/python-modules/pysmf/default.nix
index ef5e560b08c..ef5e560b08c 100644
--- a/pkgs/development/python-modules/pysmf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysmf/default.nix
diff --git a/pkgs/development/python-modules/pysmi/default.nix b/nixpkgs/pkgs/development/python-modules/pysmi/default.nix
index 62c631ac98c..62c631ac98c 100644
--- a/pkgs/development/python-modules/pysmi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysmi/default.nix
diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/nixpkgs/pkgs/development/python-modules/pysnmp/default.nix
index e4027128993..e4027128993 100644
--- a/pkgs/development/python-modules/pysnmp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysnmp/default.nix
diff --git a/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch b/nixpkgs/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch
index 784ddd3f342..784ddd3f342 100644
--- a/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch
+++ b/nixpkgs/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch
diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix
index bb41a4d1855..bb41a4d1855 100644
--- a/pkgs/development/python-modules/pysnooper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix
diff --git a/pkgs/development/python-modules/pysocks/default.nix b/nixpkgs/pkgs/development/python-modules/pysocks/default.nix
index e8d853d625d..e8d853d625d 100644
--- a/pkgs/development/python-modules/pysocks/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysocks/default.nix
diff --git a/pkgs/development/python-modules/pysolr/default.nix b/nixpkgs/pkgs/development/python-modules/pysolr/default.nix
index 0544b84e532..0544b84e532 100644
--- a/pkgs/development/python-modules/pysolr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysolr/default.nix
diff --git a/pkgs/development/python-modules/pysonos/default.nix b/nixpkgs/pkgs/development/python-modules/pysonos/default.nix
index ddab28471a8..ddab28471a8 100644
--- a/pkgs/development/python-modules/pysonos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysonos/default.nix
diff --git a/pkgs/development/python-modules/pyspark/default.nix b/nixpkgs/pkgs/development/python-modules/pyspark/default.nix
index dd83e87d724..dd83e87d724 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyspark/default.nix
diff --git a/pkgs/development/python-modules/pysparse/default.nix b/nixpkgs/pkgs/development/python-modules/pysparse/default.nix
index 5c3a6bb26f8..5c3a6bb26f8 100644
--- a/pkgs/development/python-modules/pysparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysparse/default.nix
diff --git a/pkgs/development/python-modules/pysparse/dropPackageLoader.patch b/nixpkgs/pkgs/development/python-modules/pysparse/dropPackageLoader.patch
index b2526645f89..b2526645f89 100644
--- a/pkgs/development/python-modules/pysparse/dropPackageLoader.patch
+++ b/nixpkgs/pkgs/development/python-modules/pysparse/dropPackageLoader.patch
diff --git a/pkgs/development/python-modules/pyspf/default.nix b/nixpkgs/pkgs/development/python-modules/pyspf/default.nix
index 8f1fc795ea9..8f1fc795ea9 100644
--- a/pkgs/development/python-modules/pyspf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyspf/default.nix
diff --git a/pkgs/development/python-modules/pyspinel/default.nix b/nixpkgs/pkgs/development/python-modules/pyspinel/default.nix
index 990e2b28bd8..990e2b28bd8 100644
--- a/pkgs/development/python-modules/pyspinel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyspinel/default.nix
diff --git a/pkgs/development/python-modules/pyspotify/default.nix b/nixpkgs/pkgs/development/python-modules/pyspotify/default.nix
index e329d4f7b6e..e329d4f7b6e 100644
--- a/pkgs/development/python-modules/pyspotify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyspotify/default.nix
diff --git a/pkgs/development/python-modules/pyspread/default.nix b/nixpkgs/pkgs/development/python-modules/pyspread/default.nix
index d80cbf41629..d80cbf41629 100644
--- a/pkgs/development/python-modules/pyspread/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyspread/default.nix
diff --git a/pkgs/development/python-modules/pysptk/default.nix b/nixpkgs/pkgs/development/python-modules/pysptk/default.nix
index 46864632964..46864632964 100644
--- a/pkgs/development/python-modules/pysptk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysptk/default.nix
diff --git a/pkgs/development/python-modules/pysqlite/default.nix b/nixpkgs/pkgs/development/python-modules/pysqlite/default.nix
index b13cd1781d2..b13cd1781d2 100644
--- a/pkgs/development/python-modules/pysqlite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysqlite/default.nix
diff --git a/pkgs/development/python-modules/pysrim/default.nix b/nixpkgs/pkgs/development/python-modules/pysrim/default.nix
index 8fb73455051..8fb73455051 100644
--- a/pkgs/development/python-modules/pysrim/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysrim/default.nix
diff --git a/pkgs/development/python-modules/pysrt/default.nix b/nixpkgs/pkgs/development/python-modules/pysrt/default.nix
index f383854d5b4..f383854d5b4 100644
--- a/pkgs/development/python-modules/pysrt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysrt/default.nix
diff --git a/pkgs/development/python-modules/pyssim/default.nix b/nixpkgs/pkgs/development/python-modules/pyssim/default.nix
index 38dddda9b2e..38dddda9b2e 100644
--- a/pkgs/development/python-modules/pyssim/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyssim/default.nix
diff --git a/pkgs/development/python-modules/pystache/default.nix b/nixpkgs/pkgs/development/python-modules/pystache/default.nix
index 8ae01e49397..8ae01e49397 100644
--- a/pkgs/development/python-modules/pystache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pystache/default.nix
diff --git a/pkgs/development/python-modules/pystemd/default.nix b/nixpkgs/pkgs/development/python-modules/pystemd/default.nix
index 47d6ea7e26b..47d6ea7e26b 100644
--- a/pkgs/development/python-modules/pystemd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pystemd/default.nix
diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix
index e569042f729..e569042f729 100644
--- a/pkgs/development/python-modules/pystemmer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix
diff --git a/pkgs/development/python-modules/pysvn/default.nix b/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
index c1c765f1adc..c1c765f1adc 100644
--- a/pkgs/development/python-modules/pysvn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
diff --git a/pkgs/development/python-modules/pytado/default.nix b/nixpkgs/pkgs/development/python-modules/pytado/default.nix
index a1c70b4c205..a1c70b4c205 100644
--- a/pkgs/development/python-modules/pytado/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytado/default.nix
diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix
index 6b19a8f0c73..6b19a8f0c73 100644
--- a/pkgs/development/python-modules/pytaglib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix
diff --git a/pkgs/development/python-modules/pyte/default.nix b/nixpkgs/pkgs/development/python-modules/pyte/default.nix
index 675bd47481e..675bd47481e 100644
--- a/pkgs/development/python-modules/pyte/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyte/default.nix
diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix
index 1b185070bf7..1b185070bf7 100644
--- a/pkgs/development/python-modules/pytesseract/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix
diff --git a/pkgs/development/python-modules/pytesseract/tesseract-binary.patch b/nixpkgs/pkgs/development/python-modules/pytesseract/tesseract-binary.patch
index 27b042bbaa5..27b042bbaa5 100644
--- a/pkgs/development/python-modules/pytesseract/tesseract-binary.patch
+++ b/nixpkgs/pkgs/development/python-modules/pytesseract/tesseract-binary.patch
diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix
index 7f707ebc46b..7f707ebc46b 100644
--- a/pkgs/development/python-modules/pytest-aiohttp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix
diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix
index c21ae854c9a..c21ae854c9a 100644
--- a/pkgs/development/python-modules/pytest-annotate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix
diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix
index 0ef79cd0989..0ef79cd0989 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix
diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix
index e01d26b530e..e01d26b530e 100644
--- a/pkgs/development/python-modules/pytest-arraydiff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix
diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix
index 272b1fa56b9..272b1fa56b9 100644
--- a/pkgs/development/python-modules/pytest-astropy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix
index 346530d4a81..346530d4a81 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix
diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix
index e215feac44f..e215feac44f 100644
--- a/pkgs/development/python-modules/pytest-bdd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix
diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix
index 924f16694c5..924f16694c5 100644
--- a/pkgs/development/python-modules/pytest-benchmark/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix
diff --git a/pkgs/development/python-modules/pytest-black/black-version.patch b/nixpkgs/pkgs/development/python-modules/pytest-black/black-version.patch
index 93bb4180930..93bb4180930 100644
--- a/pkgs/development/python-modules/pytest-black/black-version.patch
+++ b/nixpkgs/pkgs/development/python-modules/pytest-black/black-version.patch
diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix
index b129f9eec4b..b129f9eec4b 100644
--- a/pkgs/development/python-modules/pytest-black/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix
diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix
index fb020ba471f..fb020ba471f 100644
--- a/pkgs/development/python-modules/pytest-catchlog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix
diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix
index f91b8191eb1..f91b8191eb1 100644
--- a/pkgs/development/python-modules/pytest-check/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix
diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix
index e20ebc77ad1..e20ebc77ad1 100644
--- a/pkgs/development/python-modules/pytest-click/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix
diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix
index e376abbc33a..e376abbc33a 100644
--- a/pkgs/development/python-modules/pytest-cov/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix
diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-cram/default.nix
index ff2a29384bc..ff2a29384bc 100644
--- a/pkgs/development/python-modules/pytest-cram/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-cram/default.nix
diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix
index 1c323929a8e..1c323929a8e 100644
--- a/pkgs/development/python-modules/pytest-datafiles/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix
diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix
index 2f82f4d7dbd..2f82f4d7dbd 100644
--- a/pkgs/development/python-modules/pytest-dependency/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix
diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix
index 6b60eb6d3c5..6b60eb6d3c5 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix
diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix
index cdf60b7b07c..cdf60b7b07c 100644
--- a/pkgs/development/python-modules/pytest-doctestplus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix
diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-env/default.nix
index 909a193bd7b..909a193bd7b 100644
--- a/pkgs/development/python-modules/pytest-env/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-env/default.nix
diff --git a/pkgs/development/python-modules/pytest-expect/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-expect/default.nix
index 557446b5adc..557446b5adc 100644
--- a/pkgs/development/python-modules/pytest-expect/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-expect/default.nix
diff --git a/pkgs/development/python-modules/pytest-faulthandler/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-faulthandler/default.nix
index b9ac354abfd..b9ac354abfd 100644
--- a/pkgs/development/python-modules/pytest-faulthandler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-faulthandler/default.nix
diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix
index 7fc3d4e951f..7fc3d4e951f 100644
--- a/pkgs/development/python-modules/pytest-fixture-config/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix
diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix
index d3b2df60399..d3b2df60399 100644
--- a/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix
diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix
index df7981e6bfc..df7981e6bfc 100644
--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix
diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix
index b58b934dadc..b58b934dadc 100644
--- a/pkgs/development/python-modules/pytest-flask/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix
diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix
index 472e0b3559d..472e0b3559d 100644
--- a/pkgs/development/python-modules/pytest-forked/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix
diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
index 8f24d1dc1f6..8f24d1dc1f6 100644
--- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix
index 6d84ef0de7d..6d84ef0de7d 100644
--- a/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix
diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix
index 235d6f3af24..235d6f3af24 100644
--- a/pkgs/development/python-modules/pytest-isort/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix
diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix
index 5f2516b646c..5f2516b646c 100644
--- a/pkgs/development/python-modules/pytest-localserver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix
index c4ef0d81111..c4ef0d81111 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix
diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix
index d86647b7503..d86647b7503 100644
--- a/pkgs/development/python-modules/pytest-mpl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix
diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix
index 4fb2146d7a7..4fb2146d7a7 100644
--- a/pkgs/development/python-modules/pytest-mypy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix
diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix
index 0fb23f245fb..0fb23f245fb 100644
--- a/pkgs/development/python-modules/pytest-openfiles/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix
diff --git a/pkgs/development/python-modules/pytest-ordering/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix
index ec340806964..ec340806964 100644
--- a/pkgs/development/python-modules/pytest-ordering/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix
diff --git a/pkgs/development/python-modules/pytest-pep257/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-pep257/default.nix
index 0ff8890a6fb..0ff8890a6fb 100644
--- a/pkgs/development/python-modules/pytest-pep257/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-pep257/default.nix
diff --git a/pkgs/development/python-modules/pytest-pep8/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-pep8/default.nix
index 1fcb99574b2..1fcb99574b2 100644
--- a/pkgs/development/python-modules/pytest-pep8/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-pep8/default.nix
diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix
index 52eeccc7cd0..52eeccc7cd0 100644
--- a/pkgs/development/python-modules/pytest-pylint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix
diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix
index 201da93b018..201da93b018 100644
--- a/pkgs/development/python-modules/pytest-qt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix
diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix
index 1e8a49f90be..1e8a49f90be 100644
--- a/pkgs/development/python-modules/pytest-quickcheck/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix
diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-raisesregexp/default.nix
index bc7d1413200..bc7d1413200 100644
--- a/pkgs/development/python-modules/pytest-raisesregexp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-raisesregexp/default.nix
diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix
index 088f8702436..088f8702436 100644
--- a/pkgs/development/python-modules/pytest-random-order/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix
diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix
index 4de823c2c87..4de823c2c87 100644
--- a/pkgs/development/python-modules/pytest-relaxed/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix
diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix
index 7d801a2789c..7d801a2789c 100644
--- a/pkgs/development/python-modules/pytest-remotedata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix
diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix
index 768ad596734..768ad596734 100644
--- a/pkgs/development/python-modules/pytest-repeat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix
diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index f5c35905cf6..f5c35905cf6 100644
--- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix
diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix
index 647d7abb07c..647d7abb07c 100644
--- a/pkgs/development/python-modules/pytest-sanic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix
diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix
index 90b60686ee6..90b60686ee6 100644
--- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix
diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix
index c940dcadc7e..c940dcadc7e 100644
--- a/pkgs/development/python-modules/pytest-services/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix
diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix
index 6bc7047866e..6bc7047866e 100644
--- a/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix
diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix
index a28970a8ec4..a28970a8ec4 100644
--- a/pkgs/development/python-modules/pytest-socket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix
diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix
index b639b61ad4d..b639b61ad4d 100644
--- a/pkgs/development/python-modules/pytest-subtesthack/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix
diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix
index 5ece578dc25..5ece578dc25 100644
--- a/pkgs/development/python-modules/pytest-sugar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix
diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix
index b8535da4c7a..b8535da4c7a 100644
--- a/pkgs/development/python-modules/pytest-testmon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix
diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
index 3997e716817..3997e716817 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix
index a5c35150268..a5c35150268 100644
--- a/pkgs/development/python-modules/pytest-tornado/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix
diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix
index 0e8add5417b..0e8add5417b 100644
--- a/pkgs/development/python-modules/pytest-virtualenv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix
diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-warnings/default.nix
index 78cd02897f9..78cd02897f9 100644
--- a/pkgs/development/python-modules/pytest-warnings/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-warnings/default.nix
diff --git a/pkgs/development/python-modules/pytest-watch/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix
index 12b06c2e1b6..12b06c2e1b6 100644
--- a/pkgs/development/python-modules/pytest-watch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
index c8e41fdaa35..c8e41fdaa35 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix
index 840a096a085..840a096a085 100644
--- a/pkgs/development/python-modules/pytest-xprocess/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix
diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix
index b9ae9be428d..b9ae9be428d 100644
--- a/pkgs/development/python-modules/pytest-xvfb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix
diff --git a/pkgs/development/python-modules/pytest/4.nix b/nixpkgs/pkgs/development/python-modules/pytest/4.nix
index 2524dc61afd..2524dc61afd 100644
--- a/pkgs/development/python-modules/pytest/4.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest/4.nix
diff --git a/pkgs/development/python-modules/pytest/default.nix b/nixpkgs/pkgs/development/python-modules/pytest/default.nix
index 48b6e89a10e..48b6e89a10e 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest/default.nix
diff --git a/pkgs/development/python-modules/pytestcache/default.nix b/nixpkgs/pkgs/development/python-modules/pytestcache/default.nix
index 2875bf88340..2875bf88340 100644
--- a/pkgs/development/python-modules/pytestcache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytestcache/default.nix
diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix
index fa937e9626c..fa937e9626c 100644
--- a/pkgs/development/python-modules/pytestrunner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix
diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/nixpkgs/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
index e372913af7d..e372913af7d 100644
--- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/nixpkgs/pkgs/development/python-modules/python-axolotl/default.nix
index 55a0a355a9e..55a0a355a9e 100644
--- a/pkgs/development/python-modules/python-axolotl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-axolotl/default.nix
diff --git a/pkgs/development/python-modules/python-binance/default.nix b/nixpkgs/pkgs/development/python-modules/python-binance/default.nix
index 62aa11749a8..62aa11749a8 100644
--- a/pkgs/development/python-modules/python-binance/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-binance/default.nix
diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/nixpkgs/pkgs/development/python-modules/python-ctags3/default.nix
index c37abf7b55f..c37abf7b55f 100644
--- a/pkgs/development/python-modules/python-ctags3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-ctags3/default.nix
diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix
index e33aee6c1c9..e33aee6c1c9 100644
--- a/pkgs/development/python-modules/python-daemon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix
diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix
index 9cfc68dee46..9cfc68dee46 100644
--- a/pkgs/development/python-modules/python-dbusmock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix
diff --git a/pkgs/development/python-modules/python-docx/default.nix b/nixpkgs/pkgs/development/python-modules/python-docx/default.nix
index f86cdc665a1..f86cdc665a1 100644
--- a/pkgs/development/python-modules/python-docx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-docx/default.nix
diff --git a/pkgs/development/python-modules/python-doi/default.nix b/nixpkgs/pkgs/development/python-modules/python-doi/default.nix
index 0cb6b2a7502..0cb6b2a7502 100644
--- a/pkgs/development/python-modules/python-doi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-doi/default.nix
diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix
index f43d8d0575b..f43d8d0575b 100644
--- a/pkgs/development/python-modules/python-dotenv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix
diff --git a/pkgs/development/python-modules/python-editor/default.nix b/nixpkgs/pkgs/development/python-modules/python-editor/default.nix
index 4691785dae1..4691785dae1 100644
--- a/pkgs/development/python-modules/python-editor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-editor/default.nix
diff --git a/pkgs/development/python-modules/python-efl/default.nix b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix
index 5cf1efc49b7..5cf1efc49b7 100644
--- a/pkgs/development/python-modules/python-efl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix
diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix
index e1c380b64c3..e1c380b64c3 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix
diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix
index 1369479ac4f..1369479ac4f 100644
--- a/pkgs/development/python-modules/python-etcd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix
diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix
index dbfde18a874..dbfde18a874 100644
--- a/pkgs/development/python-modules/python-fontconfig/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix
diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix
index 68f9ad16977..68f9ad16977 100644
--- a/pkgs/development/python-modules/python-forecastio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix
diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix
index bbdf7aa6033..bbdf7aa6033 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix
diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix
index 90dee35d290..90dee35d290 100644
--- a/pkgs/development/python-modules/python-gnupg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix
diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix
index 1fdd036bd12..1fdd036bd12 100644
--- a/pkgs/development/python-modules/python-hosts/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix
diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix
index 0f20a01e0b2..0f20a01e0b2 100644
--- a/pkgs/development/python-modules/python-igraph/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix
diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix
index aea31053c5a..aea31053c5a 100644
--- a/pkgs/development/python-modules/python-jenkins/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix
diff --git a/pkgs/development/python-modules/python-jose/default.nix b/nixpkgs/pkgs/development/python-modules/python-jose/default.nix
index a9377c4a1c2..a9377c4a1c2 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-jose/default.nix
diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix
index 0141141b43c..0141141b43c 100644
--- a/pkgs/development/python-modules/python-json-logger/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix
diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index 29c6950070a..29c6950070a 100644
--- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix
index b029373bdca..b029373bdca 100644
--- a/pkgs/development/python-modules/python-language-server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix
diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/nixpkgs/pkgs/development/python-modules/python-ldap-test/default.nix
index 3ba81cacfd4..3ba81cacfd4 100644
--- a/pkgs/development/python-modules/python-ldap-test/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-ldap-test/default.nix
diff --git a/pkgs/development/python-modules/python-levenshtein/default.nix b/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix
index 7a16621da0a..7a16621da0a 100644
--- a/pkgs/development/python-modules/python-levenshtein/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix
diff --git a/pkgs/development/python-modules/python-libarchive/default.nix b/nixpkgs/pkgs/development/python-modules/python-libarchive/default.nix
index bae94191fc0..bae94191fc0 100644
--- a/pkgs/development/python-modules/python-libarchive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-libarchive/default.nix
diff --git a/pkgs/development/python-modules/python-logstash/default.nix b/nixpkgs/pkgs/development/python-modules/python-logstash/default.nix
index f4ecccf0683..f4ecccf0683 100644
--- a/pkgs/development/python-modules/python-logstash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-logstash/default.nix
diff --git a/pkgs/development/python-modules/python-ly/default.nix b/nixpkgs/pkgs/development/python-modules/python-ly/default.nix
index f8b7f023717..f8b7f023717 100644
--- a/pkgs/development/python-modules/python-ly/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-ly/default.nix
diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix
index e967ba9934d..e967ba9934d 100644
--- a/pkgs/development/python-modules/python-lz4/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix
diff --git a/pkgs/development/python-modules/python-lzf/default.nix b/nixpkgs/pkgs/development/python-modules/python-lzf/default.nix
index e8b89563f03..e8b89563f03 100644
--- a/pkgs/development/python-modules/python-lzf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-lzf/default.nix
diff --git a/pkgs/development/python-modules/python-lzo/default.nix b/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix
index 5025b86361a..5025b86361a 100644
--- a/pkgs/development/python-modules/python-lzo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix
diff --git a/pkgs/development/python-modules/python-magic/default.nix b/nixpkgs/pkgs/development/python-modules/python-magic/default.nix
index d48a6288a7d..d48a6288a7d 100644
--- a/pkgs/development/python-modules/python-magic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-magic/default.nix
diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix
index 35b7a706f60..35b7a706f60 100644
--- a/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix
diff --git a/pkgs/development/python-modules/python-markdown-math/default.nix b/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix
index 053b4897e83..053b4897e83 100644
--- a/pkgs/development/python-modules/python-markdown-math/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix
diff --git a/pkgs/development/python-modules/python-miio/default.nix b/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
index eb7c9153196..eb7c9153196 100644
--- a/pkgs/development/python-modules/python-miio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
diff --git a/pkgs/development/python-modules/python-mnist/default.nix b/nixpkgs/pkgs/development/python-modules/python-mnist/default.nix
index 67cb4eae251..67cb4eae251 100644
--- a/pkgs/development/python-modules/python-mnist/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-mnist/default.nix
diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix
index e3e75d88604..e3e75d88604 100644
--- a/pkgs/development/python-modules/python-multipart/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix
diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix
index c4ec84512a6..c4ec84512a6 100644
--- a/pkgs/development/python-modules/python-nomad/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix
diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/nixpkgs/pkgs/development/python-modules/python-oauth2/default.nix
index 4361b0a108d..4361b0a108d 100644
--- a/pkgs/development/python-modules/python-oauth2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-oauth2/default.nix
diff --git a/pkgs/development/python-modules/python-olm/default.nix b/nixpkgs/pkgs/development/python-modules/python-olm/default.nix
index b1e01f7f4ab..b1e01f7f4ab 100644
--- a/pkgs/development/python-modules/python-olm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-olm/default.nix
diff --git a/pkgs/development/python-modules/python-otr/default.nix b/nixpkgs/pkgs/development/python-modules/python-otr/default.nix
index 2b08bbffa45..2b08bbffa45 100644
--- a/pkgs/development/python-modules/python-otr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-otr/default.nix
diff --git a/pkgs/development/python-modules/python-packer/default.nix b/nixpkgs/pkgs/development/python-modules/python-packer/default.nix
index ff3d28b4746..ff3d28b4746 100644
--- a/pkgs/development/python-modules/python-packer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-packer/default.nix
diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/nixpkgs/pkgs/development/python-modules/python-periphery/default.nix
index 1c6cdcc28a1..1c6cdcc28a1 100644
--- a/pkgs/development/python-modules/python-periphery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-periphery/default.nix
diff --git a/pkgs/development/python-modules/python-pipedrive/default.nix b/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix
index e21f01d5cd6..e21f01d5cd6 100644
--- a/pkgs/development/python-modules/python-pipedrive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix
diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix
index 5d092f5e6ea..5d092f5e6ea 100644
--- a/pkgs/development/python-modules/python-prctl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix
diff --git a/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch b/nixpkgs/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch
index 19d70f234a9..19d70f234a9 100644
--- a/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch
+++ b/nixpkgs/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch
diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix
index 426b956880a..426b956880a 100644
--- a/pkgs/development/python-modules/python-ptrace/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix
diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix
index 9c2b18ba006..9c2b18ba006 100644
--- a/pkgs/development/python-modules/python-rapidjson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix
diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix
index 8aad5a1a7d2..8aad5a1a7d2 100644
--- a/pkgs/development/python-modules/python-redis-lock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix
diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix
index 24a21959b8c..24a21959b8c 100644
--- a/pkgs/development/python-modules/python-simple-hipchat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix
diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix
index 008e5e25a48..008e5e25a48 100644
--- a/pkgs/development/python-modules/python-slugify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix
diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix
index 328b1ec0994..328b1ec0994 100644
--- a/pkgs/development/python-modules/python-snappy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix
diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix
index 8f85f991534..8f85f991534 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix
diff --git a/pkgs/development/python-modules/python-sql/default.nix b/nixpkgs/pkgs/development/python-modules/python-sql/default.nix
index 54cb815bf3d..54cb815bf3d 100644
--- a/pkgs/development/python-modules/python-sql/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-sql/default.nix
diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix
index 556be12872b..556be12872b 100644
--- a/pkgs/development/python-modules/python-stdnum/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix
diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix
index 9b70d76bfed..9b70d76bfed 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix
diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix
index 5170c5a8a09..5170c5a8a09 100644
--- a/pkgs/development/python-modules/python-toolbox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix
diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix
index 6210c13f56e..6210c13f56e 100644
--- a/pkgs/development/python-modules/python-twitter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix
diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/nixpkgs/pkgs/development/python-modules/python-u2flib-host/default.nix
index 38785d81313..38785d81313 100644
--- a/pkgs/development/python-modules/python-u2flib-host/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-u2flib-host/default.nix
diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix
index 8f6c7c54cb2..8f6c7c54cb2 100644
--- a/pkgs/development/python-modules/python-uinput/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix
diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix
index a7f0bd93b0a..a7f0bd93b0a 100644
--- a/pkgs/development/python-modules/python-unshare/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix
diff --git a/pkgs/development/python-modules/python-utils/default.nix b/nixpkgs/pkgs/development/python-modules/python-utils/default.nix
index 67fbd4e24eb..67fbd4e24eb 100644
--- a/pkgs/development/python-modules/python-utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-utils/default.nix
diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix
index 88982f15293..88982f15293 100644
--- a/pkgs/development/python-modules/python-vagrant/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix
diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix
index 30c6dff048a..30c6dff048a 100644
--- a/pkgs/development/python-modules/python-vipaccess/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix
diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix
index 2bf59a63341..2bf59a63341 100644
--- a/pkgs/development/python-modules/python-vlc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix
diff --git a/pkgs/development/python-modules/python-vlc/vlc-paths.patch b/nixpkgs/pkgs/development/python-modules/python-vlc/vlc-paths.patch
index 0b1cf732711..0b1cf732711 100644
--- a/pkgs/development/python-modules/python-vlc/vlc-paths.patch
+++ b/nixpkgs/pkgs/development/python-modules/python-vlc/vlc-paths.patch
diff --git a/pkgs/development/python-modules/python-wifi/default.nix b/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix
index 7e4f2ebccf0..7e4f2ebccf0 100644
--- a/pkgs/development/python-modules/python-wifi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix
diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix
index 8a160da2964..8a160da2964 100644
--- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix
diff --git a/pkgs/development/python-modules/python2-pythondialog/default.nix b/nixpkgs/pkgs/development/python-modules/python2-pythondialog/default.nix
index a19156d1018..a19156d1018 100644
--- a/pkgs/development/python-modules/python2-pythondialog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python2-pythondialog/default.nix
diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix
index d0b10c42d01..d0b10c42d01 100644
--- a/pkgs/development/python-modules/python3-openid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix
diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix
index 24f56ae53b2..24f56ae53b2 100644
--- a/pkgs/development/python-modules/python_fedora/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix
diff --git a/pkgs/development/python-modules/python_keyczar/default.nix b/nixpkgs/pkgs/development/python-modules/python_keyczar/default.nix
index da4f3ed529e..da4f3ed529e 100644
--- a/pkgs/development/python-modules/python_keyczar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python_keyczar/default.nix
diff --git a/pkgs/development/python-modules/python_mimeparse/default.nix b/nixpkgs/pkgs/development/python-modules/python_mimeparse/default.nix
index 9484d24f5e2..9484d24f5e2 100644
--- a/pkgs/development/python-modules/python_mimeparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python_mimeparse/default.nix
diff --git a/pkgs/development/python-modules/python_openzwave/cython.patch b/nixpkgs/pkgs/development/python-modules/python_openzwave/cython.patch
index e01ffdbdc0d..e01ffdbdc0d 100644
--- a/pkgs/development/python-modules/python_openzwave/cython.patch
+++ b/nixpkgs/pkgs/development/python-modules/python_openzwave/cython.patch
diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix
index bb8d236335c..bb8d236335c 100644
--- a/pkgs/development/python-modules/python_openzwave/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix
diff --git a/pkgs/development/python-modules/python_statsd/default.nix b/nixpkgs/pkgs/development/python-modules/python_statsd/default.nix
index d6b262d9aa3..d6b262d9aa3 100644
--- a/pkgs/development/python-modules/python_statsd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python_statsd/default.nix
diff --git a/pkgs/development/python-modules/pythondialog/default.nix b/nixpkgs/pkgs/development/python-modules/pythondialog/default.nix
index 4f54c5a8fad..4f54c5a8fad 100644
--- a/pkgs/development/python-modules/pythondialog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pythondialog/default.nix
diff --git a/pkgs/development/python-modules/pythonirclib/default.nix b/nixpkgs/pkgs/development/python-modules/pythonirclib/default.nix
index 6074b76d300..6074b76d300 100644
--- a/pkgs/development/python-modules/pythonirclib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pythonirclib/default.nix
diff --git a/pkgs/development/python-modules/pythonix/default.nix b/nixpkgs/pkgs/development/python-modules/pythonix/default.nix
index 6ed150d1239..6ed150d1239 100644
--- a/pkgs/development/python-modules/pythonix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pythonix/default.nix
diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix
index f916ec63b30..f916ec63b30 100644
--- a/pkgs/development/python-modules/pythonnet/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix
diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix
index b3a9cfe82ee..b3a9cfe82ee 100644
--- a/pkgs/development/python-modules/pythonocc-core/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix
diff --git a/pkgs/development/python-modules/pytidylib/default.nix b/nixpkgs/pkgs/development/python-modules/pytidylib/default.nix
index 4ece6fb4134..4ece6fb4134 100644
--- a/pkgs/development/python-modules/pytidylib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytidylib/default.nix
diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix
index ac48fe1c240..ac48fe1c240 100644
--- a/pkgs/development/python-modules/pytimeparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix
diff --git a/pkgs/development/python-modules/pytmx/default.nix b/nixpkgs/pkgs/development/python-modules/pytmx/default.nix
index 0745aacc378..0745aacc378 100644
--- a/pkgs/development/python-modules/pytmx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytmx/default.nix
diff --git a/pkgs/development/python-modules/pytoml/default.nix b/nixpkgs/pkgs/development/python-modules/pytoml/default.nix
index d65de812323..d65de812323 100644
--- a/pkgs/development/python-modules/pytoml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytoml/default.nix
diff --git a/pkgs/development/python-modules/pytools/default.nix b/nixpkgs/pkgs/development/python-modules/pytools/default.nix
index 2de5b21d86f..2de5b21d86f 100644
--- a/pkgs/development/python-modules/pytools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytools/default.nix
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
index 0556ff93c13..0556ff93c13 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
diff --git a/pkgs/development/python-modules/pytrends/default.nix b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix
index db7f781c5bf..db7f781c5bf 100644
--- a/pkgs/development/python-modules/pytrends/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix
diff --git a/pkgs/development/python-modules/pytricia/default.nix b/nixpkgs/pkgs/development/python-modules/pytricia/default.nix
index 2f95d7fcecb..2f95d7fcecb 100644
--- a/pkgs/development/python-modules/pytricia/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytricia/default.nix
diff --git a/pkgs/development/python-modules/pytun/default.nix b/nixpkgs/pkgs/development/python-modules/pytun/default.nix
index 32e3b683e41..32e3b683e41 100644
--- a/pkgs/development/python-modules/pytun/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytun/default.nix
diff --git a/pkgs/development/python-modules/pytz/default.nix b/nixpkgs/pkgs/development/python-modules/pytz/default.nix
index e7ce3b62b5b..e7ce3b62b5b 100644
--- a/pkgs/development/python-modules/pytz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytz/default.nix
diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/nixpkgs/pkgs/development/python-modules/pytzdata/default.nix
index afda908113b..afda908113b 100644
--- a/pkgs/development/python-modules/pytzdata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytzdata/default.nix
diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix
index 16aa7b0ec31..16aa7b0ec31 100644
--- a/pkgs/development/python-modules/pyu2f/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix
diff --git a/pkgs/development/python-modules/pyudev/default.nix b/nixpkgs/pkgs/development/python-modules/pyudev/default.nix
index c35c35d6c57..c35c35d6c57 100644
--- a/pkgs/development/python-modules/pyudev/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyudev/default.nix
diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/nixpkgs/pkgs/development/python-modules/pyunifi/default.nix
index c87d9d465bc..c87d9d465bc 100644
--- a/pkgs/development/python-modules/pyunifi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyunifi/default.nix
diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix
index f4bf22854e7..f4bf22854e7 100644
--- a/pkgs/development/python-modules/pyupdate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix
diff --git a/pkgs/development/python-modules/pyusb/default.nix b/nixpkgs/pkgs/development/python-modules/pyusb/default.nix
index c54711bb6c8..c54711bb6c8 100644
--- a/pkgs/development/python-modules/pyusb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyusb/default.nix
diff --git a/pkgs/development/python-modules/pyutil/default.nix b/nixpkgs/pkgs/development/python-modules/pyutil/default.nix
index 2115374aa43..2115374aa43 100644
--- a/pkgs/development/python-modules/pyutil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyutil/default.nix
diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix
index e9397ad6fa8..e9397ad6fa8 100644
--- a/pkgs/development/python-modules/pyutilib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix
diff --git a/pkgs/development/python-modules/pyuv/default.nix b/nixpkgs/pkgs/development/python-modules/pyuv/default.nix
index cd76b283028..cd76b283028 100644
--- a/pkgs/development/python-modules/pyuv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyuv/default.nix
diff --git a/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch b/nixpkgs/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch
index 41e169acd5f..41e169acd5f 100644
--- a/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch
+++ b/nixpkgs/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch
diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/nixpkgs/pkgs/development/python-modules/pyvcd/default.nix
index aff3280e86c..aff3280e86c 100644
--- a/pkgs/development/python-modules/pyvcd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyvcd/default.nix
diff --git a/pkgs/development/python-modules/pyvcf/default.nix b/nixpkgs/pkgs/development/python-modules/pyvcf/default.nix
index 26d9d650d57..26d9d650d57 100644
--- a/pkgs/development/python-modules/pyvcf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyvcf/default.nix
diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix
index f83ee05bc26..f83ee05bc26 100644
--- a/pkgs/development/python-modules/pyviz-comms/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix
diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix
index a7fbf301295..a7fbf301295 100644
--- a/pkgs/development/python-modules/pyvmomi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix
diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix
index 83bdcec86bd..83bdcec86bd 100644
--- a/pkgs/development/python-modules/pyvoro/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix
diff --git a/pkgs/development/python-modules/pywal/convert.patch b/nixpkgs/pkgs/development/python-modules/pywal/convert.patch
index 999bc1abeaf..999bc1abeaf 100644
--- a/pkgs/development/python-modules/pywal/convert.patch
+++ b/nixpkgs/pkgs/development/python-modules/pywal/convert.patch
diff --git a/pkgs/development/python-modules/pywal/default.nix b/nixpkgs/pkgs/development/python-modules/pywal/default.nix
index 3fd61891878..3fd61891878 100644
--- a/pkgs/development/python-modules/pywal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pywal/default.nix
diff --git a/pkgs/development/python-modules/pywal/feh.patch b/nixpkgs/pkgs/development/python-modules/pywal/feh.patch
index 985e601d625..985e601d625 100644
--- a/pkgs/development/python-modules/pywal/feh.patch
+++ b/nixpkgs/pkgs/development/python-modules/pywal/feh.patch
diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/nixpkgs/pkgs/development/python-modules/pywatchman/default.nix
index 40aaea9c01a..40aaea9c01a 100644
--- a/pkgs/development/python-modules/pywatchman/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pywatchman/default.nix
diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix
index fbb226bb1f2..fbb226bb1f2 100644
--- a/pkgs/development/python-modules/pywavelets/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix
diff --git a/pkgs/development/python-modules/pywbem/default.nix b/nixpkgs/pkgs/development/python-modules/pywbem/default.nix
index c5ffb79a5d6..c5ffb79a5d6 100644
--- a/pkgs/development/python-modules/pywbem/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pywbem/default.nix
diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/nixpkgs/pkgs/development/python-modules/pywebdav/default.nix
index 15cb474f5fe..15cb474f5fe 100644
--- a/pkgs/development/python-modules/pywebdav/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pywebdav/default.nix
diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix
index ff9b20f8177..ff9b20f8177 100644
--- a/pkgs/development/python-modules/pywebpush/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix
diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/nixpkgs/pkgs/development/python-modules/pywinrm/default.nix
index 9ed44c83b60..9ed44c83b60 100644
--- a/pkgs/development/python-modules/pywinrm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pywinrm/default.nix
diff --git a/pkgs/development/python-modules/pyx/default.nix b/nixpkgs/pkgs/development/python-modules/pyx/default.nix
index 63e6e632100..63e6e632100 100644
--- a/pkgs/development/python-modules/pyx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyx/default.nix
diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix
index cba29c5cc9e..cba29c5cc9e 100644
--- a/pkgs/development/python-modules/pyxattr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix
diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix
index 2f2b6e9b543..2f2b6e9b543 100644
--- a/pkgs/development/python-modules/pyxdg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix
diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix
index c30dd0f024f..c30dd0f024f 100644
--- a/pkgs/development/python-modules/pyxl3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix
diff --git a/pkgs/development/python-modules/pyxml/default.nix b/nixpkgs/pkgs/development/python-modules/pyxml/default.nix
index 5a55c1f47bb..5a55c1f47bb 100644
--- a/pkgs/development/python-modules/pyxml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyxml/default.nix
diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/nixpkgs/pkgs/development/python-modules/pyyaml/default.nix
index 316e9974cfe..316e9974cfe 100644
--- a/pkgs/development/python-modules/pyyaml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyyaml/default.nix
diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix
index f1ecdf7c4f4..f1ecdf7c4f4 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix
diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix
index 20666010f9a..20666010f9a 100644
--- a/pkgs/development/python-modules/pyzufall/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix
diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix
index 00f15f801d1..00f15f801d1 100644
--- a/pkgs/development/python-modules/qasm2image/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix
diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/nixpkgs/pkgs/development/python-modules/qdarkstyle/default.nix
index 425bb21a687..425bb21a687 100644
--- a/pkgs/development/python-modules/qdarkstyle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qdarkstyle/default.nix
diff --git a/pkgs/development/python-modules/qds_sdk/default.nix b/nixpkgs/pkgs/development/python-modules/qds_sdk/default.nix
index 7b4cfa501dd..7b4cfa501dd 100644
--- a/pkgs/development/python-modules/qds_sdk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qds_sdk/default.nix
diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix
index 646d326fede..646d326fede 100644
--- a/pkgs/development/python-modules/qimage2ndarray/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix
diff --git a/pkgs/development/python-modules/qiskit/default.nix b/nixpkgs/pkgs/development/python-modules/qiskit/default.nix
index 89d02f7b803..89d02f7b803 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qiskit/default.nix
diff --git a/pkgs/development/python-modules/qpid-python/default.nix b/nixpkgs/pkgs/development/python-modules/qpid-python/default.nix
index 713e9db566e..713e9db566e 100644
--- a/pkgs/development/python-modules/qpid-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qpid-python/default.nix
diff --git a/pkgs/development/python-modules/qrcode/default.nix b/nixpkgs/pkgs/development/python-modules/qrcode/default.nix
index 714c7418897..714c7418897 100644
--- a/pkgs/development/python-modules/qrcode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qrcode/default.nix
diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix
index b5ce1eb26fe..b5ce1eb26fe 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix
diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix
index e44f6205d39..e44f6205d39 100644
--- a/pkgs/development/python-modules/qscintilla/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix
diff --git a/pkgs/development/python-modules/qserve/default.nix b/nixpkgs/pkgs/development/python-modules/qserve/default.nix
index ad1a7fd2ca3..ad1a7fd2ca3 100644
--- a/pkgs/development/python-modules/qserve/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qserve/default.nix
diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix
index 9392504ce26..9392504ce26 100644
--- a/pkgs/development/python-modules/qtawesome/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix
index 885eee8d4b6..885eee8d4b6 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix
diff --git a/pkgs/development/python-modules/qtpy/default.nix b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix
index 5d2210e00c4..5d2210e00c4 100644
--- a/pkgs/development/python-modules/qtpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix
diff --git a/pkgs/development/python-modules/quamash/default.nix b/nixpkgs/pkgs/development/python-modules/quamash/default.nix
index b39e081c471..b39e081c471 100644
--- a/pkgs/development/python-modules/quamash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/quamash/default.nix
diff --git a/pkgs/development/python-modules/quandl/default.nix b/nixpkgs/pkgs/development/python-modules/quandl/default.nix
index 385c51bcd3b..385c51bcd3b 100644
--- a/pkgs/development/python-modules/quandl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/quandl/default.nix
diff --git a/pkgs/development/python-modules/quantities/default.nix b/nixpkgs/pkgs/development/python-modules/quantities/default.nix
index 83cce4ad4ba..83cce4ad4ba 100644
--- a/pkgs/development/python-modules/quantities/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/quantities/default.nix
diff --git a/pkgs/development/python-modules/queuelib/default.nix b/nixpkgs/pkgs/development/python-modules/queuelib/default.nix
index dbcdd4c5924..dbcdd4c5924 100644
--- a/pkgs/development/python-modules/queuelib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/queuelib/default.nix
diff --git a/pkgs/development/python-modules/qutip/default.nix b/nixpkgs/pkgs/development/python-modules/qutip/default.nix
index 2f609651c8e..2f609651c8e 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/qutip/default.nix
diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix
index 920cc22fb39..920cc22fb39 100644
--- a/pkgs/development/python-modules/r2pipe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix
diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix
index 7406faca601..7406faca601 100644
--- a/pkgs/development/python-modules/rabbitpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix
diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix
index 08d4a8f36a3..08d4a8f36a3 100644
--- a/pkgs/development/python-modules/radicale_infcloud/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix
diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix
index d21da2c7583..d21da2c7583 100644
--- a/pkgs/development/python-modules/radio_beam/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix
diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix
index 7fc7f057009..7fc7f057009 100644
--- a/pkgs/development/python-modules/rainbowstream/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix
diff --git a/pkgs/development/python-modules/rainbowstream/image.patch b/nixpkgs/pkgs/development/python-modules/rainbowstream/image.patch
index 215152ae4fb..215152ae4fb 100644
--- a/pkgs/development/python-modules/rainbowstream/image.patch
+++ b/nixpkgs/pkgs/development/python-modules/rainbowstream/image.patch
diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix
index 0f870a5ab7a..0f870a5ab7a 100644
--- a/pkgs/development/python-modules/ramlfications/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix
diff --git a/pkgs/development/python-modules/random2/default.nix b/nixpkgs/pkgs/development/python-modules/random2/default.nix
index ecc049b34f4..ecc049b34f4 100644
--- a/pkgs/development/python-modules/random2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/random2/default.nix
diff --git a/pkgs/development/python-modules/rarfile/default.nix b/nixpkgs/pkgs/development/python-modules/rarfile/default.nix
index a2da451905a..a2da451905a 100644
--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rarfile/default.nix
diff --git a/pkgs/development/python-modules/rasterio/default.nix b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix
index 4fe5fd9e63b..4fe5fd9e63b 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix
diff --git a/pkgs/development/python-modules/ratelimiter/default.nix b/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix
index 375b6639368..375b6639368 100644
--- a/pkgs/development/python-modules/ratelimiter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix
diff --git a/pkgs/development/python-modules/raven/default.nix b/nixpkgs/pkgs/development/python-modules/raven/default.nix
index 9ea04fa8bdf..9ea04fa8bdf 100644
--- a/pkgs/development/python-modules/raven/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/raven/default.nix
diff --git a/pkgs/development/python-modules/rawkit/default.nix b/nixpkgs/pkgs/development/python-modules/rawkit/default.nix
index 6bee2bf1b0a..6bee2bf1b0a 100644
--- a/pkgs/development/python-modules/rawkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rawkit/default.nix
diff --git a/pkgs/development/python-modules/rbtools/default.nix b/nixpkgs/pkgs/development/python-modules/rbtools/default.nix
index 99f1df09bbf..99f1df09bbf 100644
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rbtools/default.nix
diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix
index 53a8e046b55..53a8e046b55 100644
--- a/pkgs/development/python-modules/rcssmin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix
diff --git a/pkgs/development/python-modules/rdflib/default.nix b/nixpkgs/pkgs/development/python-modules/rdflib/default.nix
index badaf9b3787..badaf9b3787 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rdflib/default.nix
diff --git a/pkgs/development/python-modules/readchar/default.nix b/nixpkgs/pkgs/development/python-modules/readchar/default.nix
index 1ed4539dca0..1ed4539dca0 100644
--- a/pkgs/development/python-modules/readchar/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/readchar/default.nix
diff --git a/pkgs/development/python-modules/readme/default.nix b/nixpkgs/pkgs/development/python-modules/readme/default.nix
index 057283babe7..057283babe7 100644
--- a/pkgs/development/python-modules/readme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/readme/default.nix
diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix
index 8369c3df943..8369c3df943 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix
diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
index 948e523cb7e..948e523cb7e 100644
--- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
diff --git a/pkgs/development/python-modules/rebulk/default.nix b/nixpkgs/pkgs/development/python-modules/rebulk/default.nix
index d1355560ac1..d1355560ac1 100644
--- a/pkgs/development/python-modules/rebulk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rebulk/default.nix
diff --git a/pkgs/development/python-modules/recaptcha_client/default.nix b/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix
index 09090540a5b..09090540a5b 100644
--- a/pkgs/development/python-modules/recaptcha_client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix
diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix
index 98cee494f3f..98cee494f3f 100644
--- a/pkgs/development/python-modules/recommonmark/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix
diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix
index c49f891ec1d..c49f891ec1d 100644
--- a/pkgs/development/python-modules/recursive-pth-loader/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix
diff --git a/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py b/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py
index 057e779803c..057e779803c 100644
--- a/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py
+++ b/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py
diff --git a/pkgs/development/python-modules/redis/default.nix b/nixpkgs/pkgs/development/python-modules/redis/default.nix
index 2da7470a838..2da7470a838 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/redis/default.nix
diff --git a/pkgs/development/python-modules/rednose/default.nix b/nixpkgs/pkgs/development/python-modules/rednose/default.nix
index fa142cf8723..fa142cf8723 100644
--- a/pkgs/development/python-modules/rednose/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rednose/default.nix
diff --git a/pkgs/development/python-modules/regex/default.nix b/nixpkgs/pkgs/development/python-modules/regex/default.nix
index 5a0cb50903a..5a0cb50903a 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/regex/default.nix
diff --git a/pkgs/development/python-modules/regional/default.nix b/nixpkgs/pkgs/development/python-modules/regional/default.nix
index 5f2aee1b42a..5f2aee1b42a 100644
--- a/pkgs/development/python-modules/regional/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/regional/default.nix
diff --git a/pkgs/development/python-modules/reikna/default.nix b/nixpkgs/pkgs/development/python-modules/reikna/default.nix
index 6a7cbdcc5af..6a7cbdcc5af 100644
--- a/pkgs/development/python-modules/reikna/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/reikna/default.nix
diff --git a/pkgs/development/python-modules/relatorio/default.nix b/nixpkgs/pkgs/development/python-modules/relatorio/default.nix
index ce9a4888eb9..ce9a4888eb9 100644
--- a/pkgs/development/python-modules/relatorio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/relatorio/default.nix
diff --git a/pkgs/development/python-modules/remotecv/default.nix b/nixpkgs/pkgs/development/python-modules/remotecv/default.nix
index 5c401fe799b..5c401fe799b 100644
--- a/pkgs/development/python-modules/remotecv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/remotecv/default.nix
diff --git a/pkgs/development/python-modules/remotecv/install_requires.patch b/nixpkgs/pkgs/development/python-modules/remotecv/install_requires.patch
index 37203128486..37203128486 100644
--- a/pkgs/development/python-modules/remotecv/install_requires.patch
+++ b/nixpkgs/pkgs/development/python-modules/remotecv/install_requires.patch
diff --git a/pkgs/development/python-modules/rencode/default.nix b/nixpkgs/pkgs/development/python-modules/rencode/default.nix
index 46f562ee5d6..46f562ee5d6 100644
--- a/pkgs/development/python-modules/rencode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rencode/default.nix
diff --git a/pkgs/development/python-modules/repeated_test/default.nix b/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix
index c5c2e43b657..c5c2e43b657 100644
--- a/pkgs/development/python-modules/repeated_test/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix
diff --git a/pkgs/development/python-modules/repocheck/default.nix b/nixpkgs/pkgs/development/python-modules/repocheck/default.nix
index 88437ae9032..88437ae9032 100644
--- a/pkgs/development/python-modules/repocheck/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/repocheck/default.nix
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/nixpkgs/pkgs/development/python-modules/reportlab/default.nix
index 2286ebbc4cc..2286ebbc4cc 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/reportlab/default.nix
diff --git a/pkgs/development/python-modules/repoze_lru/default.nix b/nixpkgs/pkgs/development/python-modules/repoze_lru/default.nix
index ef2a7fb246a..ef2a7fb246a 100644
--- a/pkgs/development/python-modules/repoze_lru/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/repoze_lru/default.nix
diff --git a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
index 9e144340fb3..9e144340fb3 100644
--- a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
diff --git a/pkgs/development/python-modules/repoze_who/default.nix b/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix
index 20001ff7ef8..20001ff7ef8 100644
--- a/pkgs/development/python-modules/repoze_who/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix
diff --git a/pkgs/development/python-modules/reproject/default.nix b/nixpkgs/pkgs/development/python-modules/reproject/default.nix
index 18fdd682f71..18fdd682f71 100644
--- a/pkgs/development/python-modules/reproject/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/reproject/default.nix
diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix
index 46d1dbdbbd6..46d1dbdbbd6 100644
--- a/pkgs/development/python-modules/requests-aws4auth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix
diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix
index e2409ec598f..e2409ec598f 100644
--- a/pkgs/development/python-modules/requests-cache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix
diff --git a/pkgs/development/python-modules/requests-file/default.nix b/nixpkgs/pkgs/development/python-modules/requests-file/default.nix
index fac22217651..fac22217651 100644
--- a/pkgs/development/python-modules/requests-file/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-file/default.nix
diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix
index 992c54930ca..992c54930ca 100644
--- a/pkgs/development/python-modules/requests-http-signature/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix
diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix
index ab0758a84e1..ab0758a84e1 100644
--- a/pkgs/development/python-modules/requests-kerberos/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix
diff --git a/pkgs/development/python-modules/requests-kerberos/fix_setup.patch b/nixpkgs/pkgs/development/python-modules/requests-kerberos/fix_setup.patch
index 67cc3a60f77..67cc3a60f77 100644
--- a/pkgs/development/python-modules/requests-kerberos/fix_setup.patch
+++ b/nixpkgs/pkgs/development/python-modules/requests-kerberos/fix_setup.patch
diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix
index 9728639e0ef..9728639e0ef 100644
--- a/pkgs/development/python-modules/requests-mock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix
diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix
index dd802abdb55..dd802abdb55 100644
--- a/pkgs/development/python-modules/requests-oauthlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix
diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix
index 8dba9a91226..8dba9a91226 100644
--- a/pkgs/development/python-modules/requests-toolbelt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix
diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix
index d0deaba9244..d0deaba9244 100644
--- a/pkgs/development/python-modules/requests-unixsocket/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix
diff --git a/pkgs/development/python-modules/requests/default.nix b/nixpkgs/pkgs/development/python-modules/requests/default.nix
index 260c0329576..260c0329576 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests/default.nix
diff --git a/pkgs/development/python-modules/requests_download/default.nix b/nixpkgs/pkgs/development/python-modules/requests_download/default.nix
index 8062834e180..8062834e180 100644
--- a/pkgs/development/python-modules/requests_download/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests_download/default.nix
diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/nixpkgs/pkgs/development/python-modules/requests_ntlm/default.nix
index 12cbae543ce..12cbae543ce 100644
--- a/pkgs/development/python-modules/requests_ntlm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requests_ntlm/default.nix
diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/nixpkgs/pkgs/development/python-modules/requestsexceptions/default.nix
index 55b32095535..55b32095535 100644
--- a/pkgs/development/python-modules/requestsexceptions/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requestsexceptions/default.nix
diff --git a/pkgs/development/python-modules/requirements-detector/default.nix b/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix
index 0d91cbc7509..0d91cbc7509 100644
--- a/pkgs/development/python-modules/requirements-detector/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix
diff --git a/pkgs/development/python-modules/resampy/default.nix b/nixpkgs/pkgs/development/python-modules/resampy/default.nix
index a83e196005d..a83e196005d 100644
--- a/pkgs/development/python-modules/resampy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/resampy/default.nix
diff --git a/pkgs/development/python-modules/responses/default.nix b/nixpkgs/pkgs/development/python-modules/responses/default.nix
index e98aad824b6..e98aad824b6 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/responses/default.nix
diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix
index 5163c7389b2..5163c7389b2 100644
--- a/pkgs/development/python-modules/restrictedpython/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix
diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix
index 340c558b7a4..340c558b7a4 100644
--- a/pkgs/development/python-modules/restructuredtext_lint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix
diff --git a/pkgs/development/python-modules/restview/default.nix b/nixpkgs/pkgs/development/python-modules/restview/default.nix
index a6b22220da3..a6b22220da3 100644
--- a/pkgs/development/python-modules/restview/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/restview/default.nix
diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix
index 7eea5d2c39f..7eea5d2c39f 100644
--- a/pkgs/development/python-modules/rethinkdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix
diff --git a/pkgs/development/python-modules/retry/default.nix b/nixpkgs/pkgs/development/python-modules/retry/default.nix
index a4743dcbfe4..a4743dcbfe4 100644
--- a/pkgs/development/python-modules/retry/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/retry/default.nix
diff --git a/pkgs/development/python-modules/retry_decorator/default.nix b/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix
index 496705acbc4..496705acbc4 100644
--- a/pkgs/development/python-modules/retry_decorator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix
diff --git a/pkgs/development/python-modules/retrying/default.nix b/nixpkgs/pkgs/development/python-modules/retrying/default.nix
index 9074634e9b6..9074634e9b6 100644
--- a/pkgs/development/python-modules/retrying/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/retrying/default.nix
diff --git a/pkgs/development/python-modules/rfc-bibtex/default.nix b/nixpkgs/pkgs/development/python-modules/rfc-bibtex/default.nix
index dd114fd7096..dd114fd7096 100644
--- a/pkgs/development/python-modules/rfc-bibtex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rfc-bibtex/default.nix
diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix
index eda1be2c110..eda1be2c110 100644
--- a/pkgs/development/python-modules/rfc3986/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix
diff --git a/pkgs/development/python-modules/rfc3987/default.nix b/nixpkgs/pkgs/development/python-modules/rfc3987/default.nix
index 6488dfdd8ce..6488dfdd8ce 100644
--- a/pkgs/development/python-modules/rfc3987/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rfc3987/default.nix
diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix
index 0bd7b0ca686..0bd7b0ca686 100644
--- a/pkgs/development/python-modules/rfc6555/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix
diff --git a/pkgs/development/python-modules/rfc6555/disable_network_tests.patch b/nixpkgs/pkgs/development/python-modules/rfc6555/disable_network_tests.patch
index dc59111ac43..dc59111ac43 100644
--- a/pkgs/development/python-modules/rfc6555/disable_network_tests.patch
+++ b/nixpkgs/pkgs/development/python-modules/rfc6555/disable_network_tests.patch
diff --git a/pkgs/development/python-modules/rfc7464/default.nix b/nixpkgs/pkgs/development/python-modules/rfc7464/default.nix
index 60a5308d718..60a5308d718 100644
--- a/pkgs/development/python-modules/rfc7464/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rfc7464/default.nix
diff --git a/pkgs/development/python-modules/rhpl/builder.sh b/nixpkgs/pkgs/development/python-modules/rhpl/builder.sh
index dc93effe802..dc93effe802 100644
--- a/pkgs/development/python-modules/rhpl/builder.sh
+++ b/nixpkgs/pkgs/development/python-modules/rhpl/builder.sh
diff --git a/pkgs/development/python-modules/rhpl/default.nix b/nixpkgs/pkgs/development/python-modules/rhpl/default.nix
index 577c21d6e0b..577c21d6e0b 100644
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rhpl/default.nix
diff --git a/pkgs/development/python-modules/rig/default.nix b/nixpkgs/pkgs/development/python-modules/rig/default.nix
index d83afd7885f..d83afd7885f 100644
--- a/pkgs/development/python-modules/rig/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rig/default.nix
diff --git a/pkgs/development/python-modules/ripser/default.nix b/nixpkgs/pkgs/development/python-modules/ripser/default.nix
index 258ad7cece1..258ad7cece1 100644
--- a/pkgs/development/python-modules/ripser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ripser/default.nix
diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix
index 287ae0391df..287ae0391df 100644
--- a/pkgs/development/python-modules/rjsmin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix
diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix
index bee588457ff..bee588457ff 100644
--- a/pkgs/development/python-modules/rl-coach/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix
diff --git a/pkgs/development/python-modules/rlp/default.nix b/nixpkgs/pkgs/development/python-modules/rlp/default.nix
index 303a8bc6d7f..303a8bc6d7f 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rlp/default.nix
diff --git a/pkgs/development/python-modules/robomachine/default.nix b/nixpkgs/pkgs/development/python-modules/robomachine/default.nix
index c1695a25b45..c1695a25b45 100644
--- a/pkgs/development/python-modules/robomachine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robomachine/default.nix
diff --git a/pkgs/development/python-modules/roboschool/default.nix b/nixpkgs/pkgs/development/python-modules/roboschool/default.nix
index a86e17e921b..a86e17e921b 100644
--- a/pkgs/development/python-modules/roboschool/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/roboschool/default.nix
diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix
index 81428b44ad9..81428b44ad9 100644
--- a/pkgs/development/python-modules/robot-detection/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix
diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix
index 9baf3e40227..9baf3e40227 100644
--- a/pkgs/development/python-modules/robotframework-requests/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix
diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix
index 4db1db04acc..4db1db04acc 100644
--- a/pkgs/development/python-modules/robotframework-ride/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix
diff --git a/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix
index 67f04f4f991..67f04f4f991 100644
--- a/pkgs/development/python-modules/robotframework-selenium2library/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix
diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
index 7294126f516..7294126f516 100644
--- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
index b5ca464938b..b5ca464938b 100644
--- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix
index 97bc9de0bf7..97bc9de0bf7 100644
--- a/pkgs/development/python-modules/robotframework-tools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix
diff --git a/pkgs/development/python-modules/robotframework/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework/default.nix
index bd96da28964..bd96da28964 100644
--- a/pkgs/development/python-modules/robotframework/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotframework/default.nix
diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix
index 1a2ef201c50..1a2ef201c50 100644
--- a/pkgs/development/python-modules/robotstatuschecker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix
diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix
index 59ef766adf1..59ef766adf1 100644
--- a/pkgs/development/python-modules/robotsuite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix
diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/nixpkgs/pkgs/development/python-modules/rocket-errbot/default.nix
index 616927531a5..616927531a5 100644
--- a/pkgs/development/python-modules/rocket-errbot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rocket-errbot/default.nix
diff --git a/pkgs/development/python-modules/roman/default.nix b/nixpkgs/pkgs/development/python-modules/roman/default.nix
index 52d45d72875..52d45d72875 100644
--- a/pkgs/development/python-modules/roman/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/roman/default.nix
diff --git a/pkgs/development/python-modules/rope/default.nix b/nixpkgs/pkgs/development/python-modules/rope/default.nix
index 66340f91770..66340f91770 100644
--- a/pkgs/development/python-modules/rope/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rope/default.nix
diff --git a/pkgs/development/python-modules/ropper/default.nix b/nixpkgs/pkgs/development/python-modules/ropper/default.nix
index 9a0b91fdeb8..9a0b91fdeb8 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ropper/default.nix
diff --git a/pkgs/development/python-modules/routes/default.nix b/nixpkgs/pkgs/development/python-modules/routes/default.nix
index 1e2e67c6206..1e2e67c6206 100644
--- a/pkgs/development/python-modules/routes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/routes/default.nix
diff --git a/pkgs/development/python-modules/rpdb/default.nix b/nixpkgs/pkgs/development/python-modules/rpdb/default.nix
index 8b22ef967d5..8b22ef967d5 100644
--- a/pkgs/development/python-modules/rpdb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rpdb/default.nix
diff --git a/pkgs/development/python-modules/rpkg/default.nix b/nixpkgs/pkgs/development/python-modules/rpkg/default.nix
index bbe20fd1e82..bbe20fd1e82 100644
--- a/pkgs/development/python-modules/rpkg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rpkg/default.nix
diff --git a/pkgs/development/python-modules/rply/default.nix b/nixpkgs/pkgs/development/python-modules/rply/default.nix
index a468bee275c..a468bee275c 100644
--- a/pkgs/development/python-modules/rply/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rply/default.nix
diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix
index 76fc508a5d8..76fc508a5d8 100644
--- a/pkgs/development/python-modules/rpmfluff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix
diff --git a/pkgs/development/python-modules/rpy2/2.nix b/nixpkgs/pkgs/development/python-modules/rpy2/2.nix
index aef184d4afc..aef184d4afc 100644
--- a/pkgs/development/python-modules/rpy2/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/rpy2/2.nix
diff --git a/pkgs/development/python-modules/rpy2/default.nix b/nixpkgs/pkgs/development/python-modules/rpy2/default.nix
index 5a00b18557a..5a00b18557a 100644
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rpy2/default.nix
diff --git a/pkgs/development/python-modules/rpy2/r-libs-site.patch b/nixpkgs/pkgs/development/python-modules/rpy2/r-libs-site.patch
index a55b6038bb4..a55b6038bb4 100644
--- a/pkgs/development/python-modules/rpy2/r-libs-site.patch
+++ b/nixpkgs/pkgs/development/python-modules/rpy2/r-libs-site.patch
diff --git a/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch b/nixpkgs/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch
index 177e4f9a83d..177e4f9a83d 100644
--- a/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch
+++ b/nixpkgs/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch
diff --git a/pkgs/development/python-modules/rpyc/default.nix b/nixpkgs/pkgs/development/python-modules/rpyc/default.nix
index 42d7b442ad6..42d7b442ad6 100644
--- a/pkgs/development/python-modules/rpyc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rpyc/default.nix
diff --git a/pkgs/development/python-modules/rq/default.nix b/nixpkgs/pkgs/development/python-modules/rq/default.nix
index 8c91579d241..8c91579d241 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rq/default.nix
diff --git a/pkgs/development/python-modules/rsa/default.nix b/nixpkgs/pkgs/development/python-modules/rsa/default.nix
index 1b3d339b078..1b3d339b078 100644
--- a/pkgs/development/python-modules/rsa/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rsa/default.nix
diff --git a/pkgs/development/python-modules/rtslib/default.nix b/nixpkgs/pkgs/development/python-modules/rtslib/default.nix
index c1d27488bdd..c1d27488bdd 100644
--- a/pkgs/development/python-modules/rtslib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rtslib/default.nix
diff --git a/pkgs/development/python-modules/ruamel_base/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_base/default.nix
index ba6a79fdd63..ba6a79fdd63 100644
--- a/pkgs/development/python-modules/ruamel_base/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ruamel_base/default.nix
diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix
index ee329a65166..ee329a65166 100644
--- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix
diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix
index 88b2de830b7..88b2de830b7 100644
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix
diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
index 19c208f2716..19c208f2716 100644
--- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix
index f3784342281..f3784342281 100644
--- a/pkgs/development/python-modules/rubymarshal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix
diff --git a/pkgs/development/python-modules/ruffus/default.nix b/nixpkgs/pkgs/development/python-modules/ruffus/default.nix
index 37222964b04..37222964b04 100644
--- a/pkgs/development/python-modules/ruffus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ruffus/default.nix
diff --git a/pkgs/development/python-modules/runsnakerun/default.nix b/nixpkgs/pkgs/development/python-modules/runsnakerun/default.nix
index b3a38320a2b..b3a38320a2b 100644
--- a/pkgs/development/python-modules/runsnakerun/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/runsnakerun/default.nix
diff --git a/pkgs/development/python-modules/runway-python/default.nix b/nixpkgs/pkgs/development/python-modules/runway-python/default.nix
index fca11c100cf..fca11c100cf 100644
--- a/pkgs/development/python-modules/runway-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/runway-python/default.nix
diff --git a/pkgs/development/python-modules/rx/default.nix b/nixpkgs/pkgs/development/python-modules/rx/default.nix
index 6183596ef7d..6183596ef7d 100644
--- a/pkgs/development/python-modules/rx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rx/default.nix
diff --git a/pkgs/development/python-modules/rxv/default.nix b/nixpkgs/pkgs/development/python-modules/rxv/default.nix
index 8133936798e..8133936798e 100644
--- a/pkgs/development/python-modules/rxv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rxv/default.nix
diff --git a/pkgs/development/python-modules/s2clientprotocol/default.nix b/nixpkgs/pkgs/development/python-modules/s2clientprotocol/default.nix
index 5fbf4b6fab2..5fbf4b6fab2 100644
--- a/pkgs/development/python-modules/s2clientprotocol/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/s2clientprotocol/default.nix
diff --git a/pkgs/development/python-modules/s2clientprotocol/pure-version.patch b/nixpkgs/pkgs/development/python-modules/s2clientprotocol/pure-version.patch
index 43675c3bb11..43675c3bb11 100644
--- a/pkgs/development/python-modules/s2clientprotocol/pure-version.patch
+++ b/nixpkgs/pkgs/development/python-modules/s2clientprotocol/pure-version.patch
diff --git a/pkgs/development/python-modules/s3fs/default.nix b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
index 0f800c14fa9..0f800c14fa9 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix
index 3020ab68ec7..3020ab68ec7 100644
--- a/pkgs/development/python-modules/s3transfer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix
diff --git a/pkgs/development/python-modules/sabyenc/default.nix b/nixpkgs/pkgs/development/python-modules/sabyenc/default.nix
index e8294ce7bcd..e8294ce7bcd 100644
--- a/pkgs/development/python-modules/sabyenc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sabyenc/default.nix
diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix
index ef0fcb57dc9..ef0fcb57dc9 100644
--- a/pkgs/development/python-modules/sacremoses/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix
diff --git a/pkgs/development/python-modules/safe/default.nix b/nixpkgs/pkgs/development/python-modules/safe/default.nix
index f7f6f7eabf9..f7f6f7eabf9 100644
--- a/pkgs/development/python-modules/safe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/safe/default.nix
diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix
index afd915ed840..afd915ed840 100644
--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix
diff --git a/pkgs/development/python-modules/sampledata/default.nix b/nixpkgs/pkgs/development/python-modules/sampledata/default.nix
index fcc27e3c4db..fcc27e3c4db 100644
--- a/pkgs/development/python-modules/sampledata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sampledata/default.nix
diff --git a/pkgs/development/python-modules/samplerate/default.nix b/nixpkgs/pkgs/development/python-modules/samplerate/default.nix
index 8de675d4ea1..8de675d4ea1 100644
--- a/pkgs/development/python-modules/samplerate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/samplerate/default.nix
diff --git a/pkgs/development/python-modules/sandboxlib/default.nix b/nixpkgs/pkgs/development/python-modules/sandboxlib/default.nix
index 1a3511dab97..1a3511dab97 100644
--- a/pkgs/development/python-modules/sandboxlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sandboxlib/default.nix
diff --git a/pkgs/development/python-modules/sanic/default.nix b/nixpkgs/pkgs/development/python-modules/sanic/default.nix
index 5c1e0e81246..5c1e0e81246 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sanic/default.nix
diff --git a/pkgs/development/python-modules/sarge/default.nix b/nixpkgs/pkgs/development/python-modules/sarge/default.nix
index 4d7a3a5972f..4d7a3a5972f 100644
--- a/pkgs/development/python-modules/sarge/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sarge/default.nix
diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix
index 2aec6dced1c..2aec6dced1c 100644
--- a/pkgs/development/python-modules/sasmodels/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix
diff --git a/pkgs/development/python-modules/scales/default.nix b/nixpkgs/pkgs/development/python-modules/scales/default.nix
index 4fb169b1558..4fb169b1558 100644
--- a/pkgs/development/python-modules/scales/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scales/default.nix
diff --git a/pkgs/development/python-modules/scandir/default.nix b/nixpkgs/pkgs/development/python-modules/scandir/default.nix
index bc71fde5ced..bc71fde5ced 100644
--- a/pkgs/development/python-modules/scandir/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scandir/default.nix
diff --git a/pkgs/development/python-modules/scapy/default.nix b/nixpkgs/pkgs/development/python-modules/scapy/default.nix
index 4f058a0761b..4f058a0761b 100644
--- a/pkgs/development/python-modules/scapy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scapy/default.nix
diff --git a/pkgs/development/python-modules/scapy/fix-version.patch b/nixpkgs/pkgs/development/python-modules/scapy/fix-version.patch
index c39458e9fea..c39458e9fea 100644
--- a/pkgs/development/python-modules/scapy/fix-version.patch
+++ b/nixpkgs/pkgs/development/python-modules/scapy/fix-version.patch
diff --git a/pkgs/development/python-modules/schedule/default.nix b/nixpkgs/pkgs/development/python-modules/schedule/default.nix
index 4d4ec409e02..4d4ec409e02 100644
--- a/pkgs/development/python-modules/schedule/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/schedule/default.nix
diff --git a/pkgs/development/python-modules/schema/default.nix b/nixpkgs/pkgs/development/python-modules/schema/default.nix
index 2c1173ce68f..2c1173ce68f 100644
--- a/pkgs/development/python-modules/schema/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/schema/default.nix
diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix
index c5e36f8ac07..c5e36f8ac07 100644
--- a/pkgs/development/python-modules/scikit-bio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix
diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix
index 8d459e24984..8d459e24984 100644
--- a/pkgs/development/python-modules/scikit-build/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix
diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix
index 122af8cfda2..122af8cfda2 100644
--- a/pkgs/development/python-modules/scikit-fmm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix
index fa6ced432f7..fa6ced432f7 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix
diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix
index f82dc947b06..f82dc947b06 100644
--- a/pkgs/development/python-modules/scikit-optimize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix
diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix
index 0c33f7a0dab..0c33f7a0dab 100644
--- a/pkgs/development/python-modules/scikit-tda/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix
diff --git a/pkgs/development/python-modules/scikitlearn/0.20.nix b/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix
index 92977331a84..92977331a84 100644
--- a/pkgs/development/python-modules/scikitlearn/0.20.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix
diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix
index 4830e3fb2ab..4830e3fb2ab 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix
diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix
index 89ffe334e7f..89ffe334e7f 100644
--- a/pkgs/development/python-modules/scikits-odes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix
diff --git a/pkgs/development/python-modules/scipy/default.nix b/nixpkgs/pkgs/development/python-modules/scipy/default.nix
index 6c62adb7821..6c62adb7821 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scipy/default.nix
diff --git a/pkgs/development/python-modules/scour/default.nix b/nixpkgs/pkgs/development/python-modules/scour/default.nix
index 7c198519331..7c198519331 100644
--- a/pkgs/development/python-modules/scour/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scour/default.nix
diff --git a/pkgs/development/python-modules/scp/default.nix b/nixpkgs/pkgs/development/python-modules/scp/default.nix
index c57d10cf890..c57d10cf890 100644
--- a/pkgs/development/python-modules/scp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scp/default.nix
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix
index 8fee4b6631a..8fee4b6631a 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix
diff --git a/pkgs/development/python-modules/scrapy/permissions-fix.patch b/nixpkgs/pkgs/development/python-modules/scrapy/permissions-fix.patch
index 53038cf74e5..53038cf74e5 100644
--- a/pkgs/development/python-modules/scrapy/permissions-fix.patch
+++ b/nixpkgs/pkgs/development/python-modules/scrapy/permissions-fix.patch
diff --git a/pkgs/development/python-modules/scripttest/default.nix b/nixpkgs/pkgs/development/python-modules/scripttest/default.nix
index 2ae7a4c8e36..2ae7a4c8e36 100644
--- a/pkgs/development/python-modules/scripttest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scripttest/default.nix
diff --git a/pkgs/development/python-modules/sdnotify/default.nix b/nixpkgs/pkgs/development/python-modules/sdnotify/default.nix
index 47845382178..47845382178 100644
--- a/pkgs/development/python-modules/sdnotify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sdnotify/default.nix
diff --git a/pkgs/development/python-modules/seaborn/default.nix b/nixpkgs/pkgs/development/python-modules/seaborn/default.nix
index d596c640823..d596c640823 100644
--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/seaborn/default.nix
diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix
index 8555c024c76..8555c024c76 100644
--- a/pkgs/development/python-modules/seabreeze/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix
diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
index 6b9f00783fd..6b9f00783fd 100644
--- a/pkgs/development/python-modules/secp256k1/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
diff --git a/pkgs/development/python-modules/secretstorage/2.nix b/nixpkgs/pkgs/development/python-modules/secretstorage/2.nix
index 8fa044e638a..8fa044e638a 100644
--- a/pkgs/development/python-modules/secretstorage/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/secretstorage/2.nix
diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix
index e2c3e975b9a..e2c3e975b9a 100644
--- a/pkgs/development/python-modules/secretstorage/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix
diff --git a/pkgs/development/python-modules/secure/default.nix b/nixpkgs/pkgs/development/python-modules/secure/default.nix
index 6d2f2871ec2..6d2f2871ec2 100644
--- a/pkgs/development/python-modules/secure/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/secure/default.nix
diff --git a/pkgs/development/python-modules/seekpath/default.nix b/nixpkgs/pkgs/development/python-modules/seekpath/default.nix
index fc2763be1f0..fc2763be1f0 100644
--- a/pkgs/development/python-modules/seekpath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/seekpath/default.nix
diff --git a/pkgs/development/python-modules/selectors2/default.nix b/nixpkgs/pkgs/development/python-modules/selectors2/default.nix
index 030178fef83..030178fef83 100644
--- a/pkgs/development/python-modules/selectors2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/selectors2/default.nix
diff --git a/pkgs/development/python-modules/selectors34/default.nix b/nixpkgs/pkgs/development/python-modules/selectors34/default.nix
index 7bb66be3096..7bb66be3096 100644
--- a/pkgs/development/python-modules/selectors34/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/selectors34/default.nix
diff --git a/pkgs/development/python-modules/selenium/default.nix b/nixpkgs/pkgs/development/python-modules/selenium/default.nix
index ada159aaa12..ada159aaa12 100644
--- a/pkgs/development/python-modules/selenium/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/selenium/default.nix
diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix
index f2df3c99b2a..f2df3c99b2a 100644
--- a/pkgs/development/python-modules/semantic-version/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix
diff --git a/pkgs/development/python-modules/semantic/default.nix b/nixpkgs/pkgs/development/python-modules/semantic/default.nix
index b5855fbb143..b5855fbb143 100644
--- a/pkgs/development/python-modules/semantic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/semantic/default.nix
diff --git a/pkgs/development/python-modules/semver/default.nix b/nixpkgs/pkgs/development/python-modules/semver/default.nix
index 3201de0ba46..3201de0ba46 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/semver/default.nix
diff --git a/pkgs/development/python-modules/send2trash/default.nix b/nixpkgs/pkgs/development/python-modules/send2trash/default.nix
index bb9f115590e..bb9f115590e 100644
--- a/pkgs/development/python-modules/send2trash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/send2trash/default.nix
diff --git a/pkgs/development/python-modules/sentencepiece/default.nix b/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix
index ab7a5387c02..ab7a5387c02 100644
--- a/pkgs/development/python-modules/sentencepiece/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix
diff --git a/pkgs/development/python-modules/sentinel/default.nix b/nixpkgs/pkgs/development/python-modules/sentinel/default.nix
index 6c69ea26b2a..6c69ea26b2a 100644
--- a/pkgs/development/python-modules/sentinel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sentinel/default.nix
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
index d556dcb74cf..d556dcb74cf 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix
index 1790ae2e8f5..1790ae2e8f5 100644
--- a/pkgs/development/python-modules/sepaxml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix
diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix
index 1f6307f2cbb..1f6307f2cbb 100644
--- a/pkgs/development/python-modules/seqdiag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix
diff --git a/pkgs/development/python-modules/serpent/default.nix b/nixpkgs/pkgs/development/python-modules/serpent/default.nix
index f568ad6b044..f568ad6b044 100644
--- a/pkgs/development/python-modules/serpent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/serpent/default.nix
diff --git a/pkgs/development/python-modules/serpy/default.nix b/nixpkgs/pkgs/development/python-modules/serpy/default.nix
index b627322307d..b627322307d 100644
--- a/pkgs/development/python-modules/serpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/serpy/default.nix
diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix
index 90be965c4f2..90be965c4f2 100644
--- a/pkgs/development/python-modules/serverlessrepo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix
diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix
index 2f7acce976d..2f7acce976d 100644
--- a/pkgs/development/python-modules/serversyncstorage/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix
diff --git a/pkgs/development/python-modules/service_identity/default.nix b/nixpkgs/pkgs/development/python-modules/service_identity/default.nix
index f39dd48232b..f39dd48232b 100644
--- a/pkgs/development/python-modules/service_identity/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/service_identity/default.nix
diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix
index e45638edd10..e45638edd10 100644
--- a/pkgs/development/python-modules/setproctitle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix
diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-git/default.nix
index 862a7bc2778..862a7bc2778 100644
--- a/pkgs/development/python-modules/setuptools-git/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptools-git/default.nix
diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix
index 9c08871339a..9c08871339a 100644
--- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix
index 194b90cb42a..194b90cb42a 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix
diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix
index eda01679528..eda01679528 100644
--- a/pkgs/development/python-modules/setuptools_scm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix
diff --git a/pkgs/development/python-modules/setuptoolsdarcs/default.nix b/nixpkgs/pkgs/development/python-modules/setuptoolsdarcs/default.nix
index d696a5be08f..d696a5be08f 100644
--- a/pkgs/development/python-modules/setuptoolsdarcs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptoolsdarcs/default.nix
diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix
index b393d0eb200..b393d0eb200 100644
--- a/pkgs/development/python-modules/setuptoolstrial/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix
diff --git a/pkgs/development/python-modules/sexpdata/default.nix b/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix
index 1e282f9660a..1e282f9660a 100644
--- a/pkgs/development/python-modules/sexpdata/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix
diff --git a/pkgs/development/python-modules/sh/default.nix b/nixpkgs/pkgs/development/python-modules/sh/default.nix
index aa18f07e49e..aa18f07e49e 100644
--- a/pkgs/development/python-modules/sh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sh/default.nix
diff --git a/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch b/nixpkgs/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch
index 6488dd1ffea..6488dd1ffea 100644
--- a/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch
+++ b/nixpkgs/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch
diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix
index 13a946aeafd..13a946aeafd 100644
--- a/pkgs/development/python-modules/shamir-mnemonic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix
diff --git a/pkgs/development/python-modules/shapely/default.nix b/nixpkgs/pkgs/development/python-modules/shapely/default.nix
index 220726733dc..220726733dc 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shapely/default.nix
diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/nixpkgs/pkgs/development/python-modules/shapely/library-paths.patch
index f75ad7a9486..f75ad7a9486 100644
--- a/pkgs/development/python-modules/shapely/library-paths.patch
+++ b/nixpkgs/pkgs/development/python-modules/shapely/library-paths.patch
diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/nixpkgs/pkgs/development/python-modules/sharedmem/default.nix
index 42277fc00c5..42277fc00c5 100644
--- a/pkgs/development/python-modules/sharedmem/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sharedmem/default.nix
diff --git a/pkgs/development/python-modules/shellingham/default.nix b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix
index 707a79e1055..707a79e1055 100644
--- a/pkgs/development/python-modules/shellingham/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix
diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix
index 9b2062dbf6c..9b2062dbf6c 100644
--- a/pkgs/development/python-modules/shiboken2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix
diff --git a/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch b/nixpkgs/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch
index 0884c020e83..0884c020e83 100644
--- a/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch
+++ b/nixpkgs/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch
diff --git a/pkgs/development/python-modules/shippai/default.nix b/nixpkgs/pkgs/development/python-modules/shippai/default.nix
index 7682d208603..7682d208603 100644
--- a/pkgs/development/python-modules/shippai/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shippai/default.nix
diff --git a/pkgs/development/python-modules/shodan/default.nix b/nixpkgs/pkgs/development/python-modules/shodan/default.nix
index 909c54788b2..909c54788b2 100644
--- a/pkgs/development/python-modules/shodan/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shodan/default.nix
diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix
index ac2fef9f2df..ac2fef9f2df 100644
--- a/pkgs/development/python-modules/shortuuid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix
diff --git a/pkgs/development/python-modules/should-dsl/default.nix b/nixpkgs/pkgs/development/python-modules/should-dsl/default.nix
index 987d7e60cea..987d7e60cea 100644
--- a/pkgs/development/python-modules/should-dsl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/should-dsl/default.nix
diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix
index ccff9ff4b9f..ccff9ff4b9f 100644
--- a/pkgs/development/python-modules/shouldbe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix
diff --git a/pkgs/development/python-modules/showit/default.nix b/nixpkgs/pkgs/development/python-modules/showit/default.nix
index 4060b1a4fc5..4060b1a4fc5 100644
--- a/pkgs/development/python-modules/showit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/showit/default.nix
diff --git a/pkgs/development/python-modules/shutilwhich/default.nix b/nixpkgs/pkgs/development/python-modules/shutilwhich/default.nix
index d88141c8b35..d88141c8b35 100644
--- a/pkgs/development/python-modules/shutilwhich/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/shutilwhich/default.nix
diff --git a/pkgs/development/python-modules/sievelib/default.nix b/nixpkgs/pkgs/development/python-modules/sievelib/default.nix
index d579f3ef744..d579f3ef744 100644
--- a/pkgs/development/python-modules/sievelib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sievelib/default.nix
diff --git a/pkgs/development/python-modules/signedjson/default.nix b/nixpkgs/pkgs/development/python-modules/signedjson/default.nix
index 33a615fefd4..33a615fefd4 100644
--- a/pkgs/development/python-modules/signedjson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/signedjson/default.nix
diff --git a/pkgs/development/python-modules/sigtools/default.nix b/nixpkgs/pkgs/development/python-modules/sigtools/default.nix
index 92a39e26da0..92a39e26da0 100644
--- a/pkgs/development/python-modules/sigtools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sigtools/default.nix
diff --git a/pkgs/development/python-modules/simanneal/default.nix b/nixpkgs/pkgs/development/python-modules/simanneal/default.nix
index ad1f2643e5f..ad1f2643e5f 100644
--- a/pkgs/development/python-modules/simanneal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simanneal/default.nix
diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix
index 1eacd25bede..1eacd25bede 100644
--- a/pkgs/development/python-modules/simple-salesforce/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix
diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix
index 312f58bf9fa..312f58bf9fa 100644
--- a/pkgs/development/python-modules/simple-websocket-server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix
diff --git a/pkgs/development/python-modules/simpleai/default.nix b/nixpkgs/pkgs/development/python-modules/simpleai/default.nix
index 230ac17fa0a..230ac17fa0a 100644
--- a/pkgs/development/python-modules/simpleai/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simpleai/default.nix
diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix
index 57f7df73c21..57f7df73c21 100644
--- a/pkgs/development/python-modules/simplebayes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix
diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/nixpkgs/pkgs/development/python-modules/simpleeval/default.nix
index 0aded2f423f..0aded2f423f 100644
--- a/pkgs/development/python-modules/simpleeval/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simpleeval/default.nix
diff --git a/pkgs/development/python-modules/simplefix/default.nix b/nixpkgs/pkgs/development/python-modules/simplefix/default.nix
index 8b84d6a248e..8b84d6a248e 100644
--- a/pkgs/development/python-modules/simplefix/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simplefix/default.nix
diff --git a/pkgs/development/python-modules/simplegeneric/default.nix b/nixpkgs/pkgs/development/python-modules/simplegeneric/default.nix
index 491e218154c..491e218154c 100644
--- a/pkgs/development/python-modules/simplegeneric/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simplegeneric/default.nix
diff --git a/pkgs/development/python-modules/simplejson/default.nix b/nixpkgs/pkgs/development/python-modules/simplejson/default.nix
index 54e19d2e604..54e19d2e604 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simplejson/default.nix
diff --git a/pkgs/development/python-modules/simplekml/default.nix b/nixpkgs/pkgs/development/python-modules/simplekml/default.nix
index d97c1b0c963..d97c1b0c963 100644
--- a/pkgs/development/python-modules/simplekml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simplekml/default.nix
diff --git a/pkgs/development/python-modules/simpleparse/default.nix b/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix
index 339f6d1debd..339f6d1debd 100644
--- a/pkgs/development/python-modules/simpleparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix
diff --git a/pkgs/development/python-modules/simpy/default.nix b/nixpkgs/pkgs/development/python-modules/simpy/default.nix
index 981b6693f7d..981b6693f7d 100644
--- a/pkgs/development/python-modules/simpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/simpy/default.nix
diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/nixpkgs/pkgs/development/python-modules/singledispatch/default.nix
index e0b207735df..e0b207735df 100644
--- a/pkgs/development/python-modules/singledispatch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/singledispatch/default.nix
diff --git a/pkgs/development/python-modules/sip/default.nix b/nixpkgs/pkgs/development/python-modules/sip/default.nix
index cb1575f9349..cb1575f9349 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sip/default.nix
diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix
index 63425d2b8bd..63425d2b8bd 100644
--- a/pkgs/development/python-modules/sipsimple/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix
diff --git a/pkgs/development/python-modules/six/default.nix b/nixpkgs/pkgs/development/python-modules/six/default.nix
index 8bfd32aa093..8bfd32aa093 100644
--- a/pkgs/development/python-modules/six/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/six/default.nix
diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix
index 47df62dd1c6..47df62dd1c6 100644
--- a/pkgs/development/python-modules/sklearn-deap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix
diff --git a/pkgs/development/python-modules/slackclient/default.nix b/nixpkgs/pkgs/development/python-modules/slackclient/default.nix
index 6a16b38c6e1..6a16b38c6e1 100644
--- a/pkgs/development/python-modules/slackclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slackclient/default.nix
diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix
index 426019fc8a9..426019fc8a9 100644
--- a/pkgs/development/python-modules/sleekxmpp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix
diff --git a/pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch b/nixpkgs/pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch
index d8d6eb10683..d8d6eb10683 100644
--- a/pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch
+++ b/nixpkgs/pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch
diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix
index 3273e5fe3a3..3273e5fe3a3 100644
--- a/pkgs/development/python-modules/slicedimage/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix
diff --git a/pkgs/development/python-modules/slicerator/default.nix b/nixpkgs/pkgs/development/python-modules/slicerator/default.nix
index 896ecbdd26b..896ecbdd26b 100644
--- a/pkgs/development/python-modules/slicerator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slicerator/default.nix
diff --git a/pkgs/development/python-modules/slimit/default.nix b/nixpkgs/pkgs/development/python-modules/slimit/default.nix
index e82cbe5b705..e82cbe5b705 100644
--- a/pkgs/development/python-modules/slimit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slimit/default.nix
diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix
index 0f12dbb8850..0f12dbb8850 100644
--- a/pkgs/development/python-modules/slither-analyzer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix
diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix
index 53d2006315c..53d2006315c 100644
--- a/pkgs/development/python-modules/slixmpp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix
diff --git a/pkgs/development/python-modules/slixmpp/hardcode-gnupg-path.patch b/nixpkgs/pkgs/development/python-modules/slixmpp/hardcode-gnupg-path.patch
index 4bb3b7c7349..4bb3b7c7349 100644
--- a/pkgs/development/python-modules/slixmpp/hardcode-gnupg-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/slixmpp/hardcode-gnupg-path.patch
diff --git a/pkgs/development/python-modules/slob/default.nix b/nixpkgs/pkgs/development/python-modules/slob/default.nix
index 8a6971ceb8f..8a6971ceb8f 100644
--- a/pkgs/development/python-modules/slob/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slob/default.nix
diff --git a/pkgs/development/python-modules/slowaes/default.nix b/nixpkgs/pkgs/development/python-modules/slowaes/default.nix
index f9175e507b4..f9175e507b4 100644
--- a/pkgs/development/python-modules/slowaes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/slowaes/default.nix
diff --git a/pkgs/development/python-modules/sly/default.nix b/nixpkgs/pkgs/development/python-modules/sly/default.nix
index 011fa1799ab..011fa1799ab 100644
--- a/pkgs/development/python-modules/sly/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sly/default.nix
diff --git a/pkgs/development/python-modules/smart_open/default.nix b/nixpkgs/pkgs/development/python-modules/smart_open/default.nix
index 48cfcb132f0..48cfcb132f0 100644
--- a/pkgs/development/python-modules/smart_open/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/smart_open/default.nix
diff --git a/pkgs/development/python-modules/smartdc/default.nix b/nixpkgs/pkgs/development/python-modules/smartdc/default.nix
index 50667ce9398..50667ce9398 100644
--- a/pkgs/development/python-modules/smartdc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/smartdc/default.nix
diff --git a/pkgs/development/python-modules/smartypants/default.nix b/nixpkgs/pkgs/development/python-modules/smartypants/default.nix
index 71ff2037de8..71ff2037de8 100644
--- a/pkgs/development/python-modules/smartypants/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/smartypants/default.nix
diff --git a/pkgs/development/python-modules/smmap/default.nix b/nixpkgs/pkgs/development/python-modules/smmap/default.nix
index 366897d3e19..366897d3e19 100644
--- a/pkgs/development/python-modules/smmap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/smmap/default.nix
diff --git a/pkgs/development/python-modules/smmap2/default.nix b/nixpkgs/pkgs/development/python-modules/smmap2/default.nix
index cf0b76d1a87..cf0b76d1a87 100644
--- a/pkgs/development/python-modules/smmap2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/smmap2/default.nix
diff --git a/pkgs/development/python-modules/smugline/default.nix b/nixpkgs/pkgs/development/python-modules/smugline/default.nix
index 514a3005725..514a3005725 100644
--- a/pkgs/development/python-modules/smugline/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/smugline/default.nix
diff --git a/pkgs/development/python-modules/smugpy/default.nix b/nixpkgs/pkgs/development/python-modules/smugpy/default.nix
index c2028228c31..c2028228c31 100644
--- a/pkgs/development/python-modules/smugpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/smugpy/default.nix
diff --git a/pkgs/development/python-modules/snakebite/default.nix b/nixpkgs/pkgs/development/python-modules/snakebite/default.nix
index 09945a094c7..09945a094c7 100644
--- a/pkgs/development/python-modules/snakebite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snakebite/default.nix
diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix
index c55d6c7376a..c55d6c7376a 100644
--- a/pkgs/development/python-modules/snakeviz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix
diff --git a/pkgs/development/python-modules/snapcast/default.nix b/nixpkgs/pkgs/development/python-modules/snapcast/default.nix
index 1e008d96497..1e008d96497 100644
--- a/pkgs/development/python-modules/snapcast/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snapcast/default.nix
diff --git a/pkgs/development/python-modules/snappergui/default.nix b/nixpkgs/pkgs/development/python-modules/snappergui/default.nix
index 6b31145d519..6b31145d519 100644
--- a/pkgs/development/python-modules/snappergui/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snappergui/default.nix
diff --git a/pkgs/development/python-modules/sniffio/default.nix b/nixpkgs/pkgs/development/python-modules/sniffio/default.nix
index f5674c09e02..f5674c09e02 100644
--- a/pkgs/development/python-modules/sniffio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sniffio/default.nix
diff --git a/pkgs/development/python-modules/snitun/default.nix b/nixpkgs/pkgs/development/python-modules/snitun/default.nix
index 8212379e3d4..8212379e3d4 100644
--- a/pkgs/development/python-modules/snitun/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snitun/default.nix
diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix
index 61a12c2b298..61a12c2b298 100644
--- a/pkgs/development/python-modules/snowballstemmer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix
diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
index eb8be17797f..eb8be17797f 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
index d8c557eddc7..d8c557eddc7 100644
--- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
diff --git a/pkgs/development/python-modules/snscrape/default.nix b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix
index 18a7c2bb209..18a7c2bb209 100644
--- a/pkgs/development/python-modules/snscrape/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix
diff --git a/pkgs/development/python-modules/snug/default.nix b/nixpkgs/pkgs/development/python-modules/snug/default.nix
index a697ed0161a..a697ed0161a 100644
--- a/pkgs/development/python-modules/snug/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snug/default.nix
diff --git a/pkgs/development/python-modules/snuggs/default.nix b/nixpkgs/pkgs/development/python-modules/snuggs/default.nix
index a97bbf4012c..a97bbf4012c 100644
--- a/pkgs/development/python-modules/snuggs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/snuggs/default.nix
diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/nixpkgs/pkgs/development/python-modules/sockjs-tornado/default.nix
index 10722e8af06..10722e8af06 100644
--- a/pkgs/development/python-modules/sockjs-tornado/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sockjs-tornado/default.nix
diff --git a/pkgs/development/python-modules/socksipy-branch/default.nix b/nixpkgs/pkgs/development/python-modules/socksipy-branch/default.nix
index 37961f898f5..37961f898f5 100644
--- a/pkgs/development/python-modules/socksipy-branch/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/socksipy-branch/default.nix
diff --git a/pkgs/development/python-modules/soco/default.nix b/nixpkgs/pkgs/development/python-modules/soco/default.nix
index 4a44b7d0b7a..4a44b7d0b7a 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/soco/default.nix
diff --git a/pkgs/development/python-modules/solo-python/default.nix b/nixpkgs/pkgs/development/python-modules/solo-python/default.nix
index 1b1896187f9..1b1896187f9 100644
--- a/pkgs/development/python-modules/solo-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/solo-python/default.nix
diff --git a/pkgs/development/python-modules/sopel/default.nix b/nixpkgs/pkgs/development/python-modules/sopel/default.nix
index d01fd722ab8..d01fd722ab8 100644
--- a/pkgs/development/python-modules/sopel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sopel/default.nix
diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix
index 098e2292efd..098e2292efd 100644
--- a/pkgs/development/python-modules/sorl_thumbnail/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix
diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix
index b8261d88628..b8261d88628 100644
--- a/pkgs/development/python-modules/sortedcollections/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix
diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix
index b2b7f203503..b2b7f203503 100644
--- a/pkgs/development/python-modules/sortedcontainers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix
diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix
index e538875da2b..e538875da2b 100644
--- a/pkgs/development/python-modules/sounddevice/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix
diff --git a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch b/nixpkgs/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch
index a5761764fdb..a5761764fdb 100644
--- a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch
diff --git a/pkgs/development/python-modules/soundfile/default.nix b/nixpkgs/pkgs/development/python-modules/soundfile/default.nix
index ff11e75a0de..ff11e75a0de 100644
--- a/pkgs/development/python-modules/soundfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/soundfile/default.nix
diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix
index 8995e98ca78..8995e98ca78 100644
--- a/pkgs/development/python-modules/soupsieve/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix
diff --git a/pkgs/development/python-modules/spacy/default.nix b/nixpkgs/pkgs/development/python-modules/spacy/default.nix
index e35ea517bf1..e35ea517bf1 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spacy/default.nix
diff --git a/pkgs/development/python-modules/spacy/models.json b/nixpkgs/pkgs/development/python-modules/spacy/models.json
index 4d7eff7fd02..4d7eff7fd02 100644
--- a/pkgs/development/python-modules/spacy/models.json
+++ b/nixpkgs/pkgs/development/python-modules/spacy/models.json
diff --git a/pkgs/development/python-modules/spacy/models.nix b/nixpkgs/pkgs/development/python-modules/spacy/models.nix
index b091c3b7d56..b091c3b7d56 100644
--- a/pkgs/development/python-modules/spacy/models.nix
+++ b/nixpkgs/pkgs/development/python-modules/spacy/models.nix
diff --git a/pkgs/development/python-modules/spake2/default.nix b/nixpkgs/pkgs/development/python-modules/spake2/default.nix
index 2d2f066eaed..2d2f066eaed 100644
--- a/pkgs/development/python-modules/spake2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spake2/default.nix
diff --git a/pkgs/development/python-modules/spambayes/default.nix b/nixpkgs/pkgs/development/python-modules/spambayes/default.nix
index bbd7cbb210e..bbd7cbb210e 100644
--- a/pkgs/development/python-modules/spambayes/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spambayes/default.nix
diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/nixpkgs/pkgs/development/python-modules/spark_parser/default.nix
index b513a9f33c8..b513a9f33c8 100644
--- a/pkgs/development/python-modules/spark_parser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spark_parser/default.nix
diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix
index fe400630507..fe400630507 100644
--- a/pkgs/development/python-modules/sparqlwrapper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix
diff --git a/pkgs/development/python-modules/sparse/default.nix b/nixpkgs/pkgs/development/python-modules/sparse/default.nix
index ec126e963b0..ec126e963b0 100644
--- a/pkgs/development/python-modules/sparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sparse/default.nix
diff --git a/pkgs/development/python-modules/speaklater/default.nix b/nixpkgs/pkgs/development/python-modules/speaklater/default.nix
index 5de86d9e14c..5de86d9e14c 100644
--- a/pkgs/development/python-modules/speaklater/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/speaklater/default.nix
diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix
index 39edcf9b8f5..39edcf9b8f5 100644
--- a/pkgs/development/python-modules/spectral-cube/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix
diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/nixpkgs/pkgs/development/python-modules/speedtest-cli/default.nix
index ef97617225c..ef97617225c 100644
--- a/pkgs/development/python-modules/speedtest-cli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/speedtest-cli/default.nix
diff --git a/pkgs/development/python-modules/spglib/default.nix b/nixpkgs/pkgs/development/python-modules/spglib/default.nix
index bad76f8cb93..bad76f8cb93 100644
--- a/pkgs/development/python-modules/spglib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spglib/default.nix
diff --git a/pkgs/development/python-modules/sphfile/default.nix b/nixpkgs/pkgs/development/python-modules/sphfile/default.nix
index f1455f945a9..f1455f945a9 100644
--- a/pkgs/development/python-modules/sphfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphfile/default.nix
diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix
index f5de476d109..f5de476d109 100644
--- a/pkgs/development/python-modules/sphinx-argparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix
diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix
index 375f59ec3f9..375f59ec3f9 100644
--- a/pkgs/development/python-modules/sphinx-jinja/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix
diff --git a/pkgs/development/python-modules/sphinx-navtree/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-navtree/default.nix
index 02e5711e888..02e5711e888 100644
--- a/pkgs/development/python-modules/sphinx-navtree/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinx-navtree/default.nix
diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-testing/default.nix
index 8f953970555..8f953970555 100644
--- a/pkgs/development/python-modules/sphinx-testing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinx-testing/default.nix
diff --git a/pkgs/development/python-modules/sphinx/2.nix b/nixpkgs/pkgs/development/python-modules/sphinx/2.nix
index 541c292fe8f..541c292fe8f 100644
--- a/pkgs/development/python-modules/sphinx/2.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinx/2.nix
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx/default.nix
index d9f64a93813..d9f64a93813 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinx/default.nix
diff --git a/pkgs/development/python-modules/sphinx/python2-lexer.patch b/nixpkgs/pkgs/development/python-modules/sphinx/python2-lexer.patch
index cf4a243315a..cf4a243315a 100644
--- a/pkgs/development/python-modules/sphinx/python2-lexer.patch
+++ b/nixpkgs/pkgs/development/python-modules/sphinx/python2-lexer.patch
diff --git a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix
index 52590817c71..52590817c71 100644
--- a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix
diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
index 515f6b6156a..515f6b6156a 100644
--- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix
index 60d7a20feb5..60d7a20feb5 100644
--- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
index 36fb29fde59..36fb29fde59 100644
--- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
index b8f23afabcd..b8f23afabcd 100644
--- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix
index dde8bfbb7dd..dde8bfbb7dd 100644
--- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
index 88b54d8e94f..88b54d8e94f 100644
--- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix
index ca2c8e99d41..ca2c8e99d41 100644
--- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
index 58b24f0dd73..58b24f0dd73 100644
--- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
index 92471c6c3d0..92471c6c3d0 100644
--- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix
index 76fba6e1b3a..76fba6e1b3a 100644
--- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
index b3e1ca01dba..b3e1ca01dba 100644
--- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch
index 847a6e07691..847a6e07691 100644
--- a/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch
diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
index 15585679a29..15585679a29 100644
--- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix
index d4f17171e3b..d4f17171e3b 100644
--- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
index 5173c54be34..5173c54be34 100644
--- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix
index 2dfaf7dbc14..2dfaf7dbc14 100644
--- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
index d89ecb6218c..d89ecb6218c 100644
--- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
diff --git a/pkgs/development/python-modules/splinter/default.nix b/nixpkgs/pkgs/development/python-modules/splinter/default.nix
index fac73dc8715..fac73dc8715 100644
--- a/pkgs/development/python-modules/splinter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/splinter/default.nix
diff --git a/pkgs/development/python-modules/spotipy/default.nix b/nixpkgs/pkgs/development/python-modules/spotipy/default.nix
index e728739c294..e728739c294 100644
--- a/pkgs/development/python-modules/spotipy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spotipy/default.nix
diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix
index f4d57ce579e..f4d57ce579e 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix
diff --git a/pkgs/development/python-modules/spyder/default.nix b/nixpkgs/pkgs/development/python-modules/spyder/default.nix
index 47094fcb993..47094fcb993 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spyder/default.nix
diff --git a/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix
index b91e3385404..b91e3385404 100644
--- a/pkgs/development/python-modules/sqlalchemy-citext/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix
diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
index eefb53dd7a6..eefb53dd7a6 100644
--- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
index ba93fb040b9..ba93fb040b9 100644
--- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix
index c58ec72498a..c58ec72498a 100644
--- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix
index e77f2e0e7b2..e77f2e0e7b2 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix
diff --git a/pkgs/development/python-modules/sqlite3dbm/default.nix b/nixpkgs/pkgs/development/python-modules/sqlite3dbm/default.nix
index bc49c0e426b..bc49c0e426b 100644
--- a/pkgs/development/python-modules/sqlite3dbm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlite3dbm/default.nix
diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix
index 17141897d58..17141897d58 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix
diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix
index 05dab8d0265..05dab8d0265 100644
--- a/pkgs/development/python-modules/sqlobject/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix
diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix
index e631a5ac5d9..e631a5ac5d9 100644
--- a/pkgs/development/python-modules/sqlparse/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix
diff --git a/pkgs/development/python-modules/squaremap/default.nix b/nixpkgs/pkgs/development/python-modules/squaremap/default.nix
index fb339550062..fb339550062 100644
--- a/pkgs/development/python-modules/squaremap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/squaremap/default.nix
diff --git a/pkgs/development/python-modules/srptools/default.nix b/nixpkgs/pkgs/development/python-modules/srptools/default.nix
index e7e9a1e5391..e7e9a1e5391 100644
--- a/pkgs/development/python-modules/srptools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/srptools/default.nix
diff --git a/pkgs/development/python-modules/srsly/default.nix b/nixpkgs/pkgs/development/python-modules/srsly/default.nix
index 42d3da93c90..42d3da93c90 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/srsly/default.nix
diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix
index f33143a0f02..f33143a0f02 100644
--- a/pkgs/development/python-modules/ssdeep/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix
diff --git a/pkgs/development/python-modules/ssdp/default.nix b/nixpkgs/pkgs/development/python-modules/ssdp/default.nix
index 547bddbd84d..547bddbd84d 100644
--- a/pkgs/development/python-modules/ssdp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ssdp/default.nix
diff --git a/pkgs/development/python-modules/sseclient/default.nix b/nixpkgs/pkgs/development/python-modules/sseclient/default.nix
index 8157b893d74..8157b893d74 100644
--- a/pkgs/development/python-modules/sseclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sseclient/default.nix
diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/nixpkgs/pkgs/development/python-modules/sshpubkeys/default.nix
index aefb4bd4d4b..aefb4bd4d4b 100644
--- a/pkgs/development/python-modules/sshpubkeys/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sshpubkeys/default.nix
diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix
index ff9d77bc782..ff9d77bc782 100644
--- a/pkgs/development/python-modules/sshtunnel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix
diff --git a/pkgs/development/python-modules/sslib/default.nix b/nixpkgs/pkgs/development/python-modules/sslib/default.nix
index 3e5be211d42..3e5be211d42 100644
--- a/pkgs/development/python-modules/sslib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sslib/default.nix
diff --git a/pkgs/development/python-modules/starfish/default.nix b/nixpkgs/pkgs/development/python-modules/starfish/default.nix
index 8fc0a23b065..8fc0a23b065 100644
--- a/pkgs/development/python-modules/starfish/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/starfish/default.nix
diff --git a/pkgs/development/python-modules/starlette/default.nix b/nixpkgs/pkgs/development/python-modules/starlette/default.nix
index a2170db1bd4..a2170db1bd4 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/starlette/default.nix
diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix
index 32aecdc9191..32aecdc9191 100644
--- a/pkgs/development/python-modules/staticjinja/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix
diff --git a/pkgs/development/python-modules/statistics/default.nix b/nixpkgs/pkgs/development/python-modules/statistics/default.nix
index 4380e592ff5..4380e592ff5 100644
--- a/pkgs/development/python-modules/statistics/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/statistics/default.nix
diff --git a/pkgs/development/python-modules/statsd/default.nix b/nixpkgs/pkgs/development/python-modules/statsd/default.nix
index 36042a72ea8..36042a72ea8 100644
--- a/pkgs/development/python-modules/statsd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/statsd/default.nix
diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix
index 61d354c8d5f..61d354c8d5f 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix
diff --git a/pkgs/development/python-modules/stem/default.nix b/nixpkgs/pkgs/development/python-modules/stem/default.nix
index 69931a46007..69931a46007 100644
--- a/pkgs/development/python-modules/stem/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stem/default.nix
diff --git a/pkgs/development/python-modules/stevedore/default.nix b/nixpkgs/pkgs/development/python-modules/stevedore/default.nix
index 2e3071ed29c..2e3071ed29c 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stevedore/default.nix
diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/nixpkgs/pkgs/development/python-modules/stm32loader/default.nix
index c7ea7804198..c7ea7804198 100644
--- a/pkgs/development/python-modules/stm32loader/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stm32loader/default.nix
diff --git a/pkgs/development/python-modules/stompclient/default.nix b/nixpkgs/pkgs/development/python-modules/stompclient/default.nix
index 1efcd6a6500..1efcd6a6500 100644
--- a/pkgs/development/python-modules/stompclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stompclient/default.nix
diff --git a/pkgs/development/python-modules/strategies/default.nix b/nixpkgs/pkgs/development/python-modules/strategies/default.nix
index 2b03ddcf9c9..2b03ddcf9c9 100644
--- a/pkgs/development/python-modules/strategies/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/strategies/default.nix
diff --git a/pkgs/development/python-modules/stravalib/default.nix b/nixpkgs/pkgs/development/python-modules/stravalib/default.nix
index e8e4eb4bf35..e8e4eb4bf35 100644
--- a/pkgs/development/python-modules/stravalib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stravalib/default.nix
diff --git a/pkgs/development/python-modules/streamz/default.nix b/nixpkgs/pkgs/development/python-modules/streamz/default.nix
index 9bbc312b183..9bbc312b183 100644
--- a/pkgs/development/python-modules/streamz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/streamz/default.nix
diff --git a/pkgs/development/python-modules/strict-rfc3339/default.nix b/nixpkgs/pkgs/development/python-modules/strict-rfc3339/default.nix
index 7f45f326903..7f45f326903 100644
--- a/pkgs/development/python-modules/strict-rfc3339/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/strict-rfc3339/default.nix
diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
index bb4824b5c02..bb4824b5c02 100644
--- a/pkgs/development/python-modules/strictyaml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
diff --git a/pkgs/development/python-modules/stringcase/default.nix b/nixpkgs/pkgs/development/python-modules/stringcase/default.nix
index 79f05f9b72d..79f05f9b72d 100644
--- a/pkgs/development/python-modules/stringcase/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stringcase/default.nix
diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/nixpkgs/pkgs/development/python-modules/stringtemplate/default.nix
index 7326f7d48e1..7326f7d48e1 100644
--- a/pkgs/development/python-modules/stringtemplate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stringtemplate/default.nix
diff --git a/pkgs/development/python-modules/stripe/default.nix b/nixpkgs/pkgs/development/python-modules/stripe/default.nix
index 3f1c1e53c7c..3f1c1e53c7c 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stripe/default.nix
diff --git a/pkgs/development/python-modules/structlog/default.nix b/nixpkgs/pkgs/development/python-modules/structlog/default.nix
index fece2f1b443..fece2f1b443 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/structlog/default.nix
diff --git a/pkgs/development/python-modules/stumpy/default.nix b/nixpkgs/pkgs/development/python-modules/stumpy/default.nix
index 71b643e5cb5..71b643e5cb5 100644
--- a/pkgs/development/python-modules/stumpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stumpy/default.nix
diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/nixpkgs/pkgs/development/python-modules/stups-cli-support/default.nix
index 35aaf45ed1a..35aaf45ed1a 100644
--- a/pkgs/development/python-modules/stups-cli-support/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stups-cli-support/default.nix
diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/nixpkgs/pkgs/development/python-modules/stups-fullstop/default.nix
index 5f51112324a..5f51112324a 100644
--- a/pkgs/development/python-modules/stups-fullstop/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stups-fullstop/default.nix
diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix
index aaa04991641..aaa04991641 100644
--- a/pkgs/development/python-modules/stups-pierone/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix
diff --git a/pkgs/development/python-modules/stups-tokens/default.nix b/nixpkgs/pkgs/development/python-modules/stups-tokens/default.nix
index 3e785d8febb..3e785d8febb 100644
--- a/pkgs/development/python-modules/stups-tokens/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stups-tokens/default.nix
diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/nixpkgs/pkgs/development/python-modules/stups-zign/default.nix
index a4355dd7808..a4355dd7808 100644
--- a/pkgs/development/python-modules/stups-zign/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stups-zign/default.nix
diff --git a/pkgs/development/python-modules/stytra/default.nix b/nixpkgs/pkgs/development/python-modules/stytra/default.nix
index a564798c58a..a564798c58a 100644
--- a/pkgs/development/python-modules/stytra/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/stytra/default.nix
diff --git a/pkgs/development/python-modules/subdownloader/default.nix b/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix
index 24b082123b8..24b082123b8 100644
--- a/pkgs/development/python-modules/subdownloader/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix
diff --git a/pkgs/development/python-modules/subliminal/default.nix b/nixpkgs/pkgs/development/python-modules/subliminal/default.nix
index 61d406edafc..61d406edafc 100644
--- a/pkgs/development/python-modules/subliminal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/subliminal/default.nix
diff --git a/pkgs/development/python-modules/subprocess32/default.nix b/nixpkgs/pkgs/development/python-modules/subprocess32/default.nix
index 0f43a73546d..0f43a73546d 100644
--- a/pkgs/development/python-modules/subprocess32/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/subprocess32/default.nix
diff --git a/pkgs/development/python-modules/subunit/default.nix b/nixpkgs/pkgs/development/python-modules/subunit/default.nix
index eeef94e6c76..eeef94e6c76 100644
--- a/pkgs/development/python-modules/subunit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/subunit/default.nix
diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix
index 25ff5fd1636..25ff5fd1636 100644
--- a/pkgs/development/python-modules/suds-jurko/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix
diff --git a/pkgs/development/python-modules/suds/default.nix b/nixpkgs/pkgs/development/python-modules/suds/default.nix
index c4a8e480ed4..c4a8e480ed4 100644
--- a/pkgs/development/python-modules/suds/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/suds/default.nix
diff --git a/pkgs/development/python-modules/suds/suds-0.4-CVE-2013-2217.patch b/nixpkgs/pkgs/development/python-modules/suds/suds-0.4-CVE-2013-2217.patch
index 235fc1f928c..235fc1f928c 100644
--- a/pkgs/development/python-modules/suds/suds-0.4-CVE-2013-2217.patch
+++ b/nixpkgs/pkgs/development/python-modules/suds/suds-0.4-CVE-2013-2217.patch
diff --git a/pkgs/development/python-modules/sumo/default.nix b/nixpkgs/pkgs/development/python-modules/sumo/default.nix
index 504d9121287..504d9121287 100644
--- a/pkgs/development/python-modules/sumo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sumo/default.nix
diff --git a/pkgs/development/python-modules/sunpy/default.nix b/nixpkgs/pkgs/development/python-modules/sunpy/default.nix
index 09732252437..09732252437 100644
--- a/pkgs/development/python-modules/sunpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sunpy/default.nix
diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix
index 47cdc8a28b1..47cdc8a28b1 100644
--- a/pkgs/development/python-modules/supervise_api/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix
diff --git a/pkgs/development/python-modules/supervise_api/supervise-path.patch b/nixpkgs/pkgs/development/python-modules/supervise_api/supervise-path.patch
index c5538ddc26e..c5538ddc26e 100644
--- a/pkgs/development/python-modules/supervise_api/supervise-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/supervise_api/supervise-path.patch
diff --git a/pkgs/development/python-modules/supervisor/default.nix b/nixpkgs/pkgs/development/python-modules/supervisor/default.nix
index 4ae57add6e7..4ae57add6e7 100644
--- a/pkgs/development/python-modules/supervisor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/supervisor/default.nix
diff --git a/pkgs/development/python-modules/sure/default.nix b/nixpkgs/pkgs/development/python-modules/sure/default.nix
index b4c5fdf4022..b4c5fdf4022 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sure/default.nix
diff --git a/pkgs/development/python-modules/suseapi/default.nix b/nixpkgs/pkgs/development/python-modules/suseapi/default.nix
index 0e9f4f43656..0e9f4f43656 100644
--- a/pkgs/development/python-modules/suseapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/suseapi/default.nix
diff --git a/pkgs/development/python-modules/svg-path/default.nix b/nixpkgs/pkgs/development/python-modules/svg-path/default.nix
index ac62b8b415d..ac62b8b415d 100644
--- a/pkgs/development/python-modules/svg-path/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/svg-path/default.nix
diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix
index 36f6dc06850..36f6dc06850 100644
--- a/pkgs/development/python-modules/svg2tikz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix
diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix
index 186bf0a1ce2..186bf0a1ce2 100644
--- a/pkgs/development/python-modules/svgwrite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix
diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix
index 3c83aa643f5..3c83aa643f5 100644
--- a/pkgs/development/python-modules/swagger-spec-validator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix
diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/nixpkgs/pkgs/development/python-modules/swagger-ui-bundle/default.nix
index 9922e081934..9922e081934 100644
--- a/pkgs/development/python-modules/swagger-ui-bundle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/swagger-ui-bundle/default.nix
diff --git a/pkgs/development/python-modules/sybase/default.nix b/nixpkgs/pkgs/development/python-modules/sybase/default.nix
index 7821c7b3d74..7821c7b3d74 100644
--- a/pkgs/development/python-modules/sybase/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sybase/default.nix
diff --git a/pkgs/development/python-modules/sybil/default.nix b/nixpkgs/pkgs/development/python-modules/sybil/default.nix
index 8b1677a7b84..8b1677a7b84 100644
--- a/pkgs/development/python-modules/sybil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sybil/default.nix
diff --git a/pkgs/development/python-modules/symengine/default.nix b/nixpkgs/pkgs/development/python-modules/symengine/default.nix
index 68664d0d0fd..68664d0d0fd 100644
--- a/pkgs/development/python-modules/symengine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/symengine/default.nix
diff --git a/pkgs/development/python-modules/sympy/default.nix b/nixpkgs/pkgs/development/python-modules/sympy/default.nix
index 3a03fae154d..3a03fae154d 100644
--- a/pkgs/development/python-modules/sympy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sympy/default.nix
diff --git a/pkgs/development/python-modules/systemd/default.nix b/nixpkgs/pkgs/development/python-modules/systemd/default.nix
index cbe2a213191..cbe2a213191 100644
--- a/pkgs/development/python-modules/systemd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/systemd/default.nix
diff --git a/pkgs/development/python-modules/sysv_ipc/default.nix b/nixpkgs/pkgs/development/python-modules/sysv_ipc/default.nix
index 37853980f43..37853980f43 100644
--- a/pkgs/development/python-modules/sysv_ipc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sysv_ipc/default.nix
diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix
index a2f8fbb2f53..a2f8fbb2f53 100644
--- a/pkgs/development/python-modules/tableaudocumentapi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix
diff --git a/pkgs/development/python-modules/tables/3.5.nix b/nixpkgs/pkgs/development/python-modules/tables/3.5.nix
index 4cca72aa313..4cca72aa313 100644
--- a/pkgs/development/python-modules/tables/3.5.nix
+++ b/nixpkgs/pkgs/development/python-modules/tables/3.5.nix
diff --git a/pkgs/development/python-modules/tables/default.nix b/nixpkgs/pkgs/development/python-modules/tables/default.nix
index d67bec7a496..d67bec7a496 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tables/default.nix
diff --git a/pkgs/development/python-modules/tablib/default.nix b/nixpkgs/pkgs/development/python-modules/tablib/default.nix
index 9f1bf2390b6..9f1bf2390b6 100644
--- a/pkgs/development/python-modules/tablib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tablib/default.nix
diff --git a/pkgs/development/python-modules/tabulate/default.nix b/nixpkgs/pkgs/development/python-modules/tabulate/default.nix
index cda898d2725..cda898d2725 100644
--- a/pkgs/development/python-modules/tabulate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tabulate/default.nix
diff --git a/pkgs/development/python-modules/tadasets/default.nix b/nixpkgs/pkgs/development/python-modules/tadasets/default.nix
index 61f6b866455..61f6b866455 100644
--- a/pkgs/development/python-modules/tadasets/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tadasets/default.nix
diff --git a/pkgs/development/python-modules/tarman/default.nix b/nixpkgs/pkgs/development/python-modules/tarman/default.nix
index 305daecc8de..305daecc8de 100644
--- a/pkgs/development/python-modules/tarman/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tarman/default.nix
diff --git a/pkgs/development/python-modules/tasklib/default.nix b/nixpkgs/pkgs/development/python-modules/tasklib/default.nix
index 197c98def3a..197c98def3a 100644
--- a/pkgs/development/python-modules/tasklib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tasklib/default.nix
diff --git a/pkgs/development/python-modules/taskw/default.nix b/nixpkgs/pkgs/development/python-modules/taskw/default.nix
index d2d12ca0b96..d2d12ca0b96 100644
--- a/pkgs/development/python-modules/taskw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/taskw/default.nix
diff --git a/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch b/nixpkgs/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch
index 8c7685c9d03..8c7685c9d03 100644
--- a/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch
diff --git a/pkgs/development/python-modules/tatsu/default.nix b/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
index 922ca1b9b95..922ca1b9b95 100644
--- a/pkgs/development/python-modules/tatsu/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
diff --git a/pkgs/development/python-modules/tblib/default.nix b/nixpkgs/pkgs/development/python-modules/tblib/default.nix
index 55a164773ca..55a164773ca 100644
--- a/pkgs/development/python-modules/tblib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tblib/default.nix
diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix
index f0593ba1bcc..f0593ba1bcc 100644
--- a/pkgs/development/python-modules/tbm-utils/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix
diff --git a/pkgs/development/python-modules/telegram/default.nix b/nixpkgs/pkgs/development/python-modules/telegram/default.nix
index df45aaaee3b..df45aaaee3b 100644
--- a/pkgs/development/python-modules/telegram/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/telegram/default.nix
diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
index b74fe9dc0de..b74fe9dc0de 100644
--- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
diff --git a/pkgs/development/python-modules/telethon/default.nix b/nixpkgs/pkgs/development/python-modules/telethon/default.nix
index b94796b708e..b94796b708e 100644
--- a/pkgs/development/python-modules/telethon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/telethon/default.nix
diff --git a/pkgs/development/python-modules/tempita/default.nix b/nixpkgs/pkgs/development/python-modules/tempita/default.nix
index a903aae104e..a903aae104e 100644
--- a/pkgs/development/python-modules/tempita/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tempita/default.nix
diff --git a/pkgs/development/python-modules/tempora/default.nix b/nixpkgs/pkgs/development/python-modules/tempora/default.nix
index 10de193866b..10de193866b 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tempora/default.nix
diff --git a/pkgs/development/python-modules/tenacity/default.nix b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix
index fa039e7b170..fa039e7b170 100644
--- a/pkgs/development/python-modules/tenacity/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix
diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix
index 9f6be4d1dda..9f6be4d1dda 100644
--- a/pkgs/development/python-modules/tensorflow-estimator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix
diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix
index b585ab4f81b..b585ab4f81b 100644
--- a/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix
diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
index e0108aed5ef..e0108aed5ef 100644
--- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix
index 38fec9adc7d..38fec9adc7d 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix
diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/binary-hashes.nix
index fa4809dc3f1..fa4809dc3f1 100644
--- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/binary-hashes.nix
diff --git a/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch b/nixpkgs/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch
index 25f1ba7a551..25f1ba7a551 100644
--- a/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix
index a9f3ebf9e48..a9f3ebf9e48 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix
diff --git a/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch b/nixpkgs/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch
index 24cc118d8f3..24cc118d8f3 100644
--- a/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch
diff --git a/pkgs/development/python-modules/tensorflow/no-saved-proto.patch b/nixpkgs/pkgs/development/python-modules/tensorflow/no-saved-proto.patch
index ead112f8ddd..ead112f8ddd 100644
--- a/pkgs/development/python-modules/tensorflow/no-saved-proto.patch
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/no-saved-proto.patch
diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/nixpkgs/pkgs/development/python-modules/tensorflow/prefetcher.sh
index d590fb0f173..d590fb0f173 100755
--- a/pkgs/development/python-modules/tensorflow/prefetcher.sh
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/prefetcher.sh
diff --git a/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch b/nixpkgs/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch
index ecb2d04d7ee..ecb2d04d7ee 100644
--- a/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch
diff --git a/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch b/nixpkgs/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch
index 4d70e99108b..4d70e99108b 100644
--- a/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch
diff --git a/pkgs/development/python-modules/termcolor/default.nix b/nixpkgs/pkgs/development/python-modules/termcolor/default.nix
index 2931f0e5199..2931f0e5199 100644
--- a/pkgs/development/python-modules/termcolor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/termcolor/default.nix
diff --git a/pkgs/development/python-modules/terminado/default.nix b/nixpkgs/pkgs/development/python-modules/terminado/default.nix
index af1c4d53e13..af1c4d53e13 100644
--- a/pkgs/development/python-modules/terminado/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/terminado/default.nix
diff --git a/pkgs/development/python-modules/terminaltables/default.nix b/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix
index bb6961f77ec..bb6961f77ec 100644
--- a/pkgs/development/python-modules/terminaltables/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix
diff --git a/pkgs/development/python-modules/termstyle/default.nix b/nixpkgs/pkgs/development/python-modules/termstyle/default.nix
index 0a1c4e76412..0a1c4e76412 100644
--- a/pkgs/development/python-modules/termstyle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/termstyle/default.nix
diff --git a/pkgs/development/python-modules/tess/default.nix b/nixpkgs/pkgs/development/python-modules/tess/default.nix
index c168492be72..c168492be72 100644
--- a/pkgs/development/python-modules/tess/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tess/default.nix
diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix
index 2d4f9d10a8c..2d4f9d10a8c 100644
--- a/pkgs/development/python-modules/tesserocr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix
diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix
index 8fca654632e..8fca654632e 100644
--- a/pkgs/development/python-modules/testfixtures/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix
diff --git a/pkgs/development/python-modules/testpath/default.nix b/nixpkgs/pkgs/development/python-modules/testpath/default.nix
index c9d0e8f0ad2..c9d0e8f0ad2 100644
--- a/pkgs/development/python-modules/testpath/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/testpath/default.nix
diff --git a/pkgs/development/python-modules/testrepository/default.nix b/nixpkgs/pkgs/development/python-modules/testrepository/default.nix
index 188c320e761..188c320e761 100644
--- a/pkgs/development/python-modules/testrepository/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/testrepository/default.nix
diff --git a/pkgs/development/python-modules/testresources/default.nix b/nixpkgs/pkgs/development/python-modules/testresources/default.nix
index ce00b17b177..ce00b17b177 100644
--- a/pkgs/development/python-modules/testresources/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/testresources/default.nix
diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/nixpkgs/pkgs/development/python-modules/testscenarios/default.nix
index 6fddc17af32..6fddc17af32 100644
--- a/pkgs/development/python-modules/testscenarios/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/testscenarios/default.nix
diff --git a/pkgs/development/python-modules/testtools/default.nix b/nixpkgs/pkgs/development/python-modules/testtools/default.nix
index 1a99378a541..1a99378a541 100644
--- a/pkgs/development/python-modules/testtools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/testtools/default.nix
diff --git a/pkgs/development/python-modules/text-unidecode/default.nix b/nixpkgs/pkgs/development/python-modules/text-unidecode/default.nix
index ff5d2425593..ff5d2425593 100644
--- a/pkgs/development/python-modules/text-unidecode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/text-unidecode/default.nix
diff --git a/pkgs/development/python-modules/textacy/default.nix b/nixpkgs/pkgs/development/python-modules/textacy/default.nix
index 9d44ce98898..9d44ce98898 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/textacy/default.nix
diff --git a/pkgs/development/python-modules/texttable/default.nix b/nixpkgs/pkgs/development/python-modules/texttable/default.nix
index a8c20a0eeac..a8c20a0eeac 100644
--- a/pkgs/development/python-modules/texttable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/texttable/default.nix
diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix
index 5b8e10db83e..5b8e10db83e 100644
--- a/pkgs/development/python-modules/textwrap3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix
diff --git a/pkgs/development/python-modules/tflearn/default.nix b/nixpkgs/pkgs/development/python-modules/tflearn/default.nix
index 03185ae4d9f..03185ae4d9f 100644
--- a/pkgs/development/python-modules/tflearn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tflearn/default.nix
diff --git a/pkgs/development/python-modules/thespian/default.nix b/nixpkgs/pkgs/development/python-modules/thespian/default.nix
index 1c59b0cae6b..1c59b0cae6b 100644
--- a/pkgs/development/python-modules/thespian/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/thespian/default.nix
diff --git a/pkgs/development/python-modules/thinc/default.nix b/nixpkgs/pkgs/development/python-modules/thinc/default.nix
index c8a6b5efe84..c8a6b5efe84 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/thinc/default.nix
diff --git a/pkgs/development/python-modules/threadpool/default.nix b/nixpkgs/pkgs/development/python-modules/threadpool/default.nix
index a604302add1..a604302add1 100644
--- a/pkgs/development/python-modules/threadpool/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/threadpool/default.nix
diff --git a/pkgs/development/python-modules/thrift/default.nix b/nixpkgs/pkgs/development/python-modules/thrift/default.nix
index 7d80be987f7..7d80be987f7 100644
--- a/pkgs/development/python-modules/thrift/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/thrift/default.nix
diff --git a/pkgs/development/python-modules/thumbor/0001-Don-t-use-which-implementation-to-find-required-exec.patch b/nixpkgs/pkgs/development/python-modules/thumbor/0001-Don-t-use-which-implementation-to-find-required-exec.patch
index 4a2d9df0618..4a2d9df0618 100644
--- a/pkgs/development/python-modules/thumbor/0001-Don-t-use-which-implementation-to-find-required-exec.patch
+++ b/nixpkgs/pkgs/development/python-modules/thumbor/0001-Don-t-use-which-implementation-to-find-required-exec.patch
diff --git a/pkgs/development/python-modules/thumbor/default.nix b/nixpkgs/pkgs/development/python-modules/thumbor/default.nix
index 6f2d0de9acc..6f2d0de9acc 100644
--- a/pkgs/development/python-modules/thumbor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/thumbor/default.nix
diff --git a/pkgs/development/python-modules/thumborpexif/default.nix b/nixpkgs/pkgs/development/python-modules/thumborpexif/default.nix
index 2a1240526ab..2a1240526ab 100644
--- a/pkgs/development/python-modules/thumborpexif/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/thumborpexif/default.nix
diff --git a/pkgs/development/python-modules/tifffile/default.nix b/nixpkgs/pkgs/development/python-modules/tifffile/default.nix
index fbf36b4ef97..fbf36b4ef97 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tifffile/default.nix
diff --git a/pkgs/development/python-modules/tifffile/python2-regex-compat.patch b/nixpkgs/pkgs/development/python-modules/tifffile/python2-regex-compat.patch
index 7f4ec5764bb..7f4ec5764bb 100644
--- a/pkgs/development/python-modules/tifffile/python2-regex-compat.patch
+++ b/nixpkgs/pkgs/development/python-modules/tifffile/python2-regex-compat.patch
diff --git a/pkgs/development/python-modules/tiledb/default.nix b/nixpkgs/pkgs/development/python-modules/tiledb/default.nix
index cddfb81d609..cddfb81d609 100644
--- a/pkgs/development/python-modules/tiledb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tiledb/default.nix
diff --git a/pkgs/development/python-modules/tilestache/default.nix b/nixpkgs/pkgs/development/python-modules/tilestache/default.nix
index c76cc6645d9..c76cc6645d9 100644
--- a/pkgs/development/python-modules/tilestache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tilestache/default.nix
diff --git a/pkgs/development/python-modules/timelib/default.nix b/nixpkgs/pkgs/development/python-modules/timelib/default.nix
index 39ff4b6de15..39ff4b6de15 100644
--- a/pkgs/development/python-modules/timelib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/timelib/default.nix
diff --git a/pkgs/development/python-modules/timeout-decorator/default.nix b/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix
index af1a85c9627..af1a85c9627 100644
--- a/pkgs/development/python-modules/timeout-decorator/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix
diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix
index f4339bbce4a..f4339bbce4a 100644
--- a/pkgs/development/python-modules/timezonefinder/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix
diff --git a/pkgs/development/python-modules/tinycss/default.nix b/nixpkgs/pkgs/development/python-modules/tinycss/default.nix
index 223d778095a..223d778095a 100644
--- a/pkgs/development/python-modules/tinycss/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tinycss/default.nix
diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix
index 894d4f737fb..894d4f737fb 100644
--- a/pkgs/development/python-modules/tinycss2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix
diff --git a/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch b/nixpkgs/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch
index 27ec511c55f..27ec511c55f 100644
--- a/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch
+++ b/nixpkgs/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch
diff --git a/pkgs/development/python-modules/tinydb/default.nix b/nixpkgs/pkgs/development/python-modules/tinydb/default.nix
index f4de29b5e6c..f4de29b5e6c 100644
--- a/pkgs/development/python-modules/tinydb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tinydb/default.nix
diff --git a/pkgs/development/python-modules/tiros/default.nix b/nixpkgs/pkgs/development/python-modules/tiros/default.nix
index edc4bbdebb1..edc4bbdebb1 100644
--- a/pkgs/development/python-modules/tiros/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tiros/default.nix
diff --git a/pkgs/development/python-modules/tissue/default.nix b/nixpkgs/pkgs/development/python-modules/tissue/default.nix
index 895700f681e..895700f681e 100644
--- a/pkgs/development/python-modules/tissue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tissue/default.nix
diff --git a/pkgs/development/python-modules/titlecase/default.nix b/nixpkgs/pkgs/development/python-modules/titlecase/default.nix
index e25d871f978..e25d871f978 100644
--- a/pkgs/development/python-modules/titlecase/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/titlecase/default.nix
diff --git a/pkgs/development/python-modules/tkinter/default.nix b/nixpkgs/pkgs/development/python-modules/tkinter/default.nix
index ba910f75e19..ba910f75e19 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tkinter/default.nix
diff --git a/pkgs/development/python-modules/tld/default.nix b/nixpkgs/pkgs/development/python-modules/tld/default.nix
index 5e7380f7bb3..5e7380f7bb3 100644
--- a/pkgs/development/python-modules/tld/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tld/default.nix
diff --git a/pkgs/development/python-modules/tldextract/default.nix b/nixpkgs/pkgs/development/python-modules/tldextract/default.nix
index 07865a6b4b8..07865a6b4b8 100644
--- a/pkgs/development/python-modules/tldextract/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tldextract/default.nix
diff --git a/pkgs/development/python-modules/tlsh/default.nix b/nixpkgs/pkgs/development/python-modules/tlsh/default.nix
index 2a74a00539f..2a74a00539f 100644
--- a/pkgs/development/python-modules/tlsh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tlsh/default.nix
diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix
index ac68019d369..ac68019d369 100644
--- a/pkgs/development/python-modules/tlslite-ng/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix
diff --git a/pkgs/development/python-modules/tlslite/default.nix b/nixpkgs/pkgs/development/python-modules/tlslite/default.nix
index fb1cdd0a471..fb1cdd0a471 100644
--- a/pkgs/development/python-modules/tlslite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tlslite/default.nix
diff --git a/pkgs/development/python-modules/tmdb3/default.nix b/nixpkgs/pkgs/development/python-modules/tmdb3/default.nix
index 87b62cd78ac..87b62cd78ac 100644
--- a/pkgs/development/python-modules/tmdb3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tmdb3/default.nix
diff --git a/pkgs/development/python-modules/todoist/default.nix b/nixpkgs/pkgs/development/python-modules/todoist/default.nix
index 6ad6a62861d..6ad6a62861d 100644
--- a/pkgs/development/python-modules/todoist/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/todoist/default.nix
diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix
index 6834876d8f8..6834876d8f8 100644
--- a/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix
diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix
index 24f54b98a96..24f54b98a96 100644
--- a/pkgs/development/python-modules/tokenlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix
diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/nixpkgs/pkgs/development/python-modules/tokenserver/default.nix
index 08f3f87321f..08f3f87321f 100644
--- a/pkgs/development/python-modules/tokenserver/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tokenserver/default.nix
diff --git a/pkgs/development/python-modules/toml/default.nix b/nixpkgs/pkgs/development/python-modules/toml/default.nix
index 29d0a4c692f..29d0a4c692f 100644
--- a/pkgs/development/python-modules/toml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/toml/default.nix
diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix
index 72e6e0aca63..72e6e0aca63 100644
--- a/pkgs/development/python-modules/tomlkit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix
diff --git a/pkgs/development/python-modules/toolz/default.nix b/nixpkgs/pkgs/development/python-modules/toolz/default.nix
index 7f506e56413..7f506e56413 100644
--- a/pkgs/development/python-modules/toolz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/toolz/default.nix
diff --git a/pkgs/development/python-modules/toposort/default.nix b/nixpkgs/pkgs/development/python-modules/toposort/default.nix
index dd1156f4355..dd1156f4355 100644
--- a/pkgs/development/python-modules/toposort/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/toposort/default.nix
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/nixpkgs/pkgs/development/python-modules/torchvision/default.nix
index 0413fd33f6f..0413fd33f6f 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/torchvision/default.nix
diff --git a/pkgs/development/python-modules/tornado/default.nix b/nixpkgs/pkgs/development/python-modules/tornado/default.nix
index 1d8a03578cd..1d8a03578cd 100644
--- a/pkgs/development/python-modules/tornado/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tornado/default.nix
diff --git a/pkgs/development/python-modules/tox/default.nix b/nixpkgs/pkgs/development/python-modules/tox/default.nix
index 5cec769decc..5cec769decc 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tox/default.nix
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
index d906b6d51d5..d906b6d51d5 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
diff --git a/pkgs/development/python-modules/traceback2/default.nix b/nixpkgs/pkgs/development/python-modules/traceback2/default.nix
index fe15285f065..fe15285f065 100644
--- a/pkgs/development/python-modules/traceback2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/traceback2/default.nix
diff --git a/pkgs/development/python-modules/tracing/default.nix b/nixpkgs/pkgs/development/python-modules/tracing/default.nix
index 094c01eef78..094c01eef78 100644
--- a/pkgs/development/python-modules/tracing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tracing/default.nix
diff --git a/pkgs/development/python-modules/trackpy/default.nix b/nixpkgs/pkgs/development/python-modules/trackpy/default.nix
index 32c8c64c68c..32c8c64c68c 100644
--- a/pkgs/development/python-modules/trackpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trackpy/default.nix
diff --git a/pkgs/development/python-modules/traitlets/default.nix b/nixpkgs/pkgs/development/python-modules/traitlets/default.nix
index 0342abdfefe..0342abdfefe 100644
--- a/pkgs/development/python-modules/traitlets/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/traitlets/default.nix
diff --git a/pkgs/development/python-modules/traits/default.nix b/nixpkgs/pkgs/development/python-modules/traits/default.nix
index 84aa1c5784e..84aa1c5784e 100644
--- a/pkgs/development/python-modules/traits/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/traits/default.nix
diff --git a/pkgs/development/python-modules/transaction/default.nix b/nixpkgs/pkgs/development/python-modules/transaction/default.nix
index 0ed6f84ff30..0ed6f84ff30 100644
--- a/pkgs/development/python-modules/transaction/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/transaction/default.nix
diff --git a/pkgs/development/python-modules/transformers/default.nix b/nixpkgs/pkgs/development/python-modules/transformers/default.nix
index 09ebf739d7d..09ebf739d7d 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/transformers/default.nix
diff --git a/pkgs/development/python-modules/transitions/default.nix b/nixpkgs/pkgs/development/python-modules/transitions/default.nix
index f4eb4fe5293..f4eb4fe5293 100644
--- a/pkgs/development/python-modules/transitions/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/transitions/default.nix
diff --git a/pkgs/development/python-modules/translationstring/default.nix b/nixpkgs/pkgs/development/python-modules/translationstring/default.nix
index 53f88188083..53f88188083 100644
--- a/pkgs/development/python-modules/translationstring/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/translationstring/default.nix
diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix
index 932045b6502..932045b6502 100644
--- a/pkgs/development/python-modules/transmissionrpc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix
diff --git a/pkgs/development/python-modules/treq/default.nix b/nixpkgs/pkgs/development/python-modules/treq/default.nix
index 1d488eed4e1..1d488eed4e1 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/treq/default.nix
diff --git a/pkgs/development/python-modules/trezor/default.nix b/nixpkgs/pkgs/development/python-modules/trezor/default.nix
index 2d40ad971db..2d40ad971db 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trezor/default.nix
diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix
index ad4a30d97c5..ad4a30d97c5 100644
--- a/pkgs/development/python-modules/trezor_agent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix
diff --git a/pkgs/development/python-modules/trio/default.nix b/nixpkgs/pkgs/development/python-modules/trio/default.nix
index 11f3c94aece..11f3c94aece 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trio/default.nix
diff --git a/pkgs/development/python-modules/trollius/default.nix b/nixpkgs/pkgs/development/python-modules/trollius/default.nix
index 21a3c5d6d08..21a3c5d6d08 100644
--- a/pkgs/development/python-modules/trollius/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trollius/default.nix
diff --git a/pkgs/development/python-modules/trollius/tests.patch b/nixpkgs/pkgs/development/python-modules/trollius/tests.patch
index 4923bded949..4923bded949 100644
--- a/pkgs/development/python-modules/trollius/tests.patch
+++ b/nixpkgs/pkgs/development/python-modules/trollius/tests.patch
diff --git a/pkgs/development/python-modules/trueskill/default.nix b/nixpkgs/pkgs/development/python-modules/trueskill/default.nix
index 2106e4d2e76..2106e4d2e76 100644
--- a/pkgs/development/python-modules/trueskill/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trueskill/default.nix
diff --git a/pkgs/development/python-modules/trustme/default.nix b/nixpkgs/pkgs/development/python-modules/trustme/default.nix
index 42cbf23e56f..42cbf23e56f 100644
--- a/pkgs/development/python-modules/trustme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trustme/default.nix
diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix
index bce0ad8d7c0..bce0ad8d7c0 100644
--- a/pkgs/development/python-modules/ttystatus/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix
diff --git a/pkgs/development/python-modules/tunigo/default.nix b/nixpkgs/pkgs/development/python-modules/tunigo/default.nix
index 767bb21f0fd..767bb21f0fd 100644
--- a/pkgs/development/python-modules/tunigo/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tunigo/default.nix
diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix
index 6c298dce7c7..6c298dce7c7 100644
--- a/pkgs/development/python-modules/tvdb_api/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix
diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix
index b0df4008992..b0df4008992 100644
--- a/pkgs/development/python-modules/tvnamer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix
diff --git a/pkgs/development/python-modules/tweepy/default.nix b/nixpkgs/pkgs/development/python-modules/tweepy/default.nix
index 88174a94ef4..88174a94ef4 100644
--- a/pkgs/development/python-modules/tweepy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tweepy/default.nix
diff --git a/pkgs/development/python-modules/twiggy/default.nix b/nixpkgs/pkgs/development/python-modules/twiggy/default.nix
index 9a87c684f1b..9a87c684f1b 100644
--- a/pkgs/development/python-modules/twiggy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twiggy/default.nix
diff --git a/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix
index fa167896ea0..fa167896ea0 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twilio/default.nix
diff --git a/pkgs/development/python-modules/twill/default.nix b/nixpkgs/pkgs/development/python-modules/twill/default.nix
index 097e691f7c1..097e691f7c1 100644
--- a/pkgs/development/python-modules/twill/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twill/default.nix
diff --git a/pkgs/development/python-modules/twine/default.nix b/nixpkgs/pkgs/development/python-modules/twine/default.nix
index 762df433f97..762df433f97 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twine/default.nix
diff --git a/pkgs/development/python-modules/twisted/default.nix b/nixpkgs/pkgs/development/python-modules/twisted/default.nix
index 5c4fea3f9b1..5c4fea3f9b1 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twisted/default.nix
diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix
index d562eac5cc7..d562eac5cc7 100644
--- a/pkgs/development/python-modules/twitter-common-collections/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix
diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix
index 1253b8077e7..1253b8077e7 100644
--- a/pkgs/development/python-modules/twitter-common-confluence/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix
diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix
index df2f614c5a0..df2f614c5a0 100644
--- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix
diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix
index 59f6d74ad67..59f6d74ad67 100644
--- a/pkgs/development/python-modules/twitter-common-lang/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix
diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix
index 1c3d1808f5d..1c3d1808f5d 100644
--- a/pkgs/development/python-modules/twitter-common-log/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix
diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix
index 12e55a46ab8..12e55a46ab8 100644
--- a/pkgs/development/python-modules/twitter-common-options/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix
diff --git a/pkgs/development/python-modules/twitter/default.nix b/nixpkgs/pkgs/development/python-modules/twitter/default.nix
index 2e8481198a4..2e8481198a4 100644
--- a/pkgs/development/python-modules/twitter/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twitter/default.nix
diff --git a/pkgs/development/python-modules/twofish/default.nix b/nixpkgs/pkgs/development/python-modules/twofish/default.nix
index 1fe541b0729..1fe541b0729 100644
--- a/pkgs/development/python-modules/twofish/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/twofish/default.nix
diff --git a/pkgs/development/python-modules/txaio/default.nix b/nixpkgs/pkgs/development/python-modules/txaio/default.nix
index 7fb1b9e5b5c..7fb1b9e5b5c 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/txaio/default.nix
diff --git a/pkgs/development/python-modules/txamqp/default.nix b/nixpkgs/pkgs/development/python-modules/txamqp/default.nix
index d59a0bb8b8a..d59a0bb8b8a 100644
--- a/pkgs/development/python-modules/txamqp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/txamqp/default.nix
diff --git a/pkgs/development/python-modules/txgithub/default.nix b/nixpkgs/pkgs/development/python-modules/txgithub/default.nix
index 5340b202e68..5340b202e68 100644
--- a/pkgs/development/python-modules/txgithub/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/txgithub/default.nix
diff --git a/pkgs/development/python-modules/txrequests/default.nix b/nixpkgs/pkgs/development/python-modules/txrequests/default.nix
index ee7d09d5165..ee7d09d5165 100644
--- a/pkgs/development/python-modules/txrequests/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/txrequests/default.nix
diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix
index 3b60c63d964..3b60c63d964 100644
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix
diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix
index 0514be0fb4d..0514be0fb4d 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix
diff --git a/pkgs/development/python-modules/typeguard/default.nix b/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
index 51dc3555250..51dc3555250 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
diff --git a/pkgs/development/python-modules/typesentry/default.nix b/nixpkgs/pkgs/development/python-modules/typesentry/default.nix
index ef3b1c78c39..ef3b1c78c39 100644
--- a/pkgs/development/python-modules/typesentry/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/typesentry/default.nix
diff --git a/pkgs/development/python-modules/typesystem/default.nix b/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
index 8a66d6cbcc9..8a66d6cbcc9 100644
--- a/pkgs/development/python-modules/typesystem/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix
index 6c1e85eb93c..6c1e85eb93c 100644
--- a/pkgs/development/python-modules/typing-extensions/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix
diff --git a/pkgs/development/python-modules/typing/default.nix b/nixpkgs/pkgs/development/python-modules/typing/default.nix
index c6351690f5e..c6351690f5e 100644
--- a/pkgs/development/python-modules/typing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/typing/default.nix
diff --git a/pkgs/development/python-modules/typogrify/default.nix b/nixpkgs/pkgs/development/python-modules/typogrify/default.nix
index f5724877bf2..f5724877bf2 100644
--- a/pkgs/development/python-modules/typogrify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/typogrify/default.nix
diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix
index 9948dd1e84e..9948dd1e84e 100644
--- a/pkgs/development/python-modules/tzlocal/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix
diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix
index 8fd8eaf8329..8fd8eaf8329 100644
--- a/pkgs/development/python-modules/u-msgpack-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix
diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix
index cd004c59d4a..cd004c59d4a 100644
--- a/pkgs/development/python-modules/ua-parser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix
diff --git a/pkgs/development/python-modules/uamqp/default.nix b/nixpkgs/pkgs/development/python-modules/uamqp/default.nix
index 8e74c6460fe..8e74c6460fe 100644
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uamqp/default.nix
diff --git a/pkgs/development/python-modules/uarray/default.nix b/nixpkgs/pkgs/development/python-modules/uarray/default.nix
index f0b42e6609f..f0b42e6609f 100644
--- a/pkgs/development/python-modules/uarray/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uarray/default.nix
diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix
index c956e5d8b34..c956e5d8b34 100644
--- a/pkgs/development/python-modules/ueberzug/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix
diff --git a/pkgs/development/python-modules/ujson/default.nix b/nixpkgs/pkgs/development/python-modules/ujson/default.nix
index a9d68978c3b..a9d68978c3b 100644
--- a/pkgs/development/python-modules/ujson/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ujson/default.nix
diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/nixpkgs/pkgs/development/python-modules/ukpostcodeparser/default.nix
index 42588347c85..42588347c85 100644
--- a/pkgs/development/python-modules/ukpostcodeparser/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ukpostcodeparser/default.nix
diff --git a/pkgs/development/python-modules/umalqurra/default.nix b/nixpkgs/pkgs/development/python-modules/umalqurra/default.nix
index a41921a9d8c..a41921a9d8c 100644
--- a/pkgs/development/python-modules/umalqurra/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/umalqurra/default.nix
diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix
index 465c02beb4f..465c02beb4f 100644
--- a/pkgs/development/python-modules/umap-learn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix
diff --git a/pkgs/development/python-modules/umemcache/default.nix b/nixpkgs/pkgs/development/python-modules/umemcache/default.nix
index 95c0d628697..95c0d628697 100644
--- a/pkgs/development/python-modules/umemcache/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/umemcache/default.nix
diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix
index f2c02c8a6c6..f2c02c8a6c6 100644
--- a/pkgs/development/python-modules/uncertainties/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix
diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix
index c03e8724d3d..c03e8724d3d 100644
--- a/pkgs/development/python-modules/uncompyle6/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix
diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix
index 111ff6278ea..111ff6278ea 100644
--- a/pkgs/development/python-modules/unicode-slugify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix
diff --git a/pkgs/development/python-modules/unicodecsv/default.nix b/nixpkgs/pkgs/development/python-modules/unicodecsv/default.nix
index d0f54a7c6b2..d0f54a7c6b2 100644
--- a/pkgs/development/python-modules/unicodecsv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unicodecsv/default.nix
diff --git a/pkgs/development/python-modules/unicorn/default.nix b/nixpkgs/pkgs/development/python-modules/unicorn/default.nix
index 86542439439..86542439439 100644
--- a/pkgs/development/python-modules/unicorn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unicorn/default.nix
diff --git a/pkgs/development/python-modules/unidecode/default.nix b/nixpkgs/pkgs/development/python-modules/unidecode/default.nix
index 8d3ecc54377..8d3ecc54377 100644
--- a/pkgs/development/python-modules/unidecode/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unidecode/default.nix
diff --git a/pkgs/development/python-modules/unidiff/default.nix b/nixpkgs/pkgs/development/python-modules/unidiff/default.nix
index 81e9019f489..81e9019f489 100644
--- a/pkgs/development/python-modules/unidiff/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unidiff/default.nix
diff --git a/pkgs/development/python-modules/unifi/default.nix b/nixpkgs/pkgs/development/python-modules/unifi/default.nix
index d7a8e6eaf04..d7a8e6eaf04 100644
--- a/pkgs/development/python-modules/unifi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unifi/default.nix
diff --git a/pkgs/development/python-modules/units/default.nix b/nixpkgs/pkgs/development/python-modules/units/default.nix
index 02a3fc940ae..02a3fc940ae 100644
--- a/pkgs/development/python-modules/units/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/units/default.nix
diff --git a/pkgs/development/python-modules/unittest-data-provider/default.nix b/nixpkgs/pkgs/development/python-modules/unittest-data-provider/default.nix
index ec34a451156..ec34a451156 100644
--- a/pkgs/development/python-modules/unittest-data-provider/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unittest-data-provider/default.nix
diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix
index 8d815833a40..8d815833a40 100644
--- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix
diff --git a/pkgs/development/python-modules/unittest2/default.nix b/nixpkgs/pkgs/development/python-modules/unittest2/default.nix
index 85ca7157e12..85ca7157e12 100644
--- a/pkgs/development/python-modules/unittest2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unittest2/default.nix
diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix
index b69f894cb5c..b69f894cb5c 100644
--- a/pkgs/development/python-modules/unpaddedbase64/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix
diff --git a/pkgs/development/python-modules/upass/default.nix b/nixpkgs/pkgs/development/python-modules/upass/default.nix
index baf536fdbad..baf536fdbad 100644
--- a/pkgs/development/python-modules/upass/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/upass/default.nix
diff --git a/pkgs/development/python-modules/update-copyright/default.nix b/nixpkgs/pkgs/development/python-modules/update-copyright/default.nix
index 9ff1137fb56..9ff1137fb56 100644
--- a/pkgs/development/python-modules/update-copyright/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/update-copyright/default.nix
diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/nixpkgs/pkgs/development/python-modules/update-dotdee/default.nix
index b537ca8c264..b537ca8c264 100644
--- a/pkgs/development/python-modules/update-dotdee/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/update-dotdee/default.nix
diff --git a/pkgs/development/python-modules/update_checker/default.nix b/nixpkgs/pkgs/development/python-modules/update_checker/default.nix
index ad401d80190..ad401d80190 100644
--- a/pkgs/development/python-modules/update_checker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/update_checker/default.nix
diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix
index 7bb8d4a16ea..7bb8d4a16ea 100644
--- a/pkgs/development/python-modules/uproot-methods/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix
diff --git a/pkgs/development/python-modules/uproot/default.nix b/nixpkgs/pkgs/development/python-modules/uproot/default.nix
index f5f20ad86d3..f5f20ad86d3 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uproot/default.nix
diff --git a/pkgs/development/python-modules/uptime/default.nix b/nixpkgs/pkgs/development/python-modules/uptime/default.nix
index 035acbcec2b..035acbcec2b 100644
--- a/pkgs/development/python-modules/uptime/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uptime/default.nix
diff --git a/pkgs/development/python-modules/uranium/default.nix b/nixpkgs/pkgs/development/python-modules/uranium/default.nix
index a8259451bb0..a8259451bb0 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uranium/default.nix
diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix
index 64a2fd51ee3..64a2fd51ee3 100644
--- a/pkgs/development/python-modules/uritemplate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix
diff --git a/pkgs/development/python-modules/uritools/default.nix b/nixpkgs/pkgs/development/python-modules/uritools/default.nix
index 570fc5dc718..570fc5dc718 100644
--- a/pkgs/development/python-modules/uritools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uritools/default.nix
diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix
index f81a6d814e9..f81a6d814e9 100644
--- a/pkgs/development/python-modules/urlgrabber/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix
diff --git a/pkgs/development/python-modules/urllib3/default.nix b/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
index 0c8c97925a7..0c8c97925a7 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
diff --git a/pkgs/development/python-modules/urwid/default.nix b/nixpkgs/pkgs/development/python-modules/urwid/default.nix
index 8e255dc69dc..8e255dc69dc 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/urwid/default.nix
diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix
index 468420f0e5c..468420f0e5c 100644
--- a/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix
diff --git a/pkgs/development/python-modules/us/default.nix b/nixpkgs/pkgs/development/python-modules/us/default.nix
index 53b5bc9ad16..53b5bc9ad16 100644
--- a/pkgs/development/python-modules/us/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/us/default.nix
diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix
index 8b397d3c42c..8b397d3c42c 100644
--- a/pkgs/development/python-modules/usbtmc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix
diff --git a/pkgs/development/python-modules/user-agents/default.nix b/nixpkgs/pkgs/development/python-modules/user-agents/default.nix
index a5dc414b260..a5dc414b260 100644
--- a/pkgs/development/python-modules/user-agents/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/user-agents/default.nix
diff --git a/pkgs/development/python-modules/uuid/default.nix b/nixpkgs/pkgs/development/python-modules/uuid/default.nix
index 5e31f6ccad0..5e31f6ccad0 100644
--- a/pkgs/development/python-modules/uuid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uuid/default.nix
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix
index 73d797bc43e..73d797bc43e 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix
diff --git a/pkgs/development/python-modules/uvloop/darwin_sandbox.patch b/nixpkgs/pkgs/development/python-modules/uvloop/darwin_sandbox.patch
index bd4e5e48b14..bd4e5e48b14 100644
--- a/pkgs/development/python-modules/uvloop/darwin_sandbox.patch
+++ b/nixpkgs/pkgs/development/python-modules/uvloop/darwin_sandbox.patch
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
index 36c5af1d718..36c5af1d718 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
diff --git a/pkgs/development/python-modules/validate-email/default.nix b/nixpkgs/pkgs/development/python-modules/validate-email/default.nix
index ea2c5a8db74..ea2c5a8db74 100644
--- a/pkgs/development/python-modules/validate-email/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/validate-email/default.nix
diff --git a/pkgs/development/python-modules/validators/default.nix b/nixpkgs/pkgs/development/python-modules/validators/default.nix
index 5efd676f53d..5efd676f53d 100644
--- a/pkgs/development/python-modules/validators/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/validators/default.nix
diff --git a/pkgs/development/python-modules/validictory/default.nix b/nixpkgs/pkgs/development/python-modules/validictory/default.nix
index c27d13ab8f1..c27d13ab8f1 100644
--- a/pkgs/development/python-modules/validictory/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/validictory/default.nix
diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix
index c518314d964..c518314d964 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix
diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/nixpkgs/pkgs/development/python-modules/vcversioner/default.nix
index ffe184e263a..ffe184e263a 100644
--- a/pkgs/development/python-modules/vcversioner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vcversioner/default.nix
diff --git a/pkgs/development/python-modules/vdf/default.nix b/nixpkgs/pkgs/development/python-modules/vdf/default.nix
index 2ce3e24f4cd..2ce3e24f4cd 100644
--- a/pkgs/development/python-modules/vdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vdf/default.nix
diff --git a/pkgs/development/python-modules/vega/default.nix b/nixpkgs/pkgs/development/python-modules/vega/default.nix
index 73485329ef7..73485329ef7 100644
--- a/pkgs/development/python-modules/vega/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vega/default.nix
diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix
index f028f85f3ec..f028f85f3ec 100644
--- a/pkgs/development/python-modules/vega_datasets/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix
diff --git a/pkgs/development/python-modules/venusian/default.nix b/nixpkgs/pkgs/development/python-modules/venusian/default.nix
index 7a67fdf727b..7a67fdf727b 100644
--- a/pkgs/development/python-modules/venusian/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/venusian/default.nix
diff --git a/pkgs/development/python-modules/verboselogs/default.nix b/nixpkgs/pkgs/development/python-modules/verboselogs/default.nix
index f4c78858913..f4c78858913 100644
--- a/pkgs/development/python-modules/verboselogs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/verboselogs/default.nix
diff --git a/pkgs/development/python-modules/versioneer/default.nix b/nixpkgs/pkgs/development/python-modules/versioneer/default.nix
index a3328671417..a3328671417 100644
--- a/pkgs/development/python-modules/versioneer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/versioneer/default.nix
diff --git a/pkgs/development/python-modules/versiontools/default.nix b/nixpkgs/pkgs/development/python-modules/versiontools/default.nix
index e92dbae8138..e92dbae8138 100644
--- a/pkgs/development/python-modules/versiontools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/versiontools/default.nix
diff --git a/pkgs/development/python-modules/veryprettytable/default.nix b/nixpkgs/pkgs/development/python-modules/veryprettytable/default.nix
index 8d71e6331f5..8d71e6331f5 100644
--- a/pkgs/development/python-modules/veryprettytable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/veryprettytable/default.nix
diff --git a/pkgs/development/python-modules/vidstab/default.nix b/nixpkgs/pkgs/development/python-modules/vidstab/default.nix
index 55d618899fd..55d618899fd 100644
--- a/pkgs/development/python-modules/vidstab/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vidstab/default.nix
diff --git a/pkgs/development/python-modules/viewstate/default.nix b/nixpkgs/pkgs/development/python-modules/viewstate/default.nix
index cd64dcc7564..cd64dcc7564 100644
--- a/pkgs/development/python-modules/viewstate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/viewstate/default.nix
diff --git a/pkgs/development/python-modules/vine/default.nix b/nixpkgs/pkgs/development/python-modules/vine/default.nix
index c3ee5237935..c3ee5237935 100644
--- a/pkgs/development/python-modules/vine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vine/default.nix
diff --git a/pkgs/development/python-modules/virtkey/default.nix b/nixpkgs/pkgs/development/python-modules/virtkey/default.nix
index cf62704e8be..cf62704e8be 100644
--- a/pkgs/development/python-modules/virtkey/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/virtkey/default.nix
diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/nixpkgs/pkgs/development/python-modules/virtual-display/default.nix
index 1b56f046610..1b56f046610 100644
--- a/pkgs/development/python-modules/virtual-display/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/virtual-display/default.nix
diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix
index b1ce764c4ac..b1ce764c4ac 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix
diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
index 62c86567655..62c86567655 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
diff --git a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch b/nixpkgs/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch
index f3e8ea854f6..f3e8ea854f6 100644
--- a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch
+++ b/nixpkgs/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch
diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/nixpkgs/pkgs/development/python-modules/virtualenvwrapper/default.nix
index 19ec56a1ece..19ec56a1ece 100644
--- a/pkgs/development/python-modules/virtualenvwrapper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/virtualenvwrapper/default.nix
diff --git a/pkgs/development/python-modules/visitor/default.nix b/nixpkgs/pkgs/development/python-modules/visitor/default.nix
index 78dc29bbeb0..78dc29bbeb0 100644
--- a/pkgs/development/python-modules/visitor/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/visitor/default.nix
diff --git a/pkgs/development/python-modules/vmprof/default.nix b/nixpkgs/pkgs/development/python-modules/vmprof/default.nix
index a9eb492c01e..a9eb492c01e 100644
--- a/pkgs/development/python-modules/vmprof/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vmprof/default.nix
diff --git a/pkgs/development/python-modules/vobject/default.nix b/nixpkgs/pkgs/development/python-modules/vobject/default.nix
index 95cf6efaa46..95cf6efaa46 100644
--- a/pkgs/development/python-modules/vobject/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vobject/default.nix
diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix
index 4a27252e060..4a27252e060 100644
--- a/pkgs/development/python-modules/voluptuous-serialize/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix
diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix
index 70512edf400..70512edf400 100644
--- a/pkgs/development/python-modules/voluptuous/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix
diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix
index d23f45b122f..d23f45b122f 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix
diff --git a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff b/nixpkgs/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff
index 645956594bf..645956594bf 100644
--- a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff
+++ b/nixpkgs/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff
diff --git a/pkgs/development/python-modules/vsts-cd-manager/default.nix b/nixpkgs/pkgs/development/python-modules/vsts-cd-manager/default.nix
index 5946fec05b7..5946fec05b7 100644
--- a/pkgs/development/python-modules/vsts-cd-manager/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vsts-cd-manager/default.nix
diff --git a/pkgs/development/python-modules/vsts/default.nix b/nixpkgs/pkgs/development/python-modules/vsts/default.nix
index 0f49ffd05c6..0f49ffd05c6 100644
--- a/pkgs/development/python-modules/vsts/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vsts/default.nix
diff --git a/pkgs/development/python-modules/vultr/default.nix b/nixpkgs/pkgs/development/python-modules/vultr/default.nix
index 236e4121cf8..236e4121cf8 100644
--- a/pkgs/development/python-modules/vultr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vultr/default.nix
diff --git a/pkgs/development/python-modules/vxi11/default.nix b/nixpkgs/pkgs/development/python-modules/vxi11/default.nix
index 7bae1e9860b..7bae1e9860b 100644
--- a/pkgs/development/python-modules/vxi11/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/vxi11/default.nix
diff --git a/pkgs/development/python-modules/w3lib/default.nix b/nixpkgs/pkgs/development/python-modules/w3lib/default.nix
index c0d2d744f09..c0d2d744f09 100644
--- a/pkgs/development/python-modules/w3lib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/w3lib/default.nix
diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix
index 6b3ca778ead..6b3ca778ead 100644
--- a/pkgs/development/python-modules/waitress-django/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix
diff --git a/pkgs/development/python-modules/waitress-django/setup.py b/nixpkgs/pkgs/development/python-modules/waitress-django/setup.py
index 07f7b326fda..07f7b326fda 100644
--- a/pkgs/development/python-modules/waitress-django/setup.py
+++ b/nixpkgs/pkgs/development/python-modules/waitress-django/setup.py
diff --git a/pkgs/development/python-modules/waitress-django/src/waitress-serve-django b/nixpkgs/pkgs/development/python-modules/waitress-django/src/waitress-serve-django
index b710086c22b..b710086c22b 100755
--- a/pkgs/development/python-modules/waitress-django/src/waitress-serve-django
+++ b/nixpkgs/pkgs/development/python-modules/waitress-django/src/waitress-serve-django
diff --git a/pkgs/development/python-modules/waitress/default.nix b/nixpkgs/pkgs/development/python-modules/waitress/default.nix
index acbe03793db..acbe03793db 100644
--- a/pkgs/development/python-modules/waitress/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/waitress/default.nix
diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix
index b5c9e14da35..b5c9e14da35 100644
--- a/pkgs/development/python-modules/wakeonlan/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix
diff --git a/pkgs/development/python-modules/warlock/default.nix b/nixpkgs/pkgs/development/python-modules/warlock/default.nix
index bc298b2794d..bc298b2794d 100644
--- a/pkgs/development/python-modules/warlock/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/warlock/default.nix
diff --git a/pkgs/development/python-modules/warrant/default.nix b/nixpkgs/pkgs/development/python-modules/warrant/default.nix
index 7cf69fdb614..7cf69fdb614 100644
--- a/pkgs/development/python-modules/warrant/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/warrant/default.nix
diff --git a/pkgs/development/python-modules/wasabi/default.nix b/nixpkgs/pkgs/development/python-modules/wasabi/default.nix
index 8a6af2e69db..8a6af2e69db 100644
--- a/pkgs/development/python-modules/wasabi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wasabi/default.nix
diff --git a/pkgs/development/python-modules/watchdog/default.nix b/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
index 361baea4916..361baea4916 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix
index 39ce62ca47c..39ce62ca47c 100644
--- a/pkgs/development/python-modules/wcwidth/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix
diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix
index f112d6f1555..f112d6f1555 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix
diff --git a/pkgs/development/python-modules/weasyprint/library-paths.patch b/nixpkgs/pkgs/development/python-modules/weasyprint/library-paths.patch
index eabbdbdcd6e..eabbdbdcd6e 100644
--- a/pkgs/development/python-modules/weasyprint/library-paths.patch
+++ b/nixpkgs/pkgs/development/python-modules/weasyprint/library-paths.patch
diff --git a/pkgs/development/python-modules/web/default.nix b/nixpkgs/pkgs/development/python-modules/web/default.nix
index ea1ffc7826f..ea1ffc7826f 100644
--- a/pkgs/development/python-modules/web/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/web/default.nix
diff --git a/pkgs/development/python-modules/webapp2/default.nix b/nixpkgs/pkgs/development/python-modules/webapp2/default.nix
index 584440eab6a..584440eab6a 100644
--- a/pkgs/development/python-modules/webapp2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/webapp2/default.nix
diff --git a/pkgs/development/python-modules/webassets/default.nix b/nixpkgs/pkgs/development/python-modules/webassets/default.nix
index a8a4e474f53..a8a4e474f53 100644
--- a/pkgs/development/python-modules/webassets/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/webassets/default.nix
diff --git a/pkgs/development/python-modules/webcolors/default.nix b/nixpkgs/pkgs/development/python-modules/webcolors/default.nix
index 3ca97c4556c..3ca97c4556c 100644
--- a/pkgs/development/python-modules/webcolors/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/webcolors/default.nix
diff --git a/pkgs/development/python-modules/webencodings/default.nix b/nixpkgs/pkgs/development/python-modules/webencodings/default.nix
index c4ab0dd59ca..c4ab0dd59ca 100644
--- a/pkgs/development/python-modules/webencodings/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/webencodings/default.nix
diff --git a/pkgs/development/python-modules/webhelpers/default.nix b/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix
index 37f9735f47c..37f9735f47c 100644
--- a/pkgs/development/python-modules/webhelpers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix
diff --git a/pkgs/development/python-modules/webob/default.nix b/nixpkgs/pkgs/development/python-modules/webob/default.nix
index bd2e0574a47..bd2e0574a47 100644
--- a/pkgs/development/python-modules/webob/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/webob/default.nix
diff --git a/pkgs/development/python-modules/weboob/default.nix b/nixpkgs/pkgs/development/python-modules/weboob/default.nix
index d0a5d6116f8..d0a5d6116f8 100644
--- a/pkgs/development/python-modules/weboob/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/weboob/default.nix
diff --git a/pkgs/development/python-modules/webrtcvad/default.nix b/nixpkgs/pkgs/development/python-modules/webrtcvad/default.nix
index 7bd0f20bfa1..7bd0f20bfa1 100644
--- a/pkgs/development/python-modules/webrtcvad/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/webrtcvad/default.nix
diff --git a/pkgs/development/python-modules/websocket_client/default.nix b/nixpkgs/pkgs/development/python-modules/websocket_client/default.nix
index ad830a0890a..ad830a0890a 100644
--- a/pkgs/development/python-modules/websocket_client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/websocket_client/default.nix
diff --git a/pkgs/development/python-modules/websockets/default.nix b/nixpkgs/pkgs/development/python-modules/websockets/default.nix
index 1e1e1ef58a8..1e1e1ef58a8 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/websockets/default.nix
diff --git a/pkgs/development/python-modules/websockify/default.nix b/nixpkgs/pkgs/development/python-modules/websockify/default.nix
index 484cc33b1f3..484cc33b1f3 100644
--- a/pkgs/development/python-modules/websockify/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/websockify/default.nix
diff --git a/pkgs/development/python-modules/webtest/default.nix b/nixpkgs/pkgs/development/python-modules/webtest/default.nix
index d97d58b2e5d..d97d58b2e5d 100644
--- a/pkgs/development/python-modules/webtest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/webtest/default.nix
diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix
index 7d9d55ec884..7d9d55ec884 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix
diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix
index a43aa915ea0..a43aa915ea0 100644
--- a/pkgs/development/python-modules/wfuzz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix
diff --git a/pkgs/development/python-modules/wget/default.nix b/nixpkgs/pkgs/development/python-modules/wget/default.nix
index 2ffd747d04d..2ffd747d04d 100644
--- a/pkgs/development/python-modules/wget/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wget/default.nix
diff --git a/pkgs/development/python-modules/wheel/default.nix b/nixpkgs/pkgs/development/python-modules/wheel/default.nix
index 8b6aa35b1ac..8b6aa35b1ac 100644
--- a/pkgs/development/python-modules/wheel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wheel/default.nix
diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/nixpkgs/pkgs/development/python-modules/whichcraft/default.nix
index de6c4c570cc..de6c4c570cc 100644
--- a/pkgs/development/python-modules/whichcraft/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/whichcraft/default.nix
diff --git a/pkgs/development/python-modules/whisper/default.nix b/nixpkgs/pkgs/development/python-modules/whisper/default.nix
index 134d797ecf8..134d797ecf8 100644
--- a/pkgs/development/python-modules/whisper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/whisper/default.nix
diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix
index 565032ad523..565032ad523 100644
--- a/pkgs/development/python-modules/whitenoise/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix
diff --git a/pkgs/development/python-modules/whoosh/default.nix b/nixpkgs/pkgs/development/python-modules/whoosh/default.nix
index a7b34cf9b36..a7b34cf9b36 100644
--- a/pkgs/development/python-modules/whoosh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/whoosh/default.nix
diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix
index f0aee6b8058..f0aee6b8058 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix
diff --git a/pkgs/development/python-modules/willow/default.nix b/nixpkgs/pkgs/development/python-modules/willow/default.nix
index 138facad701..138facad701 100644
--- a/pkgs/development/python-modules/willow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/willow/default.nix
diff --git a/pkgs/development/python-modules/word2vec/default.nix b/nixpkgs/pkgs/development/python-modules/word2vec/default.nix
index 706ee732402..706ee732402 100644
--- a/pkgs/development/python-modules/word2vec/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/word2vec/default.nix
diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix
index 97530989a38..97530989a38 100644
--- a/pkgs/development/python-modules/wordfreq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix
diff --git a/pkgs/development/python-modules/worldengine/default.nix b/nixpkgs/pkgs/development/python-modules/worldengine/default.nix
index 81c09bf7425..81c09bf7425 100644
--- a/pkgs/development/python-modules/worldengine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/worldengine/default.nix
diff --git a/pkgs/development/python-modules/wptserve/default.nix b/nixpkgs/pkgs/development/python-modules/wptserve/default.nix
index 12172c376c9..12172c376c9 100644
--- a/pkgs/development/python-modules/wptserve/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wptserve/default.nix
diff --git a/pkgs/development/python-modules/wrapt/default.nix b/nixpkgs/pkgs/development/python-modules/wrapt/default.nix
index 5ef9dd07508..5ef9dd07508 100644
--- a/pkgs/development/python-modules/wrapt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wrapt/default.nix
diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix
index 29c1f8dfa79..29c1f8dfa79 100644
--- a/pkgs/development/python-modules/wrf-python/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix
diff --git a/pkgs/development/python-modules/ws4py/default.nix b/nixpkgs/pkgs/development/python-modules/ws4py/default.nix
index 141b499453e..141b499453e 100644
--- a/pkgs/development/python-modules/ws4py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ws4py/default.nix
diff --git a/pkgs/development/python-modules/wsgiproxy/default.nix b/nixpkgs/pkgs/development/python-modules/wsgiproxy/default.nix
index 8ae8b4aefa5..8ae8b4aefa5 100644
--- a/pkgs/development/python-modules/wsgiproxy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wsgiproxy/default.nix
diff --git a/pkgs/development/python-modules/wsgiproxy2/default.nix b/nixpkgs/pkgs/development/python-modules/wsgiproxy2/default.nix
index 4877e5f66f2..4877e5f66f2 100644
--- a/pkgs/development/python-modules/wsgiproxy2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wsgiproxy2/default.nix
diff --git a/pkgs/development/python-modules/wsproto/0.14.nix b/nixpkgs/pkgs/development/python-modules/wsproto/0.14.nix
index b2c3c527d82..b2c3c527d82 100644
--- a/pkgs/development/python-modules/wsproto/0.14.nix
+++ b/nixpkgs/pkgs/development/python-modules/wsproto/0.14.nix
diff --git a/pkgs/development/python-modules/wsproto/default.nix b/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
index dfbf9ceabdc..dfbf9ceabdc 100644
--- a/pkgs/development/python-modules/wsproto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix
index a01aaa4631a..a01aaa4631a 100644
--- a/pkgs/development/python-modules/wtf-peewee/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix
diff --git a/pkgs/development/python-modules/wtforms/default.nix b/nixpkgs/pkgs/development/python-modules/wtforms/default.nix
index 40f0b655451..40f0b655451 100644
--- a/pkgs/development/python-modules/wtforms/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wtforms/default.nix
diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix
index b946d23acf6..b946d23acf6 100644
--- a/pkgs/development/python-modules/wurlitzer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix
diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix
index 98461dfb404..98461dfb404 100644
--- a/pkgs/development/python-modules/wxPython/3.0.nix
+++ b/nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix
diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix
index 689a1336ef7..689a1336ef7 100644
--- a/pkgs/development/python-modules/wxPython/4.0.nix
+++ b/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix
diff --git a/pkgs/development/python-modules/x11_hash/default.nix b/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix
index 060d08869b8..060d08869b8 100644
--- a/pkgs/development/python-modules/x11_hash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix
diff --git a/pkgs/development/python-modules/x256/default.nix b/nixpkgs/pkgs/development/python-modules/x256/default.nix
index 55a3ad7d0cc..55a3ad7d0cc 100644
--- a/pkgs/development/python-modules/x256/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/x256/default.nix
diff --git a/pkgs/development/python-modules/xapian/default.nix b/nixpkgs/pkgs/development/python-modules/xapian/default.nix
index 05c7fed589e..05c7fed589e 100644
--- a/pkgs/development/python-modules/xapian/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xapian/default.nix
diff --git a/pkgs/development/python-modules/xapp/default.nix b/nixpkgs/pkgs/development/python-modules/xapp/default.nix
index 440db343025..440db343025 100644
--- a/pkgs/development/python-modules/xapp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xapp/default.nix
diff --git a/pkgs/development/python-modules/xarray/default.nix b/nixpkgs/pkgs/development/python-modules/xarray/default.nix
index c7f0fb1ecf8..c7f0fb1ecf8 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xarray/default.nix
diff --git a/pkgs/development/python-modules/xattr/default.nix b/nixpkgs/pkgs/development/python-modules/xattr/default.nix
index 35c11e90088..35c11e90088 100644
--- a/pkgs/development/python-modules/xattr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xattr/default.nix
diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/nixpkgs/pkgs/development/python-modules/xcaplib/default.nix
index 7002c43cf2b..7002c43cf2b 100644
--- a/pkgs/development/python-modules/xcaplib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xcaplib/default.nix
diff --git a/pkgs/development/python-modules/xcffib/default.nix b/nixpkgs/pkgs/development/python-modules/xcffib/default.nix
index 1bb421194f9..1bb421194f9 100644
--- a/pkgs/development/python-modules/xcffib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xcffib/default.nix
diff --git a/pkgs/development/python-modules/xdis/default.nix b/nixpkgs/pkgs/development/python-modules/xdis/default.nix
index 831dd888fae..831dd888fae 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xdis/default.nix
diff --git a/pkgs/development/python-modules/xdot/default.nix b/nixpkgs/pkgs/development/python-modules/xdot/default.nix
index 14f4b24747c..14f4b24747c 100644
--- a/pkgs/development/python-modules/xdot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xdot/default.nix
diff --git a/pkgs/development/python-modules/xgboost/default.nix b/nixpkgs/pkgs/development/python-modules/xgboost/default.nix
index 81a8d05f5bf..81a8d05f5bf 100644
--- a/pkgs/development/python-modules/xgboost/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xgboost/default.nix
diff --git a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch b/nixpkgs/pkgs/development/python-modules/xgboost/lib-path-for-python.patch
index c9252c12fed..c9252c12fed 100644
--- a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch
+++ b/nixpkgs/pkgs/development/python-modules/xgboost/lib-path-for-python.patch
diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix
index d5a66685646..d5a66685646 100644
--- a/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix
diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix
index 9ea1445eff5..9ea1445eff5 100644
--- a/pkgs/development/python-modules/xkcdpass/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix
diff --git a/pkgs/development/python-modules/xlib/default.nix b/nixpkgs/pkgs/development/python-modules/xlib/default.nix
index 1903c3aaca8..1903c3aaca8 100644
--- a/pkgs/development/python-modules/xlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xlib/default.nix
diff --git a/pkgs/development/python-modules/xlrd/default.nix b/nixpkgs/pkgs/development/python-modules/xlrd/default.nix
index e37b2694576..e37b2694576 100644
--- a/pkgs/development/python-modules/xlrd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xlrd/default.nix
diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix
index 5faf56b7eba..5faf56b7eba 100644
--- a/pkgs/development/python-modules/xlsx2csv/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix
diff --git a/pkgs/development/python-modules/xlwt/default.nix b/nixpkgs/pkgs/development/python-modules/xlwt/default.nix
index 5de0348e00e..5de0348e00e 100644
--- a/pkgs/development/python-modules/xlwt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xlwt/default.nix
diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
index cf4eadd99d8..cf4eadd99d8 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
index 788ccc0ed81..788ccc0ed81 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix
index 07250337f83..07250337f83 100644
--- a/pkgs/development/python-modules/xmltodict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix
diff --git a/pkgs/development/python-modules/xmodem/default.nix b/nixpkgs/pkgs/development/python-modules/xmodem/default.nix
index 00a0bfb6043..00a0bfb6043 100644
--- a/pkgs/development/python-modules/xmodem/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xmodem/default.nix
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix
index ec725564f2b..ec725564f2b 100644
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix
diff --git a/pkgs/development/python-modules/xmpppy/ssl.patch b/nixpkgs/pkgs/development/python-modules/xmpppy/ssl.patch
index 915602dc23e..915602dc23e 100644
--- a/pkgs/development/python-modules/xmpppy/ssl.patch
+++ b/nixpkgs/pkgs/development/python-modules/xmpppy/ssl.patch
diff --git a/pkgs/development/python-modules/xnd/default.nix b/nixpkgs/pkgs/development/python-modules/xnd/default.nix
index 558e414debf..558e414debf 100644
--- a/pkgs/development/python-modules/xnd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xnd/default.nix
diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/nixpkgs/pkgs/development/python-modules/xstatic-bootbox/default.nix
index 1f60a0fbe6c..1f60a0fbe6c 100644
--- a/pkgs/development/python-modules/xstatic-bootbox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xstatic-bootbox/default.nix
diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/nixpkgs/pkgs/development/python-modules/xstatic-bootstrap/default.nix
index 9abc9b273a2..9abc9b273a2 100644
--- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xstatic-bootstrap/default.nix
diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/nixpkgs/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
index e4352e3b984..e4352e3b984 100644
--- a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/nixpkgs/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
index c47dfbc05d8..c47dfbc05d8 100644
--- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/nixpkgs/pkgs/development/python-modules/xstatic-jquery/default.nix
index 8e3f084ca7f..8e3f084ca7f 100644
--- a/pkgs/development/python-modules/xstatic-jquery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xstatic-jquery/default.nix
diff --git a/pkgs/development/python-modules/xstatic-pygments/default.nix b/nixpkgs/pkgs/development/python-modules/xstatic-pygments/default.nix
index 919d262c50d..919d262c50d 100644
--- a/pkgs/development/python-modules/xstatic-pygments/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xstatic-pygments/default.nix
diff --git a/pkgs/development/python-modules/xstatic/default.nix b/nixpkgs/pkgs/development/python-modules/xstatic/default.nix
index bbfcce54d89..bbfcce54d89 100644
--- a/pkgs/development/python-modules/xstatic/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xstatic/default.nix
diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix
index c7708d0f20b..c7708d0f20b 100644
--- a/pkgs/development/python-modules/xvfbwrapper/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix
diff --git a/pkgs/development/python-modules/xxhash/default.nix b/nixpkgs/pkgs/development/python-modules/xxhash/default.nix
index 66f31441ec5..66f31441ec5 100644
--- a/pkgs/development/python-modules/xxhash/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/xxhash/default.nix
diff --git a/pkgs/development/python-modules/yahooweather/default.nix b/nixpkgs/pkgs/development/python-modules/yahooweather/default.nix
index 38c060aa8e8..38c060aa8e8 100644
--- a/pkgs/development/python-modules/yahooweather/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yahooweather/default.nix
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/nixpkgs/pkgs/development/python-modules/yamllint/default.nix
index b4d5834b242..b4d5834b242 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yamllint/default.nix
diff --git a/pkgs/development/python-modules/yanc/default.nix b/nixpkgs/pkgs/development/python-modules/yanc/default.nix
index 690b110fc93..690b110fc93 100644
--- a/pkgs/development/python-modules/yanc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yanc/default.nix
diff --git a/pkgs/development/python-modules/yapf/default.nix b/nixpkgs/pkgs/development/python-modules/yapf/default.nix
index f4e154f2cbc..f4e154f2cbc 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yapf/default.nix
diff --git a/pkgs/development/python-modules/yappi/default.nix b/nixpkgs/pkgs/development/python-modules/yappi/default.nix
index f7a18bba903..f7a18bba903 100644
--- a/pkgs/development/python-modules/yappi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yappi/default.nix
diff --git a/pkgs/development/python-modules/yappi/tests.patch b/nixpkgs/pkgs/development/python-modules/yappi/tests.patch
index bff4b28295b..bff4b28295b 100644
--- a/pkgs/development/python-modules/yappi/tests.patch
+++ b/nixpkgs/pkgs/development/python-modules/yappi/tests.patch
diff --git a/pkgs/development/python-modules/yapsy/default.nix b/nixpkgs/pkgs/development/python-modules/yapsy/default.nix
index dfdd3dd3c05..dfdd3dd3c05 100644
--- a/pkgs/development/python-modules/yapsy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yapsy/default.nix
diff --git a/pkgs/development/python-modules/yarg/default.nix b/nixpkgs/pkgs/development/python-modules/yarg/default.nix
index f49ed20b2b9..f49ed20b2b9 100644
--- a/pkgs/development/python-modules/yarg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yarg/default.nix
diff --git a/pkgs/development/python-modules/yarl/default.nix b/nixpkgs/pkgs/development/python-modules/yarl/default.nix
index 19314e19611..19314e19611 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yarl/default.nix
diff --git a/pkgs/development/python-modules/yattag/default.nix b/nixpkgs/pkgs/development/python-modules/yattag/default.nix
index 8f97a374df6..8f97a374df6 100644
--- a/pkgs/development/python-modules/yattag/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yattag/default.nix
diff --git a/pkgs/development/python-modules/yenc/default.nix b/nixpkgs/pkgs/development/python-modules/yenc/default.nix
index 3c51d00ec14..3c51d00ec14 100644
--- a/pkgs/development/python-modules/yenc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yenc/default.nix
diff --git a/pkgs/development/python-modules/yolk/default.nix b/nixpkgs/pkgs/development/python-modules/yolk/default.nix
index fe7f0cf466e..fe7f0cf466e 100644
--- a/pkgs/development/python-modules/yolk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yolk/default.nix
diff --git a/pkgs/development/python-modules/yowsup/default.nix b/nixpkgs/pkgs/development/python-modules/yowsup/default.nix
index 0436fe8a0f0..0436fe8a0f0 100644
--- a/pkgs/development/python-modules/yowsup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yowsup/default.nix
diff --git a/pkgs/development/python-modules/yowsup/dependency-fixes.patch b/nixpkgs/pkgs/development/python-modules/yowsup/dependency-fixes.patch
index eab56332d49..eab56332d49 100644
--- a/pkgs/development/python-modules/yowsup/dependency-fixes.patch
+++ b/nixpkgs/pkgs/development/python-modules/yowsup/dependency-fixes.patch
diff --git a/pkgs/development/python-modules/yt/default.nix b/nixpkgs/pkgs/development/python-modules/yt/default.nix
index f2d7e62eca3..f2d7e62eca3 100644
--- a/pkgs/development/python-modules/yt/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yt/default.nix
diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/nixpkgs/pkgs/development/python-modules/yubico-client/default.nix
index 99aedd4e681..99aedd4e681 100644
--- a/pkgs/development/python-modules/yubico-client/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/yubico-client/default.nix
diff --git a/pkgs/development/python-modules/zake/default.nix b/nixpkgs/pkgs/development/python-modules/zake/default.nix
index 8eafaafadf5..8eafaafadf5 100644
--- a/pkgs/development/python-modules/zake/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zake/default.nix
diff --git a/pkgs/development/python-modules/zarr/default.nix b/nixpkgs/pkgs/development/python-modules/zarr/default.nix
index 5570688e98b..5570688e98b 100644
--- a/pkgs/development/python-modules/zarr/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zarr/default.nix
diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix
index c15e46e5d0d..c15e46e5d0d 100644
--- a/pkgs/development/python-modules/zbaemon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix
diff --git a/pkgs/development/python-modules/zbase32/default.nix b/nixpkgs/pkgs/development/python-modules/zbase32/default.nix
index a5002e80f49..a5002e80f49 100644
--- a/pkgs/development/python-modules/zbase32/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zbase32/default.nix
diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix
index 173a619197c..173a619197c 100644
--- a/pkgs/development/python-modules/zc_lockfile/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix
diff --git a/pkgs/development/python-modules/zconfig/default.nix b/nixpkgs/pkgs/development/python-modules/zconfig/default.nix
index f68164284da..f68164284da 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zconfig/default.nix
diff --git a/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch b/nixpkgs/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch
index 6b3d3266b21..6b3d3266b21 100644
--- a/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch
+++ b/nixpkgs/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch
diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix
index c15e46e5d0d..c15e46e5d0d 100644
--- a/pkgs/development/python-modules/zdaemon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix
diff --git a/pkgs/development/python-modules/zeep/default.nix b/nixpkgs/pkgs/development/python-modules/zeep/default.nix
index 72a6e1ba229..72a6e1ba229 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zeep/default.nix
diff --git a/pkgs/development/python-modules/zerobin/default.nix b/nixpkgs/pkgs/development/python-modules/zerobin/default.nix
index ce993d3d41a..ce993d3d41a 100644
--- a/pkgs/development/python-modules/zerobin/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zerobin/default.nix
diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix
index c7342bbfa55..c7342bbfa55 100644
--- a/pkgs/development/python-modules/zeroc-ice/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix
diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix
index ef45f663ceb..ef45f663ceb 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix
diff --git a/pkgs/development/python-modules/zerorpc/default.nix b/nixpkgs/pkgs/development/python-modules/zerorpc/default.nix
index 343c7c6e251..343c7c6e251 100644
--- a/pkgs/development/python-modules/zerorpc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zerorpc/default.nix
diff --git a/pkgs/development/python-modules/zetup/default.nix b/nixpkgs/pkgs/development/python-modules/zetup/default.nix
index eb3c5ff135c..eb3c5ff135c 100644
--- a/pkgs/development/python-modules/zetup/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zetup/default.nix
diff --git a/pkgs/development/python-modules/zfec/default.nix b/nixpkgs/pkgs/development/python-modules/zfec/default.nix
index 9193c2ddc08..9193c2ddc08 100644
--- a/pkgs/development/python-modules/zfec/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zfec/default.nix
diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
index d819a881f9f..d819a881f9f 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
diff --git a/pkgs/development/python-modules/zict/default.nix b/nixpkgs/pkgs/development/python-modules/zict/default.nix
index 42f0218c846..42f0218c846 100644
--- a/pkgs/development/python-modules/zict/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zict/default.nix
diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix
index c9df7824093..c9df7824093 100644
--- a/pkgs/development/python-modules/zigpy-deconz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix
diff --git a/pkgs/development/python-modules/zigpy/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
index 726f1fde4e6..726f1fde4e6 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/nixpkgs/pkgs/development/python-modules/zipfile36/default.nix
index 2148dcc4b80..2148dcc4b80 100644
--- a/pkgs/development/python-modules/zipfile36/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zipfile36/default.nix
diff --git a/pkgs/development/python-modules/zipp/default.nix b/nixpkgs/pkgs/development/python-modules/zipp/default.nix
index 3b9b1a12cca..3b9b1a12cca 100644
--- a/pkgs/development/python-modules/zipp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zipp/default.nix
diff --git a/pkgs/development/python-modules/zipstream/default.nix b/nixpkgs/pkgs/development/python-modules/zipstream/default.nix
index 4d5fabe7fca..4d5fabe7fca 100644
--- a/pkgs/development/python-modules/zipstream/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zipstream/default.nix
diff --git a/pkgs/development/python-modules/zm-py/default.nix b/nixpkgs/pkgs/development/python-modules/zm-py/default.nix
index 4cd5e9b1d20..4cd5e9b1d20 100644
--- a/pkgs/development/python-modules/zm-py/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zm-py/default.nix
diff --git a/pkgs/development/python-modules/zodb/default.nix b/nixpkgs/pkgs/development/python-modules/zodb/default.nix
index f15cefaa475..f15cefaa475 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zodb/default.nix
diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix
index b24b5853876..b24b5853876 100644
--- a/pkgs/development/python-modules/zodbpickle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix
diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix
index 26d8255c03b..26d8255c03b 100644
--- a/pkgs/development/python-modules/zope-deferredimport/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix
diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix
index 0b7bc80bf3a..0b7bc80bf3a 100644
--- a/pkgs/development/python-modules/zope-hookable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix
diff --git a/pkgs/development/python-modules/zope_broken/default.nix b/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix
index df3a2053ebf..df3a2053ebf 100644
--- a/pkgs/development/python-modules/zope_broken/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix
diff --git a/pkgs/development/python-modules/zope_component/default.nix b/nixpkgs/pkgs/development/python-modules/zope_component/default.nix
index 25452fdd070..25452fdd070 100644
--- a/pkgs/development/python-modules/zope_component/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_component/default.nix
diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix
index e0ec7bd6ca8..e0ec7bd6ca8 100644
--- a/pkgs/development/python-modules/zope_configuration/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix
diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix
index 6db39d6c5b5..6db39d6c5b5 100644
--- a/pkgs/development/python-modules/zope_contenttype/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix
diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix
index 4d6e740278e..4d6e740278e 100644
--- a/pkgs/development/python-modules/zope_copy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix
diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix
index b56e1969711..b56e1969711 100644
--- a/pkgs/development/python-modules/zope_deprecation/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix
diff --git a/pkgs/development/python-modules/zope_dottedname/default.nix b/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix
index d2a21fd03b0..d2a21fd03b0 100644
--- a/pkgs/development/python-modules/zope_dottedname/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix
diff --git a/pkgs/development/python-modules/zope_event/default.nix b/nixpkgs/pkgs/development/python-modules/zope_event/default.nix
index 3dea7adcb00..3dea7adcb00 100644
--- a/pkgs/development/python-modules/zope_event/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_event/default.nix
diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix
index dbbba691edb..dbbba691edb 100644
--- a/pkgs/development/python-modules/zope_exceptions/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix
diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix
index e9104a1b939..e9104a1b939 100644
--- a/pkgs/development/python-modules/zope_filerepresentation/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix
diff --git a/pkgs/development/python-modules/zope_i18n/default.nix b/nixpkgs/pkgs/development/python-modules/zope_i18n/default.nix
index 81558a21446..81558a21446 100644
--- a/pkgs/development/python-modules/zope_i18n/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_i18n/default.nix
diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix
index fe9a6b56ed8..fe9a6b56ed8 100644
--- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix
diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix
index d208d4a3529..d208d4a3529 100644
--- a/pkgs/development/python-modules/zope_interface/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix
diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix
index 738b30c489f..738b30c489f 100644
--- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix
diff --git a/pkgs/development/python-modules/zope_location/default.nix b/nixpkgs/pkgs/development/python-modules/zope_location/default.nix
index 7c0df16f775..7c0df16f775 100644
--- a/pkgs/development/python-modules/zope_location/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_location/default.nix
diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix
index 537fc1465f2..537fc1465f2 100644
--- a/pkgs/development/python-modules/zope_proxy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix
diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix
index df5322acc87..df5322acc87 100644
--- a/pkgs/development/python-modules/zope_schema/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix
diff --git a/pkgs/development/python-modules/zope_size/default.nix b/nixpkgs/pkgs/development/python-modules/zope_size/default.nix
index 8651e2d6822..8651e2d6822 100644
--- a/pkgs/development/python-modules/zope_size/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_size/default.nix
diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix
index 037c5d87f9a..037c5d87f9a 100644
--- a/pkgs/development/python-modules/zope_testing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix
diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix
index f6bf7f96a76..f6bf7f96a76 100644
--- a/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix
diff --git a/pkgs/development/python-modules/zstd/default.nix b/nixpkgs/pkgs/development/python-modules/zstd/default.nix
index 6c1b9c2bb5b..6c1b9c2bb5b 100644
--- a/pkgs/development/python-modules/zstd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zstd/default.nix
diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix
index 67f48f34731..67f48f34731 100644
--- a/pkgs/development/python-modules/zxcvbn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix
diff --git a/pkgs/development/r-modules/README.md b/nixpkgs/pkgs/development/r-modules/README.md
index e6fd09d7647..e6fd09d7647 100644
--- a/pkgs/development/r-modules/README.md
+++ b/nixpkgs/pkgs/development/r-modules/README.md
diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/nixpkgs/pkgs/development/r-modules/bioc-annotation-packages.nix
index 863d7c9fcfe..863d7c9fcfe 100644
--- a/pkgs/development/r-modules/bioc-annotation-packages.nix
+++ b/nixpkgs/pkgs/development/r-modules/bioc-annotation-packages.nix
diff --git a/pkgs/development/r-modules/bioc-experiment-packages.nix b/nixpkgs/pkgs/development/r-modules/bioc-experiment-packages.nix
index 04f4d25def2..04f4d25def2 100644
--- a/pkgs/development/r-modules/bioc-experiment-packages.nix
+++ b/nixpkgs/pkgs/development/r-modules/bioc-experiment-packages.nix
diff --git a/pkgs/development/r-modules/bioc-packages.nix b/nixpkgs/pkgs/development/r-modules/bioc-packages.nix
index a85290708fc..a85290708fc 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/nixpkgs/pkgs/development/r-modules/bioc-packages.nix
diff --git a/pkgs/development/r-modules/cran-packages.nix b/nixpkgs/pkgs/development/r-modules/cran-packages.nix
index 8c50affaeff..8c50affaeff 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/nixpkgs/pkgs/development/r-modules/cran-packages.nix
diff --git a/pkgs/development/r-modules/default.nix b/nixpkgs/pkgs/development/r-modules/default.nix
index 2c927c7408c..2c927c7408c 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/nixpkgs/pkgs/development/r-modules/default.nix
diff --git a/pkgs/development/r-modules/generate-r-packages.R b/nixpkgs/pkgs/development/r-modules/generate-r-packages.R
index 1586b5b16b3..1586b5b16b3 100755
--- a/pkgs/development/r-modules/generate-r-packages.R
+++ b/nixpkgs/pkgs/development/r-modules/generate-r-packages.R
diff --git a/pkgs/development/r-modules/generate-shell.nix b/nixpkgs/pkgs/development/r-modules/generate-shell.nix
index beb37827508..beb37827508 100644
--- a/pkgs/development/r-modules/generate-shell.nix
+++ b/nixpkgs/pkgs/development/r-modules/generate-shell.nix
diff --git a/pkgs/development/r-modules/generic-builder.nix b/nixpkgs/pkgs/development/r-modules/generic-builder.nix
index 76bf29abc17..76bf29abc17 100644
--- a/pkgs/development/r-modules/generic-builder.nix
+++ b/nixpkgs/pkgs/development/r-modules/generic-builder.nix
diff --git a/pkgs/development/r-modules/patches/BayesXsrc.patch b/nixpkgs/pkgs/development/r-modules/patches/BayesXsrc.patch
index b357d7f83fc..b357d7f83fc 100644
--- a/pkgs/development/r-modules/patches/BayesXsrc.patch
+++ b/nixpkgs/pkgs/development/r-modules/patches/BayesXsrc.patch
diff --git a/pkgs/development/r-modules/patches/EMCluster.patch b/nixpkgs/pkgs/development/r-modules/patches/EMCluster.patch
index afc9de3a95a..afc9de3a95a 100644
--- a/pkgs/development/r-modules/patches/EMCluster.patch
+++ b/nixpkgs/pkgs/development/r-modules/patches/EMCluster.patch
diff --git a/pkgs/development/r-modules/patches/RAppArmor.patch b/nixpkgs/pkgs/development/r-modules/patches/RAppArmor.patch
index f2dc49bd476..f2dc49bd476 100644
--- a/pkgs/development/r-modules/patches/RAppArmor.patch
+++ b/nixpkgs/pkgs/development/r-modules/patches/RAppArmor.patch
diff --git a/pkgs/development/r-modules/patches/Rhdf5lib.patch b/nixpkgs/pkgs/development/r-modules/patches/Rhdf5lib.patch
index dcd9b61798b..dcd9b61798b 100644
--- a/pkgs/development/r-modules/patches/Rhdf5lib.patch
+++ b/nixpkgs/pkgs/development/r-modules/patches/Rhdf5lib.patch
diff --git a/pkgs/development/r-modules/patches/Rserve.patch b/nixpkgs/pkgs/development/r-modules/patches/Rserve.patch
index 1ffe17e5542..1ffe17e5542 100644
--- a/pkgs/development/r-modules/patches/Rserve.patch
+++ b/nixpkgs/pkgs/development/r-modules/patches/Rserve.patch
diff --git a/pkgs/development/r-modules/patches/qtbase.patch b/nixpkgs/pkgs/development/r-modules/patches/qtbase.patch
index 14427b72630..14427b72630 100644
--- a/pkgs/development/r-modules/patches/qtbase.patch
+++ b/nixpkgs/pkgs/development/r-modules/patches/qtbase.patch
diff --git a/pkgs/development/r-modules/patches/spMC.patch b/nixpkgs/pkgs/development/r-modules/patches/spMC.patch
index 04239d721c0..04239d721c0 100644
--- a/pkgs/development/r-modules/patches/spMC.patch
+++ b/nixpkgs/pkgs/development/r-modules/patches/spMC.patch
diff --git a/pkgs/development/r-modules/test-evaluation.nix b/nixpkgs/pkgs/development/r-modules/test-evaluation.nix
index 2ca0d42c6db..2ca0d42c6db 100644
--- a/pkgs/development/r-modules/test-evaluation.nix
+++ b/nixpkgs/pkgs/development/r-modules/test-evaluation.nix
diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/nixpkgs/pkgs/development/r-modules/wrapper-rstudio.nix
index 5eeac8fed30..5eeac8fed30 100644
--- a/pkgs/development/r-modules/wrapper-rstudio.nix
+++ b/nixpkgs/pkgs/development/r-modules/wrapper-rstudio.nix
diff --git a/pkgs/development/r-modules/wrapper.nix b/nixpkgs/pkgs/development/r-modules/wrapper.nix
index 76e819501a5..76e819501a5 100644
--- a/pkgs/development/r-modules/wrapper.nix
+++ b/nixpkgs/pkgs/development/r-modules/wrapper.nix
diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix
index 353adbcea6f..353adbcea6f 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix
diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix
index 0812ff590a5..0812ff590a5 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix
diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix
index 35307a3fbd9..35307a3fbd9 100644
--- a/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix
diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
index add5db56d1d..add5db56d1d 100644
--- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
+++ b/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
diff --git a/pkgs/development/ruby-modules/bundled-common/test.nix b/nixpkgs/pkgs/development/ruby-modules/bundled-common/test.nix
index ab03f48445b..ab03f48445b 100644
--- a/pkgs/development/ruby-modules/bundled-common/test.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundled-common/test.nix
diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix
index 2fa70664323..2fa70664323 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler-env/default.nix
index 9e9ccb128cf..9e9ccb128cf 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundler-env/default.nix
diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test.nix
index 8fdbafbba42..8fdbafbba42 100644
--- a/pkgs/development/ruby-modules/bundler-env/test.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test.nix
diff --git a/pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test/Gemfile
index e69de29bb2d..e69de29bb2d 100644
--- a/pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock
+++ b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test/Gemfile
diff --git a/nixpkgs/pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock
diff --git a/pkgs/development/ruby-modules/bundler-env/test/gemset.nix b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test/gemset.nix
index 53f15f96bc6..53f15f96bc6 100644
--- a/pkgs/development/ruby-modules/bundler-env/test/gemset.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test/gemset.nix
diff --git a/pkgs/development/ruby-modules/bundler-update-script/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler-update-script/default.nix
index 50d0364aa06..50d0364aa06 100644
--- a/pkgs/development/ruby-modules/bundler-update-script/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundler-update-script/default.nix
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix
index 6190b4210cd..6190b4210cd 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix
index 088bcedf6de..088bcedf6de 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix
diff --git a/pkgs/development/ruby-modules/gem-config/xapian-Rakefile b/nixpkgs/pkgs/development/ruby-modules/gem-config/xapian-Rakefile
index 54412ff810b..54412ff810b 100644
--- a/pkgs/development/ruby-modules/gem-config/xapian-Rakefile
+++ b/nixpkgs/pkgs/development/ruby-modules/gem-config/xapian-Rakefile
diff --git a/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch b/nixpkgs/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch
index badb76ccfd2..badb76ccfd2 100644
--- a/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch
+++ b/nixpkgs/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/nixpkgs/pkgs/development/ruby-modules/gem/default.nix
index 158d5891ec3..158d5891ec3 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/gem/default.nix
diff --git a/pkgs/development/ruby-modules/gem/gem-post-build.rb b/nixpkgs/pkgs/development/ruby-modules/gem/gem-post-build.rb
index b754f945986..b754f945986 100644
--- a/pkgs/development/ruby-modules/gem/gem-post-build.rb
+++ b/nixpkgs/pkgs/development/ruby-modules/gem/gem-post-build.rb
diff --git a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb b/nixpkgs/pkgs/development/ruby-modules/gem/nix-bundle-install.rb
index 0d501bd9add..0d501bd9add 100644
--- a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb
+++ b/nixpkgs/pkgs/development/ruby-modules/gem/nix-bundle-install.rb
diff --git a/pkgs/development/ruby-modules/runtests.sh b/nixpkgs/pkgs/development/ruby-modules/runtests.sh
index 8bb8c8a5462..8bb8c8a5462 100755
--- a/pkgs/development/ruby-modules/runtests.sh
+++ b/nixpkgs/pkgs/development/ruby-modules/runtests.sh
diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile b/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile
index fa41b7c1d21..fa41b7c1d21 100644
--- a/pkgs/development/ruby-modules/solargraph/Gemfile
+++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile
diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index c2e4840eab0..c2e4840eab0 100644
--- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock
diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix
index ff9b1bac321..ff9b1bac321 100644
--- a/pkgs/development/ruby-modules/solargraph/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix
index e1ea15fb4e1..e1ea15fb4e1 100644
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix
diff --git a/pkgs/development/ruby-modules/testing/assertions.nix b/nixpkgs/pkgs/development/ruby-modules/testing/assertions.nix
index f28cfcd508d..f28cfcd508d 100644
--- a/pkgs/development/ruby-modules/testing/assertions.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/testing/assertions.nix
diff --git a/pkgs/development/ruby-modules/testing/driver.nix b/nixpkgs/pkgs/development/ruby-modules/testing/driver.nix
index 65e7c8d4416..65e7c8d4416 100644
--- a/pkgs/development/ruby-modules/testing/driver.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/testing/driver.nix
diff --git a/pkgs/development/ruby-modules/testing/stubs.nix b/nixpkgs/pkgs/development/ruby-modules/testing/stubs.nix
index aaab2f68960..aaab2f68960 100644
--- a/pkgs/development/ruby-modules/testing/stubs.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/testing/stubs.nix
diff --git a/pkgs/development/ruby-modules/testing/tap-support.nix b/nixpkgs/pkgs/development/ruby-modules/testing/tap-support.nix
index 74fcceebaa0..74fcceebaa0 100644
--- a/pkgs/development/ruby-modules/testing/tap-support.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/testing/tap-support.nix
diff --git a/pkgs/development/ruby-modules/testing/testing.nix b/nixpkgs/pkgs/development/ruby-modules/testing/testing.nix
index 43d10fca044..43d10fca044 100644
--- a/pkgs/development/ruby-modules/testing/testing.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/testing/testing.nix
diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile
index 3454ce3df74..3454ce3df74 100644
--- a/pkgs/development/ruby-modules/with-packages/Gemfile
+++ b/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile
diff --git a/pkgs/development/ruby-modules/with-packages/default.nix b/nixpkgs/pkgs/development/ruby-modules/with-packages/default.nix
index 7d49b0e0134..7d49b0e0134 100644
--- a/pkgs/development/ruby-modules/with-packages/default.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/with-packages/default.nix
diff --git a/pkgs/development/ruby-modules/with-packages/require_exceptions.nix b/nixpkgs/pkgs/development/ruby-modules/with-packages/require_exceptions.nix
index e6ae3b5013f..e6ae3b5013f 100644
--- a/pkgs/development/ruby-modules/with-packages/require_exceptions.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/with-packages/require_exceptions.nix
diff --git a/pkgs/development/ruby-modules/with-packages/test.nix b/nixpkgs/pkgs/development/ruby-modules/with-packages/test.nix
index dc1da3de492..dc1da3de492 100644
--- a/pkgs/development/ruby-modules/with-packages/test.nix
+++ b/nixpkgs/pkgs/development/ruby-modules/with-packages/test.nix
diff --git a/pkgs/development/ruby-modules/with-packages/test.rb b/nixpkgs/pkgs/development/ruby-modules/with-packages/test.rb
index 760402d070c..760402d070c 100755
--- a/pkgs/development/ruby-modules/with-packages/test.rb
+++ b/nixpkgs/pkgs/development/ruby-modules/with-packages/test.rb
diff --git a/pkgs/development/tools/alloy/default.nix b/nixpkgs/pkgs/development/tools/alloy/default.nix
index 0b34055274d..0b34055274d 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/nixpkgs/pkgs/development/tools/alloy/default.nix
diff --git a/pkgs/development/tools/alloy/icon.png b/nixpkgs/pkgs/development/tools/alloy/icon.png
index a76bd948047..a76bd948047 100644
--- a/pkgs/development/tools/alloy/icon.png
+++ b/nixpkgs/pkgs/development/tools/alloy/icon.png
diff --git a/pkgs/development/tools/ameba/default.nix b/nixpkgs/pkgs/development/tools/ameba/default.nix
index 5ac6c5afa91..5ac6c5afa91 100644
--- a/pkgs/development/tools/ameba/default.nix
+++ b/nixpkgs/pkgs/development/tools/ameba/default.nix
diff --git a/pkgs/development/tools/ammonite/default.nix b/nixpkgs/pkgs/development/tools/ammonite/default.nix
index 69e81596574..69e81596574 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/nixpkgs/pkgs/development/tools/ammonite/default.nix
diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix
index 7ae563c058b..7ae563c058b 100644
--- a/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix
diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix
index 2367e197f84..2367e197f84 100644
--- a/pkgs/development/tools/analysis/bingrep/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix
diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix
index edf37efbce9..edf37efbce9 100644
--- a/pkgs/development/tools/analysis/brakeman/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix
diff --git a/pkgs/development/tools/analysis/cccc/cccc.patch b/nixpkgs/pkgs/development/tools/analysis/cccc/cccc.patch
index 9454e3b18ad..9454e3b18ad 100644
--- a/pkgs/development/tools/analysis/cccc/cccc.patch
+++ b/nixpkgs/pkgs/development/tools/analysis/cccc/cccc.patch
diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix
index a46d7f9d953..a46d7f9d953 100644
--- a/pkgs/development/tools/analysis/cccc/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix
index 985dd8dfd8c..985dd8dfd8c 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix
diff --git a/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch b/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch
index bcb3ac1d146..bcb3ac1d146 100644
--- a/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch
+++ b/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch
diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix
index 6b0c1b401f6..6b0c1b401f6 100644
--- a/pkgs/development/tools/analysis/clang-analyzer/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix
diff --git a/pkgs/development/tools/analysis/coan/default.nix b/nixpkgs/pkgs/development/tools/analysis/coan/default.nix
index 951c46e2166..951c46e2166 100644
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/coan/default.nix
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
index e5770800199..e5770800199 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix
index bd8c5c37c86..bd8c5c37c86 100644
--- a/pkgs/development/tools/analysis/cov-build/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix
diff --git a/pkgs/development/tools/analysis/coz/default.nix b/nixpkgs/pkgs/development/tools/analysis/coz/default.nix
index 3775d09b27d..3775d09b27d 100644
--- a/pkgs/development/tools/analysis/coz/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/coz/default.nix
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix
index 1b7467608be..1b7467608be 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix
diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix
index 8b4a68adba3..8b4a68adba3 100644
--- a/pkgs/development/tools/analysis/cpplint/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix
diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix
index 6259756794d..6259756794d 100644
--- a/pkgs/development/tools/analysis/egypt/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix
diff --git a/pkgs/development/tools/analysis/emma/default.nix b/nixpkgs/pkgs/development/tools/analysis/emma/default.nix
index 1bd24b4785d..1bd24b4785d 100644
--- a/pkgs/development/tools/analysis/emma/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/emma/default.nix
diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/nixpkgs/pkgs/development/tools/analysis/eresi/default.nix
index ed338a6e0d9..ed338a6e0d9 100644
--- a/pkgs/development/tools/analysis/eresi/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/eresi/default.nix
diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix
index c250f442a0e..c250f442a0e 100644
--- a/pkgs/development/tools/analysis/evmdis/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix
diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix
index 7f2df62008f..7f2df62008f 100644
--- a/pkgs/development/tools/analysis/findbugs/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
index c0b9dff3183..c0b9dff3183 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix
index 7d24bf5e0d5..7d24bf5e0d5 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
index f96f7e9b66b..f96f7e9b66b 100644
--- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch
index 48301bbf61a..48301bbf61a 100644
--- a/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch
+++ b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
index 557fa838474..557fa838474 100644
--- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix
index c9214ae7e35..c9214ae7e35 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix
diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix
index fc7cd2ffe19..fc7cd2ffe19 100644
--- a/pkgs/development/tools/analysis/hotspot/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix
diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix
index a882d158f32..a882d158f32 100644
--- a/pkgs/development/tools/analysis/ikos/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix
diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 424d83822e8..424d83822e8 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix
diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix
index 455ff7722fa..455ff7722fa 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix
diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix
index b5bc31ad5e9..b5bc31ad5e9 100644
--- a/pkgs/development/tools/analysis/kcov/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix
diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix
index 06c712588f8..06c712588f8 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix
diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix
index 20fe74ecb74..20fe74ecb74 100644
--- a/pkgs/development/tools/analysis/makefile2graph/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix
diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/nixpkgs/pkgs/development/tools/analysis/massif-visualizer/default.nix
index c2f0236ed0b..c2f0236ed0b 100644
--- a/pkgs/development/tools/analysis/massif-visualizer/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/massif-visualizer/default.nix
diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix
index 5895be0208b..5895be0208b 100644
--- a/pkgs/development/tools/analysis/nix-linter/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix
diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix
index f5e649d0354..f5e649d0354 100644
--- a/pkgs/development/tools/analysis/oclgrind/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix
diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
index 250002a16b7..250002a16b7 100644
--- a/pkgs/development/tools/analysis/panopticon/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
diff --git a/pkgs/development/tools/analysis/pev/default.nix b/nixpkgs/pkgs/development/tools/analysis/pev/default.nix
index 8e8f438b5e1..8e8f438b5e1 100644
--- a/pkgs/development/tools/analysis/pev/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/pev/default.nix
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix
index 3f3731e2ac8..3f3731e2ac8 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix
index d9f39667cef..d9f39667cef 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix
diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix
index 252e95e5793..252e95e5793 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix
index 667f689b8e7..667f689b8e7 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix
diff --git a/pkgs/development/tools/analysis/radare2/update.py b/nixpkgs/pkgs/development/tools/analysis/radare2/update.py
index b9e72e62366..b9e72e62366 100755
--- a/pkgs/development/tools/analysis/radare2/update.py
+++ b/nixpkgs/pkgs/development/tools/analysis/radare2/update.py
diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix
index e8e3168e937..e8e3168e937 100644
--- a/pkgs/development/tools/analysis/randoop/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix
diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix
index 475d1950bb2..475d1950bb2 100644
--- a/pkgs/development/tools/analysis/retdec/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix
diff --git a/pkgs/development/tools/analysis/retdec/yaracpp.nix b/nixpkgs/pkgs/development/tools/analysis/retdec/yaracpp.nix
index c8bc4ed747b..c8bc4ed747b 100644
--- a/pkgs/development/tools/analysis/retdec/yaracpp.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/retdec/yaracpp.nix
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/nixpkgs/pkgs/development/tools/analysis/rr/default.nix
index a8d95eb05de..a8d95eb05de 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/rr/default.nix
diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix
index 9dc1e2db8c0..9dc1e2db8c0 100644
--- a/pkgs/development/tools/analysis/smatch/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix
index 2f7ff219081..2f7ff219081 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix
diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix
index 945f6c80af5..945f6c80af5 100644
--- a/pkgs/development/tools/analysis/sparse/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/nixpkgs/pkgs/development/tools/analysis/spin/default.nix
index 26598bb36cd..26598bb36cd 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/spin/default.nix
diff --git a/pkgs/development/tools/analysis/splint/darwin.patch b/nixpkgs/pkgs/development/tools/analysis/splint/darwin.patch
index 8c435707571..8c435707571 100644
--- a/pkgs/development/tools/analysis/splint/darwin.patch
+++ b/nixpkgs/pkgs/development/tools/analysis/splint/darwin.patch
diff --git a/pkgs/development/tools/analysis/splint/default.nix b/nixpkgs/pkgs/development/tools/analysis/splint/default.nix
index 57a83e54d70..57a83e54d70 100644
--- a/pkgs/development/tools/analysis/splint/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/splint/default.nix
diff --git a/pkgs/development/tools/analysis/splint/tmpdir.patch b/nixpkgs/pkgs/development/tools/analysis/splint/tmpdir.patch
index 01402ce943b..01402ce943b 100644
--- a/pkgs/development/tools/analysis/splint/tmpdir.patch
+++ b/nixpkgs/pkgs/development/tools/analysis/splint/tmpdir.patch
diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix
index 922a73a4be0..922a73a4be0 100644
--- a/pkgs/development/tools/analysis/swarm/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix
diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
index 79dedb3afba..79dedb3afba 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
index 49009570e57..49009570e57 100644
--- a/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
diff --git a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix b/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
index 0ad042d74de..0ad042d74de 100644
--- a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
diff --git a/pkgs/development/tools/analysis/valgrind/coregrind-makefile-race.patch b/nixpkgs/pkgs/development/tools/analysis/valgrind/coregrind-makefile-race.patch
index cd09f0edff3..cd09f0edff3 100644
--- a/pkgs/development/tools/analysis/valgrind/coregrind-makefile-race.patch
+++ b/nixpkgs/pkgs/development/tools/analysis/valgrind/coregrind-makefile-race.patch
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix
index 8e2db5caab1..8e2db5caab1 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix
diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix
index 1ecdd9f32ce..1ecdd9f32ce 100644
--- a/pkgs/development/tools/analysis/valkyrie/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix
diff --git a/pkgs/development/tools/apktool/default.nix b/nixpkgs/pkgs/development/tools/apktool/default.nix
index 76037f98e1b..76037f98e1b 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/nixpkgs/pkgs/development/tools/apktool/default.nix
diff --git a/pkgs/development/tools/asmfmt/default.nix b/nixpkgs/pkgs/development/tools/asmfmt/default.nix
index 04cb6f808df..04cb6f808df 100644
--- a/pkgs/development/tools/asmfmt/default.nix
+++ b/nixpkgs/pkgs/development/tools/asmfmt/default.nix
diff --git a/pkgs/development/tools/asmfmt/deps.nix b/nixpkgs/pkgs/development/tools/asmfmt/deps.nix
index 0288fc206d4..0288fc206d4 100644
--- a/pkgs/development/tools/asmfmt/deps.nix
+++ b/nixpkgs/pkgs/development/tools/asmfmt/deps.nix
diff --git a/pkgs/development/tools/asn2quickder/default.nix b/nixpkgs/pkgs/development/tools/asn2quickder/default.nix
index 335a2238b91..335a2238b91 100644
--- a/pkgs/development/tools/asn2quickder/default.nix
+++ b/nixpkgs/pkgs/development/tools/asn2quickder/default.nix
diff --git a/pkgs/development/tools/async/default.nix b/nixpkgs/pkgs/development/tools/async/default.nix
index 1b06d8e1adc..1b06d8e1adc 100644
--- a/pkgs/development/tools/async/default.nix
+++ b/nixpkgs/pkgs/development/tools/async/default.nix
diff --git a/pkgs/development/tools/avro-tools/default.nix b/nixpkgs/pkgs/development/tools/avro-tools/default.nix
index 6b51e2c482c..6b51e2c482c 100644
--- a/pkgs/development/tools/avro-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/avro-tools/default.nix
diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix
index 39a68622056..39a68622056 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix
diff --git a/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix
index e3e85ffcd40..e3e85ffcd40 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix
diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix
index 831ed1e97ac..831ed1e97ac 100644
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
index 62ecc47b17b..62ecc47b17b 100644
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
diff --git a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch b/nixpkgs/pkgs/development/tools/bazel-watcher/use-go-in-path.patch
index 010ba56165d..010ba56165d 100644
--- a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch
+++ b/nixpkgs/pkgs/development/tools/bazel-watcher/use-go-in-path.patch
diff --git a/pkgs/development/tools/bazelisk/default.nix b/nixpkgs/pkgs/development/tools/bazelisk/default.nix
index f6dd4687dab..f6dd4687dab 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/nixpkgs/pkgs/development/tools/bazelisk/default.nix
diff --git a/pkgs/development/tools/bloaty/default.nix b/nixpkgs/pkgs/development/tools/bloaty/default.nix
index 9a12a7afc62..9a12a7afc62 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/nixpkgs/pkgs/development/tools/bloaty/default.nix
diff --git a/pkgs/development/tools/boomerang/default.nix b/nixpkgs/pkgs/development/tools/boomerang/default.nix
index 821e51ac605..821e51ac605 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/nixpkgs/pkgs/development/tools/boomerang/default.nix
diff --git a/pkgs/development/tools/boost-build/default.nix b/nixpkgs/pkgs/development/tools/boost-build/default.nix
index f392475f618..f392475f618 100644
--- a/pkgs/development/tools/boost-build/default.nix
+++ b/nixpkgs/pkgs/development/tools/boost-build/default.nix
diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/nixpkgs/pkgs/development/tools/build-managers/alibuild/default.nix
index c50e5716063..c50e5716063 100644
--- a/pkgs/development/tools/build-managers/alibuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/alibuild/default.nix
diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix
index 661e16d83e8..661e16d83e8 100644
--- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix
index 28e86e29175..28e86e29175 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix
diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/builder.sh
index 8d06352b135..8d06352b135 100644
--- a/pkgs/development/tools/build-managers/apache-maven/builder.sh
+++ b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/builder.sh
diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix
index 9194eda3361..9194eda3361 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix
diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix
index ef3062c6ca5..ef3062c6ca5 100644
--- a/pkgs/development/tools/build-managers/arpa2cm/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix
diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix
index 969cd987974..969cd987974 100644
--- a/pkgs/development/tools/build-managers/bam/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix
diff --git a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
index b67a5ab2234..b67a5ab2234 100644
--- a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
index 62a1329eca6..62a1329eca6 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index 2eb5f772f89..2eb5f772f89 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_rc.patch b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_rc.patch
index a599ac3ec72..a599ac3ec72 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_rc.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_rc.patch
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index fc5f98a8ccb..fc5f98a8ccb 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
index 4aaa37aa9a7..4aaa37aa9a7 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix
index f4e03abdbc9..f4e03abdbc9 100644
--- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix
index da69000a5e4..da69000a5e4 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix
diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix
index 30b957eb5e3..30b957eb5e3 100644
--- a/pkgs/development/tools/build-managers/bazel/java-test.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix
diff --git a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch b/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks.patch
index 95f07646802..95f07646802 100644
--- a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks.patch
diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
index 0784de4cfd3..0784de4cfd3 100644
--- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
index c02547c08e0..c02547c08e0 100644
--- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
diff --git a/pkgs/development/tools/build-managers/bazel/shebang-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/shebang-test.nix
index fd94f97a765..fd94f97a765 100644
--- a/pkgs/development/tools/build-managers/bazel/shebang-test.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/shebang-test.nix
diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/nixpkgs/pkgs/development/tools/build-managers/bazel/src-deps.json
index 171b1f9fc64..171b1f9fc64 100644
--- a/pkgs/development/tools/build-managers/bazel/src-deps.json
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/src-deps.json
diff --git a/pkgs/development/tools/build-managers/bazel/strict_action_env.patch b/nixpkgs/pkgs/development/tools/build-managers/bazel/strict_action_env.patch
index 1402c20f6bd..1402c20f6bd 100644
--- a/pkgs/development/tools/build-managers/bazel/strict_action_env.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/strict_action_env.patch
diff --git a/pkgs/development/tools/build-managers/bazel/trim-last-argument-to-gcc-if-empty.patch b/nixpkgs/pkgs/development/tools/build-managers/bazel/trim-last-argument-to-gcc-if-empty.patch
index b93b252f363..b93b252f363 100644
--- a/pkgs/development/tools/build-managers/bazel/trim-last-argument-to-gcc-if-empty.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/trim-last-argument-to-gcc-if-empty.patch
diff --git a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py b/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
index 504a227b958..504a227b958 100755
--- a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
diff --git a/pkgs/development/tools/build-managers/bear/cmakepaths.patch b/nixpkgs/pkgs/development/tools/build-managers/bear/cmakepaths.patch
index d237267078e..d237267078e 100644
--- a/pkgs/development/tools/build-managers/bear/cmakepaths.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bear/cmakepaths.patch
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix
index ec1577c5107..ec1577c5107 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix
diff --git a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
index 8effc723bba..8effc723bba 100644
--- a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix
index ce656d4d78f..ce656d4d78f 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix
diff --git a/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch b/nixpkgs/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch
index 9b1267257ad..9b1267257ad 100644
--- a/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch
diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix
index d895261c4b5..d895261c4b5 100644
--- a/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix
diff --git a/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch b/nixpkgs/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch
index 339348f37c3..339348f37c3 100644
--- a/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch
diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/nixpkgs/pkgs/development/tools/build-managers/boot/builder.sh
index c1481dc6a14..c1481dc6a14 100644
--- a/pkgs/development/tools/build-managers/boot/builder.sh
+++ b/nixpkgs/pkgs/development/tools/build-managers/boot/builder.sh
diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix
index 3f086c912c1..3f086c912c1 100644
--- a/pkgs/development/tools/build-managers/boot/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix
diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix
index 41fc0940b9d..41fc0940b9d 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix
diff --git a/pkgs/development/tools/build-managers/buck/pex-mtime.patch b/nixpkgs/pkgs/development/tools/build-managers/buck/pex-mtime.patch
index b8726e64a60..b8726e64a60 100644
--- a/pkgs/development/tools/build-managers/buck/pex-mtime.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/buck/pex-mtime.patch
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix
index ac438080b9a..ac438080b9a 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix
diff --git a/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch
index 982aba17e87..982aba17e87 100644
--- a/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch
diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch
index e0399d0a6c6..e0399d0a6c6 100644
--- a/pkgs/development/tools/build-managers/cmake/application-services.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
index 93e75a855d3..93e75a855d3 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
diff --git a/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch
index eb3df1e4ff6..eb3df1e4ff6 100644
--- a/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch
diff --git a/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch
index 9fc94966168..9fc94966168 100644
--- a/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch
diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch
index 2f5e4d62c86..2f5e4d62c86 100644
--- a/pkgs/development/tools/build-managers/cmake/search-path.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 6f3d33bcaa7..6f3d33bcaa7 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh
diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix
index f14aa4eea6e..f14aa4eea6e 100644
--- a/pkgs/development/tools/build-managers/colormake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix
index 59b1b14ac5f..59b1b14ac5f 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix
diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix
index 8fd2514c4a0..8fd2514c4a0 100644
--- a/pkgs/development/tools/build-managers/doit/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix
diff --git a/pkgs/development/tools/build-managers/drake/Gemfile b/nixpkgs/pkgs/development/tools/build-managers/drake/Gemfile
index ddb13a65c16..ddb13a65c16 100644
--- a/pkgs/development/tools/build-managers/drake/Gemfile
+++ b/nixpkgs/pkgs/development/tools/build-managers/drake/Gemfile
diff --git a/pkgs/development/tools/build-managers/drake/Gemfile.lock b/nixpkgs/pkgs/development/tools/build-managers/drake/Gemfile.lock
index 52060a0e625..52060a0e625 100644
--- a/pkgs/development/tools/build-managers/drake/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/build-managers/drake/Gemfile.lock
diff --git a/pkgs/development/tools/build-managers/drake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/drake/default.nix
index 15fc682a315..15fc682a315 100644
--- a/pkgs/development/tools/build-managers/drake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/drake/default.nix
diff --git a/pkgs/development/tools/build-managers/drake/gemset.nix b/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix
index 061ed5d973a..061ed5d973a 100644
--- a/pkgs/development/tools/build-managers/drake/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix
index ef2b155482f..ef2b155482f 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix
index d8557bfcbc2..d8557bfcbc2 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix
diff --git a/pkgs/development/tools/build-managers/gn/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/gn/setup-hook.sh
index 850f18948ca..850f18948ca 100644
--- a/pkgs/development/tools/build-managers/gn/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/build-managers/gn/setup-hook.sh
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index 37467f225ea..37467f225ea 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch
index 186212d0d29..186212d0d29 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch
index f6646f1d012..f6646f1d012 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch
index 5a03acb2f7c..5a03acb2f7c 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
index f6fa53cfab0..f6fa53cfab0 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix
index 30c4d4ec4de..30c4d4ec4de 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix
index 7135790c1bd..7135790c1bd 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix
diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix
index 2d94b48ba54..2d94b48ba54 100644
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix
diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix
index 05834565f93..05834565f93 100644
--- a/pkgs/development/tools/build-managers/kati/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix
diff --git a/pkgs/development/tools/build-managers/kati/version.patch b/nixpkgs/pkgs/development/tools/build-managers/kati/version.patch
index 1821ac6bbb7..1821ac6bbb7 100644
--- a/pkgs/development/tools/build-managers/kati/version.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/kati/version.patch
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
index 9538171474d..9538171474d 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix
index 40ddf742ed5..40ddf742ed5 100644
--- a/pkgs/development/tools/build-managers/mage/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix
diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
index 591927c1528..591927c1528 100644
--- a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
index e4d4994a781..e4d4994a781 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch
index 6cf7afc2bdf..6cf7afc2bdf 100644
--- a/pkgs/development/tools/build-managers/meson/fix-rpath.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch
diff --git a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch
index e59795486aa..e59795486aa 100644
--- a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch
diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh
index 8d76ecdaf32..8d76ecdaf32 100644
--- a/pkgs/development/tools/build-managers/meson/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix
index ab9ba1758d0..ab9ba1758d0 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix
diff --git a/pkgs/development/tools/build-managers/mk/builder.sh b/nixpkgs/pkgs/development/tools/build-managers/mk/builder.sh
index 73678ae9f5c..73678ae9f5c 100644
--- a/pkgs/development/tools/build-managers/mk/builder.sh
+++ b/nixpkgs/pkgs/development/tools/build-managers/mk/builder.sh
diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mk/default.nix
index f510752d385..f510752d385 100644
--- a/pkgs/development/tools/build-managers/mk/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/mk/default.nix
diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix
index e9bb3c27df9..e9bb3c27df9 100644
--- a/pkgs/development/tools/build-managers/msbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix
diff --git a/pkgs/development/tools/build-managers/msbuild/nuget.nix b/nixpkgs/pkgs/development/tools/build-managers/msbuild/nuget.nix
index 0aae3840752..0aae3840752 100644
--- a/pkgs/development/tools/build-managers/msbuild/nuget.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/msbuild/nuget.nix
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix
index 7001510d52d..7001510d52d 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix
diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/ninja/setup-hook.sh
index 7d8087ad134..7d8087ad134 100644
--- a/pkgs/development/tools/build-managers/ninja/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/build-managers/ninja/setup-hook.sh
diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix
index 9757d8cda8d..9757d8cda8d 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix
index 0649cd7c595..0649cd7c595 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix
diff --git a/pkgs/development/tools/build-managers/rake/Gemfile b/nixpkgs/pkgs/development/tools/build-managers/rake/Gemfile
index bd1ff6faa65..bd1ff6faa65 100644
--- a/pkgs/development/tools/build-managers/rake/Gemfile
+++ b/nixpkgs/pkgs/development/tools/build-managers/rake/Gemfile
diff --git a/pkgs/development/tools/build-managers/rake/Gemfile.lock b/nixpkgs/pkgs/development/tools/build-managers/rake/Gemfile.lock
index 992a0bc8929..992a0bc8929 100644
--- a/pkgs/development/tools/build-managers/rake/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/build-managers/rake/Gemfile.lock
diff --git a/pkgs/development/tools/build-managers/rake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rake/default.nix
index 2ce65b28fae..2ce65b28fae 100644
--- a/pkgs/development/tools/build-managers/rake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/rake/default.nix
diff --git a/pkgs/development/tools/build-managers/rake/gemset.nix b/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix
index 05a59cff850..05a59cff850 100644
--- a/pkgs/development/tools/build-managers/rake/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix
diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix
index 6178a7368fc..6178a7368fc 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix
index 792daba791b..792daba791b 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix
diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
index f1deed1df35..f1deed1df35 100755
--- a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
+++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix
index 571df924e1f..571df924e1f 100644
--- a/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
index f08a2e56342..f08a2e56342 100644
--- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix
index d8c79e33dff..d8c79e33dff 100644
--- a/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix
diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix
index 19ce0b44bf7..19ce0b44bf7 100644
--- a/pkgs/development/tools/build-managers/redo-sh/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix
diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo/default.nix
index 97b82d204ad..97b82d204ad 100644
--- a/pkgs/development/tools/build-managers/redo/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/redo/default.nix
diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix
index 4d43812ebe6..4d43812ebe6 100644
--- a/pkgs/development/tools/build-managers/remake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix
diff --git a/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch b/nixpkgs/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch
index ef876e2fb23..ef876e2fb23 100644
--- a/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch
diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix
index 33e8e7cad5d..33e8e7cad5d 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
index 486f44d8c64..486f44d8c64 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
diff --git a/pkgs/development/tools/build-managers/sbt/scala-native.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt/scala-native.nix
index 70038ed2d3a..70038ed2d3a 100644
--- a/pkgs/development/tools/build-managers/sbt/scala-native.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/sbt/scala-native.nix
diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix
index 740d04d853f..740d04d853f 100644
--- a/pkgs/development/tools/build-managers/scons/common.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix
index 0afe2fbe928..0afe2fbe928 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix
diff --git a/pkgs/development/tools/build-managers/scons/print-statements.patch b/nixpkgs/pkgs/development/tools/build-managers/scons/print-statements.patch
index a963bf78aba..a963bf78aba 100644
--- a/pkgs/development/tools/build-managers/scons/print-statements.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/scons/print-statements.patch
diff --git a/pkgs/development/tools/build-managers/scons/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/scons/setup-hook.sh
index 0b908f68286..0b908f68286 100644
--- a/pkgs/development/tools/build-managers/scons/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/build-managers/scons/setup-hook.sh
diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix
index 7f0cc8100ac..7f0cc8100ac 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix
diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix
index 9b44b30d777..9b44b30d777 100644
--- a/pkgs/development/tools/build-managers/tup/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix
diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix
index f8bbda61627..f8bbda61627 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix
diff --git a/pkgs/development/tools/build-managers/wafHook/default.nix b/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix
index 4184bd5fe8c..4184bd5fe8c 100644
--- a/pkgs/development/tools/build-managers/wafHook/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix
diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/wafHook/setup-hook.sh
index 3da86d3201f..3da86d3201f 100644
--- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/build-managers/wafHook/setup-hook.sh
diff --git a/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix
index 7a17d3dfb56..7a17d3dfb56 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/nixpkgs/pkgs/development/tools/buildah/default.nix
diff --git a/pkgs/development/tools/buildah/disable-go-module-mode.patch b/nixpkgs/pkgs/development/tools/buildah/disable-go-module-mode.patch
index a6f211412ea..a6f211412ea 100644
--- a/pkgs/development/tools/buildah/disable-go-module-mode.patch
+++ b/nixpkgs/pkgs/development/tools/buildah/disable-go-module-mode.patch
diff --git a/pkgs/development/tools/buildkit/default.nix b/nixpkgs/pkgs/development/tools/buildkit/default.nix
index 29b07fbfd0f..29b07fbfd0f 100644
--- a/pkgs/development/tools/buildkit/default.nix
+++ b/nixpkgs/pkgs/development/tools/buildkit/default.nix
diff --git a/pkgs/development/tools/buildpack/default.nix b/nixpkgs/pkgs/development/tools/buildpack/default.nix
index c3eace89174..c3eace89174 100644
--- a/pkgs/development/tools/buildpack/default.nix
+++ b/nixpkgs/pkgs/development/tools/buildpack/default.nix
diff --git a/pkgs/development/tools/cadre/Gemfile b/nixpkgs/pkgs/development/tools/cadre/Gemfile
index aa42f75c95c..aa42f75c95c 100644
--- a/pkgs/development/tools/cadre/Gemfile
+++ b/nixpkgs/pkgs/development/tools/cadre/Gemfile
diff --git a/pkgs/development/tools/cadre/Gemfile.lock b/nixpkgs/pkgs/development/tools/cadre/Gemfile.lock
index c14df9cffa6..c14df9cffa6 100644
--- a/pkgs/development/tools/cadre/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/cadre/Gemfile.lock
diff --git a/pkgs/development/tools/cadre/default.nix b/nixpkgs/pkgs/development/tools/cadre/default.nix
index 77b49107e16..77b49107e16 100644
--- a/pkgs/development/tools/cadre/default.nix
+++ b/nixpkgs/pkgs/development/tools/cadre/default.nix
diff --git a/pkgs/development/tools/cadre/gemset.nix b/nixpkgs/pkgs/development/tools/cadre/gemset.nix
index 33fd428debf..33fd428debf 100644
--- a/pkgs/development/tools/cadre/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/cadre/gemset.nix
diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/nixpkgs/pkgs/development/tools/cargo-flamegraph/default.nix
index 9d25d7cf354..9d25d7cf354 100644
--- a/pkgs/development/tools/cargo-flamegraph/default.nix
+++ b/nixpkgs/pkgs/development/tools/cargo-flamegraph/default.nix
diff --git a/pkgs/development/tools/cargo-web/default.nix b/nixpkgs/pkgs/development/tools/cargo-web/default.nix
index 7ed75d3f6e6..7ed75d3f6e6 100644
--- a/pkgs/development/tools/cargo-web/default.nix
+++ b/nixpkgs/pkgs/development/tools/cargo-web/default.nix
diff --git a/pkgs/development/tools/cask/default.nix b/nixpkgs/pkgs/development/tools/cask/default.nix
index 71050356069..71050356069 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/nixpkgs/pkgs/development/tools/cask/default.nix
diff --git a/pkgs/development/tools/casperjs/default.nix b/nixpkgs/pkgs/development/tools/casperjs/default.nix
index 8a1d81acaaa..8a1d81acaaa 100644
--- a/pkgs/development/tools/casperjs/default.nix
+++ b/nixpkgs/pkgs/development/tools/casperjs/default.nix
diff --git a/pkgs/development/tools/castxml/default.nix b/nixpkgs/pkgs/development/tools/castxml/default.nix
index 1011f95cce7..1011f95cce7 100644
--- a/pkgs/development/tools/castxml/default.nix
+++ b/nixpkgs/pkgs/development/tools/castxml/default.nix
diff --git a/pkgs/development/tools/cbor-diag/Gemfile b/nixpkgs/pkgs/development/tools/cbor-diag/Gemfile
index 798e507460e..798e507460e 100644
--- a/pkgs/development/tools/cbor-diag/Gemfile
+++ b/nixpkgs/pkgs/development/tools/cbor-diag/Gemfile
diff --git a/pkgs/development/tools/cbor-diag/Gemfile.lock b/nixpkgs/pkgs/development/tools/cbor-diag/Gemfile.lock
index 9f9a160c587..9f9a160c587 100644
--- a/pkgs/development/tools/cbor-diag/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/cbor-diag/Gemfile.lock
diff --git a/pkgs/development/tools/cbor-diag/default.nix b/nixpkgs/pkgs/development/tools/cbor-diag/default.nix
index 7942ff52645..7942ff52645 100644
--- a/pkgs/development/tools/cbor-diag/default.nix
+++ b/nixpkgs/pkgs/development/tools/cbor-diag/default.nix
diff --git a/pkgs/development/tools/cbor-diag/gemset.nix b/nixpkgs/pkgs/development/tools/cbor-diag/gemset.nix
index 49de5b06f54..49de5b06f54 100644
--- a/pkgs/development/tools/cbor-diag/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/cbor-diag/gemset.nix
diff --git a/pkgs/development/tools/ccloud-cli/default.nix b/nixpkgs/pkgs/development/tools/ccloud-cli/default.nix
index 7fa53029772..7fa53029772 100644
--- a/pkgs/development/tools/ccloud-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/ccloud-cli/default.nix
diff --git a/pkgs/development/tools/cddl/Gemfile b/nixpkgs/pkgs/development/tools/cddl/Gemfile
index 2ba729084f1..2ba729084f1 100644
--- a/pkgs/development/tools/cddl/Gemfile
+++ b/nixpkgs/pkgs/development/tools/cddl/Gemfile
diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/nixpkgs/pkgs/development/tools/cddl/Gemfile.lock
index cd4e1407637..cd4e1407637 100644
--- a/pkgs/development/tools/cddl/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/cddl/Gemfile.lock
diff --git a/pkgs/development/tools/cddl/default.nix b/nixpkgs/pkgs/development/tools/cddl/default.nix
index 60e7edc7520..60e7edc7520 100644
--- a/pkgs/development/tools/cddl/default.nix
+++ b/nixpkgs/pkgs/development/tools/cddl/default.nix
diff --git a/pkgs/development/tools/cddl/gemset.nix b/nixpkgs/pkgs/development/tools/cddl/gemset.nix
index a66833e27d9..a66833e27d9 100644
--- a/pkgs/development/tools/cddl/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/cddl/gemset.nix
diff --git a/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch b/nixpkgs/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch
index ecdee5d544f..ecdee5d544f 100644
--- a/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch
+++ b/nixpkgs/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch
diff --git a/pkgs/development/tools/cdecl/default.nix b/nixpkgs/pkgs/development/tools/cdecl/default.nix
index 7981681a641..7981681a641 100644
--- a/pkgs/development/tools/cdecl/default.nix
+++ b/nixpkgs/pkgs/development/tools/cdecl/default.nix
diff --git a/pkgs/development/tools/check/default.nix b/nixpkgs/pkgs/development/tools/check/default.nix
index 9ae1026c858..9ae1026c858 100644
--- a/pkgs/development/tools/check/default.nix
+++ b/nixpkgs/pkgs/development/tools/check/default.nix
diff --git a/pkgs/development/tools/check/deps.nix b/nixpkgs/pkgs/development/tools/check/deps.nix
index b9c50d95d11..b9c50d95d11 100644
--- a/pkgs/development/tools/check/deps.nix
+++ b/nixpkgs/pkgs/development/tools/check/deps.nix
diff --git a/pkgs/development/tools/chefdk/Gemfile b/nixpkgs/pkgs/development/tools/chefdk/Gemfile
index 4d9640c8e9f..4d9640c8e9f 100644
--- a/pkgs/development/tools/chefdk/Gemfile
+++ b/nixpkgs/pkgs/development/tools/chefdk/Gemfile
diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/nixpkgs/pkgs/development/tools/chefdk/Gemfile.lock
index 545375d8780..545375d8780 100644
--- a/pkgs/development/tools/chefdk/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/chefdk/Gemfile.lock
diff --git a/pkgs/development/tools/chefdk/default.nix b/nixpkgs/pkgs/development/tools/chefdk/default.nix
index d30c0aaeb49..d30c0aaeb49 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/nixpkgs/pkgs/development/tools/chefdk/default.nix
diff --git a/pkgs/development/tools/chefdk/gemset.nix b/nixpkgs/pkgs/development/tools/chefdk/gemset.nix
index 228b3cd8513..228b3cd8513 100644
--- a/pkgs/development/tools/chefdk/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/chefdk/gemset.nix
diff --git a/pkgs/development/tools/chit/default.nix b/nixpkgs/pkgs/development/tools/chit/default.nix
index e939ddb1334..e939ddb1334 100644
--- a/pkgs/development/tools/chit/default.nix
+++ b/nixpkgs/pkgs/development/tools/chit/default.nix
diff --git a/pkgs/development/tools/clang-tools/default.nix b/nixpkgs/pkgs/development/tools/clang-tools/default.nix
index 2e8f48901ab..2e8f48901ab 100644
--- a/pkgs/development/tools/clang-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/clang-tools/default.nix
diff --git a/pkgs/development/tools/clang-tools/wrapper b/nixpkgs/pkgs/development/tools/clang-tools/wrapper
index 53c99a67f2d..53c99a67f2d 100644
--- a/pkgs/development/tools/clang-tools/wrapper
+++ b/nixpkgs/pkgs/development/tools/clang-tools/wrapper
diff --git a/pkgs/development/tools/clj-kondo/default.nix b/nixpkgs/pkgs/development/tools/clj-kondo/default.nix
index 8317473570d..8317473570d 100644
--- a/pkgs/development/tools/clj-kondo/default.nix
+++ b/nixpkgs/pkgs/development/tools/clj-kondo/default.nix
diff --git a/pkgs/development/tools/clog-cli/default.nix b/nixpkgs/pkgs/development/tools/clog-cli/default.nix
index 12289cbb68a..12289cbb68a 100644
--- a/pkgs/development/tools/clog-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/clog-cli/default.nix
diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix
index f452b24cf07..f452b24cf07 100644
--- a/pkgs/development/tools/cloud-nuke/default.nix
+++ b/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix
diff --git a/pkgs/development/tools/cloud-nuke/deps.nix b/nixpkgs/pkgs/development/tools/cloud-nuke/deps.nix
index ffd50762ee2..ffd50762ee2 100644
--- a/pkgs/development/tools/cloud-nuke/deps.nix
+++ b/nixpkgs/pkgs/development/tools/cloud-nuke/deps.nix
diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/nixpkgs/pkgs/development/tools/cloudflare-wrangler/default.nix
index efca438ada3..efca438ada3 100644
--- a/pkgs/development/tools/cloudflare-wrangler/default.nix
+++ b/nixpkgs/pkgs/development/tools/cloudflare-wrangler/default.nix
diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix
index be39f6e3667..be39f6e3667 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix
diff --git a/pkgs/development/tools/cmake-format/default.nix b/nixpkgs/pkgs/development/tools/cmake-format/default.nix
index 837e1484583..837e1484583 100644
--- a/pkgs/development/tools/cmake-format/default.nix
+++ b/nixpkgs/pkgs/development/tools/cmake-format/default.nix
diff --git a/pkgs/development/tools/compass/Gemfile b/nixpkgs/pkgs/development/tools/compass/Gemfile
index 66a29975e7d..66a29975e7d 100644
--- a/pkgs/development/tools/compass/Gemfile
+++ b/nixpkgs/pkgs/development/tools/compass/Gemfile
diff --git a/pkgs/development/tools/compass/Gemfile.lock b/nixpkgs/pkgs/development/tools/compass/Gemfile.lock
index 43790d9e7a1..43790d9e7a1 100644
--- a/pkgs/development/tools/compass/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/compass/Gemfile.lock
diff --git a/pkgs/development/tools/compass/default.nix b/nixpkgs/pkgs/development/tools/compass/default.nix
index 516900c2067..516900c2067 100644
--- a/pkgs/development/tools/compass/default.nix
+++ b/nixpkgs/pkgs/development/tools/compass/default.nix
diff --git a/pkgs/development/tools/compass/gemset.nix b/nixpkgs/pkgs/development/tools/compass/gemset.nix
index 1beb3d3fec0..1beb3d3fec0 100644
--- a/pkgs/development/tools/compass/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/compass/gemset.nix
diff --git a/pkgs/development/tools/compile-daemon/default.nix b/nixpkgs/pkgs/development/tools/compile-daemon/default.nix
index 24aca0dada7..24aca0dada7 100644
--- a/pkgs/development/tools/compile-daemon/default.nix
+++ b/nixpkgs/pkgs/development/tools/compile-daemon/default.nix
diff --git a/pkgs/development/tools/compile-daemon/deps.nix b/nixpkgs/pkgs/development/tools/compile-daemon/deps.nix
index 53771ddad9f..53771ddad9f 100644
--- a/pkgs/development/tools/compile-daemon/deps.nix
+++ b/nixpkgs/pkgs/development/tools/compile-daemon/deps.nix
diff --git a/pkgs/development/tools/conftest/default.nix b/nixpkgs/pkgs/development/tools/conftest/default.nix
index ae35170cd19..ae35170cd19 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/nixpkgs/pkgs/development/tools/conftest/default.nix
diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/nixpkgs/pkgs/development/tools/container-linux-config-transpiler/default.nix
index 9aaf886ef06..9aaf886ef06 100644
--- a/pkgs/development/tools/container-linux-config-transpiler/default.nix
+++ b/nixpkgs/pkgs/development/tools/container-linux-config-transpiler/default.nix
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index 7e86c93b9bd..7e86c93b9bd 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
index d9f7237d289..d9f7237d289 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix
index 1a3105a2269..1a3105a2269 100644
--- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix
index 8e63daab2d6..8e63daab2d6 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix
diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix
index 1a56be02a28..1a56be02a28 100644
--- a/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix
diff --git a/pkgs/development/tools/continuous-integration/fly/fly.bash b/nixpkgs/pkgs/development/tools/continuous-integration/fly/fly.bash
index a9acc5f70a4..a9acc5f70a4 100644
--- a/pkgs/development/tools/continuous-integration/fly/fly.bash
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/fly/fly.bash
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 91ef9d4a222..91ef9d4a222 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
index 8aa419ea5f9..8aa419ea5f9 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
index adee52d967e..adee52d967e 100644
--- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix
index c0fabdeb5a1..c0fabdeb5a1 100644
--- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 9708674c6d6..9708674c6d6 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix
diff --git a/pkgs/development/tools/continuous-integration/jenkins/update.sh b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh
index 4f2f6527ecc..4f2f6527ecc 100755
--- a/pkgs/development/tools/continuous-integration/jenkins/update.sh
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh
diff --git a/pkgs/development/tools/corgi/default.nix b/nixpkgs/pkgs/development/tools/corgi/default.nix
index b7772dd659f..b7772dd659f 100644
--- a/pkgs/development/tools/corgi/default.nix
+++ b/nixpkgs/pkgs/development/tools/corgi/default.nix
diff --git a/pkgs/development/tools/corgi/deps.nix b/nixpkgs/pkgs/development/tools/corgi/deps.nix
index d48b141627c..d48b141627c 100644
--- a/pkgs/development/tools/corgi/deps.nix
+++ b/nixpkgs/pkgs/development/tools/corgi/deps.nix
diff --git a/pkgs/development/tools/corundum/Gemfile b/nixpkgs/pkgs/development/tools/corundum/Gemfile
index 5f817ae498a..5f817ae498a 100644
--- a/pkgs/development/tools/corundum/Gemfile
+++ b/nixpkgs/pkgs/development/tools/corundum/Gemfile
diff --git a/pkgs/development/tools/corundum/Gemfile.lock b/nixpkgs/pkgs/development/tools/corundum/Gemfile.lock
index 40ad1948394..40ad1948394 100644
--- a/pkgs/development/tools/corundum/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/corundum/Gemfile.lock
diff --git a/pkgs/development/tools/corundum/default.nix b/nixpkgs/pkgs/development/tools/corundum/default.nix
index 0d1c6985663..0d1c6985663 100644
--- a/pkgs/development/tools/corundum/default.nix
+++ b/nixpkgs/pkgs/development/tools/corundum/default.nix
diff --git a/pkgs/development/tools/corundum/gemset.nix b/nixpkgs/pkgs/development/tools/corundum/gemset.nix
index e395e098e6d..e395e098e6d 100644
--- a/pkgs/development/tools/corundum/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/corundum/gemset.nix
diff --git a/pkgs/development/tools/coursier/default.nix b/nixpkgs/pkgs/development/tools/coursier/default.nix
index 09e6513d2b1..09e6513d2b1 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/nixpkgs/pkgs/development/tools/coursier/default.nix
diff --git a/pkgs/development/tools/cppclean/default.nix b/nixpkgs/pkgs/development/tools/cppclean/default.nix
index 85d49667a9a..85d49667a9a 100644
--- a/pkgs/development/tools/cppclean/default.nix
+++ b/nixpkgs/pkgs/development/tools/cppclean/default.nix
diff --git a/pkgs/development/tools/cucumber/Gemfile b/nixpkgs/pkgs/development/tools/cucumber/Gemfile
index f738129eca4..f738129eca4 100644
--- a/pkgs/development/tools/cucumber/Gemfile
+++ b/nixpkgs/pkgs/development/tools/cucumber/Gemfile
diff --git a/pkgs/development/tools/cucumber/Gemfile.lock b/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock
index a9a2d073de4..a9a2d073de4 100644
--- a/pkgs/development/tools/cucumber/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock
diff --git a/pkgs/development/tools/cucumber/default.nix b/nixpkgs/pkgs/development/tools/cucumber/default.nix
index 15db6013deb..15db6013deb 100644
--- a/pkgs/development/tools/cucumber/default.nix
+++ b/nixpkgs/pkgs/development/tools/cucumber/default.nix
diff --git a/pkgs/development/tools/cucumber/gemset.nix b/nixpkgs/pkgs/development/tools/cucumber/gemset.nix
index 99d519a83b6..99d519a83b6 100644
--- a/pkgs/development/tools/cucumber/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/cucumber/gemset.nix
diff --git a/pkgs/development/tools/cue/default.nix b/nixpkgs/pkgs/development/tools/cue/default.nix
index 98bf5249b62..98bf5249b62 100644
--- a/pkgs/development/tools/cue/default.nix
+++ b/nixpkgs/pkgs/development/tools/cue/default.nix
diff --git a/pkgs/development/tools/dapper/default.nix b/nixpkgs/pkgs/development/tools/dapper/default.nix
index d5c7d309e98..d5c7d309e98 100644
--- a/pkgs/development/tools/dapper/default.nix
+++ b/nixpkgs/pkgs/development/tools/dapper/default.nix
diff --git a/pkgs/development/tools/database/cdb/default.nix b/nixpkgs/pkgs/development/tools/database/cdb/default.nix
index 47f62573675..47f62573675 100644
--- a/pkgs/development/tools/database/cdb/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/cdb/default.nix
diff --git a/pkgs/development/tools/database/dbmate/default.nix b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix
index efc20b6972b..efc20b6972b 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix
diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/nixpkgs/pkgs/development/tools/database/dbmate/deps.nix
index 97bfc10b20a..97bfc10b20a 100644
--- a/pkgs/development/tools/database/dbmate/deps.nix
+++ b/nixpkgs/pkgs/development/tools/database/dbmate/deps.nix
diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix
index ae511824569..ae511824569 100644
--- a/pkgs/development/tools/database/ephemeralpg/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
index 637519bcf3f..637519bcf3f 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
diff --git a/pkgs/development/tools/database/litecli/default.nix b/nixpkgs/pkgs/development/tools/database/litecli/default.nix
index 8881bce1a38..8881bce1a38 100644
--- a/pkgs/development/tools/database/litecli/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/litecli/default.nix
diff --git a/pkgs/development/tools/database/pg_checksums/default.nix b/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix
index f440e550a89..f440e550a89 100644
--- a/pkgs/development/tools/database/pg_checksums/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix
diff --git a/pkgs/development/tools/database/pgcli/default.nix b/nixpkgs/pkgs/development/tools/database/pgcli/default.nix
index 4038ad7010f..4038ad7010f 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/pgcli/default.nix
diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix
index a83b5a21944..a83b5a21944 100644
--- a/pkgs/development/tools/database/pyrseas/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix
diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix
index 00309c343d2..00309c343d2 100644
--- a/pkgs/development/tools/database/schemaspy/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix
diff --git a/pkgs/development/tools/database/shmig/default.nix b/nixpkgs/pkgs/development/tools/database/shmig/default.nix
index 2ba38905af9..2ba38905af9 100644
--- a/pkgs/development/tools/database/shmig/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/shmig/default.nix
diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix
index 33b2abce277..33b2abce277 100644
--- a/pkgs/development/tools/database/sqlcheck/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix
diff --git a/pkgs/development/tools/database/sqldeveloper/18.2.nix b/nixpkgs/pkgs/development/tools/database/sqldeveloper/18.2.nix
index 070c7c81c40..070c7c81c40 100644
--- a/pkgs/development/tools/database/sqldeveloper/18.2.nix
+++ b/nixpkgs/pkgs/development/tools/database/sqldeveloper/18.2.nix
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
index 9e75088aa5c..9e75088aa5c 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/nixpkgs/pkgs/development/tools/database/sqlite-web/default.nix
index a1b8ece1236..a1b8ece1236 100644
--- a/pkgs/development/tools/database/sqlite-web/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/sqlite-web/default.nix
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix
index 3a4425d436a..3a4425d436a 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix
diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix
index 717dc2d7951..717dc2d7951 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix
diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
index 3c9f9c54dd3..3c9f9c54dd3 100644
--- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix
index ac145fcd34e..ac145fcd34e 100644
--- a/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix
+++ b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix
diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix
index 9dd92317373..9dd92317373 100644
--- a/pkgs/development/tools/database/timescaledb-tune/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix
diff --git a/pkgs/development/tools/database/timescaledb-tune/deps.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/deps.nix
index d898770fd4e..d898770fd4e 100644
--- a/pkgs/development/tools/database/timescaledb-tune/deps.nix
+++ b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/deps.nix
diff --git a/pkgs/development/tools/dcadec/default.nix b/nixpkgs/pkgs/development/tools/dcadec/default.nix
index 685b9d2f13d..685b9d2f13d 100644
--- a/pkgs/development/tools/dcadec/default.nix
+++ b/nixpkgs/pkgs/development/tools/dcadec/default.nix
diff --git a/pkgs/development/tools/deadcode/default.nix b/nixpkgs/pkgs/development/tools/deadcode/default.nix
index 7d106e5a251..7d106e5a251 100644
--- a/pkgs/development/tools/deadcode/default.nix
+++ b/nixpkgs/pkgs/development/tools/deadcode/default.nix
diff --git a/pkgs/development/tools/deis/default.nix b/nixpkgs/pkgs/development/tools/deis/default.nix
index db232561add..db232561add 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/nixpkgs/pkgs/development/tools/deis/default.nix
diff --git a/pkgs/development/tools/deisctl/default.nix b/nixpkgs/pkgs/development/tools/deisctl/default.nix
index a344bcf91d8..a344bcf91d8 100644
--- a/pkgs/development/tools/deisctl/default.nix
+++ b/nixpkgs/pkgs/development/tools/deisctl/default.nix
diff --git a/pkgs/development/tools/delve/default.nix b/nixpkgs/pkgs/development/tools/delve/default.nix
index fc38f3edb47..fc38f3edb47 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/nixpkgs/pkgs/development/tools/delve/default.nix
diff --git a/pkgs/development/tools/dep/default.nix b/nixpkgs/pkgs/development/tools/dep/default.nix
index d807e79f9ed..d807e79f9ed 100644
--- a/pkgs/development/tools/dep/default.nix
+++ b/nixpkgs/pkgs/development/tools/dep/default.nix
diff --git a/pkgs/development/tools/dep2nix/default.nix b/nixpkgs/pkgs/development/tools/dep2nix/default.nix
index dcdb1053cf7..dcdb1053cf7 100644
--- a/pkgs/development/tools/dep2nix/default.nix
+++ b/nixpkgs/pkgs/development/tools/dep2nix/default.nix
diff --git a/pkgs/development/tools/dep2nix/deps.nix b/nixpkgs/pkgs/development/tools/dep2nix/deps.nix
index fc9280e9df5..fc9280e9df5 100644
--- a/pkgs/development/tools/dep2nix/deps.nix
+++ b/nixpkgs/pkgs/development/tools/dep2nix/deps.nix
diff --git a/pkgs/development/tools/detect-secrets/default.nix b/nixpkgs/pkgs/development/tools/detect-secrets/default.nix
index 6e9e1596b13..6e9e1596b13 100644
--- a/pkgs/development/tools/detect-secrets/default.nix
+++ b/nixpkgs/pkgs/development/tools/detect-secrets/default.nix
diff --git a/pkgs/development/tools/devd/default.nix b/nixpkgs/pkgs/development/tools/devd/default.nix
index f3e63c53789..f3e63c53789 100644
--- a/pkgs/development/tools/devd/default.nix
+++ b/nixpkgs/pkgs/development/tools/devd/default.nix
diff --git a/pkgs/development/tools/devd/deps.nix b/nixpkgs/pkgs/development/tools/devd/deps.nix
index 2cf6dd7eb23..2cf6dd7eb23 100644
--- a/pkgs/development/tools/devd/deps.nix
+++ b/nixpkgs/pkgs/development/tools/devd/deps.nix
diff --git a/pkgs/development/tools/devpi-client/default.nix b/nixpkgs/pkgs/development/tools/devpi-client/default.nix
index dc105a84687..dc105a84687 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/nixpkgs/pkgs/development/tools/devpi-client/default.nix
diff --git a/pkgs/development/tools/devpi-server/default.nix b/nixpkgs/pkgs/development/tools/devpi-server/default.nix
index 4c8d0276d1a..4c8d0276d1a 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/nixpkgs/pkgs/development/tools/devpi-server/default.nix
diff --git a/pkgs/development/tools/devtodo/default.nix b/nixpkgs/pkgs/development/tools/devtodo/default.nix
index 4396f295340..4396f295340 100644
--- a/pkgs/development/tools/devtodo/default.nix
+++ b/nixpkgs/pkgs/development/tools/devtodo/default.nix
diff --git a/pkgs/development/tools/diesel-cli/allow-warnings.patch b/nixpkgs/pkgs/development/tools/diesel-cli/allow-warnings.patch
index 342ac1baa10..342ac1baa10 100644
--- a/pkgs/development/tools/diesel-cli/allow-warnings.patch
+++ b/nixpkgs/pkgs/development/tools/diesel-cli/allow-warnings.patch
diff --git a/pkgs/development/tools/diesel-cli/cargo-lock.patch b/nixpkgs/pkgs/development/tools/diesel-cli/cargo-lock.patch
index 26d583f9a11..26d583f9a11 100644
--- a/pkgs/development/tools/diesel-cli/cargo-lock.patch
+++ b/nixpkgs/pkgs/development/tools/diesel-cli/cargo-lock.patch
diff --git a/pkgs/development/tools/diesel-cli/default.nix b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix
index 0fdd026d875..0fdd026d875 100644
--- a/pkgs/development/tools/diesel-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix
diff --git a/pkgs/development/tools/diesel-cli/update-cargo-lock.sh b/nixpkgs/pkgs/development/tools/diesel-cli/update-cargo-lock.sh
index bd2e033e687..bd2e033e687 100755
--- a/pkgs/development/tools/diesel-cli/update-cargo-lock.sh
+++ b/nixpkgs/pkgs/development/tools/diesel-cli/update-cargo-lock.sh
diff --git a/pkgs/development/tools/distgen/default.nix b/nixpkgs/pkgs/development/tools/distgen/default.nix
index 7db4db24689..7db4db24689 100644
--- a/pkgs/development/tools/distgen/default.nix
+++ b/nixpkgs/pkgs/development/tools/distgen/default.nix
diff --git a/pkgs/development/tools/dive/default.nix b/nixpkgs/pkgs/development/tools/dive/default.nix
index 6c4d91bac78..6c4d91bac78 100644
--- a/pkgs/development/tools/dive/default.nix
+++ b/nixpkgs/pkgs/development/tools/dive/default.nix
diff --git a/pkgs/development/tools/doctl/default.nix b/nixpkgs/pkgs/development/tools/doctl/default.nix
index 2aead3940ad..2aead3940ad 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/nixpkgs/pkgs/development/tools/doctl/default.nix
diff --git a/pkgs/development/tools/documentation/antora/default.nix b/nixpkgs/pkgs/development/tools/documentation/antora/default.nix
index 6427fa461dd..6427fa461dd 100644
--- a/pkgs/development/tools/documentation/antora/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/antora/default.nix
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix
index af73ce25d42..af73ce25d42 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix
diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index 54c37fa6183..54c37fa6183 100644
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
index 3c0b0cff548..3c0b0cff548 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
diff --git a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch
index 95f6879a006..95f6879a006 100644
--- a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch
+++ b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch
diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix
index 2ca2ef29dd2..2ca2ef29dd2 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix
diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix
index e9e116280a0..e9e116280a0 100644
--- a/pkgs/development/tools/documentation/mkdocs/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix
diff --git a/pkgs/development/tools/drip/default.nix b/nixpkgs/pkgs/development/tools/drip/default.nix
index 1b559df8ef6..1b559df8ef6 100644
--- a/pkgs/development/tools/drip/default.nix
+++ b/nixpkgs/pkgs/development/tools/drip/default.nix
diff --git a/pkgs/development/tools/drm_info/default.nix b/nixpkgs/pkgs/development/tools/drm_info/default.nix
index a97526f8538..a97526f8538 100644
--- a/pkgs/development/tools/drm_info/default.nix
+++ b/nixpkgs/pkgs/development/tools/drm_info/default.nix
diff --git a/pkgs/development/tools/dtools/default.nix b/nixpkgs/pkgs/development/tools/dtools/default.nix
index 5f359757eac..5f359757eac 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/nixpkgs/pkgs/development/tools/dtools/default.nix
diff --git a/pkgs/development/tools/easyjson/default.nix b/nixpkgs/pkgs/development/tools/easyjson/default.nix
index 4f3d89c0788..4f3d89c0788 100644
--- a/pkgs/development/tools/easyjson/default.nix
+++ b/nixpkgs/pkgs/development/tools/easyjson/default.nix
diff --git a/pkgs/development/tools/easyjson/deps.nix b/nixpkgs/pkgs/development/tools/easyjson/deps.nix
index 0429d8876b2..0429d8876b2 100644
--- a/pkgs/development/tools/easyjson/deps.nix
+++ b/nixpkgs/pkgs/development/tools/easyjson/deps.nix
diff --git a/pkgs/development/tools/ejson/Gemfile b/nixpkgs/pkgs/development/tools/ejson/Gemfile
index f860fe5075d..f860fe5075d 100644
--- a/pkgs/development/tools/ejson/Gemfile
+++ b/nixpkgs/pkgs/development/tools/ejson/Gemfile
diff --git a/pkgs/development/tools/ejson/Gemfile.lock b/nixpkgs/pkgs/development/tools/ejson/Gemfile.lock
index 52c82545bf3..52c82545bf3 100644
--- a/pkgs/development/tools/ejson/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/ejson/Gemfile.lock
diff --git a/pkgs/development/tools/ejson/default.nix b/nixpkgs/pkgs/development/tools/ejson/default.nix
index bc46f0776a6..bc46f0776a6 100644
--- a/pkgs/development/tools/ejson/default.nix
+++ b/nixpkgs/pkgs/development/tools/ejson/default.nix
diff --git a/pkgs/development/tools/ejson/deps.nix b/nixpkgs/pkgs/development/tools/ejson/deps.nix
index b0c7defc5d7..b0c7defc5d7 100644
--- a/pkgs/development/tools/ejson/deps.nix
+++ b/nixpkgs/pkgs/development/tools/ejson/deps.nix
diff --git a/pkgs/development/tools/ejson/gemset.nix b/nixpkgs/pkgs/development/tools/ejson/gemset.nix
index 70c61be984c..70c61be984c 100644
--- a/pkgs/development/tools/ejson/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/ejson/gemset.nix
diff --git a/pkgs/development/tools/electron/3.x.nix b/nixpkgs/pkgs/development/tools/electron/3.x.nix
index a902f279a49..a902f279a49 100644
--- a/pkgs/development/tools/electron/3.x.nix
+++ b/nixpkgs/pkgs/development/tools/electron/3.x.nix
diff --git a/pkgs/development/tools/electron/5.x.nix b/nixpkgs/pkgs/development/tools/electron/5.x.nix
index 0b993ccf2a7..0b993ccf2a7 100644
--- a/pkgs/development/tools/electron/5.x.nix
+++ b/nixpkgs/pkgs/development/tools/electron/5.x.nix
diff --git a/pkgs/development/tools/electron/6.x.nix b/nixpkgs/pkgs/development/tools/electron/6.x.nix
index 5d412848d2d..5d412848d2d 100644
--- a/pkgs/development/tools/electron/6.x.nix
+++ b/nixpkgs/pkgs/development/tools/electron/6.x.nix
diff --git a/pkgs/development/tools/electron/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix
index 2efd97ebb1c..2efd97ebb1c 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/nixpkgs/pkgs/development/tools/electron/default.nix
diff --git a/pkgs/development/tools/electron/print-hashes.sh b/nixpkgs/pkgs/development/tools/electron/print-hashes.sh
index 203e5a4dfec..203e5a4dfec 100755
--- a/pkgs/development/tools/electron/print-hashes.sh
+++ b/nixpkgs/pkgs/development/tools/electron/print-hashes.sh
diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix
index dccf4a55831..dccf4a55831 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix
diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix
index 0f9d973e677..0f9d973e677 100644
--- a/pkgs/development/tools/erlang/relx-exe/default.nix
+++ b/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix
diff --git a/pkgs/development/tools/errcheck/default.nix b/nixpkgs/pkgs/development/tools/errcheck/default.nix
index f65dfe6565b..f65dfe6565b 100644
--- a/pkgs/development/tools/errcheck/default.nix
+++ b/nixpkgs/pkgs/development/tools/errcheck/default.nix
diff --git a/pkgs/development/tools/errcheck/deps.nix b/nixpkgs/pkgs/development/tools/errcheck/deps.nix
index 8470c9e12aa..8470c9e12aa 100644
--- a/pkgs/development/tools/errcheck/deps.nix
+++ b/nixpkgs/pkgs/development/tools/errcheck/deps.nix
diff --git a/pkgs/development/tools/fac/default.nix b/nixpkgs/pkgs/development/tools/fac/default.nix
index 331c86ad88c..331c86ad88c 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/nixpkgs/pkgs/development/tools/fac/default.nix
diff --git a/pkgs/development/tools/fac/deps.nix b/nixpkgs/pkgs/development/tools/fac/deps.nix
index 65335497e5f..65335497e5f 100644
--- a/pkgs/development/tools/fac/deps.nix
+++ b/nixpkgs/pkgs/development/tools/fac/deps.nix
diff --git a/pkgs/development/tools/fdroidserver/default.nix b/nixpkgs/pkgs/development/tools/fdroidserver/default.nix
index 731eb80b261..731eb80b261 100644
--- a/pkgs/development/tools/fdroidserver/default.nix
+++ b/nixpkgs/pkgs/development/tools/fdroidserver/default.nix
diff --git a/pkgs/development/tools/fedpkg/default.nix b/nixpkgs/pkgs/development/tools/fedpkg/default.nix
index f257ae8adbf..f257ae8adbf 100644
--- a/pkgs/development/tools/fedpkg/default.nix
+++ b/nixpkgs/pkgs/development/tools/fedpkg/default.nix
diff --git a/pkgs/development/tools/fedpkg/fix-paths.patch b/nixpkgs/pkgs/development/tools/fedpkg/fix-paths.patch
index 1831337a585..1831337a585 100644
--- a/pkgs/development/tools/fedpkg/fix-paths.patch
+++ b/nixpkgs/pkgs/development/tools/fedpkg/fix-paths.patch
diff --git a/pkgs/development/tools/flamegraph/default.nix b/nixpkgs/pkgs/development/tools/flamegraph/default.nix
index 23ada99eac0..23ada99eac0 100644
--- a/pkgs/development/tools/flamegraph/default.nix
+++ b/nixpkgs/pkgs/development/tools/flamegraph/default.nix
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix
index 1bb5c23645d..1bb5c23645d 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix
diff --git a/pkgs/development/tools/flatpak-builder/fix-paths.patch b/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch
index 6b82e623a02..6b82e623a02 100644
--- a/pkgs/development/tools/flatpak-builder/fix-paths.patch
+++ b/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch
diff --git a/pkgs/development/tools/flatpak-builder/fix-test-paths.patch b/nixpkgs/pkgs/development/tools/flatpak-builder/fix-test-paths.patch
index 96212a30fcf..96212a30fcf 100644
--- a/pkgs/development/tools/flatpak-builder/fix-test-paths.patch
+++ b/nixpkgs/pkgs/development/tools/flatpak-builder/fix-test-paths.patch
diff --git a/pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch b/nixpkgs/pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch
index 0e259aebd8a..0e259aebd8a 100644
--- a/pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch
+++ b/nixpkgs/pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch
diff --git a/pkgs/development/tools/flock/default.nix b/nixpkgs/pkgs/development/tools/flock/default.nix
index a6ba410ec71..a6ba410ec71 100644
--- a/pkgs/development/tools/flock/default.nix
+++ b/nixpkgs/pkgs/development/tools/flock/default.nix
diff --git a/pkgs/development/tools/flootty/default.nix b/nixpkgs/pkgs/development/tools/flootty/default.nix
index 1baddb52259..1baddb52259 100644
--- a/pkgs/development/tools/flootty/default.nix
+++ b/nixpkgs/pkgs/development/tools/flootty/default.nix
diff --git a/pkgs/development/tools/flyway/default.nix b/nixpkgs/pkgs/development/tools/flyway/default.nix
index 67d408505db..67d408505db 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/nixpkgs/pkgs/development/tools/flyway/default.nix
diff --git a/pkgs/development/tools/fmbt/default.nix b/nixpkgs/pkgs/development/tools/fmbt/default.nix
index 3100daae389..3100daae389 100644
--- a/pkgs/development/tools/fmbt/default.nix
+++ b/nixpkgs/pkgs/development/tools/fmbt/default.nix
diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix
index 4fb05da3067..4fb05da3067 100644
--- a/pkgs/development/tools/fusee-launcher/default.nix
+++ b/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix
diff --git a/pkgs/development/tools/galen/default.nix b/nixpkgs/pkgs/development/tools/galen/default.nix
index 15129bbebff..15129bbebff 100644
--- a/pkgs/development/tools/galen/default.nix
+++ b/nixpkgs/pkgs/development/tools/galen/default.nix
diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix
index 7c31f691b4e..7c31f691b4e 100644
--- a/pkgs/development/tools/gamecube-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix
diff --git a/pkgs/development/tools/gauge/default.nix b/nixpkgs/pkgs/development/tools/gauge/default.nix
index b284b7e7a04..b284b7e7a04 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/nixpkgs/pkgs/development/tools/gauge/default.nix
diff --git a/pkgs/development/tools/gdm/default.nix b/nixpkgs/pkgs/development/tools/gdm/default.nix
index 9cfa2f02c6e..9cfa2f02c6e 100644
--- a/pkgs/development/tools/gdm/default.nix
+++ b/nixpkgs/pkgs/development/tools/gdm/default.nix
diff --git a/pkgs/development/tools/gdm/deps.nix b/nixpkgs/pkgs/development/tools/gdm/deps.nix
index 62a3df65e3a..62a3df65e3a 100644
--- a/pkgs/development/tools/gdm/deps.nix
+++ b/nixpkgs/pkgs/development/tools/gdm/deps.nix
diff --git a/pkgs/development/tools/geckodriver/cargo-lock.patch b/nixpkgs/pkgs/development/tools/geckodriver/cargo-lock.patch
index a283d0c382c..a283d0c382c 100644
--- a/pkgs/development/tools/geckodriver/cargo-lock.patch
+++ b/nixpkgs/pkgs/development/tools/geckodriver/cargo-lock.patch
diff --git a/pkgs/development/tools/geckodriver/default.nix b/nixpkgs/pkgs/development/tools/geckodriver/default.nix
index 9f0de971d1b..9f0de971d1b 100644
--- a/pkgs/development/tools/geckodriver/default.nix
+++ b/nixpkgs/pkgs/development/tools/geckodriver/default.nix
diff --git a/pkgs/development/tools/ghp-import/default.nix b/nixpkgs/pkgs/development/tools/ghp-import/default.nix
index 4c258d6154b..4c258d6154b 100644
--- a/pkgs/development/tools/ghp-import/default.nix
+++ b/nixpkgs/pkgs/development/tools/ghp-import/default.nix
diff --git a/pkgs/development/tools/gir/default.nix b/nixpkgs/pkgs/development/tools/gir/default.nix
index b8dbda2a1f8..b8dbda2a1f8 100644
--- a/pkgs/development/tools/gir/default.nix
+++ b/nixpkgs/pkgs/development/tools/gir/default.nix
diff --git a/pkgs/development/tools/git-ftp/default.nix b/nixpkgs/pkgs/development/tools/git-ftp/default.nix
index b0a59e632f1..b0a59e632f1 100644
--- a/pkgs/development/tools/git-ftp/default.nix
+++ b/nixpkgs/pkgs/development/tools/git-ftp/default.nix
diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix
index 83df38cf7db..83df38cf7db 100644
--- a/pkgs/development/tools/git-quick-stats/default.nix
+++ b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix
diff --git a/pkgs/development/tools/git-repo-updater/default.nix b/nixpkgs/pkgs/development/tools/git-repo-updater/default.nix
index 6acb628a322..6acb628a322 100644
--- a/pkgs/development/tools/git-repo-updater/default.nix
+++ b/nixpkgs/pkgs/development/tools/git-repo-updater/default.nix
diff --git a/pkgs/development/tools/git-series/default.nix b/nixpkgs/pkgs/development/tools/git-series/default.nix
index 0a7c9e7ebe1..0a7c9e7ebe1 100644
--- a/pkgs/development/tools/git-series/default.nix
+++ b/nixpkgs/pkgs/development/tools/git-series/default.nix
diff --git a/pkgs/development/tools/github-changelog-generator/Gemfile b/nixpkgs/pkgs/development/tools/github-changelog-generator/Gemfile
index 5db8cdb7348..5db8cdb7348 100644
--- a/pkgs/development/tools/github-changelog-generator/Gemfile
+++ b/nixpkgs/pkgs/development/tools/github-changelog-generator/Gemfile
diff --git a/pkgs/development/tools/github-changelog-generator/Gemfile.lock b/nixpkgs/pkgs/development/tools/github-changelog-generator/Gemfile.lock
index b1b955cba94..b1b955cba94 100644
--- a/pkgs/development/tools/github-changelog-generator/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/github-changelog-generator/Gemfile.lock
diff --git a/pkgs/development/tools/github-changelog-generator/default.nix b/nixpkgs/pkgs/development/tools/github-changelog-generator/default.nix
index 9a14cc7f6e2..9a14cc7f6e2 100644
--- a/pkgs/development/tools/github-changelog-generator/default.nix
+++ b/nixpkgs/pkgs/development/tools/github-changelog-generator/default.nix
diff --git a/pkgs/development/tools/github-changelog-generator/gemset.nix b/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix
index 3382557aaa5..3382557aaa5 100644
--- a/pkgs/development/tools/github-changelog-generator/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix
diff --git a/pkgs/development/tools/github-commenter/default.nix b/nixpkgs/pkgs/development/tools/github-commenter/default.nix
index 969d7950cb9..969d7950cb9 100644
--- a/pkgs/development/tools/github-commenter/default.nix
+++ b/nixpkgs/pkgs/development/tools/github-commenter/default.nix
diff --git a/pkgs/development/tools/github-commenter/deps.nix b/nixpkgs/pkgs/development/tools/github-commenter/deps.nix
index 4b6be6c6d62..4b6be6c6d62 100644
--- a/pkgs/development/tools/github-commenter/deps.nix
+++ b/nixpkgs/pkgs/development/tools/github-commenter/deps.nix
diff --git a/pkgs/development/tools/github/cligh/default.nix b/nixpkgs/pkgs/development/tools/github/cligh/default.nix
index 1bad76b246a..1bad76b246a 100644
--- a/pkgs/development/tools/github/cligh/default.nix
+++ b/nixpkgs/pkgs/development/tools/github/cligh/default.nix
diff --git a/pkgs/development/tools/github/github-release/default.nix b/nixpkgs/pkgs/development/tools/github/github-release/default.nix
index be268fa6de3..be268fa6de3 100644
--- a/pkgs/development/tools/github/github-release/default.nix
+++ b/nixpkgs/pkgs/development/tools/github/github-release/default.nix
diff --git a/pkgs/development/tools/glide/default.nix b/nixpkgs/pkgs/development/tools/glide/default.nix
index 93004348981..93004348981 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/nixpkgs/pkgs/development/tools/glide/default.nix
diff --git a/pkgs/development/tools/gllvm/default.nix b/nixpkgs/pkgs/development/tools/gllvm/default.nix
index dfc5ed843e7..dfc5ed843e7 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/nixpkgs/pkgs/development/tools/gllvm/default.nix
diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix
index 74a88caeb7c..74a88caeb7c 100644
--- a/pkgs/development/tools/global-platform-pro/default.nix
+++ b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix
diff --git a/pkgs/development/tools/glock/default.nix b/nixpkgs/pkgs/development/tools/glock/default.nix
index d0e9cc9e2d3..d0e9cc9e2d3 100644
--- a/pkgs/development/tools/glock/default.nix
+++ b/nixpkgs/pkgs/development/tools/glock/default.nix
diff --git a/pkgs/development/tools/glock/deps.nix b/nixpkgs/pkgs/development/tools/glock/deps.nix
index b7392d757cf..b7392d757cf 100644
--- a/pkgs/development/tools/glock/deps.nix
+++ b/nixpkgs/pkgs/development/tools/glock/deps.nix
diff --git a/pkgs/development/tools/glslviewer/default.nix b/nixpkgs/pkgs/development/tools/glslviewer/default.nix
index fd22295540d..fd22295540d 100644
--- a/pkgs/development/tools/glslviewer/default.nix
+++ b/nixpkgs/pkgs/development/tools/glslviewer/default.nix
diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix
index 8f9b9ddf0b5..8f9b9ddf0b5 100644
--- a/pkgs/development/tools/gnome-desktop-testing/default.nix
+++ b/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix
diff --git a/pkgs/development/tools/gnulib/default.nix b/nixpkgs/pkgs/development/tools/gnulib/default.nix
index 15042353b1d..15042353b1d 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/nixpkgs/pkgs/development/tools/gnulib/default.nix
diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix
index ffdb2a092a0..ffdb2a092a0 100644
--- a/pkgs/development/tools/go-bindata-assetfs/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix
diff --git a/pkgs/development/tools/go-bindata/default.nix b/nixpkgs/pkgs/development/tools/go-bindata/default.nix
index 4d07939bd7c..4d07939bd7c 100644
--- a/pkgs/development/tools/go-bindata/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-bindata/default.nix
diff --git a/pkgs/development/tools/go-junit-report/default.nix b/nixpkgs/pkgs/development/tools/go-junit-report/default.nix
index 3c6cf7e3d83..3c6cf7e3d83 100644
--- a/pkgs/development/tools/go-junit-report/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-junit-report/default.nix
diff --git a/pkgs/development/tools/go-langserver/default.nix b/nixpkgs/pkgs/development/tools/go-langserver/default.nix
index ec0e565eabd..ec0e565eabd 100644
--- a/pkgs/development/tools/go-langserver/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-langserver/default.nix
diff --git a/pkgs/development/tools/go-motion/default.nix b/nixpkgs/pkgs/development/tools/go-motion/default.nix
index 52b2962a23d..52b2962a23d 100644
--- a/pkgs/development/tools/go-motion/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-motion/default.nix
diff --git a/pkgs/development/tools/go-outline/default.nix b/nixpkgs/pkgs/development/tools/go-outline/default.nix
index 5f6088363f1..5f6088363f1 100644
--- a/pkgs/development/tools/go-outline/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-outline/default.nix
diff --git a/pkgs/development/tools/go-outline/deps.nix b/nixpkgs/pkgs/development/tools/go-outline/deps.nix
index 6a333b58bec..6a333b58bec 100644
--- a/pkgs/development/tools/go-outline/deps.nix
+++ b/nixpkgs/pkgs/development/tools/go-outline/deps.nix
diff --git a/pkgs/development/tools/go-protobuf/default.nix b/nixpkgs/pkgs/development/tools/go-protobuf/default.nix
index febf71657eb..febf71657eb 100644
--- a/pkgs/development/tools/go-protobuf/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-protobuf/default.nix
diff --git a/pkgs/development/tools/go-repo-root/default.nix b/nixpkgs/pkgs/development/tools/go-repo-root/default.nix
index 7fcec1937c7..7fcec1937c7 100644
--- a/pkgs/development/tools/go-repo-root/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-repo-root/default.nix
diff --git a/pkgs/development/tools/go-repo-root/deps.nix b/nixpkgs/pkgs/development/tools/go-repo-root/deps.nix
index 2554b3cad1a..2554b3cad1a 100644
--- a/pkgs/development/tools/go-repo-root/deps.nix
+++ b/nixpkgs/pkgs/development/tools/go-repo-root/deps.nix
diff --git a/pkgs/development/tools/go-symbols/default.nix b/nixpkgs/pkgs/development/tools/go-symbols/default.nix
index e774ed71664..e774ed71664 100644
--- a/pkgs/development/tools/go-symbols/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-symbols/default.nix
diff --git a/pkgs/development/tools/go-symbols/deps.nix b/nixpkgs/pkgs/development/tools/go-symbols/deps.nix
index 6a333b58bec..6a333b58bec 100644
--- a/pkgs/development/tools/go-symbols/deps.nix
+++ b/nixpkgs/pkgs/development/tools/go-symbols/deps.nix
diff --git a/pkgs/development/tools/go-tools/default.nix b/nixpkgs/pkgs/development/tools/go-tools/default.nix
index 4c80c2aff18..4c80c2aff18 100644
--- a/pkgs/development/tools/go-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/go-tools/default.nix
diff --git a/pkgs/development/tools/go2nix/default.nix b/nixpkgs/pkgs/development/tools/go2nix/default.nix
index 26458a3ca2e..26458a3ca2e 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/nixpkgs/pkgs/development/tools/go2nix/default.nix
diff --git a/pkgs/development/tools/go2nix/deps.nix b/nixpkgs/pkgs/development/tools/go2nix/deps.nix
index 8fc784f4b7f..8fc784f4b7f 100644
--- a/pkgs/development/tools/go2nix/deps.nix
+++ b/nixpkgs/pkgs/development/tools/go2nix/deps.nix
diff --git a/pkgs/development/tools/goa/default.nix b/nixpkgs/pkgs/development/tools/goa/default.nix
index 24a21c8279c..24a21c8279c 100644
--- a/pkgs/development/tools/goa/default.nix
+++ b/nixpkgs/pkgs/development/tools/goa/default.nix
diff --git a/pkgs/development/tools/goa/deps.nix b/nixpkgs/pkgs/development/tools/goa/deps.nix
index bfe862a4006..bfe862a4006 100644
--- a/pkgs/development/tools/goa/deps.nix
+++ b/nixpkgs/pkgs/development/tools/goa/deps.nix
diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix
index 1524984756f..1524984756f 100644
--- a/pkgs/development/tools/gocode-gomod/default.nix
+++ b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix
diff --git a/pkgs/development/tools/gocode-gomod/deps.nix b/nixpkgs/pkgs/development/tools/gocode-gomod/deps.nix
index ac966269706..ac966269706 100644
--- a/pkgs/development/tools/gocode-gomod/deps.nix
+++ b/nixpkgs/pkgs/development/tools/gocode-gomod/deps.nix
diff --git a/pkgs/development/tools/gocode/default.nix b/nixpkgs/pkgs/development/tools/gocode/default.nix
index b67f8929e48..b67f8929e48 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/nixpkgs/pkgs/development/tools/gocode/default.nix
diff --git a/pkgs/development/tools/gocode/deps.nix b/nixpkgs/pkgs/development/tools/gocode/deps.nix
index ac966269706..ac966269706 100644
--- a/pkgs/development/tools/gocode/deps.nix
+++ b/nixpkgs/pkgs/development/tools/gocode/deps.nix
diff --git a/pkgs/development/tools/goconst/default.nix b/nixpkgs/pkgs/development/tools/goconst/default.nix
index 0ee889d0265..0ee889d0265 100644
--- a/pkgs/development/tools/goconst/default.nix
+++ b/nixpkgs/pkgs/development/tools/goconst/default.nix
diff --git a/pkgs/development/tools/goconvey/default.nix b/nixpkgs/pkgs/development/tools/goconvey/default.nix
index 1df94147ba4..1df94147ba4 100644
--- a/pkgs/development/tools/goconvey/default.nix
+++ b/nixpkgs/pkgs/development/tools/goconvey/default.nix
diff --git a/pkgs/development/tools/goconvey/deps.nix b/nixpkgs/pkgs/development/tools/goconvey/deps.nix
index d329359da70..d329359da70 100644
--- a/pkgs/development/tools/goconvey/deps.nix
+++ b/nixpkgs/pkgs/development/tools/goconvey/deps.nix
diff --git a/pkgs/development/tools/gocyclo/default.nix b/nixpkgs/pkgs/development/tools/gocyclo/default.nix
index f446b728908..f446b728908 100644
--- a/pkgs/development/tools/gocyclo/default.nix
+++ b/nixpkgs/pkgs/development/tools/gocyclo/default.nix
diff --git a/pkgs/development/tools/godef/default.nix b/nixpkgs/pkgs/development/tools/godef/default.nix
index ce6c77b2cc3..ce6c77b2cc3 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/nixpkgs/pkgs/development/tools/godef/default.nix
diff --git a/pkgs/development/tools/godot/default.nix b/nixpkgs/pkgs/development/tools/godot/default.nix
index e31d27f710b..e31d27f710b 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/nixpkgs/pkgs/development/tools/godot/default.nix
diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch
index 96a8464b566..96a8464b566 100644
--- a/pkgs/development/tools/godot/dont_clobber_environment.patch
+++ b/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch
diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch
index 409baaa6f26..409baaa6f26 100644
--- a/pkgs/development/tools/godot/pkg_config_additions.patch
+++ b/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch
diff --git a/pkgs/development/tools/gofumpt/default.nix b/nixpkgs/pkgs/development/tools/gofumpt/default.nix
index 221058a461e..221058a461e 100644
--- a/pkgs/development/tools/gofumpt/default.nix
+++ b/nixpkgs/pkgs/development/tools/gofumpt/default.nix
diff --git a/pkgs/development/tools/gogetdoc/default.nix b/nixpkgs/pkgs/development/tools/gogetdoc/default.nix
index 61d0e7a73db..61d0e7a73db 100644
--- a/pkgs/development/tools/gogetdoc/default.nix
+++ b/nixpkgs/pkgs/development/tools/gogetdoc/default.nix
diff --git a/pkgs/development/tools/gogetdoc/deps.nix b/nixpkgs/pkgs/development/tools/gogetdoc/deps.nix
index d770057d1d7..d770057d1d7 100644
--- a/pkgs/development/tools/gogetdoc/deps.nix
+++ b/nixpkgs/pkgs/development/tools/gogetdoc/deps.nix
diff --git a/pkgs/development/tools/golangci-lint/default.nix b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
index 8304d95d99f..8304d95d99f 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
diff --git a/pkgs/development/tools/golint/default.nix b/nixpkgs/pkgs/development/tools/golint/default.nix
index bd66f35e471..bd66f35e471 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/nixpkgs/pkgs/development/tools/golint/default.nix
diff --git a/pkgs/development/tools/golint/deps.nix b/nixpkgs/pkgs/development/tools/golint/deps.nix
index e2640098933..e2640098933 100644
--- a/pkgs/development/tools/golint/deps.nix
+++ b/nixpkgs/pkgs/development/tools/golint/deps.nix
diff --git a/pkgs/development/tools/gometalinter/default.nix b/nixpkgs/pkgs/development/tools/gometalinter/default.nix
index c2f2a8a597a..c2f2a8a597a 100644
--- a/pkgs/development/tools/gometalinter/default.nix
+++ b/nixpkgs/pkgs/development/tools/gometalinter/default.nix
diff --git a/pkgs/development/tools/gomodifytags/default.nix b/nixpkgs/pkgs/development/tools/gomodifytags/default.nix
index 4d97415bc56..4d97415bc56 100644
--- a/pkgs/development/tools/gomodifytags/default.nix
+++ b/nixpkgs/pkgs/development/tools/gomodifytags/default.nix
diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index df3310893a4..df3310893a4 100644
--- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix
diff --git a/pkgs/development/tools/gopkgs/default.nix b/nixpkgs/pkgs/development/tools/gopkgs/default.nix
index 778ed562637..778ed562637 100644
--- a/pkgs/development/tools/gopkgs/default.nix
+++ b/nixpkgs/pkgs/development/tools/gopkgs/default.nix
diff --git a/pkgs/development/tools/gopkgs/deps.nix b/nixpkgs/pkgs/development/tools/gopkgs/deps.nix
index 715c7bbbc82..715c7bbbc82 100644
--- a/pkgs/development/tools/gopkgs/deps.nix
+++ b/nixpkgs/pkgs/development/tools/gopkgs/deps.nix
diff --git a/pkgs/development/tools/gosec/default.nix b/nixpkgs/pkgs/development/tools/gosec/default.nix
index 1b6b3aed4e8..1b6b3aed4e8 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/nixpkgs/pkgs/development/tools/gosec/default.nix
diff --git a/pkgs/development/tools/gosec/deps.nix b/nixpkgs/pkgs/development/tools/gosec/deps.nix
index 80a77e7fb80..80a77e7fb80 100644
--- a/pkgs/development/tools/gosec/deps.nix
+++ b/nixpkgs/pkgs/development/tools/gosec/deps.nix
diff --git a/pkgs/development/tools/gotags/default.nix b/nixpkgs/pkgs/development/tools/gotags/default.nix
index 881ae7e24d4..881ae7e24d4 100644
--- a/pkgs/development/tools/gotags/default.nix
+++ b/nixpkgs/pkgs/development/tools/gotags/default.nix
diff --git a/pkgs/development/tools/gotests/default.nix b/nixpkgs/pkgs/development/tools/gotests/default.nix
index e74b6c27b2b..e74b6c27b2b 100644
--- a/pkgs/development/tools/gotests/default.nix
+++ b/nixpkgs/pkgs/development/tools/gotests/default.nix
diff --git a/pkgs/development/tools/gotests/deps.nix b/nixpkgs/pkgs/development/tools/gotests/deps.nix
index df411303d94..df411303d94 100644
--- a/pkgs/development/tools/gotests/deps.nix
+++ b/nixpkgs/pkgs/development/tools/gotests/deps.nix
diff --git a/pkgs/development/tools/gotestsum/default.nix b/nixpkgs/pkgs/development/tools/gotestsum/default.nix
index 839c12c04af..839c12c04af 100644
--- a/pkgs/development/tools/gotestsum/default.nix
+++ b/nixpkgs/pkgs/development/tools/gotestsum/default.nix
diff --git a/pkgs/development/tools/gotools/default.nix b/nixpkgs/pkgs/development/tools/gotools/default.nix
index 59416f03134..59416f03134 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/nixpkgs/pkgs/development/tools/gotools/default.nix
diff --git a/pkgs/development/tools/govendor/default.nix b/nixpkgs/pkgs/development/tools/govendor/default.nix
index 804a9bf043e..804a9bf043e 100644
--- a/pkgs/development/tools/govendor/default.nix
+++ b/nixpkgs/pkgs/development/tools/govendor/default.nix
diff --git a/pkgs/development/tools/govers/default.nix b/nixpkgs/pkgs/development/tools/govers/default.nix
index ebce368ea9f..ebce368ea9f 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/nixpkgs/pkgs/development/tools/govers/default.nix
diff --git a/pkgs/development/tools/gox/default.nix b/nixpkgs/pkgs/development/tools/gox/default.nix
index 6caa32c16f2..6caa32c16f2 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/nixpkgs/pkgs/development/tools/gox/default.nix
diff --git a/pkgs/development/tools/gox/deps.nix b/nixpkgs/pkgs/development/tools/gox/deps.nix
index c4991e38ff0..c4991e38ff0 100644
--- a/pkgs/development/tools/gox/deps.nix
+++ b/nixpkgs/pkgs/development/tools/gox/deps.nix
diff --git a/pkgs/development/tools/gpp/default.nix b/nixpkgs/pkgs/development/tools/gpp/default.nix
index ee15df1a9f6..ee15df1a9f6 100644
--- a/pkgs/development/tools/gpp/default.nix
+++ b/nixpkgs/pkgs/development/tools/gpp/default.nix
diff --git a/pkgs/development/tools/grabserial/default.nix b/nixpkgs/pkgs/development/tools/grabserial/default.nix
index 5e06e9f771d..5e06e9f771d 100644
--- a/pkgs/development/tools/grabserial/default.nix
+++ b/nixpkgs/pkgs/development/tools/grabserial/default.nix
diff --git a/pkgs/development/tools/gron/default.nix b/nixpkgs/pkgs/development/tools/gron/default.nix
index e0d2d3d1498..e0d2d3d1498 100644
--- a/pkgs/development/tools/gron/default.nix
+++ b/nixpkgs/pkgs/development/tools/gron/default.nix
diff --git a/pkgs/development/tools/gron/deps.nix b/nixpkgs/pkgs/development/tools/gron/deps.nix
index effc255d877..effc255d877 100644
--- a/pkgs/development/tools/gron/deps.nix
+++ b/nixpkgs/pkgs/development/tools/gron/deps.nix
diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix
index 02d5ad87dc4..02d5ad87dc4 100644
--- a/pkgs/development/tools/gtk-mac-bundler/default.nix
+++ b/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix
diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix
index 15233979e15..15233979e15 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix
diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix
index b8efb30f5f1..b8efb30f5f1 100644
--- a/pkgs/development/tools/guile/guile-lint/default.nix
+++ b/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix
diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix
index 7d99a5e9a57..7d99a5e9a57 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/default.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix
diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/server.nix
index 47a9c550fa8..47a9c550fa8 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/server.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/server.nix
diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index 0f42a5e3490..0f42a5e3490 100644
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix
diff --git a/pkgs/development/tools/haskell/lambdabot/custom-config.patch b/nixpkgs/pkgs/development/tools/haskell/lambdabot/custom-config.patch
index db467f8dd29..db467f8dd29 100644
--- a/pkgs/development/tools/haskell/lambdabot/custom-config.patch
+++ b/nixpkgs/pkgs/development/tools/haskell/lambdabot/custom-config.patch
diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/nixpkgs/pkgs/development/tools/haskell/lambdabot/default.nix
index 5e372b4f387..5e372b4f387 100644
--- a/pkgs/development/tools/haskell/lambdabot/default.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/lambdabot/default.nix
diff --git a/pkgs/development/tools/haskell/mueval/default.nix b/nixpkgs/pkgs/development/tools/haskell/mueval/default.nix
index 3b4a6406f70..3b4a6406f70 100644
--- a/pkgs/development/tools/haskell/mueval/default.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/mueval/default.nix
diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix
index 1eb8bf75cdf..1eb8bf75cdf 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix
diff --git a/pkgs/development/tools/hcloud/default.nix b/nixpkgs/pkgs/development/tools/hcloud/default.nix
index 480456ff21d..480456ff21d 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/nixpkgs/pkgs/development/tools/hcloud/default.nix
diff --git a/pkgs/development/tools/heroku/default.nix b/nixpkgs/pkgs/development/tools/heroku/default.nix
index 58e9c67dd44..58e9c67dd44 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/nixpkgs/pkgs/development/tools/heroku/default.nix
diff --git a/pkgs/development/tools/hexio/default.nix b/nixpkgs/pkgs/development/tools/hexio/default.nix
index c97e35583b6..c97e35583b6 100644
--- a/pkgs/development/tools/hexio/default.nix
+++ b/nixpkgs/pkgs/development/tools/hexio/default.nix
diff --git a/pkgs/development/tools/iaca/2.1.nix b/nixpkgs/pkgs/development/tools/iaca/2.1.nix
index b2c764c5a85..b2c764c5a85 100644
--- a/pkgs/development/tools/iaca/2.1.nix
+++ b/nixpkgs/pkgs/development/tools/iaca/2.1.nix
diff --git a/pkgs/development/tools/iaca/3.0.nix b/nixpkgs/pkgs/development/tools/iaca/3.0.nix
index 34b9e1df190..34b9e1df190 100644
--- a/pkgs/development/tools/iaca/3.0.nix
+++ b/nixpkgs/pkgs/development/tools/iaca/3.0.nix
diff --git a/pkgs/development/tools/icestorm/default.nix b/nixpkgs/pkgs/development/tools/icestorm/default.nix
index a7af74a8dc8..a7af74a8dc8 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/nixpkgs/pkgs/development/tools/icestorm/default.nix
diff --git a/pkgs/development/tools/icr/default.nix b/nixpkgs/pkgs/development/tools/icr/default.nix
index 3a39d0ddf6b..3a39d0ddf6b 100644
--- a/pkgs/development/tools/icr/default.nix
+++ b/nixpkgs/pkgs/development/tools/icr/default.nix
diff --git a/pkgs/development/tools/iferr/default.nix b/nixpkgs/pkgs/development/tools/iferr/default.nix
index 5874d1eeed3..5874d1eeed3 100644
--- a/pkgs/development/tools/iferr/default.nix
+++ b/nixpkgs/pkgs/development/tools/iferr/default.nix
diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix
index c4d290bf967..c4d290bf967 100644
--- a/pkgs/development/tools/imatix_gsl/default.nix
+++ b/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix
diff --git a/pkgs/development/tools/impl/default.nix b/nixpkgs/pkgs/development/tools/impl/default.nix
index 8d368ba528a..8d368ba528a 100644
--- a/pkgs/development/tools/impl/default.nix
+++ b/nixpkgs/pkgs/development/tools/impl/default.nix
diff --git a/pkgs/development/tools/impl/deps.nix b/nixpkgs/pkgs/development/tools/impl/deps.nix
index 3477aaed607..3477aaed607 100644
--- a/pkgs/development/tools/impl/deps.nix
+++ b/nixpkgs/pkgs/development/tools/impl/deps.nix
diff --git a/pkgs/development/tools/ineffassign/default.nix b/nixpkgs/pkgs/development/tools/ineffassign/default.nix
index 06831e3a43c..06831e3a43c 100644
--- a/pkgs/development/tools/ineffassign/default.nix
+++ b/nixpkgs/pkgs/development/tools/ineffassign/default.nix
diff --git a/pkgs/development/tools/interfacer/default.nix b/nixpkgs/pkgs/development/tools/interfacer/default.nix
index 2f505ef1c67..2f505ef1c67 100644
--- a/pkgs/development/tools/interfacer/default.nix
+++ b/nixpkgs/pkgs/development/tools/interfacer/default.nix
diff --git a/pkgs/development/tools/interfacer/deps.nix b/nixpkgs/pkgs/development/tools/interfacer/deps.nix
index 6810950878b..6810950878b 100644
--- a/pkgs/development/tools/interfacer/deps.nix
+++ b/nixpkgs/pkgs/development/tools/interfacer/deps.nix
diff --git a/pkgs/development/tools/irony-server/default.nix b/nixpkgs/pkgs/development/tools/irony-server/default.nix
index 228a82f6008..228a82f6008 100644
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/nixpkgs/pkgs/development/tools/irony-server/default.nix
diff --git a/pkgs/development/tools/java/cfr/default.nix b/nixpkgs/pkgs/development/tools/java/cfr/default.nix
index 1d928292cd5..1d928292cd5 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/nixpkgs/pkgs/development/tools/java/cfr/default.nix
diff --git a/pkgs/development/tools/java/fastjar/default.nix b/nixpkgs/pkgs/development/tools/java/fastjar/default.nix
index 9791cd56ea1..9791cd56ea1 100644
--- a/pkgs/development/tools/java/fastjar/default.nix
+++ b/nixpkgs/pkgs/development/tools/java/fastjar/default.nix
diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix
index dae39453495..dae39453495 100644
--- a/pkgs/development/tools/java/jhiccup/default.nix
+++ b/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix
diff --git a/pkgs/development/tools/java/visualvm/default.nix b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix
index 4dd6c1efc90..4dd6c1efc90 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix
diff --git a/pkgs/development/tools/jazzy/Gemfile b/nixpkgs/pkgs/development/tools/jazzy/Gemfile
index 27c230a9829..27c230a9829 100644
--- a/pkgs/development/tools/jazzy/Gemfile
+++ b/nixpkgs/pkgs/development/tools/jazzy/Gemfile
diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/nixpkgs/pkgs/development/tools/jazzy/Gemfile.lock
index 210dc101a24..210dc101a24 100644
--- a/pkgs/development/tools/jazzy/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/jazzy/Gemfile.lock
diff --git a/pkgs/development/tools/jazzy/default.nix b/nixpkgs/pkgs/development/tools/jazzy/default.nix
index a6cb7a92b63..a6cb7a92b63 100644
--- a/pkgs/development/tools/jazzy/default.nix
+++ b/nixpkgs/pkgs/development/tools/jazzy/default.nix
diff --git a/pkgs/development/tools/jazzy/gemset.nix b/nixpkgs/pkgs/development/tools/jazzy/gemset.nix
index 872b6296786..872b6296786 100644
--- a/pkgs/development/tools/jazzy/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/jazzy/gemset.nix
diff --git a/pkgs/development/tools/jbake/default.nix b/nixpkgs/pkgs/development/tools/jbake/default.nix
index 79054c7f667..79054c7f667 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/nixpkgs/pkgs/development/tools/jbake/default.nix
diff --git a/pkgs/development/tools/jd/default.nix b/nixpkgs/pkgs/development/tools/jd/default.nix
index b03fd7a0028..b03fd7a0028 100644
--- a/pkgs/development/tools/jd/default.nix
+++ b/nixpkgs/pkgs/development/tools/jd/default.nix
diff --git a/pkgs/development/tools/jid/default.nix b/nixpkgs/pkgs/development/tools/jid/default.nix
index 0fc8b85d8f4..0fc8b85d8f4 100644
--- a/pkgs/development/tools/jid/default.nix
+++ b/nixpkgs/pkgs/development/tools/jid/default.nix
diff --git a/pkgs/development/tools/jid/deps.nix b/nixpkgs/pkgs/development/tools/jid/deps.nix
index a027902d2df..a027902d2df 100644
--- a/pkgs/development/tools/jid/deps.nix
+++ b/nixpkgs/pkgs/development/tools/jid/deps.nix
diff --git a/pkgs/development/tools/jira_cli/default.nix b/nixpkgs/pkgs/development/tools/jira_cli/default.nix
index 8722d49eb32..8722d49eb32 100644
--- a/pkgs/development/tools/jira_cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/jira_cli/default.nix
diff --git a/pkgs/development/tools/jl/default.nix b/nixpkgs/pkgs/development/tools/jl/default.nix
index 0d9ce143a83..0d9ce143a83 100644
--- a/pkgs/development/tools/jl/default.nix
+++ b/nixpkgs/pkgs/development/tools/jl/default.nix
diff --git a/pkgs/development/tools/jmespath/default.nix b/nixpkgs/pkgs/development/tools/jmespath/default.nix
index b12be2a9567..b12be2a9567 100644
--- a/pkgs/development/tools/jmespath/default.nix
+++ b/nixpkgs/pkgs/development/tools/jmespath/default.nix
diff --git a/pkgs/development/tools/jo/default.nix b/nixpkgs/pkgs/development/tools/jo/default.nix
index 9e5d29a6bb2..9e5d29a6bb2 100644
--- a/pkgs/development/tools/jo/default.nix
+++ b/nixpkgs/pkgs/development/tools/jo/default.nix
diff --git a/pkgs/development/tools/jp/default.nix b/nixpkgs/pkgs/development/tools/jp/default.nix
index 3ebdc881dcb..3ebdc881dcb 100644
--- a/pkgs/development/tools/jp/default.nix
+++ b/nixpkgs/pkgs/development/tools/jp/default.nix
diff --git a/pkgs/development/tools/jq/default.nix b/nixpkgs/pkgs/development/tools/jq/default.nix
index 8605ef398a1..8605ef398a1 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/nixpkgs/pkgs/development/tools/jq/default.nix
diff --git a/pkgs/development/tools/jsduck/Gemfile b/nixpkgs/pkgs/development/tools/jsduck/Gemfile
index 483fc40ff79..483fc40ff79 100644
--- a/pkgs/development/tools/jsduck/Gemfile
+++ b/nixpkgs/pkgs/development/tools/jsduck/Gemfile
diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/nixpkgs/pkgs/development/tools/jsduck/Gemfile.lock
index 2a95d72c946..2a95d72c946 100644
--- a/pkgs/development/tools/jsduck/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/jsduck/Gemfile.lock
diff --git a/pkgs/development/tools/jsduck/default.nix b/nixpkgs/pkgs/development/tools/jsduck/default.nix
index 0b6098e5ee9..0b6098e5ee9 100644
--- a/pkgs/development/tools/jsduck/default.nix
+++ b/nixpkgs/pkgs/development/tools/jsduck/default.nix
diff --git a/pkgs/development/tools/jsduck/gemset.nix b/nixpkgs/pkgs/development/tools/jsduck/gemset.nix
index 493cc42f4f4..493cc42f4f4 100644
--- a/pkgs/development/tools/jsduck/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/jsduck/gemset.nix
diff --git a/pkgs/development/tools/json2hcl/default.nix b/nixpkgs/pkgs/development/tools/json2hcl/default.nix
index 4fe4e4c7eab..4fe4e4c7eab 100644
--- a/pkgs/development/tools/json2hcl/default.nix
+++ b/nixpkgs/pkgs/development/tools/json2hcl/default.nix
diff --git a/pkgs/development/tools/json2hcl/deps.nix b/nixpkgs/pkgs/development/tools/json2hcl/deps.nix
index bb9df28ad87..bb9df28ad87 100644
--- a/pkgs/development/tools/json2hcl/deps.nix
+++ b/nixpkgs/pkgs/development/tools/json2hcl/deps.nix
diff --git a/pkgs/development/tools/jtc/default.nix b/nixpkgs/pkgs/development/tools/jtc/default.nix
index 84dff0277ef..84dff0277ef 100644
--- a/pkgs/development/tools/jtc/default.nix
+++ b/nixpkgs/pkgs/development/tools/jtc/default.nix
diff --git a/pkgs/development/tools/just/default.nix b/nixpkgs/pkgs/development/tools/just/default.nix
index 7628bd9558a..7628bd9558a 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/nixpkgs/pkgs/development/tools/just/default.nix
diff --git a/pkgs/development/tools/k6/default.nix b/nixpkgs/pkgs/development/tools/k6/default.nix
index b8071bf1ac2..b8071bf1ac2 100644
--- a/pkgs/development/tools/k6/default.nix
+++ b/nixpkgs/pkgs/development/tools/k6/default.nix
diff --git a/pkgs/development/tools/kafkacat/default.nix b/nixpkgs/pkgs/development/tools/kafkacat/default.nix
index 7de5cd6340a..7de5cd6340a 100644
--- a/pkgs/development/tools/kafkacat/default.nix
+++ b/nixpkgs/pkgs/development/tools/kafkacat/default.nix
diff --git a/pkgs/development/tools/kcli/default.nix b/nixpkgs/pkgs/development/tools/kcli/default.nix
index a3944ff4126..a3944ff4126 100644
--- a/pkgs/development/tools/kcli/default.nix
+++ b/nixpkgs/pkgs/development/tools/kcli/default.nix
diff --git a/pkgs/development/tools/kexpand/default.nix b/nixpkgs/pkgs/development/tools/kexpand/default.nix
index e6c562721c2..e6c562721c2 100644
--- a/pkgs/development/tools/kexpand/default.nix
+++ b/nixpkgs/pkgs/development/tools/kexpand/default.nix
diff --git a/pkgs/development/tools/kexpand/deps.nix b/nixpkgs/pkgs/development/tools/kexpand/deps.nix
index c049d9683cc..c049d9683cc 100644
--- a/pkgs/development/tools/kexpand/deps.nix
+++ b/nixpkgs/pkgs/development/tools/kexpand/deps.nix
diff --git a/pkgs/development/tools/kind/default.nix b/nixpkgs/pkgs/development/tools/kind/default.nix
index 94a0ff87982..94a0ff87982 100644
--- a/pkgs/development/tools/kind/default.nix
+++ b/nixpkgs/pkgs/development/tools/kind/default.nix
diff --git a/pkgs/development/tools/kind/deps.nix b/nixpkgs/pkgs/development/tools/kind/deps.nix
index 1706406c456..1706406c456 100644
--- a/pkgs/development/tools/kind/deps.nix
+++ b/nixpkgs/pkgs/development/tools/kind/deps.nix
diff --git a/pkgs/development/tools/ktlint/default.nix b/nixpkgs/pkgs/development/tools/ktlint/default.nix
index 0c55dc9fdb1..0c55dc9fdb1 100644
--- a/pkgs/development/tools/ktlint/default.nix
+++ b/nixpkgs/pkgs/development/tools/ktlint/default.nix
diff --git a/pkgs/development/tools/kube-aws/default.nix b/nixpkgs/pkgs/development/tools/kube-aws/default.nix
index 6083c03ebc9..6083c03ebc9 100644
--- a/pkgs/development/tools/kube-aws/default.nix
+++ b/nixpkgs/pkgs/development/tools/kube-aws/default.nix
diff --git a/pkgs/development/tools/kube-prompt/default.nix b/nixpkgs/pkgs/development/tools/kube-prompt/default.nix
index 8e6ca8e221e..8e6ca8e221e 100644
--- a/pkgs/development/tools/kube-prompt/default.nix
+++ b/nixpkgs/pkgs/development/tools/kube-prompt/default.nix
diff --git a/pkgs/development/tools/kube-prompt/deps.nix b/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix
index e2391789a41..e2391789a41 100644
--- a/pkgs/development/tools/kube-prompt/deps.nix
+++ b/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix
diff --git a/pkgs/development/tools/kubectx/default.nix b/nixpkgs/pkgs/development/tools/kubectx/default.nix
index b3116a9b2f9..b3116a9b2f9 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/nixpkgs/pkgs/development/tools/kubectx/default.nix
diff --git a/pkgs/development/tools/kubeprompt/default.nix b/nixpkgs/pkgs/development/tools/kubeprompt/default.nix
index 7c6f3f3396c..7c6f3f3396c 100644
--- a/pkgs/development/tools/kubeprompt/default.nix
+++ b/nixpkgs/pkgs/development/tools/kubeprompt/default.nix
diff --git a/pkgs/development/tools/kubicorn/default.nix b/nixpkgs/pkgs/development/tools/kubicorn/default.nix
index 104b11c1ce1..104b11c1ce1 100644
--- a/pkgs/development/tools/kubicorn/default.nix
+++ b/nixpkgs/pkgs/development/tools/kubicorn/default.nix
diff --git a/pkgs/development/tools/kustomize/default.nix b/nixpkgs/pkgs/development/tools/kustomize/default.nix
index e60181e9bc4..e60181e9bc4 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/nixpkgs/pkgs/development/tools/kustomize/default.nix
diff --git a/pkgs/development/tools/kythe/default.nix b/nixpkgs/pkgs/development/tools/kythe/default.nix
index c2bba7b3254..c2bba7b3254 100644
--- a/pkgs/development/tools/kythe/default.nix
+++ b/nixpkgs/pkgs/development/tools/kythe/default.nix
diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix
index 1dea1440113..1dea1440113 100644
--- a/pkgs/development/tools/lattice-diamond/default.nix
+++ b/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix
diff --git a/pkgs/development/tools/lazygit/default.nix b/nixpkgs/pkgs/development/tools/lazygit/default.nix
index bb6d7dc0871..bb6d7dc0871 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/nixpkgs/pkgs/development/tools/lazygit/default.nix
diff --git a/pkgs/development/tools/leaps/default.nix b/nixpkgs/pkgs/development/tools/leaps/default.nix
index a2a35c7fd1d..a2a35c7fd1d 100644
--- a/pkgs/development/tools/leaps/default.nix
+++ b/nixpkgs/pkgs/development/tools/leaps/default.nix
diff --git a/pkgs/development/tools/leaps/deps.nix b/nixpkgs/pkgs/development/tools/leaps/deps.nix
index afaf42779b3..afaf42779b3 100644
--- a/pkgs/development/tools/leaps/deps.nix
+++ b/nixpkgs/pkgs/development/tools/leaps/deps.nix
diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix
index 7f40824c472..7f40824c472 100644
--- a/pkgs/development/tools/librarian-puppet-go/default.nix
+++ b/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix
diff --git a/pkgs/development/tools/librarian-puppet-go/deps.nix b/nixpkgs/pkgs/development/tools/librarian-puppet-go/deps.nix
index e5729707d8a..e5729707d8a 100644
--- a/pkgs/development/tools/librarian-puppet-go/deps.nix
+++ b/nixpkgs/pkgs/development/tools/librarian-puppet-go/deps.nix
diff --git a/pkgs/development/tools/libsigrok/default.nix b/nixpkgs/pkgs/development/tools/libsigrok/default.nix
index a80b638625e..a80b638625e 100644
--- a/pkgs/development/tools/libsigrok/default.nix
+++ b/nixpkgs/pkgs/development/tools/libsigrok/default.nix
diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix
index b9c149af531..b9c149af531 100644
--- a/pkgs/development/tools/libsigrokdecode/default.nix
+++ b/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix
diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix
index 035374d3e90..035374d3e90 100644
--- a/pkgs/development/tools/literate-programming/Literate/default.nix
+++ b/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix
diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix
index 17a7731896e..17a7731896e 100644
--- a/pkgs/development/tools/literate-programming/eweb/default.nix
+++ b/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix
diff --git a/pkgs/development/tools/literate-programming/funnelweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix
index 66b44d1fc83..66b44d1fc83 100644
--- a/pkgs/development/tools/literate-programming/funnelweb/default.nix
+++ b/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix
diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix
index 7a2252c6b27..7a2252c6b27 100644
--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix
diff --git a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch b/nixpkgs/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
index 3230924990b..3230924990b 100644
--- a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
+++ b/nixpkgs/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix
index 41c4b25c8b1..41c4b25c8b1 100644
--- a/pkgs/development/tools/literate-programming/nuweb/default.nix
+++ b/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix
diff --git a/pkgs/development/tools/makerpm/default.nix b/nixpkgs/pkgs/development/tools/makerpm/default.nix
index 24e5a6b6e19..24e5a6b6e19 100644
--- a/pkgs/development/tools/makerpm/default.nix
+++ b/nixpkgs/pkgs/development/tools/makerpm/default.nix
diff --git a/pkgs/development/tools/maligned/default.nix b/nixpkgs/pkgs/development/tools/maligned/default.nix
index 3029ee38518..3029ee38518 100644
--- a/pkgs/development/tools/maligned/default.nix
+++ b/nixpkgs/pkgs/development/tools/maligned/default.nix
diff --git a/pkgs/development/tools/maligned/deps.nix b/nixpkgs/pkgs/development/tools/maligned/deps.nix
index afe5e50e47b..afe5e50e47b 100644
--- a/pkgs/development/tools/maligned/deps.nix
+++ b/nixpkgs/pkgs/development/tools/maligned/deps.nix
diff --git a/pkgs/development/tools/manul/default.nix b/nixpkgs/pkgs/development/tools/manul/default.nix
index f921e900e56..f921e900e56 100644
--- a/pkgs/development/tools/manul/default.nix
+++ b/nixpkgs/pkgs/development/tools/manul/default.nix
diff --git a/pkgs/development/tools/manul/deps.nix b/nixpkgs/pkgs/development/tools/manul/deps.nix
index e99a597b078..e99a597b078 100644
--- a/pkgs/development/tools/manul/deps.nix
+++ b/nixpkgs/pkgs/development/tools/manul/deps.nix
diff --git a/pkgs/development/tools/mbed-cli/default.nix b/nixpkgs/pkgs/development/tools/mbed-cli/default.nix
index cd80a5ad9e6..cd80a5ad9e6 100644
--- a/pkgs/development/tools/mbed-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/mbed-cli/default.nix
diff --git a/pkgs/development/tools/mdk/default.nix b/nixpkgs/pkgs/development/tools/mdk/default.nix
index 27f0063e24b..27f0063e24b 100644
--- a/pkgs/development/tools/mdk/default.nix
+++ b/nixpkgs/pkgs/development/tools/mdk/default.nix
diff --git a/pkgs/development/tools/metals/default.nix b/nixpkgs/pkgs/development/tools/metals/default.nix
index 415479edc84..415479edc84 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/nixpkgs/pkgs/development/tools/metals/default.nix
diff --git a/pkgs/development/tools/micronaut/default.nix b/nixpkgs/pkgs/development/tools/micronaut/default.nix
index 7b9223ddec0..7b9223ddec0 100644
--- a/pkgs/development/tools/micronaut/default.nix
+++ b/nixpkgs/pkgs/development/tools/micronaut/default.nix
diff --git a/pkgs/development/tools/minizinc/default.nix b/nixpkgs/pkgs/development/tools/minizinc/default.nix
index 53e2920c68d..53e2920c68d 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/nixpkgs/pkgs/development/tools/minizinc/default.nix
diff --git a/pkgs/development/tools/minizinc/ide.nix b/nixpkgs/pkgs/development/tools/minizinc/ide.nix
index 3b1ac92a96e..3b1ac92a96e 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/nixpkgs/pkgs/development/tools/minizinc/ide.nix
diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix
index 37d49b1f35b..37d49b1f35b 100644
--- a/pkgs/development/tools/misc/abi-compliance-checker/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix
diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix
index ca59bf28b1e..ca59bf28b1e 100644
--- a/pkgs/development/tools/misc/abi-dumper/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix
diff --git a/pkgs/development/tools/misc/act/default.nix b/nixpkgs/pkgs/development/tools/misc/act/default.nix
index bf1cae3edc7..bf1cae3edc7 100644
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/act/default.nix
diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix
index 5eeae0ece5c..5eeae0ece5c 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix
diff --git a/pkgs/development/tools/misc/argbash/default.nix b/nixpkgs/pkgs/development/tools/misc/argbash/default.nix
index 0cc25ddf20b..0cc25ddf20b 100644
--- a/pkgs/development/tools/misc/argbash/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/argbash/default.nix
diff --git a/pkgs/development/tools/misc/astyle/default.nix b/nixpkgs/pkgs/development/tools/misc/astyle/default.nix
index 66e972826cb..66e972826cb 100644
--- a/pkgs/development/tools/misc/astyle/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/astyle/default.nix
diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix
index 8f425a92959..8f425a92959 100644
--- a/pkgs/development/tools/misc/autobuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix
diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix
index 9901e46d578..9901e46d578 100644
--- a/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix
diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix
index 9e777e53cf6..9e777e53cf6 100644
--- a/pkgs/development/tools/misc/autoconf/2.13.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix
diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix
index 98b55e31f60..98b55e31f60 100644
--- a/pkgs/development/tools/misc/autoconf/2.64.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix
index 304b4fddf0d..304b4fddf0d 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/nixpkgs/pkgs/development/tools/misc/autogen/default.nix
index dc719789719..dc719789719 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/autogen/default.nix
diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix
index a5aa44abcde..a5aa44abcde 100644
--- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix
diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix
index f1a48644617..f1a48644617 100644
--- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix
diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix
index 1e432a6e149..1e432a6e149 100644
--- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix
diff --git a/pkgs/development/tools/misc/automake/builder.sh b/nixpkgs/pkgs/development/tools/misc/automake/builder.sh
index e54a2acca67..e54a2acca67 100644
--- a/pkgs/development/tools/misc/automake/builder.sh
+++ b/nixpkgs/pkgs/development/tools/misc/automake/builder.sh
diff --git a/pkgs/development/tools/misc/automake/fix-perl-5.26.patch b/nixpkgs/pkgs/development/tools/misc/automake/fix-perl-5.26.patch
index fb2d08de6d8..fb2d08de6d8 100644
--- a/pkgs/development/tools/misc/automake/fix-perl-5.26.patch
+++ b/nixpkgs/pkgs/development/tools/misc/automake/fix-perl-5.26.patch
diff --git a/pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch b/nixpkgs/pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch
index 2ffa91f24ed..2ffa91f24ed 100644
--- a/pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch
+++ b/nixpkgs/pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch
diff --git a/pkgs/development/tools/misc/automake/help2man-SOURCE_DATE_EPOCH-support.patch b/nixpkgs/pkgs/development/tools/misc/automake/help2man-SOURCE_DATE_EPOCH-support.patch
index 048f75e6334..048f75e6334 100644
--- a/pkgs/development/tools/misc/automake/help2man-SOURCE_DATE_EPOCH-support.patch
+++ b/nixpkgs/pkgs/development/tools/misc/automake/help2man-SOURCE_DATE_EPOCH-support.patch
diff --git a/pkgs/development/tools/misc/automake/setup-hook.sh b/nixpkgs/pkgs/development/tools/misc/automake/setup-hook.sh
index 292632b7cbc..292632b7cbc 100644
--- a/pkgs/development/tools/misc/automake/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/misc/automake/setup-hook.sh
diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/nixpkgs/pkgs/development/tools/misc/automoc4/default.nix
index c2bf7e0a831..c2bf7e0a831 100644
--- a/pkgs/development/tools/misc/automoc4/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/automoc4/default.nix
diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix
index 39f98ae0028..39f98ae0028 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix
diff --git a/pkgs/development/tools/misc/awf/default.nix b/nixpkgs/pkgs/development/tools/misc/awf/default.nix
index 8892142ad77..8892142ad77 100644
--- a/pkgs/development/tools/misc/awf/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/awf/default.nix
diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/nixpkgs/pkgs/development/tools/misc/babeltrace/default.nix
index 19ed711f1f4..19ed711f1f4 100644
--- a/pkgs/development/tools/misc/babeltrace/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/babeltrace/default.nix
diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix
index 72848d04930..72848d04930 100644
--- a/pkgs/development/tools/misc/bashdb/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix
diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix
index c246ddb9d90..c246ddb9d90 100644
--- a/pkgs/development/tools/misc/bin_replace_string/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix
diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
index 5a047b0f070..5a047b0f070 100644
--- a/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
+++ b/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
index ca50d9a57cd..ca50d9a57cd 100644
--- a/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
+++ b/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
index 866d6db8ce2..866d6db8ce2 100644
--- a/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
+++ b/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
diff --git a/pkgs/development/tools/misc/binutils/always-search-rpath.patch b/nixpkgs/pkgs/development/tools/misc/binutils/always-search-rpath.patch
index 2e9956e6b6e..2e9956e6b6e 100644
--- a/pkgs/development/tools/misc/binutils/always-search-rpath.patch
+++ b/nixpkgs/pkgs/development/tools/misc/binutils/always-search-rpath.patch
diff --git a/pkgs/development/tools/misc/binutils/build-components-separately.patch b/nixpkgs/pkgs/development/tools/misc/binutils/build-components-separately.patch
index d3cd0d2131c..d3cd0d2131c 100644
--- a/pkgs/development/tools/misc/binutils/build-components-separately.patch
+++ b/nixpkgs/pkgs/development/tools/misc/binutils/build-components-separately.patch
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix
index 82365d986b8..82365d986b8 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix
diff --git a/pkgs/development/tools/misc/binutils/deterministic.patch b/nixpkgs/pkgs/development/tools/misc/binutils/deterministic.patch
index 736e0aca6ce..736e0aca6ce 100644
--- a/pkgs/development/tools/misc/binutils/deterministic.patch
+++ b/nixpkgs/pkgs/development/tools/misc/binutils/deterministic.patch
diff --git a/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch b/nixpkgs/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch
index abbfa73da05..abbfa73da05 100644
--- a/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch
+++ b/nixpkgs/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch
diff --git a/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch b/nixpkgs/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch
index 0fb05a482d1..0fb05a482d1 100644
--- a/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch
+++ b/nixpkgs/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch
diff --git a/pkgs/development/tools/misc/binutils/no-plugins.patch b/nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch
index 9624b7976b7..9624b7976b7 100644
--- a/pkgs/development/tools/misc/binutils/no-plugins.patch
+++ b/nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch
diff --git a/pkgs/development/tools/misc/binutils/support-ios.patch b/nixpkgs/pkgs/development/tools/misc/binutils/support-ios.patch
index 74e56d130ed..74e56d130ed 100644
--- a/pkgs/development/tools/misc/binutils/support-ios.patch
+++ b/nixpkgs/pkgs/development/tools/misc/binutils/support-ios.patch
diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix
index ddc15f856b5..ddc15f856b5 100644
--- a/pkgs/development/tools/misc/blackmagic/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix
diff --git a/pkgs/development/tools/misc/blackmagic/helper.sh b/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh
index 991d0249e16..991d0249e16 100755
--- a/pkgs/development/tools/misc/blackmagic/helper.sh
+++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh
diff --git a/pkgs/development/tools/misc/bossa/bin2c.c b/nixpkgs/pkgs/development/tools/misc/bossa/bin2c.c
index f0b915de540..f0b915de540 100644
--- a/pkgs/development/tools/misc/bossa/bin2c.c
+++ b/nixpkgs/pkgs/development/tools/misc/bossa/bin2c.c
diff --git a/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch b/nixpkgs/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch
index 4284245f485..4284245f485 100644
--- a/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch
+++ b/nixpkgs/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch
diff --git a/pkgs/development/tools/misc/bossa/default.nix b/nixpkgs/pkgs/development/tools/misc/bossa/default.nix
index 6548e964397..6548e964397 100644
--- a/pkgs/development/tools/misc/bossa/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/bossa/default.nix
diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix
index dd84e3830c4..dd84e3830c4 100644
--- a/pkgs/development/tools/misc/bsdbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix
diff --git a/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff b/nixpkgs/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
index cc42f0745da..cc42f0745da 100644
--- a/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
+++ b/nixpkgs/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix
index 6519f349bfc..6519f349bfc 100644
--- a/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix
index 4eeb61a7edd..4eeb61a7edd 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix
diff --git a/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch b/nixpkgs/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch
index 98a6fbf10bf..98a6fbf10bf 100644
--- a/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch
+++ b/nixpkgs/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch
diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/nixpkgs/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch
index 7b233df6531..7b233df6531 100644
--- a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch
+++ b/nixpkgs/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch
diff --git a/pkgs/development/tools/misc/ccls/default.nix b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix
index 8748cdf52b4..8748cdf52b4 100644
--- a/pkgs/development/tools/misc/ccls/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix
diff --git a/pkgs/development/tools/misc/ccls/wrapper b/nixpkgs/pkgs/development/tools/misc/ccls/wrapper
index 155e6d4f647..155e6d4f647 100644
--- a/pkgs/development/tools/misc/ccls/wrapper
+++ b/nixpkgs/pkgs/development/tools/misc/ccls/wrapper
diff --git a/pkgs/development/tools/misc/cflow/default.nix b/nixpkgs/pkgs/development/tools/misc/cflow/default.nix
index ed4886305e3..ed4886305e3 100644
--- a/pkgs/development/tools/misc/cflow/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cflow/default.nix
diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix
index f823519fb34..f823519fb34 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix
diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix
index 887a0f16ec1..887a0f16ec1 100644
--- a/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix
diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix
index 3cae6aa2ae6..3cae6aa2ae6 100644
--- a/pkgs/development/tools/misc/chrpath/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix
diff --git a/pkgs/development/tools/misc/chruby/default.nix b/nixpkgs/pkgs/development/tools/misc/chruby/default.nix
index 1aac0bd651c..1aac0bd651c 100644
--- a/pkgs/development/tools/misc/chruby/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/chruby/default.nix
diff --git a/pkgs/development/tools/misc/chruby/env.patch b/nixpkgs/pkgs/development/tools/misc/chruby/env.patch
index 6a4ef8b7349..6a4ef8b7349 100644
--- a/pkgs/development/tools/misc/chruby/env.patch
+++ b/nixpkgs/pkgs/development/tools/misc/chruby/env.patch
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix
index a590d4a6106..a590d4a6106 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix
diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix
index c245a32a06d..c245a32a06d 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix
diff --git a/pkgs/development/tools/misc/cl-launch/default.upstream b/nixpkgs/pkgs/development/tools/misc/cl-launch/default.upstream
index ff7ee9446d2..ff7ee9446d2 100644
--- a/pkgs/development/tools/misc/cl-launch/default.upstream
+++ b/nixpkgs/pkgs/development/tools/misc/cl-launch/default.upstream
diff --git a/pkgs/development/tools/misc/cli11/default.nix b/nixpkgs/pkgs/development/tools/misc/cli11/default.nix
index 6261ffc9b01..6261ffc9b01 100644
--- a/pkgs/development/tools/misc/cli11/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cli11/default.nix
diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix
index f2bb771f217..f2bb771f217 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix
index 861a6eff164..861a6eff164 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix
diff --git a/pkgs/development/tools/misc/complexity/default.nix b/nixpkgs/pkgs/development/tools/misc/complexity/default.nix
index a2a39b81055..a2a39b81055 100644
--- a/pkgs/development/tools/misc/complexity/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/complexity/default.nix
diff --git a/pkgs/development/tools/misc/cppi/default.nix b/nixpkgs/pkgs/development/tools/misc/cppi/default.nix
index e4d123dece1..e4d123dece1 100644
--- a/pkgs/development/tools/misc/cppi/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cppi/default.nix
diff --git a/pkgs/development/tools/misc/cproto/cproto_patch b/nixpkgs/pkgs/development/tools/misc/cproto/cproto_patch
index 3743fef977b..3743fef977b 100644
--- a/pkgs/development/tools/misc/cproto/cproto_patch
+++ b/nixpkgs/pkgs/development/tools/misc/cproto/cproto_patch
diff --git a/pkgs/development/tools/misc/cproto/default.nix b/nixpkgs/pkgs/development/tools/misc/cproto/default.nix
index 973caee64e8..973caee64e8 100644
--- a/pkgs/development/tools/misc/cproto/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cproto/default.nix
diff --git a/pkgs/development/tools/misc/cquery/default.nix b/nixpkgs/pkgs/development/tools/misc/cquery/default.nix
index c43509a4f43..c43509a4f43 100644
--- a/pkgs/development/tools/misc/cquery/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cquery/default.nix
diff --git a/pkgs/development/tools/misc/cquery/wrapper b/nixpkgs/pkgs/development/tools/misc/cquery/wrapper
index 8b3e5729042..8b3e5729042 100644
--- a/pkgs/development/tools/misc/cquery/wrapper
+++ b/nixpkgs/pkgs/development/tools/misc/cquery/wrapper
diff --git a/pkgs/development/tools/misc/creduce/default.nix b/nixpkgs/pkgs/development/tools/misc/creduce/default.nix
index 1aa17bac750..1aa17bac750 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/creduce/default.nix
diff --git a/pkgs/development/tools/misc/cscope/default.nix b/nixpkgs/pkgs/development/tools/misc/cscope/default.nix
index 67cd321cfd5..67cd321cfd5 100644
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cscope/default.nix
diff --git a/pkgs/development/tools/misc/csmith/default.nix b/nixpkgs/pkgs/development/tools/misc/csmith/default.nix
index 34cbadb38af..34cbadb38af 100644
--- a/pkgs/development/tools/misc/csmith/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/csmith/default.nix
diff --git a/pkgs/development/tools/misc/ctags/default.nix b/nixpkgs/pkgs/development/tools/misc/ctags/default.nix
index 86136084d84..86136084d84 100644
--- a/pkgs/development/tools/misc/ctags/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ctags/default.nix
diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix
index 08f8049aa8a..08f8049aa8a 100644
--- a/pkgs/development/tools/misc/ctags/wrapped.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix
diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix
index 3a54a17a93a..3a54a17a93a 100644
--- a/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix
index cc256bc23bd..cc256bc23bd 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix
diff --git a/pkgs/development/tools/misc/dbench/default.nix b/nixpkgs/pkgs/development/tools/misc/dbench/default.nix
index 5bccea9ced8..5bccea9ced8 100644
--- a/pkgs/development/tools/misc/dbench/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/dbench/default.nix
diff --git a/pkgs/development/tools/misc/dbench/fix-missing-stdint.patch b/nixpkgs/pkgs/development/tools/misc/dbench/fix-missing-stdint.patch
index 96cb28e9e55..96cb28e9e55 100644
--- a/pkgs/development/tools/misc/dbench/fix-missing-stdint.patch
+++ b/nixpkgs/pkgs/development/tools/misc/dbench/fix-missing-stdint.patch
diff --git a/pkgs/development/tools/misc/ddd/default.nix b/nixpkgs/pkgs/development/tools/misc/ddd/default.nix
index 1ff96918766..1ff96918766 100644
--- a/pkgs/development/tools/misc/ddd/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ddd/default.nix
diff --git a/pkgs/development/tools/misc/ddd/gcc44.patch b/nixpkgs/pkgs/development/tools/misc/ddd/gcc44.patch
index c4e4004b12e..c4e4004b12e 100644
--- a/pkgs/development/tools/misc/ddd/gcc44.patch
+++ b/nixpkgs/pkgs/development/tools/misc/ddd/gcc44.patch
diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
index 693c791875b..693c791875b 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix
index 1dd53f62cec..1dd53f62cec 100644
--- a/pkgs/development/tools/misc/dfu-programmer/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix
diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix
index bf1effbe71a..bf1effbe71a 100644
--- a/pkgs/development/tools/misc/dfu-util/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/nixpkgs/pkgs/development/tools/misc/dialog/default.nix
index b82429cdac5..b82429cdac5 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/dialog/default.nix
diff --git a/pkgs/development/tools/misc/direvent/default.nix b/nixpkgs/pkgs/development/tools/misc/direvent/default.nix
index 0ae1884646d..0ae1884646d 100644
--- a/pkgs/development/tools/misc/direvent/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/direvent/default.nix
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/nixpkgs/pkgs/development/tools/misc/distcc/default.nix
index 9891726c663..9891726c663 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/distcc/default.nix
diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/nixpkgs/pkgs/development/tools/misc/distcc/masq.nix
index f3bccde8160..f3bccde8160 100644
--- a/pkgs/development/tools/misc/distcc/masq.nix
+++ b/nixpkgs/pkgs/development/tools/misc/distcc/masq.nix
diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix
index fe86a22b7f4..fe86a22b7f4 100644
--- a/pkgs/development/tools/misc/doclifter/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix
diff --git a/pkgs/development/tools/misc/drush/default.nix b/nixpkgs/pkgs/development/tools/misc/drush/default.nix
index f9a640d4703..f9a640d4703 100644
--- a/pkgs/development/tools/misc/drush/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/drush/default.nix
diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix
index cbb6a38f67a..cbb6a38f67a 100644
--- a/pkgs/development/tools/misc/editorconfig-checker/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix
diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix
index 2eda1f044ce..2eda1f044ce 100644
--- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix
diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix
index 7c7e5340434..7c7e5340434 100644
--- a/pkgs/development/tools/misc/eggdbus/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix
diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix
index 8628990d531..8628990d531 100644
--- a/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix
diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix
index 288e8bf9699..288e8bf9699 100644
--- a/pkgs/development/tools/misc/elfkickers/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix
diff --git a/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch b/nixpkgs/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch
index 409f1311c31..409f1311c31 100644
--- a/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch
+++ b/nixpkgs/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix
index 06f1e2895c0..06f1e2895c0 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix
diff --git a/pkgs/development/tools/misc/epm/default.nix b/nixpkgs/pkgs/development/tools/misc/epm/default.nix
index b449c0a2d01..b449c0a2d01 100644
--- a/pkgs/development/tools/misc/epm/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/epm/default.nix
diff --git a/pkgs/development/tools/misc/findnewest/default.nix b/nixpkgs/pkgs/development/tools/misc/findnewest/default.nix
index 6dd7e90f8f7..6dd7e90f8f7 100644
--- a/pkgs/development/tools/misc/findnewest/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/findnewest/default.nix
diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix
index b8202f94ce9..b8202f94ce9 100644
--- a/pkgs/development/tools/misc/fsatrace/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix
index a5c32bd3dc1..a5c32bd3dc1 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix
diff --git a/pkgs/development/tools/misc/gdb/darwin-target-match.patch b/nixpkgs/pkgs/development/tools/misc/gdb/darwin-target-match.patch
index 1328d919503..1328d919503 100644
--- a/pkgs/development/tools/misc/gdb/darwin-target-match.patch
+++ b/nixpkgs/pkgs/development/tools/misc/gdb/darwin-target-match.patch
diff --git a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch b/nixpkgs/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
index a7eda2c7e17..a7eda2c7e17 100644
--- a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
+++ b/nixpkgs/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
index e125b7418f6..e125b7418f6 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix
index b021a3e222b..b021a3e222b 100644
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix
diff --git a/pkgs/development/tools/misc/gede/default.nix b/nixpkgs/pkgs/development/tools/misc/gede/default.nix
index 40e64ced4dc..40e64ced4dc 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gede/default.nix
diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix
index a1a02632478..a1a02632478 100644
--- a/pkgs/development/tools/misc/gengetopt/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix
diff --git a/pkgs/development/tools/misc/global/default.nix b/nixpkgs/pkgs/development/tools/misc/global/default.nix
index edcca88c71d..edcca88c71d 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/global/default.nix
diff --git a/pkgs/development/tools/misc/gnum4/darwin-secure-format.patch b/nixpkgs/pkgs/development/tools/misc/gnum4/darwin-secure-format.patch
index b14d8be6ef1..b14d8be6ef1 100644
--- a/pkgs/development/tools/misc/gnum4/darwin-secure-format.patch
+++ b/nixpkgs/pkgs/development/tools/misc/gnum4/darwin-secure-format.patch
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix
index ab2ab0de9cf..ab2ab0de9cf 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix
diff --git a/pkgs/development/tools/misc/gnum4/s_isdir.patch b/nixpkgs/pkgs/development/tools/misc/gnum4/s_isdir.patch
index a009a4ba446..a009a4ba446 100644
--- a/pkgs/development/tools/misc/gnum4/s_isdir.patch
+++ b/nixpkgs/pkgs/development/tools/misc/gnum4/s_isdir.patch
diff --git a/pkgs/development/tools/misc/gob2/default.nix b/nixpkgs/pkgs/development/tools/misc/gob2/default.nix
index b1e107368ba..b1e107368ba 100644
--- a/pkgs/development/tools/misc/gob2/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gob2/default.nix
diff --git a/pkgs/development/tools/misc/gperf/3.0.x.nix b/nixpkgs/pkgs/development/tools/misc/gperf/3.0.x.nix
index 4a8b2e8daab..4a8b2e8daab 100644
--- a/pkgs/development/tools/misc/gperf/3.0.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gperf/3.0.x.nix
diff --git a/pkgs/development/tools/misc/gperf/default.nix b/nixpkgs/pkgs/development/tools/misc/gperf/default.nix
index cd0854d2beb..cd0854d2beb 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gperf/default.nix
diff --git a/pkgs/development/tools/misc/gperf/gperf-ar-fix.patch b/nixpkgs/pkgs/development/tools/misc/gperf/gperf-ar-fix.patch
index 942d726d76e..942d726d76e 100644
--- a/pkgs/development/tools/misc/gperf/gperf-ar-fix.patch
+++ b/nixpkgs/pkgs/development/tools/misc/gperf/gperf-ar-fix.patch
diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix
index 108d6190cb7..108d6190cb7 100644
--- a/pkgs/development/tools/misc/gpshell/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix
diff --git a/pkgs/development/tools/misc/gputils/default.nix b/nixpkgs/pkgs/development/tools/misc/gputils/default.nix
index 2ad496bfb88..2ad496bfb88 100644
--- a/pkgs/development/tools/misc/gputils/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gputils/default.nix
diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix
index efb61c4730f..efb61c4730f 100644
--- a/pkgs/development/tools/misc/gtkdialog/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix
diff --git a/pkgs/development/tools/misc/gtkperf/bench.patch b/nixpkgs/pkgs/development/tools/misc/gtkperf/bench.patch
index 3d00a03e9a5..3d00a03e9a5 100644
--- a/pkgs/development/tools/misc/gtkperf/bench.patch
+++ b/nixpkgs/pkgs/development/tools/misc/gtkperf/bench.patch
diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix
index 5b47ce0bc24..5b47ce0bc24 100644
--- a/pkgs/development/tools/misc/gtkperf/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix
diff --git a/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch b/nixpkgs/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch
index 82f8cf1cb37..82f8cf1cb37 100644
--- a/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch
+++ b/nixpkgs/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/nixpkgs/pkgs/development/tools/misc/help2man/default.nix
index c4cba5ffc69..c4cba5ffc69 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/help2man/default.nix
diff --git a/pkgs/development/tools/misc/hound/default.nix b/nixpkgs/pkgs/development/tools/misc/hound/default.nix
index d3afbbc1bc7..d3afbbc1bc7 100644
--- a/pkgs/development/tools/misc/hound/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/hound/default.nix
diff --git a/pkgs/development/tools/misc/hound/deps.nix b/nixpkgs/pkgs/development/tools/misc/hound/deps.nix
index fe51488c706..fe51488c706 100644
--- a/pkgs/development/tools/misc/hound/deps.nix
+++ b/nixpkgs/pkgs/development/tools/misc/hound/deps.nix
diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix
index 79ef81d09e1..79ef81d09e1 100644
--- a/pkgs/development/tools/misc/hydra-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix
index 3e5c12e183a..3e5c12e183a 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix
diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix
index d7b2cd36492..d7b2cd36492 100644
--- a/pkgs/development/tools/misc/icon-naming-utils/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix
diff --git a/pkgs/development/tools/misc/igprof/default.nix b/nixpkgs/pkgs/development/tools/misc/igprof/default.nix
index 996dda4ca94..996dda4ca94 100644
--- a/pkgs/development/tools/misc/igprof/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/igprof/default.nix
diff --git a/pkgs/development/tools/misc/indent/darwin.patch b/nixpkgs/pkgs/development/tools/misc/indent/darwin.patch
index 5458a0d93bf..5458a0d93bf 100644
--- a/pkgs/development/tools/misc/indent/darwin.patch
+++ b/nixpkgs/pkgs/development/tools/misc/indent/darwin.patch
diff --git a/pkgs/development/tools/misc/indent/default.nix b/nixpkgs/pkgs/development/tools/misc/indent/default.nix
index c4b5fecca74..c4b5fecca74 100644
--- a/pkgs/development/tools/misc/indent/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/indent/default.nix
diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix
index b04de1832ab..b04de1832ab 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index a56ab127235..a56ab127235 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/nixpkgs/pkgs/development/tools/misc/intltool/default.nix
index c837728f72d..c837728f72d 100644
--- a/pkgs/development/tools/misc/intltool/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/intltool/default.nix
diff --git a/pkgs/development/tools/misc/iozone/default.nix b/nixpkgs/pkgs/development/tools/misc/iozone/default.nix
index 1d5da65df7e..1d5da65df7e 100644
--- a/pkgs/development/tools/misc/iozone/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/iozone/default.nix
diff --git a/pkgs/development/tools/misc/itstool/default.nix b/nixpkgs/pkgs/development/tools/misc/itstool/default.nix
index a5c3623b699..a5c3623b699 100644
--- a/pkgs/development/tools/misc/itstool/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/itstool/default.nix
diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix
index af660561ee1..af660561ee1 100644
--- a/pkgs/development/tools/misc/jscoverage/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix
diff --git a/pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch b/nixpkgs/pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch
index b49594964e1..b49594964e1 100644
--- a/pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch
+++ b/nixpkgs/pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch
diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix
index e33259b416f..e33259b416f 100644
--- a/pkgs/development/tools/misc/kconfig-frontends/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix
diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix
index 29bf1333aa0..29bf1333aa0 100644
--- a/pkgs/development/tools/misc/kdbg/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix
diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix
index 9605a035be6..9605a035be6 100644
--- a/pkgs/development/tools/misc/kibana/6.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix
diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix
index a0f2f8f546a..a0f2f8f546a 100644
--- a/pkgs/development/tools/misc/kibana/7.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix
diff --git a/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch b/nixpkgs/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch
index ef4c207764c..ef4c207764c 100644
--- a/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch
+++ b/nixpkgs/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch
diff --git a/pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch b/nixpkgs/pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch
index 12a81566a72..12a81566a72 100644
--- a/pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch
+++ b/nixpkgs/pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/nixpkgs/pkgs/development/tools/misc/libtool/default.nix
index f56a59c4270..f56a59c4270 100644
--- a/pkgs/development/tools/misc/libtool/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/libtool/default.nix
diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix
index 0424b901251..0424b901251 100644
--- a/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix
diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
index c751c275558..c751c275558 100644
--- a/pkgs/development/tools/misc/libwhich/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix
index 5dd6f422713..5dd6f422713 100644
--- a/pkgs/development/tools/misc/linuxkit/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix
diff --git a/pkgs/development/tools/misc/lit/default.nix b/nixpkgs/pkgs/development/tools/misc/lit/default.nix
index c4164b41433..c4164b41433 100644
--- a/pkgs/development/tools/misc/lit/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/lit/default.nix
diff --git a/pkgs/development/tools/misc/loccount/default.nix b/nixpkgs/pkgs/development/tools/misc/loccount/default.nix
index ace34f35059..ace34f35059 100644
--- a/pkgs/development/tools/misc/loccount/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/loccount/default.nix
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/nixpkgs/pkgs/development/tools/misc/lsof/default.nix
index 274577c4a4c..274577c4a4c 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/lsof/default.nix
diff --git a/pkgs/development/tools/misc/lsof/no-build-info.patch b/nixpkgs/pkgs/development/tools/misc/lsof/no-build-info.patch
index cf785e248f2..cf785e248f2 100644
--- a/pkgs/development/tools/misc/lsof/no-build-info.patch
+++ b/nixpkgs/pkgs/development/tools/misc/lsof/no-build-info.patch
diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix
index b8fa02306c4..b8fa02306c4 100644
--- a/pkgs/development/tools/misc/ltrace/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix
index 815d5aac406..815d5aac406 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix
index 4b0be0f0fa4..4b0be0f0fa4 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix
diff --git a/pkgs/development/tools/misc/lttv/default.nix b/nixpkgs/pkgs/development/tools/misc/lttv/default.nix
index 36a89726e81..36a89726e81 100644
--- a/pkgs/development/tools/misc/lttv/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/lttv/default.nix
diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch
index 4ba883f0113..4ba883f0113 100644
--- a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch
+++ b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch
diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix
index fa19b249407..fa19b249407 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix
diff --git a/pkgs/development/tools/misc/luarocks/default.upstream b/nixpkgs/pkgs/development/tools/misc/luarocks/default.upstream
index e69de1fe889..e69de1fe889 100644
--- a/pkgs/development/tools/misc/luarocks/default.upstream
+++ b/nixpkgs/pkgs/development/tools/misc/luarocks/default.upstream
diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
index 57f200fd0fc..57f200fd0fc 100644
--- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
+++ b/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
diff --git a/pkgs/development/tools/misc/luarocks/setup-hook.sh b/nixpkgs/pkgs/development/tools/misc/luarocks/setup-hook.sh
index 587d5413c3e..587d5413c3e 100644
--- a/pkgs/development/tools/misc/luarocks/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/misc/luarocks/setup-hook.sh
diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix
index 518d128890a..518d128890a 100644
--- a/pkgs/development/tools/misc/macdylibbundler/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix
diff --git a/pkgs/development/tools/misc/md2man/default.nix b/nixpkgs/pkgs/development/tools/misc/md2man/default.nix
index 7cbd9246081..7cbd9246081 100644
--- a/pkgs/development/tools/misc/md2man/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/md2man/default.nix
diff --git a/pkgs/development/tools/misc/mdl/Gemfile b/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile
index 15b33c53a65..15b33c53a65 100644
--- a/pkgs/development/tools/misc/mdl/Gemfile
+++ b/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile
diff --git a/pkgs/development/tools/misc/mdl/Gemfile.lock b/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock
index aabcd784d86..aabcd784d86 100644
--- a/pkgs/development/tools/misc/mdl/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock
diff --git a/pkgs/development/tools/misc/mdl/default.nix b/nixpkgs/pkgs/development/tools/misc/mdl/default.nix
index eda2fabd9c6..eda2fabd9c6 100644
--- a/pkgs/development/tools/misc/mdl/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/mdl/default.nix
diff --git a/pkgs/development/tools/misc/mdl/gemset.nix b/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix
index 6d48be1cbcb..6d48be1cbcb 100644
--- a/pkgs/development/tools/misc/mdl/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix
diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix
index 9fbafebb10c..9fbafebb10c 100644
--- a/pkgs/development/tools/misc/micronucleus/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix
diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix
index ae0a4a6dfe2..ae0a4a6dfe2 100644
--- a/pkgs/development/tools/misc/mkcert/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix
diff --git a/pkgs/development/tools/misc/moby/default.nix b/nixpkgs/pkgs/development/tools/misc/moby/default.nix
index a5e4572d18d..a5e4572d18d 100644
--- a/pkgs/development/tools/misc/moby/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/moby/default.nix
diff --git a/pkgs/development/tools/misc/msitools/default.nix b/nixpkgs/pkgs/development/tools/misc/msitools/default.nix
index 5c2b0ad0ee3..5c2b0ad0ee3 100644
--- a/pkgs/development/tools/misc/msitools/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/msitools/default.nix
diff --git a/pkgs/development/tools/misc/ninka/default.nix b/nixpkgs/pkgs/development/tools/misc/ninka/default.nix
index 8af12170798..8af12170798 100644
--- a/pkgs/development/tools/misc/ninka/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ninka/default.nix
diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/nixpkgs/pkgs/development/tools/misc/nixbang/default.nix
index 164e0e80b60..164e0e80b60 100644
--- a/pkgs/development/tools/misc/nixbang/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/nixbang/default.nix
diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix
index 0a6155e649e..0a6155e649e 100644
--- a/pkgs/development/tools/misc/nrfutil/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix
diff --git a/pkgs/development/tools/misc/objconv/default.nix b/nixpkgs/pkgs/development/tools/misc/objconv/default.nix
index dea6256824d..dea6256824d 100644
--- a/pkgs/development/tools/misc/objconv/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/objconv/default.nix
diff --git a/pkgs/development/tools/misc/one_gadget/Gemfile b/nixpkgs/pkgs/development/tools/misc/one_gadget/Gemfile
index bf4378d58ce..bf4378d58ce 100644
--- a/pkgs/development/tools/misc/one_gadget/Gemfile
+++ b/nixpkgs/pkgs/development/tools/misc/one_gadget/Gemfile
diff --git a/pkgs/development/tools/misc/one_gadget/Gemfile.lock b/nixpkgs/pkgs/development/tools/misc/one_gadget/Gemfile.lock
index ea31cc3704f..ea31cc3704f 100644
--- a/pkgs/development/tools/misc/one_gadget/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/misc/one_gadget/Gemfile.lock
diff --git a/pkgs/development/tools/misc/one_gadget/default.nix b/nixpkgs/pkgs/development/tools/misc/one_gadget/default.nix
index 1c2cbe35439..1c2cbe35439 100644
--- a/pkgs/development/tools/misc/one_gadget/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/one_gadget/default.nix
diff --git a/pkgs/development/tools/misc/one_gadget/gemset.nix b/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix
index 26507a26e91..26507a26e91 100644
--- a/pkgs/development/tools/misc/one_gadget/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix
diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix
index 21e825ac0bf..21e825ac0bf 100644
--- a/pkgs/development/tools/misc/opengrok/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/nixpkgs/pkgs/development/tools/misc/openocd/default.nix
index 7e141270904..7e141270904 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/openocd/default.nix
diff --git a/pkgs/development/tools/misc/pahole/default.nix b/nixpkgs/pkgs/development/tools/misc/pahole/default.nix
index 015fc534f6b..015fc534f6b 100644
--- a/pkgs/development/tools/misc/pahole/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/pahole/default.nix
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix
index 77d03f299f4..77d03f299f4 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix
diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/nixpkgs/pkgs/development/tools/misc/patchelf/setup-hook.sh
index 576b9ca2103..576b9ca2103 100644
--- a/pkgs/development/tools/misc/patchelf/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/misc/patchelf/setup-hook.sh
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix
index f5ff1c74bcc..f5ff1c74bcc 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix
diff --git a/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch b/nixpkgs/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch
index c1dd808e600..c1dd808e600 100644
--- a/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch
+++ b/nixpkgs/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch
diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix
index 13855eb4e74..13855eb4e74 100644
--- a/pkgs/development/tools/misc/pkg-config/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix
diff --git a/pkgs/development/tools/misc/pkg-config/requires-private.patch b/nixpkgs/pkgs/development/tools/misc/pkg-config/requires-private.patch
index d40aa980137..d40aa980137 100644
--- a/pkgs/development/tools/misc/pkg-config/requires-private.patch
+++ b/nixpkgs/pkgs/development/tools/misc/pkg-config/requires-private.patch
diff --git a/pkgs/development/tools/misc/pkg-config/setup-hook.sh b/nixpkgs/pkgs/development/tools/misc/pkg-config/setup-hook.sh
index 34a9b9f1173..34a9b9f1173 100644
--- a/pkgs/development/tools/misc/pkg-config/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/misc/pkg-config/setup-hook.sh
diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix
index e4a6416129e..e4a6416129e 100644
--- a/pkgs/development/tools/misc/pkgconf/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix
diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix
index 0b91953a7c7..0b91953a7c7 100644
--- a/pkgs/development/tools/misc/pmccabe/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix
diff --git a/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch b/nixpkgs/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch
index 534d6c1d6ef..534d6c1d6ef 100644
--- a/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch
+++ b/nixpkgs/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch
diff --git a/pkgs/development/tools/misc/prelink/default.nix b/nixpkgs/pkgs/development/tools/misc/prelink/default.nix
index 7bfff632826..7bfff632826 100644
--- a/pkgs/development/tools/misc/prelink/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/prelink/default.nix
diff --git a/pkgs/development/tools/misc/premake/3.nix b/nixpkgs/pkgs/development/tools/misc/premake/3.nix
index a94614af796..a94614af796 100644
--- a/pkgs/development/tools/misc/premake/3.nix
+++ b/nixpkgs/pkgs/development/tools/misc/premake/3.nix
diff --git a/pkgs/development/tools/misc/premake/5.nix b/nixpkgs/pkgs/development/tools/misc/premake/5.nix
index d9d28580210..d9d28580210 100644
--- a/pkgs/development/tools/misc/premake/5.nix
+++ b/nixpkgs/pkgs/development/tools/misc/premake/5.nix
diff --git a/pkgs/development/tools/misc/premake/default.nix b/nixpkgs/pkgs/development/tools/misc/premake/default.nix
index 99bf8cac81f..99bf8cac81f 100644
--- a/pkgs/development/tools/misc/premake/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/premake/default.nix
diff --git a/pkgs/development/tools/misc/premake/setup-hook.sh b/nixpkgs/pkgs/development/tools/misc/premake/setup-hook.sh
index 6e65e9e8c73..6e65e9e8c73 100644
--- a/pkgs/development/tools/misc/premake/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/misc/premake/setup-hook.sh
diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix
index 0c1a3dfc932..0c1a3dfc932 100644
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix
diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix
index 9af294716ff..9af294716ff 100644
--- a/pkgs/development/tools/misc/reviewdog/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix
diff --git a/pkgs/development/tools/misc/rman/default.nix b/nixpkgs/pkgs/development/tools/misc/rman/default.nix
index 8093846780d..8093846780d 100644
--- a/pkgs/development/tools/misc/rman/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/rman/default.nix
diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix
index 1e85e87c537..1e85e87c537 100644
--- a/pkgs/development/tools/misc/rolespec/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix
index ffb537abfba..ffb537abfba 100644
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix
diff --git a/pkgs/development/tools/misc/saleae-logic/preload.c b/nixpkgs/pkgs/development/tools/misc/saleae-logic/preload.c
index b4451e4d99f..b4451e4d99f 100644
--- a/pkgs/development/tools/misc/saleae-logic/preload.c
+++ b/nixpkgs/pkgs/development/tools/misc/saleae-logic/preload.c
diff --git a/pkgs/development/tools/misc/scc/default.nix b/nixpkgs/pkgs/development/tools/misc/scc/default.nix
index 47a91482327..47a91482327 100644
--- a/pkgs/development/tools/misc/scc/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/scc/default.nix
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
index 16a3f9557d2..16a3f9557d2 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix
index 879346a2b79..879346a2b79 100644
--- a/pkgs/development/tools/misc/semver-tool/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix
diff --git a/pkgs/development/tools/misc/sipp/default.nix b/nixpkgs/pkgs/development/tools/misc/sipp/default.nix
index eec1f32b4df..eec1f32b4df 100644
--- a/pkgs/development/tools/misc/sipp/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/sipp/default.nix
diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix
index 4d63e2c6a15..4d63e2c6a15 100644
--- a/pkgs/development/tools/misc/sloccount/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix
diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix
index 66d40ae3127..66d40ae3127 100644
--- a/pkgs/development/tools/misc/sqitch/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix
diff --git a/pkgs/development/tools/misc/srecord/default.nix b/nixpkgs/pkgs/development/tools/misc/srecord/default.nix
index fd810555296..fd810555296 100644
--- a/pkgs/development/tools/misc/srecord/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/srecord/default.nix
diff --git a/pkgs/development/tools/misc/stlink/default.nix b/nixpkgs/pkgs/development/tools/misc/stlink/default.nix
index 98c400d5285..98c400d5285 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/stlink/default.nix
diff --git a/pkgs/development/tools/misc/stm32cubemx/default.nix b/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix
index 53336ab417c..53336ab417c 100644
--- a/pkgs/development/tools/misc/stm32cubemx/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix
diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix
index 553ded815ef..553ded815ef 100644
--- a/pkgs/development/tools/misc/stm32flash/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix
diff --git a/pkgs/development/tools/misc/strace/default.nix b/nixpkgs/pkgs/development/tools/misc/strace/default.nix
index 2ecabb68670..2ecabb68670 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/strace/default.nix
diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix
index 80cfdc8b196..80cfdc8b196 100644
--- a/pkgs/development/tools/misc/swig/2.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix
diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix
index 262afe4f189..262afe4f189 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix
diff --git a/pkgs/development/tools/misc/swig/4.nix b/nixpkgs/pkgs/development/tools/misc/swig/4.nix
index 079c5e7ef3c..079c5e7ef3c 100644
--- a/pkgs/development/tools/misc/swig/4.nix
+++ b/nixpkgs/pkgs/development/tools/misc/swig/4.nix
diff --git a/pkgs/development/tools/misc/swig/default.nix b/nixpkgs/pkgs/development/tools/misc/swig/default.nix
index e74b2898498..e74b2898498 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/swig/default.nix
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix
index dbb8057292b..dbb8057292b 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix
diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix
index 9872c91ac4b..9872c91ac4b 100644
--- a/pkgs/development/tools/misc/tcptrack/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix
diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix
index 2975d64113e..2975d64113e 100644
--- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix
diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix
index 26aa50f7f7a..26aa50f7f7a 100644
--- a/pkgs/development/tools/misc/terracognita/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix
diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix
index 94492395a58..94492395a58 100644
--- a/pkgs/development/tools/misc/terraform-lsp/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix
diff --git a/pkgs/development/tools/misc/tet/default.nix b/nixpkgs/pkgs/development/tools/misc/tet/default.nix
index fb38d096ab4..fb38d096ab4 100644
--- a/pkgs/development/tools/misc/tet/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/tet/default.nix
diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/nixpkgs/pkgs/development/tools/misc/texi2html/default.nix
index 247733b81ba..247733b81ba 100644
--- a/pkgs/development/tools/misc/texi2html/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/texi2html/default.nix
diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix
index 5f4478bd4fb..5f4478bd4fb 100644
--- a/pkgs/development/tools/misc/texinfo/4.13a.nix
+++ b/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix
diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/nixpkgs/pkgs/development/tools/misc/texinfo/5.2.nix
index d395494984d..d395494984d 100644
--- a/pkgs/development/tools/misc/texinfo/5.2.nix
+++ b/nixpkgs/pkgs/development/tools/misc/texinfo/5.2.nix
diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/nixpkgs/pkgs/development/tools/misc/texinfo/6.5.nix
index 34596f30658..34596f30658 100644
--- a/pkgs/development/tools/misc/texinfo/6.5.nix
+++ b/nixpkgs/pkgs/development/tools/misc/texinfo/6.5.nix
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix
index 56ae48b7133..56ae48b7133 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix
diff --git a/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch b/nixpkgs/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch
index f0e4230d7ec..f0e4230d7ec 100644
--- a/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch
+++ b/nixpkgs/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch
diff --git a/pkgs/development/tools/misc/texinfo/perl.patch b/nixpkgs/pkgs/development/tools/misc/texinfo/perl.patch
index e651b37371c..e651b37371c 100644
--- a/pkgs/development/tools/misc/texinfo/perl.patch
+++ b/nixpkgs/pkgs/development/tools/misc/texinfo/perl.patch
diff --git a/pkgs/development/tools/misc/texlab/default.nix b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix
index 1e8b3b2cbab..1e8b3b2cbab 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix
diff --git a/pkgs/development/tools/misc/tie/default.nix b/nixpkgs/pkgs/development/tools/misc/tie/default.nix
index 5e40152df8d..5e40152df8d 100644
--- a/pkgs/development/tools/misc/tie/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/tie/default.nix
diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/nixpkgs/pkgs/development/tools/misc/tinyprog/default.nix
index 10d067e2c61..10d067e2c61 100644
--- a/pkgs/development/tools/misc/tinyprog/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/tinyprog/default.nix
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix
index 96eb98bbbef..96eb98bbbef 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix
diff --git a/pkgs/development/tools/misc/travis/Gemfile b/nixpkgs/pkgs/development/tools/misc/travis/Gemfile
index 3da9975913e..3da9975913e 100644
--- a/pkgs/development/tools/misc/travis/Gemfile
+++ b/nixpkgs/pkgs/development/tools/misc/travis/Gemfile
diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/nixpkgs/pkgs/development/tools/misc/travis/Gemfile.lock
index a29f329ca8a..a29f329ca8a 100644
--- a/pkgs/development/tools/misc/travis/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/misc/travis/Gemfile.lock
diff --git a/pkgs/development/tools/misc/travis/default.nix b/nixpkgs/pkgs/development/tools/misc/travis/default.nix
index 9020766fd86..9020766fd86 100644
--- a/pkgs/development/tools/misc/travis/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/travis/default.nix
diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix
index a12a891b3e7..a12a891b3e7 100644
--- a/pkgs/development/tools/misc/travis/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix
diff --git a/pkgs/development/tools/misc/travis/shell.nix b/nixpkgs/pkgs/development/tools/misc/travis/shell.nix
index ddcf493bb46..ddcf493bb46 100644
--- a/pkgs/development/tools/misc/travis/shell.nix
+++ b/nixpkgs/pkgs/development/tools/misc/travis/shell.nix
diff --git a/pkgs/development/tools/misc/trv/default.nix b/nixpkgs/pkgs/development/tools/misc/trv/default.nix
index 2e056306db4..2e056306db4 100644
--- a/pkgs/development/tools/misc/trv/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/trv/default.nix
diff --git a/pkgs/development/tools/misc/uisp/default.nix b/nixpkgs/pkgs/development/tools/misc/uisp/default.nix
index 1727f772006..1727f772006 100644
--- a/pkgs/development/tools/misc/uisp/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/uisp/default.nix
diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix
index 01ed6603018..01ed6603018 100644
--- a/pkgs/development/tools/misc/uncrustify/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix
diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix
index 8fc26842350..8fc26842350 100644
--- a/pkgs/development/tools/misc/unifdef/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix
index c104adc78cc..c104adc78cc 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix
diff --git a/pkgs/development/tools/misc/universal-ctags/sed-test.patch b/nixpkgs/pkgs/development/tools/misc/universal-ctags/sed-test.patch
index 7c44d699d79..7c44d699d79 100644
--- a/pkgs/development/tools/misc/universal-ctags/sed-test.patch
+++ b/nixpkgs/pkgs/development/tools/misc/universal-ctags/sed-test.patch
diff --git a/pkgs/development/tools/misc/usb-modeswitch/configurable-usb-modeswitch.patch b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/configurable-usb-modeswitch.patch
index d55caab22e6..d55caab22e6 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/configurable-usb-modeswitch.patch
+++ b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/configurable-usb-modeswitch.patch
diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix
index 6280b103ab6..6280b103ab6 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/data.nix
+++ b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix
index 731ac836412..731ac836412 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix
diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix
index 2b6e349b9fd..2b6e349b9fd 100644
--- a/pkgs/development/tools/misc/vtable-dumper/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix
diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile b/nixpkgs/pkgs/development/tools/misc/watson-ruby/Gemfile
index fc739389e84..fc739389e84 100644
--- a/pkgs/development/tools/misc/watson-ruby/Gemfile
+++ b/nixpkgs/pkgs/development/tools/misc/watson-ruby/Gemfile
diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock b/nixpkgs/pkgs/development/tools/misc/watson-ruby/Gemfile.lock
index fa157d794f7..fa157d794f7 100644
--- a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/misc/watson-ruby/Gemfile.lock
diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix
index 4d73e106b2f..4d73e106b2f 100644
--- a/pkgs/development/tools/misc/watson-ruby/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix
diff --git a/pkgs/development/tools/misc/watson-ruby/gemset.nix b/nixpkgs/pkgs/development/tools/misc/watson-ruby/gemset.nix
index a3bb144899c..a3bb144899c 100644
--- a/pkgs/development/tools/misc/watson-ruby/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/misc/watson-ruby/gemset.nix
diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix
index 0c6e4f568ff..0c6e4f568ff 100644
--- a/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix
diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/nixpkgs/pkgs/development/tools/misc/wishbone-tool/default.nix
index 6b2c944f701..6b2c944f701 100644
--- a/pkgs/development/tools/misc/wishbone-tool/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/wishbone-tool/default.nix
diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix
index 68897105f5c..68897105f5c 100644
--- a/pkgs/development/tools/misc/xc3sprog/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix
diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/nixpkgs/pkgs/development/tools/misc/xxdiff/default.nix
index c187ad42c0e..c187ad42c0e 100644
--- a/pkgs/development/tools/misc/xxdiff/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/xxdiff/default.nix
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix
index eac81aa7f17..eac81aa7f17 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/nixpkgs/pkgs/development/tools/misc/yodl/default.nix
index 38a92bc5482..38a92bc5482 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/yodl/default.nix
diff --git a/pkgs/development/tools/mod/default.nix b/nixpkgs/pkgs/development/tools/mod/default.nix
index 60e948d593f..60e948d593f 100644
--- a/pkgs/development/tools/mod/default.nix
+++ b/nixpkgs/pkgs/development/tools/mod/default.nix
diff --git a/pkgs/development/tools/modd/default.nix b/nixpkgs/pkgs/development/tools/modd/default.nix
index 47beb1a2241..47beb1a2241 100644
--- a/pkgs/development/tools/modd/default.nix
+++ b/nixpkgs/pkgs/development/tools/modd/default.nix
diff --git a/pkgs/development/tools/modd/deps.nix b/nixpkgs/pkgs/development/tools/modd/deps.nix
index 42190e65577..42190e65577 100644
--- a/pkgs/development/tools/modd/deps.nix
+++ b/nixpkgs/pkgs/development/tools/modd/deps.nix
diff --git a/pkgs/development/tools/mpfshell/default.nix b/nixpkgs/pkgs/development/tools/mpfshell/default.nix
index b44e52aa2bf..b44e52aa2bf 100644
--- a/pkgs/development/tools/mpfshell/default.nix
+++ b/nixpkgs/pkgs/development/tools/mpfshell/default.nix
diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix
index 1d7784ae1cc..1d7784ae1cc 100644
--- a/pkgs/development/tools/msgpack-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix
diff --git a/pkgs/development/tools/mustache-go/default.nix b/nixpkgs/pkgs/development/tools/mustache-go/default.nix
index 41e74bc120f..41e74bc120f 100644
--- a/pkgs/development/tools/mustache-go/default.nix
+++ b/nixpkgs/pkgs/development/tools/mustache-go/default.nix
diff --git a/pkgs/development/tools/nailgun/default.nix b/nixpkgs/pkgs/development/tools/nailgun/default.nix
index 6e0014b3773..6e0014b3773 100644
--- a/pkgs/development/tools/nailgun/default.nix
+++ b/nixpkgs/pkgs/development/tools/nailgun/default.nix
diff --git a/pkgs/development/tools/nemiver/default.nix b/nixpkgs/pkgs/development/tools/nemiver/default.nix
index 1f3556fc904..1f3556fc904 100644
--- a/pkgs/development/tools/nemiver/default.nix
+++ b/nixpkgs/pkgs/development/tools/nemiver/default.nix
diff --git a/pkgs/development/tools/neoload/default.nix b/nixpkgs/pkgs/development/tools/neoload/default.nix
index b07ab21fdf1..b07ab21fdf1 100644
--- a/pkgs/development/tools/neoload/default.nix
+++ b/nixpkgs/pkgs/development/tools/neoload/default.nix
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix
index e052b724439..e052b724439 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix
diff --git a/pkgs/development/tools/nrpl/default.nix b/nixpkgs/pkgs/development/tools/nrpl/default.nix
index d8dab6b0358..d8dab6b0358 100644
--- a/pkgs/development/tools/nrpl/default.nix
+++ b/nixpkgs/pkgs/development/tools/nrpl/default.nix
diff --git a/pkgs/development/tools/nsis/default.nix b/nixpkgs/pkgs/development/tools/nsis/default.nix
index f8beae4d527..f8beae4d527 100644
--- a/pkgs/development/tools/nsis/default.nix
+++ b/nixpkgs/pkgs/development/tools/nsis/default.nix
diff --git a/pkgs/development/tools/nwjs/default.nix b/nixpkgs/pkgs/development/tools/nwjs/default.nix
index 30f531d7db2..30f531d7db2 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/nixpkgs/pkgs/development/tools/nwjs/default.nix
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix
index 309c44d6d46..309c44d6d46 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix
index de5da5674a2..de5da5674a2 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix
index c3fbb586349..c3fbb586349 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix
diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix
index d6327010e30..d6327010e30 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix
diff --git a/pkgs/development/tools/ocaml/crunch/default.nix b/nixpkgs/pkgs/development/tools/ocaml/crunch/default.nix
index e48707dcb9a..e48707dcb9a 100644
--- a/pkgs/development/tools/ocaml/crunch/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/crunch/default.nix
diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix
index 8e409ac8ca7..8e409ac8ca7 100644
--- a/pkgs/development/tools/ocaml/dune/2.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix
diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix
index ef0f5c4fabd..ef0f5c4fabd 100644
--- a/pkgs/development/tools/ocaml/dune/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix
index 9db5ed10c84..9db5ed10c84 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix
diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/nixpkgs/pkgs/development/tools/ocaml/findlib/install_topfind.patch
index dbdb0edd6cb..dbdb0edd6cb 100644
--- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch
+++ b/nixpkgs/pkgs/development/tools/ocaml/findlib/install_topfind.patch
diff --git a/pkgs/development/tools/ocaml/findlib/ldconf.patch b/nixpkgs/pkgs/development/tools/ocaml/findlib/ldconf.patch
index 7718cb67392..7718cb67392 100644
--- a/pkgs/development/tools/ocaml/findlib/ldconf.patch
+++ b/nixpkgs/pkgs/development/tools/ocaml/findlib/ldconf.patch
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
index 9ca6ca67421..9ca6ca67421 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
index e6fc96038ff..e6fc96038ff 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
+++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
index e9e7f9d279e..e9e7f9d279e 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index 801e4142780..801e4142780 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index e535ba29aeb..e535ba29aeb 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
index 5c8f4377e8d..5c8f4377e8d 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
index 344352467e9..344352467e9 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
index 3adad22bd9c..3adad22bd9c 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
index 2ff9ddbcf9e..2ff9ddbcf9e 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
index c39c985183a..c39c985183a 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix
index ed3d5efc789..ed3d5efc789 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix
index b13d98acd0d..b13d98acd0d 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix
diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix
index e7528d4f772..e7528d4f772 100644
--- a/pkgs/development/tools/ocaml/obelisk/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix
diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix
index 61e8e77f384..61e8e77f384 100644
--- a/pkgs/development/tools/ocaml/obuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix
diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix
index 3ceb9b1622c..3ceb9b1622c 100644
--- a/pkgs/development/tools/ocaml/ocaml-top/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix
diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix
index ec9ff6f4ba9..ec9ff6f4ba9 100644
--- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix
diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix
index b70fcc4fbf9..b70fcc4fbf9 100644
--- a/pkgs/development/tools/ocaml/ocamlformat/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix
diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix
index 5465e9dcb6f..5465e9dcb6f 100644
--- a/pkgs/development/tools/ocaml/ocamlify/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix
index 522cb7c199d..522cb7c199d 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix
diff --git a/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch b/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch
index 4fc887c070d..4fc887c070d 100644
--- a/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch
diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix
index 33b729f938d..33b729f938d 100644
--- a/pkgs/development/tools/ocaml/ocamlscript/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix
index cf5372bdc20..cf5372bdc20 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix
diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-indent/default.nix
index 6f8d80df564..6f8d80df564 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocp-indent/default.nix
diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix
index 9ea01a8dca7..9ea01a8dca7 100644
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix
diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
index 09ab9587ddb..09ab9587ddb 100644
--- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
index 6a3c0c20d85..6a3c0c20d85 100644
--- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix
index da7a5b439ab..da7a5b439ab 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix
diff --git a/pkgs/development/tools/ocaml/omake/warn.patch b/nixpkgs/pkgs/development/tools/ocaml/omake/warn.patch
index 4459e89d7f9..4459e89d7f9 100644
--- a/pkgs/development/tools/ocaml/omake/warn.patch
+++ b/nixpkgs/pkgs/development/tools/ocaml/omake/warn.patch
diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix
index a49749ad716..a49749ad716 100644
--- a/pkgs/development/tools/ocaml/opaline/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix
diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix
index 53482598f13..53482598f13 100644
--- a/pkgs/development/tools/ocaml/opam/1.2.2.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix
index f1028208dae..f1028208dae 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix
diff --git a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch b/nixpkgs/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
index 13aa7a89570..13aa7a89570 100644
--- a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
+++ b/nixpkgs/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl
index 605d0c41cae..605d0c41cae 100755
--- a/pkgs/development/tools/ocaml/opam/opam.nix.pl
+++ b/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix
index f3092a696b1..f3092a696b1 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix
diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix
index e62827c67b4..e62827c67b4 100644
--- a/pkgs/development/tools/ofono-phonesim/default.nix
+++ b/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix
diff --git a/pkgs/development/tools/omniorb/default.nix b/nixpkgs/pkgs/development/tools/omniorb/default.nix
index af295eb242f..af295eb242f 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/nixpkgs/pkgs/development/tools/omniorb/default.nix
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
index 784895845e5..784895845e5 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
index d1ecdd1efd9..d1ecdd1efd9 100644
--- a/pkgs/development/tools/open-policy-agent/default.nix
+++ b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
diff --git a/pkgs/development/tools/open-policy-agent/deps.nix b/nixpkgs/pkgs/development/tools/open-policy-agent/deps.nix
index ba9eed180d5..ba9eed180d5 100644
--- a/pkgs/development/tools/open-policy-agent/deps.nix
+++ b/nixpkgs/pkgs/development/tools/open-policy-agent/deps.nix
diff --git a/pkgs/development/tools/osslsigncode/default.nix b/nixpkgs/pkgs/development/tools/osslsigncode/default.nix
index a867e3850e2..a867e3850e2 100644
--- a/pkgs/development/tools/osslsigncode/default.nix
+++ b/nixpkgs/pkgs/development/tools/osslsigncode/default.nix
diff --git a/pkgs/development/tools/out-of-tree/default.nix b/nixpkgs/pkgs/development/tools/out-of-tree/default.nix
index 725694063a3..725694063a3 100644
--- a/pkgs/development/tools/out-of-tree/default.nix
+++ b/nixpkgs/pkgs/development/tools/out-of-tree/default.nix
diff --git a/pkgs/development/tools/out-of-tree/deps.nix b/nixpkgs/pkgs/development/tools/out-of-tree/deps.nix
index 28c6af4586c..28c6af4586c 100644
--- a/pkgs/development/tools/out-of-tree/deps.nix
+++ b/nixpkgs/pkgs/development/tools/out-of-tree/deps.nix
diff --git a/pkgs/development/tools/overcommit/Gemfile b/nixpkgs/pkgs/development/tools/overcommit/Gemfile
index 39325c7561b..39325c7561b 100644
--- a/pkgs/development/tools/overcommit/Gemfile
+++ b/nixpkgs/pkgs/development/tools/overcommit/Gemfile
diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/nixpkgs/pkgs/development/tools/overcommit/Gemfile.lock
index bf88c1bb148..bf88c1bb148 100644
--- a/pkgs/development/tools/overcommit/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/overcommit/Gemfile.lock
diff --git a/pkgs/development/tools/overcommit/default.nix b/nixpkgs/pkgs/development/tools/overcommit/default.nix
index 84529ca4b6f..84529ca4b6f 100644
--- a/pkgs/development/tools/overcommit/default.nix
+++ b/nixpkgs/pkgs/development/tools/overcommit/default.nix
diff --git a/pkgs/development/tools/overcommit/gemset.nix b/nixpkgs/pkgs/development/tools/overcommit/gemset.nix
index b7d58c0ea70..b7d58c0ea70 100644
--- a/pkgs/development/tools/overcommit/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/overcommit/gemset.nix
diff --git a/pkgs/development/tools/packer/default.nix b/nixpkgs/pkgs/development/tools/packer/default.nix
index bfc330276b0..bfc330276b0 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/nixpkgs/pkgs/development/tools/packer/default.nix
diff --git a/pkgs/development/tools/packet/default.nix b/nixpkgs/pkgs/development/tools/packet/default.nix
index 54100dfdee9..54100dfdee9 100644
--- a/pkgs/development/tools/packet/default.nix
+++ b/nixpkgs/pkgs/development/tools/packet/default.nix
diff --git a/pkgs/development/tools/packet/deps.nix b/nixpkgs/pkgs/development/tools/packet/deps.nix
index 53a9bef7320..53a9bef7320 100644
--- a/pkgs/development/tools/packet/deps.nix
+++ b/nixpkgs/pkgs/development/tools/packet/deps.nix
diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix
index 0d7c806d2f4..0d7c806d2f4 100644
--- a/pkgs/development/tools/parinfer-rust/default.nix
+++ b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix
diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix
index 0f8ead579d0..0f8ead579d0 100644
--- a/pkgs/development/tools/parse-cli-bin/default.nix
+++ b/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix
diff --git a/pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch b/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch
index a71b7718e3b..a71b7718e3b 100644
--- a/pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch
diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix
index a054bc82d45..a054bc82d45 100644
--- a/pkgs/development/tools/parsing/antlr/2.7.7.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix
diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix
index 9e86a29cf93..9e86a29cf93 100644
--- a/pkgs/development/tools/parsing/antlr/3.4.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix
diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix
index 6fa6323d3e8..6fa6323d3e8 100644
--- a/pkgs/development/tools/parsing/antlr/3.5.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix
diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix
index 05f08e5f060..05f08e5f060 100644
--- a/pkgs/development/tools/parsing/antlr/4.7.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix
diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/nixpkgs/pkgs/development/tools/parsing/antlr/builder.sh
index b8e7791b6fc..b8e7791b6fc 100644
--- a/pkgs/development/tools/parsing/antlr/builder.sh
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/builder.sh
diff --git a/pkgs/development/tools/parsing/bison/default.nix b/nixpkgs/pkgs/development/tools/parsing/bison/default.nix
index 0253fa27dc0..0253fa27dc0 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/bison/default.nix
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix
index 79e171d5fd7..79e171d5fd7 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix
diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix
index e555f1d5985..e555f1d5985 100644
--- a/pkgs/development/tools/parsing/flex/2.5.35.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix
diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix
index fc2c7699583..fc2c7699583 100644
--- a/pkgs/development/tools/parsing/flex/2.6.1.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/nixpkgs/pkgs/development/tools/parsing/flex/default.nix
index e46a494de76..e46a494de76 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/flex/default.nix
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix
index 93f1d1ee649..93f1d1ee649 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix
diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix
index e10fe49b1e4..e10fe49b1e4 100644
--- a/pkgs/development/tools/parsing/hammer/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix
diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix
index 6f0eb3735ff..6f0eb3735ff 100644
--- a/pkgs/development/tools/parsing/jikespg/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix
diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/nixpkgs/pkgs/development/tools/parsing/jshon/default.nix
index 359daad2d51..359daad2d51 100644
--- a/pkgs/development/tools/parsing/jshon/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/jshon/default.nix
diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix
index 009ebe8e2ff..009ebe8e2ff 100644
--- a/pkgs/development/tools/parsing/lemon/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix
diff --git a/pkgs/development/tools/parsing/peg/default.nix b/nixpkgs/pkgs/development/tools/parsing/peg/default.nix
index 458ddc007f5..458ddc007f5 100644
--- a/pkgs/development/tools/parsing/peg/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/peg/default.nix
diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix
index 12c9b9d57f8..12c9b9d57f8 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix
diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix
index dddd407d0da..dddd407d0da 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
index 989107a2fbe..989107a2fbe 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
diff --git a/pkgs/development/tools/parsing/tree-sitter/disable-web-ui.patch b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/disable-web-ui.patch
index 6065aa9e7fd..6065aa9e7fd 100644
--- a/pkgs/development/tools/parsing/tree-sitter/disable-web-ui.patch
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/disable-web-ui.patch
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index b6451bce728..b6451bce728 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json
index c367d24d09f..c367d24d09f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
index 1342f7d092b..1342f7d092b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index 8c7d10f2654..8c7d10f2654 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
index 89940ffec8c..89940ffec8c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
index 6a354f5c2e2..6a354f5c2e2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
index 732d2dda40b..732d2dda40b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index a1e29e1504e..a1e29e1504e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
index 2bb0dcd4d8f..2bb0dcd4d8f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index f46695edfa8..f46695edfa8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
index e2f9928c870..e2f9928c870 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index 328b337ed5a..328b337ed5a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index 61507888154..61507888154 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix
index aa87df6bed1..aa87df6bed1 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix
diff --git a/pkgs/development/tools/pax-rs/default.nix b/nixpkgs/pkgs/development/tools/pax-rs/default.nix
index f1bda9997ac..f1bda9997ac 100644
--- a/pkgs/development/tools/pax-rs/default.nix
+++ b/nixpkgs/pkgs/development/tools/pax-rs/default.nix
diff --git a/pkgs/development/tools/pet/default.nix b/nixpkgs/pkgs/development/tools/pet/default.nix
index e7f4fce3c4d..e7f4fce3c4d 100644
--- a/pkgs/development/tools/pet/default.nix
+++ b/nixpkgs/pkgs/development/tools/pet/default.nix
diff --git a/pkgs/development/tools/pew/default.nix b/nixpkgs/pkgs/development/tools/pew/default.nix
index e4b50f31776..e4b50f31776 100644
--- a/pkgs/development/tools/pew/default.nix
+++ b/nixpkgs/pkgs/development/tools/pew/default.nix
diff --git a/pkgs/development/tools/pgformatter/default.nix b/nixpkgs/pkgs/development/tools/pgformatter/default.nix
index 87bf826f5c5..87bf826f5c5 100644
--- a/pkgs/development/tools/pgformatter/default.nix
+++ b/nixpkgs/pkgs/development/tools/pgformatter/default.nix
diff --git a/pkgs/development/tools/pgloader/default.nix b/nixpkgs/pkgs/development/tools/pgloader/default.nix
index 8aaae2b1c43..8aaae2b1c43 100644
--- a/pkgs/development/tools/pgloader/default.nix
+++ b/nixpkgs/pkgs/development/tools/pgloader/default.nix
diff --git a/pkgs/development/tools/phantomjs/default.nix b/nixpkgs/pkgs/development/tools/phantomjs/default.nix
index 2c37d71e75c..2c37d71e75c 100644
--- a/pkgs/development/tools/phantomjs/default.nix
+++ b/nixpkgs/pkgs/development/tools/phantomjs/default.nix
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/nixpkgs/pkgs/development/tools/phantomjs2/default.nix
index b18bd0104ce..b18bd0104ce 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/nixpkgs/pkgs/development/tools/phantomjs2/default.nix
diff --git a/pkgs/development/tools/phantomjs2/system-qtbase.patch b/nixpkgs/pkgs/development/tools/phantomjs2/system-qtbase.patch
index 743372b0f0b..743372b0f0b 100644
--- a/pkgs/development/tools/phantomjs2/system-qtbase.patch
+++ b/nixpkgs/pkgs/development/tools/phantomjs2/system-qtbase.patch
diff --git a/pkgs/development/tools/pigeon/default.nix b/nixpkgs/pkgs/development/tools/pigeon/default.nix
index ae543533059..ae543533059 100644
--- a/pkgs/development/tools/pigeon/default.nix
+++ b/nixpkgs/pkgs/development/tools/pigeon/default.nix
diff --git a/pkgs/development/tools/pigeon/deps.nix b/nixpkgs/pkgs/development/tools/pigeon/deps.nix
index d836dc43c7c..d836dc43c7c 100644
--- a/pkgs/development/tools/pigeon/deps.nix
+++ b/nixpkgs/pkgs/development/tools/pigeon/deps.nix
diff --git a/pkgs/development/tools/pipenv/default.nix b/nixpkgs/pkgs/development/tools/pipenv/default.nix
index 37d5c8a7890..37d5c8a7890 100644
--- a/pkgs/development/tools/pipenv/default.nix
+++ b/nixpkgs/pkgs/development/tools/pipenv/default.nix
diff --git a/pkgs/development/tools/poetry/default.nix b/nixpkgs/pkgs/development/tools/poetry/default.nix
index 1517e53f219..1517e53f219 100644
--- a/pkgs/development/tools/poetry/default.nix
+++ b/nixpkgs/pkgs/development/tools/poetry/default.nix
diff --git a/pkgs/development/tools/poetry/poetry.lock b/nixpkgs/pkgs/development/tools/poetry/poetry.lock
index 182f389363d..182f389363d 100644
--- a/pkgs/development/tools/poetry/poetry.lock
+++ b/nixpkgs/pkgs/development/tools/poetry/poetry.lock
diff --git a/pkgs/development/tools/poetry/pyproject.toml b/nixpkgs/pkgs/development/tools/poetry/pyproject.toml
index 283091dfbc1..283091dfbc1 100644
--- a/pkgs/development/tools/poetry/pyproject.toml
+++ b/nixpkgs/pkgs/development/tools/poetry/pyproject.toml
diff --git a/pkgs/development/tools/poetry/src.json b/nixpkgs/pkgs/development/tools/poetry/src.json
index 6e4b26b152f..6e4b26b152f 100644
--- a/pkgs/development/tools/poetry/src.json
+++ b/nixpkgs/pkgs/development/tools/poetry/src.json
diff --git a/pkgs/development/tools/poetry/update b/nixpkgs/pkgs/development/tools/poetry/update
index 68a60b8c874..68a60b8c874 100755
--- a/pkgs/development/tools/poetry/update
+++ b/nixpkgs/pkgs/development/tools/poetry/update
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/README.md b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/README.md
index ac4861534f5..ac4861534f5 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/README.md
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/README.md
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix
index 95576b987f5..95576b987f5 100755
--- a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
index db85d4ddd3c..db85d4ddd3c 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index 0d1c243d097..0d1c243d097 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json
index 33052efe296..33052efe296 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
index 68d854f2648..68d854f2648 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
index cbfa3dafa75..cbfa3dafa75 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 86260c03703..86260c03703 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
index b2e11205c36..b2e11205c36 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
index ae0c29f3683..ae0c29f3683 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py
index bb61e4a5cb4..bb61e4a5cb4 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
index 784589a4ca4..784589a4ca4 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
diff --git a/pkgs/development/tools/poetry2nix/update b/nixpkgs/pkgs/development/tools/poetry2nix/update
index a5d367590be..a5d367590be 100755
--- a/pkgs/development/tools/poetry2nix/update
+++ b/nixpkgs/pkgs/development/tools/poetry2nix/update
diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix
index 40cd133032f..40cd133032f 100644
--- a/pkgs/development/tools/postiats-utilities/default.nix
+++ b/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix
diff --git a/pkgs/development/tools/pretty-simple/default.nix b/nixpkgs/pkgs/development/tools/pretty-simple/default.nix
index c55e176176d..c55e176176d 100644
--- a/pkgs/development/tools/pretty-simple/default.nix
+++ b/nixpkgs/pkgs/development/tools/pretty-simple/default.nix
diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix
index e856c1f718a..e856c1f718a 100644
--- a/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix
diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix
index 1e52c0e95c0..1e52c0e95c0 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix
diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/nixpkgs/pkgs/development/tools/profiling/oprofile/default.nix
index 0b2b4971764..0b2b4971764 100644
--- a/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/oprofile/default.nix
diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix
index 120fd89377b..120fd89377b 100644
--- a/pkgs/development/tools/profiling/pprof/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix
diff --git a/pkgs/development/tools/profiling/pprof/deps.nix b/nixpkgs/pkgs/development/tools/profiling/pprof/deps.nix
index e76f6367996..e76f6367996 100644
--- a/pkgs/development/tools/profiling/pprof/deps.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/pprof/deps.nix
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix
index b7538a2b388..b7538a2b388 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix
index 3f0b37a7175..3f0b37a7175 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix
diff --git a/pkgs/development/tools/prospector/default.nix b/nixpkgs/pkgs/development/tools/prospector/default.nix
index 38472ce86f0..38472ce86f0 100644
--- a/pkgs/development/tools/prospector/default.nix
+++ b/nixpkgs/pkgs/development/tools/prospector/default.nix
diff --git a/pkgs/development/tools/prospector/setoptconf.nix b/nixpkgs/pkgs/development/tools/prospector/setoptconf.nix
index 62b4e95357d..62b4e95357d 100644
--- a/pkgs/development/tools/prospector/setoptconf.nix
+++ b/nixpkgs/pkgs/development/tools/prospector/setoptconf.nix
diff --git a/pkgs/development/tools/proto-contrib/default.nix b/nixpkgs/pkgs/development/tools/proto-contrib/default.nix
index 83668389556..83668389556 100644
--- a/pkgs/development/tools/proto-contrib/default.nix
+++ b/nixpkgs/pkgs/development/tools/proto-contrib/default.nix
diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix
index 77c1df6f43e..77c1df6f43e 100644
--- a/pkgs/development/tools/protoc-gen-doc/default.nix
+++ b/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix
diff --git a/pkgs/development/tools/prototool/default.nix b/nixpkgs/pkgs/development/tools/prototool/default.nix
index 37b0f1fdf8d..37b0f1fdf8d 100644
--- a/pkgs/development/tools/prototool/default.nix
+++ b/nixpkgs/pkgs/development/tools/prototool/default.nix
diff --git a/pkgs/development/tools/pry/Gemfile b/nixpkgs/pkgs/development/tools/pry/Gemfile
index ec63e2251d5..ec63e2251d5 100644
--- a/pkgs/development/tools/pry/Gemfile
+++ b/nixpkgs/pkgs/development/tools/pry/Gemfile
diff --git a/pkgs/development/tools/pry/Gemfile.lock b/nixpkgs/pkgs/development/tools/pry/Gemfile.lock
index e6025f50ca1..e6025f50ca1 100644
--- a/pkgs/development/tools/pry/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/pry/Gemfile.lock
diff --git a/pkgs/development/tools/pry/default.nix b/nixpkgs/pkgs/development/tools/pry/default.nix
index 974b61617fb..974b61617fb 100644
--- a/pkgs/development/tools/pry/default.nix
+++ b/nixpkgs/pkgs/development/tools/pry/default.nix
diff --git a/pkgs/development/tools/pry/gemset.nix b/nixpkgs/pkgs/development/tools/pry/gemset.nix
index e779c48aebf..e779c48aebf 100644
--- a/pkgs/development/tools/pry/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/pry/gemset.nix
diff --git a/pkgs/development/tools/pup/default.nix b/nixpkgs/pkgs/development/tools/pup/default.nix
index 13e8c233ec3..13e8c233ec3 100644
--- a/pkgs/development/tools/pup/default.nix
+++ b/nixpkgs/pkgs/development/tools/pup/default.nix
diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile b/nixpkgs/pkgs/development/tools/puppet/puppet-lint/Gemfile
index 10504981912..10504981912 100644
--- a/pkgs/development/tools/puppet/puppet-lint/Gemfile
+++ b/nixpkgs/pkgs/development/tools/puppet/puppet-lint/Gemfile
diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock b/nixpkgs/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock
index 8c5d369fb37..8c5d369fb37 100644
--- a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock
diff --git a/pkgs/development/tools/puppet/puppet-lint/default.nix b/nixpkgs/pkgs/development/tools/puppet/puppet-lint/default.nix
index 2940605b1b0..2940605b1b0 100644
--- a/pkgs/development/tools/puppet/puppet-lint/default.nix
+++ b/nixpkgs/pkgs/development/tools/puppet/puppet-lint/default.nix
diff --git a/pkgs/development/tools/puppet/puppet-lint/gemset.nix b/nixpkgs/pkgs/development/tools/puppet/puppet-lint/gemset.nix
index 86d18b0c554..86d18b0c554 100644
--- a/pkgs/development/tools/puppet/puppet-lint/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/puppet/puppet-lint/gemset.nix
diff --git a/pkgs/development/tools/purescript/spago/default.nix b/nixpkgs/pkgs/development/tools/purescript/spago/default.nix
index 2fc5efedb20..2fc5efedb20 100644
--- a/pkgs/development/tools/purescript/spago/default.nix
+++ b/nixpkgs/pkgs/development/tools/purescript/spago/default.nix
diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix
index 1a7ec35748b..1a7ec35748b 100644
--- a/pkgs/development/tools/purescript/spago/spago.nix
+++ b/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix
diff --git a/pkgs/development/tools/purescript/spago/update.sh b/nixpkgs/pkgs/development/tools/purescript/spago/update.sh
index 00c9c6d85f1..00c9c6d85f1 100755
--- a/pkgs/development/tools/purescript/spago/update.sh
+++ b/nixpkgs/pkgs/development/tools/purescript/spago/update.sh
diff --git a/pkgs/development/tools/pydb/default.nix b/nixpkgs/pkgs/development/tools/pydb/default.nix
index e174184835a..e174184835a 100644
--- a/pkgs/development/tools/pydb/default.nix
+++ b/nixpkgs/pkgs/development/tools/pydb/default.nix
diff --git a/pkgs/development/tools/pypi2nix/default.nix b/nixpkgs/pkgs/development/tools/pypi2nix/default.nix
index 980aa0f09ea..980aa0f09ea 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/nixpkgs/pkgs/development/tools/pypi2nix/default.nix
diff --git a/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch b/nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch
index f0e8c3d2c5e..f0e8c3d2c5e 100644
--- a/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch
+++ b/nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch
diff --git a/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch b/nixpkgs/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch
index b0427e94c7c..b0427e94c7c 100644
--- a/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch
+++ b/nixpkgs/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch
diff --git a/pkgs/development/tools/qtcreator/default.nix b/nixpkgs/pkgs/development/tools/qtcreator/default.nix
index 9e9ec6f0d3d..9e9ec6f0d3d 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/nixpkgs/pkgs/development/tools/qtcreator/default.nix
diff --git a/pkgs/development/tools/quicktemplate/default.nix b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix
index d9433f535da..d9433f535da 100644
--- a/pkgs/development/tools/quicktemplate/default.nix
+++ b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix
diff --git a/pkgs/development/tools/quicktemplate/deps.nix b/nixpkgs/pkgs/development/tools/quicktemplate/deps.nix
index 6c042966c23..6c042966c23 100644
--- a/pkgs/development/tools/quicktemplate/deps.nix
+++ b/nixpkgs/pkgs/development/tools/quicktemplate/deps.nix
diff --git a/pkgs/development/tools/quilt/default.nix b/nixpkgs/pkgs/development/tools/quilt/default.nix
index d5059aa6b93..d5059aa6b93 100644
--- a/pkgs/development/tools/quilt/default.nix
+++ b/nixpkgs/pkgs/development/tools/quilt/default.nix
diff --git a/pkgs/development/tools/rdbtools/default.nix b/nixpkgs/pkgs/development/tools/rdbtools/default.nix
index 5a81ae757ea..5a81ae757ea 100644
--- a/pkgs/development/tools/rdbtools/default.nix
+++ b/nixpkgs/pkgs/development/tools/rdbtools/default.nix
diff --git a/pkgs/development/tools/rdocker/default.nix b/nixpkgs/pkgs/development/tools/rdocker/default.nix
index d92003a575e..d92003a575e 100644
--- a/pkgs/development/tools/rdocker/default.nix
+++ b/nixpkgs/pkgs/development/tools/rdocker/default.nix
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix
index 15c61da13c0..15c61da13c0 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix
diff --git a/pkgs/development/tools/redis-dump/.bundle/config b/nixpkgs/pkgs/development/tools/redis-dump/.bundle/config
index b81abe028c3..b81abe028c3 100644
--- a/pkgs/development/tools/redis-dump/.bundle/config
+++ b/nixpkgs/pkgs/development/tools/redis-dump/.bundle/config
diff --git a/pkgs/development/tools/redis-dump/Gemfile b/nixpkgs/pkgs/development/tools/redis-dump/Gemfile
index f78cb0873c0..f78cb0873c0 100644
--- a/pkgs/development/tools/redis-dump/Gemfile
+++ b/nixpkgs/pkgs/development/tools/redis-dump/Gemfile
diff --git a/pkgs/development/tools/redis-dump/Gemfile.lock b/nixpkgs/pkgs/development/tools/redis-dump/Gemfile.lock
index 364bdb778f5..364bdb778f5 100644
--- a/pkgs/development/tools/redis-dump/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/redis-dump/Gemfile.lock
diff --git a/pkgs/development/tools/redis-dump/default.nix b/nixpkgs/pkgs/development/tools/redis-dump/default.nix
index 646d04c266f..646d04c266f 100644
--- a/pkgs/development/tools/redis-dump/default.nix
+++ b/nixpkgs/pkgs/development/tools/redis-dump/default.nix
diff --git a/pkgs/development/tools/redis-dump/gemset.nix b/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix
index 2bfaa1fb952..2bfaa1fb952 100644
--- a/pkgs/development/tools/redis-dump/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix
diff --git a/pkgs/development/tools/reflex/default.nix b/nixpkgs/pkgs/development/tools/reflex/default.nix
index b82c0694fec..b82c0694fec 100644
--- a/pkgs/development/tools/reflex/default.nix
+++ b/nixpkgs/pkgs/development/tools/reflex/default.nix
diff --git a/pkgs/development/tools/reftools/default.nix b/nixpkgs/pkgs/development/tools/reftools/default.nix
index 2d5346f2112..2d5346f2112 100644
--- a/pkgs/development/tools/reftools/default.nix
+++ b/nixpkgs/pkgs/development/tools/reftools/default.nix
diff --git a/pkgs/development/tools/remarshal/default.nix b/nixpkgs/pkgs/development/tools/remarshal/default.nix
index eb70a7b326d..eb70a7b326d 100644
--- a/pkgs/development/tools/remarshal/default.nix
+++ b/nixpkgs/pkgs/development/tools/remarshal/default.nix
diff --git a/pkgs/development/tools/renderizer/default.nix b/nixpkgs/pkgs/development/tools/renderizer/default.nix
index f33cad8da7a..f33cad8da7a 100644
--- a/pkgs/development/tools/renderizer/default.nix
+++ b/nixpkgs/pkgs/development/tools/renderizer/default.nix
diff --git a/pkgs/development/tools/reno/default.nix b/nixpkgs/pkgs/development/tools/reno/default.nix
index 80c64a65083..80c64a65083 100644
--- a/pkgs/development/tools/reno/default.nix
+++ b/nixpkgs/pkgs/development/tools/reno/default.nix
diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix
index a727eebe054..a727eebe054 100644
--- a/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix
diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch b/nixpkgs/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch
index 14bcc973aae..14bcc973aae 100644
--- a/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch
+++ b/nixpkgs/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch
diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch b/nixpkgs/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch
index 744b4b96a56..744b4b96a56 100644
--- a/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch
+++ b/nixpkgs/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch
diff --git a/pkgs/development/tools/richgo/default.nix b/nixpkgs/pkgs/development/tools/richgo/default.nix
index 871ea0dc67a..871ea0dc67a 100644
--- a/pkgs/development/tools/richgo/default.nix
+++ b/nixpkgs/pkgs/development/tools/richgo/default.nix
diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix
index 37a1955ce8b..37a1955ce8b 100644
--- a/pkgs/development/tools/rnix-lsp/default.nix
+++ b/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix
diff --git a/pkgs/development/tools/ronn/Gemfile b/nixpkgs/pkgs/development/tools/ronn/Gemfile
index 64f1df743ab..64f1df743ab 100644
--- a/pkgs/development/tools/ronn/Gemfile
+++ b/nixpkgs/pkgs/development/tools/ronn/Gemfile
diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/nixpkgs/pkgs/development/tools/ronn/Gemfile.lock
index c2b90f63494..c2b90f63494 100644
--- a/pkgs/development/tools/ronn/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/ronn/Gemfile.lock
diff --git a/pkgs/development/tools/ronn/default.nix b/nixpkgs/pkgs/development/tools/ronn/default.nix
index e4762796c18..e4762796c18 100644
--- a/pkgs/development/tools/ronn/default.nix
+++ b/nixpkgs/pkgs/development/tools/ronn/default.nix
diff --git a/pkgs/development/tools/ronn/gemset.nix b/nixpkgs/pkgs/development/tools/ronn/gemset.nix
index ce804e1f9f5..ce804e1f9f5 100644
--- a/pkgs/development/tools/ronn/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/ronn/gemset.nix
diff --git a/pkgs/development/tools/rq/default.nix b/nixpkgs/pkgs/development/tools/rq/default.nix
index 78a8c7470df..78a8c7470df 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/nixpkgs/pkgs/development/tools/rq/default.nix
diff --git a/pkgs/development/tools/rshell/default.nix b/nixpkgs/pkgs/development/tools/rshell/default.nix
index 421aeb9ad91..421aeb9ad91 100644
--- a/pkgs/development/tools/rshell/default.nix
+++ b/nixpkgs/pkgs/development/tools/rshell/default.nix
diff --git a/pkgs/development/tools/rtags/default.nix b/nixpkgs/pkgs/development/tools/rtags/default.nix
index c35018f4cc7..c35018f4cc7 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/nixpkgs/pkgs/development/tools/rtags/default.nix
diff --git a/pkgs/development/tools/rubocop/Gemfile b/nixpkgs/pkgs/development/tools/rubocop/Gemfile
index 18a39cab1c3..18a39cab1c3 100644
--- a/pkgs/development/tools/rubocop/Gemfile
+++ b/nixpkgs/pkgs/development/tools/rubocop/Gemfile
diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock
index 9d166f0fad5..9d166f0fad5 100644
--- a/pkgs/development/tools/rubocop/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock
diff --git a/pkgs/development/tools/rubocop/default.nix b/nixpkgs/pkgs/development/tools/rubocop/default.nix
index 9a6393977d7..9a6393977d7 100644
--- a/pkgs/development/tools/rubocop/default.nix
+++ b/nixpkgs/pkgs/development/tools/rubocop/default.nix
diff --git a/pkgs/development/tools/rubocop/gemset.nix b/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
index d7e1b9328dc..d7e1b9328dc 100644
--- a/pkgs/development/tools/rubocop/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
diff --git a/pkgs/development/tools/rucksack/default.nix b/nixpkgs/pkgs/development/tools/rucksack/default.nix
index 9eb568040ff..9eb568040ff 100644
--- a/pkgs/development/tools/rucksack/default.nix
+++ b/nixpkgs/pkgs/development/tools/rucksack/default.nix
diff --git a/pkgs/development/tools/run/default.nix b/nixpkgs/pkgs/development/tools/run/default.nix
index 18c08a0f3f5..18c08a0f3f5 100644
--- a/pkgs/development/tools/run/default.nix
+++ b/nixpkgs/pkgs/development/tools/run/default.nix
diff --git a/pkgs/development/tools/rund/default.nix b/nixpkgs/pkgs/development/tools/rund/default.nix
index a2433da2997..a2433da2997 100644
--- a/pkgs/development/tools/rund/default.nix
+++ b/nixpkgs/pkgs/development/tools/rund/default.nix
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix
index a87ef4d2228..a87ef4d2228 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix
diff --git a/pkgs/development/tools/rust/bindgen/wrapper.sh b/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh
index 95cd0901cec..95cd0901cec 100755
--- a/pkgs/development/tools/rust/bindgen/wrapper.sh
+++ b/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh
diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix
index 17103bae50a..17103bae50a 100644
--- a/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix
diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix
index 61d2c327d9b..61d2c327d9b 100644
--- a/pkgs/development/tools/rust/cargo-bloat/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix
diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix
index 60d0c3504c8..60d0c3504c8 100644
--- a/pkgs/development/tools/rust/cargo-crev/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix
diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix
index cec7a509dc1..cec7a509dc1 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix
diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix
index c5b45b92c81..c5b45b92c81 100644
--- a/pkgs/development/tools/rust/cargo-fuzz/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix
diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix
index 1edeaeb9b46..1edeaeb9b46 100644
--- a/pkgs/development/tools/rust/cargo-geiger/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix
diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix
index c49739165aa..c49739165aa 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix
diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix
index 79b1214de65..79b1214de65 100644
--- a/pkgs/development/tools/rust/cargo-inspect/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix
diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock
index de4e6f080bc..de4e6f080bc 100644
--- a/pkgs/development/tools/rust/cargo-make/Cargo.lock
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
index d596e51b275..d596e51b275 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix
index 142edbdaf11..142edbdaf11 100644
--- a/pkgs/development/tools/rust/cargo-raze/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix
diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix
index a6068a96dc7..a6068a96dc7 100644
--- a/pkgs/development/tools/rust/cargo-sweep/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix
diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix
index 829f9aa3740..829f9aa3740 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix
diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix
index 55721df22d7..55721df22d7 100644
--- a/pkgs/development/tools/rust/cargo-watch/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix
diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
index 56cb5560f94..56cb5560f94 100644
--- a/pkgs/development/tools/rust/cargo-xbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix
index fb71c2fbdff..fb71c2fbdff 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix
diff --git a/pkgs/development/tools/rust/maturin/default.nix b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix
index 98a2b0b7e0b..98a2b0b7e0b 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix
diff --git a/pkgs/development/tools/rust/racer/default.nix b/nixpkgs/pkgs/development/tools/rust/racer/default.nix
index ded4d2c98e6..ded4d2c98e6 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/racer/default.nix
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/nixpkgs/pkgs/development/tools/rust/racerd/default.nix
index 9457a08556a..9457a08556a 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/racerd/default.nix
diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/nixpkgs/pkgs/development/tools/rust/rainicorn/default.nix
index 8a87bf5cf4d..8a87bf5cf4d 100644
--- a/pkgs/development/tools/rust/rainicorn/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/rainicorn/default.nix
diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
index d46ad59109e..d46ad59109e 100644
--- a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
+++ b/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix
index ffae05f1c74..ffae05f1c74 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix
diff --git a/pkgs/development/tools/rust/svd2rust/cargo-lock.patch b/nixpkgs/pkgs/development/tools/rust/svd2rust/cargo-lock.patch
index 5cd1f685fc1..5cd1f685fc1 100644
--- a/pkgs/development/tools/rust/svd2rust/cargo-lock.patch
+++ b/nixpkgs/pkgs/development/tools/rust/svd2rust/cargo-lock.patch
diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix
index 32cc66f76e9..32cc66f76e9 100644
--- a/pkgs/development/tools/rust/svd2rust/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix
diff --git a/pkgs/development/tools/sass/Gemfile b/nixpkgs/pkgs/development/tools/sass/Gemfile
index e46ea120f72..e46ea120f72 100644
--- a/pkgs/development/tools/sass/Gemfile
+++ b/nixpkgs/pkgs/development/tools/sass/Gemfile
diff --git a/pkgs/development/tools/sass/Gemfile.lock b/nixpkgs/pkgs/development/tools/sass/Gemfile.lock
index 1b99dd3a136..1b99dd3a136 100644
--- a/pkgs/development/tools/sass/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/sass/Gemfile.lock
diff --git a/pkgs/development/tools/sass/default.nix b/nixpkgs/pkgs/development/tools/sass/default.nix
index 6d9a7f1c080..6d9a7f1c080 100644
--- a/pkgs/development/tools/sass/default.nix
+++ b/nixpkgs/pkgs/development/tools/sass/default.nix
diff --git a/pkgs/development/tools/sass/gemset.nix b/nixpkgs/pkgs/development/tools/sass/gemset.nix
index f4fdc899abf..f4fdc899abf 100644
--- a/pkgs/development/tools/sass/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/sass/gemset.nix
diff --git a/pkgs/development/tools/sassc/default.nix b/nixpkgs/pkgs/development/tools/sassc/default.nix
index 07f1581e341..07f1581e341 100644
--- a/pkgs/development/tools/sassc/default.nix
+++ b/nixpkgs/pkgs/development/tools/sassc/default.nix
diff --git a/pkgs/development/tools/sauce-connect/default.nix b/nixpkgs/pkgs/development/tools/sauce-connect/default.nix
index 4cd8b328353..4cd8b328353 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/nixpkgs/pkgs/development/tools/sauce-connect/default.nix
diff --git a/pkgs/development/tools/scalafix/default.nix b/nixpkgs/pkgs/development/tools/scalafix/default.nix
index ab70552c2e8..ab70552c2e8 100644
--- a/pkgs/development/tools/scalafix/default.nix
+++ b/nixpkgs/pkgs/development/tools/scalafix/default.nix
diff --git a/pkgs/development/tools/scalafmt/default.nix b/nixpkgs/pkgs/development/tools/scalafmt/default.nix
index 5c0fc6f28ed..5c0fc6f28ed 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/nixpkgs/pkgs/development/tools/scalafmt/default.nix
diff --git a/pkgs/development/tools/scry/default.nix b/nixpkgs/pkgs/development/tools/scry/default.nix
index 7bd3fa38332..7bd3fa38332 100644
--- a/pkgs/development/tools/scry/default.nix
+++ b/nixpkgs/pkgs/development/tools/scry/default.nix
diff --git a/pkgs/development/tools/scry/fix_for_crystal_0_28_and_above.patch b/nixpkgs/pkgs/development/tools/scry/fix_for_crystal_0_28_and_above.patch
index 909b790b81a..909b790b81a 100644
--- a/pkgs/development/tools/scry/fix_for_crystal_0_28_and_above.patch
+++ b/nixpkgs/pkgs/development/tools/scry/fix_for_crystal_0_28_and_above.patch
diff --git a/pkgs/development/tools/scry/shards.nix b/nixpkgs/pkgs/development/tools/scry/shards.nix
index 31660ef7cd2..31660ef7cd2 100644
--- a/pkgs/development/tools/scry/shards.nix
+++ b/nixpkgs/pkgs/development/tools/scry/shards.nix
diff --git a/pkgs/development/tools/scss-lint/Gemfile b/nixpkgs/pkgs/development/tools/scss-lint/Gemfile
index 05eac2332f5..05eac2332f5 100644
--- a/pkgs/development/tools/scss-lint/Gemfile
+++ b/nixpkgs/pkgs/development/tools/scss-lint/Gemfile
diff --git a/pkgs/development/tools/scss-lint/Gemfile.lock b/nixpkgs/pkgs/development/tools/scss-lint/Gemfile.lock
index 546dfabe4d7..546dfabe4d7 100644
--- a/pkgs/development/tools/scss-lint/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/scss-lint/Gemfile.lock
diff --git a/pkgs/development/tools/scss-lint/default.nix b/nixpkgs/pkgs/development/tools/scss-lint/default.nix
index 8d17969b55e..8d17969b55e 100644
--- a/pkgs/development/tools/scss-lint/default.nix
+++ b/nixpkgs/pkgs/development/tools/scss-lint/default.nix
diff --git a/pkgs/development/tools/scss-lint/gemset.nix b/nixpkgs/pkgs/development/tools/scss-lint/gemset.nix
index 46747f04939..46747f04939 100644
--- a/pkgs/development/tools/scss-lint/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/scss-lint/gemset.nix
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix
index aed384ba61f..aed384ba61f 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix
diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix
index 3f4b8a22d64..3f4b8a22d64 100644
--- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix
+++ b/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix
diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix
index 27e87d212e6..27e87d212e6 100644
--- a/pkgs/development/tools/selenium/selendroid/default.nix
+++ b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix
diff --git a/pkgs/development/tools/selenium/server/default.nix b/nixpkgs/pkgs/development/tools/selenium/server/default.nix
index d3a8efaadb6..d3a8efaadb6 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/nixpkgs/pkgs/development/tools/selenium/server/default.nix
diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/nixpkgs/pkgs/development/tools/setupcfg2nix/default.nix
index 5d1f015e805..5d1f015e805 100644
--- a/pkgs/development/tools/setupcfg2nix/default.nix
+++ b/nixpkgs/pkgs/development/tools/setupcfg2nix/default.nix
diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/nixpkgs/pkgs/development/tools/setupcfg2nix/info.nix
index b0d5873ed63..b0d5873ed63 100644
--- a/pkgs/development/tools/setupcfg2nix/info.nix
+++ b/nixpkgs/pkgs/development/tools/setupcfg2nix/info.nix
diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/nixpkgs/pkgs/development/tools/sigrok-cli/default.nix
index f5b1399df09..f5b1399df09 100644
--- a/pkgs/development/tools/sigrok-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/sigrok-cli/default.nix
diff --git a/pkgs/development/tools/simavr/default.nix b/nixpkgs/pkgs/development/tools/simavr/default.nix
index a455f9e5fc7..a455f9e5fc7 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/nixpkgs/pkgs/development/tools/simavr/default.nix
diff --git a/pkgs/development/tools/skaffold/default.nix b/nixpkgs/pkgs/development/tools/skaffold/default.nix
index d485ac19996..d485ac19996 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/nixpkgs/pkgs/development/tools/skaffold/default.nix
diff --git a/pkgs/development/tools/skopeo/default.nix b/nixpkgs/pkgs/development/tools/skopeo/default.nix
index e36f34bb10c..e36f34bb10c 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/nixpkgs/pkgs/development/tools/skopeo/default.nix
diff --git a/pkgs/development/tools/slimerjs/default.nix b/nixpkgs/pkgs/development/tools/slimerjs/default.nix
index 49eea7213bd..49eea7213bd 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/nixpkgs/pkgs/development/tools/slimerjs/default.nix
diff --git a/pkgs/development/tools/slimerjs/default.upstream b/nixpkgs/pkgs/development/tools/slimerjs/default.upstream
index f2d6b89e51b..f2d6b89e51b 100644
--- a/pkgs/development/tools/slimerjs/default.upstream
+++ b/nixpkgs/pkgs/development/tools/slimerjs/default.upstream
diff --git a/pkgs/development/tools/slimerjs/default.upstream.git b/nixpkgs/pkgs/development/tools/slimerjs/default.upstream.git
index 3066d5de829..3066d5de829 100644
--- a/pkgs/development/tools/slimerjs/default.upstream.git
+++ b/nixpkgs/pkgs/development/tools/slimerjs/default.upstream.git
diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix
index e0a078415eb..e0a078415eb 100644
--- a/pkgs/development/tools/solarus-quest-editor/default.nix
+++ b/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix
diff --git a/pkgs/development/tools/sourcetrail/default.nix b/nixpkgs/pkgs/development/tools/sourcetrail/default.nix
index 3d068b06f40..3d068b06f40 100644
--- a/pkgs/development/tools/sourcetrail/default.nix
+++ b/nixpkgs/pkgs/development/tools/sourcetrail/default.nix
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix
index f6702229374..f6702229374 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix
diff --git a/pkgs/development/tools/spring-boot/default.nix b/nixpkgs/pkgs/development/tools/spring-boot/default.nix
index 9e0e2b5dee4..9e0e2b5dee4 100644
--- a/pkgs/development/tools/spring-boot/default.nix
+++ b/nixpkgs/pkgs/development/tools/spring-boot/default.nix
diff --git a/pkgs/development/tools/sqlint/Gemfile b/nixpkgs/pkgs/development/tools/sqlint/Gemfile
index 7f045baeaa0..7f045baeaa0 100644
--- a/pkgs/development/tools/sqlint/Gemfile
+++ b/nixpkgs/pkgs/development/tools/sqlint/Gemfile
diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock
index 6fc638615fb..6fc638615fb 100644
--- a/pkgs/development/tools/sqlint/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock
diff --git a/pkgs/development/tools/sqlint/default.nix b/nixpkgs/pkgs/development/tools/sqlint/default.nix
index d7ff9199460..d7ff9199460 100644
--- a/pkgs/development/tools/sqlint/default.nix
+++ b/nixpkgs/pkgs/development/tools/sqlint/default.nix
diff --git a/pkgs/development/tools/sqlint/gemset.nix b/nixpkgs/pkgs/development/tools/sqlint/gemset.nix
index b10a56c4c92..b10a56c4c92 100644
--- a/pkgs/development/tools/sqlint/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/sqlint/gemset.nix
diff --git a/pkgs/development/tools/sqsh/default.nix b/nixpkgs/pkgs/development/tools/sqsh/default.nix
index 52c33f3e444..52c33f3e444 100644
--- a/pkgs/development/tools/sqsh/default.nix
+++ b/nixpkgs/pkgs/development/tools/sqsh/default.nix
diff --git a/pkgs/development/tools/sslmate/default.nix b/nixpkgs/pkgs/development/tools/sslmate/default.nix
index 9fbdc2e2e87..9fbdc2e2e87 100644
--- a/pkgs/development/tools/sslmate/default.nix
+++ b/nixpkgs/pkgs/development/tools/sslmate/default.nix
diff --git a/pkgs/development/tools/stagit/default.nix b/nixpkgs/pkgs/development/tools/stagit/default.nix
index 8f4ee7ce6e5..8f4ee7ce6e5 100644
--- a/pkgs/development/tools/stagit/default.nix
+++ b/nixpkgs/pkgs/development/tools/stagit/default.nix
diff --git a/pkgs/development/tools/statik/default.nix b/nixpkgs/pkgs/development/tools/statik/default.nix
index e26431b2687..e26431b2687 100644
--- a/pkgs/development/tools/statik/default.nix
+++ b/nixpkgs/pkgs/development/tools/statik/default.nix
diff --git a/pkgs/development/tools/statik/deps.nix b/nixpkgs/pkgs/development/tools/statik/deps.nix
index 0429d8876b2..0429d8876b2 100644
--- a/pkgs/development/tools/statik/deps.nix
+++ b/nixpkgs/pkgs/development/tools/statik/deps.nix
diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix
index b3026cdf84d..b3026cdf84d 100644
--- a/pkgs/development/tools/sunxi-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix
diff --git a/pkgs/development/tools/swiftformat/default.nix b/nixpkgs/pkgs/development/tools/swiftformat/default.nix
index e87728b1a30..e87728b1a30 100644
--- a/pkgs/development/tools/swiftformat/default.nix
+++ b/nixpkgs/pkgs/development/tools/swiftformat/default.nix
diff --git a/pkgs/development/tools/textql/default.nix b/nixpkgs/pkgs/development/tools/textql/default.nix
index cc865e2bd52..cc865e2bd52 100644
--- a/pkgs/development/tools/textql/default.nix
+++ b/nixpkgs/pkgs/development/tools/textql/default.nix
diff --git a/pkgs/development/tools/textql/deps.nix b/nixpkgs/pkgs/development/tools/textql/deps.nix
index e166e73a61f..e166e73a61f 100644
--- a/pkgs/development/tools/textql/deps.nix
+++ b/nixpkgs/pkgs/development/tools/textql/deps.nix
diff --git a/pkgs/development/tools/thrust/default.nix b/nixpkgs/pkgs/development/tools/thrust/default.nix
index 50c34dc39ed..50c34dc39ed 100644
--- a/pkgs/development/tools/thrust/default.nix
+++ b/nixpkgs/pkgs/development/tools/thrust/default.nix
diff --git a/pkgs/development/tools/toluapp/default.nix b/nixpkgs/pkgs/development/tools/toluapp/default.nix
index aab1c49a537..aab1c49a537 100644
--- a/pkgs/development/tools/toluapp/default.nix
+++ b/nixpkgs/pkgs/development/tools/toluapp/default.nix
diff --git a/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch b/nixpkgs/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch
index 6743b25cb8a..6743b25cb8a 100644
--- a/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch
+++ b/nixpkgs/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch
diff --git a/pkgs/development/tools/toluapp/headers.patch b/nixpkgs/pkgs/development/tools/toluapp/headers.patch
index 59a47bb989a..59a47bb989a 100644
--- a/pkgs/development/tools/toluapp/headers.patch
+++ b/nixpkgs/pkgs/development/tools/toluapp/headers.patch
diff --git a/pkgs/development/tools/tora/default.nix b/nixpkgs/pkgs/development/tools/tora/default.nix
index 213c926521f..213c926521f 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/nixpkgs/pkgs/development/tools/tora/default.nix
diff --git a/pkgs/development/tools/toxiproxy/default.nix b/nixpkgs/pkgs/development/tools/toxiproxy/default.nix
index a5c13e2266e..a5c13e2266e 100644
--- a/pkgs/development/tools/toxiproxy/default.nix
+++ b/nixpkgs/pkgs/development/tools/toxiproxy/default.nix
diff --git a/pkgs/development/tools/tradcpp/aarch64.patch b/nixpkgs/pkgs/development/tools/tradcpp/aarch64.patch
index ef7ad9828ac..ef7ad9828ac 100644
--- a/pkgs/development/tools/tradcpp/aarch64.patch
+++ b/nixpkgs/pkgs/development/tools/tradcpp/aarch64.patch
diff --git a/pkgs/development/tools/tradcpp/default.nix b/nixpkgs/pkgs/development/tools/tradcpp/default.nix
index 7f395174bb4..7f395174bb4 100644
--- a/pkgs/development/tools/tradcpp/default.nix
+++ b/nixpkgs/pkgs/development/tools/tradcpp/default.nix
diff --git a/pkgs/development/tools/tradcpp/tradcpp-configure.patch b/nixpkgs/pkgs/development/tools/tradcpp/tradcpp-configure.patch
index 39cc499e218..39cc499e218 100644
--- a/pkgs/development/tools/tradcpp/tradcpp-configure.patch
+++ b/nixpkgs/pkgs/development/tools/tradcpp/tradcpp-configure.patch
diff --git a/pkgs/development/tools/trellis/default.nix b/nixpkgs/pkgs/development/tools/trellis/default.nix
index 007f97753cd..007f97753cd 100644
--- a/pkgs/development/tools/trellis/default.nix
+++ b/nixpkgs/pkgs/development/tools/trellis/default.nix
diff --git a/pkgs/development/tools/tychus/default.nix b/nixpkgs/pkgs/development/tools/tychus/default.nix
index 5908ceb0f80..5908ceb0f80 100644
--- a/pkgs/development/tools/tychus/default.nix
+++ b/nixpkgs/pkgs/development/tools/tychus/default.nix
diff --git a/pkgs/development/tools/tychus/deps.nix b/nixpkgs/pkgs/development/tools/tychus/deps.nix
index 194aa96ae3c..194aa96ae3c 100644
--- a/pkgs/development/tools/tychus/deps.nix
+++ b/nixpkgs/pkgs/development/tools/tychus/deps.nix
diff --git a/pkgs/development/tools/udis86/default.nix b/nixpkgs/pkgs/development/tools/udis86/default.nix
index 6996d5bf13f..6996d5bf13f 100644
--- a/pkgs/development/tools/udis86/default.nix
+++ b/nixpkgs/pkgs/development/tools/udis86/default.nix
diff --git a/pkgs/development/tools/uftrace/default.nix b/nixpkgs/pkgs/development/tools/uftrace/default.nix
index 796d3509c1c..796d3509c1c 100644
--- a/pkgs/development/tools/uftrace/default.nix
+++ b/nixpkgs/pkgs/development/tools/uftrace/default.nix
diff --git a/pkgs/development/tools/unconvert/default.nix b/nixpkgs/pkgs/development/tools/unconvert/default.nix
index a6c087d7be7..a6c087d7be7 100644
--- a/pkgs/development/tools/unconvert/default.nix
+++ b/nixpkgs/pkgs/development/tools/unconvert/default.nix
diff --git a/pkgs/development/tools/unconvert/deps.nix b/nixpkgs/pkgs/development/tools/unconvert/deps.nix
index 333ec7ca3b1..333ec7ca3b1 100644
--- a/pkgs/development/tools/unconvert/deps.nix
+++ b/nixpkgs/pkgs/development/tools/unconvert/deps.nix
diff --git a/pkgs/development/tools/unity3d/default.nix b/nixpkgs/pkgs/development/tools/unity3d/default.nix
index 895cedd7010..895cedd7010 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/nixpkgs/pkgs/development/tools/unity3d/default.nix
diff --git a/pkgs/development/tools/unity3d/unity-nosuid.c b/nixpkgs/pkgs/development/tools/unity3d/unity-nosuid.c
index 26a923ab039..26a923ab039 100644
--- a/pkgs/development/tools/unity3d/unity-nosuid.c
+++ b/nixpkgs/pkgs/development/tools/unity3d/unity-nosuid.c
diff --git a/pkgs/development/tools/unityhub/default.nix b/nixpkgs/pkgs/development/tools/unityhub/default.nix
index f52d790c106..f52d790c106 100644
--- a/pkgs/development/tools/unityhub/default.nix
+++ b/nixpkgs/pkgs/development/tools/unityhub/default.nix
diff --git a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch b/nixpkgs/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch
index f87ff5135b3..f87ff5135b3 100644
--- a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch
+++ b/nixpkgs/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch
diff --git a/pkgs/development/tools/vagrant/default.nix b/nixpkgs/pkgs/development/tools/vagrant/default.nix
index ea3382f3e70..ea3382f3e70 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/nixpkgs/pkgs/development/tools/vagrant/default.nix
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/nixpkgs/pkgs/development/tools/vagrant/gemset.nix
index f9aebbe6996..f9aebbe6996 100644
--- a/pkgs/development/tools/vagrant/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/vagrant/gemset.nix
diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix
index 2631833dc00..2631833dc00 100644
--- a/pkgs/development/tools/vagrant/gemset_libvirt.nix
+++ b/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix
diff --git a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch b/nixpkgs/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch
index 7b4ce471c94..7b4ce471c94 100644
--- a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch
+++ b/nixpkgs/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch
diff --git a/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch
index c386acf4a1c..c386acf4a1c 100644
--- a/pkgs/development/tools/vagrant/use-system-bundler-version.patch
+++ b/nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch
diff --git a/pkgs/development/tools/vagrant/vagrant-libvirt.json.in b/nixpkgs/pkgs/development/tools/vagrant/vagrant-libvirt.json.in
index 22060e1c2db..22060e1c2db 100644
--- a/pkgs/development/tools/vagrant/vagrant-libvirt.json.in
+++ b/nixpkgs/pkgs/development/tools/vagrant/vagrant-libvirt.json.in
diff --git a/pkgs/development/tools/vala-lint/default.nix b/nixpkgs/pkgs/development/tools/vala-lint/default.nix
index 92fb6ebcc68..92fb6ebcc68 100644
--- a/pkgs/development/tools/vala-lint/default.nix
+++ b/nixpkgs/pkgs/development/tools/vala-lint/default.nix
diff --git a/pkgs/development/tools/vcstool/default.nix b/nixpkgs/pkgs/development/tools/vcstool/default.nix
index f9a84937af3..f9a84937af3 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/nixpkgs/pkgs/development/tools/vcstool/default.nix
diff --git a/pkgs/development/tools/vgo2nix/default.nix b/nixpkgs/pkgs/development/tools/vgo2nix/default.nix
index df0c360f75c..df0c360f75c 100644
--- a/pkgs/development/tools/vgo2nix/default.nix
+++ b/nixpkgs/pkgs/development/tools/vgo2nix/default.nix
diff --git a/pkgs/development/tools/vgo2nix/deps.nix b/nixpkgs/pkgs/development/tools/vgo2nix/deps.nix
index 4f8506794d3..4f8506794d3 100644
--- a/pkgs/development/tools/vgo2nix/deps.nix
+++ b/nixpkgs/pkgs/development/tools/vgo2nix/deps.nix
diff --git a/pkgs/development/tools/vim-vint/default.nix b/nixpkgs/pkgs/development/tools/vim-vint/default.nix
index 382871ff6af..382871ff6af 100644
--- a/pkgs/development/tools/vim-vint/default.nix
+++ b/nixpkgs/pkgs/development/tools/vim-vint/default.nix
diff --git a/pkgs/development/tools/vndr/default.nix b/nixpkgs/pkgs/development/tools/vndr/default.nix
index 197f48dbbfb..197f48dbbfb 100644
--- a/pkgs/development/tools/vndr/default.nix
+++ b/nixpkgs/pkgs/development/tools/vndr/default.nix
diff --git a/pkgs/development/tools/vogl/default.nix b/nixpkgs/pkgs/development/tools/vogl/default.nix
index 266024d323d..266024d323d 100644
--- a/pkgs/development/tools/vogl/default.nix
+++ b/nixpkgs/pkgs/development/tools/vogl/default.nix
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix
index 36d018682df..36d018682df 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix
diff --git a/pkgs/development/tools/vultr/default.nix b/nixpkgs/pkgs/development/tools/vultr/default.nix
index 23fd684b412..23fd684b412 100644
--- a/pkgs/development/tools/vultr/default.nix
+++ b/nixpkgs/pkgs/development/tools/vultr/default.nix
diff --git a/pkgs/development/tools/wabt/default.nix b/nixpkgs/pkgs/development/tools/wabt/default.nix
index b3be6c4552d..b3be6c4552d 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/nixpkgs/pkgs/development/tools/wabt/default.nix
diff --git a/pkgs/development/tools/wabt/version.patch b/nixpkgs/pkgs/development/tools/wabt/version.patch
index a49cd0bc155..a49cd0bc155 100644
--- a/pkgs/development/tools/wabt/version.patch
+++ b/nixpkgs/pkgs/development/tools/wabt/version.patch
diff --git a/pkgs/development/tools/wally-cli/default.nix b/nixpkgs/pkgs/development/tools/wally-cli/default.nix
index b7333e45644..b7333e45644 100644
--- a/pkgs/development/tools/wally-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/wally-cli/default.nix
diff --git a/pkgs/development/tools/wally-cli/deps.nix b/nixpkgs/pkgs/development/tools/wally-cli/deps.nix
index 8edac40c0d5..8edac40c0d5 100644
--- a/pkgs/development/tools/wally-cli/deps.nix
+++ b/nixpkgs/pkgs/development/tools/wally-cli/deps.nix
diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch
index cd06dc30fbe..cd06dc30fbe 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch
+++ b/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch
diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix
index e949da2cf7e..e949da2cf7e 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix
diff --git a/pkgs/development/tools/wasm-pack/default.nix b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix
index 3f721eaee2a..3f721eaee2a 100644
--- a/pkgs/development/tools/wasm-pack/default.nix
+++ b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix
diff --git a/pkgs/development/tools/watchman/default.nix b/nixpkgs/pkgs/development/tools/watchman/default.nix
index 3a58e1088ea..3a58e1088ea 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/nixpkgs/pkgs/development/tools/watchman/default.nix
diff --git a/pkgs/development/tools/wiggle/default.nix b/nixpkgs/pkgs/development/tools/wiggle/default.nix
index f1edd52eca2..f1edd52eca2 100644
--- a/pkgs/development/tools/wiggle/default.nix
+++ b/nixpkgs/pkgs/development/tools/wiggle/default.nix
diff --git a/pkgs/development/tools/wiiload/default.nix b/nixpkgs/pkgs/development/tools/wiiload/default.nix
index 95f54050184..95f54050184 100644
--- a/pkgs/development/tools/wiiload/default.nix
+++ b/nixpkgs/pkgs/development/tools/wiiload/default.nix
diff --git a/pkgs/development/tools/winpdb/default.nix b/nixpkgs/pkgs/development/tools/winpdb/default.nix
index e0c897499d2..e0c897499d2 100644
--- a/pkgs/development/tools/winpdb/default.nix
+++ b/nixpkgs/pkgs/development/tools/winpdb/default.nix
diff --git a/pkgs/development/tools/wllvm/default.nix b/nixpkgs/pkgs/development/tools/wllvm/default.nix
index 18d7be93258..18d7be93258 100644
--- a/pkgs/development/tools/wllvm/default.nix
+++ b/nixpkgs/pkgs/development/tools/wllvm/default.nix
diff --git a/pkgs/development/tools/wp-cli/default.nix b/nixpkgs/pkgs/development/tools/wp-cli/default.nix
index 14e55f99e0b..14e55f99e0b 100644
--- a/pkgs/development/tools/wp-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/wp-cli/default.nix
diff --git a/pkgs/development/tools/ws/default.nix b/nixpkgs/pkgs/development/tools/ws/default.nix
index da1b493b0d2..da1b493b0d2 100644
--- a/pkgs/development/tools/ws/default.nix
+++ b/nixpkgs/pkgs/development/tools/ws/default.nix
diff --git a/pkgs/development/tools/ws/deps.nix b/nixpkgs/pkgs/development/tools/ws/deps.nix
index 82988437145..82988437145 100644
--- a/pkgs/development/tools/ws/deps.nix
+++ b/nixpkgs/pkgs/development/tools/ws/deps.nix
diff --git a/pkgs/development/tools/xcbuild/default.nix b/nixpkgs/pkgs/development/tools/xcbuild/default.nix
index 8090aca5ff3..8090aca5ff3 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/xcbuild/default.nix
diff --git a/pkgs/development/tools/xcbuild/platforms.nix b/nixpkgs/pkgs/development/tools/xcbuild/platforms.nix
index e20dc878b53..e20dc878b53 100644
--- a/pkgs/development/tools/xcbuild/platforms.nix
+++ b/nixpkgs/pkgs/development/tools/xcbuild/platforms.nix
diff --git a/pkgs/development/tools/xcbuild/sdks.nix b/nixpkgs/pkgs/development/tools/xcbuild/sdks.nix
index 5ff3ca6808d..5ff3ca6808d 100644
--- a/pkgs/development/tools/xcbuild/sdks.nix
+++ b/nixpkgs/pkgs/development/tools/xcbuild/sdks.nix
diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/nixpkgs/pkgs/development/tools/xcbuild/setup-hook.sh
index f4b5abf2d8d..f4b5abf2d8d 100644
--- a/pkgs/development/tools/xcbuild/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/xcbuild/setup-hook.sh
diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix
index e435f0978c5..e435f0978c5 100644
--- a/pkgs/development/tools/xcbuild/toolchains.nix
+++ b/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/nixpkgs/pkgs/development/tools/xcbuild/wrapper.nix
index cd7b8616366..cd7b8616366 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/nixpkgs/pkgs/development/tools/xcbuild/wrapper.nix
diff --git a/pkgs/development/tools/xcpretty/Gemfile b/nixpkgs/pkgs/development/tools/xcpretty/Gemfile
index 0b37143fe0e..0b37143fe0e 100644
--- a/pkgs/development/tools/xcpretty/Gemfile
+++ b/nixpkgs/pkgs/development/tools/xcpretty/Gemfile
diff --git a/pkgs/development/tools/xcpretty/Gemfile.lock b/nixpkgs/pkgs/development/tools/xcpretty/Gemfile.lock
index 6f1ba7545a8..6f1ba7545a8 100644
--- a/pkgs/development/tools/xcpretty/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/xcpretty/Gemfile.lock
diff --git a/pkgs/development/tools/xcpretty/default.nix b/nixpkgs/pkgs/development/tools/xcpretty/default.nix
index 84a6798afe3..84a6798afe3 100644
--- a/pkgs/development/tools/xcpretty/default.nix
+++ b/nixpkgs/pkgs/development/tools/xcpretty/default.nix
diff --git a/pkgs/development/tools/xcpretty/gemset.nix b/nixpkgs/pkgs/development/tools/xcpretty/gemset.nix
index 30c68a93c13..30c68a93c13 100644
--- a/pkgs/development/tools/xcpretty/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/xcpretty/gemset.nix
diff --git a/pkgs/development/tools/xib2nib/default.nix b/nixpkgs/pkgs/development/tools/xib2nib/default.nix
index 4d62f5b8571..4d62f5b8571 100644
--- a/pkgs/development/tools/xib2nib/default.nix
+++ b/nixpkgs/pkgs/development/tools/xib2nib/default.nix
diff --git a/pkgs/development/tools/xqilla/default.nix b/nixpkgs/pkgs/development/tools/xqilla/default.nix
index 44a7254a3d7..44a7254a3d7 100644
--- a/pkgs/development/tools/xqilla/default.nix
+++ b/nixpkgs/pkgs/development/tools/xqilla/default.nix
diff --git a/pkgs/development/tools/yaml2json/default.nix b/nixpkgs/pkgs/development/tools/yaml2json/default.nix
index f31a119bb65..f31a119bb65 100644
--- a/pkgs/development/tools/yaml2json/default.nix
+++ b/nixpkgs/pkgs/development/tools/yaml2json/default.nix
diff --git a/pkgs/development/tools/yaml2json/deps.nix b/nixpkgs/pkgs/development/tools/yaml2json/deps.nix
index f907520cc87..f907520cc87 100644
--- a/pkgs/development/tools/yaml2json/deps.nix
+++ b/nixpkgs/pkgs/development/tools/yaml2json/deps.nix
diff --git a/pkgs/development/tools/yarn/default.nix b/nixpkgs/pkgs/development/tools/yarn/default.nix
index 154b228e0e1..154b228e0e1 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/nixpkgs/pkgs/development/tools/yarn/default.nix
diff --git a/pkgs/development/tools/yarn2nix-moretea/fetch-source.nix b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/fetch-source.nix
index fc9b149887a..fc9b149887a 100644
--- a/pkgs/development/tools/yarn2nix-moretea/fetch-source.nix
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/fetch-source.nix
diff --git a/pkgs/development/tools/yarn2nix-moretea/generate.sh b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/generate.sh
index bfe1cda5e71..bfe1cda5e71 100755
--- a/pkgs/development/tools/yarn2nix-moretea/generate.sh
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/generate.sh
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/LICENSE.txt b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/LICENSE.txt
index 94a9ed024d3..94a9ed024d3 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/LICENSE.txt
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/LICENSE.txt
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js
index d4f160b124d..d4f160b124d 100755
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
index 22032e145d3..22032e145d3 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js
index 6f0b5c93fa0..6f0b5c93fa0 100755
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js
index 86e92f85208..86e92f85208 100755
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js
index 2826f36e326..2826f36e326 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
index 964eaf2555d..964eaf2555d 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/mapObjIndexedReturnArray.js b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/mapObjIndexedReturnArray.js
index 83c6634f7c8..83c6634f7c8 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/mapObjIndexedReturnArray.js
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/mapObjIndexedReturnArray.js
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js
index 81feaaf3a65..81feaaf3a65 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh
index fad230c6921..fad230c6921 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/package.json b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/package.json
index 5b85a68ca5c..5b85a68ca5c 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/package.json
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/package.json
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock
index 803f6b3875a..803f6b3875a 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix
index 9f4154b328b..9f4154b328b 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix
+++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix
diff --git a/pkgs/development/tools/ydiff/default.nix b/nixpkgs/pkgs/development/tools/ydiff/default.nix
index c2f72138db5..c2f72138db5 100644
--- a/pkgs/development/tools/ydiff/default.nix
+++ b/nixpkgs/pkgs/development/tools/ydiff/default.nix
diff --git a/pkgs/development/tools/yj/default.nix b/nixpkgs/pkgs/development/tools/yj/default.nix
index a2076668f60..a2076668f60 100644
--- a/pkgs/development/tools/yj/default.nix
+++ b/nixpkgs/pkgs/development/tools/yj/default.nix
diff --git a/pkgs/development/tools/yj/deps.nix b/nixpkgs/pkgs/development/tools/yj/deps.nix
index 0bfe7f5f5da..0bfe7f5f5da 100644
--- a/pkgs/development/tools/yj/deps.nix
+++ b/nixpkgs/pkgs/development/tools/yj/deps.nix
diff --git a/pkgs/development/tools/yq-go/default.nix b/nixpkgs/pkgs/development/tools/yq-go/default.nix
index 3180131c6f7..3180131c6f7 100644
--- a/pkgs/development/tools/yq-go/default.nix
+++ b/nixpkgs/pkgs/development/tools/yq-go/default.nix
diff --git a/pkgs/development/tools/yq-go/deps.nix b/nixpkgs/pkgs/development/tools/yq-go/deps.nix
index ec2057964ec..ec2057964ec 100644
--- a/pkgs/development/tools/yq-go/deps.nix
+++ b/nixpkgs/pkgs/development/tools/yq-go/deps.nix
diff --git a/pkgs/development/tools/yq/default.nix b/nixpkgs/pkgs/development/tools/yq/default.nix
index e9b54e67f5e..e9b54e67f5e 100644
--- a/pkgs/development/tools/yq/default.nix
+++ b/nixpkgs/pkgs/development/tools/yq/default.nix
diff --git a/pkgs/development/tools/yuicompressor/default.nix b/nixpkgs/pkgs/development/tools/yuicompressor/default.nix
index 82fac9f6be7..82fac9f6be7 100644
--- a/pkgs/development/tools/yuicompressor/default.nix
+++ b/nixpkgs/pkgs/development/tools/yuicompressor/default.nix
diff --git a/pkgs/development/web/csslint/default.nix b/nixpkgs/pkgs/development/web/csslint/default.nix
index 4db0da4f418..4db0da4f418 100644
--- a/pkgs/development/web/csslint/default.nix
+++ b/nixpkgs/pkgs/development/web/csslint/default.nix
diff --git a/pkgs/development/web/cypress/default.nix b/nixpkgs/pkgs/development/web/cypress/default.nix
index 796060de0b0..796060de0b0 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/nixpkgs/pkgs/development/web/cypress/default.nix
diff --git a/pkgs/development/web/grails/default.nix b/nixpkgs/pkgs/development/web/grails/default.nix
index 1c5557f7624..1c5557f7624 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/nixpkgs/pkgs/development/web/grails/default.nix
diff --git a/pkgs/development/web/insomnia/default.nix b/nixpkgs/pkgs/development/web/insomnia/default.nix
index 00ffa9d1d62..00ffa9d1d62 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/nixpkgs/pkgs/development/web/insomnia/default.nix
diff --git a/pkgs/development/web/kcgi/default.nix b/nixpkgs/pkgs/development/web/kcgi/default.nix
index ec1ec527c5e..ec1ec527c5e 100644
--- a/pkgs/development/web/kcgi/default.nix
+++ b/nixpkgs/pkgs/development/web/kcgi/default.nix
diff --git a/pkgs/development/web/kore/default.nix b/nixpkgs/pkgs/development/web/kore/default.nix
index a59db6d4d1a..a59db6d4d1a 100644
--- a/pkgs/development/web/kore/default.nix
+++ b/nixpkgs/pkgs/development/web/kore/default.nix
diff --git a/pkgs/development/web/mailcatcher/Gemfile b/nixpkgs/pkgs/development/web/mailcatcher/Gemfile
index 8cc16fad7e5..8cc16fad7e5 100644
--- a/pkgs/development/web/mailcatcher/Gemfile
+++ b/nixpkgs/pkgs/development/web/mailcatcher/Gemfile
diff --git a/pkgs/development/web/mailcatcher/Gemfile.lock b/nixpkgs/pkgs/development/web/mailcatcher/Gemfile.lock
index 560213897c9..560213897c9 100644
--- a/pkgs/development/web/mailcatcher/Gemfile.lock
+++ b/nixpkgs/pkgs/development/web/mailcatcher/Gemfile.lock
diff --git a/pkgs/development/web/mailcatcher/default.nix b/nixpkgs/pkgs/development/web/mailcatcher/default.nix
index f960fe19278..f960fe19278 100644
--- a/pkgs/development/web/mailcatcher/default.nix
+++ b/nixpkgs/pkgs/development/web/mailcatcher/default.nix
diff --git a/pkgs/development/web/mailcatcher/gemset.nix b/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix
index 7603e8ff2ef..7603e8ff2ef 100644
--- a/pkgs/development/web/mailcatcher/gemset.nix
+++ b/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix
diff --git a/pkgs/development/web/minify/default.nix b/nixpkgs/pkgs/development/web/minify/default.nix
index 76434809cb5..76434809cb5 100644
--- a/pkgs/development/web/minify/default.nix
+++ b/nixpkgs/pkgs/development/web/minify/default.nix
diff --git a/pkgs/development/web/nodejs/disable-libatomic-darwin.patch b/nixpkgs/pkgs/development/web/nodejs/disable-libatomic-darwin.patch
index 7ac6c2ef895..7ac6c2ef895 100644
--- a/pkgs/development/web/nodejs/disable-libatomic-darwin.patch
+++ b/nixpkgs/pkgs/development/web/nodejs/disable-libatomic-darwin.patch
diff --git a/pkgs/development/web/nodejs/nodejs-release-keys.asc b/nixpkgs/pkgs/development/web/nodejs/nodejs-release-keys.asc
index c89b3b37f87..c89b3b37f87 100644
--- a/pkgs/development/web/nodejs/nodejs-release-keys.asc
+++ b/nixpkgs/pkgs/development/web/nodejs/nodejs-release-keys.asc
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/nixpkgs/pkgs/development/web/nodejs/nodejs.nix
index ea23ad06cd2..ea23ad06cd2 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/nodejs.nix
diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/nixpkgs/pkgs/development/web/nodejs/setup-hook.sh
index 18368588c2a..18368588c2a 100644
--- a/pkgs/development/web/nodejs/setup-hook.sh
+++ b/nixpkgs/pkgs/development/web/nodejs/setup-hook.sh
diff --git a/pkgs/development/web/nodejs/update-keyring b/nixpkgs/pkgs/development/web/nodejs/update-keyring
index 39737758e76..39737758e76 100755
--- a/pkgs/development/web/nodejs/update-keyring
+++ b/nixpkgs/pkgs/development/web/nodejs/update-keyring
diff --git a/pkgs/development/web/nodejs/update.nix b/nixpkgs/pkgs/development/web/nodejs/update.nix
index 47e1abc9b21..47e1abc9b21 100644
--- a/pkgs/development/web/nodejs/update.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/update.nix
diff --git a/pkgs/development/web/nodejs/v10.nix b/nixpkgs/pkgs/development/web/nodejs/v10.nix
index 2d77ac7591f..2d77ac7591f 100644
--- a/pkgs/development/web/nodejs/v10.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/v10.nix
diff --git a/pkgs/development/web/nodejs/v12.nix b/nixpkgs/pkgs/development/web/nodejs/v12.nix
index 8f84d24f70b..8f84d24f70b 100644
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/v12.nix
diff --git a/pkgs/development/web/nodejs/v13.nix b/nixpkgs/pkgs/development/web/nodejs/v13.nix
index db1705d481e..db1705d481e 100644
--- a/pkgs/development/web/nodejs/v13.nix
+++ b/nixpkgs/pkgs/development/web/nodejs/v13.nix
diff --git a/pkgs/development/web/now-cli/default.nix b/nixpkgs/pkgs/development/web/now-cli/default.nix
index eb3254dcd3a..eb3254dcd3a 100644
--- a/pkgs/development/web/now-cli/default.nix
+++ b/nixpkgs/pkgs/development/web/now-cli/default.nix
diff --git a/pkgs/development/web/postman/default.nix b/nixpkgs/pkgs/development/web/postman/default.nix
index 5407f8408ea..5407f8408ea 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/nixpkgs/pkgs/development/web/postman/default.nix
diff --git a/pkgs/development/web/remarkjs/default.nix b/nixpkgs/pkgs/development/web/remarkjs/default.nix
index d56819be019..d56819be019 100644
--- a/pkgs/development/web/remarkjs/default.nix
+++ b/nixpkgs/pkgs/development/web/remarkjs/default.nix
diff --git a/pkgs/development/web/remarkjs/generate.sh b/nixpkgs/pkgs/development/web/remarkjs/generate.sh
index 59542101812..59542101812 100644
--- a/pkgs/development/web/remarkjs/generate.sh
+++ b/nixpkgs/pkgs/development/web/remarkjs/generate.sh
diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/nixpkgs/pkgs/development/web/remarkjs/node-packages.nix
index 12282d4ea3a..12282d4ea3a 100644
--- a/pkgs/development/web/remarkjs/node-packages.nix
+++ b/nixpkgs/pkgs/development/web/remarkjs/node-packages.nix
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix
index bbdaeb5d292..bbdaeb5d292 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix
diff --git a/pkgs/development/web/remarkjs/pkgs.json b/nixpkgs/pkgs/development/web/remarkjs/pkgs.json
index 516bcebc6f4..516bcebc6f4 100644
--- a/pkgs/development/web/remarkjs/pkgs.json
+++ b/nixpkgs/pkgs/development/web/remarkjs/pkgs.json
diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix
index d0de36d426a..d0de36d426a 100644
--- a/pkgs/development/web/twitter-bootstrap/default.nix
+++ b/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix
diff --git a/pkgs/development/web/valum/default.nix b/nixpkgs/pkgs/development/web/valum/default.nix
index c48d16fcae9..c48d16fcae9 100644
--- a/pkgs/development/web/valum/default.nix
+++ b/nixpkgs/pkgs/development/web/valum/default.nix
diff --git a/pkgs/development/web/wml/default.nix b/nixpkgs/pkgs/development/web/wml/default.nix
index 6208bff15bc..6208bff15bc 100644
--- a/pkgs/development/web/wml/default.nix
+++ b/nixpkgs/pkgs/development/web/wml/default.nix
diff --git a/pkgs/development/web/wml/dynaloader.patch b/nixpkgs/pkgs/development/web/wml/dynaloader.patch
index 89b9f0427f9..89b9f0427f9 100644
--- a/pkgs/development/web/wml/dynaloader.patch
+++ b/nixpkgs/pkgs/development/web/wml/dynaloader.patch
diff --git a/pkgs/development/web/wml/no_bitvector.patch b/nixpkgs/pkgs/development/web/wml/no_bitvector.patch
index d5fe926c4c7..d5fe926c4c7 100644
--- a/pkgs/development/web/wml/no_bitvector.patch
+++ b/nixpkgs/pkgs/development/web/wml/no_bitvector.patch
diff --git a/pkgs/development/web/wml/redhat-with-thr.patch b/nixpkgs/pkgs/development/web/wml/redhat-with-thr.patch
index 4b06ccb3f56..4b06ccb3f56 100644
--- a/pkgs/development/web/wml/redhat-with-thr.patch
+++ b/nixpkgs/pkgs/development/web/wml/redhat-with-thr.patch
diff --git a/pkgs/development/web/woff2/brotli-static.patch b/nixpkgs/pkgs/development/web/woff2/brotli-static.patch
index 4ed6d7e741a..4ed6d7e741a 100644
--- a/pkgs/development/web/woff2/brotli-static.patch
+++ b/nixpkgs/pkgs/development/web/woff2/brotli-static.patch
diff --git a/pkgs/development/web/woff2/default.nix b/nixpkgs/pkgs/development/web/woff2/default.nix
index ff0484547fc..ff0484547fc 100644
--- a/pkgs/development/web/woff2/default.nix
+++ b/nixpkgs/pkgs/development/web/woff2/default.nix
diff --git a/pkgs/development/web/xmlindent/default.nix b/nixpkgs/pkgs/development/web/xmlindent/default.nix
index b9b0ccf7272..b9b0ccf7272 100644
--- a/pkgs/development/web/xmlindent/default.nix
+++ b/nixpkgs/pkgs/development/web/xmlindent/default.nix
diff --git a/pkgs/games/0ad/data.nix b/nixpkgs/pkgs/games/0ad/data.nix
index eeedae92440..eeedae92440 100644
--- a/pkgs/games/0ad/data.nix
+++ b/nixpkgs/pkgs/games/0ad/data.nix
diff --git a/pkgs/games/0ad/default.nix b/nixpkgs/pkgs/games/0ad/default.nix
index d53942766bb..d53942766bb 100644
--- a/pkgs/games/0ad/default.nix
+++ b/nixpkgs/pkgs/games/0ad/default.nix
diff --git a/pkgs/games/0ad/game.nix b/nixpkgs/pkgs/games/0ad/game.nix
index 42464f71ae3..42464f71ae3 100644
--- a/pkgs/games/0ad/game.nix
+++ b/nixpkgs/pkgs/games/0ad/game.nix
diff --git a/pkgs/games/0ad/rootdir_env.patch b/nixpkgs/pkgs/games/0ad/rootdir_env.patch
index c001473e510..c001473e510 100644
--- a/pkgs/games/0ad/rootdir_env.patch
+++ b/nixpkgs/pkgs/games/0ad/rootdir_env.patch
diff --git a/pkgs/games/0ad/wrapper.nix b/nixpkgs/pkgs/games/0ad/wrapper.nix
index ca7c8e16e3c..ca7c8e16e3c 100644
--- a/pkgs/games/0ad/wrapper.nix
+++ b/nixpkgs/pkgs/games/0ad/wrapper.nix
diff --git a/pkgs/games/2048-in-terminal/default.nix b/nixpkgs/pkgs/games/2048-in-terminal/default.nix
index 446252062fa..446252062fa 100644
--- a/pkgs/games/2048-in-terminal/default.nix
+++ b/nixpkgs/pkgs/games/2048-in-terminal/default.nix
diff --git a/pkgs/games/20kly/default.nix b/nixpkgs/pkgs/games/20kly/default.nix
index 37cb96f2cfd..37cb96f2cfd 100644
--- a/pkgs/games/20kly/default.nix
+++ b/nixpkgs/pkgs/games/20kly/default.nix
diff --git a/pkgs/games/90secondportraits/default.nix b/nixpkgs/pkgs/games/90secondportraits/default.nix
index f7de15604fd..f7de15604fd 100644
--- a/pkgs/games/90secondportraits/default.nix
+++ b/nixpkgs/pkgs/games/90secondportraits/default.nix
diff --git a/pkgs/games/abbaye-des-morts/default.nix b/nixpkgs/pkgs/games/abbaye-des-morts/default.nix
index 103b67e99ed..103b67e99ed 100644
--- a/pkgs/games/abbaye-des-morts/default.nix
+++ b/nixpkgs/pkgs/games/abbaye-des-morts/default.nix
diff --git a/pkgs/games/adom/default.nix b/nixpkgs/pkgs/games/adom/default.nix
index 2d3be1880de..2d3be1880de 100644
--- a/pkgs/games/adom/default.nix
+++ b/nixpkgs/pkgs/games/adom/default.nix
diff --git a/pkgs/games/airstrike/default.nix b/nixpkgs/pkgs/games/airstrike/default.nix
index 408f2817854..408f2817854 100644
--- a/pkgs/games/airstrike/default.nix
+++ b/nixpkgs/pkgs/games/airstrike/default.nix
diff --git a/pkgs/games/alienarena/default.nix b/nixpkgs/pkgs/games/alienarena/default.nix
index 5c27e3426fd..5c27e3426fd 100644
--- a/pkgs/games/alienarena/default.nix
+++ b/nixpkgs/pkgs/games/alienarena/default.nix
diff --git a/pkgs/games/amoeba/data.nix b/nixpkgs/pkgs/games/amoeba/data.nix
index fcde2d591f1..fcde2d591f1 100644
--- a/pkgs/games/amoeba/data.nix
+++ b/nixpkgs/pkgs/games/amoeba/data.nix
diff --git a/pkgs/games/amoeba/default.nix b/nixpkgs/pkgs/games/amoeba/default.nix
index 491b20d9969..491b20d9969 100644
--- a/pkgs/games/amoeba/default.nix
+++ b/nixpkgs/pkgs/games/amoeba/default.nix
diff --git a/pkgs/games/amoeba/include-string-h.patch b/nixpkgs/pkgs/games/amoeba/include-string-h.patch
index 828cab88d98..828cab88d98 100644
--- a/pkgs/games/amoeba/include-string-h.patch
+++ b/nixpkgs/pkgs/games/amoeba/include-string-h.patch
diff --git a/pkgs/games/andyetitmoves/default.nix b/nixpkgs/pkgs/games/andyetitmoves/default.nix
index 943f9eb881c..943f9eb881c 100644
--- a/pkgs/games/andyetitmoves/default.nix
+++ b/nixpkgs/pkgs/games/andyetitmoves/default.nix
diff --git a/pkgs/games/angband/default.nix b/nixpkgs/pkgs/games/angband/default.nix
index 309ea244d71..309ea244d71 100644
--- a/pkgs/games/angband/default.nix
+++ b/nixpkgs/pkgs/games/angband/default.nix
diff --git a/pkgs/games/anki/default.nix b/nixpkgs/pkgs/games/anki/default.nix
index c1ba8851f5c..c1ba8851f5c 100644
--- a/pkgs/games/anki/default.nix
+++ b/nixpkgs/pkgs/games/anki/default.nix
diff --git a/pkgs/games/anki/no-version-check.patch b/nixpkgs/pkgs/games/anki/no-version-check.patch
index ce166b4b87d..ce166b4b87d 100644
--- a/pkgs/games/anki/no-version-check.patch
+++ b/nixpkgs/pkgs/games/anki/no-version-check.patch
diff --git a/pkgs/games/arena/default.nix b/nixpkgs/pkgs/games/arena/default.nix
index a2a5f7b723a..a2a5f7b723a 100644
--- a/pkgs/games/arena/default.nix
+++ b/nixpkgs/pkgs/games/arena/default.nix
diff --git a/pkgs/games/armagetronad/default.nix b/nixpkgs/pkgs/games/armagetronad/default.nix
index 57373d39b54..57373d39b54 100644
--- a/pkgs/games/armagetronad/default.nix
+++ b/nixpkgs/pkgs/games/armagetronad/default.nix
diff --git a/pkgs/games/arx-libertatis/default.nix b/nixpkgs/pkgs/games/arx-libertatis/default.nix
index 354787e0f07..354787e0f07 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/nixpkgs/pkgs/games/arx-libertatis/default.nix
diff --git a/pkgs/games/asc/default.nix b/nixpkgs/pkgs/games/asc/default.nix
index c8f5deef924..c8f5deef924 100644
--- a/pkgs/games/asc/default.nix
+++ b/nixpkgs/pkgs/games/asc/default.nix
diff --git a/pkgs/games/assaultcube/default.nix b/nixpkgs/pkgs/games/assaultcube/default.nix
index 7d83d3a7cdb..7d83d3a7cdb 100644
--- a/pkgs/games/assaultcube/default.nix
+++ b/nixpkgs/pkgs/games/assaultcube/default.nix
diff --git a/pkgs/games/astromenace/default.nix b/nixpkgs/pkgs/games/astromenace/default.nix
index 191428f66db..191428f66db 100644
--- a/pkgs/games/astromenace/default.nix
+++ b/nixpkgs/pkgs/games/astromenace/default.nix
diff --git a/pkgs/games/atanks/default.nix b/nixpkgs/pkgs/games/atanks/default.nix
index b11a177e045..b11a177e045 100644
--- a/pkgs/games/atanks/default.nix
+++ b/nixpkgs/pkgs/games/atanks/default.nix
diff --git a/pkgs/games/azimuth/default.nix b/nixpkgs/pkgs/games/azimuth/default.nix
index 8cb583e07d2..8cb583e07d2 100644
--- a/pkgs/games/azimuth/default.nix
+++ b/nixpkgs/pkgs/games/azimuth/default.nix
diff --git a/pkgs/games/ball-and-paddle/default.nix b/nixpkgs/pkgs/games/ball-and-paddle/default.nix
index a8b5f9fea4d..a8b5f9fea4d 100644
--- a/pkgs/games/ball-and-paddle/default.nix
+++ b/nixpkgs/pkgs/games/ball-and-paddle/default.nix
diff --git a/pkgs/games/ball-and-paddle/getenv-decl.patch b/nixpkgs/pkgs/games/ball-and-paddle/getenv-decl.patch
index 6bf26b50a14..6bf26b50a14 100644
--- a/pkgs/games/ball-and-paddle/getenv-decl.patch
+++ b/nixpkgs/pkgs/games/ball-and-paddle/getenv-decl.patch
diff --git a/pkgs/games/banner/default.nix b/nixpkgs/pkgs/games/banner/default.nix
index 5699dbb7270..5699dbb7270 100644
--- a/pkgs/games/banner/default.nix
+++ b/nixpkgs/pkgs/games/banner/default.nix
diff --git a/pkgs/games/bastet/default.nix b/nixpkgs/pkgs/games/bastet/default.nix
index 85b6fcefdd2..85b6fcefdd2 100644
--- a/pkgs/games/bastet/default.nix
+++ b/nixpkgs/pkgs/games/bastet/default.nix
diff --git a/pkgs/games/beret/default.nix b/nixpkgs/pkgs/games/beret/default.nix
index 81bdbed46e9..81bdbed46e9 100644
--- a/pkgs/games/beret/default.nix
+++ b/nixpkgs/pkgs/games/beret/default.nix
diff --git a/pkgs/games/beret/use-home-dir.patch b/nixpkgs/pkgs/games/beret/use-home-dir.patch
index c8597a0303b..c8597a0303b 100644
--- a/pkgs/games/beret/use-home-dir.patch
+++ b/nixpkgs/pkgs/games/beret/use-home-dir.patch
diff --git a/pkgs/games/bitsnbots/default.nix b/nixpkgs/pkgs/games/bitsnbots/default.nix
index c6c5176ecdf..c6c5176ecdf 100644
--- a/pkgs/games/bitsnbots/default.nix
+++ b/nixpkgs/pkgs/games/bitsnbots/default.nix
diff --git a/pkgs/games/blackshades/default.nix b/nixpkgs/pkgs/games/blackshades/default.nix
index 608b32764bb..608b32764bb 100644
--- a/pkgs/games/blackshades/default.nix
+++ b/nixpkgs/pkgs/games/blackshades/default.nix
diff --git a/pkgs/games/blobby/blobby.sh b/nixpkgs/pkgs/games/blobby/blobby.sh
index 4c4b32b1243..4c4b32b1243 100644
--- a/pkgs/games/blobby/blobby.sh
+++ b/nixpkgs/pkgs/games/blobby/blobby.sh
diff --git a/pkgs/games/blobby/default.nix b/nixpkgs/pkgs/games/blobby/default.nix
index 938d767c3d8..938d767c3d8 100644
--- a/pkgs/games/blobby/default.nix
+++ b/nixpkgs/pkgs/games/blobby/default.nix
diff --git a/pkgs/games/blobby/default.upstream b/nixpkgs/pkgs/games/blobby/default.upstream
index 8f2804e0794..8f2804e0794 100644
--- a/pkgs/games/blobby/default.upstream
+++ b/nixpkgs/pkgs/games/blobby/default.upstream
diff --git a/pkgs/games/boohu/default.nix b/nixpkgs/pkgs/games/boohu/default.nix
index 3dcfe201d2c..3dcfe201d2c 100644
--- a/pkgs/games/boohu/default.nix
+++ b/nixpkgs/pkgs/games/boohu/default.nix
diff --git a/pkgs/games/boohu/deps.nix b/nixpkgs/pkgs/games/boohu/deps.nix
index c2dc3b41b97..c2dc3b41b97 100644
--- a/pkgs/games/boohu/deps.nix
+++ b/nixpkgs/pkgs/games/boohu/deps.nix
diff --git a/pkgs/games/braincurses/default.nix b/nixpkgs/pkgs/games/braincurses/default.nix
index deb542e3a86..deb542e3a86 100644
--- a/pkgs/games/braincurses/default.nix
+++ b/nixpkgs/pkgs/games/braincurses/default.nix
diff --git a/pkgs/games/brogue/default.nix b/nixpkgs/pkgs/games/brogue/default.nix
index e34dfc383a1..e34dfc383a1 100644
--- a/pkgs/games/brogue/default.nix
+++ b/nixpkgs/pkgs/games/brogue/default.nix
diff --git a/pkgs/games/bsdgames/default.nix b/nixpkgs/pkgs/games/bsdgames/default.nix
index ef30a3d350c..ef30a3d350c 100644
--- a/pkgs/games/bsdgames/default.nix
+++ b/nixpkgs/pkgs/games/bsdgames/default.nix
diff --git a/pkgs/games/btanks/default.nix b/nixpkgs/pkgs/games/btanks/default.nix
index 5bb7cfa215b..5bb7cfa215b 100644
--- a/pkgs/games/btanks/default.nix
+++ b/nixpkgs/pkgs/games/btanks/default.nix
diff --git a/pkgs/games/bzflag/default.nix b/nixpkgs/pkgs/games/bzflag/default.nix
index d07088a30a3..d07088a30a3 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/nixpkgs/pkgs/games/bzflag/default.nix
diff --git a/pkgs/games/cataclysm-dda/common.nix b/nixpkgs/pkgs/games/cataclysm-dda/common.nix
index 3a7b410a04b..3a7b410a04b 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/nixpkgs/pkgs/games/cataclysm-dda/common.nix
diff --git a/pkgs/games/cataclysm-dda/default.nix b/nixpkgs/pkgs/games/cataclysm-dda/default.nix
index ced19bffb31..ced19bffb31 100644
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/nixpkgs/pkgs/games/cataclysm-dda/default.nix
diff --git a/pkgs/games/cataclysm-dda/git.nix b/nixpkgs/pkgs/games/cataclysm-dda/git.nix
index 8e3c3e33994..8e3c3e33994 100644
--- a/pkgs/games/cataclysm-dda/git.nix
+++ b/nixpkgs/pkgs/games/cataclysm-dda/git.nix
diff --git a/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch b/nixpkgs/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch
index 60a3dc45745..60a3dc45745 100644
--- a/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch
+++ b/nixpkgs/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch
diff --git a/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch b/nixpkgs/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch
index 79b442ff5c9..79b442ff5c9 100644
--- a/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch
+++ b/nixpkgs/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch
diff --git a/pkgs/games/chessdb/default.nix b/nixpkgs/pkgs/games/chessdb/default.nix
index 28cea5e0c77..28cea5e0c77 100644
--- a/pkgs/games/chessdb/default.nix
+++ b/nixpkgs/pkgs/games/chessdb/default.nix
diff --git a/pkgs/games/chessx/default.nix b/nixpkgs/pkgs/games/chessx/default.nix
index f0b04489eda..f0b04489eda 100644
--- a/pkgs/games/chessx/default.nix
+++ b/nixpkgs/pkgs/games/chessx/default.nix
diff --git a/pkgs/games/chiaki/default.nix b/nixpkgs/pkgs/games/chiaki/default.nix
index 7a9ac7d381c..7a9ac7d381c 100644
--- a/pkgs/games/chiaki/default.nix
+++ b/nixpkgs/pkgs/games/chiaki/default.nix
diff --git a/pkgs/games/chocolate-doom/default.nix b/nixpkgs/pkgs/games/chocolate-doom/default.nix
index 56a926e63f6..56a926e63f6 100644
--- a/pkgs/games/chocolate-doom/default.nix
+++ b/nixpkgs/pkgs/games/chocolate-doom/default.nix
diff --git a/pkgs/games/ckan/default.nix b/nixpkgs/pkgs/games/ckan/default.nix
index 81f1ee0cd15..81f1ee0cd15 100644
--- a/pkgs/games/ckan/default.nix
+++ b/nixpkgs/pkgs/games/ckan/default.nix
diff --git a/pkgs/games/cockatrice/default.nix b/nixpkgs/pkgs/games/cockatrice/default.nix
index fa3b906268d..fa3b906268d 100644
--- a/pkgs/games/cockatrice/default.nix
+++ b/nixpkgs/pkgs/games/cockatrice/default.nix
diff --git a/pkgs/games/commandergenius/default.nix b/nixpkgs/pkgs/games/commandergenius/default.nix
index 56164cfc017..56164cfc017 100644
--- a/pkgs/games/commandergenius/default.nix
+++ b/nixpkgs/pkgs/games/commandergenius/default.nix
diff --git a/pkgs/games/construo/default.nix b/nixpkgs/pkgs/games/construo/default.nix
index 5c74b596279..5c74b596279 100644
--- a/pkgs/games/construo/default.nix
+++ b/nixpkgs/pkgs/games/construo/default.nix
diff --git a/pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch b/nixpkgs/pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch
index fb2910d128e..fb2910d128e 100644
--- a/pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch
+++ b/nixpkgs/pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch
diff --git a/pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch b/nixpkgs/pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch
index 4daea4c53a2..4daea4c53a2 100644
--- a/pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch
+++ b/nixpkgs/pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch
diff --git a/pkgs/games/crack-attack/default.nix b/nixpkgs/pkgs/games/crack-attack/default.nix
index 4741ac7bb68..4741ac7bb68 100644
--- a/pkgs/games/crack-attack/default.nix
+++ b/nixpkgs/pkgs/games/crack-attack/default.nix
diff --git a/pkgs/games/crafty/default.nix b/nixpkgs/pkgs/games/crafty/default.nix
index c9dcd2d9d40..c9dcd2d9d40 100644
--- a/pkgs/games/crafty/default.nix
+++ b/nixpkgs/pkgs/games/crafty/default.nix
diff --git a/pkgs/games/crawl/crawl_purify.patch b/nixpkgs/pkgs/games/crawl/crawl_purify.patch
index f792dc013f0..f792dc013f0 100644
--- a/pkgs/games/crawl/crawl_purify.patch
+++ b/nixpkgs/pkgs/games/crawl/crawl_purify.patch
diff --git a/pkgs/games/crawl/default.nix b/nixpkgs/pkgs/games/crawl/default.nix
index e4cccdd6221..e4cccdd6221 100644
--- a/pkgs/games/crawl/default.nix
+++ b/nixpkgs/pkgs/games/crawl/default.nix
diff --git a/pkgs/games/crispy-doom/default.nix b/nixpkgs/pkgs/games/crispy-doom/default.nix
index e85cebde040..e85cebde040 100644
--- a/pkgs/games/crispy-doom/default.nix
+++ b/nixpkgs/pkgs/games/crispy-doom/default.nix
diff --git a/pkgs/games/crrcsim/default.nix b/nixpkgs/pkgs/games/crrcsim/default.nix
index 75ff970a16a..75ff970a16a 100644
--- a/pkgs/games/crrcsim/default.nix
+++ b/nixpkgs/pkgs/games/crrcsim/default.nix
diff --git a/pkgs/games/crrcsim/gcc6.patch b/nixpkgs/pkgs/games/crrcsim/gcc6.patch
index c19f28c514d..c19f28c514d 100644
--- a/pkgs/games/crrcsim/gcc6.patch
+++ b/nixpkgs/pkgs/games/crrcsim/gcc6.patch
diff --git a/pkgs/games/curseofwar/default.nix b/nixpkgs/pkgs/games/curseofwar/default.nix
index 8b915345f86..8b915345f86 100644
--- a/pkgs/games/curseofwar/default.nix
+++ b/nixpkgs/pkgs/games/curseofwar/default.nix
diff --git a/pkgs/games/cutemaze/default.nix b/nixpkgs/pkgs/games/cutemaze/default.nix
index 24077697218..24077697218 100644
--- a/pkgs/games/cutemaze/default.nix
+++ b/nixpkgs/pkgs/games/cutemaze/default.nix
diff --git a/pkgs/games/cuyo/default.nix b/nixpkgs/pkgs/games/cuyo/default.nix
index 24e45719f51..24e45719f51 100644
--- a/pkgs/games/cuyo/default.nix
+++ b/nixpkgs/pkgs/games/cuyo/default.nix
diff --git a/pkgs/games/devilutionx/default.nix b/nixpkgs/pkgs/games/devilutionx/default.nix
index ac7d61b31c7..ac7d61b31c7 100644
--- a/pkgs/games/devilutionx/default.nix
+++ b/nixpkgs/pkgs/games/devilutionx/default.nix
diff --git a/pkgs/games/dhewm3/default.nix b/nixpkgs/pkgs/games/dhewm3/default.nix
index fd972937640..fd972937640 100644
--- a/pkgs/games/dhewm3/default.nix
+++ b/nixpkgs/pkgs/games/dhewm3/default.nix
diff --git a/pkgs/games/duckmarines/default.nix b/nixpkgs/pkgs/games/duckmarines/default.nix
index 7f73e047fd7..7f73e047fd7 100644
--- a/pkgs/games/duckmarines/default.nix
+++ b/nixpkgs/pkgs/games/duckmarines/default.nix
diff --git a/pkgs/games/dwarf-fortress/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/default.nix
index 650d5da5331..650d5da5331 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/default.nix
diff --git a/pkgs/games/dwarf-fortress/df_permission b/nixpkgs/pkgs/games/dwarf-fortress/df_permission
index b0121bb3fa3..b0121bb3fa3 100644
--- a/pkgs/games/dwarf-fortress/df_permission
+++ b/nixpkgs/pkgs/games/dwarf-fortress/df_permission
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix
index 5706337dffd..5706337dffd 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix
diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/nixpkgs/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch
index da860cd5562..da860cd5562 100644
--- a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch
+++ b/nixpkgs/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index bcef336f342..bcef336f342 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in b/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in
index 77936c430e2..77936c430e2 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in
+++ b/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 6871a611784..6871a611784 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
diff --git a/pkgs/games/dwarf-fortress/game.json b/nixpkgs/pkgs/games/dwarf-fortress/game.json
index 05fb0cf5080..05fb0cf5080 100644
--- a/pkgs/games/dwarf-fortress/game.json
+++ b/nixpkgs/pkgs/games/dwarf-fortress/game.json
diff --git a/pkgs/games/dwarf-fortress/game.nix b/nixpkgs/pkgs/games/dwarf-fortress/game.nix
index d3a26529424..d3a26529424 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/game.nix
diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/nixpkgs/pkgs/games/dwarf-fortress/lazy-pack.nix
index 5f0328cba02..5f0328cba02 100644
--- a/pkgs/games/dwarf-fortress/lazy-pack.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/lazy-pack.nix
diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/legends-browser/default.nix
index 3bc4fa9c4bb..3bc4fa9c4bb 100644
--- a/pkgs/games/dwarf-fortress/legends-browser/default.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/legends-browser/default.nix
diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/nixpkgs/pkgs/games/dwarf-fortress/soundsense.nix
index a59c8730690..a59c8730690 100644
--- a/pkgs/games/dwarf-fortress/soundsense.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/soundsense.nix
diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/themes/default.nix
index feb4782d7c3..feb4782d7c3 100644
--- a/pkgs/games/dwarf-fortress/themes/default.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/themes/default.nix
diff --git a/pkgs/games/dwarf-fortress/themes/themes.json b/nixpkgs/pkgs/games/dwarf-fortress/themes/themes.json
index f2cc4ed3ac7..f2cc4ed3ac7 100644
--- a/pkgs/games/dwarf-fortress/themes/themes.json
+++ b/nixpkgs/pkgs/games/dwarf-fortress/themes/themes.json
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix
index e191d372704..e191d372704 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/nixpkgs/pkgs/games/dwarf-fortress/unfuck.nix
index c4d01b3ff39..c4d01b3ff39 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/unfuck.nix
diff --git a/pkgs/games/dwarf-fortress/update.sh b/nixpkgs/pkgs/games/dwarf-fortress/update.sh
index 3db68122d35..3db68122d35 100755
--- a/pkgs/games/dwarf-fortress/update.sh
+++ b/nixpkgs/pkgs/games/dwarf-fortress/update.sh
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix
index 31b21c5a435..31b21c5a435 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix
diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dfhack.in
index 026b33ab87b..026b33ab87b 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in
+++ b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dfhack.in
diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
index 054935af012..054935af012 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
+++ b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
index 4448bd05fda..4448bd05fda 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
+++ b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
diff --git a/pkgs/games/dwarf-fortress/wrapper/soundSense.in b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/soundSense.in
index 28357ed7579..28357ed7579 100644
--- a/pkgs/games/dwarf-fortress/wrapper/soundSense.in
+++ b/nixpkgs/pkgs/games/dwarf-fortress/wrapper/soundSense.in
diff --git a/pkgs/games/dxx-rebirth/assets.nix b/nixpkgs/pkgs/games/dxx-rebirth/assets.nix
index 682d1e05069..682d1e05069 100644
--- a/pkgs/games/dxx-rebirth/assets.nix
+++ b/nixpkgs/pkgs/games/dxx-rebirth/assets.nix
diff --git a/pkgs/games/dxx-rebirth/default.nix b/nixpkgs/pkgs/games/dxx-rebirth/default.nix
index b7eb2f02568..b7eb2f02568 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/nixpkgs/pkgs/games/dxx-rebirth/default.nix
diff --git a/pkgs/games/dxx-rebirth/full.nix b/nixpkgs/pkgs/games/dxx-rebirth/full.nix
index 7a1e690c39d..7a1e690c39d 100644
--- a/pkgs/games/dxx-rebirth/full.nix
+++ b/nixpkgs/pkgs/games/dxx-rebirth/full.nix
diff --git a/pkgs/games/easyrpg-player/default.nix b/nixpkgs/pkgs/games/easyrpg-player/default.nix
index dfa57a72864..dfa57a72864 100644
--- a/pkgs/games/easyrpg-player/default.nix
+++ b/nixpkgs/pkgs/games/easyrpg-player/default.nix
diff --git a/pkgs/games/eboard/default.nix b/nixpkgs/pkgs/games/eboard/default.nix
index af6bc4be393..af6bc4be393 100644
--- a/pkgs/games/eboard/default.nix
+++ b/nixpkgs/pkgs/games/eboard/default.nix
diff --git a/pkgs/games/eboard/eboard.patch b/nixpkgs/pkgs/games/eboard/eboard.patch
index f80c1b2f78d..f80c1b2f78d 100644
--- a/pkgs/games/eboard/eboard.patch
+++ b/nixpkgs/pkgs/games/eboard/eboard.patch
diff --git a/pkgs/games/eduke32/default.nix b/nixpkgs/pkgs/games/eduke32/default.nix
index 242e0930db3..242e0930db3 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/nixpkgs/pkgs/games/eduke32/default.nix
diff --git a/pkgs/games/egoboo/default.nix b/nixpkgs/pkgs/games/egoboo/default.nix
index c8a5f380900..c8a5f380900 100644
--- a/pkgs/games/egoboo/default.nix
+++ b/nixpkgs/pkgs/games/egoboo/default.nix
diff --git a/pkgs/games/eidolon/cargo-lock.patch b/nixpkgs/pkgs/games/eidolon/cargo-lock.patch
index 5aa09c52683..5aa09c52683 100644
--- a/pkgs/games/eidolon/cargo-lock.patch
+++ b/nixpkgs/pkgs/games/eidolon/cargo-lock.patch
diff --git a/pkgs/games/eidolon/default.nix b/nixpkgs/pkgs/games/eidolon/default.nix
index ab3d9647dc8..ab3d9647dc8 100644
--- a/pkgs/games/eidolon/default.nix
+++ b/nixpkgs/pkgs/games/eidolon/default.nix
diff --git a/pkgs/games/empty-epsilon/default.nix b/nixpkgs/pkgs/games/empty-epsilon/default.nix
index 6560db48cb3..6560db48cb3 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/nixpkgs/pkgs/games/empty-epsilon/default.nix
diff --git a/pkgs/games/endgame-singularity/default.nix b/nixpkgs/pkgs/games/endgame-singularity/default.nix
index 8b259bad88d..8b259bad88d 100644
--- a/pkgs/games/endgame-singularity/default.nix
+++ b/nixpkgs/pkgs/games/endgame-singularity/default.nix
diff --git a/pkgs/games/endless-sky/default.nix b/nixpkgs/pkgs/games/endless-sky/default.nix
index 5d1ed1c11a9..5d1ed1c11a9 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/nixpkgs/pkgs/games/endless-sky/default.nix
diff --git a/pkgs/games/endless-sky/fixes.patch b/nixpkgs/pkgs/games/endless-sky/fixes.patch
index 359e2ee4af3..359e2ee4af3 100644
--- a/pkgs/games/endless-sky/fixes.patch
+++ b/nixpkgs/pkgs/games/endless-sky/fixes.patch
diff --git a/pkgs/games/enyo-doom/default.nix b/nixpkgs/pkgs/games/enyo-doom/default.nix
index af002a690e4..af002a690e4 100644
--- a/pkgs/games/enyo-doom/default.nix
+++ b/nixpkgs/pkgs/games/enyo-doom/default.nix
diff --git a/pkgs/games/eternity-engine/default.nix b/nixpkgs/pkgs/games/eternity-engine/default.nix
index 49339e5619d..49339e5619d 100644
--- a/pkgs/games/eternity-engine/default.nix
+++ b/nixpkgs/pkgs/games/eternity-engine/default.nix
diff --git a/pkgs/games/extremetuxracer/default.nix b/nixpkgs/pkgs/games/extremetuxracer/default.nix
index c7c618c0c18..c7c618c0c18 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/nixpkgs/pkgs/games/extremetuxracer/default.nix
diff --git a/pkgs/games/exult/arch.patch b/nixpkgs/pkgs/games/exult/arch.patch
index 70de34184a2..70de34184a2 100644
--- a/pkgs/games/exult/arch.patch
+++ b/nixpkgs/pkgs/games/exult/arch.patch
diff --git a/pkgs/games/exult/default.nix b/nixpkgs/pkgs/games/exult/default.nix
index 07f84d7a151..07f84d7a151 100644
--- a/pkgs/games/exult/default.nix
+++ b/nixpkgs/pkgs/games/exult/default.nix
diff --git a/pkgs/games/ezquake/default.nix b/nixpkgs/pkgs/games/ezquake/default.nix
index 1c007cc6bb5..1c007cc6bb5 100644
--- a/pkgs/games/ezquake/default.nix
+++ b/nixpkgs/pkgs/games/ezquake/default.nix
diff --git a/pkgs/games/factorio/default.nix b/nixpkgs/pkgs/games/factorio/default.nix
index 43ec92719c2..43ec92719c2 100644
--- a/pkgs/games/factorio/default.nix
+++ b/nixpkgs/pkgs/games/factorio/default.nix
diff --git a/pkgs/games/factorio/mods.nix b/nixpkgs/pkgs/games/factorio/mods.nix
index 501665494eb..501665494eb 100644
--- a/pkgs/games/factorio/mods.nix
+++ b/nixpkgs/pkgs/games/factorio/mods.nix
diff --git a/pkgs/games/factorio/utils.nix b/nixpkgs/pkgs/games/factorio/utils.nix
index 563ece6cb9c..563ece6cb9c 100644
--- a/pkgs/games/factorio/utils.nix
+++ b/nixpkgs/pkgs/games/factorio/utils.nix
diff --git a/pkgs/games/fairymax/default.nix b/nixpkgs/pkgs/games/fairymax/default.nix
index 44ed91da168..44ed91da168 100644
--- a/pkgs/games/fairymax/default.nix
+++ b/nixpkgs/pkgs/games/fairymax/default.nix
diff --git a/pkgs/games/fish-fillets-ng/default.nix b/nixpkgs/pkgs/games/fish-fillets-ng/default.nix
index 47f72c52c1f..47f72c52c1f 100644
--- a/pkgs/games/fish-fillets-ng/default.nix
+++ b/nixpkgs/pkgs/games/fish-fillets-ng/default.nix
diff --git a/pkgs/games/flare/default.nix b/nixpkgs/pkgs/games/flare/default.nix
index 2058abebb55..2058abebb55 100644
--- a/pkgs/games/flare/default.nix
+++ b/nixpkgs/pkgs/games/flare/default.nix
diff --git a/pkgs/games/flare/engine.nix b/nixpkgs/pkgs/games/flare/engine.nix
index 74f983c6441..74f983c6441 100644
--- a/pkgs/games/flare/engine.nix
+++ b/nixpkgs/pkgs/games/flare/engine.nix
diff --git a/pkgs/games/flare/game.nix b/nixpkgs/pkgs/games/flare/game.nix
index 6a231a5ff7d..6a231a5ff7d 100644
--- a/pkgs/games/flare/game.nix
+++ b/nixpkgs/pkgs/games/flare/game.nix
diff --git a/pkgs/games/flightgear/default.nix b/nixpkgs/pkgs/games/flightgear/default.nix
index d3c3271710a..d3c3271710a 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/nixpkgs/pkgs/games/flightgear/default.nix
diff --git a/pkgs/games/fltrator/default.nix b/nixpkgs/pkgs/games/fltrator/default.nix
index 957452aa162..957452aa162 100644
--- a/pkgs/games/fltrator/default.nix
+++ b/nixpkgs/pkgs/games/fltrator/default.nix
diff --git a/pkgs/games/freecell-solver/default.nix b/nixpkgs/pkgs/games/freecell-solver/default.nix
index 3ba383c7427..3ba383c7427 100644
--- a/pkgs/games/freecell-solver/default.nix
+++ b/nixpkgs/pkgs/games/freecell-solver/default.nix
diff --git a/pkgs/games/freeciv/default.nix b/nixpkgs/pkgs/games/freeciv/default.nix
index 9fc260e7406..9fc260e7406 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/nixpkgs/pkgs/games/freeciv/default.nix
diff --git a/pkgs/games/freedink/default.nix b/nixpkgs/pkgs/games/freedink/default.nix
index 3b8bc1288ef..3b8bc1288ef 100644
--- a/pkgs/games/freedink/default.nix
+++ b/nixpkgs/pkgs/games/freedink/default.nix
diff --git a/pkgs/games/freedroidrpg/default.nix b/nixpkgs/pkgs/games/freedroidrpg/default.nix
index 281691d283d..281691d283d 100644
--- a/pkgs/games/freedroidrpg/default.nix
+++ b/nixpkgs/pkgs/games/freedroidrpg/default.nix
diff --git a/pkgs/games/freeorion/default.nix b/nixpkgs/pkgs/games/freeorion/default.nix
index dfad954f0f0..dfad954f0f0 100644
--- a/pkgs/games/freeorion/default.nix
+++ b/nixpkgs/pkgs/games/freeorion/default.nix
diff --git a/pkgs/games/freeorion/fix-paths.sh b/nixpkgs/pkgs/games/freeorion/fix-paths.sh
index 3f82533dd60..3f82533dd60 100644
--- a/pkgs/games/freeorion/fix-paths.sh
+++ b/nixpkgs/pkgs/games/freeorion/fix-paths.sh
diff --git a/pkgs/games/freeorion/fix-paths.xslt b/nixpkgs/pkgs/games/freeorion/fix-paths.xslt
index f0db646b81a..f0db646b81a 100644
--- a/pkgs/games/freeorion/fix-paths.xslt
+++ b/nixpkgs/pkgs/games/freeorion/fix-paths.xslt
diff --git a/pkgs/games/freesweep/default.nix b/nixpkgs/pkgs/games/freesweep/default.nix
index 94efe1b650a..94efe1b650a 100644
--- a/pkgs/games/freesweep/default.nix
+++ b/nixpkgs/pkgs/games/freesweep/default.nix
diff --git a/pkgs/games/frogatto/data.nix b/nixpkgs/pkgs/games/frogatto/data.nix
index 6531d407d21..6531d407d21 100644
--- a/pkgs/games/frogatto/data.nix
+++ b/nixpkgs/pkgs/games/frogatto/data.nix
diff --git a/pkgs/games/frogatto/default.nix b/nixpkgs/pkgs/games/frogatto/default.nix
index 4c5f1af8a9b..4c5f1af8a9b 100644
--- a/pkgs/games/frogatto/default.nix
+++ b/nixpkgs/pkgs/games/frogatto/default.nix
diff --git a/pkgs/games/frogatto/engine.nix b/nixpkgs/pkgs/games/frogatto/engine.nix
index 5254ff25b02..5254ff25b02 100644
--- a/pkgs/games/frogatto/engine.nix
+++ b/nixpkgs/pkgs/games/frogatto/engine.nix
diff --git a/pkgs/games/frotz/default.nix b/nixpkgs/pkgs/games/frotz/default.nix
index 788280fd820..788280fd820 100644
--- a/pkgs/games/frotz/default.nix
+++ b/nixpkgs/pkgs/games/frotz/default.nix
diff --git a/pkgs/games/frozen-bubble/default.nix b/nixpkgs/pkgs/games/frozen-bubble/default.nix
index 3b562ee44f2..3b562ee44f2 100644
--- a/pkgs/games/frozen-bubble/default.nix
+++ b/nixpkgs/pkgs/games/frozen-bubble/default.nix
diff --git a/pkgs/games/frozen-bubble/fix-compilation.patch b/nixpkgs/pkgs/games/frozen-bubble/fix-compilation.patch
index e87dd0668dc..e87dd0668dc 100644
--- a/pkgs/games/frozen-bubble/fix-compilation.patch
+++ b/nixpkgs/pkgs/games/frozen-bubble/fix-compilation.patch
diff --git a/pkgs/games/fsg/default.nix b/nixpkgs/pkgs/games/fsg/default.nix
index b8a0d5ff3c7..b8a0d5ff3c7 100644
--- a/pkgs/games/fsg/default.nix
+++ b/nixpkgs/pkgs/games/fsg/default.nix
diff --git a/pkgs/games/galaxis/default.nix b/nixpkgs/pkgs/games/galaxis/default.nix
index f5089b6395f..f5089b6395f 100644
--- a/pkgs/games/galaxis/default.nix
+++ b/nixpkgs/pkgs/games/galaxis/default.nix
diff --git a/pkgs/games/gambatte/default.nix b/nixpkgs/pkgs/games/gambatte/default.nix
index 6d8d14d8de0..6d8d14d8de0 100644
--- a/pkgs/games/gambatte/default.nix
+++ b/nixpkgs/pkgs/games/gambatte/default.nix
diff --git a/pkgs/games/gambatte/fix-scons-paths.patch b/nixpkgs/pkgs/games/gambatte/fix-scons-paths.patch
index ea10ee4163b..ea10ee4163b 100644
--- a/pkgs/games/gambatte/fix-scons-paths.patch
+++ b/nixpkgs/pkgs/games/gambatte/fix-scons-paths.patch
diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix
index 4c57538e234..4c57538e234 100644
--- a/pkgs/games/garden-of-coloured-lights/default.nix
+++ b/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix
diff --git a/pkgs/games/gargoyle/darwin.sh b/nixpkgs/pkgs/games/gargoyle/darwin.sh
index ed0daec4ef1..ed0daec4ef1 100644
--- a/pkgs/games/gargoyle/darwin.sh
+++ b/nixpkgs/pkgs/games/gargoyle/darwin.sh
diff --git a/pkgs/games/gargoyle/default.nix b/nixpkgs/pkgs/games/gargoyle/default.nix
index 83a567fa578..83a567fa578 100644
--- a/pkgs/games/gargoyle/default.nix
+++ b/nixpkgs/pkgs/games/gargoyle/default.nix
diff --git a/pkgs/games/gav/default.nix b/nixpkgs/pkgs/games/gav/default.nix
index 20e3f69152c..20e3f69152c 100644
--- a/pkgs/games/gav/default.nix
+++ b/nixpkgs/pkgs/games/gav/default.nix
diff --git a/pkgs/games/gav/gcc.patch b/nixpkgs/pkgs/games/gav/gcc.patch
index eb4c64727bc..eb4c64727bc 100644
--- a/pkgs/games/gav/gcc.patch
+++ b/nixpkgs/pkgs/games/gav/gcc.patch
diff --git a/pkgs/games/gcompris/default.nix b/nixpkgs/pkgs/games/gcompris/default.nix
index 67d52ac7bcb..67d52ac7bcb 100644
--- a/pkgs/games/gcompris/default.nix
+++ b/nixpkgs/pkgs/games/gcompris/default.nix
diff --git a/pkgs/games/gcs/default.nix b/nixpkgs/pkgs/games/gcs/default.nix
index f1230b739bb..f1230b739bb 100644
--- a/pkgs/games/gcs/default.nix
+++ b/nixpkgs/pkgs/games/gcs/default.nix
diff --git a/pkgs/games/gemrb/default.nix b/nixpkgs/pkgs/games/gemrb/default.nix
index 72afca4cd2c..72afca4cd2c 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/nixpkgs/pkgs/games/gemrb/default.nix
diff --git a/pkgs/games/gl-117/default.nix b/nixpkgs/pkgs/games/gl-117/default.nix
index 09a472f4dac..09a472f4dac 100644
--- a/pkgs/games/gl-117/default.nix
+++ b/nixpkgs/pkgs/games/gl-117/default.nix
diff --git a/pkgs/games/globulation/default.nix b/nixpkgs/pkgs/games/globulation/default.nix
index 45c5013705f..45c5013705f 100644
--- a/pkgs/games/globulation/default.nix
+++ b/nixpkgs/pkgs/games/globulation/default.nix
diff --git a/pkgs/games/globulation/header-order.patch b/nixpkgs/pkgs/games/globulation/header-order.patch
index 6c8dd922c25..6c8dd922c25 100644
--- a/pkgs/games/globulation/header-order.patch
+++ b/nixpkgs/pkgs/games/globulation/header-order.patch
diff --git a/pkgs/games/globulation/public-buildproject.patch b/nixpkgs/pkgs/games/globulation/public-buildproject.patch
index 1eaedf08820..1eaedf08820 100644
--- a/pkgs/games/globulation/public-buildproject.patch
+++ b/nixpkgs/pkgs/games/globulation/public-buildproject.patch
diff --git a/pkgs/games/gltron/default.nix b/nixpkgs/pkgs/games/gltron/default.nix
index 0e70096ab53..0e70096ab53 100644
--- a/pkgs/games/gltron/default.nix
+++ b/nixpkgs/pkgs/games/gltron/default.nix
diff --git a/pkgs/games/gltron/gentoo-prototypes.patch b/nixpkgs/pkgs/games/gltron/gentoo-prototypes.patch
index 71078ae553f..71078ae553f 100644
--- a/pkgs/games/gltron/gentoo-prototypes.patch
+++ b/nixpkgs/pkgs/games/gltron/gentoo-prototypes.patch
diff --git a/pkgs/games/gmad/default.nix b/nixpkgs/pkgs/games/gmad/default.nix
index e51c326da19..e51c326da19 100644
--- a/pkgs/games/gmad/default.nix
+++ b/nixpkgs/pkgs/games/gmad/default.nix
diff --git a/pkgs/games/gnome-hexgl/default.nix b/nixpkgs/pkgs/games/gnome-hexgl/default.nix
index 6212c1bbec1..6212c1bbec1 100644
--- a/pkgs/games/gnome-hexgl/default.nix
+++ b/nixpkgs/pkgs/games/gnome-hexgl/default.nix
diff --git a/pkgs/games/gnubg/default.nix b/nixpkgs/pkgs/games/gnubg/default.nix
index ff09a70e932..ff09a70e932 100644
--- a/pkgs/games/gnubg/default.nix
+++ b/nixpkgs/pkgs/games/gnubg/default.nix
diff --git a/pkgs/games/gnuchess/default.nix b/nixpkgs/pkgs/games/gnuchess/default.nix
index 43c60c66730..43c60c66730 100644
--- a/pkgs/games/gnuchess/default.nix
+++ b/nixpkgs/pkgs/games/gnuchess/default.nix
diff --git a/pkgs/games/gnuchess/default.upstream b/nixpkgs/pkgs/games/gnuchess/default.upstream
index f19dca51add..f19dca51add 100644
--- a/pkgs/games/gnuchess/default.upstream
+++ b/nixpkgs/pkgs/games/gnuchess/default.upstream
diff --git a/pkgs/games/gnugo/default.nix b/nixpkgs/pkgs/games/gnugo/default.nix
index fa8d59c0503..fa8d59c0503 100644
--- a/pkgs/games/gnugo/default.nix
+++ b/nixpkgs/pkgs/games/gnugo/default.nix
diff --git a/pkgs/games/gnujump/default.nix b/nixpkgs/pkgs/games/gnujump/default.nix
index af2e924960a..af2e924960a 100644
--- a/pkgs/games/gnujump/default.nix
+++ b/nixpkgs/pkgs/games/gnujump/default.nix
diff --git a/pkgs/games/gnushogi/default.nix b/nixpkgs/pkgs/games/gnushogi/default.nix
index 381b4fd5959..381b4fd5959 100644
--- a/pkgs/games/gnushogi/default.nix
+++ b/nixpkgs/pkgs/games/gnushogi/default.nix
diff --git a/pkgs/games/gogui/default.nix b/nixpkgs/pkgs/games/gogui/default.nix
index f9ae137bb62..f9ae137bb62 100644
--- a/pkgs/games/gogui/default.nix
+++ b/nixpkgs/pkgs/games/gogui/default.nix
diff --git a/pkgs/games/gscrabble/default.nix b/nixpkgs/pkgs/games/gscrabble/default.nix
index 7e89704324f..7e89704324f 100644
--- a/pkgs/games/gscrabble/default.nix
+++ b/nixpkgs/pkgs/games/gscrabble/default.nix
diff --git a/pkgs/games/gshogi/default.nix b/nixpkgs/pkgs/games/gshogi/default.nix
index d3fff64ada6..d3fff64ada6 100644
--- a/pkgs/games/gshogi/default.nix
+++ b/nixpkgs/pkgs/games/gshogi/default.nix
diff --git a/pkgs/games/gtetrinet/default.nix b/nixpkgs/pkgs/games/gtetrinet/default.nix
index f1c24ba4de8..f1c24ba4de8 100644
--- a/pkgs/games/gtetrinet/default.nix
+++ b/nixpkgs/pkgs/games/gtetrinet/default.nix
diff --git a/pkgs/games/gtypist/default.nix b/nixpkgs/pkgs/games/gtypist/default.nix
index 6031762d1d6..6031762d1d6 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/nixpkgs/pkgs/games/gtypist/default.nix
diff --git a/pkgs/games/gweled/default.nix b/nixpkgs/pkgs/games/gweled/default.nix
index d5d4f5c4015..d5d4f5c4015 100644
--- a/pkgs/games/gweled/default.nix
+++ b/nixpkgs/pkgs/games/gweled/default.nix
diff --git a/pkgs/games/gzdoom/default.nix b/nixpkgs/pkgs/games/gzdoom/default.nix
index c0aea8927b9..c0aea8927b9 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/nixpkgs/pkgs/games/gzdoom/default.nix
diff --git a/pkgs/games/harmonist/default.nix b/nixpkgs/pkgs/games/harmonist/default.nix
index 19074a309dd..19074a309dd 100644
--- a/pkgs/games/harmonist/default.nix
+++ b/nixpkgs/pkgs/games/harmonist/default.nix
diff --git a/pkgs/games/harmonist/deps.nix b/nixpkgs/pkgs/games/harmonist/deps.nix
index 68290823625..68290823625 100644
--- a/pkgs/games/harmonist/deps.nix
+++ b/nixpkgs/pkgs/games/harmonist/deps.nix
diff --git a/pkgs/games/hawkthorne/default.nix b/nixpkgs/pkgs/games/hawkthorne/default.nix
index a770e452ae4..a770e452ae4 100644
--- a/pkgs/games/hawkthorne/default.nix
+++ b/nixpkgs/pkgs/games/hawkthorne/default.nix
diff --git a/pkgs/games/hawkthorne/makefile.patch b/nixpkgs/pkgs/games/hawkthorne/makefile.patch
index 16a79683149..16a79683149 100644
--- a/pkgs/games/hawkthorne/makefile.patch
+++ b/nixpkgs/pkgs/games/hawkthorne/makefile.patch
diff --git a/pkgs/games/hedgewars/default.nix b/nixpkgs/pkgs/games/hedgewars/default.nix
index dffeb2ac556..dffeb2ac556 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/nixpkgs/pkgs/games/hedgewars/default.nix
diff --git a/pkgs/games/holdingnuts/default.nix b/nixpkgs/pkgs/games/holdingnuts/default.nix
index c20cce723c2..c20cce723c2 100644
--- a/pkgs/games/holdingnuts/default.nix
+++ b/nixpkgs/pkgs/games/holdingnuts/default.nix
diff --git a/pkgs/games/hyperrogue/default.nix b/nixpkgs/pkgs/games/hyperrogue/default.nix
index 09ecd4279e4..09ecd4279e4 100644
--- a/pkgs/games/hyperrogue/default.nix
+++ b/nixpkgs/pkgs/games/hyperrogue/default.nix
diff --git a/pkgs/games/icbm3d/default.nix b/nixpkgs/pkgs/games/icbm3d/default.nix
index ba9173c0492..ba9173c0492 100644
--- a/pkgs/games/icbm3d/default.nix
+++ b/nixpkgs/pkgs/games/icbm3d/default.nix
diff --git a/pkgs/games/instead-launcher/default.nix b/nixpkgs/pkgs/games/instead-launcher/default.nix
index 10d29657d7c..10d29657d7c 100644
--- a/pkgs/games/instead-launcher/default.nix
+++ b/nixpkgs/pkgs/games/instead-launcher/default.nix
diff --git a/pkgs/games/instead-launcher/path.patch b/nixpkgs/pkgs/games/instead-launcher/path.patch
index f63737bfb16..f63737bfb16 100644
--- a/pkgs/games/instead-launcher/path.patch
+++ b/nixpkgs/pkgs/games/instead-launcher/path.patch
diff --git a/pkgs/games/instead/default.nix b/nixpkgs/pkgs/games/instead/default.nix
index fff15b5c5b0..fff15b5c5b0 100644
--- a/pkgs/games/instead/default.nix
+++ b/nixpkgs/pkgs/games/instead/default.nix
diff --git a/pkgs/games/ivan/default.nix b/nixpkgs/pkgs/games/ivan/default.nix
index 8acab2eed0e..8acab2eed0e 100644
--- a/pkgs/games/ivan/default.nix
+++ b/nixpkgs/pkgs/games/ivan/default.nix
diff --git a/pkgs/games/ja2-stracciatella/Cargo.lock b/nixpkgs/pkgs/games/ja2-stracciatella/Cargo.lock
index d017e93e4db..d017e93e4db 100644
--- a/pkgs/games/ja2-stracciatella/Cargo.lock
+++ b/nixpkgs/pkgs/games/ja2-stracciatella/Cargo.lock
diff --git a/pkgs/games/ja2-stracciatella/default.nix b/nixpkgs/pkgs/games/ja2-stracciatella/default.nix
index fa0720e51fd..fa0720e51fd 100644
--- a/pkgs/games/ja2-stracciatella/default.nix
+++ b/nixpkgs/pkgs/games/ja2-stracciatella/default.nix
diff --git a/pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch b/nixpkgs/pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch
index b86589fc671..b86589fc671 100644
--- a/pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch
+++ b/nixpkgs/pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch
diff --git a/pkgs/games/keen4/builder.sh b/nixpkgs/pkgs/games/keen4/builder.sh
index 50d261db865..50d261db865 100644
--- a/pkgs/games/keen4/builder.sh
+++ b/nixpkgs/pkgs/games/keen4/builder.sh
diff --git a/pkgs/games/keen4/default.nix b/nixpkgs/pkgs/games/keen4/default.nix
index 64522e568db..64522e568db 100644
--- a/pkgs/games/keen4/default.nix
+++ b/nixpkgs/pkgs/games/keen4/default.nix
diff --git a/pkgs/games/klavaro/default.nix b/nixpkgs/pkgs/games/klavaro/default.nix
index f58f86cd8fb..f58f86cd8fb 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/nixpkgs/pkgs/games/klavaro/default.nix
diff --git a/pkgs/games/kobodeluxe/default.nix b/nixpkgs/pkgs/games/kobodeluxe/default.nix
index 38eff4f2fce..38eff4f2fce 100644
--- a/pkgs/games/kobodeluxe/default.nix
+++ b/nixpkgs/pkgs/games/kobodeluxe/default.nix
diff --git a/pkgs/games/kobodeluxe/glibc29.patch b/nixpkgs/pkgs/games/kobodeluxe/glibc29.patch
index 7a9ef355a82..7a9ef355a82 100644
--- a/pkgs/games/kobodeluxe/glibc29.patch
+++ b/nixpkgs/pkgs/games/kobodeluxe/glibc29.patch
diff --git a/pkgs/games/lbreakout2/default.nix b/nixpkgs/pkgs/games/lbreakout2/default.nix
index 0e6941a8acd..0e6941a8acd 100644
--- a/pkgs/games/lbreakout2/default.nix
+++ b/nixpkgs/pkgs/games/lbreakout2/default.nix
diff --git a/pkgs/games/leela-zero/default.nix b/nixpkgs/pkgs/games/leela-zero/default.nix
index d4621682cc6..d4621682cc6 100644
--- a/pkgs/games/leela-zero/default.nix
+++ b/nixpkgs/pkgs/games/leela-zero/default.nix
diff --git a/pkgs/games/lgogdownloader/default.nix b/nixpkgs/pkgs/games/lgogdownloader/default.nix
index dc6ebd396ed..dc6ebd396ed 100644
--- a/pkgs/games/lgogdownloader/default.nix
+++ b/nixpkgs/pkgs/games/lgogdownloader/default.nix
diff --git a/pkgs/games/liberal-crime-squad/default.nix b/nixpkgs/pkgs/games/liberal-crime-squad/default.nix
index 0811c01aa79..0811c01aa79 100644
--- a/pkgs/games/liberal-crime-squad/default.nix
+++ b/nixpkgs/pkgs/games/liberal-crime-squad/default.nix
diff --git a/pkgs/games/lincity/default.nix b/nixpkgs/pkgs/games/lincity/default.nix
index fb98b1a3811..fb98b1a3811 100644
--- a/pkgs/games/lincity/default.nix
+++ b/nixpkgs/pkgs/games/lincity/default.nix
diff --git a/pkgs/games/lincity/ng.nix b/nixpkgs/pkgs/games/lincity/ng.nix
index 67f15be1ed3..67f15be1ed3 100644
--- a/pkgs/games/lincity/ng.nix
+++ b/nixpkgs/pkgs/games/lincity/ng.nix
diff --git a/pkgs/games/linux-steam-integration/default.nix b/nixpkgs/pkgs/games/linux-steam-integration/default.nix
index a3c9599e7b1..a3c9599e7b1 100644
--- a/pkgs/games/linux-steam-integration/default.nix
+++ b/nixpkgs/pkgs/games/linux-steam-integration/default.nix
diff --git a/pkgs/games/liquidwar/5.nix b/nixpkgs/pkgs/games/liquidwar/5.nix
index 5c42b8ecaab..5c42b8ecaab 100644
--- a/pkgs/games/liquidwar/5.nix
+++ b/nixpkgs/pkgs/games/liquidwar/5.nix
diff --git a/pkgs/games/liquidwar/default.nix b/nixpkgs/pkgs/games/liquidwar/default.nix
index 800ac0fc4c7..800ac0fc4c7 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/nixpkgs/pkgs/games/liquidwar/default.nix
diff --git a/pkgs/games/ltris/default.nix b/nixpkgs/pkgs/games/ltris/default.nix
index d580d7586ff..d580d7586ff 100644
--- a/pkgs/games/ltris/default.nix
+++ b/nixpkgs/pkgs/games/ltris/default.nix
diff --git a/pkgs/games/ltris/gcc5_compliance.diff b/nixpkgs/pkgs/games/ltris/gcc5_compliance.diff
index bf53fcf8467..bf53fcf8467 100644
--- a/pkgs/games/ltris/gcc5_compliance.diff
+++ b/nixpkgs/pkgs/games/ltris/gcc5_compliance.diff
diff --git a/pkgs/games/lugaru/default.nix b/nixpkgs/pkgs/games/lugaru/default.nix
index cad98650c24..cad98650c24 100644
--- a/pkgs/games/lugaru/default.nix
+++ b/nixpkgs/pkgs/games/lugaru/default.nix
diff --git a/pkgs/games/macopix/default.nix b/nixpkgs/pkgs/games/macopix/default.nix
index 7879b68c857..7879b68c857 100644
--- a/pkgs/games/macopix/default.nix
+++ b/nixpkgs/pkgs/games/macopix/default.nix
diff --git a/pkgs/games/mar1d/default.nix b/nixpkgs/pkgs/games/mar1d/default.nix
index ed0b2be0d97..ed0b2be0d97 100644
--- a/pkgs/games/mar1d/default.nix
+++ b/nixpkgs/pkgs/games/mar1d/default.nix
diff --git a/pkgs/games/mars/default.nix b/nixpkgs/pkgs/games/mars/default.nix
index ed926461db2..ed926461db2 100644
--- a/pkgs/games/mars/default.nix
+++ b/nixpkgs/pkgs/games/mars/default.nix
diff --git a/pkgs/games/mars/fix-gluortho2d.patch b/nixpkgs/pkgs/games/mars/fix-gluortho2d.patch
index 15a5c07060e..15a5c07060e 100644
--- a/pkgs/games/mars/fix-gluortho2d.patch
+++ b/nixpkgs/pkgs/games/mars/fix-gluortho2d.patch
diff --git a/pkgs/games/mars/unbind_fix.patch b/nixpkgs/pkgs/games/mars/unbind_fix.patch
index 2aef6eb5cf6..2aef6eb5cf6 100644
--- a/pkgs/games/mars/unbind_fix.patch
+++ b/nixpkgs/pkgs/games/mars/unbind_fix.patch
diff --git a/pkgs/games/megaglest/default.nix b/nixpkgs/pkgs/games/megaglest/default.nix
index 14e0d881e09..14e0d881e09 100644
--- a/pkgs/games/megaglest/default.nix
+++ b/nixpkgs/pkgs/games/megaglest/default.nix
diff --git a/pkgs/games/meritous/default.nix b/nixpkgs/pkgs/games/meritous/default.nix
index 4a37fc8f676..4a37fc8f676 100644
--- a/pkgs/games/meritous/default.nix
+++ b/nixpkgs/pkgs/games/meritous/default.nix
diff --git a/pkgs/games/mindustry/default.nix b/nixpkgs/pkgs/games/mindustry/default.nix
index 3d4f52f2c70..3d4f52f2c70 100644
--- a/pkgs/games/mindustry/default.nix
+++ b/nixpkgs/pkgs/games/mindustry/default.nix
diff --git a/pkgs/games/minecraft-server/default.nix b/nixpkgs/pkgs/games/minecraft-server/default.nix
index 4751660af3a..4751660af3a 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/nixpkgs/pkgs/games/minecraft-server/default.nix
diff --git a/pkgs/games/minecraft/default.nix b/nixpkgs/pkgs/games/minecraft/default.nix
index 5bc2157a70b..5bc2157a70b 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/nixpkgs/pkgs/games/minecraft/default.nix
diff --git a/pkgs/games/minecraft/update.sh b/nixpkgs/pkgs/games/minecraft/update.sh
index 02b362e839b..02b362e839b 100755
--- a/pkgs/games/minecraft/update.sh
+++ b/nixpkgs/pkgs/games/minecraft/update.sh
diff --git a/pkgs/games/minetest/default.nix b/nixpkgs/pkgs/games/minetest/default.nix
index 02a53d06506..02a53d06506 100644
--- a/pkgs/games/minetest/default.nix
+++ b/nixpkgs/pkgs/games/minetest/default.nix
diff --git a/pkgs/games/mnemosyne/default.nix b/nixpkgs/pkgs/games/mnemosyne/default.nix
index 5c65203c93a..5c65203c93a 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/nixpkgs/pkgs/games/mnemosyne/default.nix
diff --git a/pkgs/games/moon-buggy/default.nix b/nixpkgs/pkgs/games/moon-buggy/default.nix
index d0c07b71e2e..d0c07b71e2e 100644
--- a/pkgs/games/moon-buggy/default.nix
+++ b/nixpkgs/pkgs/games/moon-buggy/default.nix
diff --git a/pkgs/games/mrrescue/default.nix b/nixpkgs/pkgs/games/mrrescue/default.nix
index e8138f81232..e8138f81232 100644
--- a/pkgs/games/mrrescue/default.nix
+++ b/nixpkgs/pkgs/games/mrrescue/default.nix
diff --git a/pkgs/games/mudlet/default.nix b/nixpkgs/pkgs/games/mudlet/default.nix
index a402587ed8b..a402587ed8b 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/nixpkgs/pkgs/games/mudlet/default.nix
diff --git a/pkgs/games/multimc/default.nix b/nixpkgs/pkgs/games/multimc/default.nix
index e6fa064f387..e6fa064f387 100644
--- a/pkgs/games/multimc/default.nix
+++ b/nixpkgs/pkgs/games/multimc/default.nix
diff --git a/pkgs/games/n2048/default.nix b/nixpkgs/pkgs/games/n2048/default.nix
index ae086af184c..ae086af184c 100644
--- a/pkgs/games/n2048/default.nix
+++ b/nixpkgs/pkgs/games/n2048/default.nix
diff --git a/pkgs/games/naev/default.nix b/nixpkgs/pkgs/games/naev/default.nix
index a1b525ff093..a1b525ff093 100644
--- a/pkgs/games/naev/default.nix
+++ b/nixpkgs/pkgs/games/naev/default.nix
diff --git a/pkgs/games/nethack/default.nix b/nixpkgs/pkgs/games/nethack/default.nix
index 07f84e498db..07f84e498db 100644
--- a/pkgs/games/nethack/default.nix
+++ b/nixpkgs/pkgs/games/nethack/default.nix
diff --git a/pkgs/games/neverball/default.nix b/nixpkgs/pkgs/games/neverball/default.nix
index daba54ce810..daba54ce810 100644
--- a/pkgs/games/neverball/default.nix
+++ b/nixpkgs/pkgs/games/neverball/default.nix
diff --git a/pkgs/games/newtonwars/default.nix b/nixpkgs/pkgs/games/newtonwars/default.nix
index 093f071c723..093f071c723 100644
--- a/pkgs/games/newtonwars/default.nix
+++ b/nixpkgs/pkgs/games/newtonwars/default.nix
diff --git a/pkgs/games/nexuiz/default.nix b/nixpkgs/pkgs/games/nexuiz/default.nix
index 9f8d228e716..9f8d228e716 100644
--- a/pkgs/games/nexuiz/default.nix
+++ b/nixpkgs/pkgs/games/nexuiz/default.nix
diff --git a/pkgs/games/njam/default.nix b/nixpkgs/pkgs/games/njam/default.nix
index 6f700ad3204..6f700ad3204 100644
--- a/pkgs/games/njam/default.nix
+++ b/nixpkgs/pkgs/games/njam/default.nix
diff --git a/pkgs/games/njam/logfile.patch b/nixpkgs/pkgs/games/njam/logfile.patch
index 45fd82a0845..45fd82a0845 100644
--- a/pkgs/games/njam/logfile.patch
+++ b/nixpkgs/pkgs/games/njam/logfile.patch
diff --git a/pkgs/games/nudoku/default.nix b/nixpkgs/pkgs/games/nudoku/default.nix
index b9e521bce36..b9e521bce36 100644
--- a/pkgs/games/nudoku/default.nix
+++ b/nixpkgs/pkgs/games/nudoku/default.nix
diff --git a/pkgs/games/nxengine-evo/default.nix b/nixpkgs/pkgs/games/nxengine-evo/default.nix
index 909737a6804..909737a6804 100644
--- a/pkgs/games/nxengine-evo/default.nix
+++ b/nixpkgs/pkgs/games/nxengine-evo/default.nix
diff --git a/pkgs/games/odamex/default.nix b/nixpkgs/pkgs/games/odamex/default.nix
index 2afb259ea43..2afb259ea43 100644
--- a/pkgs/games/odamex/default.nix
+++ b/nixpkgs/pkgs/games/odamex/default.nix
diff --git a/pkgs/games/oilrush/default.nix b/nixpkgs/pkgs/games/oilrush/default.nix
index 1d56d86f530..1d56d86f530 100644
--- a/pkgs/games/oilrush/default.nix
+++ b/nixpkgs/pkgs/games/oilrush/default.nix
diff --git a/pkgs/games/onscripter-en/default.nix b/nixpkgs/pkgs/games/onscripter-en/default.nix
index 2ad23a72368..2ad23a72368 100644
--- a/pkgs/games/onscripter-en/default.nix
+++ b/nixpkgs/pkgs/games/onscripter-en/default.nix
diff --git a/pkgs/games/openarena/default.nix b/nixpkgs/pkgs/games/openarena/default.nix
index 1e839c46f0f..1e839c46f0f 100644
--- a/pkgs/games/openarena/default.nix
+++ b/nixpkgs/pkgs/games/openarena/default.nix
diff --git a/pkgs/games/openclonk/default.nix b/nixpkgs/pkgs/games/openclonk/default.nix
index cce643e9f7d..cce643e9f7d 100644
--- a/pkgs/games/openclonk/default.nix
+++ b/nixpkgs/pkgs/games/openclonk/default.nix
diff --git a/pkgs/games/opendune/default.nix b/nixpkgs/pkgs/games/opendune/default.nix
index 751eb6d5933..751eb6d5933 100644
--- a/pkgs/games/opendune/default.nix
+++ b/nixpkgs/pkgs/games/opendune/default.nix
diff --git a/pkgs/games/opendungeons/cmakepaths.patch b/nixpkgs/pkgs/games/opendungeons/cmakepaths.patch
index bcffd7a22bc..bcffd7a22bc 100644
--- a/pkgs/games/opendungeons/cmakepaths.patch
+++ b/nixpkgs/pkgs/games/opendungeons/cmakepaths.patch
diff --git a/pkgs/games/opendungeons/default.nix b/nixpkgs/pkgs/games/opendungeons/default.nix
index f6841abb1d0..f6841abb1d0 100644
--- a/pkgs/games/opendungeons/default.nix
+++ b/nixpkgs/pkgs/games/opendungeons/default.nix
diff --git a/pkgs/games/openjk/default.nix b/nixpkgs/pkgs/games/openjk/default.nix
index fd12c901583..fd12c901583 100644
--- a/pkgs/games/openjk/default.nix
+++ b/nixpkgs/pkgs/games/openjk/default.nix
diff --git a/pkgs/games/openlierox/default.nix b/nixpkgs/pkgs/games/openlierox/default.nix
index 4b1385f3e10..4b1385f3e10 100644
--- a/pkgs/games/openlierox/default.nix
+++ b/nixpkgs/pkgs/games/openlierox/default.nix
diff --git a/pkgs/games/openmw/default.nix b/nixpkgs/pkgs/games/openmw/default.nix
index d9c992199c4..d9c992199c4 100644
--- a/pkgs/games/openmw/default.nix
+++ b/nixpkgs/pkgs/games/openmw/default.nix
diff --git a/pkgs/games/openmw/tes3mp.nix b/nixpkgs/pkgs/games/openmw/tes3mp.nix
index 4bbddfbb1df..4bbddfbb1df 100644
--- a/pkgs/games/openmw/tes3mp.nix
+++ b/nixpkgs/pkgs/games/openmw/tes3mp.nix
diff --git a/pkgs/games/openra/common.nix b/nixpkgs/pkgs/games/openra/common.nix
index 51f94177177..51f94177177 100644
--- a/pkgs/games/openra/common.nix
+++ b/nixpkgs/pkgs/games/openra/common.nix
diff --git a/pkgs/games/openra/default.nix b/nixpkgs/pkgs/games/openra/default.nix
index 2e8533f7816..2e8533f7816 100644
--- a/pkgs/games/openra/default.nix
+++ b/nixpkgs/pkgs/games/openra/default.nix
diff --git a/pkgs/games/openra/engine.nix b/nixpkgs/pkgs/games/openra/engine.nix
index 7d2d007d075..7d2d007d075 100644
--- a/pkgs/games/openra/engine.nix
+++ b/nixpkgs/pkgs/games/openra/engine.nix
diff --git a/pkgs/games/openra/engines.nix b/nixpkgs/pkgs/games/openra/engines.nix
index 1c3d2308d97..1c3d2308d97 100644
--- a/pkgs/games/openra/engines.nix
+++ b/nixpkgs/pkgs/games/openra/engines.nix
diff --git a/pkgs/games/openra/mkdirp.sh b/nixpkgs/pkgs/games/openra/mkdirp.sh
index 7b2cf0b89c0..7b2cf0b89c0 100644
--- a/pkgs/games/openra/mkdirp.sh
+++ b/nixpkgs/pkgs/games/openra/mkdirp.sh
diff --git a/pkgs/games/openra/mod-launch-game.sh b/nixpkgs/pkgs/games/openra/mod-launch-game.sh
index 88b53e71e1b..88b53e71e1b 100644
--- a/pkgs/games/openra/mod-launch-game.sh
+++ b/nixpkgs/pkgs/games/openra/mod-launch-game.sh
diff --git a/pkgs/games/openra/mod-update.sh b/nixpkgs/pkgs/games/openra/mod-update.sh
index 8489d5a97a7..8489d5a97a7 100755
--- a/pkgs/games/openra/mod-update.sh
+++ b/nixpkgs/pkgs/games/openra/mod-update.sh
diff --git a/pkgs/games/openra/mod.nix b/nixpkgs/pkgs/games/openra/mod.nix
index 8df5922a441..8df5922a441 100644
--- a/pkgs/games/openra/mod.nix
+++ b/nixpkgs/pkgs/games/openra/mod.nix
diff --git a/pkgs/games/openra/mods.nix b/nixpkgs/pkgs/games/openra/mods.nix
index a045e365ece..a045e365ece 100644
--- a/pkgs/games/openra/mods.nix
+++ b/nixpkgs/pkgs/games/openra/mods.nix
diff --git a/pkgs/games/openra/openra-mod.desktop b/nixpkgs/pkgs/games/openra/openra-mod.desktop
index 090b6c1325d..090b6c1325d 100644
--- a/pkgs/games/openra/openra-mod.desktop
+++ b/nixpkgs/pkgs/games/openra/openra-mod.desktop
diff --git a/pkgs/games/openra/packages.nix b/nixpkgs/pkgs/games/openra/packages.nix
index c09b697771a..c09b697771a 100644
--- a/pkgs/games/openra/packages.nix
+++ b/nixpkgs/pkgs/games/openra/packages.nix
diff --git a/pkgs/games/openrct2/default.nix b/nixpkgs/pkgs/games/openrct2/default.nix
index 1dbb14c9497..1dbb14c9497 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/nixpkgs/pkgs/games/openrct2/default.nix
diff --git a/pkgs/games/openrw/default.nix b/nixpkgs/pkgs/games/openrw/default.nix
index 04d8afd2786..04d8afd2786 100644
--- a/pkgs/games/openrw/default.nix
+++ b/nixpkgs/pkgs/games/openrw/default.nix
diff --git a/pkgs/games/openspades/default.nix b/nixpkgs/pkgs/games/openspades/default.nix
index b00524461a4..b00524461a4 100644
--- a/pkgs/games/openspades/default.nix
+++ b/nixpkgs/pkgs/games/openspades/default.nix
diff --git a/pkgs/games/openttd/default.nix b/nixpkgs/pkgs/games/openttd/default.nix
index 704ef3c327e..704ef3c327e 100644
--- a/pkgs/games/openttd/default.nix
+++ b/nixpkgs/pkgs/games/openttd/default.nix
diff --git a/pkgs/games/opentyrian/default.nix b/nixpkgs/pkgs/games/opentyrian/default.nix
index 2dae58df976..2dae58df976 100644
--- a/pkgs/games/opentyrian/default.nix
+++ b/nixpkgs/pkgs/games/opentyrian/default.nix
diff --git a/pkgs/games/openxcom/default.nix b/nixpkgs/pkgs/games/openxcom/default.nix
index a77b8f2ba4c..a77b8f2ba4c 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/nixpkgs/pkgs/games/openxcom/default.nix
diff --git a/pkgs/games/openxray/default.nix b/nixpkgs/pkgs/games/openxray/default.nix
index c115833d848..c115833d848 100644
--- a/pkgs/games/openxray/default.nix
+++ b/nixpkgs/pkgs/games/openxray/default.nix
diff --git a/pkgs/games/orthorobot/default.nix b/nixpkgs/pkgs/games/orthorobot/default.nix
index 97fb3ebd19f..97fb3ebd19f 100644
--- a/pkgs/games/orthorobot/default.nix
+++ b/nixpkgs/pkgs/games/orthorobot/default.nix
diff --git a/pkgs/games/pacvim/default.nix b/nixpkgs/pkgs/games/pacvim/default.nix
index d7805ad66fb..d7805ad66fb 100644
--- a/pkgs/games/pacvim/default.nix
+++ b/nixpkgs/pkgs/games/pacvim/default.nix
diff --git a/pkgs/games/pentobi/default.nix b/nixpkgs/pkgs/games/pentobi/default.nix
index 2dc196c33cc..2dc196c33cc 100644
--- a/pkgs/games/pentobi/default.nix
+++ b/nixpkgs/pkgs/games/pentobi/default.nix
diff --git a/pkgs/games/performous/default.nix b/nixpkgs/pkgs/games/performous/default.nix
index 28487a7f8e8..28487a7f8e8 100644
--- a/pkgs/games/performous/default.nix
+++ b/nixpkgs/pkgs/games/performous/default.nix
diff --git a/pkgs/games/pingus/default.nix b/nixpkgs/pkgs/games/pingus/default.nix
index 628493a34b1..628493a34b1 100644
--- a/pkgs/games/pingus/default.nix
+++ b/nixpkgs/pkgs/games/pingus/default.nix
diff --git a/pkgs/games/pingus/default.upstream b/nixpkgs/pkgs/games/pingus/default.upstream
index 6b4eb31aa5f..6b4eb31aa5f 100644
--- a/pkgs/games/pingus/default.upstream
+++ b/nixpkgs/pkgs/games/pingus/default.upstream
diff --git a/pkgs/games/pioneer/default.nix b/nixpkgs/pkgs/games/pioneer/default.nix
index cb9fe730f19..cb9fe730f19 100644
--- a/pkgs/games/pioneer/default.nix
+++ b/nixpkgs/pkgs/games/pioneer/default.nix
diff --git a/pkgs/games/pioneers/default.nix b/nixpkgs/pkgs/games/pioneers/default.nix
index 53de9fa29e2..53de9fa29e2 100644
--- a/pkgs/games/pioneers/default.nix
+++ b/nixpkgs/pkgs/games/pioneers/default.nix
diff --git a/pkgs/games/planetaryannihilation/default.nix b/nixpkgs/pkgs/games/planetaryannihilation/default.nix
index 74e3b897a03..74e3b897a03 100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/nixpkgs/pkgs/games/planetaryannihilation/default.nix
diff --git a/pkgs/games/pokerth/default.nix b/nixpkgs/pkgs/games/pokerth/default.nix
index 2e4ce270b82..2e4ce270b82 100644
--- a/pkgs/games/pokerth/default.nix
+++ b/nixpkgs/pkgs/games/pokerth/default.nix
diff --git a/pkgs/games/pong3d/default.nix b/nixpkgs/pkgs/games/pong3d/default.nix
index 74e5e50b4e8..74e5e50b4e8 100644
--- a/pkgs/games/pong3d/default.nix
+++ b/nixpkgs/pkgs/games/pong3d/default.nix
diff --git a/pkgs/games/prboom/default.nix b/nixpkgs/pkgs/games/prboom/default.nix
index ea6f8b01c71..ea6f8b01c71 100644
--- a/pkgs/games/prboom/default.nix
+++ b/nixpkgs/pkgs/games/prboom/default.nix
diff --git a/pkgs/games/privateer/0001-fix-VSFile-constructor.patch b/nixpkgs/pkgs/games/privateer/0001-fix-VSFile-constructor.patch
index 05b02fe5d73..05b02fe5d73 100644
--- a/pkgs/games/privateer/0001-fix-VSFile-constructor.patch
+++ b/nixpkgs/pkgs/games/privateer/0001-fix-VSFile-constructor.patch
diff --git a/pkgs/games/privateer/default.nix b/nixpkgs/pkgs/games/privateer/default.nix
index 607458f3798..607458f3798 100644
--- a/pkgs/games/privateer/default.nix
+++ b/nixpkgs/pkgs/games/privateer/default.nix
diff --git a/pkgs/games/pro-office-calculator/default.nix b/nixpkgs/pkgs/games/pro-office-calculator/default.nix
index 4cfd7de6a55..4cfd7de6a55 100644
--- a/pkgs/games/pro-office-calculator/default.nix
+++ b/nixpkgs/pkgs/games/pro-office-calculator/default.nix
diff --git a/pkgs/games/pysolfc/default.nix b/nixpkgs/pkgs/games/pysolfc/default.nix
index 48c06c0eab6..48c06c0eab6 100644
--- a/pkgs/games/pysolfc/default.nix
+++ b/nixpkgs/pkgs/games/pysolfc/default.nix
diff --git a/pkgs/games/pysolfc/pysolfc-datadir.patch b/nixpkgs/pkgs/games/pysolfc/pysolfc-datadir.patch
index d9f1cf4e09f..d9f1cf4e09f 100644
--- a/pkgs/games/pysolfc/pysolfc-datadir.patch
+++ b/nixpkgs/pkgs/games/pysolfc/pysolfc-datadir.patch
diff --git a/pkgs/games/qgo/default.nix b/nixpkgs/pkgs/games/qgo/default.nix
index 610be7efdce..610be7efdce 100644
--- a/pkgs/games/qgo/default.nix
+++ b/nixpkgs/pkgs/games/qgo/default.nix
diff --git a/pkgs/games/qgo/fix-paths.patch b/nixpkgs/pkgs/games/qgo/fix-paths.patch
index c1d1e399ec1..c1d1e399ec1 100644
--- a/pkgs/games/qgo/fix-paths.patch
+++ b/nixpkgs/pkgs/games/qgo/fix-paths.patch
diff --git a/pkgs/games/qqwing/default.nix b/nixpkgs/pkgs/games/qqwing/default.nix
index f161f53bfe1..f161f53bfe1 100644
--- a/pkgs/games/qqwing/default.nix
+++ b/nixpkgs/pkgs/games/qqwing/default.nix
diff --git a/pkgs/games/qtads/default.nix b/nixpkgs/pkgs/games/qtads/default.nix
index dda7799aacb..dda7799aacb 100644
--- a/pkgs/games/qtads/default.nix
+++ b/nixpkgs/pkgs/games/qtads/default.nix
diff --git a/pkgs/games/quake2/yquake2/default.nix b/nixpkgs/pkgs/games/quake2/yquake2/default.nix
index c831163be97..c831163be97 100644
--- a/pkgs/games/quake2/yquake2/default.nix
+++ b/nixpkgs/pkgs/games/quake2/yquake2/default.nix
diff --git a/pkgs/games/quake2/yquake2/games.nix b/nixpkgs/pkgs/games/quake2/yquake2/games.nix
index 059fb26eb9b..059fb26eb9b 100644
--- a/pkgs/games/quake2/yquake2/games.nix
+++ b/nixpkgs/pkgs/games/quake2/yquake2/games.nix
diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/nixpkgs/pkgs/games/quake2/yquake2/wrapper.nix
index 9ab086f96a2..9ab086f96a2 100644
--- a/pkgs/games/quake2/yquake2/wrapper.nix
+++ b/nixpkgs/pkgs/games/quake2/yquake2/wrapper.nix
diff --git a/pkgs/games/quake3/content/demo.nix b/nixpkgs/pkgs/games/quake3/content/demo.nix
index 0d8a64f14cd..0d8a64f14cd 100644
--- a/pkgs/games/quake3/content/demo.nix
+++ b/nixpkgs/pkgs/games/quake3/content/demo.nix
diff --git a/pkgs/games/quake3/content/pointrelease.nix b/nixpkgs/pkgs/games/quake3/content/pointrelease.nix
index e34064d93b0..e34064d93b0 100644
--- a/pkgs/games/quake3/content/pointrelease.nix
+++ b/nixpkgs/pkgs/games/quake3/content/pointrelease.nix
diff --git a/pkgs/games/quake3/ioquake/default.nix b/nixpkgs/pkgs/games/quake3/ioquake/default.nix
index a592455486b..a592455486b 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/nixpkgs/pkgs/games/quake3/ioquake/default.nix
diff --git a/pkgs/games/quake3/quake3e/default.nix b/nixpkgs/pkgs/games/quake3/quake3e/default.nix
index 1e179f2f956..1e179f2f956 100644
--- a/pkgs/games/quake3/quake3e/default.nix
+++ b/nixpkgs/pkgs/games/quake3/quake3e/default.nix
diff --git a/pkgs/games/quake3/wrapper/default.nix b/nixpkgs/pkgs/games/quake3/wrapper/default.nix
index 4ab53d67732..4ab53d67732 100644
--- a/pkgs/games/quake3/wrapper/default.nix
+++ b/nixpkgs/pkgs/games/quake3/wrapper/default.nix
diff --git a/pkgs/games/quakespasm/default.nix b/nixpkgs/pkgs/games/quakespasm/default.nix
index a8d740ea512..a8d740ea512 100644
--- a/pkgs/games/quakespasm/default.nix
+++ b/nixpkgs/pkgs/games/quakespasm/default.nix
diff --git a/pkgs/games/quakespasm/vulkan.nix b/nixpkgs/pkgs/games/quakespasm/vulkan.nix
index deca3bec9cc..deca3bec9cc 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/nixpkgs/pkgs/games/quakespasm/vulkan.nix
diff --git a/pkgs/games/quantumminigolf/default.nix b/nixpkgs/pkgs/games/quantumminigolf/default.nix
index 1a8cbbea5f9..1a8cbbea5f9 100644
--- a/pkgs/games/quantumminigolf/default.nix
+++ b/nixpkgs/pkgs/games/quantumminigolf/default.nix
diff --git a/pkgs/games/quantumminigolf/default.upstream b/nixpkgs/pkgs/games/quantumminigolf/default.upstream
index a994bb1a6cb..a994bb1a6cb 100644
--- a/pkgs/games/quantumminigolf/default.upstream
+++ b/nixpkgs/pkgs/games/quantumminigolf/default.upstream
diff --git a/pkgs/games/racer/default.nix b/nixpkgs/pkgs/games/racer/default.nix
index 1347f88cc2c..1347f88cc2c 100644
--- a/pkgs/games/racer/default.nix
+++ b/nixpkgs/pkgs/games/racer/default.nix
diff --git a/pkgs/games/racer/mkdir.patch b/nixpkgs/pkgs/games/racer/mkdir.patch
index 910eaf390f4..910eaf390f4 100644
--- a/pkgs/games/racer/mkdir.patch
+++ b/nixpkgs/pkgs/games/racer/mkdir.patch
diff --git a/pkgs/games/redeclipse/default.nix b/nixpkgs/pkgs/games/redeclipse/default.nix
index 3002fc75e63..3002fc75e63 100644
--- a/pkgs/games/redeclipse/default.nix
+++ b/nixpkgs/pkgs/games/redeclipse/default.nix
diff --git a/pkgs/games/residualvm/default.nix b/nixpkgs/pkgs/games/residualvm/default.nix
index 9b0cfaa3b50..9b0cfaa3b50 100644
--- a/pkgs/games/residualvm/default.nix
+++ b/nixpkgs/pkgs/games/residualvm/default.nix
diff --git a/pkgs/games/rftg/default.nix b/nixpkgs/pkgs/games/rftg/default.nix
index 9ab63553053..9ab63553053 100644
--- a/pkgs/games/rftg/default.nix
+++ b/nixpkgs/pkgs/games/rftg/default.nix
diff --git a/pkgs/games/rigsofrods/default.nix b/nixpkgs/pkgs/games/rigsofrods/default.nix
index 00faee7b928..00faee7b928 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/nixpkgs/pkgs/games/rigsofrods/default.nix
diff --git a/pkgs/games/riko4/default.nix b/nixpkgs/pkgs/games/riko4/default.nix
index 1ddca346fbb..1ddca346fbb 100644
--- a/pkgs/games/riko4/default.nix
+++ b/nixpkgs/pkgs/games/riko4/default.nix
diff --git a/pkgs/games/rili/default.nix b/nixpkgs/pkgs/games/rili/default.nix
index df89f9dc743..df89f9dc743 100644
--- a/pkgs/games/rili/default.nix
+++ b/nixpkgs/pkgs/games/rili/default.nix
diff --git a/pkgs/games/rili/moderinze_cpp.patch b/nixpkgs/pkgs/games/rili/moderinze_cpp.patch
index 3d076afb39e..3d076afb39e 100644
--- a/pkgs/games/rili/moderinze_cpp.patch
+++ b/nixpkgs/pkgs/games/rili/moderinze_cpp.patch
diff --git a/pkgs/games/rimshot/default.nix b/nixpkgs/pkgs/games/rimshot/default.nix
index c940c90b884..c940c90b884 100644
--- a/pkgs/games/rimshot/default.nix
+++ b/nixpkgs/pkgs/games/rimshot/default.nix
diff --git a/pkgs/games/robotfindskitten/default.nix b/nixpkgs/pkgs/games/robotfindskitten/default.nix
index fa1eb338a89..fa1eb338a89 100644
--- a/pkgs/games/robotfindskitten/default.nix
+++ b/nixpkgs/pkgs/games/robotfindskitten/default.nix
diff --git a/pkgs/games/rocksndiamonds/default.nix b/nixpkgs/pkgs/games/rocksndiamonds/default.nix
index c0b07814aa5..c0b07814aa5 100644
--- a/pkgs/games/rocksndiamonds/default.nix
+++ b/nixpkgs/pkgs/games/rocksndiamonds/default.nix
diff --git a/pkgs/games/rogue/default.nix b/nixpkgs/pkgs/games/rogue/default.nix
index 1e27d67eb03..1e27d67eb03 100644
--- a/pkgs/games/rogue/default.nix
+++ b/nixpkgs/pkgs/games/rogue/default.nix
diff --git a/pkgs/games/rrootage/default.nix b/nixpkgs/pkgs/games/rrootage/default.nix
index 459ff238b4a..459ff238b4a 100644
--- a/pkgs/games/rrootage/default.nix
+++ b/nixpkgs/pkgs/games/rrootage/default.nix
diff --git a/pkgs/games/runelite/default.nix b/nixpkgs/pkgs/games/runelite/default.nix
index 9b6ca4f7c05..9b6ca4f7c05 100644
--- a/pkgs/games/runelite/default.nix
+++ b/nixpkgs/pkgs/games/runelite/default.nix
diff --git a/pkgs/games/sauerbraten/default.nix b/nixpkgs/pkgs/games/sauerbraten/default.nix
index c4119ee4363..c4119ee4363 100644
--- a/pkgs/games/sauerbraten/default.nix
+++ b/nixpkgs/pkgs/games/sauerbraten/default.nix
diff --git a/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch b/nixpkgs/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch
index 63f31d7ef9e..63f31d7ef9e 100644
--- a/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch
+++ b/nixpkgs/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch
diff --git a/pkgs/games/scid-vs-pc/default.nix b/nixpkgs/pkgs/games/scid-vs-pc/default.nix
index 345ce33fca0..345ce33fca0 100644
--- a/pkgs/games/scid-vs-pc/default.nix
+++ b/nixpkgs/pkgs/games/scid-vs-pc/default.nix
diff --git a/pkgs/games/scid/default.nix b/nixpkgs/pkgs/games/scid/default.nix
index 048a8fdc09b..048a8fdc09b 100644
--- a/pkgs/games/scid/default.nix
+++ b/nixpkgs/pkgs/games/scid/default.nix
diff --git a/pkgs/games/scorched3d/default.nix b/nixpkgs/pkgs/games/scorched3d/default.nix
index c86df396ff1..c86df396ff1 100644
--- a/pkgs/games/scorched3d/default.nix
+++ b/nixpkgs/pkgs/games/scorched3d/default.nix
diff --git a/pkgs/games/scorched3d/file-existence.patch b/nixpkgs/pkgs/games/scorched3d/file-existence.patch
index 35eb63d0702..35eb63d0702 100644
--- a/pkgs/games/scorched3d/file-existence.patch
+++ b/nixpkgs/pkgs/games/scorched3d/file-existence.patch
diff --git a/pkgs/games/scrolls/default.nix b/nixpkgs/pkgs/games/scrolls/default.nix
index b8bf4efcf0a..b8bf4efcf0a 100644
--- a/pkgs/games/scrolls/default.nix
+++ b/nixpkgs/pkgs/games/scrolls/default.nix
diff --git a/pkgs/games/scummvm/default.nix b/nixpkgs/pkgs/games/scummvm/default.nix
index 80fa840cc69..80fa840cc69 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/nixpkgs/pkgs/games/scummvm/default.nix
diff --git a/pkgs/games/scummvm/games.nix b/nixpkgs/pkgs/games/scummvm/games.nix
index a96250e7acb..a96250e7acb 100644
--- a/pkgs/games/scummvm/games.nix
+++ b/nixpkgs/pkgs/games/scummvm/games.nix
diff --git a/pkgs/games/sgt-puzzles/default.nix b/nixpkgs/pkgs/games/sgt-puzzles/default.nix
index 8349be64264..8349be64264 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/nixpkgs/pkgs/games/sgt-puzzles/default.nix
diff --git a/pkgs/games/sgt-puzzles/default.upstream b/nixpkgs/pkgs/games/sgt-puzzles/default.upstream
index b6d048b68ae..b6d048b68ae 100644
--- a/pkgs/games/sgt-puzzles/default.upstream
+++ b/nixpkgs/pkgs/games/sgt-puzzles/default.upstream
diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix
index f96f61764b5..f96f61764b5 100644
--- a/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix
diff --git a/pkgs/games/sienna/default.nix b/nixpkgs/pkgs/games/sienna/default.nix
index ed6ac781cae..ed6ac781cae 100644
--- a/pkgs/games/sienna/default.nix
+++ b/nixpkgs/pkgs/games/sienna/default.nix
diff --git a/pkgs/games/sil/default.nix b/nixpkgs/pkgs/games/sil/default.nix
index a998a86370d..a998a86370d 100644
--- a/pkgs/games/sil/default.nix
+++ b/nixpkgs/pkgs/games/sil/default.nix
diff --git a/pkgs/games/simutrans/default.nix b/nixpkgs/pkgs/games/simutrans/default.nix
index 50be7b55203..50be7b55203 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/nixpkgs/pkgs/games/simutrans/default.nix
diff --git a/pkgs/games/snake4/default.nix b/nixpkgs/pkgs/games/snake4/default.nix
index b3a74d0f4fb..b3a74d0f4fb 100644
--- a/pkgs/games/snake4/default.nix
+++ b/nixpkgs/pkgs/games/snake4/default.nix
diff --git a/pkgs/games/snipes/default.nix b/nixpkgs/pkgs/games/snipes/default.nix
index e035bc436cc..e035bc436cc 100644
--- a/pkgs/games/snipes/default.nix
+++ b/nixpkgs/pkgs/games/snipes/default.nix
diff --git a/pkgs/games/soi/default.nix b/nixpkgs/pkgs/games/soi/default.nix
index 7179c4f48b5..7179c4f48b5 100644
--- a/pkgs/games/soi/default.nix
+++ b/nixpkgs/pkgs/games/soi/default.nix
diff --git a/pkgs/games/solarus/default.nix b/nixpkgs/pkgs/games/solarus/default.nix
index 68d0f642aef..68d0f642aef 100644
--- a/pkgs/games/solarus/default.nix
+++ b/nixpkgs/pkgs/games/solarus/default.nix
diff --git a/pkgs/games/space-orbit/default.nix b/nixpkgs/pkgs/games/space-orbit/default.nix
index e9fe6257fb6..e9fe6257fb6 100644
--- a/pkgs/games/space-orbit/default.nix
+++ b/nixpkgs/pkgs/games/space-orbit/default.nix
diff --git a/pkgs/games/speed-dreams/default.nix b/nixpkgs/pkgs/games/speed-dreams/default.nix
index 473409ffae9..473409ffae9 100644
--- a/pkgs/games/speed-dreams/default.nix
+++ b/nixpkgs/pkgs/games/speed-dreams/default.nix
diff --git a/pkgs/games/spring/default.nix b/nixpkgs/pkgs/games/spring/default.nix
index 8f43a6d84b1..8f43a6d84b1 100644
--- a/pkgs/games/spring/default.nix
+++ b/nixpkgs/pkgs/games/spring/default.nix
diff --git a/pkgs/games/spring/fix-certs.patch b/nixpkgs/pkgs/games/spring/fix-certs.patch
index b31160a05cc..b31160a05cc 100644
--- a/pkgs/games/spring/fix-certs.patch
+++ b/nixpkgs/pkgs/games/spring/fix-certs.patch
diff --git a/pkgs/games/spring/revert_58b423e.patch b/nixpkgs/pkgs/games/spring/revert_58b423e.patch
index 79a42cefa5a..79a42cefa5a 100644
--- a/pkgs/games/spring/revert_58b423e.patch
+++ b/nixpkgs/pkgs/games/spring/revert_58b423e.patch
diff --git a/pkgs/games/spring/springlobby.nix b/nixpkgs/pkgs/games/spring/springlobby.nix
index dbcec10fdc6..dbcec10fdc6 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/nixpkgs/pkgs/games/spring/springlobby.nix
diff --git a/pkgs/games/stardust/default.nix b/nixpkgs/pkgs/games/stardust/default.nix
index 1e2089b9c50..1e2089b9c50 100644
--- a/pkgs/games/stardust/default.nix
+++ b/nixpkgs/pkgs/games/stardust/default.nix
diff --git a/pkgs/games/steam/build-runtime.py b/nixpkgs/pkgs/games/steam/build-runtime.py
index e0ff5cebd93..e0ff5cebd93 100644
--- a/pkgs/games/steam/build-runtime.py
+++ b/nixpkgs/pkgs/games/steam/build-runtime.py
diff --git a/pkgs/games/steam/build-wrapped.sh b/nixpkgs/pkgs/games/steam/build-wrapped.sh
index ddf974671a0..ddf974671a0 100644
--- a/pkgs/games/steam/build-wrapped.sh
+++ b/nixpkgs/pkgs/games/steam/build-wrapped.sh
diff --git a/pkgs/games/steam/chrootenv.nix b/nixpkgs/pkgs/games/steam/chrootenv.nix
index 1a930b287af..1a930b287af 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/nixpkgs/pkgs/games/steam/chrootenv.nix
diff --git a/pkgs/games/steam/default.nix b/nixpkgs/pkgs/games/steam/default.nix
index 5aab54b8322..5aab54b8322 100644
--- a/pkgs/games/steam/default.nix
+++ b/nixpkgs/pkgs/games/steam/default.nix
diff --git a/pkgs/games/steam/fonts.nix b/nixpkgs/pkgs/games/steam/fonts.nix
index dab393a86fb..dab393a86fb 100644
--- a/pkgs/games/steam/fonts.nix
+++ b/nixpkgs/pkgs/games/steam/fonts.nix
diff --git a/pkgs/games/steam/runtime-generated.nix b/nixpkgs/pkgs/games/steam/runtime-generated.nix
index bb4decfda4d..bb4decfda4d 100644
--- a/pkgs/games/steam/runtime-generated.nix
+++ b/nixpkgs/pkgs/games/steam/runtime-generated.nix
diff --git a/pkgs/games/steam/runtime-mirror.nix b/nixpkgs/pkgs/games/steam/runtime-mirror.nix
index 49986a346e8..49986a346e8 100644
--- a/pkgs/games/steam/runtime-mirror.nix
+++ b/nixpkgs/pkgs/games/steam/runtime-mirror.nix
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/nixpkgs/pkgs/games/steam/runtime-wrapped.nix
index 8e4f5b866bb..8e4f5b866bb 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/nixpkgs/pkgs/games/steam/runtime-wrapped.nix
diff --git a/pkgs/games/steam/runtime.nix b/nixpkgs/pkgs/games/steam/runtime.nix
index 1fa17c32d6c..1fa17c32d6c 100644
--- a/pkgs/games/steam/runtime.nix
+++ b/nixpkgs/pkgs/games/steam/runtime.nix
diff --git a/pkgs/games/steam/steam.nix b/nixpkgs/pkgs/games/steam/steam.nix
index 0276122655f..0276122655f 100644
--- a/pkgs/games/steam/steam.nix
+++ b/nixpkgs/pkgs/games/steam/steam.nix
diff --git a/pkgs/games/steam/steamcmd.nix b/nixpkgs/pkgs/games/steam/steamcmd.nix
index a38122702f2..a38122702f2 100644
--- a/pkgs/games/steam/steamcmd.nix
+++ b/nixpkgs/pkgs/games/steam/steamcmd.nix
diff --git a/pkgs/games/steam/steamcmd.sh b/nixpkgs/pkgs/games/steam/steamcmd.sh
index 588badb41a1..588badb41a1 100644
--- a/pkgs/games/steam/steamcmd.sh
+++ b/nixpkgs/pkgs/games/steam/steamcmd.sh
diff --git a/pkgs/games/steam/update-runtime-shell.nix b/nixpkgs/pkgs/games/steam/update-runtime-shell.nix
index bb9362b9bf0..bb9362b9bf0 100644
--- a/pkgs/games/steam/update-runtime-shell.nix
+++ b/nixpkgs/pkgs/games/steam/update-runtime-shell.nix
diff --git a/pkgs/games/steam/update-runtime.py b/nixpkgs/pkgs/games/steam/update-runtime.py
index d33165b309d..d33165b309d 100755
--- a/pkgs/games/steam/update-runtime.py
+++ b/nixpkgs/pkgs/games/steam/update-runtime.py
diff --git a/pkgs/games/stepmania/default.nix b/nixpkgs/pkgs/games/stepmania/default.nix
index 71524c244ee..71524c244ee 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/nixpkgs/pkgs/games/stepmania/default.nix
diff --git a/pkgs/games/stockfish/default.nix b/nixpkgs/pkgs/games/stockfish/default.nix
index 1919383048e..1919383048e 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/nixpkgs/pkgs/games/stockfish/default.nix
diff --git a/pkgs/games/stuntrally/default.nix b/nixpkgs/pkgs/games/stuntrally/default.nix
index 6b3da08b70c..6b3da08b70c 100644
--- a/pkgs/games/stuntrally/default.nix
+++ b/nixpkgs/pkgs/games/stuntrally/default.nix
diff --git a/pkgs/games/super-tux-kart/default.nix b/nixpkgs/pkgs/games/super-tux-kart/default.nix
index 2db49165c5f..2db49165c5f 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/nixpkgs/pkgs/games/super-tux-kart/default.nix
diff --git a/pkgs/games/supertux/default.nix b/nixpkgs/pkgs/games/supertux/default.nix
index 3b33296892f..3b33296892f 100644
--- a/pkgs/games/supertux/default.nix
+++ b/nixpkgs/pkgs/games/supertux/default.nix
diff --git a/pkgs/games/system-syzygy/default.nix b/nixpkgs/pkgs/games/system-syzygy/default.nix
index ee47bd54506..ee47bd54506 100644
--- a/pkgs/games/system-syzygy/default.nix
+++ b/nixpkgs/pkgs/games/system-syzygy/default.nix
diff --git a/pkgs/games/t4kcommon/default.nix b/nixpkgs/pkgs/games/t4kcommon/default.nix
index f576403b70b..f576403b70b 100644
--- a/pkgs/games/t4kcommon/default.nix
+++ b/nixpkgs/pkgs/games/t4kcommon/default.nix
diff --git a/pkgs/games/tcl2048/default.nix b/nixpkgs/pkgs/games/tcl2048/default.nix
index 57e7217fcdb..57e7217fcdb 100644
--- a/pkgs/games/tcl2048/default.nix
+++ b/nixpkgs/pkgs/games/tcl2048/default.nix
diff --git a/pkgs/games/tdm/default.nix b/nixpkgs/pkgs/games/tdm/default.nix
index 294d4703bb0..294d4703bb0 100644
--- a/pkgs/games/tdm/default.nix
+++ b/nixpkgs/pkgs/games/tdm/default.nix
diff --git a/pkgs/games/teetertorture/default.nix b/nixpkgs/pkgs/games/teetertorture/default.nix
index 7933ef2f069..7933ef2f069 100644
--- a/pkgs/games/teetertorture/default.nix
+++ b/nixpkgs/pkgs/games/teetertorture/default.nix
diff --git a/pkgs/games/teeworlds/default.nix b/nixpkgs/pkgs/games/teeworlds/default.nix
index ff0dfad51a6..ff0dfad51a6 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/nixpkgs/pkgs/games/teeworlds/default.nix
diff --git a/pkgs/games/tennix/default.nix b/nixpkgs/pkgs/games/tennix/default.nix
index 283d8ad21d7..283d8ad21d7 100644
--- a/pkgs/games/tennix/default.nix
+++ b/nixpkgs/pkgs/games/tennix/default.nix
diff --git a/pkgs/games/tennix/fix_FTBFS.patch b/nixpkgs/pkgs/games/tennix/fix_FTBFS.patch
index d58aa3a8129..d58aa3a8129 100644
--- a/pkgs/games/tennix/fix_FTBFS.patch
+++ b/nixpkgs/pkgs/games/tennix/fix_FTBFS.patch
diff --git a/pkgs/games/terraria-server/default.nix b/nixpkgs/pkgs/games/terraria-server/default.nix
index 5432824ce6c..5432824ce6c 100644
--- a/pkgs/games/terraria-server/default.nix
+++ b/nixpkgs/pkgs/games/terraria-server/default.nix
diff --git a/pkgs/games/the-butterfly-effect/default.nix b/nixpkgs/pkgs/games/the-butterfly-effect/default.nix
index 9cc3bf7149f..9cc3bf7149f 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/nixpkgs/pkgs/games/the-butterfly-effect/default.nix
diff --git a/pkgs/games/the-powder-toy/default.nix b/nixpkgs/pkgs/games/the-powder-toy/default.nix
index b0901fcb9a0..b0901fcb9a0 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/nixpkgs/pkgs/games/the-powder-toy/default.nix
diff --git a/pkgs/games/tibia/default.nix b/nixpkgs/pkgs/games/tibia/default.nix
index 1482b58a7b0..1482b58a7b0 100644
--- a/pkgs/games/tibia/default.nix
+++ b/nixpkgs/pkgs/games/tibia/default.nix
diff --git a/pkgs/games/tintin/default.nix b/nixpkgs/pkgs/games/tintin/default.nix
index 9b58725a392..9b58725a392 100644
--- a/pkgs/games/tintin/default.nix
+++ b/nixpkgs/pkgs/games/tintin/default.nix
diff --git a/pkgs/games/tinyfugue/default.nix b/nixpkgs/pkgs/games/tinyfugue/default.nix
index fb3ebf36db3..fb3ebf36db3 100644
--- a/pkgs/games/tinyfugue/default.nix
+++ b/nixpkgs/pkgs/games/tinyfugue/default.nix
diff --git a/pkgs/games/tome2/default.nix b/nixpkgs/pkgs/games/tome2/default.nix
index a632e523aaa..a632e523aaa 100644
--- a/pkgs/games/tome2/default.nix
+++ b/nixpkgs/pkgs/games/tome2/default.nix
diff --git a/pkgs/games/tome4/default.nix b/nixpkgs/pkgs/games/tome4/default.nix
index b31b53922ff..b31b53922ff 100644
--- a/pkgs/games/tome4/default.nix
+++ b/nixpkgs/pkgs/games/tome4/default.nix
diff --git a/pkgs/games/toppler/default.nix b/nixpkgs/pkgs/games/toppler/default.nix
index cf037a0f436..cf037a0f436 100644
--- a/pkgs/games/toppler/default.nix
+++ b/nixpkgs/pkgs/games/toppler/default.nix
diff --git a/pkgs/games/torcs/default.nix b/nixpkgs/pkgs/games/torcs/default.nix
index 67d7f82457f..67d7f82457f 100644
--- a/pkgs/games/torcs/default.nix
+++ b/nixpkgs/pkgs/games/torcs/default.nix
diff --git a/pkgs/games/trackballs/default.nix b/nixpkgs/pkgs/games/trackballs/default.nix
index b778579c9d7..b778579c9d7 100644
--- a/pkgs/games/trackballs/default.nix
+++ b/nixpkgs/pkgs/games/trackballs/default.nix
diff --git a/pkgs/games/tremulous/default.nix b/nixpkgs/pkgs/games/tremulous/default.nix
index 7ea83f80fef..7ea83f80fef 100644
--- a/pkgs/games/tremulous/default.nix
+++ b/nixpkgs/pkgs/games/tremulous/default.nix
diff --git a/pkgs/games/tremulous/parse.patch b/nixpkgs/pkgs/games/tremulous/parse.patch
index 12a73138c09..12a73138c09 100644
--- a/pkgs/games/tremulous/parse.patch
+++ b/nixpkgs/pkgs/games/tremulous/parse.patch
diff --git a/pkgs/games/trigger/default.nix b/nixpkgs/pkgs/games/trigger/default.nix
index 34ae0762bea..34ae0762bea 100644
--- a/pkgs/games/trigger/default.nix
+++ b/nixpkgs/pkgs/games/trigger/default.nix
diff --git a/pkgs/games/tuxpaint/default.nix b/nixpkgs/pkgs/games/tuxpaint/default.nix
index 603fb3ef491..603fb3ef491 100644
--- a/pkgs/games/tuxpaint/default.nix
+++ b/nixpkgs/pkgs/games/tuxpaint/default.nix
diff --git a/pkgs/games/tuxpaint/tuxpaint-completion.diff b/nixpkgs/pkgs/games/tuxpaint/tuxpaint-completion.diff
index 0824b2becf4..0824b2becf4 100644
--- a/pkgs/games/tuxpaint/tuxpaint-completion.diff
+++ b/nixpkgs/pkgs/games/tuxpaint/tuxpaint-completion.diff
diff --git a/pkgs/games/tuxtype/default.nix b/nixpkgs/pkgs/games/tuxtype/default.nix
index 6b2fb8178ea..6b2fb8178ea 100644
--- a/pkgs/games/tuxtype/default.nix
+++ b/nixpkgs/pkgs/games/tuxtype/default.nix
diff --git a/pkgs/games/typespeed/default.nix b/nixpkgs/pkgs/games/typespeed/default.nix
index 6f0afc359ab..6f0afc359ab 100644
--- a/pkgs/games/typespeed/default.nix
+++ b/nixpkgs/pkgs/games/typespeed/default.nix
diff --git a/pkgs/games/typespeed/typespeed-config-in-home.patch b/nixpkgs/pkgs/games/typespeed/typespeed-config-in-home.patch
index fe313a4392e..fe313a4392e 100644
--- a/pkgs/games/typespeed/typespeed-config-in-home.patch
+++ b/nixpkgs/pkgs/games/typespeed/typespeed-config-in-home.patch
diff --git a/pkgs/games/ue4/cdn-deps.nix b/nixpkgs/pkgs/games/ue4/cdn-deps.nix
index 76c11c6baa7..76c11c6baa7 100644
--- a/pkgs/games/ue4/cdn-deps.nix
+++ b/nixpkgs/pkgs/games/ue4/cdn-deps.nix
diff --git a/pkgs/games/ue4/default.nix b/nixpkgs/pkgs/games/ue4/default.nix
index 5eb97e99189..5eb97e99189 100644
--- a/pkgs/games/ue4/default.nix
+++ b/nixpkgs/pkgs/games/ue4/default.nix
diff --git a/pkgs/games/ue4/generate-expr-from-cdn.sh b/nixpkgs/pkgs/games/ue4/generate-expr-from-cdn.sh
index 91cab1ca32f..91cab1ca32f 100644
--- a/pkgs/games/ue4/generate-expr-from-cdn.sh
+++ b/nixpkgs/pkgs/games/ue4/generate-expr-from-cdn.sh
diff --git a/pkgs/games/ue4demos/default.nix b/nixpkgs/pkgs/games/ue4demos/default.nix
index 2020066ee65..2020066ee65 100644
--- a/pkgs/games/ue4demos/default.nix
+++ b/nixpkgs/pkgs/games/ue4demos/default.nix
diff --git a/pkgs/games/ufoai/default.nix b/nixpkgs/pkgs/games/ufoai/default.nix
index beff8ada96b..beff8ada96b 100644
--- a/pkgs/games/ufoai/default.nix
+++ b/nixpkgs/pkgs/games/ufoai/default.nix
diff --git a/pkgs/games/ultimatestunts/default.nix b/nixpkgs/pkgs/games/ultimatestunts/default.nix
index df80b3a555f..df80b3a555f 100644
--- a/pkgs/games/ultimatestunts/default.nix
+++ b/nixpkgs/pkgs/games/ultimatestunts/default.nix
diff --git a/pkgs/games/ultrastardx/default.nix b/nixpkgs/pkgs/games/ultrastardx/default.nix
index feaf6cabf32..feaf6cabf32 100644
--- a/pkgs/games/ultrastardx/default.nix
+++ b/nixpkgs/pkgs/games/ultrastardx/default.nix
diff --git a/pkgs/games/unnethack/default.nix b/nixpkgs/pkgs/games/unnethack/default.nix
index ee3890aeea5..ee3890aeea5 100644
--- a/pkgs/games/unnethack/default.nix
+++ b/nixpkgs/pkgs/games/unnethack/default.nix
diff --git a/pkgs/games/uqm/3dovideo.nix b/nixpkgs/pkgs/games/uqm/3dovideo.nix
index 8d1bf2b6887..8d1bf2b6887 100644
--- a/pkgs/games/uqm/3dovideo.nix
+++ b/nixpkgs/pkgs/games/uqm/3dovideo.nix
diff --git a/pkgs/games/uqm/default.nix b/nixpkgs/pkgs/games/uqm/default.nix
index 3944050e983..3944050e983 100644
--- a/pkgs/games/uqm/default.nix
+++ b/nixpkgs/pkgs/games/uqm/default.nix
diff --git a/pkgs/games/urbanterror/default.nix b/nixpkgs/pkgs/games/urbanterror/default.nix
index 98ef32b0472..98ef32b0472 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/nixpkgs/pkgs/games/urbanterror/default.nix
diff --git a/pkgs/games/ut2004/default.nix b/nixpkgs/pkgs/games/ut2004/default.nix
index 3f306ac6eb5..3f306ac6eb5 100644
--- a/pkgs/games/ut2004/default.nix
+++ b/nixpkgs/pkgs/games/ut2004/default.nix
diff --git a/pkgs/games/ut2004/demo.nix b/nixpkgs/pkgs/games/ut2004/demo.nix
index 1790f083063..1790f083063 100644
--- a/pkgs/games/ut2004/demo.nix
+++ b/nixpkgs/pkgs/games/ut2004/demo.nix
diff --git a/pkgs/games/ut2004/wrapper.nix b/nixpkgs/pkgs/games/ut2004/wrapper.nix
index 31d0763be4d..31d0763be4d 100644
--- a/pkgs/games/ut2004/wrapper.nix
+++ b/nixpkgs/pkgs/games/ut2004/wrapper.nix
diff --git a/pkgs/games/vapor/default.nix b/nixpkgs/pkgs/games/vapor/default.nix
index 2e4fdf1af96..2e4fdf1af96 100644
--- a/pkgs/games/vapor/default.nix
+++ b/nixpkgs/pkgs/games/vapor/default.nix
diff --git a/pkgs/games/vassal/default.nix b/nixpkgs/pkgs/games/vassal/default.nix
index 84984fcbb58..84984fcbb58 100644
--- a/pkgs/games/vassal/default.nix
+++ b/nixpkgs/pkgs/games/vassal/default.nix
diff --git a/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch b/nixpkgs/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch
index 6794e8018af..6794e8018af 100644
--- a/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch
+++ b/nixpkgs/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch
diff --git a/pkgs/games/vdrift/default.nix b/nixpkgs/pkgs/games/vdrift/default.nix
index 3002216b9d4..3002216b9d4 100644
--- a/pkgs/games/vdrift/default.nix
+++ b/nixpkgs/pkgs/games/vdrift/default.nix
diff --git a/pkgs/games/vectoroids/default.nix b/nixpkgs/pkgs/games/vectoroids/default.nix
index f1e9c13f86b..f1e9c13f86b 100644
--- a/pkgs/games/vectoroids/default.nix
+++ b/nixpkgs/pkgs/games/vectoroids/default.nix
diff --git a/pkgs/games/vessel/default.nix b/nixpkgs/pkgs/games/vessel/default.nix
index 483912bab45..483912bab45 100644
--- a/pkgs/games/vessel/default.nix
+++ b/nixpkgs/pkgs/games/vessel/default.nix
diff --git a/pkgs/games/vessel/isatty.c b/nixpkgs/pkgs/games/vessel/isatty.c
index 38ee2b6ce2e..38ee2b6ce2e 100644
--- a/pkgs/games/vessel/isatty.c
+++ b/nixpkgs/pkgs/games/vessel/isatty.c
diff --git a/pkgs/games/vitetris/default.nix b/nixpkgs/pkgs/games/vitetris/default.nix
index fdc28d3a539..fdc28d3a539 100644
--- a/pkgs/games/vitetris/default.nix
+++ b/nixpkgs/pkgs/games/vitetris/default.nix
diff --git a/pkgs/games/vms-empire/default.nix b/nixpkgs/pkgs/games/vms-empire/default.nix
index 1d4545f17b1..1d4545f17b1 100644
--- a/pkgs/games/vms-empire/default.nix
+++ b/nixpkgs/pkgs/games/vms-empire/default.nix
diff --git a/pkgs/games/voxelands/default.nix b/nixpkgs/pkgs/games/voxelands/default.nix
index d8c16c9b7ce..d8c16c9b7ce 100644
--- a/pkgs/games/voxelands/default.nix
+++ b/nixpkgs/pkgs/games/voxelands/default.nix
diff --git a/pkgs/games/warmux/default.nix b/nixpkgs/pkgs/games/warmux/default.nix
index c3896f6cf71..c3896f6cf71 100644
--- a/pkgs/games/warmux/default.nix
+++ b/nixpkgs/pkgs/games/warmux/default.nix
diff --git a/pkgs/games/warsow/default.nix b/nixpkgs/pkgs/games/warsow/default.nix
index 6282658fc15..6282658fc15 100644
--- a/pkgs/games/warsow/default.nix
+++ b/nixpkgs/pkgs/games/warsow/default.nix
diff --git a/pkgs/games/warsow/engine.nix b/nixpkgs/pkgs/games/warsow/engine.nix
index c42aa319825..c42aa319825 100644
--- a/pkgs/games/warsow/engine.nix
+++ b/nixpkgs/pkgs/games/warsow/engine.nix
diff --git a/pkgs/games/warsow/libpath.patch b/nixpkgs/pkgs/games/warsow/libpath.patch
index ad248710237..ad248710237 100644
--- a/pkgs/games/warsow/libpath.patch
+++ b/nixpkgs/pkgs/games/warsow/libpath.patch
diff --git a/pkgs/games/warzone2100/default.nix b/nixpkgs/pkgs/games/warzone2100/default.nix
index d99a7c44240..d99a7c44240 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/nixpkgs/pkgs/games/warzone2100/default.nix
diff --git a/pkgs/games/wesnoth/default.nix b/nixpkgs/pkgs/games/wesnoth/default.nix
index e0f90d84b11..e0f90d84b11 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/nixpkgs/pkgs/games/wesnoth/default.nix
diff --git a/pkgs/games/widelands/bincmake.patch b/nixpkgs/pkgs/games/widelands/bincmake.patch
index ed6a9912522..ed6a9912522 100644
--- a/pkgs/games/widelands/bincmake.patch
+++ b/nixpkgs/pkgs/games/widelands/bincmake.patch
diff --git a/pkgs/games/widelands/default.nix b/nixpkgs/pkgs/games/widelands/default.nix
index e499f4ad1fc..e499f4ad1fc 100644
--- a/pkgs/games/widelands/default.nix
+++ b/nixpkgs/pkgs/games/widelands/default.nix
diff --git a/pkgs/games/worldofgoo/default.nix b/nixpkgs/pkgs/games/worldofgoo/default.nix
index 0889e52d8f8..0889e52d8f8 100644
--- a/pkgs/games/worldofgoo/default.nix
+++ b/nixpkgs/pkgs/games/worldofgoo/default.nix
diff --git a/pkgs/games/xbill/default.nix b/nixpkgs/pkgs/games/xbill/default.nix
index 8a6d4cf14cd..8a6d4cf14cd 100644
--- a/pkgs/games/xbill/default.nix
+++ b/nixpkgs/pkgs/games/xbill/default.nix
diff --git a/pkgs/games/xboard/default.nix b/nixpkgs/pkgs/games/xboard/default.nix
index 4a8e7188ce8..4a8e7188ce8 100644
--- a/pkgs/games/xboard/default.nix
+++ b/nixpkgs/pkgs/games/xboard/default.nix
diff --git a/pkgs/games/xboard/default.upstream b/nixpkgs/pkgs/games/xboard/default.upstream
index 2e5af5d0872..2e5af5d0872 100644
--- a/pkgs/games/xboard/default.upstream
+++ b/nixpkgs/pkgs/games/xboard/default.upstream
diff --git a/pkgs/games/xbomb/default.nix b/nixpkgs/pkgs/games/xbomb/default.nix
index 54d6c320f18..54d6c320f18 100644
--- a/pkgs/games/xbomb/default.nix
+++ b/nixpkgs/pkgs/games/xbomb/default.nix
diff --git a/pkgs/games/xconq/default.nix b/nixpkgs/pkgs/games/xconq/default.nix
index 6e852639979..6e852639979 100644
--- a/pkgs/games/xconq/default.nix
+++ b/nixpkgs/pkgs/games/xconq/default.nix
diff --git a/pkgs/games/xjump/darwin.patch b/nixpkgs/pkgs/games/xjump/darwin.patch
index 8221677658e..8221677658e 100644
--- a/pkgs/games/xjump/darwin.patch
+++ b/nixpkgs/pkgs/games/xjump/darwin.patch
diff --git a/pkgs/games/xjump/default.nix b/nixpkgs/pkgs/games/xjump/default.nix
index afac2de9fce..afac2de9fce 100644
--- a/pkgs/games/xjump/default.nix
+++ b/nixpkgs/pkgs/games/xjump/default.nix
diff --git a/pkgs/games/xmoto/default.nix b/nixpkgs/pkgs/games/xmoto/default.nix
index 34c9bf1f06d..34c9bf1f06d 100644
--- a/pkgs/games/xmoto/default.nix
+++ b/nixpkgs/pkgs/games/xmoto/default.nix
diff --git a/pkgs/games/xonotic/default.nix b/nixpkgs/pkgs/games/xonotic/default.nix
index f4ce3c86a64..f4ce3c86a64 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/nixpkgs/pkgs/games/xonotic/default.nix
diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/nixpkgs/pkgs/games/xpilot/bloodspilot-client.nix
index 4a1c25ee12e..4a1c25ee12e 100644
--- a/pkgs/games/xpilot/bloodspilot-client.nix
+++ b/nixpkgs/pkgs/games/xpilot/bloodspilot-client.nix
diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/nixpkgs/pkgs/games/xpilot/bloodspilot-server.nix
index 2f37680bbaa..2f37680bbaa 100644
--- a/pkgs/games/xpilot/bloodspilot-server.nix
+++ b/nixpkgs/pkgs/games/xpilot/bloodspilot-server.nix
diff --git a/pkgs/games/xpilot/default.nix b/nixpkgs/pkgs/games/xpilot/default.nix
index 7d83dece333..7d83dece333 100644
--- a/pkgs/games/xpilot/default.nix
+++ b/nixpkgs/pkgs/games/xpilot/default.nix
diff --git a/pkgs/games/xpilot/server-gcc5.patch b/nixpkgs/pkgs/games/xpilot/server-gcc5.patch
index 5618399bfec..5618399bfec 100644
--- a/pkgs/games/xpilot/server-gcc5.patch
+++ b/nixpkgs/pkgs/games/xpilot/server-gcc5.patch
diff --git a/pkgs/games/xskat/default.nix b/nixpkgs/pkgs/games/xskat/default.nix
index 086aaded9aa..086aaded9aa 100644
--- a/pkgs/games/xskat/default.nix
+++ b/nixpkgs/pkgs/games/xskat/default.nix
diff --git a/pkgs/games/xsnow/default.nix b/nixpkgs/pkgs/games/xsnow/default.nix
index b3011fbce77..b3011fbce77 100644
--- a/pkgs/games/xsnow/default.nix
+++ b/nixpkgs/pkgs/games/xsnow/default.nix
diff --git a/pkgs/games/xsok/default.nix b/nixpkgs/pkgs/games/xsok/default.nix
index 62cdaccc297..62cdaccc297 100644
--- a/pkgs/games/xsok/default.nix
+++ b/nixpkgs/pkgs/games/xsok/default.nix
diff --git a/pkgs/games/xsokoban/default.nix b/nixpkgs/pkgs/games/xsokoban/default.nix
index 3f6062c4f68..3f6062c4f68 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/nixpkgs/pkgs/games/xsokoban/default.nix
diff --git a/pkgs/games/xtris/default.nix b/nixpkgs/pkgs/games/xtris/default.nix
index 8f5f832058c..8f5f832058c 100644
--- a/pkgs/games/xtris/default.nix
+++ b/nixpkgs/pkgs/games/xtris/default.nix
diff --git a/pkgs/games/zandronum/add_gitinfo.patch b/nixpkgs/pkgs/games/zandronum/add_gitinfo.patch
index 4d8d7c83796..4d8d7c83796 100644
--- a/pkgs/games/zandronum/add_gitinfo.patch
+++ b/nixpkgs/pkgs/games/zandronum/add_gitinfo.patch
diff --git a/pkgs/games/zandronum/default.nix b/nixpkgs/pkgs/games/zandronum/default.nix
index 3f1ebb69618..3f1ebb69618 100644
--- a/pkgs/games/zandronum/default.nix
+++ b/nixpkgs/pkgs/games/zandronum/default.nix
diff --git a/pkgs/games/zandronum/dont_update_gitinfo.patch b/nixpkgs/pkgs/games/zandronum/dont_update_gitinfo.patch
index d6dd3a58f45..d6dd3a58f45 100644
--- a/pkgs/games/zandronum/dont_update_gitinfo.patch
+++ b/nixpkgs/pkgs/games/zandronum/dont_update_gitinfo.patch
diff --git a/pkgs/games/zandronum/fmod.nix b/nixpkgs/pkgs/games/zandronum/fmod.nix
index 3d5160bb591..3d5160bb591 100644
--- a/pkgs/games/zandronum/fmod.nix
+++ b/nixpkgs/pkgs/games/zandronum/fmod.nix
diff --git a/pkgs/games/zandronum/sqlite.nix b/nixpkgs/pkgs/games/zandronum/sqlite.nix
index 3d60dab6fe0..3d60dab6fe0 100644
--- a/pkgs/games/zandronum/sqlite.nix
+++ b/nixpkgs/pkgs/games/zandronum/sqlite.nix
diff --git a/pkgs/games/zandronum/zan_configure_impurity.patch b/nixpkgs/pkgs/games/zandronum/zan_configure_impurity.patch
index 0cf7150502e..0cf7150502e 100644
--- a/pkgs/games/zandronum/zan_configure_impurity.patch
+++ b/nixpkgs/pkgs/games/zandronum/zan_configure_impurity.patch
diff --git a/pkgs/games/zangband/default.nix b/nixpkgs/pkgs/games/zangband/default.nix
index 0722e4bbbf9..0722e4bbbf9 100644
--- a/pkgs/games/zangband/default.nix
+++ b/nixpkgs/pkgs/games/zangband/default.nix
diff --git a/pkgs/games/zaz/default.nix b/nixpkgs/pkgs/games/zaz/default.nix
index 9d42cfd6896..9d42cfd6896 100644
--- a/pkgs/games/zaz/default.nix
+++ b/nixpkgs/pkgs/games/zaz/default.nix
diff --git a/pkgs/games/zdoom/bcc-git.nix b/nixpkgs/pkgs/games/zdoom/bcc-git.nix
index 2a1219e66ea..2a1219e66ea 100644
--- a/pkgs/games/zdoom/bcc-git.nix
+++ b/nixpkgs/pkgs/games/zdoom/bcc-git.nix
diff --git a/pkgs/games/zdoom/bcc-warning-fix.patch b/nixpkgs/pkgs/games/zdoom/bcc-warning-fix.patch
index 4a352cb1e47..4a352cb1e47 100644
--- a/pkgs/games/zdoom/bcc-warning-fix.patch
+++ b/nixpkgs/pkgs/games/zdoom/bcc-warning-fix.patch
diff --git a/pkgs/games/zdoom/default.nix b/nixpkgs/pkgs/games/zdoom/default.nix
index f6fde241129..f6fde241129 100644
--- a/pkgs/games/zdoom/default.nix
+++ b/nixpkgs/pkgs/games/zdoom/default.nix
diff --git a/pkgs/games/zdoom/zdbsp.nix b/nixpkgs/pkgs/games/zdoom/zdbsp.nix
index 430d5269a68..430d5269a68 100644
--- a/pkgs/games/zdoom/zdbsp.nix
+++ b/nixpkgs/pkgs/games/zdoom/zdbsp.nix
diff --git a/pkgs/games/zod/default.nix b/nixpkgs/pkgs/games/zod/default.nix
index 888b7bd3d6a..888b7bd3d6a 100644
--- a/pkgs/games/zod/default.nix
+++ b/nixpkgs/pkgs/games/zod/default.nix
diff --git a/pkgs/games/zoom/default.nix b/nixpkgs/pkgs/games/zoom/default.nix
index 827fb351f1d..827fb351f1d 100644
--- a/pkgs/games/zoom/default.nix
+++ b/nixpkgs/pkgs/games/zoom/default.nix
diff --git a/pkgs/misc/acpilight/default.nix b/nixpkgs/pkgs/misc/acpilight/default.nix
index 1975e2d3790..1975e2d3790 100644
--- a/pkgs/misc/acpilight/default.nix
+++ b/nixpkgs/pkgs/misc/acpilight/default.nix
diff --git a/pkgs/misc/apulse/default.nix b/nixpkgs/pkgs/misc/apulse/default.nix
index 273e358184d..273e358184d 100644
--- a/pkgs/misc/apulse/default.nix
+++ b/nixpkgs/pkgs/misc/apulse/default.nix
diff --git a/pkgs/misc/apulse/pressureaudio.nix b/nixpkgs/pkgs/misc/apulse/pressureaudio.nix
index 710712fe508..710712fe508 100644
--- a/pkgs/misc/apulse/pressureaudio.nix
+++ b/nixpkgs/pkgs/misc/apulse/pressureaudio.nix
diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix
index ead87f6fab4..ead87f6fab4 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix
diff --git a/pkgs/misc/base16-builder/default.nix b/nixpkgs/pkgs/misc/base16-builder/default.nix
index af57f2a90de..af57f2a90de 100644
--- a/pkgs/misc/base16-builder/default.nix
+++ b/nixpkgs/pkgs/misc/base16-builder/default.nix
diff --git a/pkgs/misc/base16-builder/generate.sh b/nixpkgs/pkgs/misc/base16-builder/generate.sh
index e1e436010b4..e1e436010b4 100755
--- a/pkgs/misc/base16-builder/generate.sh
+++ b/nixpkgs/pkgs/misc/base16-builder/generate.sh
diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/nixpkgs/pkgs/misc/base16-builder/node-packages-generated.nix
index f13c62f04a9..f13c62f04a9 100644
--- a/pkgs/misc/base16-builder/node-packages-generated.nix
+++ b/nixpkgs/pkgs/misc/base16-builder/node-packages-generated.nix
diff --git a/pkgs/misc/base16-builder/node-packages.json b/nixpkgs/pkgs/misc/base16-builder/node-packages.json
index 3266c128bc4..3266c128bc4 100644
--- a/pkgs/misc/base16-builder/node-packages.json
+++ b/nixpkgs/pkgs/misc/base16-builder/node-packages.json
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/nixpkgs/pkgs/misc/base16-builder/node-packages.nix
index 735ea623247..735ea623247 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/nixpkgs/pkgs/misc/base16-builder/node-packages.nix
diff --git a/pkgs/misc/base16-shell-preview/default.nix b/nixpkgs/pkgs/misc/base16-shell-preview/default.nix
index 72b7de3b9a2..72b7de3b9a2 100644
--- a/pkgs/misc/base16-shell-preview/default.nix
+++ b/nixpkgs/pkgs/misc/base16-shell-preview/default.nix
diff --git a/pkgs/misc/beep/default.nix b/nixpkgs/pkgs/misc/beep/default.nix
index b98560992e3..b98560992e3 100644
--- a/pkgs/misc/beep/default.nix
+++ b/nixpkgs/pkgs/misc/beep/default.nix
diff --git a/pkgs/misc/brightnessctl/default.nix b/nixpkgs/pkgs/misc/brightnessctl/default.nix
index d6e606324c4..d6e606324c4 100644
--- a/pkgs/misc/brightnessctl/default.nix
+++ b/nixpkgs/pkgs/misc/brightnessctl/default.nix
diff --git a/pkgs/misc/calaos/installer/default.nix b/nixpkgs/pkgs/misc/calaos/installer/default.nix
index 618bc6d8505..618bc6d8505 100644
--- a/pkgs/misc/calaos/installer/default.nix
+++ b/nixpkgs/pkgs/misc/calaos/installer/default.nix
diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix
index 6534d300e82..6534d300e82 100644
--- a/pkgs/misc/cups/cups-pk-helper.nix
+++ b/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix
diff --git a/pkgs/misc/cups/default.nix b/nixpkgs/pkgs/misc/cups/default.nix
index d18829673cc..d18829673cc 100644
--- a/pkgs/misc/cups/default.nix
+++ b/nixpkgs/pkgs/misc/cups/default.nix
diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
index 4464b5ba11b..4464b5ba11b 100644
--- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
index 2df3cfe6733..2df3cfe6733 100644
--- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/nixpkgs/pkgs/misc/cups/drivers/brlaser/default.nix
index bf0f4ef8279..bf0f4ef8279 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/brlaser/default.nix
diff --git a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix b/nixpkgs/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix
index f101ffef95b..f101ffef95b 100644
--- a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix
index adc4ead94b7..adc4ead94b7 100644
--- a/pkgs/misc/cups/drivers/canon/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix
diff --git a/pkgs/misc/cups/drivers/canon/preload.c b/nixpkgs/pkgs/misc/cups/drivers/canon/preload.c
index f3a30063a6e..f3a30063a6e 100644
--- a/pkgs/misc/cups/drivers/canon/preload.c
+++ b/nixpkgs/pkgs/misc/cups/drivers/canon/preload.c
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index 364a7336bf3..364a7336bf3 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
index a09311a8292..a09311a8292 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch
index f5b3a1b13db..f5b3a1b13db 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch
+++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch
index 20c2d756d1e..20c2d756d1e 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch
+++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
index 8866b425ca8..8866b425ca8 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch
index dfc0bb2268c..dfc0bb2268c 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch
+++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch
index 6b51d4837d4..6b51d4837d4 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch
+++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch
index 92bef72ba05..92bef72ba05 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch
+++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch
index dc85801a256..dc85801a256 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch
+++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch
index 7dba7999511..7dba7999511 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch
+++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch
diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix
index 0c91b782117..0c91b782117 100644
--- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix
diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix
index c2b912007d8..c2b912007d8 100644
--- a/pkgs/misc/cups/drivers/dymo/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix
diff --git a/pkgs/misc/cups/drivers/dymo/fix-includes.patch b/nixpkgs/pkgs/misc/cups/drivers/dymo/fix-includes.patch
index 55f71369a00..55f71369a00 100644
--- a/pkgs/misc/cups/drivers/dymo/fix-includes.patch
+++ b/nixpkgs/pkgs/misc/cups/drivers/dymo/fix-includes.patch
diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix
index ad8b0089a87..ad8b0089a87 100644
--- a/pkgs/misc/cups/drivers/estudio/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix
diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
index 23651a57df8..23651a57df8 100644
--- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
diff --git a/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix
index 0dcd518de84..0dcd518de84 100644
--- a/pkgs/misc/cups/drivers/googlecloudprint/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix
diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/nixpkgs/pkgs/misc/cups/drivers/hl1110/default.nix
index 701d4b6a100..701d4b6a100 100644
--- a/pkgs/misc/cups/drivers/hl1110/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/hl1110/default.nix
diff --git a/pkgs/misc/cups/drivers/hl3140cw/default.nix b/nixpkgs/pkgs/misc/cups/drivers/hl3140cw/default.nix
index 001a3c1eac0..001a3c1eac0 100644
--- a/pkgs/misc/cups/drivers/hl3140cw/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/hl3140cw/default.nix
diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/nixpkgs/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
index 90f9a8e943a..90f9a8e943a 100644
--- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/nixpkgs/pkgs/misc/cups/drivers/kyocera/default.nix
index cd4c049e67f..cd4c049e67f 100644
--- a/pkgs/misc/cups/drivers/kyocera/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/kyocera/default.nix
diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/nixpkgs/pkgs/misc/cups/drivers/kyodialog3/default.nix
index fa16a136f97..fa16a136f97 100644
--- a/pkgs/misc/cups/drivers/kyodialog3/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/kyodialog3/default.nix
diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
index c7484e6d30b..c7484e6d30b 100644
--- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
index befafd855bc..befafd855bc 100644
--- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
index 4ec9e3fc6c8..4ec9e3fc6c8 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
index b12ef18e46c..b12ef18e46c 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
index 1673c2d5c5c..1673c2d5c5c 100644
--- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
index 91110104bc9..91110104bc9 100644
--- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
index b58e7b4faa4..b58e7b4faa4 100644
--- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
index b4b16563610..b4b16563610 100644
--- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
index f2303a45a2f..f2303a45a2f 100644
--- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
index c2209806724..c2209806724 100644
--- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
index 50f3b583e42..50f3b583e42 100644
--- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
index 0e088401c0a..0e088401c0a 100644
--- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
index 8c906db642e..8c906db642e 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix
index e98da9de2b6..e98da9de2b6 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix
index 9135441a6e7..9135441a6e7 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix
diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh
index f750df6e506..f750df6e506 100644
--- a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh
+++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh
diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
index 5dc39793070..5dc39793070 100644
--- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix
index f81fa27503f..f81fa27503f 100644
--- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix
diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix
index e227de086de..e227de086de 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix
diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix
index 87a023af1ca..87a023af1ca 100644
--- a/pkgs/misc/cups/drivers/zj-58/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix
diff --git a/pkgs/misc/cups/filters.nix b/nixpkgs/pkgs/misc/cups/filters.nix
index 76f68e50750..76f68e50750 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/nixpkgs/pkgs/misc/cups/filters.nix
diff --git a/pkgs/misc/documentation-highlighter/LICENSE b/nixpkgs/pkgs/misc/documentation-highlighter/LICENSE
index 422deb7350f..422deb7350f 100644
--- a/pkgs/misc/documentation-highlighter/LICENSE
+++ b/nixpkgs/pkgs/misc/documentation-highlighter/LICENSE
diff --git a/pkgs/misc/documentation-highlighter/README.md b/nixpkgs/pkgs/misc/documentation-highlighter/README.md
index f4baa3c8e00..f4baa3c8e00 100644
--- a/pkgs/misc/documentation-highlighter/README.md
+++ b/nixpkgs/pkgs/misc/documentation-highlighter/README.md
diff --git a/pkgs/misc/documentation-highlighter/default.nix b/nixpkgs/pkgs/misc/documentation-highlighter/default.nix
index a9fbcc178bb..a9fbcc178bb 100644
--- a/pkgs/misc/documentation-highlighter/default.nix
+++ b/nixpkgs/pkgs/misc/documentation-highlighter/default.nix
diff --git a/pkgs/misc/documentation-highlighter/highlight.pack.js b/nixpkgs/pkgs/misc/documentation-highlighter/highlight.pack.js
index f909702367e..f909702367e 100644
--- a/pkgs/misc/documentation-highlighter/highlight.pack.js
+++ b/nixpkgs/pkgs/misc/documentation-highlighter/highlight.pack.js
diff --git a/pkgs/misc/documentation-highlighter/loader.js b/nixpkgs/pkgs/misc/documentation-highlighter/loader.js
index 4ad7dbf24b5..4ad7dbf24b5 100644
--- a/pkgs/misc/documentation-highlighter/loader.js
+++ b/nixpkgs/pkgs/misc/documentation-highlighter/loader.js
diff --git a/pkgs/misc/documentation-highlighter/mono-blue.css b/nixpkgs/pkgs/misc/documentation-highlighter/mono-blue.css
index 884c97c7673..884c97c7673 100644
--- a/pkgs/misc/documentation-highlighter/mono-blue.css
+++ b/nixpkgs/pkgs/misc/documentation-highlighter/mono-blue.css
diff --git a/pkgs/misc/documentation-highlighter/update.sh b/nixpkgs/pkgs/misc/documentation-highlighter/update.sh
index 3b77af4af41..3b77af4af41 100755
--- a/pkgs/misc/documentation-highlighter/update.sh
+++ b/nixpkgs/pkgs/misc/documentation-highlighter/update.sh
diff --git a/pkgs/misc/doge/default.nix b/nixpkgs/pkgs/misc/doge/default.nix
index 37acfbf4a8a..37acfbf4a8a 100644
--- a/pkgs/misc/doge/default.nix
+++ b/nixpkgs/pkgs/misc/doge/default.nix
diff --git a/pkgs/misc/drivers/dell-530cdn/default.nix b/nixpkgs/pkgs/misc/drivers/dell-530cdn/default.nix
index 9cabd8fa339..9cabd8fa339 100644
--- a/pkgs/misc/drivers/dell-530cdn/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/dell-530cdn/default.nix
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix
index 13bb63ca709..13bb63ca709 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix
diff --git a/pkgs/misc/drivers/epkowa/firmware_location.patch b/nixpkgs/pkgs/misc/drivers/epkowa/firmware_location.patch
index 58ea849d8f9..58ea849d8f9 100644
--- a/pkgs/misc/drivers/epkowa/firmware_location.patch
+++ b/nixpkgs/pkgs/misc/drivers/epkowa/firmware_location.patch
diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/nixpkgs/pkgs/misc/drivers/epson-201106w/default.nix
index 448bac92ae8..448bac92ae8 100644
--- a/pkgs/misc/drivers/epson-201106w/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/epson-201106w/default.nix
diff --git a/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch b/nixpkgs/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch
index 2277a9afccc..2277a9afccc 100644
--- a/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch
+++ b/nixpkgs/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch
diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/nixpkgs/pkgs/misc/drivers/epson-alc1100/default.nix
index fe52b104a52..fe52b104a52 100644
--- a/pkgs/misc/drivers/epson-alc1100/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/epson-alc1100/default.nix
diff --git a/pkgs/misc/drivers/epson-alc1100/ppd.patch b/nixpkgs/pkgs/misc/drivers/epson-alc1100/ppd.patch
index 71d86668f53..71d86668f53 100644
--- a/pkgs/misc/drivers/epson-alc1100/ppd.patch
+++ b/nixpkgs/pkgs/misc/drivers/epson-alc1100/ppd.patch
diff --git a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch b/nixpkgs/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
index b9f198b14b7..b9f198b14b7 100644
--- a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
+++ b/nixpkgs/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix
index d90ef2c91f6..d90ef2c91f6 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix
diff --git a/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch b/nixpkgs/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch
index 02897f4f44d..02897f4f44d 100644
--- a/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch
+++ b/nixpkgs/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch
diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix
index 4edc08a3571..4edc08a3571 100644
--- a/pkgs/misc/drivers/epson-escpr2/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix
diff --git a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix
index 0cc5537180b..0cc5537180b 100644
--- a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix
diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/nixpkgs/pkgs/misc/drivers/epson_201207w/default.nix
index fc854c00796..fc854c00796 100644
--- a/pkgs/misc/drivers/epson_201207w/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/epson_201207w/default.nix
diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix
index 7e1ff01bda0..7e1ff01bda0 100644
--- a/pkgs/misc/drivers/foo2zjs/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix
diff --git a/pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff b/nixpkgs/pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff
index 003272858a4..003272858a4 100644
--- a/pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff
+++ b/nixpkgs/pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff
diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/nixpkgs/pkgs/misc/drivers/foomatic-filters/default.nix
index 9bee05bfb25..9bee05bfb25 100644
--- a/pkgs/misc/drivers/foomatic-filters/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/foomatic-filters/default.nix
diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/nixpkgs/pkgs/misc/drivers/gutenprint/bin.nix
index 6cf754192f8..6cf754192f8 100644
--- a/pkgs/misc/drivers/gutenprint/bin.nix
+++ b/nixpkgs/pkgs/misc/drivers/gutenprint/bin.nix
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix
index 7c8750905d9..7c8750905d9 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/nixpkgs/pkgs/misc/drivers/hplip/3.16.11.nix
index 3b03c300db3..3b03c300db3 100644
--- a/pkgs/misc/drivers/hplip/3.16.11.nix
+++ b/nixpkgs/pkgs/misc/drivers/hplip/3.16.11.nix
diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix
index ab1794c1251..ab1794c1251 100644
--- a/pkgs/misc/drivers/hplip/3.18.5.nix
+++ b/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix
diff --git a/pkgs/misc/drivers/hplip/default.nix b/nixpkgs/pkgs/misc/drivers/hplip/default.nix
index 1514e8def97..1514e8def97 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/hplip/default.nix
diff --git a/pkgs/misc/drivers/hplip/hplip.state b/nixpkgs/pkgs/misc/drivers/hplip/hplip.state
index 9d19a93f364..9d19a93f364 100644
--- a/pkgs/misc/drivers/hplip/hplip.state
+++ b/nixpkgs/pkgs/misc/drivers/hplip/hplip.state
diff --git a/pkgs/misc/drivers/hplip/image-processor.patch b/nixpkgs/pkgs/misc/drivers/hplip/image-processor.patch
index 30df1d29d97..30df1d29d97 100644
--- a/pkgs/misc/drivers/hplip/image-processor.patch
+++ b/nixpkgs/pkgs/misc/drivers/hplip/image-processor.patch
diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix
index 492488f675f..492488f675f 100644
--- a/pkgs/misc/drivers/m33-linux/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix
diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix
index 2dd32a93219..2dd32a93219 100644
--- a/pkgs/misc/drivers/moltengamepad/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix
diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/nixpkgs/pkgs/misc/drivers/postscript-lexmark/default.nix
index cd322bf8fdb..cd322bf8fdb 100644
--- a/pkgs/misc/drivers/postscript-lexmark/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/postscript-lexmark/default.nix
diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix
index b977b2c0c15..b977b2c0c15 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix
diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix
index 4b19932450e..4b19932450e 100644
--- a/pkgs/misc/drivers/steamcontroller/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix
diff --git a/pkgs/misc/drivers/sundtek/default.nix b/nixpkgs/pkgs/misc/drivers/sundtek/default.nix
index 5b1641a098d..5b1641a098d 100644
--- a/pkgs/misc/drivers/sundtek/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/sundtek/default.nix
diff --git a/pkgs/misc/drivers/utsushi/default.nix b/nixpkgs/pkgs/misc/drivers/utsushi/default.nix
index ad7659d060a..ad7659d060a 100644
--- a/pkgs/misc/drivers/utsushi/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/utsushi/default.nix
diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix
index e2f2bcc2f24..e2f2bcc2f24 100644
--- a/pkgs/misc/drivers/xboxdrv/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix
diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix
index a21584afa4c..a21584afa4c 100644
--- a/pkgs/misc/drivers/xwiimote/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix
diff --git a/pkgs/misc/dumb/default.nix b/nixpkgs/pkgs/misc/dumb/default.nix
index 829367aa329..829367aa329 100644
--- a/pkgs/misc/dumb/default.nix
+++ b/nixpkgs/pkgs/misc/dumb/default.nix
diff --git a/pkgs/misc/emulators/atari++/default.nix b/nixpkgs/pkgs/misc/emulators/atari++/default.nix
index 2e6ccd0a491..2e6ccd0a491 100644
--- a/pkgs/misc/emulators/atari++/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/atari++/default.nix
diff --git a/pkgs/misc/emulators/atari800/default.nix b/nixpkgs/pkgs/misc/emulators/atari800/default.nix
index 38dc54ea9d7..38dc54ea9d7 100644
--- a/pkgs/misc/emulators/atari800/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/atari800/default.nix
diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix
index 6c47109fb65..6c47109fb65 100644
--- a/pkgs/misc/emulators/attract-mode/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix
diff --git a/pkgs/misc/emulators/blastem/default.nix b/nixpkgs/pkgs/misc/emulators/blastem/default.nix
index 0d4c7ab7216..0d4c7ab7216 100644
--- a/pkgs/misc/emulators/blastem/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/blastem/default.nix
diff --git a/pkgs/misc/emulators/bsod/default.nix b/nixpkgs/pkgs/misc/emulators/bsod/default.nix
index 8575d654feb..8575d654feb 100644
--- a/pkgs/misc/emulators/bsod/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/bsod/default.nix
diff --git a/pkgs/misc/emulators/caprice32/default.nix b/nixpkgs/pkgs/misc/emulators/caprice32/default.nix
index a8068e9b47b..a8068e9b47b 100644
--- a/pkgs/misc/emulators/caprice32/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/caprice32/default.nix
diff --git a/pkgs/misc/emulators/ccemux/default.nix b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix
index 12777032870..12777032870 100644
--- a/pkgs/misc/emulators/ccemux/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix
diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix
index 246dbb7dd35..246dbb7dd35 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix
diff --git a/pkgs/misc/emulators/cdemu/base.nix b/nixpkgs/pkgs/misc/emulators/cdemu/base.nix
index e587151d3e7..e587151d3e7 100644
--- a/pkgs/misc/emulators/cdemu/base.nix
+++ b/nixpkgs/pkgs/misc/emulators/cdemu/base.nix
diff --git a/pkgs/misc/emulators/cdemu/client.nix b/nixpkgs/pkgs/misc/emulators/cdemu/client.nix
index 087b15cecd1..087b15cecd1 100644
--- a/pkgs/misc/emulators/cdemu/client.nix
+++ b/nixpkgs/pkgs/misc/emulators/cdemu/client.nix
diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/nixpkgs/pkgs/misc/emulators/cdemu/daemon.nix
index db6ed7ddb47..db6ed7ddb47 100644
--- a/pkgs/misc/emulators/cdemu/daemon.nix
+++ b/nixpkgs/pkgs/misc/emulators/cdemu/daemon.nix
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix
index 599531950a2..599531950a2 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix
diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix
index cc3118ace15..cc3118ace15 100644
--- a/pkgs/misc/emulators/cdemu/libmirage.nix
+++ b/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix
index df25fb96eb1..df25fb96eb1 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix
diff --git a/pkgs/misc/emulators/citra/default.nix b/nixpkgs/pkgs/misc/emulators/citra/default.nix
index ca6ad37b5aa..ca6ad37b5aa 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/citra/default.nix
diff --git a/pkgs/misc/emulators/darcnes/default.nix b/nixpkgs/pkgs/misc/emulators/darcnes/default.nix
index bdec34e396f..bdec34e396f 100644
--- a/pkgs/misc/emulators/darcnes/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/darcnes/default.nix
diff --git a/pkgs/misc/emulators/darcnes/label.patch b/nixpkgs/pkgs/misc/emulators/darcnes/label.patch
index 612aa1e3911..612aa1e3911 100644
--- a/pkgs/misc/emulators/darcnes/label.patch
+++ b/nixpkgs/pkgs/misc/emulators/darcnes/label.patch
diff --git a/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch b/nixpkgs/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch
index 8cec26026e7..8cec26026e7 100644
--- a/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch
+++ b/nixpkgs/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch
diff --git a/pkgs/misc/emulators/desmume/default.nix b/nixpkgs/pkgs/misc/emulators/desmume/default.nix
index d5d63cc2694..d5d63cc2694 100644
--- a/pkgs/misc/emulators/desmume/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/desmume/default.nix
diff --git a/pkgs/misc/emulators/desmume/gcc6_fixes.patch b/nixpkgs/pkgs/misc/emulators/desmume/gcc6_fixes.patch
index 6eb9576f649..6eb9576f649 100644
--- a/pkgs/misc/emulators/desmume/gcc6_fixes.patch
+++ b/nixpkgs/pkgs/misc/emulators/desmume/gcc6_fixes.patch
diff --git a/pkgs/misc/emulators/desmume/gcc7_fixes.patch b/nixpkgs/pkgs/misc/emulators/desmume/gcc7_fixes.patch
index a4934ff6e61..a4934ff6e61 100644
--- a/pkgs/misc/emulators/desmume/gcc7_fixes.patch
+++ b/nixpkgs/pkgs/misc/emulators/desmume/gcc7_fixes.patch
diff --git a/pkgs/misc/emulators/dlx/default.nix b/nixpkgs/pkgs/misc/emulators/dlx/default.nix
index ad111a61514..ad111a61514 100644
--- a/pkgs/misc/emulators/dlx/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/dlx/default.nix
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix
index cc49ef2aa1d..cc49ef2aa1d 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix
index cec88918282..cec88918282 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix
diff --git a/pkgs/misc/emulators/dosbox/default.nix b/nixpkgs/pkgs/misc/emulators/dosbox/default.nix
index 5b770a6471a..5b770a6471a 100644
--- a/pkgs/misc/emulators/dosbox/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/dosbox/default.nix
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix
index 722f6b25429..722f6b25429 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/nixpkgs/pkgs/misc/emulators/epsxe/default.nix
index 81202008db1..81202008db1 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/epsxe/default.nix
diff --git a/pkgs/misc/emulators/fakenes/build.patch b/nixpkgs/pkgs/misc/emulators/fakenes/build.patch
index 90799d977a1..90799d977a1 100644
--- a/pkgs/misc/emulators/fakenes/build.patch
+++ b/nixpkgs/pkgs/misc/emulators/fakenes/build.patch
diff --git a/pkgs/misc/emulators/fakenes/default.nix b/nixpkgs/pkgs/misc/emulators/fakenes/default.nix
index 704cef52e5e..704cef52e5e 100644
--- a/pkgs/misc/emulators/fakenes/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/fakenes/default.nix
diff --git a/pkgs/misc/emulators/fceux/default.nix b/nixpkgs/pkgs/misc/emulators/fceux/default.nix
index 13ebeb1d2a9..13ebeb1d2a9 100644
--- a/pkgs/misc/emulators/fceux/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/fceux/default.nix
diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix
index 079af05e794..079af05e794 100644
--- a/pkgs/misc/emulators/firebird-emu/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix
index 9f092f91e2e..9f092f91e2e 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix
diff --git a/pkgs/misc/emulators/fuse-emulator/default.nix b/nixpkgs/pkgs/misc/emulators/fuse-emulator/default.nix
index a3a379eb2cf..a3a379eb2cf 100644
--- a/pkgs/misc/emulators/fuse-emulator/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/fuse-emulator/default.nix
diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix
index 4120ec7ba6a..4120ec7ba6a 100644
--- a/pkgs/misc/emulators/gens-gs/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix
diff --git a/pkgs/misc/emulators/gxemul/default.nix b/nixpkgs/pkgs/misc/emulators/gxemul/default.nix
index 04c5b441f01..04c5b441f01 100644
--- a/pkgs/misc/emulators/gxemul/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/gxemul/default.nix
diff --git a/pkgs/misc/emulators/hatari/default.nix b/nixpkgs/pkgs/misc/emulators/hatari/default.nix
index 278d8d8dc5f..278d8d8dc5f 100644
--- a/pkgs/misc/emulators/hatari/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/hatari/default.nix
diff --git a/pkgs/misc/emulators/higan/0001-change-flags.diff b/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff
index 5821a9c130b..5821a9c130b 100644
--- a/pkgs/misc/emulators/higan/0001-change-flags.diff
+++ b/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff
diff --git a/pkgs/misc/emulators/higan/default.nix b/nixpkgs/pkgs/misc/emulators/higan/default.nix
index c1e64d26b47..c1e64d26b47 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/higan/default.nix
diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix
index da6a7c8bf2f..da6a7c8bf2f 100644
--- a/pkgs/misc/emulators/kega-fusion/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix
diff --git a/pkgs/misc/emulators/libdsk/default.nix b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix
index cb64c30be49..cb64c30be49 100644
--- a/pkgs/misc/emulators/libdsk/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix
diff --git a/pkgs/misc/emulators/mame/default.nix b/nixpkgs/pkgs/misc/emulators/mame/default.nix
index 3c205a70375..3c205a70375 100644
--- a/pkgs/misc/emulators/mame/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/mame/default.nix
diff --git a/pkgs/misc/emulators/mame/emuopts.patch b/nixpkgs/pkgs/misc/emulators/mame/emuopts.patch
index b85291f52f7..b85291f52f7 100644
--- a/pkgs/misc/emulators/mame/emuopts.patch
+++ b/nixpkgs/pkgs/misc/emulators/mame/emuopts.patch
diff --git a/pkgs/misc/emulators/mednafen/default.nix b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix
index 337d19804fc..337d19804fc 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix
diff --git a/pkgs/misc/emulators/mednafen/server.nix b/nixpkgs/pkgs/misc/emulators/mednafen/server.nix
index 146d5320261..146d5320261 100644
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/nixpkgs/pkgs/misc/emulators/mednafen/server.nix
diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix
index 40390068e7b..40390068e7b 100644
--- a/pkgs/misc/emulators/mednaffe/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix
diff --git a/pkgs/misc/emulators/mgba/default.nix b/nixpkgs/pkgs/misc/emulators/mgba/default.nix
index c2b30f8ce47..c2b30f8ce47 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/mgba/default.nix
diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix
index ee3aab1834a..ee3aab1834a 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix
diff --git a/pkgs/misc/emulators/nestopia/build-fix.patch b/nixpkgs/pkgs/misc/emulators/nestopia/build-fix.patch
index a7d82ead15c..a7d82ead15c 100644
--- a/pkgs/misc/emulators/nestopia/build-fix.patch
+++ b/nixpkgs/pkgs/misc/emulators/nestopia/build-fix.patch
diff --git a/pkgs/misc/emulators/nestopia/default.nix b/nixpkgs/pkgs/misc/emulators/nestopia/default.nix
index 20c7c39312a..20c7c39312a 100644
--- a/pkgs/misc/emulators/nestopia/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/nestopia/default.nix
diff --git a/pkgs/misc/emulators/nestopia/gcc6.patch b/nixpkgs/pkgs/misc/emulators/nestopia/gcc6.patch
index 65dcc72c0c2..65dcc72c0c2 100644
--- a/pkgs/misc/emulators/nestopia/gcc6.patch
+++ b/nixpkgs/pkgs/misc/emulators/nestopia/gcc6.patch
diff --git a/pkgs/misc/emulators/openmsx/custom-nixos.mk b/nixpkgs/pkgs/misc/emulators/openmsx/custom-nixos.mk
index 9098762e40d..9098762e40d 100644
--- a/pkgs/misc/emulators/openmsx/custom-nixos.mk
+++ b/nixpkgs/pkgs/misc/emulators/openmsx/custom-nixos.mk
diff --git a/pkgs/misc/emulators/openmsx/default.nix b/nixpkgs/pkgs/misc/emulators/openmsx/default.nix
index 6ac6f93750e..6ac6f93750e 100644
--- a/pkgs/misc/emulators/openmsx/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/openmsx/default.nix
diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix
index 6f28c5777ca..6f28c5777ca 100644
--- a/pkgs/misc/emulators/pcsx2/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix
diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix
index 1035061d057..1035061d057 100644
--- a/pkgs/misc/emulators/pcsxr/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix
diff --git a/pkgs/misc/emulators/pcsxr/uncompress2.patch b/nixpkgs/pkgs/misc/emulators/pcsxr/uncompress2.patch
index 356868ce7a8..356868ce7a8 100644
--- a/pkgs/misc/emulators/pcsxr/uncompress2.patch
+++ b/nixpkgs/pkgs/misc/emulators/pcsxr/uncompress2.patch
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix
index b976c1e8c27..b976c1e8c27 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix
diff --git a/pkgs/misc/emulators/qmc2/default.nix b/nixpkgs/pkgs/misc/emulators/qmc2/default.nix
index 660eba5fd03..660eba5fd03 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/qmc2/default.nix
diff --git a/pkgs/misc/emulators/resim/default.nix b/nixpkgs/pkgs/misc/emulators/resim/default.nix
index 81acdf81f2e..81acdf81f2e 100644
--- a/pkgs/misc/emulators/resim/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/resim/default.nix
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix
index 2176d53628f..2176d53628f 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/nixpkgs/pkgs/misc/emulators/retroarch/default.nix
index 3f14258b0c0..3f14258b0c0 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/retroarch/default.nix
diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
index d751c4f7fc4..d751c4f7fc4 100644
--- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
+++ b/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/nixpkgs/pkgs/misc/emulators/retroarch/wrapper.nix
index 08ebf8ea854..08ebf8ea854 100644
--- a/pkgs/misc/emulators/retroarch/wrapper.nix
+++ b/nixpkgs/pkgs/misc/emulators/retroarch/wrapper.nix
diff --git a/pkgs/misc/emulators/retrofe/default.nix b/nixpkgs/pkgs/misc/emulators/retrofe/default.nix
index 44571de3489..44571de3489 100644
--- a/pkgs/misc/emulators/retrofe/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/retrofe/default.nix
diff --git a/pkgs/misc/emulators/retrofe/include-paths.patch b/nixpkgs/pkgs/misc/emulators/retrofe/include-paths.patch
index 02eef2594ea..02eef2594ea 100644
--- a/pkgs/misc/emulators/retrofe/include-paths.patch
+++ b/nixpkgs/pkgs/misc/emulators/retrofe/include-paths.patch
diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix
index 674222dc355..674222dc355 100644
--- a/pkgs/misc/emulators/rpcs3/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix
diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix
index 0ae92121cab..0ae92121cab 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix
diff --git a/pkgs/misc/emulators/stella/default.nix b/nixpkgs/pkgs/misc/emulators/stella/default.nix
index c2d98cda060..c2d98cda060 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/stella/default.nix
diff --git a/pkgs/misc/emulators/termtekst/default.nix b/nixpkgs/pkgs/misc/emulators/termtekst/default.nix
index 8186aba1ee5..8186aba1ee5 100644
--- a/pkgs/misc/emulators/termtekst/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/termtekst/default.nix
diff --git a/pkgs/misc/emulators/uae/default.nix b/nixpkgs/pkgs/misc/emulators/uae/default.nix
index 313b61b393e..313b61b393e 100644
--- a/pkgs/misc/emulators/uae/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/uae/default.nix
diff --git a/pkgs/misc/emulators/vbam/default.nix b/nixpkgs/pkgs/misc/emulators/vbam/default.nix
index e44b45dbb4b..e44b45dbb4b 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/vbam/default.nix
diff --git a/pkgs/misc/emulators/vice/default.nix b/nixpkgs/pkgs/misc/emulators/vice/default.nix
index cb083c0aa0d..cb083c0aa0d 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/vice/default.nix
diff --git a/pkgs/misc/emulators/wine/base.nix b/nixpkgs/pkgs/misc/emulators/wine/base.nix
index 025158b0717..025158b0717 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/base.nix
diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/nixpkgs/pkgs/misc/emulators/wine/builder-wow.sh
index c006db3116b..c006db3116b 100644
--- a/pkgs/misc/emulators/wine/builder-wow.sh
+++ b/nixpkgs/pkgs/misc/emulators/wine/builder-wow.sh
diff --git a/pkgs/misc/emulators/wine/cert-path.patch b/nixpkgs/pkgs/misc/emulators/wine/cert-path.patch
index da01a477810..da01a477810 100644
--- a/pkgs/misc/emulators/wine/cert-path.patch
+++ b/nixpkgs/pkgs/misc/emulators/wine/cert-path.patch
diff --git a/pkgs/misc/emulators/wine/default.nix b/nixpkgs/pkgs/misc/emulators/wine/default.nix
index 727eb270067..727eb270067 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/default.nix
diff --git a/pkgs/misc/emulators/wine/fonts.nix b/nixpkgs/pkgs/misc/emulators/wine/fonts.nix
index 0ee1b3973d8..0ee1b3973d8 100644
--- a/pkgs/misc/emulators/wine/fonts.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/fonts.nix
diff --git a/pkgs/misc/emulators/wine/packages.nix b/nixpkgs/pkgs/misc/emulators/wine/packages.nix
index 3ea60e62c66..3ea60e62c66 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/packages.nix
diff --git a/pkgs/misc/emulators/wine/sources.nix b/nixpkgs/pkgs/misc/emulators/wine/sources.nix
index 06b3a950ba0..06b3a950ba0 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/sources.nix
diff --git a/pkgs/misc/emulators/wine/staging.nix b/nixpkgs/pkgs/misc/emulators/wine/staging.nix
index df979c68a47..df979c68a47 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/staging.nix
diff --git a/pkgs/misc/emulators/wine/util.nix b/nixpkgs/pkgs/misc/emulators/wine/util.nix
index b90a68e72df..b90a68e72df 100644
--- a/pkgs/misc/emulators/wine/util.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/util.nix
diff --git a/pkgs/misc/emulators/wine/vkd3d.nix b/nixpkgs/pkgs/misc/emulators/wine/vkd3d.nix
index 082eb0b90c6..082eb0b90c6 100644
--- a/pkgs/misc/emulators/wine/vkd3d.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/vkd3d.nix
diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/nixpkgs/pkgs/misc/emulators/wine/winetricks.nix
index 76606edf53c..76606edf53c 100644
--- a/pkgs/misc/emulators/wine/winetricks.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/winetricks.nix
diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix
index 2416ddd65b7..2416ddd65b7 100644
--- a/pkgs/misc/emulators/wxmupen64plus/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix
diff --git a/pkgs/misc/emulators/xcpc/default.nix b/nixpkgs/pkgs/misc/emulators/xcpc/default.nix
index 3806d25e5d0..3806d25e5d0 100644
--- a/pkgs/misc/emulators/xcpc/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/xcpc/default.nix
diff --git a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch b/nixpkgs/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch
index 43539ef4ca5..43539ef4ca5 100644
--- a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch
+++ b/nixpkgs/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch
diff --git a/pkgs/misc/emulators/yabause/default.nix b/nixpkgs/pkgs/misc/emulators/yabause/default.nix
index abceb752b2f..abceb752b2f 100644
--- a/pkgs/misc/emulators/yabause/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/yabause/default.nix
diff --git a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch b/nixpkgs/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch
index bb0491b373f..bb0491b373f 100644
--- a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch
+++ b/nixpkgs/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch
diff --git a/pkgs/misc/emulators/zsnes/default.nix b/nixpkgs/pkgs/misc/emulators/zsnes/default.nix
index 55fe49895c9..55fe49895c9 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/zsnes/default.nix
diff --git a/pkgs/misc/foldingathome/default.nix b/nixpkgs/pkgs/misc/foldingathome/default.nix
index 1aae47e603b..1aae47e603b 100644
--- a/pkgs/misc/foldingathome/default.nix
+++ b/nixpkgs/pkgs/misc/foldingathome/default.nix
diff --git a/pkgs/misc/frescobaldi/default.nix b/nixpkgs/pkgs/misc/frescobaldi/default.nix
index 5487b6cdc2a..5487b6cdc2a 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/nixpkgs/pkgs/misc/frescobaldi/default.nix
diff --git a/pkgs/misc/ghostscript/default.nix b/nixpkgs/pkgs/misc/ghostscript/default.nix
index 37974e41080..37974e41080 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/nixpkgs/pkgs/misc/ghostscript/default.nix
diff --git a/pkgs/misc/ghostscript/doc-no-ref.diff b/nixpkgs/pkgs/misc/ghostscript/doc-no-ref.diff
index 7380ba2f995..7380ba2f995 100644
--- a/pkgs/misc/ghostscript/doc-no-ref.diff
+++ b/nixpkgs/pkgs/misc/ghostscript/doc-no-ref.diff
diff --git a/pkgs/misc/ghostscript/urw-font-files.patch b/nixpkgs/pkgs/misc/ghostscript/urw-font-files.patch
index 9a4aab0bbbe..9a4aab0bbbe 100644
--- a/pkgs/misc/ghostscript/urw-font-files.patch
+++ b/nixpkgs/pkgs/misc/ghostscript/urw-font-files.patch
diff --git a/pkgs/misc/gnash/default.nix b/nixpkgs/pkgs/misc/gnash/default.nix
index cfc0c3f7301..cfc0c3f7301 100644
--- a/pkgs/misc/gnash/default.nix
+++ b/nixpkgs/pkgs/misc/gnash/default.nix
diff --git a/pkgs/misc/gnuk/default.nix b/nixpkgs/pkgs/misc/gnuk/default.nix
index afef861c0dc..afef861c0dc 100644
--- a/pkgs/misc/gnuk/default.nix
+++ b/nixpkgs/pkgs/misc/gnuk/default.nix
diff --git a/pkgs/misc/gnuk/generic.nix b/nixpkgs/pkgs/misc/gnuk/generic.nix
index e592b945a40..e592b945a40 100644
--- a/pkgs/misc/gnuk/generic.nix
+++ b/nixpkgs/pkgs/misc/gnuk/generic.nix
diff --git a/pkgs/misc/jackaudio/default.nix b/nixpkgs/pkgs/misc/jackaudio/default.nix
index f6eaa553bb2..f6eaa553bb2 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/nixpkgs/pkgs/misc/jackaudio/default.nix
diff --git a/pkgs/misc/jackaudio/jack1.nix b/nixpkgs/pkgs/misc/jackaudio/jack1.nix
index 39c0d7d50c7..39c0d7d50c7 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/nixpkgs/pkgs/misc/jackaudio/jack1.nix
diff --git a/pkgs/misc/lguf-brightness/default.nix b/nixpkgs/pkgs/misc/lguf-brightness/default.nix
index 297ca955e86..297ca955e86 100644
--- a/pkgs/misc/lguf-brightness/default.nix
+++ b/nixpkgs/pkgs/misc/lguf-brightness/default.nix
diff --git a/pkgs/misc/libcardiacarrest/default.nix b/nixpkgs/pkgs/misc/libcardiacarrest/default.nix
index 0c3370814bc..0c3370814bc 100644
--- a/pkgs/misc/libcardiacarrest/default.nix
+++ b/nixpkgs/pkgs/misc/libcardiacarrest/default.nix
diff --git a/pkgs/misc/lightspark/default.nix b/nixpkgs/pkgs/misc/lightspark/default.nix
index a821d430f6c..a821d430f6c 100644
--- a/pkgs/misc/lightspark/default.nix
+++ b/nixpkgs/pkgs/misc/lightspark/default.nix
diff --git a/pkgs/misc/lilypond/default.nix b/nixpkgs/pkgs/misc/lilypond/default.nix
index 7738c9b1c09..7738c9b1c09 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/nixpkgs/pkgs/misc/lilypond/default.nix
diff --git a/pkgs/misc/lilypond/findlib.patch b/nixpkgs/pkgs/misc/lilypond/findlib.patch
index 30e130bc8ad..30e130bc8ad 100644
--- a/pkgs/misc/lilypond/findlib.patch
+++ b/nixpkgs/pkgs/misc/lilypond/findlib.patch
diff --git a/pkgs/misc/lilypond/fonts.nix b/nixpkgs/pkgs/misc/lilypond/fonts.nix
index 00335eddce8..00335eddce8 100644
--- a/pkgs/misc/lilypond/fonts.nix
+++ b/nixpkgs/pkgs/misc/lilypond/fonts.nix
diff --git a/pkgs/misc/lilypond/unstable.nix b/nixpkgs/pkgs/misc/lilypond/unstable.nix
index 5b548038da9..5b548038da9 100644
--- a/pkgs/misc/lilypond/unstable.nix
+++ b/nixpkgs/pkgs/misc/lilypond/unstable.nix
diff --git a/pkgs/misc/lilypond/with-fonts.nix b/nixpkgs/pkgs/misc/lilypond/with-fonts.nix
index 36dbcf170dd..36dbcf170dd 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/nixpkgs/pkgs/misc/lilypond/with-fonts.nix
diff --git a/pkgs/misc/logging/beats/6.x.nix b/nixpkgs/pkgs/misc/logging/beats/6.x.nix
index a0a29f95aba..a0a29f95aba 100644
--- a/pkgs/misc/logging/beats/6.x.nix
+++ b/nixpkgs/pkgs/misc/logging/beats/6.x.nix
diff --git a/pkgs/misc/logging/beats/7.x.nix b/nixpkgs/pkgs/misc/logging/beats/7.x.nix
index adcbdddfc3a..adcbdddfc3a 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/nixpkgs/pkgs/misc/logging/beats/7.x.nix
diff --git a/pkgs/misc/long-shebang/default.nix b/nixpkgs/pkgs/misc/long-shebang/default.nix
index 5af75be690c..5af75be690c 100644
--- a/pkgs/misc/long-shebang/default.nix
+++ b/nixpkgs/pkgs/misc/long-shebang/default.nix
diff --git a/pkgs/misc/meson-tools/default.nix b/nixpkgs/pkgs/misc/meson-tools/default.nix
index 02b162c8809..02b162c8809 100644
--- a/pkgs/misc/meson-tools/default.nix
+++ b/nixpkgs/pkgs/misc/meson-tools/default.nix
diff --git a/pkgs/misc/mnemonicode/default.nix b/nixpkgs/pkgs/misc/mnemonicode/default.nix
index ec0dd0b1fd5..ec0dd0b1fd5 100644
--- a/pkgs/misc/mnemonicode/default.nix
+++ b/nixpkgs/pkgs/misc/mnemonicode/default.nix
diff --git a/pkgs/misc/mxt-app/default.nix b/nixpkgs/pkgs/misc/mxt-app/default.nix
index d701bd654d2..d701bd654d2 100644
--- a/pkgs/misc/mxt-app/default.nix
+++ b/nixpkgs/pkgs/misc/mxt-app/default.nix
diff --git a/pkgs/misc/my-env/default.nix b/nixpkgs/pkgs/misc/my-env/default.nix
index fb8de9b6a71..fb8de9b6a71 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/nixpkgs/pkgs/misc/my-env/default.nix
diff --git a/pkgs/misc/my-env/loadenv.sh b/nixpkgs/pkgs/misc/my-env/loadenv.sh
index 1688d2f158f..1688d2f158f 100644
--- a/pkgs/misc/my-env/loadenv.sh
+++ b/nixpkgs/pkgs/misc/my-env/loadenv.sh
diff --git a/pkgs/misc/riscv-pk/default.nix b/nixpkgs/pkgs/misc/riscv-pk/default.nix
index e724869b235..e724869b235 100644
--- a/pkgs/misc/riscv-pk/default.nix
+++ b/nixpkgs/pkgs/misc/riscv-pk/default.nix
diff --git a/pkgs/misc/rkdeveloptool/default.nix b/nixpkgs/pkgs/misc/rkdeveloptool/default.nix
index e877629bcb0..e877629bcb0 100644
--- a/pkgs/misc/rkdeveloptool/default.nix
+++ b/nixpkgs/pkgs/misc/rkdeveloptool/default.nix
diff --git a/pkgs/misc/sailsd/default.nix b/nixpkgs/pkgs/misc/sailsd/default.nix
index 49d86491aa0..49d86491aa0 100644
--- a/pkgs/misc/sailsd/default.nix
+++ b/nixpkgs/pkgs/misc/sailsd/default.nix
diff --git a/pkgs/misc/scrcpy/default.nix b/nixpkgs/pkgs/misc/scrcpy/default.nix
index 6e5822b5a6f..6e5822b5a6f 100644
--- a/pkgs/misc/scrcpy/default.nix
+++ b/nixpkgs/pkgs/misc/scrcpy/default.nix
diff --git a/pkgs/misc/scream-receivers/default.nix b/nixpkgs/pkgs/misc/scream-receivers/default.nix
index 6c0f73f1b25..6c0f73f1b25 100644
--- a/pkgs/misc/scream-receivers/default.nix
+++ b/nixpkgs/pkgs/misc/scream-receivers/default.nix
diff --git a/pkgs/misc/screensavers/alock/default.nix b/nixpkgs/pkgs/misc/screensavers/alock/default.nix
index 59d5a146e16..59d5a146e16 100644
--- a/pkgs/misc/screensavers/alock/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/alock/default.nix
diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix
index d25f253bd00..d25f253bd00 100644
--- a/pkgs/misc/screensavers/betterlockscreen/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix
diff --git a/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch
index 3bbbfcfd613..3bbbfcfd613 100644
--- a/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch
+++ b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch
diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix
index b36f8bf98de..b36f8bf98de 100644
--- a/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix
diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix
index ae61291b087..ae61291b087 100644
--- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix
diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix
index 9763949cf98..9763949cf98 100644
--- a/pkgs/misc/screensavers/light-locker/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix
diff --git a/pkgs/misc/screensavers/physlock/default.nix b/nixpkgs/pkgs/misc/screensavers/physlock/default.nix
index c27ac344e05..c27ac344e05 100644
--- a/pkgs/misc/screensavers/physlock/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/physlock/default.nix
diff --git a/pkgs/misc/screensavers/pipes/default.nix b/nixpkgs/pkgs/misc/screensavers/pipes/default.nix
index fb80f9922ce..fb80f9922ce 100644
--- a/pkgs/misc/screensavers/pipes/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/pipes/default.nix
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix
index 467f762de86..467f762de86 100644
--- a/pkgs/misc/screensavers/rss-glx/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix
diff --git a/pkgs/misc/screensavers/slock/default.nix b/nixpkgs/pkgs/misc/screensavers/slock/default.nix
index 9dadd085067..9dadd085067 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/slock/default.nix
diff --git a/pkgs/misc/screensavers/vlock/default.nix b/nixpkgs/pkgs/misc/screensavers/vlock/default.nix
index ae89bbd53cc..ae89bbd53cc 100644
--- a/pkgs/misc/screensavers/vlock/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/vlock/default.nix
diff --git a/pkgs/misc/screensavers/vlock/eintr.patch b/nixpkgs/pkgs/misc/screensavers/vlock/eintr.patch
index 64f43243432..64f43243432 100644
--- a/pkgs/misc/screensavers/vlock/eintr.patch
+++ b/nixpkgs/pkgs/misc/screensavers/vlock/eintr.patch
diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix
index cefcdbc75a3..cefcdbc75a3 100644
--- a/pkgs/misc/screensavers/xautolock/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix
index c43a8acf885..c43a8acf885 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix
index 1937874a49c..1937874a49c 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix
diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/nixpkgs/pkgs/misc/screensavers/xss-lock/default.nix
index b7b0e27ad46..b7b0e27ad46 100644
--- a/pkgs/misc/screensavers/xss-lock/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/xss-lock/default.nix
diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/nixpkgs/pkgs/misc/screensavers/xssproxy/default.nix
index a278e6dc949..a278e6dc949 100644
--- a/pkgs/misc/screensavers/xssproxy/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/xssproxy/default.nix
diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix
index 1aa1f347ab4..1aa1f347ab4 100644
--- a/pkgs/misc/screensavers/xtrlock-pam/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix
diff --git a/pkgs/misc/seafile-shared/default.nix b/nixpkgs/pkgs/misc/seafile-shared/default.nix
index 6236b3a71ba..6236b3a71ba 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/nixpkgs/pkgs/misc/seafile-shared/default.nix
diff --git a/pkgs/misc/sndio/default.nix b/nixpkgs/pkgs/misc/sndio/default.nix
index c415714f573..c415714f573 100644
--- a/pkgs/misc/sndio/default.nix
+++ b/nixpkgs/pkgs/misc/sndio/default.nix
diff --git a/pkgs/misc/solfege/default.nix b/nixpkgs/pkgs/misc/solfege/default.nix
index 7ca9843e2e3..7ca9843e2e3 100644
--- a/pkgs/misc/solfege/default.nix
+++ b/nixpkgs/pkgs/misc/solfege/default.nix
diff --git a/pkgs/misc/sound-of-sorting/default.nix b/nixpkgs/pkgs/misc/sound-of-sorting/default.nix
index 1072bac7816..1072bac7816 100644
--- a/pkgs/misc/sound-of-sorting/default.nix
+++ b/nixpkgs/pkgs/misc/sound-of-sorting/default.nix
diff --git a/pkgs/misc/source-and-tags/default.nix b/nixpkgs/pkgs/misc/source-and-tags/default.nix
index 7c082cbbbb0..7c082cbbbb0 100644
--- a/pkgs/misc/source-and-tags/default.nix
+++ b/nixpkgs/pkgs/misc/source-and-tags/default.nix
diff --git a/pkgs/misc/stabber/default.nix b/nixpkgs/pkgs/misc/stabber/default.nix
index d0d3fbdf2d7..d0d3fbdf2d7 100644
--- a/pkgs/misc/stabber/default.nix
+++ b/nixpkgs/pkgs/misc/stabber/default.nix
diff --git a/pkgs/misc/talkfilters/default.nix b/nixpkgs/pkgs/misc/talkfilters/default.nix
index 8154e417e06..8154e417e06 100644
--- a/pkgs/misc/talkfilters/default.nix
+++ b/nixpkgs/pkgs/misc/talkfilters/default.nix
diff --git a/pkgs/misc/tmux-plugins/default.nix b/nixpkgs/pkgs/misc/tmux-plugins/default.nix
index 0d10b44ab1e..0d10b44ab1e 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/nixpkgs/pkgs/misc/tmux-plugins/default.nix
diff --git a/pkgs/misc/uboot/default.nix b/nixpkgs/pkgs/misc/uboot/default.nix
index 29dfb6558a9..29dfb6558a9 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/nixpkgs/pkgs/misc/uboot/default.nix
diff --git a/pkgs/misc/uboot/nanonote.nix b/nixpkgs/pkgs/misc/uboot/nanonote.nix
index fb3b98f478e..fb3b98f478e 100644
--- a/pkgs/misc/uboot/nanonote.nix
+++ b/nixpkgs/pkgs/misc/uboot/nanonote.nix
diff --git a/pkgs/misc/uq/default.nix b/nixpkgs/pkgs/misc/uq/default.nix
index 9dcfae41ea8..9dcfae41ea8 100755
--- a/pkgs/misc/uq/default.nix
+++ b/nixpkgs/pkgs/misc/uq/default.nix
diff --git a/pkgs/misc/urbit/default.nix b/nixpkgs/pkgs/misc/urbit/default.nix
index a0b6be3a418..a0b6be3a418 100644
--- a/pkgs/misc/urbit/default.nix
+++ b/nixpkgs/pkgs/misc/urbit/default.nix
diff --git a/pkgs/misc/vim-plugins/aliases.nix b/nixpkgs/pkgs/misc/vim-plugins/aliases.nix
index cfdd629369c..cfdd629369c 100644
--- a/pkgs/misc/vim-plugins/aliases.nix
+++ b/nixpkgs/pkgs/misc/vim-plugins/aliases.nix
diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix
index 4ca99b09af5..4ca99b09af5 100644
--- a/pkgs/misc/vim-plugins/build-vim-plugin.nix
+++ b/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix
diff --git a/pkgs/misc/vim-plugins/default.nix b/nixpkgs/pkgs/misc/vim-plugins/default.nix
index 20cbbf275c3..20cbbf275c3 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/nixpkgs/pkgs/misc/vim-plugins/default.nix
diff --git a/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix
index d4823066d8d..d4823066d8d 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
index fc3d295e6ee..fc3d295e6ee 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
diff --git a/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch b/nixpkgs/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch
index 72c928d1a97..72c928d1a97 100644
--- a/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch
+++ b/nixpkgs/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch
diff --git a/pkgs/misc/vim-plugins/readme.md b/nixpkgs/pkgs/misc/vim-plugins/readme.md
index 0758a3e9598..0758a3e9598 100644
--- a/pkgs/misc/vim-plugins/readme.md
+++ b/nixpkgs/pkgs/misc/vim-plugins/readme.md
diff --git a/pkgs/misc/vim-plugins/update.py b/nixpkgs/pkgs/misc/vim-plugins/update.py
index 0ef93ac569a..0ef93ac569a 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/nixpkgs/pkgs/misc/vim-plugins/update.py
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
index 9ce6f478672..9ce6f478672 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix
index 16c14b32218..16c14b32218 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix
diff --git a/pkgs/misc/vim-plugins/vim2nix/README.txt b/nixpkgs/pkgs/misc/vim-plugins/vim2nix/README.txt
index 4263481461f..4263481461f 100644
--- a/pkgs/misc/vim-plugins/vim2nix/README.txt
+++ b/nixpkgs/pkgs/misc/vim-plugins/vim2nix/README.txt
diff --git a/pkgs/misc/vim-plugins/vim2nix/addon-info.json b/nixpkgs/pkgs/misc/vim-plugins/vim2nix/addon-info.json
index 93ca9bc129b..93ca9bc129b 100644
--- a/pkgs/misc/vim-plugins/vim2nix/addon-info.json
+++ b/nixpkgs/pkgs/misc/vim-plugins/vim2nix/addon-info.json
diff --git a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim b/nixpkgs/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
index 0ddbeaae6be..0ddbeaae6be 100644
--- a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
+++ b/nixpkgs/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix
index 08fee83d8ce..08fee83d8ce 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix
diff --git a/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh
index f5eb08d78a5..f5eb08d78a5 100755
--- a/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh
+++ b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh
diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json
index c2d8a10f340..c2d8a10f340 100644
--- a/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json
+++ b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json
diff --git a/pkgs/misc/vscode-extensions/cpptools/update_helper.sh b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/update_helper.sh
index 00ef7755324..00ef7755324 100755
--- a/pkgs/misc/vscode-extensions/cpptools/update_helper.sh
+++ b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/update_helper.sh
diff --git a/pkgs/misc/vscode-extensions/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/default.nix
index b4ec1d2d696..b4ec1d2d696 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/nixpkgs/pkgs/misc/vscode-extensions/default.nix
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix
index 376f52ec5ff..376f52ec5ff 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix
diff --git a/pkgs/misc/vscode-extensions/python/extract-nuget.nix b/nixpkgs/pkgs/misc/vscode-extensions/python/extract-nuget.nix
index e4d3b6a0ed1..e4d3b6a0ed1 100644
--- a/pkgs/misc/vscode-extensions/python/extract-nuget.nix
+++ b/nixpkgs/pkgs/misc/vscode-extensions/python/extract-nuget.nix
diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix
index fe053dd7ea3..fe053dd7ea3 100644
--- a/pkgs/misc/vscode-extensions/remote-ssh/default.nix
+++ b/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix
diff --git a/pkgs/misc/vscode-extensions/update_installed_exts.sh b/nixpkgs/pkgs/misc/vscode-extensions/update_installed_exts.sh
index fdbc14fb264..fdbc14fb264 100755
--- a/pkgs/misc/vscode-extensions/update_installed_exts.sh
+++ b/nixpkgs/pkgs/misc/vscode-extensions/update_installed_exts.sh
diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix
index 2216e425897..2216e425897 100644
--- a/pkgs/misc/vscode-extensions/vscode-utils.nix
+++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix
diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix
index da8d940f71c..da8d940f71c 100644
--- a/pkgs/misc/vscode-extensions/wakatime/default.nix
+++ b/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix
diff --git a/pkgs/misc/xosd/default.nix b/nixpkgs/pkgs/misc/xosd/default.nix
index a841acdca94..a841acdca94 100644
--- a/pkgs/misc/xosd/default.nix
+++ b/nixpkgs/pkgs/misc/xosd/default.nix
diff --git a/pkgs/os-specific/bsd/default.nix b/nixpkgs/pkgs/os-specific/bsd/default.nix
index ee7158e2a8c..ee7158e2a8c 100644
--- a/pkgs/os-specific/bsd/default.nix
+++ b/nixpkgs/pkgs/os-specific/bsd/default.nix
diff --git a/pkgs/os-specific/bsd/netbsd/builder.sh b/nixpkgs/pkgs/os-specific/bsd/netbsd/builder.sh
index 925001567f7..925001567f7 100644
--- a/pkgs/os-specific/bsd/netbsd/builder.sh
+++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/builder.sh
diff --git a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh b/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh
index 81df09eba17..81df09eba17 100644
--- a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh
+++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh
diff --git a/pkgs/os-specific/bsd/netbsd/compat.patch b/nixpkgs/pkgs/os-specific/bsd/netbsd/compat.patch
index f67ca2e5079..f67ca2e5079 100644
--- a/pkgs/os-specific/bsd/netbsd/compat.patch
+++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/compat.patch
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix
index 2d51c11f04a..2d51c11f04a 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix
diff --git a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh b/nixpkgs/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh
index 5cf8c753aec..5cf8c753aec 100644
--- a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh
+++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh
diff --git a/pkgs/os-specific/bsd/netbsd/getent.patch b/nixpkgs/pkgs/os-specific/bsd/netbsd/getent.patch
index e9e34d19a31..e9e34d19a31 100644
--- a/pkgs/os-specific/bsd/netbsd/getent.patch
+++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/getent.patch
diff --git a/pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc b/nixpkgs/pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc
index 3aadabe5088..3aadabe5088 100644
--- a/pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc
+++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc
diff --git a/pkgs/os-specific/bsd/netbsd/locale.patch b/nixpkgs/pkgs/os-specific/bsd/netbsd/locale.patch
index 1df9eb38562..1df9eb38562 100644
--- a/pkgs/os-specific/bsd/netbsd/locale.patch
+++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/locale.patch
diff --git a/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix
index aa73c7f86c4..aa73c7f86c4 100644
--- a/pkgs/os-specific/darwin/CoreSymbolication/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix
diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/nixpkgs/pkgs/os-specific/darwin/DarwinTools/default.nix
index 174f9478633..174f9478633 100644
--- a/pkgs/os-specific/darwin/DarwinTools/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/DarwinTools/default.nix
diff --git a/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh
index 86c241cd0f5..86c241cd0f5 100644
--- a/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix
index aef7341e5e9..aef7341e5e9 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix
diff --git a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh
index b0d5915fc1f..b0d5915fc1f 100644
--- a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index b5a378cc6ae..b5a378cc6ae 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
index c111492f2b3..c111492f2b3 100644
--- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
diff --git a/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh
index a351c39de13..a351c39de13 100644
--- a/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh
diff --git a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh
index 35cea773f98..35cea773f98 100644
--- a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix
index 5c6d54aeb9c..5c6d54aeb9c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix
index ad51f1df2bc..ad51f1df2bc 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix
index 7fd32a64fe5..7fd32a64fe5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch
index fd9df812940..fd9df812940 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
index 761ff3ea925..761ff3ea925 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
index 4b82209f176..4b82209f176 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
index 29aa3d64cb0..29aa3d64cb0 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/CrashReporterClient.h b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/CrashReporterClient.h
index a1cbb72b917..a1cbb72b917 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/CrashReporterClient.h
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/CrashReporterClient.h
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
index 6ebb470145d..6ebb470145d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix
index add51a61d3d..add51a61d3d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix
index df5f6b7b8fd..df5f6b7b8fd 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix
index 2ee80d70264..2ee80d70264 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
index a7b2bd7d981..a7b2bd7d981 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 99d67002803..99d67002803 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
index edc2e759a29..edc2e759a29 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols
index 1ec6c6332cf..1ec6c6332cf 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
index 7c5b90f95ed..7c5b90f95ed 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_symbols b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_symbols
index 75a00acac49..75a00acac49 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_symbols
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_symbols
diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix
index 5685d09e54f..5685d09e54f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix
index e04142b8b11..e04142b8b11 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix
index f1b5e19feb2..f1b5e19feb2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix
index 2a2d4cbe493..2a2d4cbe493 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
index 0cbd7d81b90..0cbd7d81b90 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
index ebeb3ef0884..ebeb3ef0884 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
index eadf18e028e..eadf18e028e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
index 256781f61b1..256781f61b1 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
index 043c7b0bc70..043c7b0bc70 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
index 20168d24dd7..20168d24dd7 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
index 7e1dc5309b1..7e1dc5309b1 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 14c69b84eb4..14c69b84eb4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
index 21971ea2e28..21971ea2e28 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
index 6d3bd103811..6d3bd103811 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
index 3e7e89642c2..3e7e89642c2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix
index ddadf1f3940..ddadf1f3940 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
index b24d94b9d70..b24d94b9d70 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
index 5de84d2a6e5..5de84d2a6e5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix
index ab294b143d3..ab294b143d3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix
index eed7982e9d8..eed7982e9d8 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libauto/auto_dtrace.h b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libauto/auto_dtrace.h
index bf367a3cabb..bf367a3cabb 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libauto/auto_dtrace.h
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libauto/auto_dtrace.h
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix
index b2ef3374ca2..b2ef3374ca2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix
index ac33a24a8b4..ac33a24a8b4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
index 46e9e592ddc..46e9e592ddc 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index 0532c88b66b..0532c88b66b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
index 4fd0ab8a7fb..4fd0ab8a7fb 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
index 650c6415def..650c6415def 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
index f3c7558cfc6..f3c7558cfc6 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
index bd219ae434c..bd219ae434c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix
index 2b196e46ef4..2b196e46ef4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix
index f17ed785360..f17ed785360 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index 82be7dc860e..82be7dc860e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
index a7cedaaea11..a7cedaaea11 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/objc-probes.h b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/objc-probes.h
index 4ad9ba9ad10..4ad9ba9ad10 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/objc4/objc-probes.h
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/objc-probes.h
diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix
index 6a0c819a0a3..6a0c819a0a3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/spinlocks.patch b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/spinlocks.patch
index 50c6a983fe4..50c6a983fe4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/objc4/spinlocks.patch
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/spinlocks.patch
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
index 5668c376130..5668c376130 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix
index 2b45fbdb45e..2b45fbdb45e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
index b87dadd391d..b87dadd391d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
index 16454cbc1a5..16454cbc1a5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
index 14d7a5e3b32..14d7a5e3b32 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/top/default.nix
index a2f912ca578..a2f912ca578 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/top/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
index da2d0c5dc7b..da2d0c5dc7b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch
index 10778406c8e..10778406c8e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch
+++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix
index e31f9b91f97..e31f9b91f97 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix
diff --git a/pkgs/os-specific/darwin/cctools/ld-ignore-rpath-link.patch b/nixpkgs/pkgs/os-specific/darwin/cctools/ld-ignore-rpath-link.patch
index fc87f69ac32..fc87f69ac32 100644
--- a/pkgs/os-specific/darwin/cctools/ld-ignore-rpath-link.patch
+++ b/nixpkgs/pkgs/os-specific/darwin/cctools/ld-ignore-rpath-link.patch
diff --git a/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch b/nixpkgs/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch
index 17ad9053f3b..17ad9053f3b 100644
--- a/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch
+++ b/nixpkgs/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/nixpkgs/pkgs/os-specific/darwin/cctools/port.nix
index 1aee5c8c35e..1aee5c8c35e 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/cctools/port.nix
diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/nixpkgs/pkgs/os-specific/darwin/chunkwm/default.nix
index 12b35812651..12b35812651 100644
--- a/pkgs/os-specific/darwin/chunkwm/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/chunkwm/default.nix
diff --git a/pkgs/os-specific/darwin/darling/default.nix b/nixpkgs/pkgs/os-specific/darwin/darling/default.nix
index 846831d0a87..846831d0a87 100644
--- a/pkgs/os-specific/darwin/darling/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/darling/default.nix
diff --git a/pkgs/os-specific/darwin/duti/default.nix b/nixpkgs/pkgs/os-specific/darwin/duti/default.nix
index 5c63b8e0dfb..5c63b8e0dfb 100644
--- a/pkgs/os-specific/darwin/duti/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/duti/default.nix
diff --git a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix b/nixpkgs/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix
index 46ba6828186..46ba6828186 100644
--- a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix
diff --git a/pkgs/os-specific/darwin/goku/default.nix b/nixpkgs/pkgs/os-specific/darwin/goku/default.nix
index e374bd2f11c..e374bd2f11c 100644
--- a/pkgs/os-specific/darwin/goku/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/goku/default.nix
diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/nixpkgs/pkgs/os-specific/darwin/insert_dylib/default.nix
index 0ab6a415707..0ab6a415707 100644
--- a/pkgs/os-specific/darwin/insert_dylib/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/insert_dylib/default.nix
diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/nixpkgs/pkgs/os-specific/darwin/iproute2mac/default.nix
index e82636fce1f..e82636fce1f 100644
--- a/pkgs/os-specific/darwin/iproute2mac/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/iproute2mac/default.nix
diff --git a/pkgs/os-specific/darwin/khd/default.nix b/nixpkgs/pkgs/os-specific/darwin/khd/default.nix
index 90f92b0b644..90f92b0b644 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/khd/default.nix
diff --git a/pkgs/os-specific/darwin/khd/org.nixos.khd.plist b/nixpkgs/pkgs/os-specific/darwin/khd/org.nixos.khd.plist
index 3c0aaa81eb6..3c0aaa81eb6 100644
--- a/pkgs/os-specific/darwin/khd/org.nixos.khd.plist
+++ b/nixpkgs/pkgs/os-specific/darwin/khd/org.nixos.khd.plist
diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/nixpkgs/pkgs/os-specific/darwin/kwm/default.nix
index c3fa76f5096..c3fa76f5096 100644
--- a/pkgs/os-specific/darwin/kwm/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/kwm/default.nix
diff --git a/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist b/nixpkgs/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist
index eafce2ab4a4..eafce2ab4a4 100644
--- a/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist
+++ b/nixpkgs/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist
diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/nixpkgs/pkgs/os-specific/darwin/libtapi/default.nix
index 182d1db3bfd..182d1db3bfd 100644
--- a/pkgs/os-specific/darwin/libtapi/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/libtapi/default.nix
diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/nixpkgs/pkgs/os-specific/darwin/lsusb/default.nix
index 02821fe61ef..02821fe61ef 100644
--- a/pkgs/os-specific/darwin/lsusb/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/lsusb/default.nix
diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix
index 12bf02bf89f..12bf02bf89f 100644
--- a/pkgs/os-specific/darwin/m-cli/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix
diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/nixpkgs/pkgs/os-specific/darwin/maloader/default.nix
index d1df820615d..d1df820615d 100644
--- a/pkgs/os-specific/darwin/maloader/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/maloader/default.nix
diff --git a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix b/nixpkgs/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix
index fa3d4284e59..fa3d4284e59 100644
--- a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix
diff --git a/pkgs/os-specific/darwin/noah/default.nix b/nixpkgs/pkgs/os-specific/darwin/noah/default.nix
index 81f4ab2bd9e..81f4ab2bd9e 100644
--- a/pkgs/os-specific/darwin/noah/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/noah/default.nix
diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/nixpkgs/pkgs/os-specific/darwin/opencflite/default.nix
index 23b5ded1fe6..23b5ded1fe6 100644
--- a/pkgs/os-specific/darwin/opencflite/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/opencflite/default.nix
diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix
index e1a00c71cb8..e1a00c71cb8 100644
--- a/pkgs/os-specific/darwin/osxfuse/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix
diff --git a/pkgs/os-specific/darwin/osxsnarf/default.nix b/nixpkgs/pkgs/os-specific/darwin/osxsnarf/default.nix
index e391be1807c..e391be1807c 100644
--- a/pkgs/os-specific/darwin/osxsnarf/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/osxsnarf/default.nix
diff --git a/pkgs/os-specific/darwin/qes/default.nix b/nixpkgs/pkgs/os-specific/darwin/qes/default.nix
index 21b0d605021..21b0d605021 100644
--- a/pkgs/os-specific/darwin/qes/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/qes/default.nix
diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/nixpkgs/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
index 768ca6cf9c9..768ca6cf9c9 100644
--- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix
index ba5d3e9255b..ba5d3e9255b 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix
diff --git a/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist b/nixpkgs/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist
index e6624487740..e6624487740 100644
--- a/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist
+++ b/nixpkgs/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist
diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix
index 9efa230d3b7..9efa230d3b7 100644
--- a/pkgs/os-specific/darwin/smimesign/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix
diff --git a/pkgs/os-specific/darwin/stubs/default.nix b/nixpkgs/pkgs/os-specific/darwin/stubs/default.nix
index 6fedf0a451e..6fedf0a451e 100644
--- a/pkgs/os-specific/darwin/stubs/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/stubs/default.nix
diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
index 059cb70bfbd..059cb70bfbd 100644
--- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
diff --git a/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix b/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix
index bd143b6071b..bd143b6071b 100644
--- a/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix
diff --git a/pkgs/os-specific/darwin/trash/default.nix b/nixpkgs/pkgs/os-specific/darwin/trash/default.nix
index 50c6d4fd2f4..50c6d4fd2f4 100644
--- a/pkgs/os-specific/darwin/trash/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/trash/default.nix
diff --git a/pkgs/os-specific/darwin/trash/trash.diff b/nixpkgs/pkgs/os-specific/darwin/trash/trash.diff
index fa6edf98b3d..fa6edf98b3d 100644
--- a/pkgs/os-specific/darwin/trash/trash.diff
+++ b/nixpkgs/pkgs/os-specific/darwin/trash/trash.diff
diff --git a/pkgs/os-specific/darwin/usr-include/default.nix b/nixpkgs/pkgs/os-specific/darwin/usr-include/default.nix
index 4fef1388764..4fef1388764 100644
--- a/pkgs/os-specific/darwin/usr-include/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/usr-include/default.nix
diff --git a/pkgs/os-specific/darwin/wifi-password/default.nix b/nixpkgs/pkgs/os-specific/darwin/wifi-password/default.nix
index 801e180f734..801e180f734 100644
--- a/pkgs/os-specific/darwin/wifi-password/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/wifi-password/default.nix
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix
index 282afe13c34..282afe13c34 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix
diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
index e8302a82555..e8302a82555 100644
--- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/nixpkgs/pkgs/os-specific/linux/915resolution/default.nix
index ce21887f19f..ce21887f19f 100644
--- a/pkgs/os-specific/linux/915resolution/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/915resolution/default.nix
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix
index bd12373da88..bd12373da88 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/nixpkgs/pkgs/os-specific/linux/acpi/default.nix
index cc7317f5520..cc7317f5520 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/acpi/default.nix
diff --git a/pkgs/os-specific/linux/acpid/default.nix b/nixpkgs/pkgs/os-specific/linux/acpid/default.nix
index d58aec4a97c..d58aec4a97c 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/acpid/default.nix
diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/nixpkgs/pkgs/os-specific/linux/acpitool/default.nix
index 86e6b54906a..86e6b54906a 100644
--- a/pkgs/os-specific/linux/acpitool/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/acpitool/default.nix
diff --git a/pkgs/os-specific/linux/afuse/default.nix b/nixpkgs/pkgs/os-specific/linux/afuse/default.nix
index 67c5ff14087..67c5ff14087 100644
--- a/pkgs/os-specific/linux/afuse/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/afuse/default.nix
diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-firmware/default.nix
index 7f0ba5498df..7f0ba5498df 100644
--- a/pkgs/os-specific/linux/alsa-firmware/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/alsa-firmware/default.nix
diff --git a/pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch b/nixpkgs/pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch
index b17df9a492e..b17df9a492e 100644
--- a/pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch
+++ b/nixpkgs/pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch
diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-lib/default.nix
index 8dcddf4baf9..8dcddf4baf9 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/alsa-lib/default.nix
diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-oss/default.nix
index 77b351a1998..77b351a1998 100644
--- a/pkgs/os-specific/linux/alsa-oss/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/alsa-oss/default.nix
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-plugins/default.nix
index a5262d6ae9e..a5262d6ae9e 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/alsa-plugins/default.nix
diff --git a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix b/nixpkgs/pkgs/os-specific/linux/alsa-plugins/wrapper.nix
index 769b6ecd9bf..769b6ecd9bf 100644
--- a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix
+++ b/nixpkgs/pkgs/os-specific/linux/alsa-plugins/wrapper.nix
diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-tools/default.nix
index 743e8f3576b..743e8f3576b 100644
--- a/pkgs/os-specific/linux/alsa-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/alsa-tools/default.nix
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix
index 7b356746861..7b356746861 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix
diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/default.nix
index b72944a49eb..b72944a49eb 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/default.nix
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch b/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch
index ecde6401ac1..ecde6401ac1 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch
+++ b/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch b/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch
index 20f429757a5..20f429757a5 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch
+++ b/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch b/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch
index 0091c471680..0091c471680 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch
+++ b/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch
diff --git a/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c b/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c
index ab47bacb822..ab47bacb822 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c
+++ b/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c
diff --git a/pkgs/os-specific/linux/anbox/default.nix b/nixpkgs/pkgs/os-specific/linux/anbox/default.nix
index 0012c3de989..0012c3de989 100644
--- a/pkgs/os-specific/linux/anbox/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/anbox/default.nix
diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix
index 0888f2c5414..0888f2c5414 100644
--- a/pkgs/os-specific/linux/anbox/kmod.nix
+++ b/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix
index 2aa71b92beb..2aa71b92beb 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix
diff --git a/pkgs/os-specific/linux/apparmor/cross.patch b/nixpkgs/pkgs/os-specific/linux/apparmor/cross.patch
index f7e95ecfb40..f7e95ecfb40 100644
--- a/pkgs/os-specific/linux/apparmor/cross.patch
+++ b/nixpkgs/pkgs/os-specific/linux/apparmor/cross.patch
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix
index de9601dc85e..de9601dc85e 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix
diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/nixpkgs/pkgs/os-specific/linux/ati-drivers/builder.sh
index a9e5aaef397..a9e5aaef397 100644
--- a/pkgs/os-specific/linux/ati-drivers/builder.sh
+++ b/nixpkgs/pkgs/os-specific/linux/ati-drivers/builder.sh
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/nixpkgs/pkgs/os-specific/linux/ati-drivers/default.nix
index a391f73391f..a391f73391f 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ati-drivers/default.nix
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch
index 22e43fc0c7b..22e43fc0c7b 100644
--- a/pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/15.9-kcl_str.patch b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-kcl_str.patch
index 20c3bc8a169..20c3bc8a169 100644
--- a/pkgs/os-specific/linux/ati-drivers/patches/15.9-kcl_str.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-kcl_str.patch
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/15.9-mtrr.patch b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-mtrr.patch
index bdf70b4ccdc..bdf70b4ccdc 100644
--- a/pkgs/os-specific/linux/ati-drivers/patches/15.9-mtrr.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-mtrr.patch
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/15.9-preempt.patch b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-preempt.patch
index c6598835133..c6598835133 100644
--- a/pkgs/os-specific/linux/ati-drivers/patches/15.9-preempt.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-preempt.patch
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/15.9-sep_printf.patch b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-sep_printf.patch
index 3e4e8d6499a..3e4e8d6499a 100644
--- a/pkgs/os-specific/linux/ati-drivers/patches/15.9-sep_printf.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-sep_printf.patch
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch
index cb86f5aff27..cb86f5aff27 100644
--- a/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch
index 8a6c42cdb1f..8a6c42cdb1f 100644
--- a/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch
index 1e7209ed5ed..1e7209ed5ed 100644
--- a/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch
index 28820790e49..28820790e49 100644
--- a/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/patch-samples.patch b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/patch-samples.patch
index 8bd24b1d022..8bd24b1d022 100644
--- a/pkgs/os-specific/linux/ati-drivers/patches/patch-samples.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/patch-samples.patch
diff --git a/pkgs/os-specific/linux/atop/default.nix b/nixpkgs/pkgs/os-specific/linux/atop/default.nix
index 5144add3a37..5144add3a37 100644
--- a/pkgs/os-specific/linux/atop/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/atop/default.nix
diff --git a/pkgs/os-specific/linux/atop/default.upstream b/nixpkgs/pkgs/os-specific/linux/atop/default.upstream
index 46099d9c959..46099d9c959 100644
--- a/pkgs/os-specific/linux/atop/default.upstream
+++ b/nixpkgs/pkgs/os-specific/linux/atop/default.upstream
diff --git a/pkgs/os-specific/linux/audit/default.nix b/nixpkgs/pkgs/os-specific/linux/audit/default.nix
index dab95049643..dab95049643 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/audit/default.nix
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/nixpkgs/pkgs/os-specific/linux/autofs/default.nix
index 591a9a8792f..591a9a8792f 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/autofs/default.nix
diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/nixpkgs/pkgs/os-specific/linux/batman-adv/alfred.nix
index fa2be46688c..fa2be46688c 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/nixpkgs/pkgs/os-specific/linux/batman-adv/alfred.nix
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/nixpkgs/pkgs/os-specific/linux/batman-adv/batctl.nix
index 57bafb398d1..57bafb398d1 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/nixpkgs/pkgs/os-specific/linux/batman-adv/batctl.nix
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix
index 796be1e5d48..796be1e5d48 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix
diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix
index f9f3013e1f9..f9f3013e1f9 100644
--- a/pkgs/os-specific/linux/batman-adv/version.nix
+++ b/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix
diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix
index 4b914860068..4b914860068 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/nixpkgs/pkgs/os-specific/linux/bcc/default.nix
index ffb14e9c3c1..ffb14e9c3c1 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/bcc/default.nix
diff --git a/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch b/nixpkgs/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch
index 1c422635f4f..1c422635f4f 100644
--- a/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch
+++ b/nixpkgs/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch
diff --git a/pkgs/os-specific/linux/bcc/libbcc-path.patch b/nixpkgs/pkgs/os-specific/linux/bcc/libbcc-path.patch
index 187bb3aadd0..187bb3aadd0 100644
--- a/pkgs/os-specific/linux/bcc/libbcc-path.patch
+++ b/nixpkgs/pkgs/os-specific/linux/bcc/libbcc-path.patch
diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix
index 4ae449c19aa..4ae449c19aa 100644
--- a/pkgs/os-specific/linux/blktrace/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/nixpkgs/pkgs/os-specific/linux/bluez/default.nix
index cf9bcec554c..cf9bcec554c 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/bluez/default.nix
diff --git a/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch b/nixpkgs/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch
index 0853bcea916..0853bcea916 100644
--- a/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch
+++ b/nixpkgs/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch
diff --git a/pkgs/os-specific/linux/bolt/default.nix b/nixpkgs/pkgs/os-specific/linux/bolt/default.nix
index 3a4c2ef7d9f..3a4c2ef7d9f 100644
--- a/pkgs/os-specific/linux/bolt/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/bolt/default.nix
diff --git a/pkgs/os-specific/linux/bpftool/default.nix b/nixpkgs/pkgs/os-specific/linux/bpftool/default.nix
index 34ddcc3a213..34ddcc3a213 100644
--- a/pkgs/os-specific/linux/bpftool/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/bpftool/default.nix
diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix
index 9eb9c53b8dd..9eb9c53b8dd 100644
--- a/pkgs/os-specific/linux/bpftrace/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix
diff --git a/pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch b/nixpkgs/pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch
index bff370d51e2..bff370d51e2 100644
--- a/pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch
+++ b/nixpkgs/pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch
diff --git a/pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch b/nixpkgs/pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch
index c9149bfec38..c9149bfec38 100644
--- a/pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch
+++ b/nixpkgs/pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch
diff --git a/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch b/nixpkgs/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
index efa41075644..efa41075644 100644
--- a/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
+++ b/nixpkgs/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/bridge-utils/default.nix
index e3207fdf37d..e3207fdf37d 100644
--- a/pkgs/os-specific/linux/bridge-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/bridge-utils/default.nix
diff --git a/pkgs/os-specific/linux/brillo/default.nix b/nixpkgs/pkgs/os-specific/linux/brillo/default.nix
index 1262260664c..1262260664c 100644
--- a/pkgs/os-specific/linux/brillo/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/brillo/default.nix
diff --git a/pkgs/os-specific/linux/brillo/udev-rule.patch b/nixpkgs/pkgs/os-specific/linux/brillo/udev-rule.patch
index 7b1cf484067..7b1cf484067 100644
--- a/pkgs/os-specific/linux/brillo/udev-rule.patch
+++ b/nixpkgs/pkgs/os-specific/linux/brillo/udev-rule.patch
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/default.nix
index e24171dfefe..e24171dfefe 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/default.nix
diff --git a/pkgs/os-specific/linux/broadcom-sta/gcc.patch b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/gcc.patch
index f93e3f1d3a3..f93e3f1d3a3 100644
--- a/pkgs/os-specific/linux/broadcom-sta/gcc.patch
+++ b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/gcc.patch
diff --git a/pkgs/os-specific/linux/broadcom-sta/i686-build-failure.patch b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/i686-build-failure.patch
index cfa16075409..cfa16075409 100644
--- a/pkgs/os-specific/linux/broadcom-sta/i686-build-failure.patch
+++ b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/i686-build-failure.patch
diff --git a/pkgs/os-specific/linux/broadcom-sta/license.patch b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/license.patch
index aebb4636519..aebb4636519 100644
--- a/pkgs/os-specific/linux/broadcom-sta/license.patch
+++ b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/license.patch
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch
index a779f8c84cf..a779f8c84cf 100644
--- a/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch
+++ b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch
index 8abc73db4db..8abc73db4db 100644
--- a/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch
+++ b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch
index 523fa291d52..523fa291d52 100644
--- a/pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch
+++ b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.7.patch b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-4.7.patch
index 566680a0914..566680a0914 100644
--- a/pkgs/os-specific/linux/broadcom-sta/linux-4.7.patch
+++ b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-4.7.patch
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.8.patch b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-4.8.patch
index 20e8a9ae49d..20e8a9ae49d 100644
--- a/pkgs/os-specific/linux/broadcom-sta/linux-4.8.patch
+++ b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-4.8.patch
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-5.1.patch b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-5.1.patch
index 8f04a737cab..8f04a737cab 100644
--- a/pkgs/os-specific/linux/broadcom-sta/linux-5.1.patch
+++ b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-5.1.patch
diff --git a/pkgs/os-specific/linux/broadcom-sta/null-pointer-fix.patch b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/null-pointer-fix.patch
index 76379729430..76379729430 100644
--- a/pkgs/os-specific/linux/broadcom-sta/null-pointer-fix.patch
+++ b/nixpkgs/pkgs/os-specific/linux/broadcom-sta/null-pointer-fix.patch
diff --git a/pkgs/os-specific/linux/btfs/default.nix b/nixpkgs/pkgs/os-specific/linux/btfs/default.nix
index d2e5d91e365..d2e5d91e365 100644
--- a/pkgs/os-specific/linux/btfs/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/btfs/default.nix
diff --git a/pkgs/os-specific/linux/busybox/busybox-in-store.patch b/nixpkgs/pkgs/os-specific/linux/busybox/busybox-in-store.patch
index 2d356b66b3a..2d356b66b3a 100644
--- a/pkgs/os-specific/linux/busybox/busybox-in-store.patch
+++ b/nixpkgs/pkgs/os-specific/linux/busybox/busybox-in-store.patch
diff --git a/pkgs/os-specific/linux/busybox/clang-cross.patch b/nixpkgs/pkgs/os-specific/linux/busybox/clang-cross.patch
index b2d696bfd73..b2d696bfd73 100644
--- a/pkgs/os-specific/linux/busybox/clang-cross.patch
+++ b/nixpkgs/pkgs/os-specific/linux/busybox/clang-cross.patch
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/nixpkgs/pkgs/os-specific/linux/busybox/default.nix
index 41ac6e94ab3..41ac6e94ab3 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/busybox/default.nix
diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/nixpkgs/pkgs/os-specific/linux/busybox/sandbox-shell.nix
index 036ea0a0f48..036ea0a0f48 100644
--- a/pkgs/os-specific/linux/busybox/sandbox-shell.nix
+++ b/nixpkgs/pkgs/os-specific/linux/busybox/sandbox-shell.nix
diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/nixpkgs/pkgs/os-specific/linux/cachefilesd/default.nix
index 44c2cfff5a2..44c2cfff5a2 100644
--- a/pkgs/os-specific/linux/cachefilesd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/cachefilesd/default.nix
diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix
index 7f16ecb9e6d..7f16ecb9e6d 100644
--- a/pkgs/os-specific/linux/can-isotp/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix
diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/can-utils/default.nix
index 6e26ef4bbce..6e26ef4bbce 100644
--- a/pkgs/os-specific/linux/can-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/can-utils/default.nix
diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/nixpkgs/pkgs/os-specific/linux/cgmanager/default.nix
index 6ba86036a52..6ba86036a52 100644
--- a/pkgs/os-specific/linux/cgmanager/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/cgmanager/default.nix
diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/nixpkgs/pkgs/os-specific/linux/checkpolicy/default.nix
index fc2faa5b8f5..fc2faa5b8f5 100644
--- a/pkgs/os-specific/linux/checkpolicy/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/checkpolicy/default.nix
diff --git a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch b/nixpkgs/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
index 9beeab0f954..9beeab0f954 100644
--- a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
+++ b/nixpkgs/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/nixpkgs/pkgs/os-specific/linux/checksec/default.nix
index 01e70fbb040..01e70fbb040 100644
--- a/pkgs/os-specific/linux/checksec/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/checksec/default.nix
diff --git a/pkgs/os-specific/linux/chromium-xorg-conf/default.nix b/nixpkgs/pkgs/os-specific/linux/chromium-xorg-conf/default.nix
index d9608650ed9..d9608650ed9 100644
--- a/pkgs/os-specific/linux/chromium-xorg-conf/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/chromium-xorg-conf/default.nix
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix
index 1ee7ece0537..1ee7ece0537 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix
diff --git a/pkgs/os-specific/linux/compsize/default.nix b/nixpkgs/pkgs/os-specific/linux/compsize/default.nix
index 0f24b1a18e9..0f24b1a18e9 100644
--- a/pkgs/os-specific/linux/compsize/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/compsize/default.nix
diff --git a/pkgs/os-specific/linux/conky/default.nix b/nixpkgs/pkgs/os-specific/linux/conky/default.nix
index f826ddd423d..f826ddd423d 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/conky/default.nix
diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/conntrack-tools/default.nix
index 20c441ffae2..20c441ffae2 100644
--- a/pkgs/os-specific/linux/conntrack-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/conntrack-tools/default.nix
diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/nixpkgs/pkgs/os-specific/linux/consoletools/default.nix
index c46af5fba85..c46af5fba85 100644
--- a/pkgs/os-specific/linux/consoletools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/consoletools/default.nix
diff --git a/pkgs/os-specific/linux/conspy/default.nix b/nixpkgs/pkgs/os-specific/linux/conspy/default.nix
index 32905b8ec39..32905b8ec39 100644
--- a/pkgs/os-specific/linux/conspy/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/conspy/default.nix
diff --git a/pkgs/os-specific/linux/conspy/default.upstream b/nixpkgs/pkgs/os-specific/linux/conspy/default.upstream
index 3f9ff3e4a82..3f9ff3e4a82 100644
--- a/pkgs/os-specific/linux/conspy/default.upstream
+++ b/nixpkgs/pkgs/os-specific/linux/conspy/default.upstream
diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/nixpkgs/pkgs/os-specific/linux/cpufrequtils/default.nix
index 04da31176da..04da31176da 100644
--- a/pkgs/os-specific/linux/cpufrequtils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/cpufrequtils/default.nix
diff --git a/pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch b/nixpkgs/pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch
index 0116ed9eab0..0116ed9eab0 100644
--- a/pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch
+++ b/nixpkgs/pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch
diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/nixpkgs/pkgs/os-specific/linux/cpupower/default.nix
index 601810f2600..601810f2600 100644
--- a/pkgs/os-specific/linux/cpupower/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/cpupower/default.nix
diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix
index 5791145d52a..5791145d52a 100644
--- a/pkgs/os-specific/linux/cpuset/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix
diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/nixpkgs/pkgs/os-specific/linux/cpustat/default.nix
index 23ed2b07c96..23ed2b07c96 100644
--- a/pkgs/os-specific/linux/cpustat/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/cpustat/default.nix
diff --git a/pkgs/os-specific/linux/cramfsswap/builder.sh b/nixpkgs/pkgs/os-specific/linux/cramfsswap/builder.sh
index 51a5b11dda6..51a5b11dda6 100644
--- a/pkgs/os-specific/linux/cramfsswap/builder.sh
+++ b/nixpkgs/pkgs/os-specific/linux/cramfsswap/builder.sh
diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/nixpkgs/pkgs/os-specific/linux/cramfsswap/default.nix
index d183bb25cb5..d183bb25cb5 100644
--- a/pkgs/os-specific/linux/cramfsswap/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/cramfsswap/default.nix
diff --git a/pkgs/os-specific/linux/crda/default.nix b/nixpkgs/pkgs/os-specific/linux/crda/default.nix
index 501b1fb1884..501b1fb1884 100644
--- a/pkgs/os-specific/linux/crda/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/crda/default.nix
diff --git a/pkgs/os-specific/linux/criu/default.nix b/nixpkgs/pkgs/os-specific/linux/criu/default.nix
index 3210a0106a6..3210a0106a6 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/criu/default.nix
diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix
index c146e18f68d..c146e18f68d 100644
--- a/pkgs/os-specific/linux/cryptodev/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix
index 9c621d28ed2..9c621d28ed2 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix
diff --git a/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch b/nixpkgs/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch
index 1504bf3e151..1504bf3e151 100644
--- a/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch
+++ b/nixpkgs/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix
index 5f5005d8b97..5f5005d8b97 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix
diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/nixpkgs/pkgs/os-specific/linux/ddcci/default.nix
index a399ad7029f..a399ad7029f 100644
--- a/pkgs/os-specific/linux/ddcci/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ddcci/default.nix
diff --git a/pkgs/os-specific/linux/deepin-anything/default.nix b/nixpkgs/pkgs/os-specific/linux/deepin-anything/default.nix
index 4139cc153cd..4139cc153cd 100644
--- a/pkgs/os-specific/linux/deepin-anything/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/deepin-anything/default.nix
diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix
index 13d819a08a5..13d819a08a5 100644
--- a/pkgs/os-specific/linux/device-tree/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix
diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/nixpkgs/pkgs/os-specific/linux/device-tree/raspberrypi.nix
index 5e99e870ac8..5e99e870ac8 100644
--- a/pkgs/os-specific/linux/device-tree/raspberrypi.nix
+++ b/nixpkgs/pkgs/os-specific/linux/device-tree/raspberrypi.nix
diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix
index 77fa7fe3b1b..77fa7fe3b1b 100644
--- a/pkgs/os-specific/linux/devmem2/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix
diff --git a/pkgs/os-specific/linux/digimend/default.nix b/nixpkgs/pkgs/os-specific/linux/digimend/default.nix
index 94f32d2c432..94f32d2c432 100644
--- a/pkgs/os-specific/linux/digimend/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/digimend/default.nix
diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix
index a880f699b69..a880f699b69 100644
--- a/pkgs/os-specific/linux/directvnc/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix
diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/nixpkgs/pkgs/os-specific/linux/disk-indicator/default.nix
index 46ebc923e3b..46ebc923e3b 100644
--- a/pkgs/os-specific/linux/disk-indicator/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/disk-indicator/default.nix
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix
index 642d05e4beb..642d05e4beb 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix
diff --git a/pkgs/os-specific/linux/displaylink/udev-installer.patch b/nixpkgs/pkgs/os-specific/linux/displaylink/udev-installer.patch
index bd7d9d145c9..bd7d9d145c9 100644
--- a/pkgs/os-specific/linux/displaylink/udev-installer.patch
+++ b/nixpkgs/pkgs/os-specific/linux/displaylink/udev-installer.patch
diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix
index 55dcba378ca..55dcba378ca 100644
--- a/pkgs/os-specific/linux/dmidecode/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix
diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/nixpkgs/pkgs/os-specific/linux/dmraid/default.nix
index 129ccb30456..129ccb30456 100644
--- a/pkgs/os-specific/linux/dmraid/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/dmraid/default.nix
diff --git a/pkgs/os-specific/linux/dmraid/hardening-format.patch b/nixpkgs/pkgs/os-specific/linux/dmraid/hardening-format.patch
index f91a7fb18aa..f91a7fb18aa 100644
--- a/pkgs/os-specific/linux/dmraid/hardening-format.patch
+++ b/nixpkgs/pkgs/os-specific/linux/dmraid/hardening-format.patch
diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/nixpkgs/pkgs/os-specific/linux/dmtcp/default.nix
index 0f7f2f9817a..0f7f2f9817a 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/dmtcp/default.nix
diff --git a/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch b/nixpkgs/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch
index 5a81dad0cc9..5a81dad0cc9 100644
--- a/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch
+++ b/nixpkgs/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix
index 414f276a210..414f276a210 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix
diff --git a/pkgs/os-specific/linux/drbd/default.nix b/nixpkgs/pkgs/os-specific/linux/drbd/default.nix
index 74f3430c2d8..74f3430c2d8 100644
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/drbd/default.nix
diff --git a/pkgs/os-specific/linux/drbd/pass-force.patch b/nixpkgs/pkgs/os-specific/linux/drbd/pass-force.patch
index 8f0201100f7..8f0201100f7 100644
--- a/pkgs/os-specific/linux/drbd/pass-force.patch
+++ b/nixpkgs/pkgs/os-specific/linux/drbd/pass-force.patch
diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/nixpkgs/pkgs/os-specific/linux/dropwatch/default.nix
index 69acfa9682b..69acfa9682b 100644
--- a/pkgs/os-specific/linux/dropwatch/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/dropwatch/default.nix
diff --git a/pkgs/os-specific/linux/dstat/default.nix b/nixpkgs/pkgs/os-specific/linux/dstat/default.nix
index 25d0eb1fd02..25d0eb1fd02 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/dstat/default.nix
diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/nixpkgs/pkgs/os-specific/linux/e1000e/default.nix
index 38ef803d8e5..38ef803d8e5 100644
--- a/pkgs/os-specific/linux/e1000e/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/e1000e/default.nix
diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix
index 9725ea66dd4..9725ea66dd4 100644
--- a/pkgs/os-specific/linux/earlyoom/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix
diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/nixpkgs/pkgs/os-specific/linux/ebtables/default.nix
index 3f025ca7504..3f025ca7504 100644
--- a/pkgs/os-specific/linux/ebtables/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ebtables/default.nix
diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/edac-utils/default.nix
index eabd0848553..eabd0848553 100644
--- a/pkgs/os-specific/linux/edac-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/edac-utils/default.nix
diff --git a/pkgs/os-specific/linux/ell/default.nix b/nixpkgs/pkgs/os-specific/linux/ell/default.nix
index 5cbddac82f0..5cbddac82f0 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ell/default.nix
diff --git a/pkgs/os-specific/linux/ell/fix-dbus-tests.patch b/nixpkgs/pkgs/os-specific/linux/ell/fix-dbus-tests.patch
index b494ba8b43c..b494ba8b43c 100644
--- a/pkgs/os-specific/linux/ell/fix-dbus-tests.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ell/fix-dbus-tests.patch
diff --git a/pkgs/os-specific/linux/ena/default.nix b/nixpkgs/pkgs/os-specific/linux/ena/default.nix
index 9b5d82b9f7b..9b5d82b9f7b 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ena/default.nix
diff --git a/pkgs/os-specific/linux/eudev/default.nix b/nixpkgs/pkgs/os-specific/linux/eudev/default.nix
index d087a9e2e26..d087a9e2e26 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/eudev/default.nix
diff --git a/pkgs/os-specific/linux/evdi/default.nix b/nixpkgs/pkgs/os-specific/linux/evdi/default.nix
index 6dbf6ace693..6dbf6ace693 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/evdi/default.nix
diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix
index ddc8ee64ba0..ddc8ee64ba0 100644
--- a/pkgs/os-specific/linux/eventstat/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix
diff --git a/pkgs/os-specific/linux/exfat/default.nix b/nixpkgs/pkgs/os-specific/linux/exfat/default.nix
index e66ac4d65ab..e66ac4d65ab 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/exfat/default.nix
diff --git a/pkgs/os-specific/linux/extrace/default.nix b/nixpkgs/pkgs/os-specific/linux/extrace/default.nix
index 0d00eaa3ac8..0d00eaa3ac8 100644
--- a/pkgs/os-specific/linux/extrace/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/extrace/default.nix
diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/nixpkgs/pkgs/os-specific/linux/facetimehd/default.nix
index 99e72c33983..99e72c33983 100644
--- a/pkgs/os-specific/linux/facetimehd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/facetimehd/default.nix
diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/nixpkgs/pkgs/os-specific/linux/fatrace/default.nix
index b99f719f836..b99f719f836 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fatrace/default.nix
diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/nixpkgs/pkgs/os-specific/linux/fbterm/default.nix
index d56b254d382..d56b254d382 100644
--- a/pkgs/os-specific/linux/fbterm/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fbterm/default.nix
diff --git a/pkgs/os-specific/linux/fbterm/select.patch b/nixpkgs/pkgs/os-specific/linux/fbterm/select.patch
index 549674047a9..549674047a9 100644
--- a/pkgs/os-specific/linux/fbterm/select.patch
+++ b/nixpkgs/pkgs/os-specific/linux/fbterm/select.patch
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/nixpkgs/pkgs/os-specific/linux/ffado/default.nix
index 3d2c6ae6dae..3d2c6ae6dae 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ffado/default.nix
diff --git a/pkgs/os-specific/linux/ffado/fix-build.patch b/nixpkgs/pkgs/os-specific/linux/ffado/fix-build.patch
index 7e360932613..7e360932613 100644
--- a/pkgs/os-specific/linux/ffado/fix-build.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ffado/fix-build.patch
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/nixpkgs/pkgs/os-specific/linux/firejail/default.nix
index 678592c0379..678592c0379 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firejail/default.nix
diff --git a/pkgs/os-specific/linux/firejail/default.upstream b/nixpkgs/pkgs/os-specific/linux/firejail/default.upstream
index 0e6576c44a8..0e6576c44a8 100644
--- a/pkgs/os-specific/linux/firejail/default.upstream
+++ b/nixpkgs/pkgs/os-specific/linux/firejail/default.upstream
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
index 8aa78e65dec..8aa78e65dec 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch
index 578812e0ad0..578812e0ad0 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
index 58cd88b4dce..58cd88b4dce 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
index 959c0c74618..959c0c74618 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
index 4d5271a9ddf..4d5271a9ddf 100644
--- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
index 9a99881be46..9a99881be46 100644
--- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
index 1a1c1ec39d7..1a1c1ec39d7 100644
--- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 1a454cb8957..1a454cb8957 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
index 81e82d68dbc..81e82d68dbc 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix
index aa2d9978178..aa2d9978178 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix
diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch
index 474b250097d..474b250097d 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch
diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch
index 6c4b6b62a0c..6c4b6b62a0c 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch
diff --git a/pkgs/os-specific/linux/firmware/fwupd/no-which.patch b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/no-which.patch
index c0c65e42539..c0c65e42539 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/no-which.patch
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/no-which.patch
diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/default.nix
index c14e04dc344..c14e04dc344 100644
--- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/default.nix
diff --git a/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch b/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch
index b8588ef2b11..b8588ef2b11 100644
--- a/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch
diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
index 372be2d71f2..372be2d71f2 100644
--- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
index 421a3300f7b..421a3300f7b 100644
--- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
index 392ddda6f57..392ddda6f57 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index a8c4bd559d3..a8c4bd559d3 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch
index e12aeeb0cdb..e12aeeb0cdb 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
index 1ea2b5e4e3d..1ea2b5e4e3d 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/rt5677/default.nix
index af0c07d1059..af0c07d1059 100644
--- a/pkgs/os-specific/linux/firmware/rt5677/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/rt5677/default.nix
diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
index d8d4c37fd88..d8d4c37fd88 100644
--- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix
index eea6f2893f2..eea6f2893f2 100644
--- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix
diff --git a/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix
index 673ef686e48..673ef686e48 100644
--- a/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix
diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/zd1211/default.nix
index 2c9db47539f..2c9db47539f 100644
--- a/pkgs/os-specific/linux/firmware/zd1211/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/firmware/zd1211/default.nix
diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix
index bf3d2ef8d6d..bf3d2ef8d6d 100644
--- a/pkgs/os-specific/linux/flashbench/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix
diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/nixpkgs/pkgs/os-specific/linux/fnotifystat/default.nix
index c20206dc351..c20206dc351 100644
--- a/pkgs/os-specific/linux/fnotifystat/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fnotifystat/default.nix
diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix
index f68be3e8d2f..f68be3e8d2f 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix
diff --git a/pkgs/os-specific/linux/forktty/default.nix b/nixpkgs/pkgs/os-specific/linux/forktty/default.nix
index 66570bac942..66570bac942 100644
--- a/pkgs/os-specific/linux/forktty/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/forktty/default.nix
diff --git a/pkgs/os-specific/linux/forktty/default.upstream b/nixpkgs/pkgs/os-specific/linux/forktty/default.upstream
index 45cb775a0ae..45cb775a0ae 100644
--- a/pkgs/os-specific/linux/forktty/default.upstream
+++ b/nixpkgs/pkgs/os-specific/linux/forktty/default.upstream
diff --git a/pkgs/os-specific/linux/freefall/default.nix b/nixpkgs/pkgs/os-specific/linux/freefall/default.nix
index a6c5a6593d1..a6c5a6593d1 100644
--- a/pkgs/os-specific/linux/freefall/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/freefall/default.nix
diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix
index 92594ea99de..92594ea99de 100644
--- a/pkgs/os-specific/linux/fscrypt/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix
diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix
index ecab0350d78..ecab0350d78 100644
--- a/pkgs/os-specific/linux/fscryptctl/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix
diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/nixpkgs/pkgs/os-specific/linux/fswebcam/default.nix
index b7f47f12b15..b7f47f12b15 100644
--- a/pkgs/os-specific/linux/fswebcam/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fswebcam/default.nix
diff --git a/pkgs/os-specific/linux/ftop/default.nix b/nixpkgs/pkgs/os-specific/linux/ftop/default.nix
index 4d283d5dc0c..4d283d5dc0c 100644
--- a/pkgs/os-specific/linux/ftop/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ftop/default.nix
diff --git a/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch b/nixpkgs/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch
index f10fa6a33b8..f10fa6a33b8 100644
--- a/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch
diff --git a/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch b/nixpkgs/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch
index afb04306428..afb04306428 100644
--- a/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/nixpkgs/pkgs/os-specific/linux/fuse/common.nix
index 35c91c5ec07..35c91c5ec07 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fuse/common.nix
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix
index 6792e05829d..6792e05829d 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix
diff --git a/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch b/nixpkgs/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch
index 8ff40f34f93..8ff40f34f93 100644
--- a/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch
+++ b/nixpkgs/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch
diff --git a/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch b/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch
index 1d41a26b0a4..1d41a26b0a4 100644
--- a/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch
+++ b/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch
diff --git a/pkgs/os-specific/linux/fuse/fuse3-install.patch b/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch
index 147bcb439fb..147bcb439fb 100644
--- a/pkgs/os-specific/linux/fuse/fuse3-install.patch
+++ b/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch
diff --git a/pkgs/os-specific/linux/fwts/default.nix b/nixpkgs/pkgs/os-specific/linux/fwts/default.nix
index 2f725952f0a..2f725952f0a 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fwts/default.nix
diff --git a/pkgs/os-specific/linux/fwts/module.nix b/nixpkgs/pkgs/os-specific/linux/fwts/module.nix
index ef90e0c303b..ef90e0c303b 100644
--- a/pkgs/os-specific/linux/fwts/module.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fwts/module.nix
diff --git a/pkgs/os-specific/linux/fxload/default.nix b/nixpkgs/pkgs/os-specific/linux/fxload/default.nix
index 61bd2a229ab..61bd2a229ab 100644
--- a/pkgs/os-specific/linux/fxload/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fxload/default.nix
diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/nixpkgs/pkgs/os-specific/linux/gfxtablet/default.nix
index 56fa4f1d7d6..56fa4f1d7d6 100644
--- a/pkgs/os-specific/linux/gfxtablet/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/gfxtablet/default.nix
diff --git a/pkgs/os-specific/linux/gogoclient/config-paths.patch b/nixpkgs/pkgs/os-specific/linux/gogoclient/config-paths.patch
index 88358038bc7..88358038bc7 100644
--- a/pkgs/os-specific/linux/gogoclient/config-paths.patch
+++ b/nixpkgs/pkgs/os-specific/linux/gogoclient/config-paths.patch
diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/nixpkgs/pkgs/os-specific/linux/gogoclient/default.nix
index 942cafd0343..942cafd0343 100644
--- a/pkgs/os-specific/linux/gogoclient/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/gogoclient/default.nix
diff --git a/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch b/nixpkgs/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch
index 22ecad187d6..22ecad187d6 100644
--- a/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch
+++ b/nixpkgs/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix
index 6037f35ba86..6037f35ba86 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix
diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/nixpkgs/pkgs/os-specific/linux/gpu-switch/default.nix
index ea1051c5f05..ea1051c5f05 100644
--- a/pkgs/os-specific/linux/gpu-switch/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/gpu-switch/default.nix
diff --git a/pkgs/os-specific/linux/gradm/default.nix b/nixpkgs/pkgs/os-specific/linux/gradm/default.nix
index fee183c8259..fee183c8259 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/gradm/default.nix
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix
index 8e6db2a5774..8e6db2a5774 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix
diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/nixpkgs/pkgs/os-specific/linux/hal-flash/default.nix
index 27b85fbfc89..27b85fbfc89 100644
--- a/pkgs/os-specific/linux/hal-flash/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/hal-flash/default.nix
diff --git a/pkgs/os-specific/linux/hd-idle/default.nix b/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix
index 91185438416..91185438416 100644
--- a/pkgs/os-specific/linux/hd-idle/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix
diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/nixpkgs/pkgs/os-specific/linux/hdapsd/default.nix
index 893eb4fdd99..893eb4fdd99 100644
--- a/pkgs/os-specific/linux/hdapsd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/hdapsd/default.nix
diff --git a/pkgs/os-specific/linux/hdapsd/postInstall.sh b/nixpkgs/pkgs/os-specific/linux/hdapsd/postInstall.sh
index 37867817bf6..37867817bf6 100644
--- a/pkgs/os-specific/linux/hdapsd/postInstall.sh
+++ b/nixpkgs/pkgs/os-specific/linux/hdapsd/postInstall.sh
diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix
index 2aa928e8119..2aa928e8119 100644
--- a/pkgs/os-specific/linux/hdparm/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix
diff --git a/pkgs/os-specific/linux/health-check/default.nix b/nixpkgs/pkgs/os-specific/linux/health-check/default.nix
index 694d4565d96..694d4565d96 100644
--- a/pkgs/os-specific/linux/health-check/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/health-check/default.nix
diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix
index 3d759001d01..3d759001d01 100644
--- a/pkgs/os-specific/linux/hibernate/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix
diff --git a/pkgs/os-specific/linux/hibernate/gen-manpages.patch b/nixpkgs/pkgs/os-specific/linux/hibernate/gen-manpages.patch
index cdbacc86baf..cdbacc86baf 100644
--- a/pkgs/os-specific/linux/hibernate/gen-manpages.patch
+++ b/nixpkgs/pkgs/os-specific/linux/hibernate/gen-manpages.patch
diff --git a/pkgs/os-specific/linux/hibernate/hibernate.patch b/nixpkgs/pkgs/os-specific/linux/hibernate/hibernate.patch
index 24de1637d3c..24de1637d3c 100644
--- a/pkgs/os-specific/linux/hibernate/hibernate.patch
+++ b/nixpkgs/pkgs/os-specific/linux/hibernate/hibernate.patch
diff --git a/pkgs/os-specific/linux/hibernate/install.patch b/nixpkgs/pkgs/os-specific/linux/hibernate/install.patch
index ae296b955ac..ae296b955ac 100644
--- a/pkgs/os-specific/linux/hibernate/install.patch
+++ b/nixpkgs/pkgs/os-specific/linux/hibernate/install.patch
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix
index b1251a4396f..b1251a4396f 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix
index 38335682ddb..38335682ddb 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix
diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix
index 1a111a295a4..1a111a295a4 100644
--- a/pkgs/os-specific/linux/hyperv-daemons/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix
diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix
index 1b87619faa3..1b87619faa3 100644
--- a/pkgs/os-specific/linux/i2c-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix
diff --git a/pkgs/os-specific/linux/i7z/default.nix b/nixpkgs/pkgs/os-specific/linux/i7z/default.nix
index 2f792cb7ea7..2f792cb7ea7 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/i7z/default.nix
diff --git a/pkgs/os-specific/linux/i7z/qt5.patch b/nixpkgs/pkgs/os-specific/linux/i7z/qt5.patch
index 9e9b162d9e8..9e9b162d9e8 100644
--- a/pkgs/os-specific/linux/i7z/qt5.patch
+++ b/nixpkgs/pkgs/os-specific/linux/i7z/qt5.patch
diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/nixpkgs/pkgs/os-specific/linux/i810switch/default.nix
index 2f4511bcbc4..2f4511bcbc4 100644
--- a/pkgs/os-specific/linux/i810switch/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/i810switch/default.nix
diff --git a/pkgs/os-specific/linux/ifenslave/default.nix b/nixpkgs/pkgs/os-specific/linux/ifenslave/default.nix
index 1b22c1eafd3..1b22c1eafd3 100644
--- a/pkgs/os-specific/linux/ifenslave/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ifenslave/default.nix
diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/nixpkgs/pkgs/os-specific/linux/iio-sensor-proxy/default.nix
index a1d488adcfa..a1d488adcfa 100644
--- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/iio-sensor-proxy/default.nix
diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/ima-evm-utils/default.nix
index 69ec6560d83..69ec6560d83 100644
--- a/pkgs/os-specific/linux/ima-evm-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ima-evm-utils/default.nix
diff --git a/pkgs/os-specific/linux/ima-evm-utils/xattr.patch b/nixpkgs/pkgs/os-specific/linux/ima-evm-utils/xattr.patch
index 2d27570a578..2d27570a578 100644
--- a/pkgs/os-specific/linux/ima-evm-utils/xattr.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ima-evm-utils/xattr.patch
diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/input-utils/default.nix
index c6248ee9083..c6248ee9083 100644
--- a/pkgs/os-specific/linux/input-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/input-utils/default.nix
diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix
index d8aefd02e7f..d8aefd02e7f 100644
--- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix
diff --git a/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch b/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch
index d9a80ffa6f9..d9a80ffa6f9 100644
--- a/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch
+++ b/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch
diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/nixpkgs/pkgs/os-specific/linux/intel-ocl/default.nix
index 1f67208db8b..1f67208db8b 100644
--- a/pkgs/os-specific/linux/intel-ocl/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/intel-ocl/default.nix
diff --git a/pkgs/os-specific/linux/intel-speed-select/default.nix b/nixpkgs/pkgs/os-specific/linux/intel-speed-select/default.nix
index cf0dd75a8a4..cf0dd75a8a4 100644
--- a/pkgs/os-specific/linux/intel-speed-select/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/intel-speed-select/default.nix
diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/nixpkgs/pkgs/os-specific/linux/iomelt/default.nix
index 7b41b095091..7b41b095091 100644
--- a/pkgs/os-specific/linux/iomelt/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/iomelt/default.nix
diff --git a/pkgs/os-specific/linux/ioport/default.nix b/nixpkgs/pkgs/os-specific/linux/ioport/default.nix
index c14d9f146eb..c14d9f146eb 100644
--- a/pkgs/os-specific/linux/ioport/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ioport/default.nix
diff --git a/pkgs/os-specific/linux/iotop/default.nix b/nixpkgs/pkgs/os-specific/linux/iotop/default.nix
index cb882a0dc1f..cb882a0dc1f 100644
--- a/pkgs/os-specific/linux/iotop/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/iotop/default.nix
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/nixpkgs/pkgs/os-specific/linux/iproute/default.nix
index b8b46b33e96..b8b46b33e96 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/iproute/default.nix
diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix
index 90503c21c04..90503c21c04 100644
--- a/pkgs/os-specific/linux/iproute/mptcp.nix
+++ b/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix
diff --git a/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch b/nixpkgs/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch
index 00c23c6cac1..00c23c6cac1 100644
--- a/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch
diff --git a/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch b/nixpkgs/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch
index b644d46f8c9..b644d46f8c9 100644
--- a/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch
diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix
index 551fc61f814..551fc61f814 100644
--- a/pkgs/os-specific/linux/ipsec-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix
diff --git a/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch b/nixpkgs/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch
index 16b80c36d6a..16b80c36d6a 100644
--- a/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch
diff --git a/pkgs/os-specific/linux/ipset/default.nix b/nixpkgs/pkgs/os-specific/linux/ipset/default.nix
index 6696252678d..6696252678d 100644
--- a/pkgs/os-specific/linux/ipset/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ipset/default.nix
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/nixpkgs/pkgs/os-specific/linux/iptables/default.nix
index f556d7368e9..f556d7368e9 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/iptables/default.nix
diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/nixpkgs/pkgs/os-specific/linux/iptstate/default.nix
index 5a0555f6680..5a0555f6680 100644
--- a/pkgs/os-specific/linux/iptstate/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/iptstate/default.nix
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/nixpkgs/pkgs/os-specific/linux/iputils/default.nix
index 3944a7b37fb..3944a7b37fb 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/iputils/default.nix
diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/nixpkgs/pkgs/os-specific/linux/ipvsadm/default.nix
index 98dab0e62d7..98dab0e62d7 100644
--- a/pkgs/os-specific/linux/ipvsadm/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ipvsadm/default.nix
diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix
index 8dc9e2694d4..8dc9e2694d4 100644
--- a/pkgs/os-specific/linux/irqbalance/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix
diff --git a/pkgs/os-specific/linux/it87/default.nix b/nixpkgs/pkgs/os-specific/linux/it87/default.nix
index c115eab1503..c115eab1503 100644
--- a/pkgs/os-specific/linux/it87/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/it87/default.nix
diff --git a/pkgs/os-specific/linux/iw/default.nix b/nixpkgs/pkgs/os-specific/linux/iw/default.nix
index 930f77437ac..930f77437ac 100644
--- a/pkgs/os-specific/linux/iw/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/iw/default.nix
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/nixpkgs/pkgs/os-specific/linux/iwd/default.nix
index 8e1bbd374cf..8e1bbd374cf 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/iwd/default.nix
diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/nixpkgs/pkgs/os-specific/linux/ixgbevf/default.nix
index 8a860cc1467..8a860cc1467 100644
--- a/pkgs/os-specific/linux/ixgbevf/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ixgbevf/default.nix
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/nixpkgs/pkgs/os-specific/linux/jfbview/default.nix
index e037ad98226..e037ad98226 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/jfbview/default.nix
diff --git a/pkgs/os-specific/linux/jool/cli.nix b/nixpkgs/pkgs/os-specific/linux/jool/cli.nix
index 58b1b53d52f..58b1b53d52f 100644
--- a/pkgs/os-specific/linux/jool/cli.nix
+++ b/nixpkgs/pkgs/os-specific/linux/jool/cli.nix
diff --git a/pkgs/os-specific/linux/jool/default.nix b/nixpkgs/pkgs/os-specific/linux/jool/default.nix
index 8d170583a6c..8d170583a6c 100644
--- a/pkgs/os-specific/linux/jool/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/jool/default.nix
diff --git a/pkgs/os-specific/linux/jool/source.nix b/nixpkgs/pkgs/os-specific/linux/jool/source.nix
index 9e8de46edba..9e8de46edba 100644
--- a/pkgs/os-specific/linux/jool/source.nix
+++ b/nixpkgs/pkgs/os-specific/linux/jool/source.nix
diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/nixpkgs/pkgs/os-specific/linux/jujuutils/default.nix
index 617dad8bddd..617dad8bddd 100644
--- a/pkgs/os-specific/linux/jujuutils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/jujuutils/default.nix
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/nixpkgs/pkgs/os-specific/linux/kbd/default.nix
index 3386a7f9206..3386a7f9206 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kbd/default.nix
diff --git a/pkgs/os-specific/linux/kbd/keymaps.nix b/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix
index b3d5fe1b63c..b3d5fe1b63c 100644
--- a/pkgs/os-specific/linux/kbd/keymaps.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix
diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/nixpkgs/pkgs/os-specific/linux/kbd/search-paths.patch
index c9405a56721..c9405a56721 100644
--- a/pkgs/os-specific/linux/kbd/search-paths.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kbd/search-paths.patch
diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/nixpkgs/pkgs/os-specific/linux/kbdlight/default.nix
index 6df3e4fffe7..6df3e4fffe7 100644
--- a/pkgs/os-specific/linux/kbdlight/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kbdlight/default.nix
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix
index fb2b9068921..fb2b9068921 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix
diff --git a/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch b/nixpkgs/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch
index 9b582cac715..9b582cac715 100644
--- a/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch
diff --git a/pkgs/os-specific/linux/kernel-headers/no-relocs.patch b/nixpkgs/pkgs/os-specific/linux/kernel-headers/no-relocs.patch
index 67e8b19e23b..67e8b19e23b 100644
--- a/pkgs/os-specific/linux/kernel-headers/no-relocs.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel-headers/no-relocs.patch
diff --git a/pkgs/os-specific/linux/kernel/bridge-stp-helper.patch b/nixpkgs/pkgs/os-specific/linux/kernel/bridge-stp-helper.patch
index 70d0f944c2a..70d0f944c2a 100644
--- a/pkgs/os-specific/linux/kernel/bridge-stp-helper.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/bridge-stp-helper.patch
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
index 4ce6a37e689..4ce6a37e689 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.11.patch b/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.11.patch
index 38cc0532ba9..38cc0532ba9 100644
--- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.11.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.11.patch
diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch b/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch
index 8f2418c9efc..8f2418c9efc 100644
--- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch
diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch b/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch
index 6f0904cbce9..6f0904cbce9 100644
--- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch
diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md b/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
index 6d48fde6bee..6d48fde6bee 100644
--- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/default.nix b/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/default.nix
index 5bef5633aa0..5bef5633aa0 100644
--- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/default.nix
diff --git a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch b/nixpkgs/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch
index 205497aee2d..205497aee2d 100644
--- a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch
diff --git a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch b/nixpkgs/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch
index dc9ca64bdc1..dc9ca64bdc1 100644
--- a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch
diff --git a/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch b/nixpkgs/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch
index 0639f8b4e8f..0639f8b4e8f 100644
--- a/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch
diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/nixpkgs/pkgs/os-specific/linux/kernel/generate-config.pl
index 26c559ea908..26c559ea908 100644
--- a/pkgs/os-specific/linux/kernel/generate-config.pl
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/generate-config.pl
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix
index e6e1bd84236..e6e1bd84236 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix
diff --git a/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch b/nixpkgs/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch
index 47ae77a5a54..47ae77a5a54 100644
--- a/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch
diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/hardened-config.nix
index 156a4cf4423..156a4cf4423 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/hardened-config.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
index d7c6c6b5e60..d7c6c6b5e60 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 00f5fb9db94..00f5fb9db94 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 5409947c0a1..5409947c0a1 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
index ff202b3fe9b..ff202b3fe9b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 60be4978945..60be4978945 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.5.nix
index 7347cf1fa66..7347cf1fa66 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.5.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.5.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
index ba37c71d134..ba37c71d134 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix
index fab4fd6aaed..fab4fd6aaed 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix
index e53c3ceb5c4..e53c3ceb5c4 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix
index ad933ff63a7..ad933ff63a7 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 6f5f2524276..6f5f2524276 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index f4b9e5b8da6..f4b9e5b8da6 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix
index 00dcb6f0f48..00dcb6f0f48 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix
diff --git a/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch b/nixpkgs/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch
index 2f1fa6a0dae..2f1fa6a0dae 100644
--- a/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix
index 0538511c528..0538511c528 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix
diff --git a/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch b/nixpkgs/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch
index 58a9191989a..58a9191989a 100644
--- a/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch
diff --git a/pkgs/os-specific/linux/kernel/mptcp-config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/mptcp-config.nix
index e5e3ee283ff..e5e3ee283ff 100644
--- a/pkgs/os-specific/linux/kernel/mptcp-config.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/mptcp-config.nix
diff --git a/pkgs/os-specific/linux/kernel/p9-fixes.patch b/nixpkgs/pkgs/os-specific/linux/kernel/p9-fixes.patch
index f6061b60667..f6061b60667 100644
--- a/pkgs/os-specific/linux/kernel/p9-fixes.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/p9-fixes.patch
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix
index 2af64c2ddc4..2af64c2ddc4 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/nixpkgs/pkgs/os-specific/linux/kernel/perf.nix
index 07dd8c78f42..07dd8c78f42 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/perf.nix
diff --git a/pkgs/os-specific/linux/kernel/randstruct-provide-seed.patch b/nixpkgs/pkgs/os-specific/linux/kernel/randstruct-provide-seed.patch
index 1328b9cee3c..1328b9cee3c 100644
--- a/pkgs/os-specific/linux/kernel/randstruct-provide-seed.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/randstruct-provide-seed.patch
diff --git a/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch b/nixpkgs/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch
index aabb9e801be..aabb9e801be 100644
--- a/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch
diff --git a/pkgs/os-specific/linux/kernel/request-key-helper.patch b/nixpkgs/pkgs/os-specific/linux/kernel/request-key-helper.patch
index 8264e265aed..8264e265aed 100644
--- a/pkgs/os-specific/linux/kernel/request-key-helper.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/request-key-helper.patch
diff --git a/pkgs/os-specific/linux/kernel/tag-hardened.patch b/nixpkgs/pkgs/os-specific/linux/kernel/tag-hardened.patch
index ff8a3a12797..ff8a3a12797 100644
--- a/pkgs/os-specific/linux/kernel/tag-hardened.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/tag-hardened.patch
diff --git a/pkgs/os-specific/linux/kernel/update-libre.sh b/nixpkgs/pkgs/os-specific/linux/kernel/update-libre.sh
index aea12df55cc..aea12df55cc 100755
--- a/pkgs/os-specific/linux/kernel/update-libre.sh
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/update-libre.sh
diff --git a/pkgs/os-specific/linux/kernel/update.sh b/nixpkgs/pkgs/os-specific/linux/kernel/update.sh
index c7fcc07ea0a..c7fcc07ea0a 100755
--- a/pkgs/os-specific/linux/kernel/update.sh
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/update.sh
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/nixpkgs/pkgs/os-specific/linux/kexectools/default.nix
index 4e9007c7362..4e9007c7362 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kexectools/default.nix
diff --git a/pkgs/os-specific/linux/keyutils/conf-symlink.patch b/nixpkgs/pkgs/os-specific/linux/keyutils/conf-symlink.patch
index 02762e857a8..02762e857a8 100644
--- a/pkgs/os-specific/linux/keyutils/conf-symlink.patch
+++ b/nixpkgs/pkgs/os-specific/linux/keyutils/conf-symlink.patch
diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix
index 887aee45aa8..887aee45aa8 100644
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/nixpkgs/pkgs/os-specific/linux/klibc/default.nix
index 8e224c8f33b..8e224c8f33b 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/klibc/default.nix
diff --git a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch b/nixpkgs/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch
index d3e55fc8731..d3e55fc8731 100644
--- a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch
+++ b/nixpkgs/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch
diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/nixpkgs/pkgs/os-specific/linux/klibc/shrunk.nix
index b5b9783c6e7..b5b9783c6e7 100644
--- a/pkgs/os-specific/linux/klibc/shrunk.nix
+++ b/nixpkgs/pkgs/os-specific/linux/klibc/shrunk.nix
diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index 55ae78219d1..55ae78219d1 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/nixpkgs/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
index 07ab0427b22..07ab0427b22 100644
--- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
diff --git a/pkgs/os-specific/linux/kmod/aggregator.nix b/nixpkgs/pkgs/os-specific/linux/kmod/aggregator.nix
index cd138f1d7f5..cd138f1d7f5 100644
--- a/pkgs/os-specific/linux/kmod/aggregator.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kmod/aggregator.nix
diff --git a/pkgs/os-specific/linux/kmod/darwin.patch b/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch
index 69dbf479f9f..69dbf479f9f 100644
--- a/pkgs/os-specific/linux/kmod/darwin.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/nixpkgs/pkgs/os-specific/linux/kmod/default.nix
index 052ab3061c1..052ab3061c1 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kmod/default.nix
diff --git a/pkgs/os-specific/linux/kmod/enable-static.patch b/nixpkgs/pkgs/os-specific/linux/kmod/enable-static.patch
index 8308c655792..8308c655792 100644
--- a/pkgs/os-specific/linux/kmod/enable-static.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kmod/enable-static.patch
diff --git a/pkgs/os-specific/linux/kmod/module-dir.patch b/nixpkgs/pkgs/os-specific/linux/kmod/module-dir.patch
index f7432e3756e..f7432e3756e 100644
--- a/pkgs/os-specific/linux/kmod/module-dir.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kmod/module-dir.patch
diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/nixpkgs/pkgs/os-specific/linux/kmscon/default.nix
index fd16acaa3a9..fd16acaa3a9 100644
--- a/pkgs/os-specific/linux/kmscon/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kmscon/default.nix
diff --git a/pkgs/os-specific/linux/kmscon/kmscon-8-glibc-2.26.patch b/nixpkgs/pkgs/os-specific/linux/kmscon/kmscon-8-glibc-2.26.patch
index b70a750180e..b70a750180e 100644
--- a/pkgs/os-specific/linux/kmscon/kmscon-8-glibc-2.26.patch
+++ b/nixpkgs/pkgs/os-specific/linux/kmscon/kmscon-8-glibc-2.26.patch
diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/nixpkgs/pkgs/os-specific/linux/kmscube/default.nix
index 12463c736a6..12463c736a6 100644
--- a/pkgs/os-specific/linux/kmscube/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kmscube/default.nix
diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/nixpkgs/pkgs/os-specific/linux/latencytop/default.nix
index 93d2ac8b031..93d2ac8b031 100644
--- a/pkgs/os-specific/linux/latencytop/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/latencytop/default.nix
diff --git a/pkgs/os-specific/linux/ldm/default.nix b/nixpkgs/pkgs/os-specific/linux/ldm/default.nix
index ce76e31a920..ce76e31a920 100644
--- a/pkgs/os-specific/linux/ldm/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ldm/default.nix
diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/nixpkgs/pkgs/os-specific/linux/ledger-udev-rules/default.nix
index e61bac510e6..e61bac510e6 100644
--- a/pkgs/os-specific/linux/ledger-udev-rules/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ledger-udev-rules/default.nix
diff --git a/pkgs/os-specific/linux/libaio/default.nix b/nixpkgs/pkgs/os-specific/linux/libaio/default.nix
index 792568e8b57..792568e8b57 100644
--- a/pkgs/os-specific/linux/libaio/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libaio/default.nix
diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/nixpkgs/pkgs/os-specific/linux/libatasmart/default.nix
index 018f8c62435..018f8c62435 100644
--- a/pkgs/os-specific/linux/libatasmart/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libatasmart/default.nix
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix
index 1294bd3d268..1294bd3d268 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix
diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix
index d0fc97d0dd3..d0fc97d0dd3 100644
--- a/pkgs/os-specific/linux/libcap-ng/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/nixpkgs/pkgs/os-specific/linux/libcap/default.nix
index 174f1be99db..174f1be99db 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libcap/default.nix
diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/nixpkgs/pkgs/os-specific/linux/libcgroup/default.nix
index 026b43fc615..026b43fc615 100644
--- a/pkgs/os-specific/linux/libcgroup/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libcgroup/default.nix
diff --git a/pkgs/os-specific/linux/libevdevc/default.nix b/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix
index e3dfbd3d6c2..e3dfbd3d6c2 100644
--- a/pkgs/os-specific/linux/libevdevc/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix
diff --git a/pkgs/os-specific/linux/libgestures/default.nix b/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix
index 4c51525727a..4c51525727a 100644
--- a/pkgs/os-specific/linux/libgestures/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix
diff --git a/pkgs/os-specific/linux/libgestures/include-fix.patch b/nixpkgs/pkgs/os-specific/linux/libgestures/include-fix.patch
index 851be477143..851be477143 100644
--- a/pkgs/os-specific/linux/libgestures/include-fix.patch
+++ b/nixpkgs/pkgs/os-specific/linux/libgestures/include-fix.patch
diff --git a/pkgs/os-specific/linux/libnl/default.nix b/nixpkgs/pkgs/os-specific/linux/libnl/default.nix
index 61380115ab5..61380115ab5 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libnl/default.nix
diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix
index 9c926800c30..9c926800c30 100644
--- a/pkgs/os-specific/linux/libratbag/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix
index 741c51e2233..741c51e2233 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix
index 70b2508451b..70b2508451b 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix
index b31554d6cee..b31554d6cee 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix
index d0ae1852853..d0ae1852853 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix
diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/nixpkgs/pkgs/os-specific/linux/libudev0-shim/default.nix
index ecdc658f2f1..ecdc658f2f1 100644
--- a/pkgs/os-specific/linux/libudev0-shim/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libudev0-shim/default.nix
diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix
index 14c152dc10e..14c152dc10e 100644
--- a/pkgs/os-specific/linux/libvolume_id/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix
diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/nixpkgs/pkgs/os-specific/linux/libwebcam/default.nix
index 5cccc82b843..5cccc82b843 100644
--- a/pkgs/os-specific/linux/libwebcam/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/libwebcam/default.nix
diff --git a/pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch b/nixpkgs/pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
index 07e5f0bf852..07e5f0bf852 100644
--- a/pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
+++ b/nixpkgs/pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
diff --git a/pkgs/os-specific/linux/light/default.nix b/nixpkgs/pkgs/os-specific/linux/light/default.nix
index e9ee69ca03e..e9ee69ca03e 100644
--- a/pkgs/os-specific/linux/light/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/light/default.nix
diff --git a/pkgs/os-specific/linux/lightum/default.nix b/nixpkgs/pkgs/os-specific/linux/lightum/default.nix
index 3eaf4363195..3eaf4363195 100644
--- a/pkgs/os-specific/linux/lightum/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/lightum/default.nix
diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix
index 84a0f4a10d5..84a0f4a10d5 100644
--- a/pkgs/os-specific/linux/linuxptp/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix
diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix
index 6c644c9482a..6c644c9482a 100644
--- a/pkgs/os-specific/linux/lksctp-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix
diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix
index 82ac626d7c9..82ac626d7c9 100644
--- a/pkgs/os-specific/linux/lm-sensors/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix
diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix
index 74abd12868d..74abd12868d 100644
--- a/pkgs/os-specific/linux/lockdep/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix
diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix
index 369f412fbfc..369f412fbfc 100644
--- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix
diff --git a/pkgs/os-specific/linux/lsb-release/default.nix b/nixpkgs/pkgs/os-specific/linux/lsb-release/default.nix
index 7ab10bfac12..7ab10bfac12 100644
--- a/pkgs/os-specific/linux/lsb-release/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/lsb-release/default.nix
diff --git a/pkgs/os-specific/linux/lsb-release/lsb_release.sh b/nixpkgs/pkgs/os-specific/linux/lsb-release/lsb_release.sh
index 47b449c3161..47b449c3161 100644
--- a/pkgs/os-specific/linux/lsb-release/lsb_release.sh
+++ b/nixpkgs/pkgs/os-specific/linux/lsb-release/lsb_release.sh
diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix
index 63155e66678..63155e66678 100644
--- a/pkgs/os-specific/linux/lsiutil/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix
diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/nixpkgs/pkgs/os-specific/linux/lsscsi/default.nix
index aba907039ac..aba907039ac 100644
--- a/pkgs/os-specific/linux/lsscsi/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/lsscsi/default.nix
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix
index 46c8dec8889..46c8dec8889 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix
index 7eac8fad64c..7eac8fad64c 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix
diff --git a/pkgs/os-specific/linux/lvm2/default.upstream b/nixpkgs/pkgs/os-specific/linux/lvm2/default.upstream
index 1e5aaf5ab5c..1e5aaf5ab5c 100644
--- a/pkgs/os-specific/linux/lvm2/default.upstream
+++ b/nixpkgs/pkgs/os-specific/linux/lvm2/default.upstream
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/nixpkgs/pkgs/os-specific/linux/lxc/default.nix
index fff66fe328a..fff66fe328a 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/lxc/default.nix
diff --git a/pkgs/os-specific/linux/lxc/support-db2x.patch b/nixpkgs/pkgs/os-specific/linux/lxc/support-db2x.patch
index 16715992d35..16715992d35 100644
--- a/pkgs/os-specific/linux/lxc/support-db2x.patch
+++ b/nixpkgs/pkgs/os-specific/linux/lxc/support-db2x.patch
diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix
index 7acee410a4e..7acee410a4e 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix
diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/nixpkgs/pkgs/os-specific/linux/macchanger/default.nix
index 1f1c4b4d7c1..1f1c4b4d7c1 100644
--- a/pkgs/os-specific/linux/macchanger/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/macchanger/default.nix
diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix
index 7c72c8a2dbf..7c72c8a2dbf 100644
--- a/pkgs/os-specific/linux/mba6x_bl/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/nixpkgs/pkgs/os-specific/linux/mbpfan/default.nix
index 4e2e31606c5..4e2e31606c5 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/mbpfan/default.nix
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix
index a9947f92fc9..a9947f92fc9 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/nixpkgs/pkgs/os-specific/linux/mdadm/default.nix
index 8638ac9f798..8638ac9f798 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/mdadm/default.nix
diff --git a/pkgs/os-specific/linux/mdadm/no-self-references.patch b/nixpkgs/pkgs/os-specific/linux/mdadm/no-self-references.patch
index cf0366e52d1..cf0366e52d1 100644
--- a/pkgs/os-specific/linux/mdadm/no-self-references.patch
+++ b/nixpkgs/pkgs/os-specific/linux/mdadm/no-self-references.patch
diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/nixpkgs/pkgs/os-specific/linux/microcode/amd.nix
index 1a24ae3b9a2..1a24ae3b9a2 100644
--- a/pkgs/os-specific/linux/microcode/amd.nix
+++ b/nixpkgs/pkgs/os-specific/linux/microcode/amd.nix
diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix
index 70b2580b664..70b2580b664 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix
diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/nixpkgs/pkgs/os-specific/linux/microcode/iucode-tool.nix
index c81a0c9097a..c81a0c9097a 100644
--- a/pkgs/os-specific/linux/microcode/iucode-tool.nix
+++ b/nixpkgs/pkgs/os-specific/linux/microcode/iucode-tool.nix
diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/nixpkgs/pkgs/os-specific/linux/mingetty/default.nix
index a29a0373424..a29a0373424 100644
--- a/pkgs/os-specific/linux/mingetty/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/mingetty/default.nix
diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix
index 6b67401b9b2..6b67401b9b2 100644
--- a/pkgs/os-specific/linux/miraclecast/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix
diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
index 1b5925a5581..1b5925a5581 100644
--- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix
index 16c73377cb4..16c73377cb4 100644
--- a/pkgs/os-specific/linux/mmc-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix
diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/nixpkgs/pkgs/os-specific/linux/molly-guard/default.nix
index 9b412d9d7ed..9b412d9d7ed 100644
--- a/pkgs/os-specific/linux/molly-guard/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/molly-guard/default.nix
diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/msr-tools/default.nix
index f7b81bd3915..f7b81bd3915 100644
--- a/pkgs/os-specific/linux/msr-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/msr-tools/default.nix
diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/nixpkgs/pkgs/os-specific/linux/mstpd/default.nix
index 4a7c6282d4c..4a7c6282d4c 100644
--- a/pkgs/os-specific/linux/mstpd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/mstpd/default.nix
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix
index 9a76e5873d4..9a76e5873d4 100644
--- a/pkgs/os-specific/linux/multipath-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix
diff --git a/pkgs/os-specific/linux/musl/default.nix b/nixpkgs/pkgs/os-specific/linux/musl/default.nix
index 93e9ba614f8..93e9ba614f8 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/musl/default.nix
diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix
index 9490bc91181..9490bc91181 100644
--- a/pkgs/os-specific/linux/mwprocapture/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix
diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/nixpkgs/pkgs/os-specific/linux/mxu11x0/default.nix
index 76e60ec80ff..76e60ec80ff 100644
--- a/pkgs/os-specific/linux/mxu11x0/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/mxu11x0/default.nix
diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/nixpkgs/pkgs/os-specific/linux/ndiswrapper/default.nix
index bdb52c0c091..bdb52c0c091 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ndiswrapper/default.nix
diff --git a/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch b/nixpkgs/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch
index 34965540d24..34965540d24 100644
--- a/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch
+++ b/nixpkgs/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch
diff --git a/pkgs/os-specific/linux/net-tools/config.h b/nixpkgs/pkgs/os-specific/linux/net-tools/config.h
index dedaac6247d..dedaac6247d 100644
--- a/pkgs/os-specific/linux/net-tools/config.h
+++ b/nixpkgs/pkgs/os-specific/linux/net-tools/config.h
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/net-tools/default.nix
index 3cd8f224ce4..3cd8f224ce4 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/net-tools/default.nix
diff --git a/pkgs/os-specific/linux/net-tools/mptcp.nix b/nixpkgs/pkgs/os-specific/linux/net-tools/mptcp.nix
index 700bc5cb7f1..700bc5cb7f1 100644
--- a/pkgs/os-specific/linux/net-tools/mptcp.nix
+++ b/nixpkgs/pkgs/os-specific/linux/net-tools/mptcp.nix
diff --git a/pkgs/os-specific/linux/netatop/default.nix b/nixpkgs/pkgs/os-specific/linux/netatop/default.nix
index 718cf4815ba..718cf4815ba 100644
--- a/pkgs/os-specific/linux/netatop/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/netatop/default.nix
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix
index 74363be47f4..74363be47f4 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/nixpkgs/pkgs/os-specific/linux/nftables/default.nix
index 34f899977d1..34f899977d1 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nftables/default.nix
diff --git a/pkgs/os-specific/linux/nmon/default.nix b/nixpkgs/pkgs/os-specific/linux/nmon/default.nix
index 9de18401d7b..9de18401d7b 100644
--- a/pkgs/os-specific/linux/nmon/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nmon/default.nix
diff --git a/pkgs/os-specific/linux/nss_ldap/crashes.patch b/nixpkgs/pkgs/os-specific/linux/nss_ldap/crashes.patch
index 48250141e82..48250141e82 100644
--- a/pkgs/os-specific/linux/nss_ldap/crashes.patch
+++ b/nixpkgs/pkgs/os-specific/linux/nss_ldap/crashes.patch
diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/nixpkgs/pkgs/os-specific/linux/nss_ldap/default.nix
index c23eb19a482..c23eb19a482 100644
--- a/pkgs/os-specific/linux/nss_ldap/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nss_ldap/default.nix
diff --git a/pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch b/nixpkgs/pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch
index 8b0b9289327..8b0b9289327 100644
--- a/pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch
+++ b/nixpkgs/pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch
diff --git a/pkgs/os-specific/linux/numactl/default.nix b/nixpkgs/pkgs/os-specific/linux/numactl/default.nix
index f2188ee37cb..f2188ee37cb 100644
--- a/pkgs/os-specific/linux/numactl/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/numactl/default.nix
diff --git a/pkgs/os-specific/linux/numad/default.nix b/nixpkgs/pkgs/os-specific/linux/numad/default.nix
index 0d5dd118798..0d5dd118798 100644
--- a/pkgs/os-specific/linux/numad/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/numad/default.nix
diff --git a/pkgs/os-specific/linux/numad/numad-linker-flags.patch b/nixpkgs/pkgs/os-specific/linux/numad/numad-linker-flags.patch
index 97f3dc8b6cf..97f3dc8b6cf 100644
--- a/pkgs/os-specific/linux/numad/numad-linker-flags.patch
+++ b/nixpkgs/pkgs/os-specific/linux/numad/numad-linker-flags.patch
diff --git a/pkgs/os-specific/linux/numatop/default.nix b/nixpkgs/pkgs/os-specific/linux/numatop/default.nix
index 80f14b568ed..80f14b568ed 100644
--- a/pkgs/os-specific/linux/numatop/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/numatop/default.nix
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh
index b4c6952d44d..b4c6952d44d 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix
index f5aad76b0b4..f5aad76b0b4 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix
index eeb7b99bbaa..eeb7b99bbaa 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index 4f8a0b68664..4f8a0b68664 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix
index 533a74fcffd..533a74fcffd 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix
diff --git a/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch
index 6ce5c1205e2..6ce5c1205e2 100644
--- a/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch
+++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch
diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/nixpkgs/pkgs/os-specific/linux/nvidiabl/default.nix
index 02161f7133c..02161f7133c 100644
--- a/pkgs/os-specific/linux/nvidiabl/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nvidiabl/default.nix
diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix
index d0aca3bbc82..d0aca3bbc82 100644
--- a/pkgs/os-specific/linux/nvme-cli/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix
index e1acda12025..e1acda12025 100644
--- a/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix
diff --git a/pkgs/os-specific/linux/ofp/default.nix b/nixpkgs/pkgs/os-specific/linux/ofp/default.nix
index 855754a6bc1..855754a6bc1 100644
--- a/pkgs/os-specific/linux/ofp/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ofp/default.nix
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix
index 34e2591d44a..34e2591d44a 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix
diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix
index 6a0273afbdd..6a0273afbdd 100644
--- a/pkgs/os-specific/linux/open-isns/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix
diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
index cd21899e60e..cd21899e60e 100644
--- a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
+++ b/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/default.nix
index f4043f70030..f4043f70030 100644
--- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/default.nix
diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix
index a6bf67db098..a6bf67db098 100644
--- a/pkgs/os-specific/linux/openrazer/driver.nix
+++ b/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix
index 53fc986d9f6..53fc986d9f6 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix
diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix
index 4f3f4c5c172..4f3f4c5c172 100644
--- a/pkgs/os-specific/linux/openvswitch/lts.nix
+++ b/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix
diff --git a/pkgs/os-specific/linux/openvswitch/patches/lts-ssl.patch b/nixpkgs/pkgs/os-specific/linux/openvswitch/patches/lts-ssl.patch
index 0d8ff5b0d52..0d8ff5b0d52 100644
--- a/pkgs/os-specific/linux/openvswitch/patches/lts-ssl.patch
+++ b/nixpkgs/pkgs/os-specific/linux/openvswitch/patches/lts-ssl.patch
diff --git a/pkgs/os-specific/linux/otpw/default.nix b/nixpkgs/pkgs/os-specific/linux/otpw/default.nix
index a0464e1996a..a0464e1996a 100644
--- a/pkgs/os-specific/linux/otpw/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/otpw/default.nix
diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/nixpkgs/pkgs/os-specific/linux/pagemon/default.nix
index 772ef56cde2..772ef56cde2 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pagemon/default.nix
diff --git a/pkgs/os-specific/linux/pam/default.nix b/nixpkgs/pkgs/os-specific/linux/pam/default.nix
index e4429cc3bd7..e4429cc3bd7 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pam/default.nix
diff --git a/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch b/nixpkgs/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch
index 194e47b9e5b..194e47b9e5b 100644
--- a/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch
+++ b/nixpkgs/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch
diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_ccreds/default.nix
index 012750c22ad..012750c22ad 100644
--- a/pkgs/os-specific/linux/pam_ccreds/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pam_ccreds/default.nix
diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_krb5/default.nix
index 3b23c286e19..3b23c286e19 100644
--- a/pkgs/os-specific/linux/pam_krb5/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pam_krb5/default.nix
diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_ldap/default.nix
index 2b3a300ecca..2b3a300ecca 100644
--- a/pkgs/os-specific/linux/pam_ldap/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pam_ldap/default.nix
diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix
index 4bda93baddc..4bda93baddc 100644
--- a/pkgs/os-specific/linux/pam_mount/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix
diff --git a/pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch b/nixpkgs/pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch
index 6d9da05da29..6d9da05da29 100644
--- a/pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch
+++ b/nixpkgs/pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch
diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_pgsql/default.nix
index a1c91516ce0..a1c91516ce0 100644
--- a/pkgs/os-specific/linux/pam_pgsql/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pam_pgsql/default.nix
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
index 48c02be9c38..48c02be9c38 100644
--- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/nixpkgs/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
index 190325251c9..190325251c9 100644
--- a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
+++ b/nixpkgs/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_u2f/default.nix
index 6e9ab379dbc..6e9ab379dbc 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pam_u2f/default.nix
diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_usb/default.nix
index 9b915725514..9b915725514 100644
--- a/pkgs/os-specific/linux/pam_usb/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pam_usb/default.nix
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix
index 917652ca6f7..917652ca6f7 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix
diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/nixpkgs/pkgs/os-specific/linux/paxctl/default.nix
index 754f6bcac33..754f6bcac33 100644
--- a/pkgs/os-specific/linux/paxctl/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/paxctl/default.nix
diff --git a/pkgs/os-specific/linux/paxctl/setup-hook.sh b/nixpkgs/pkgs/os-specific/linux/paxctl/setup-hook.sh
index 11a6bb9910f..11a6bb9910f 100644
--- a/pkgs/os-specific/linux/paxctl/setup-hook.sh
+++ b/nixpkgs/pkgs/os-specific/linux/paxctl/setup-hook.sh
diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/nixpkgs/pkgs/os-specific/linux/paxtest/default.nix
index 6bd59e1e7fd..6bd59e1e7fd 100644
--- a/pkgs/os-specific/linux/paxtest/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/paxtest/default.nix
diff --git a/pkgs/os-specific/linux/pcm/default.nix b/nixpkgs/pkgs/os-specific/linux/pcm/default.nix
index c00bd67f95c..c00bd67f95c 100644
--- a/pkgs/os-specific/linux/pcm/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pcm/default.nix
diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix
index 75c32577a00..75c32577a00 100644
--- a/pkgs/os-specific/linux/pcmciautils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix
diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/perf-tools/default.nix
index ef8e8c7b34a..ef8e8c7b34a 100644
--- a/pkgs/os-specific/linux/perf-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/perf-tools/default.nix
diff --git a/pkgs/os-specific/linux/pflask/default.nix b/nixpkgs/pkgs/os-specific/linux/pflask/default.nix
index f3e63133d1e..f3e63133d1e 100644
--- a/pkgs/os-specific/linux/pflask/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pflask/default.nix
diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/nixpkgs/pkgs/os-specific/linux/phc-intel/default.nix
index 75fce129e93..75fce129e93 100644
--- a/pkgs/os-specific/linux/phc-intel/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/phc-intel/default.nix
diff --git a/pkgs/os-specific/linux/piper/default.nix b/nixpkgs/pkgs/os-specific/linux/piper/default.nix
index 1229c442fa2..1229c442fa2 100644
--- a/pkgs/os-specific/linux/piper/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/piper/default.nix
diff --git a/pkgs/os-specific/linux/pipework/default.nix b/nixpkgs/pkgs/os-specific/linux/pipework/default.nix
index 044f75cbd6f..044f75cbd6f 100644
--- a/pkgs/os-specific/linux/pipework/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pipework/default.nix
diff --git a/pkgs/os-specific/linux/pktgen/configure.patch b/nixpkgs/pkgs/os-specific/linux/pktgen/configure.patch
index b4933313a51..b4933313a51 100644
--- a/pkgs/os-specific/linux/pktgen/configure.patch
+++ b/nixpkgs/pkgs/os-specific/linux/pktgen/configure.patch
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix
index 3312f230247..3312f230247 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix
diff --git a/pkgs/os-specific/linux/ply/default.nix b/nixpkgs/pkgs/os-specific/linux/ply/default.nix
index 42739e53fda..42739e53fda 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/ply/default.nix
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/nixpkgs/pkgs/os-specific/linux/plymouth/default.nix
index b074c6d7244..b074c6d7244 100644
--- a/pkgs/os-specific/linux/plymouth/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/plymouth/default.nix
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/pm-utils/default.nix
index b314e8db837..b314e8db837 100644
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pm-utils/default.nix
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/nixpkgs/pkgs/os-specific/linux/pmount/default.nix
index 0981a0b5a4b..0981a0b5a4b 100644
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pmount/default.nix
diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/nixpkgs/pkgs/os-specific/linux/policycoreutils/default.nix
index 9d229c50000..9d229c50000 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/policycoreutils/default.nix
diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/nixpkgs/pkgs/os-specific/linux/pommed-light/default.nix
index 06ea49034a0..06ea49034a0 100644
--- a/pkgs/os-specific/linux/pommed-light/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pommed-light/default.nix
diff --git a/pkgs/os-specific/linux/power-calibrate/default.nix b/nixpkgs/pkgs/os-specific/linux/power-calibrate/default.nix
index d62990ed4ff..d62990ed4ff 100644
--- a/pkgs/os-specific/linux/power-calibrate/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/power-calibrate/default.nix
diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix
index 91e1bc0f53a..91e1bc0f53a 100644
--- a/pkgs/os-specific/linux/powerstat/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/nixpkgs/pkgs/os-specific/linux/powertop/default.nix
index 691b216073f..691b216073f 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/powertop/default.nix
diff --git a/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch b/nixpkgs/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch
index b9b3fdbaf34..b9b3fdbaf34 100644
--- a/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch
+++ b/nixpkgs/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch
diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/pps-tools/default.nix
index f50bfcec781..f50bfcec781 100644
--- a/pkgs/os-specific/linux/pps-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pps-tools/default.nix
diff --git a/pkgs/os-specific/linux/prl-tools/autostart.desktop b/nixpkgs/pkgs/os-specific/linux/prl-tools/autostart.desktop
index b8eb27fdd99..b8eb27fdd99 100644
--- a/pkgs/os-specific/linux/prl-tools/autostart.desktop
+++ b/nixpkgs/pkgs/os-specific/linux/prl-tools/autostart.desktop
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix
index 09e4cbc438b..09e4cbc438b 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix
diff --git a/pkgs/os-specific/linux/procdump/default.nix b/nixpkgs/pkgs/os-specific/linux/procdump/default.nix
index d24f665cc7c..d24f665cc7c 100644
--- a/pkgs/os-specific/linux/procdump/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/procdump/default.nix
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix
index 62a6b645c2c..62a6b645c2c 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix
diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/nixpkgs/pkgs/os-specific/linux/pscircle/default.nix
index f8eb8c0a969..f8eb8c0a969 100644
--- a/pkgs/os-specific/linux/pscircle/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/pscircle/default.nix
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix
index 999df37706d..999df37706d 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix
diff --git a/pkgs/os-specific/linux/r8168/default.nix b/nixpkgs/pkgs/os-specific/linux/r8168/default.nix
index b3d8965704f..b3d8965704f 100644
--- a/pkgs/os-specific/linux/r8168/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/r8168/default.nix
diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/nixpkgs/pkgs/os-specific/linux/radeontools/default.nix
index d2c3c11c939..d2c3c11c939 100644
--- a/pkgs/os-specific/linux/radeontools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/radeontools/default.nix
diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/nixpkgs/pkgs/os-specific/linux/radeontop/default.nix
index c013a0107ea..c013a0107ea 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/radeontop/default.nix
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix
index b16b230ce27..b16b230ce27 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix
diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/nixpkgs/pkgs/os-specific/linux/read-edid/default.nix
index 815005ae290..815005ae290 100644
--- a/pkgs/os-specific/linux/read-edid/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/read-edid/default.nix
diff --git a/pkgs/os-specific/linux/regionset/default.nix b/nixpkgs/pkgs/os-specific/linux/regionset/default.nix
index 3cb964f364d..3cb964f364d 100644
--- a/pkgs/os-specific/linux/regionset/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/regionset/default.nix
diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix
index 1635dc064be..1635dc064be 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix
diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix
index 710eba642cb..710eba642cb 100644
--- a/pkgs/os-specific/linux/rewritefs/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix
diff --git a/pkgs/os-specific/linux/rfkill/default.nix b/nixpkgs/pkgs/os-specific/linux/rfkill/default.nix
index 80b5ce01243..80b5ce01243 100644
--- a/pkgs/os-specific/linux/rfkill/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/rfkill/default.nix
diff --git a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh b/nixpkgs/pkgs/os-specific/linux/rfkill/rfkill-hook.sh
index 75716e40dae..75716e40dae 100755
--- a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh
+++ b/nixpkgs/pkgs/os-specific/linux/rfkill/rfkill-hook.sh
diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix
index 0575c46e28e..0575c46e28e 100644
--- a/pkgs/os-specific/linux/rfkill/udev.nix
+++ b/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix
diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix
index 1f5b31d0deb..1f5b31d0deb 100644
--- a/pkgs/os-specific/linux/roccat-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix
diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/nixpkgs/pkgs/os-specific/linux/rtkit/default.nix
index 4ad454437f5..4ad454437f5 100644
--- a/pkgs/os-specific/linux/rtkit/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/rtkit/default.nix
diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix
index f24921c7ce6..f24921c7ce6 100644
--- a/pkgs/os-specific/linux/rtl8192eu/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix
diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/nixpkgs/pkgs/os-specific/linux/rtl8723bs/default.nix
index f468196dc73..f468196dc73 100644
--- a/pkgs/os-specific/linux/rtl8723bs/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/rtl8723bs/default.nix
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix
index 68364580346..68364580346 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix
diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix
index c54d4577342..c54d4577342 100644
--- a/pkgs/os-specific/linux/rtl8814au/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix
diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix
index 1829bd6763f..1829bd6763f 100644
--- a/pkgs/os-specific/linux/rtl8821au/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix
diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix
index 4be46299122..4be46299122 100644
--- a/pkgs/os-specific/linux/rtl8821ce/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix
diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix
index 403f0a40010..403f0a40010 100644
--- a/pkgs/os-specific/linux/rtlwifi_new/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/s6-linux-utils/default.nix
index 200e66cb4d8..200e66cb4d8 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/s6-linux-utils/default.nix
diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/nixpkgs/pkgs/os-specific/linux/sch_cake/default.nix
index 68fc8a6e017..68fc8a6e017 100644
--- a/pkgs/os-specific/linux/sch_cake/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/sch_cake/default.nix
diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/nixpkgs/pkgs/os-specific/linux/schedtool/default.nix
index 316c9800079..316c9800079 100644
--- a/pkgs/os-specific/linux/schedtool/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/schedtool/default.nix
diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix b/nixpkgs/pkgs/os-specific/linux/sdnotify-wrapper/default.nix
index 613a7fd51e6..613a7fd51e6 100644
--- a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/sdnotify-wrapper/default.nix
diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c b/nixpkgs/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c
index 0d1ae96068a..0d1ae96068a 100644
--- a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c
+++ b/nixpkgs/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c
diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/nixpkgs/pkgs/os-specific/linux/sdparm/default.nix
index 5517f163b3e..5517f163b3e 100644
--- a/pkgs/os-specific/linux/sdparm/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/sdparm/default.nix
diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/nixpkgs/pkgs/os-specific/linux/selinux-python/default.nix
index 2ca88c32f13..2ca88c32f13 100644
--- a/pkgs/os-specific/linux/selinux-python/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/selinux-python/default.nix
diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/nixpkgs/pkgs/os-specific/linux/selinux-sandbox/default.nix
index 5343c5fae1a..5343c5fae1a 100644
--- a/pkgs/os-specific/linux/selinux-sandbox/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/selinux-sandbox/default.nix
diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix
index bf1f36835b4..bf1f36835b4 100644
--- a/pkgs/os-specific/linux/semodule-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix
diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/nixpkgs/pkgs/os-specific/linux/sepolgen/default.nix
index 53250b345e8..53250b345e8 100644
--- a/pkgs/os-specific/linux/sepolgen/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/sepolgen/default.nix
diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/nixpkgs/pkgs/os-specific/linux/service-wrapper/default.nix
index 150262158da..150262158da 100644
--- a/pkgs/os-specific/linux/service-wrapper/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/service-wrapper/default.nix
diff --git a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh b/nixpkgs/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh
index a7c3bc9758b..a7c3bc9758b 100755
--- a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh
+++ b/nixpkgs/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh
diff --git a/pkgs/os-specific/linux/setools/default.nix b/nixpkgs/pkgs/os-specific/linux/setools/default.nix
index 138b54b0224..138b54b0224 100644
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/setools/default.nix
diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/nixpkgs/pkgs/os-specific/linux/seturgent/default.nix
index 15582574ecb..15582574ecb 100644
--- a/pkgs/os-specific/linux/seturgent/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/seturgent/default.nix
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/nixpkgs/pkgs/os-specific/linux/shadow/default.nix
index c2547ce262a..c2547ce262a 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/shadow/default.nix
diff --git a/pkgs/os-specific/linux/shadow/keep-path.patch b/nixpkgs/pkgs/os-specific/linux/shadow/keep-path.patch
index 99fd17c27bc..99fd17c27bc 100644
--- a/pkgs/os-specific/linux/shadow/keep-path.patch
+++ b/nixpkgs/pkgs/os-specific/linux/shadow/keep-path.patch
diff --git a/pkgs/os-specific/linux/shadow/respect-xml-catalog-files-var.patch b/nixpkgs/pkgs/os-specific/linux/shadow/respect-xml-catalog-files-var.patch
index 7d922eae71f..7d922eae71f 100644
--- a/pkgs/os-specific/linux/shadow/respect-xml-catalog-files-var.patch
+++ b/nixpkgs/pkgs/os-specific/linux/shadow/respect-xml-catalog-files-var.patch
diff --git a/pkgs/os-specific/linux/sinit/default.nix b/nixpkgs/pkgs/os-specific/linux/sinit/default.nix
index 32761970d81..32761970d81 100644
--- a/pkgs/os-specific/linux/sinit/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/sinit/default.nix
diff --git a/pkgs/os-specific/linux/smem/default.nix b/nixpkgs/pkgs/os-specific/linux/smem/default.nix
index f40652922d8..f40652922d8 100644
--- a/pkgs/os-specific/linux/smem/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/smem/default.nix
diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix
index dbaf6f41325..dbaf6f41325 100644
--- a/pkgs/os-specific/linux/smemstat/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix
diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix
index 6f2e6306003..6f2e6306003 100644
--- a/pkgs/os-specific/linux/speedometer/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/nixpkgs/pkgs/os-specific/linux/sssd/default.nix
index 3dbdb99549a..3dbdb99549a 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/sssd/default.nix
diff --git a/pkgs/os-specific/linux/statifier/default.nix b/nixpkgs/pkgs/os-specific/linux/statifier/default.nix
index 376ae47ffbe..376ae47ffbe 100644
--- a/pkgs/os-specific/linux/statifier/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/statifier/default.nix
diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/nixpkgs/pkgs/os-specific/linux/syscall_limiter/default.nix
index ef13e5ded02..ef13e5ded02 100644
--- a/pkgs/os-specific/linux/syscall_limiter/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/syscall_limiter/default.nix
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix
index 61a51afa3a7..61a51afa3a7 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix
diff --git a/pkgs/os-specific/linux/sysdig/default.upstream b/nixpkgs/pkgs/os-specific/linux/sysdig/default.upstream
index 485de5741d7..485de5741d7 100644
--- a/pkgs/os-specific/linux/sysdig/default.upstream
+++ b/nixpkgs/pkgs/os-specific/linux/sysdig/default.upstream
diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/nixpkgs/pkgs/os-specific/linux/sysfsutils/default.nix
index 485f3d94a73..485f3d94a73 100644
--- a/pkgs/os-specific/linux/sysfsutils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/sysfsutils/default.nix
diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix
index 213394e5ecc..213394e5ecc 100644
--- a/pkgs/os-specific/linux/sysklogd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix
diff --git a/pkgs/os-specific/linux/sysklogd/systemd.patch b/nixpkgs/pkgs/os-specific/linux/sysklogd/systemd.patch
index 0a7fb166bd7..0a7fb166bd7 100644
--- a/pkgs/os-specific/linux/sysklogd/systemd.patch
+++ b/nixpkgs/pkgs/os-specific/linux/sysklogd/systemd.patch
diff --git a/pkgs/os-specific/linux/sysklogd/union-wait.patch b/nixpkgs/pkgs/os-specific/linux/sysklogd/union-wait.patch
index e4bffa5d695..e4bffa5d695 100644
--- a/pkgs/os-specific/linux/sysklogd/union-wait.patch
+++ b/nixpkgs/pkgs/os-specific/linux/sysklogd/union-wait.patch
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix
index ed901b21ac1..ed901b21ac1 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix
index 2ad7b21d451..2ad7b21d451 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix
diff --git a/pkgs/os-specific/linux/sysstat/install.patch b/nixpkgs/pkgs/os-specific/linux/sysstat/install.patch
index 473fa30b98b..473fa30b98b 100644
--- a/pkgs/os-specific/linux/sysstat/install.patch
+++ b/nixpkgs/pkgs/os-specific/linux/sysstat/install.patch
diff --git a/pkgs/os-specific/linux/systemd-wait/default.nix b/nixpkgs/pkgs/os-specific/linux/systemd-wait/default.nix
index 114f4c2444e..114f4c2444e 100644
--- a/pkgs/os-specific/linux/systemd-wait/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/systemd-wait/default.nix
diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/nixpkgs/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
index 3fd8ff07f42..3fd8ff07f42 100644
--- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
+++ b/nixpkgs/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
index 2f8f898ceaf..2f8f898ceaf 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix
index e3a8baa7da3..e3a8baa7da3 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix
diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix
index aa670aba727..aa670aba727 100644
--- a/pkgs/os-specific/linux/targetcli/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix
diff --git a/pkgs/os-specific/linux/tbs/default.nix b/nixpkgs/pkgs/os-specific/linux/tbs/default.nix
index bb640e6fa5e..bb640e6fa5e 100644
--- a/pkgs/os-specific/linux/tbs/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/tbs/default.nix
diff --git a/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch b/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch
index eee640e8a82..eee640e8a82 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch
+++ b/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch
diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/default.nix
index 309d69ebad5..309d69ebad5 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/default.nix
diff --git a/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch b/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch
index 328a4a10261..328a4a10261 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch
+++ b/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch
diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/nixpkgs/pkgs/os-specific/linux/thunderbolt/default.nix
index 299ac8ad220..299ac8ad220 100644
--- a/pkgs/os-specific/linux/thunderbolt/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/thunderbolt/default.nix
diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/nixpkgs/pkgs/os-specific/linux/tiptop/default.nix
index bfcf58a3530..bfcf58a3530 100644
--- a/pkgs/os-specific/linux/tiptop/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/tiptop/default.nix
diff --git a/pkgs/os-specific/linux/tiscamera/allow-pipeline-stop-in-trigger-mode.patch b/nixpkgs/pkgs/os-specific/linux/tiscamera/allow-pipeline-stop-in-trigger-mode.patch
index 48a520f6ec3..48a520f6ec3 100644
--- a/pkgs/os-specific/linux/tiscamera/allow-pipeline-stop-in-trigger-mode.patch
+++ b/nixpkgs/pkgs/os-specific/linux/tiscamera/allow-pipeline-stop-in-trigger-mode.patch
diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix
index 387a3bcf2c6..387a3bcf2c6 100644
--- a/pkgs/os-specific/linux/tiscamera/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix
diff --git a/pkgs/os-specific/linux/tmon/default.nix b/nixpkgs/pkgs/os-specific/linux/tmon/default.nix
index 690eb8b2eab..690eb8b2eab 100644
--- a/pkgs/os-specific/linux/tmon/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/tmon/default.nix
diff --git a/pkgs/os-specific/linux/tomb/default.nix b/nixpkgs/pkgs/os-specific/linux/tomb/default.nix
index 4a47ed8868d..4a47ed8868d 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/tomb/default.nix
diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/nixpkgs/pkgs/os-specific/linux/tp_smapi/default.nix
index e22263bc2db..e22263bc2db 100644
--- a/pkgs/os-specific/linux/tp_smapi/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/tp_smapi/default.nix
diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/nixpkgs/pkgs/os-specific/linux/tp_smapi/update.nix
index 65b557e4545..65b557e4545 100644
--- a/pkgs/os-specific/linux/tp_smapi/update.nix
+++ b/nixpkgs/pkgs/os-specific/linux/tp_smapi/update.nix
diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/nixpkgs/pkgs/os-specific/linux/tpacpi-bat/default.nix
index bb6d51669e6..bb6d51669e6 100644
--- a/pkgs/os-specific/linux/tpacpi-bat/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/tpacpi-bat/default.nix
diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix
index 5ec5fbb7c22..5ec5fbb7c22 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix
diff --git a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch b/nixpkgs/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
index db194e16fdb..db194e16fdb 100644
--- a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
+++ b/nixpkgs/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index 5e355ac7c9a..5e355ac7c9a 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
diff --git a/pkgs/os-specific/linux/trace-cmd/src.nix b/nixpkgs/pkgs/os-specific/linux/trace-cmd/src.nix
index 47c1b82fdd4..47c1b82fdd4 100644
--- a/pkgs/os-specific/linux/trace-cmd/src.nix
+++ b/nixpkgs/pkgs/os-specific/linux/trace-cmd/src.nix
diff --git a/pkgs/os-specific/linux/trezor-udev-rules/default.nix b/nixpkgs/pkgs/os-specific/linux/trezor-udev-rules/default.nix
index c2be8137376..c2be8137376 100644
--- a/pkgs/os-specific/linux/trezor-udev-rules/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/trezor-udev-rules/default.nix
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/nixpkgs/pkgs/os-specific/linux/trinity/default.nix
index b855f0547ba..b855f0547ba 100644
--- a/pkgs/os-specific/linux/trinity/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/trinity/default.nix
diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/nixpkgs/pkgs/os-specific/linux/tunctl/default.nix
index ded9ec0281d..ded9ec0281d 100644
--- a/pkgs/os-specific/linux/tunctl/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/tunctl/default.nix
diff --git a/pkgs/os-specific/linux/turbostat/default.nix b/nixpkgs/pkgs/os-specific/linux/turbostat/default.nix
index 10074f490b8..10074f490b8 100644
--- a/pkgs/os-specific/linux/turbostat/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/turbostat/default.nix
diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/nixpkgs/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
index b67bf2d3dab..b67bf2d3dab 100644
--- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix
index 5f401411074..5f401411074 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix
diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/nixpkgs/pkgs/os-specific/linux/udisks-glue/default.nix
index 29e3fd2e2a8..29e3fd2e2a8 100644
--- a/pkgs/os-specific/linux/udisks-glue/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/udisks-glue/default.nix
diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/nixpkgs/pkgs/os-specific/linux/udisks/1-default.nix
index 60bf2b9bc24..60bf2b9bc24 100644
--- a/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/udisks/1-default.nix
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/nixpkgs/pkgs/os-specific/linux/udisks/2-default.nix
index 1d967b38eb9..1d967b38eb9 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/udisks/2-default.nix
diff --git a/pkgs/os-specific/linux/udisks/fix-paths.patch b/nixpkgs/pkgs/os-specific/linux/udisks/fix-paths.patch
index c2744c3b42e..c2744c3b42e 100644
--- a/pkgs/os-specific/linux/udisks/fix-paths.patch
+++ b/nixpkgs/pkgs/os-specific/linux/udisks/fix-paths.patch
diff --git a/pkgs/os-specific/linux/udisks/force-path.patch b/nixpkgs/pkgs/os-specific/linux/udisks/force-path.patch
index 16c7ea5322f..16c7ea5322f 100644
--- a/pkgs/os-specific/linux/udisks/force-path.patch
+++ b/nixpkgs/pkgs/os-specific/linux/udisks/force-path.patch
diff --git a/pkgs/os-specific/linux/udisks/glibc.patch b/nixpkgs/pkgs/os-specific/linux/udisks/glibc.patch
index 85ef5208049..85ef5208049 100644
--- a/pkgs/os-specific/linux/udisks/glibc.patch
+++ b/nixpkgs/pkgs/os-specific/linux/udisks/glibc.patch
diff --git a/pkgs/os-specific/linux/udisks/no-pci-db.patch b/nixpkgs/pkgs/os-specific/linux/udisks/no-pci-db.patch
index b323b515c40..b323b515c40 100644
--- a/pkgs/os-specific/linux/udisks/no-pci-db.patch
+++ b/nixpkgs/pkgs/os-specific/linux/udisks/no-pci-db.patch
diff --git a/pkgs/os-specific/linux/udisks/purity.patch b/nixpkgs/pkgs/os-specific/linux/udisks/purity.patch
index bf1121ddb65..bf1121ddb65 100644
--- a/pkgs/os-specific/linux/udisks/purity.patch
+++ b/nixpkgs/pkgs/os-specific/linux/udisks/purity.patch
diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/nixpkgs/pkgs/os-specific/linux/undervolt/default.nix
index eb8f55ac665..eb8f55ac665 100644
--- a/pkgs/os-specific/linux/undervolt/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/undervolt/default.nix
diff --git a/pkgs/os-specific/linux/unstick/default.nix b/nixpkgs/pkgs/os-specific/linux/unstick/default.nix
index cca6e6210cb..cca6e6210cb 100644
--- a/pkgs/os-specific/linux/unstick/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/unstick/default.nix
diff --git a/pkgs/os-specific/linux/untie/default.nix b/nixpkgs/pkgs/os-specific/linux/untie/default.nix
index 9ca1c37e11b..9ca1c37e11b 100644
--- a/pkgs/os-specific/linux/untie/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/untie/default.nix
diff --git a/pkgs/os-specific/linux/upower/default.nix b/nixpkgs/pkgs/os-specific/linux/upower/default.nix
index ab7f65925ee..ab7f65925ee 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/upower/default.nix
diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix
index 3b4c1c4b665..3b4c1c4b665 100644
--- a/pkgs/os-specific/linux/usbguard/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix
diff --git a/pkgs/os-specific/linux/usbip/default.nix b/nixpkgs/pkgs/os-specific/linux/usbip/default.nix
index f927eaefb4e..f927eaefb4e 100644
--- a/pkgs/os-specific/linux/usbip/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/usbip/default.nix
diff --git a/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch b/nixpkgs/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch
index 63fca9ddbfe..63fca9ddbfe 100644
--- a/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch
+++ b/nixpkgs/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch
diff --git a/pkgs/os-specific/linux/usbip/fix-strncpy-truncation.patch b/nixpkgs/pkgs/os-specific/linux/usbip/fix-strncpy-truncation.patch
index a5c4c97bbc0..a5c4c97bbc0 100644
--- a/pkgs/os-specific/linux/usbip/fix-strncpy-truncation.patch
+++ b/nixpkgs/pkgs/os-specific/linux/usbip/fix-strncpy-truncation.patch
diff --git a/pkgs/os-specific/linux/usbtop/default.nix b/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix
index 0ff8fcf0ddf..0ff8fcf0ddf 100644
--- a/pkgs/os-specific/linux/usbtop/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix
index 2627286ccff..2627286ccff 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix
diff --git a/pkgs/os-specific/linux/usbutils/fix-paths.patch b/nixpkgs/pkgs/os-specific/linux/usbutils/fix-paths.patch
index d75c68505ef..d75c68505ef 100644
--- a/pkgs/os-specific/linux/usbutils/fix-paths.patch
+++ b/nixpkgs/pkgs/os-specific/linux/usbutils/fix-paths.patch
diff --git a/pkgs/os-specific/linux/usermount/default.nix b/nixpkgs/pkgs/os-specific/linux/usermount/default.nix
index ec58d513b09..ec58d513b09 100644
--- a/pkgs/os-specific/linux/usermount/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/usermount/default.nix
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix
index c66b4cbab83..c66b4cbab83 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix
diff --git a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/nixpkgs/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
index 5f38861bf68..5f38861bf68 100644
--- a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
+++ b/nixpkgs/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/nixpkgs/pkgs/os-specific/linux/uvcdynctrl/default.nix
index cfb93684f3b..cfb93684f3b 100644
--- a/pkgs/os-specific/linux/uvcdynctrl/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/uvcdynctrl/default.nix
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix
index 73db222d390..73db222d390 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix
diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix
index 275372b8309..275372b8309 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix
diff --git a/pkgs/os-specific/linux/v86d/default.nix b/nixpkgs/pkgs/os-specific/linux/v86d/default.nix
index 073a6ded998..073a6ded998 100644
--- a/pkgs/os-specific/linux/v86d/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/v86d/default.nix
diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/nixpkgs/pkgs/os-specific/linux/virtualbox/default.nix
index f795d36207a..f795d36207a 100644
--- a/pkgs/os-specific/linux/virtualbox/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/virtualbox/default.nix
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix
index 247fd8ed250..247fd8ed250 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix
diff --git a/pkgs/os-specific/linux/wireless-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/wireless-tools/default.nix
index 687bb7647cf..687bb7647cf 100644
--- a/pkgs/os-specific/linux/wireless-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/wireless-tools/default.nix
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix
index dc5b4289a45..dc5b4289a45 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/gui.nix
index d02901e0cc1..d02901e0cc1 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix
+++ b/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/gui.nix
diff --git a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix b/nixpkgs/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix
index b4997714cea..b4997714cea 100644
--- a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix
diff --git a/pkgs/os-specific/linux/x86info/default.nix b/nixpkgs/pkgs/os-specific/linux/x86info/default.nix
index 1c2aaa8ee01..1c2aaa8ee01 100644
--- a/pkgs/os-specific/linux/x86info/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/x86info/default.nix
diff --git a/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/nixpkgs/pkgs/os-specific/linux/xf86-input-cmt/default.nix
index 9f9b278d6f7..9f9b278d6f7 100644
--- a/pkgs/os-specific/linux/xf86-input-cmt/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/xf86-input-cmt/default.nix
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/nixpkgs/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index ac095ffaf89..ac095ffaf89 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/xf86-input-wacom/default.nix
diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/nixpkgs/pkgs/os-specific/linux/xf86-video-nested/default.nix
index 69a10673d24..69a10673d24 100644
--- a/pkgs/os-specific/linux/xf86-video-nested/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/xf86-video-nested/default.nix
diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/nixpkgs/pkgs/os-specific/linux/xsensors/default.nix
index 440a797a723..440a797a723 100644
--- a/pkgs/os-specific/linux/xsensors/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/xsensors/default.nix
diff --git a/pkgs/os-specific/linux/xsensors/remove-unused-variables.patch b/nixpkgs/pkgs/os-specific/linux/xsensors/remove-unused-variables.patch
index 7da97a0e56e..7da97a0e56e 100644
--- a/pkgs/os-specific/linux/xsensors/remove-unused-variables.patch
+++ b/nixpkgs/pkgs/os-specific/linux/xsensors/remove-unused-variables.patch
diff --git a/pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch b/nixpkgs/pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch
index fed4c7dc4c9..fed4c7dc4c9 100644
--- a/pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch
+++ b/nixpkgs/pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch
diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix
index c333b94f40e..c333b94f40e 100644
--- a/pkgs/os-specific/linux/zenmonitor/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix
diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/nixpkgs/pkgs/os-specific/linux/zenpower/default.nix
index 8fdf7f23cf8..8fdf7f23cf8 100644
--- a/pkgs/os-specific/linux/zenpower/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/zenpower/default.nix
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/nixpkgs/pkgs/os-specific/linux/zfs/default.nix
index 738171bb5ec..738171bb5ec 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/zfs/default.nix
diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/nixpkgs/pkgs/os-specific/windows/cygwin-setup/default.nix
index a6c74d029c5..a6c74d029c5 100644
--- a/pkgs/os-specific/windows/cygwin-setup/default.nix
+++ b/nixpkgs/pkgs/os-specific/windows/cygwin-setup/default.nix
diff --git a/pkgs/os-specific/windows/default.nix b/nixpkgs/pkgs/os-specific/windows/default.nix
index 7f1634d5c0b..7f1634d5c0b 100644
--- a/pkgs/os-specific/windows/default.nix
+++ b/nixpkgs/pkgs/os-specific/windows/default.nix
diff --git a/pkgs/os-specific/windows/jom/default.nix b/nixpkgs/pkgs/os-specific/windows/jom/default.nix
index 0ddec9282e6..0ddec9282e6 100644
--- a/pkgs/os-specific/windows/jom/default.nix
+++ b/nixpkgs/pkgs/os-specific/windows/jom/default.nix
diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/nixpkgs/pkgs/os-specific/windows/libgnurx/default.nix
index fedfea15ccb..fedfea15ccb 100644
--- a/pkgs/os-specific/windows/libgnurx/default.nix
+++ b/nixpkgs/pkgs/os-specific/windows/libgnurx/default.nix
diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/nixpkgs/pkgs/os-specific/windows/mcfgthreads/default.nix
index 6c4cd171025..6c4cd171025 100644
--- a/pkgs/os-specific/windows/mcfgthreads/default.nix
+++ b/nixpkgs/pkgs/os-specific/windows/mcfgthreads/default.nix
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/nixpkgs/pkgs/os-specific/windows/mingw-w64/default.nix
index 7efc2e21313..7efc2e21313 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/nixpkgs/pkgs/os-specific/windows/mingw-w64/default.nix
diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/nixpkgs/pkgs/os-specific/windows/mingw-w64/headers.nix
index 6a93cea6708..6a93cea6708 100644
--- a/pkgs/os-specific/windows/mingw-w64/headers.nix
+++ b/nixpkgs/pkgs/os-specific/windows/mingw-w64/headers.nix
diff --git a/pkgs/os-specific/windows/mingw-w64/osvi.patch b/nixpkgs/pkgs/os-specific/windows/mingw-w64/osvi.patch
index c51ff4bd5df..c51ff4bd5df 100644
--- a/pkgs/os-specific/windows/mingw-w64/osvi.patch
+++ b/nixpkgs/pkgs/os-specific/windows/mingw-w64/osvi.patch
diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/nixpkgs/pkgs/os-specific/windows/mingw-w64/pthreads.nix
index bbcb028d3cb..bbcb028d3cb 100644
--- a/pkgs/os-specific/windows/mingw-w64/pthreads.nix
+++ b/nixpkgs/pkgs/os-specific/windows/mingw-w64/pthreads.nix
diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/nixpkgs/pkgs/os-specific/windows/mingwrt/default.nix
index 4fb92569a47..4fb92569a47 100644
--- a/pkgs/os-specific/windows/mingwrt/default.nix
+++ b/nixpkgs/pkgs/os-specific/windows/mingwrt/default.nix
diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix
index 25706733967..25706733967 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix
diff --git a/pkgs/os-specific/windows/w32api/default.nix b/nixpkgs/pkgs/os-specific/windows/w32api/default.nix
index ebc95ecaa7a..ebc95ecaa7a 100644
--- a/pkgs/os-specific/windows/w32api/default.nix
+++ b/nixpkgs/pkgs/os-specific/windows/w32api/default.nix
diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/nixpkgs/pkgs/os-specific/windows/wxMSW-2.8/default.nix
index 2764c4232c1..2764c4232c1 100644
--- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix
+++ b/nixpkgs/pkgs/os-specific/windows/wxMSW-2.8/default.nix
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/nixpkgs/pkgs/servers/amqp/qpid-cpp/default.nix
index 02c2e03d90f..02c2e03d90f 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/nixpkgs/pkgs/servers/amqp/qpid-cpp/default.nix
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix
index 8fd207e9175..8fd207e9175 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix
diff --git a/pkgs/servers/apache-kafka/default.nix b/nixpkgs/pkgs/servers/apache-kafka/default.nix
index 769f5f79a77..769f5f79a77 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/nixpkgs/pkgs/servers/apache-kafka/default.nix
diff --git a/pkgs/servers/apcupsd/default.nix b/nixpkgs/pkgs/servers/apcupsd/default.nix
index bec61d460a7..bec61d460a7 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/nixpkgs/pkgs/servers/apcupsd/default.nix
diff --git a/pkgs/servers/asterisk/default.nix b/nixpkgs/pkgs/servers/asterisk/default.nix
index 1e5ba46d382..1e5ba46d382 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/nixpkgs/pkgs/servers/asterisk/default.nix
diff --git a/pkgs/servers/asterisk/runtime-vardirs.patch b/nixpkgs/pkgs/servers/asterisk/runtime-vardirs.patch
index 498c62ee4d8..498c62ee4d8 100644
--- a/pkgs/servers/asterisk/runtime-vardirs.patch
+++ b/nixpkgs/pkgs/servers/asterisk/runtime-vardirs.patch
diff --git a/pkgs/servers/atlassian/confluence.nix b/nixpkgs/pkgs/servers/atlassian/confluence.nix
index a5aead770b8..a5aead770b8 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/nixpkgs/pkgs/servers/atlassian/confluence.nix
diff --git a/pkgs/servers/atlassian/crowd.nix b/nixpkgs/pkgs/servers/atlassian/crowd.nix
index 81b90091e66..81b90091e66 100644
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/nixpkgs/pkgs/servers/atlassian/crowd.nix
diff --git a/pkgs/servers/atlassian/jira.nix b/nixpkgs/pkgs/servers/atlassian/jira.nix
index e5bc253f83d..e5bc253f83d 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/nixpkgs/pkgs/servers/atlassian/jira.nix
diff --git a/pkgs/servers/beanstalkd/default.nix b/nixpkgs/pkgs/servers/beanstalkd/default.nix
index 58ebbf88f78..58ebbf88f78 100644
--- a/pkgs/servers/beanstalkd/default.nix
+++ b/nixpkgs/pkgs/servers/beanstalkd/default.nix
diff --git a/pkgs/servers/bird/default.nix b/nixpkgs/pkgs/servers/bird/default.nix
index 2cc27eda1d4..2cc27eda1d4 100644
--- a/pkgs/servers/bird/default.nix
+++ b/nixpkgs/pkgs/servers/bird/default.nix
diff --git a/pkgs/servers/bird/dont-create-sysconfdir-1.patch b/nixpkgs/pkgs/servers/bird/dont-create-sysconfdir-1.patch
index 8f62670aee9..8f62670aee9 100644
--- a/pkgs/servers/bird/dont-create-sysconfdir-1.patch
+++ b/nixpkgs/pkgs/servers/bird/dont-create-sysconfdir-1.patch
diff --git a/pkgs/servers/bird/dont-create-sysconfdir-2.patch b/nixpkgs/pkgs/servers/bird/dont-create-sysconfdir-2.patch
index 24716446118..24716446118 100644
--- a/pkgs/servers/bird/dont-create-sysconfdir-2.patch
+++ b/nixpkgs/pkgs/servers/bird/dont-create-sysconfdir-2.patch
diff --git a/pkgs/servers/blockbook/default.nix b/nixpkgs/pkgs/servers/blockbook/default.nix
index b95c3d41b39..b95c3d41b39 100644
--- a/pkgs/servers/blockbook/default.nix
+++ b/nixpkgs/pkgs/servers/blockbook/default.nix
diff --git a/pkgs/servers/blockbook/deps.nix b/nixpkgs/pkgs/servers/blockbook/deps.nix
index 90ff098581a..90ff098581a 100644
--- a/pkgs/servers/blockbook/deps.nix
+++ b/nixpkgs/pkgs/servers/blockbook/deps.nix
diff --git a/pkgs/servers/brickd/default.nix b/nixpkgs/pkgs/servers/brickd/default.nix
index ee8925e1170..ee8925e1170 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/nixpkgs/pkgs/servers/brickd/default.nix
diff --git a/pkgs/servers/caddy/default.nix b/nixpkgs/pkgs/servers/caddy/default.nix
index 2eca465bfd2..2eca465bfd2 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/nixpkgs/pkgs/servers/caddy/default.nix
diff --git a/pkgs/servers/caddy/v2.nix b/nixpkgs/pkgs/servers/caddy/v2.nix
index c0b2134abde..c0b2134abde 100644
--- a/pkgs/servers/caddy/v2.nix
+++ b/nixpkgs/pkgs/servers/caddy/v2.nix
diff --git a/pkgs/servers/cayley/default.nix b/nixpkgs/pkgs/servers/cayley/default.nix
index c9a39b691e7..c9a39b691e7 100644
--- a/pkgs/servers/cayley/default.nix
+++ b/nixpkgs/pkgs/servers/cayley/default.nix
diff --git a/pkgs/servers/cayley/deps.nix b/nixpkgs/pkgs/servers/cayley/deps.nix
index eb3dce827bd..eb3dce827bd 100644
--- a/pkgs/servers/cayley/deps.nix
+++ b/nixpkgs/pkgs/servers/cayley/deps.nix
diff --git a/pkgs/servers/clickhouse/default.nix b/nixpkgs/pkgs/servers/clickhouse/default.nix
index 4c586efe177..4c586efe177 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/nixpkgs/pkgs/servers/clickhouse/default.nix
diff --git a/pkgs/servers/cloud-print-connector/default.nix b/nixpkgs/pkgs/servers/cloud-print-connector/default.nix
index 2fb5b403508..2fb5b403508 100644
--- a/pkgs/servers/cloud-print-connector/default.nix
+++ b/nixpkgs/pkgs/servers/cloud-print-connector/default.nix
diff --git a/pkgs/servers/cloud-print-connector/deps.nix b/nixpkgs/pkgs/servers/cloud-print-connector/deps.nix
index 0547d48ea87..0547d48ea87 100644
--- a/pkgs/servers/cloud-print-connector/deps.nix
+++ b/nixpkgs/pkgs/servers/cloud-print-connector/deps.nix
diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix
index 13fad7059af..13fad7059af 100644
--- a/pkgs/servers/computing/slurm-spank-x11/default.nix
+++ b/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix
diff --git a/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix
index 637ac0607db..637ac0607db 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix
diff --git a/pkgs/servers/computing/storm/default.nix b/nixpkgs/pkgs/servers/computing/storm/default.nix
index 8335e40de98..8335e40de98 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/nixpkgs/pkgs/servers/computing/storm/default.nix
diff --git a/pkgs/servers/computing/torque/default.nix b/nixpkgs/pkgs/servers/computing/torque/default.nix
index 8eb12a1b811..8eb12a1b811 100644
--- a/pkgs/servers/computing/torque/default.nix
+++ b/nixpkgs/pkgs/servers/computing/torque/default.nix
diff --git a/pkgs/servers/confluent-platform/default.nix b/nixpkgs/pkgs/servers/confluent-platform/default.nix
index 93794ce7052..93794ce7052 100644
--- a/pkgs/servers/confluent-platform/default.nix
+++ b/nixpkgs/pkgs/servers/confluent-platform/default.nix
diff --git a/pkgs/servers/consul/default.nix b/nixpkgs/pkgs/servers/consul/default.nix
index 2a4361d99d2..2a4361d99d2 100644
--- a/pkgs/servers/consul/default.nix
+++ b/nixpkgs/pkgs/servers/consul/default.nix
diff --git a/pkgs/servers/corosync/default.nix b/nixpkgs/pkgs/servers/corosync/default.nix
index 2d7acda90af..2d7acda90af 100644
--- a/pkgs/servers/corosync/default.nix
+++ b/nixpkgs/pkgs/servers/corosync/default.nix
diff --git a/pkgs/servers/coturn/default.nix b/nixpkgs/pkgs/servers/coturn/default.nix
index 2fbd0bbfb3d..2fbd0bbfb3d 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/nixpkgs/pkgs/servers/coturn/default.nix
diff --git a/pkgs/servers/coturn/pure-configure.patch b/nixpkgs/pkgs/servers/coturn/pure-configure.patch
index 0315a71b184..0315a71b184 100644
--- a/pkgs/servers/coturn/pure-configure.patch
+++ b/nixpkgs/pkgs/servers/coturn/pure-configure.patch
diff --git a/pkgs/servers/couchpotato/default.nix b/nixpkgs/pkgs/servers/couchpotato/default.nix
index 07ff725f7c9..07ff725f7c9 100644
--- a/pkgs/servers/couchpotato/default.nix
+++ b/nixpkgs/pkgs/servers/couchpotato/default.nix
diff --git a/pkgs/servers/dante/default.nix b/nixpkgs/pkgs/servers/dante/default.nix
index c36ca2f8f50..c36ca2f8f50 100644
--- a/pkgs/servers/dante/default.nix
+++ b/nixpkgs/pkgs/servers/dante/default.nix
diff --git a/pkgs/servers/demoit/default.nix b/nixpkgs/pkgs/servers/demoit/default.nix
index 29d00caa023..29d00caa023 100644
--- a/pkgs/servers/demoit/default.nix
+++ b/nixpkgs/pkgs/servers/demoit/default.nix
diff --git a/pkgs/servers/dex/default.nix b/nixpkgs/pkgs/servers/dex/default.nix
index 799b73294e8..799b73294e8 100644
--- a/pkgs/servers/dex/default.nix
+++ b/nixpkgs/pkgs/servers/dex/default.nix
diff --git a/pkgs/servers/dgraph/default.nix b/nixpkgs/pkgs/servers/dgraph/default.nix
index 489f2e297bb..489f2e297bb 100644
--- a/pkgs/servers/dgraph/default.nix
+++ b/nixpkgs/pkgs/servers/dgraph/default.nix
diff --git a/pkgs/servers/dgraph/deps.nix b/nixpkgs/pkgs/servers/dgraph/deps.nix
index 602233d635e..602233d635e 100644
--- a/pkgs/servers/dgraph/deps.nix
+++ b/nixpkgs/pkgs/servers/dgraph/deps.nix
diff --git a/pkgs/servers/dico/default.nix b/nixpkgs/pkgs/servers/dico/default.nix
index d2a6dc9df15..d2a6dc9df15 100644
--- a/pkgs/servers/dico/default.nix
+++ b/nixpkgs/pkgs/servers/dico/default.nix
diff --git a/pkgs/servers/dict/buildfix.diff b/nixpkgs/pkgs/servers/dict/buildfix.diff
index e30fcb2b038..e30fcb2b038 100644
--- a/pkgs/servers/dict/buildfix.diff
+++ b/nixpkgs/pkgs/servers/dict/buildfix.diff
diff --git a/pkgs/servers/dict/default.nix b/nixpkgs/pkgs/servers/dict/default.nix
index b4ad70f8277..b4ad70f8277 100644
--- a/pkgs/servers/dict/default.nix
+++ b/nixpkgs/pkgs/servers/dict/default.nix
diff --git a/pkgs/servers/dict/dictd-db-collector.nix b/nixpkgs/pkgs/servers/dict/dictd-db-collector.nix
index f635c98602d..f635c98602d 100644
--- a/pkgs/servers/dict/dictd-db-collector.nix
+++ b/nixpkgs/pkgs/servers/dict/dictd-db-collector.nix
diff --git a/pkgs/servers/dict/dictd-db.nix b/nixpkgs/pkgs/servers/dict/dictd-db.nix
index 442ef45d1bf..442ef45d1bf 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/nixpkgs/pkgs/servers/dict/dictd-db.nix
diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix
index b7dbf04026d..b7dbf04026d 100644
--- a/pkgs/servers/dict/dictd-wiktionary.nix
+++ b/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix
diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix
index 2c97101d9cb..2c97101d9cb 100644
--- a/pkgs/servers/dict/dictd-wordnet.nix
+++ b/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix
diff --git a/pkgs/servers/dict/libmaa.nix b/nixpkgs/pkgs/servers/dict/libmaa.nix
index 4ac4328c35f..4ac4328c35f 100644
--- a/pkgs/servers/dict/libmaa.nix
+++ b/nixpkgs/pkgs/servers/dict/libmaa.nix
diff --git a/pkgs/servers/dict/wiktionary2dict.py b/nixpkgs/pkgs/servers/dict/wiktionary2dict.py
index 8a0210e7254..8a0210e7254 100644
--- a/pkgs/servers/dict/wiktionary2dict.py
+++ b/nixpkgs/pkgs/servers/dict/wiktionary2dict.py
diff --git a/pkgs/servers/dict/wordnet_structures.py b/nixpkgs/pkgs/servers/dict/wordnet_structures.py
index 6a88427c5da..6a88427c5da 100644
--- a/pkgs/servers/dict/wordnet_structures.py
+++ b/nixpkgs/pkgs/servers/dict/wordnet_structures.py
diff --git a/pkgs/servers/diod/default.nix b/nixpkgs/pkgs/servers/diod/default.nix
index cf81d9b4b9a..cf81d9b4b9a 100644
--- a/pkgs/servers/diod/default.nix
+++ b/nixpkgs/pkgs/servers/diod/default.nix
diff --git a/pkgs/servers/dns/bind/default.nix b/nixpkgs/pkgs/servers/dns/bind/default.nix
index 9cfd7514621..9cfd7514621 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/nixpkgs/pkgs/servers/dns/bind/default.nix
diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
index 17fdb15ad46..17fdb15ad46 100644
--- a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
+++ b/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
diff --git a/pkgs/servers/dns/bind/remove-mkdir-var.patch b/nixpkgs/pkgs/servers/dns/bind/remove-mkdir-var.patch
index d0dcd580c20..d0dcd580c20 100644
--- a/pkgs/servers/dns/bind/remove-mkdir-var.patch
+++ b/nixpkgs/pkgs/servers/dns/bind/remove-mkdir-var.patch
diff --git a/pkgs/servers/dns/coredns/default.nix b/nixpkgs/pkgs/servers/dns/coredns/default.nix
index 2c8506ac9d2..2c8506ac9d2 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/nixpkgs/pkgs/servers/dns/coredns/default.nix
diff --git a/pkgs/servers/dns/dnsdist/default.nix b/nixpkgs/pkgs/servers/dns/dnsdist/default.nix
index 0c236fe9315..0c236fe9315 100644
--- a/pkgs/servers/dns/dnsdist/default.nix
+++ b/nixpkgs/pkgs/servers/dns/dnsdist/default.nix
diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/nixpkgs/pkgs/servers/dns/doh-proxy/default.nix
index d94f34ebd21..d94f34ebd21 100644
--- a/pkgs/servers/dns/doh-proxy/default.nix
+++ b/nixpkgs/pkgs/servers/dns/doh-proxy/default.nix
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
index c3d63a54ac0..c3d63a54ac0 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix
index 953d8ebcbae..953d8ebcbae 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix
diff --git a/pkgs/servers/dns/nsd/default.nix b/nixpkgs/pkgs/servers/dns/nsd/default.nix
index 130a25511d7..130a25511d7 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/nixpkgs/pkgs/servers/dns/nsd/default.nix
diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix
index e5fc3ac5bb9..e5fc3ac5bb9 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix
diff --git a/pkgs/servers/dns/powerdns/default.nix b/nixpkgs/pkgs/servers/dns/powerdns/default.nix
index 129fec2895b..129fec2895b 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/nixpkgs/pkgs/servers/dns/powerdns/default.nix
diff --git a/pkgs/servers/documize-community/default.nix b/nixpkgs/pkgs/servers/documize-community/default.nix
index 078936b237f..078936b237f 100644
--- a/pkgs/servers/documize-community/default.nix
+++ b/nixpkgs/pkgs/servers/documize-community/default.nix
diff --git a/pkgs/servers/echoip/default.nix b/nixpkgs/pkgs/servers/echoip/default.nix
index b3402933f9f..b3402933f9f 100644
--- a/pkgs/servers/echoip/default.nix
+++ b/nixpkgs/pkgs/servers/echoip/default.nix
diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix
index 5293b18368e..5293b18368e 100644
--- a/pkgs/servers/elasticmq-server-bin/default.nix
+++ b/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix
diff --git a/pkgs/servers/elasticmq/default.nix b/nixpkgs/pkgs/servers/elasticmq/default.nix
index c1216becaf3..c1216becaf3 100644
--- a/pkgs/servers/elasticmq/default.nix
+++ b/nixpkgs/pkgs/servers/elasticmq/default.nix
diff --git a/pkgs/servers/endlessh/default.nix b/nixpkgs/pkgs/servers/endlessh/default.nix
index 0e424d1d122..0e424d1d122 100644
--- a/pkgs/servers/endlessh/default.nix
+++ b/nixpkgs/pkgs/servers/endlessh/default.nix
diff --git a/pkgs/servers/etcd/default.nix b/nixpkgs/pkgs/servers/etcd/default.nix
index 5a693fd7529..5a693fd7529 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/nixpkgs/pkgs/servers/etcd/default.nix
diff --git a/pkgs/servers/exhibitor/default.nix b/nixpkgs/pkgs/servers/exhibitor/default.nix
index 1e05c856ab5..1e05c856ab5 100644
--- a/pkgs/servers/exhibitor/default.nix
+++ b/nixpkgs/pkgs/servers/exhibitor/default.nix
diff --git a/pkgs/servers/fcgiwrap/default.nix b/nixpkgs/pkgs/servers/fcgiwrap/default.nix
index c8ddcf438f7..c8ddcf438f7 100644
--- a/pkgs/servers/fcgiwrap/default.nix
+++ b/nixpkgs/pkgs/servers/fcgiwrap/default.nix
diff --git a/pkgs/servers/felix/default.nix b/nixpkgs/pkgs/servers/felix/default.nix
index 7be7416d04d..7be7416d04d 100644
--- a/pkgs/servers/felix/default.nix
+++ b/nixpkgs/pkgs/servers/felix/default.nix
diff --git a/pkgs/servers/felix/remoteshell.nix b/nixpkgs/pkgs/servers/felix/remoteshell.nix
index 2fe628db046..2fe628db046 100644
--- a/pkgs/servers/felix/remoteshell.nix
+++ b/nixpkgs/pkgs/servers/felix/remoteshell.nix
diff --git a/pkgs/servers/fileshare/default.nix b/nixpkgs/pkgs/servers/fileshare/default.nix
index 42f280eed23..42f280eed23 100644
--- a/pkgs/servers/fileshare/default.nix
+++ b/nixpkgs/pkgs/servers/fileshare/default.nix
diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/nixpkgs/pkgs/servers/fingerd/bsd-fingerd/default.nix
index 99971816021..99971816021 100644
--- a/pkgs/servers/fingerd/bsd-fingerd/default.nix
+++ b/nixpkgs/pkgs/servers/fingerd/bsd-fingerd/default.nix
diff --git a/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch b/nixpkgs/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch
index 80968d587ba..80968d587ba 100644
--- a/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch
+++ b/nixpkgs/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch
diff --git a/pkgs/servers/firebird/default.nix b/nixpkgs/pkgs/servers/firebird/default.nix
index d80508bfe44..d80508bfe44 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/nixpkgs/pkgs/servers/firebird/default.nix
diff --git a/pkgs/servers/foundationdb/cmake.nix b/nixpkgs/pkgs/servers/foundationdb/cmake.nix
index 512842b3a6a..512842b3a6a 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/nixpkgs/pkgs/servers/foundationdb/cmake.nix
diff --git a/pkgs/servers/foundationdb/default.nix b/nixpkgs/pkgs/servers/foundationdb/default.nix
index 98247e35e19..98247e35e19 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/nixpkgs/pkgs/servers/foundationdb/default.nix
diff --git a/pkgs/servers/foundationdb/patches/clang-libcxx.patch b/nixpkgs/pkgs/servers/foundationdb/patches/clang-libcxx.patch
index ebbacdf871e..ebbacdf871e 100644
--- a/pkgs/servers/foundationdb/patches/clang-libcxx.patch
+++ b/nixpkgs/pkgs/servers/foundationdb/patches/clang-libcxx.patch
diff --git a/pkgs/servers/foundationdb/patches/fix-scm-version.patch b/nixpkgs/pkgs/servers/foundationdb/patches/fix-scm-version.patch
index 0e0df7ade82..0e0df7ade82 100644
--- a/pkgs/servers/foundationdb/patches/fix-scm-version.patch
+++ b/nixpkgs/pkgs/servers/foundationdb/patches/fix-scm-version.patch
diff --git a/pkgs/servers/foundationdb/patches/gcc-fixes.patch b/nixpkgs/pkgs/servers/foundationdb/patches/gcc-fixes.patch
index 295e405b9fc..295e405b9fc 100644
--- a/pkgs/servers/foundationdb/patches/gcc-fixes.patch
+++ b/nixpkgs/pkgs/servers/foundationdb/patches/gcc-fixes.patch
diff --git a/pkgs/servers/foundationdb/patches/ldflags-5.1.patch b/nixpkgs/pkgs/servers/foundationdb/patches/ldflags-5.1.patch
index 4d523a7ecdd..4d523a7ecdd 100644
--- a/pkgs/servers/foundationdb/patches/ldflags-5.1.patch
+++ b/nixpkgs/pkgs/servers/foundationdb/patches/ldflags-5.1.patch
diff --git a/pkgs/servers/foundationdb/patches/ldflags-5.2.patch b/nixpkgs/pkgs/servers/foundationdb/patches/ldflags-5.2.patch
index ee5911e495f..ee5911e495f 100644
--- a/pkgs/servers/foundationdb/patches/ldflags-5.2.patch
+++ b/nixpkgs/pkgs/servers/foundationdb/patches/ldflags-5.2.patch
diff --git a/pkgs/servers/foundationdb/patches/ldflags-6.0.patch b/nixpkgs/pkgs/servers/foundationdb/patches/ldflags-6.0.patch
index 1fa17a9615a..1fa17a9615a 100644
--- a/pkgs/servers/foundationdb/patches/ldflags-6.0.patch
+++ b/nixpkgs/pkgs/servers/foundationdb/patches/ldflags-6.0.patch
diff --git a/pkgs/servers/foundationdb/patches/suppress-clang-warnings.patch b/nixpkgs/pkgs/servers/foundationdb/patches/suppress-clang-warnings.patch
index 9d1ae992efc..9d1ae992efc 100644
--- a/pkgs/servers/foundationdb/patches/suppress-clang-warnings.patch
+++ b/nixpkgs/pkgs/servers/foundationdb/patches/suppress-clang-warnings.patch
diff --git a/pkgs/servers/foundationdb/python.nix b/nixpkgs/pkgs/servers/foundationdb/python.nix
index e4256fab0fa..e4256fab0fa 100644
--- a/pkgs/servers/foundationdb/python.nix
+++ b/nixpkgs/pkgs/servers/foundationdb/python.nix
diff --git a/pkgs/servers/foundationdb/test-list.txt b/nixpkgs/pkgs/servers/foundationdb/test-list.txt
index 3e9ce1428ad..3e9ce1428ad 100644
--- a/pkgs/servers/foundationdb/test-list.txt
+++ b/nixpkgs/pkgs/servers/foundationdb/test-list.txt
diff --git a/pkgs/servers/foundationdb/vsmake.nix b/nixpkgs/pkgs/servers/foundationdb/vsmake.nix
index a7eedb8408b..a7eedb8408b 100644
--- a/pkgs/servers/foundationdb/vsmake.nix
+++ b/nixpkgs/pkgs/servers/foundationdb/vsmake.nix
diff --git a/pkgs/servers/freeradius/default.nix b/nixpkgs/pkgs/servers/freeradius/default.nix
index cbd71085340..cbd71085340 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/nixpkgs/pkgs/servers/freeradius/default.nix
diff --git a/pkgs/servers/ftp/bftpd/default.nix b/nixpkgs/pkgs/servers/ftp/bftpd/default.nix
index 34757462a17..34757462a17 100644
--- a/pkgs/servers/ftp/bftpd/default.nix
+++ b/nixpkgs/pkgs/servers/ftp/bftpd/default.nix
diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix
index 5f6e7d466cf..5f6e7d466cf 100644
--- a/pkgs/servers/ftp/pure-ftpd/default.nix
+++ b/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix
diff --git a/pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch b/nixpkgs/pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch
index 0a614439511..0a614439511 100644
--- a/pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch
+++ b/nixpkgs/pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix
index 1ef624f2a41..1ef624f2a41 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix
diff --git a/pkgs/servers/gobetween/default.nix b/nixpkgs/pkgs/servers/gobetween/default.nix
index ff59ad53ed1..ff59ad53ed1 100644
--- a/pkgs/servers/gobetween/default.nix
+++ b/nixpkgs/pkgs/servers/gobetween/default.nix
diff --git a/pkgs/servers/gopher/gofish/default.nix b/nixpkgs/pkgs/servers/gopher/gofish/default.nix
index 1bec32e5125..1bec32e5125 100644
--- a/pkgs/servers/gopher/gofish/default.nix
+++ b/nixpkgs/pkgs/servers/gopher/gofish/default.nix
diff --git a/pkgs/servers/gortr/default.nix b/nixpkgs/pkgs/servers/gortr/default.nix
index 375631d5cbf..375631d5cbf 100644
--- a/pkgs/servers/gortr/default.nix
+++ b/nixpkgs/pkgs/servers/gortr/default.nix
diff --git a/pkgs/servers/gotify/default.nix b/nixpkgs/pkgs/servers/gotify/default.nix
index 9782b289055..9782b289055 100644
--- a/pkgs/servers/gotify/default.nix
+++ b/nixpkgs/pkgs/servers/gotify/default.nix
diff --git a/pkgs/servers/gotify/package.json b/nixpkgs/pkgs/servers/gotify/package.json
index 1c84de17f46..1c84de17f46 100644
--- a/pkgs/servers/gotify/package.json
+++ b/nixpkgs/pkgs/servers/gotify/package.json
diff --git a/pkgs/servers/gotify/ui.nix b/nixpkgs/pkgs/servers/gotify/ui.nix
index 2c1bddec68f..2c1bddec68f 100644
--- a/pkgs/servers/gotify/ui.nix
+++ b/nixpkgs/pkgs/servers/gotify/ui.nix
diff --git a/pkgs/servers/gotify/update-yarn-deps.sh b/nixpkgs/pkgs/servers/gotify/update-yarn-deps.sh
index d25b5c429df..d25b5c429df 100755
--- a/pkgs/servers/gotify/update-yarn-deps.sh
+++ b/nixpkgs/pkgs/servers/gotify/update-yarn-deps.sh
diff --git a/pkgs/servers/gotify/yarndeps.nix b/nixpkgs/pkgs/servers/gotify/yarndeps.nix
index 0e81e890a9f..0e81e890a9f 100644
--- a/pkgs/servers/gotify/yarndeps.nix
+++ b/nixpkgs/pkgs/servers/gotify/yarndeps.nix
diff --git a/pkgs/servers/gotty/default.nix b/nixpkgs/pkgs/servers/gotty/default.nix
index a9cf6c1da47..a9cf6c1da47 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/nixpkgs/pkgs/servers/gotty/default.nix
diff --git a/pkgs/servers/gpm/default.nix b/nixpkgs/pkgs/servers/gpm/default.nix
index 3cd36858204..3cd36858204 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/nixpkgs/pkgs/servers/gpm/default.nix
diff --git a/pkgs/servers/gpsd/0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch b/nixpkgs/pkgs/servers/gpsd/0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch
index a8721a3e702..a8721a3e702 100644
--- a/pkgs/servers/gpsd/0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch
+++ b/nixpkgs/pkgs/servers/gpsd/0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch
diff --git a/pkgs/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.patch b/nixpkgs/pkgs/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.patch
index 58ae754ecfb..58ae754ecfb 100644
--- a/pkgs/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.patch
+++ b/nixpkgs/pkgs/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.patch
diff --git a/pkgs/servers/gpsd/0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch b/nixpkgs/pkgs/servers/gpsd/0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch
index 3e387167d6f..3e387167d6f 100644
--- a/pkgs/servers/gpsd/0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch
+++ b/nixpkgs/pkgs/servers/gpsd/0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch
diff --git a/pkgs/servers/gpsd/0002-scons-envs-patch.patch b/nixpkgs/pkgs/servers/gpsd/0002-scons-envs-patch.patch
index fbb06db6aa3..fbb06db6aa3 100644
--- a/pkgs/servers/gpsd/0002-scons-envs-patch.patch
+++ b/nixpkgs/pkgs/servers/gpsd/0002-scons-envs-patch.patch
diff --git a/pkgs/servers/gpsd/default.nix b/nixpkgs/pkgs/servers/gpsd/default.nix
index a05b37e9d2c..a05b37e9d2c 100644
--- a/pkgs/servers/gpsd/default.nix
+++ b/nixpkgs/pkgs/servers/gpsd/default.nix
diff --git a/pkgs/servers/h2/default.nix b/nixpkgs/pkgs/servers/h2/default.nix
index ff127e705e5..ff127e705e5 100644
--- a/pkgs/servers/h2/default.nix
+++ b/nixpkgs/pkgs/servers/h2/default.nix
diff --git a/pkgs/servers/hbase/default.nix b/nixpkgs/pkgs/servers/hbase/default.nix
index 3d05933f513..3d05933f513 100644
--- a/pkgs/servers/hbase/default.nix
+++ b/nixpkgs/pkgs/servers/hbase/default.nix
diff --git a/pkgs/servers/headphones/default.nix b/nixpkgs/pkgs/servers/headphones/default.nix
index aab651d5a4a..aab651d5a4a 100644
--- a/pkgs/servers/headphones/default.nix
+++ b/nixpkgs/pkgs/servers/headphones/default.nix
diff --git a/pkgs/servers/hitch/default.nix b/nixpkgs/pkgs/servers/hitch/default.nix
index 442796b8065..442796b8065 100644
--- a/pkgs/servers/hitch/default.nix
+++ b/nixpkgs/pkgs/servers/hitch/default.nix
diff --git a/pkgs/servers/holochain-go/default.nix b/nixpkgs/pkgs/servers/holochain-go/default.nix
index 95ec267dba2..95ec267dba2 100644
--- a/pkgs/servers/holochain-go/default.nix
+++ b/nixpkgs/pkgs/servers/holochain-go/default.nix
diff --git a/pkgs/servers/holochain-go/deps.nix b/nixpkgs/pkgs/servers/holochain-go/deps.nix
index bad01c01a6b..bad01c01a6b 100644
--- a/pkgs/servers/holochain-go/deps.nix
+++ b/nixpkgs/pkgs/servers/holochain-go/deps.nix
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix
index 47d9e88999a..47d9e88999a 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix
diff --git a/pkgs/servers/home-assistant/cli.nix b/nixpkgs/pkgs/servers/home-assistant/cli.nix
index 419462dcf85..419462dcf85 100644
--- a/pkgs/servers/home-assistant/cli.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/cli.nix
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
index 0dfb69b9538..0dfb69b9538 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
diff --git a/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix
index 7d32bf9a058..7d32bf9a058 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/default.nix
diff --git a/pkgs/servers/home-assistant/esphome.nix b/nixpkgs/pkgs/servers/home-assistant/esphome.nix
index 12b36de4965..12b36de4965 100644
--- a/pkgs/servers/home-assistant/esphome.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/esphome.nix
diff --git a/pkgs/servers/home-assistant/frontend.nix b/nixpkgs/pkgs/servers/home-assistant/frontend.nix
index 75d02ed0635..75d02ed0635 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/frontend.nix
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py
index 96cf1d86050..96cf1d86050 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
index 252365098dd..252365098dd 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
index 6bad43a62f0..6bad43a62f0 100644
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch b/nixpkgs/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch
index 63b69fb142f..63b69fb142f 100644
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch
diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_ca/default.nix
index 37f2a397ae6..37f2a397ae6 100644
--- a/pkgs/servers/http/apache-modules/mod_ca/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_ca/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_crl/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_crl/default.nix
index 54c0de1c701..54c0de1c701 100644
--- a/pkgs/servers/http/apache-modules/mod_crl/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_crl/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_csr/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_csr/default.nix
index 60f97d2f361..60f97d2f361 100644
--- a/pkgs/servers/http/apache-modules/mod_csr/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_csr/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h b/nixpkgs/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h
index a2a9e0f7a18..a2a9e0f7a18 100644
--- a/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h
diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
index d681146eee5..d681146eee5 100644
--- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_evasive/default.nix
index 2b8693f7379..2b8693f7379 100644
--- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_evasive/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index a6f4f992671..a6f4f992671 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
index 6730ca16f10..6730ca16f10 100644
--- a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix
index 04746d678c5..04746d678c5 100644
--- a/pkgs/servers/http/apache-modules/mod_perl/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
index 2bcf3b1d9c2..2bcf3b1d9c2 100644
--- a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix
index 6aed1481ddf..6aed1481ddf 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_python/install.patch b/nixpkgs/pkgs/servers/http/apache-modules/mod_python/install.patch
index 29667e11ed8..29667e11ed8 100644
--- a/pkgs/servers/http/apache-modules/mod_python/install.patch
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_python/install.patch
diff --git a/pkgs/servers/http/apache-modules/mod_scep/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_scep/default.nix
index 98703659c35..98703659c35 100644
--- a/pkgs/servers/http/apache-modules/mod_scep/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_scep/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h b/nixpkgs/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h
index a2a9e0f7a18..a2a9e0f7a18 100644
--- a/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h
diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_spkac/default.nix
index 72e0d521e3b..72e0d521e3b 100644
--- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_spkac/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_tile/default.nix
index 397e0dfe0bb..397e0dfe0bb 100644
--- a/pkgs/servers/http/apache-modules/mod_tile/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_tile/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
index 139da289078..139da289078 100644
--- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index c0e4cefa40a..c0e4cefa40a 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
index 138864aec7d..138864aec7d 100644
--- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix
index 65ec2510d34..65ec2510d34 100644
--- a/pkgs/servers/http/apt-cacher-ng/default.nix
+++ b/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix
index a9d806f9de8..a9d806f9de8 100644
--- a/pkgs/servers/http/couchdb/2.0.0.nix
+++ b/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix
diff --git a/pkgs/servers/http/couchdb/default.nix b/nixpkgs/pkgs/servers/http/couchdb/default.nix
index f2e5e67dd7a..f2e5e67dd7a 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/nixpkgs/pkgs/servers/http/couchdb/default.nix
diff --git a/pkgs/servers/http/couchdb/jsapi.patch b/nixpkgs/pkgs/servers/http/couchdb/jsapi.patch
index bb7d4ca610c..bb7d4ca610c 100644
--- a/pkgs/servers/http/couchdb/jsapi.patch
+++ b/nixpkgs/pkgs/servers/http/couchdb/jsapi.patch
diff --git a/pkgs/servers/http/darkhttpd/default.nix b/nixpkgs/pkgs/servers/http/darkhttpd/default.nix
index 42de9904f90..42de9904f90 100644
--- a/pkgs/servers/http/darkhttpd/default.nix
+++ b/nixpkgs/pkgs/servers/http/darkhttpd/default.nix
diff --git a/pkgs/servers/http/gatling/default.nix b/nixpkgs/pkgs/servers/http/gatling/default.nix
index 395504e4970..395504e4970 100644
--- a/pkgs/servers/http/gatling/default.nix
+++ b/nixpkgs/pkgs/servers/http/gatling/default.nix
diff --git a/pkgs/servers/http/h2o/default.nix b/nixpkgs/pkgs/servers/http/h2o/default.nix
index d599956cfda..d599956cfda 100644
--- a/pkgs/servers/http/h2o/default.nix
+++ b/nixpkgs/pkgs/servers/http/h2o/default.nix
diff --git a/pkgs/servers/http/hiawatha/default.nix b/nixpkgs/pkgs/servers/http/hiawatha/default.nix
index 4e799774569..4e799774569 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/nixpkgs/pkgs/servers/http/hiawatha/default.nix
diff --git a/pkgs/servers/http/hyp/default.nix b/nixpkgs/pkgs/servers/http/hyp/default.nix
index 3a1eb50f05b..3a1eb50f05b 100644
--- a/pkgs/servers/http/hyp/default.nix
+++ b/nixpkgs/pkgs/servers/http/hyp/default.nix
diff --git a/pkgs/servers/http/jboss/default.nix b/nixpkgs/pkgs/servers/http/jboss/default.nix
index c5702132d28..c5702132d28 100644
--- a/pkgs/servers/http/jboss/default.nix
+++ b/nixpkgs/pkgs/servers/http/jboss/default.nix
diff --git a/pkgs/servers/http/jboss/jdbc/mysql/builder.sh b/nixpkgs/pkgs/servers/http/jboss/jdbc/mysql/builder.sh
index 6af39a0cb63..6af39a0cb63 100644
--- a/pkgs/servers/http/jboss/jdbc/mysql/builder.sh
+++ b/nixpkgs/pkgs/servers/http/jboss/jdbc/mysql/builder.sh
diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/nixpkgs/pkgs/servers/http/jboss/jdbc/mysql/default.nix
index fd2dec44c7f..fd2dec44c7f 100644
--- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix
+++ b/nixpkgs/pkgs/servers/http/jboss/jdbc/mysql/default.nix
diff --git a/pkgs/servers/http/jetty/default.nix b/nixpkgs/pkgs/servers/http/jetty/default.nix
index 4a3a3f2da01..4a3a3f2da01 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/nixpkgs/pkgs/servers/http/jetty/default.nix
diff --git a/pkgs/servers/http/lighttpd/default.nix b/nixpkgs/pkgs/servers/http/lighttpd/default.nix
index f67bc5b0045..f67bc5b0045 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/nixpkgs/pkgs/servers/http/lighttpd/default.nix
diff --git a/pkgs/servers/http/lwan/default.nix b/nixpkgs/pkgs/servers/http/lwan/default.nix
index 9cd9a6b7fec..9cd9a6b7fec 100644
--- a/pkgs/servers/http/lwan/default.nix
+++ b/nixpkgs/pkgs/servers/http/lwan/default.nix
diff --git a/pkgs/servers/http/micro-httpd/default.nix b/nixpkgs/pkgs/servers/http/micro-httpd/default.nix
index d99af7a81ae..d99af7a81ae 100644
--- a/pkgs/servers/http/micro-httpd/default.nix
+++ b/nixpkgs/pkgs/servers/http/micro-httpd/default.nix
diff --git a/pkgs/servers/http/mini-httpd/default.nix b/nixpkgs/pkgs/servers/http/mini-httpd/default.nix
index 37a0a98d4e0..37a0a98d4e0 100644
--- a/pkgs/servers/http/mini-httpd/default.nix
+++ b/nixpkgs/pkgs/servers/http/mini-httpd/default.nix
diff --git a/pkgs/servers/http/myserver/default.nix b/nixpkgs/pkgs/servers/http/myserver/default.nix
index 3c29ddb8e0a..3c29ddb8e0a 100644
--- a/pkgs/servers/http/myserver/default.nix
+++ b/nixpkgs/pkgs/servers/http/myserver/default.nix
diff --git a/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch b/nixpkgs/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch
index 31b24915c4d..31b24915c4d 100644
--- a/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch
+++ b/nixpkgs/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch
diff --git a/pkgs/servers/http/nginx/generic.nix b/nixpkgs/pkgs/servers/http/nginx/generic.nix
index 990d7c5cf13..990d7c5cf13 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/nixpkgs/pkgs/servers/http/nginx/generic.nix
diff --git a/pkgs/servers/http/nginx/mainline.nix b/nixpkgs/pkgs/servers/http/nginx/mainline.nix
index c5e0b47e238..c5e0b47e238 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/nixpkgs/pkgs/servers/http/nginx/mainline.nix
diff --git a/pkgs/servers/http/nginx/mainline.upstream b/nixpkgs/pkgs/servers/http/nginx/mainline.upstream
index 7bb02549959..7bb02549959 100644
--- a/pkgs/servers/http/nginx/mainline.upstream
+++ b/nixpkgs/pkgs/servers/http/nginx/mainline.upstream
diff --git a/pkgs/servers/http/nginx/modules.nix b/nixpkgs/pkgs/servers/http/nginx/modules.nix
index 78ad5c5582d..78ad5c5582d 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/nixpkgs/pkgs/servers/http/nginx/modules.nix
diff --git a/pkgs/servers/http/nginx/nix-etag-1.15.4.patch b/nixpkgs/pkgs/servers/http/nginx/nix-etag-1.15.4.patch
index c1473ccdb1b..c1473ccdb1b 100644
--- a/pkgs/servers/http/nginx/nix-etag-1.15.4.patch
+++ b/nixpkgs/pkgs/servers/http/nginx/nix-etag-1.15.4.patch
diff --git a/pkgs/servers/http/nginx/stable.nix b/nixpkgs/pkgs/servers/http/nginx/stable.nix
index 31aeaa6f084..31aeaa6f084 100644
--- a/pkgs/servers/http/nginx/stable.nix
+++ b/nixpkgs/pkgs/servers/http/nginx/stable.nix
diff --git a/pkgs/servers/http/nginx/stable.upstream b/nixpkgs/pkgs/servers/http/nginx/stable.upstream
index c2013901743..c2013901743 100644
--- a/pkgs/servers/http/nginx/stable.upstream
+++ b/nixpkgs/pkgs/servers/http/nginx/stable.upstream
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix
index bef7f43ea71..bef7f43ea71 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix
diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in b/nixpkgs/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in
index 13b62a8829d..13b62a8829d 100644
--- a/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in
+++ b/nixpkgs/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in
diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in b/nixpkgs/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in
index 890e68765b4..890e68765b4 100644
--- a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in
+++ b/nixpkgs/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in
diff --git a/pkgs/servers/http/openresty/default.nix b/nixpkgs/pkgs/servers/http/openresty/default.nix
index 328db9ec986..328db9ec986 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/nixpkgs/pkgs/servers/http/openresty/default.nix
diff --git a/pkgs/servers/http/pshs/default.nix b/nixpkgs/pkgs/servers/http/pshs/default.nix
index 19d0b9a2641..19d0b9a2641 100644
--- a/pkgs/servers/http/pshs/default.nix
+++ b/nixpkgs/pkgs/servers/http/pshs/default.nix
diff --git a/pkgs/servers/http/redstore/default.nix b/nixpkgs/pkgs/servers/http/redstore/default.nix
index 7d592d0256b..7d592d0256b 100644
--- a/pkgs/servers/http/redstore/default.nix
+++ b/nixpkgs/pkgs/servers/http/redstore/default.nix
diff --git a/pkgs/servers/http/showoff/Gemfile b/nixpkgs/pkgs/servers/http/showoff/Gemfile
index cfd295096bc..cfd295096bc 100644
--- a/pkgs/servers/http/showoff/Gemfile
+++ b/nixpkgs/pkgs/servers/http/showoff/Gemfile
diff --git a/pkgs/servers/http/showoff/Gemfile.lock b/nixpkgs/pkgs/servers/http/showoff/Gemfile.lock
index ccf0415d440..ccf0415d440 100644
--- a/pkgs/servers/http/showoff/Gemfile.lock
+++ b/nixpkgs/pkgs/servers/http/showoff/Gemfile.lock
diff --git a/pkgs/servers/http/showoff/default.nix b/nixpkgs/pkgs/servers/http/showoff/default.nix
index 136fcb3e07c..136fcb3e07c 100644
--- a/pkgs/servers/http/showoff/default.nix
+++ b/nixpkgs/pkgs/servers/http/showoff/default.nix
diff --git a/pkgs/servers/http/showoff/gemset.nix b/nixpkgs/pkgs/servers/http/showoff/gemset.nix
index 334f09e8a0d..334f09e8a0d 100644
--- a/pkgs/servers/http/showoff/gemset.nix
+++ b/nixpkgs/pkgs/servers/http/showoff/gemset.nix
diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/nixpkgs/pkgs/servers/http/spawn-fcgi/default.nix
index c24b0b4c1a9..c24b0b4c1a9 100644
--- a/pkgs/servers/http/spawn-fcgi/default.nix
+++ b/nixpkgs/pkgs/servers/http/spawn-fcgi/default.nix
diff --git a/pkgs/servers/http/tengine/check-resolv-conf.patch b/nixpkgs/pkgs/servers/http/tengine/check-resolv-conf.patch
index c46482b3014..c46482b3014 100644
--- a/pkgs/servers/http/tengine/check-resolv-conf.patch
+++ b/nixpkgs/pkgs/servers/http/tengine/check-resolv-conf.patch
diff --git a/pkgs/servers/http/tengine/default.nix b/nixpkgs/pkgs/servers/http/tengine/default.nix
index 1eeb5a8c4dd..1eeb5a8c4dd 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/nixpkgs/pkgs/servers/http/tengine/default.nix
diff --git a/pkgs/servers/http/thttpd/default.nix b/nixpkgs/pkgs/servers/http/thttpd/default.nix
index b72439bc37a..b72439bc37a 100644
--- a/pkgs/servers/http/thttpd/default.nix
+++ b/nixpkgs/pkgs/servers/http/thttpd/default.nix
diff --git a/pkgs/servers/http/tomcat/axis2/builder.sh b/nixpkgs/pkgs/servers/http/tomcat/axis2/builder.sh
index 2e36367e9dc..2e36367e9dc 100644
--- a/pkgs/servers/http/tomcat/axis2/builder.sh
+++ b/nixpkgs/pkgs/servers/http/tomcat/axis2/builder.sh
diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix
index 59a4ab6e5b4..59a4ab6e5b4 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix
diff --git a/pkgs/servers/http/tomcat/default.nix b/nixpkgs/pkgs/servers/http/tomcat/default.nix
index 38b4974e155..38b4974e155 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/nixpkgs/pkgs/servers/http/tomcat/default.nix
diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh b/nixpkgs/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh
index 14829c5e85d..14829c5e85d 100644
--- a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh
+++ b/nixpkgs/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh
diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/nixpkgs/pkgs/servers/http/tomcat/jdbc/mysql/default.nix
index d070a9f1740..d070a9f1740 100644
--- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix
+++ b/nixpkgs/pkgs/servers/http/tomcat/jdbc/mysql/default.nix
diff --git a/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix
index c3af0d55543..c3af0d55543 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/nixpkgs/pkgs/servers/http/unit/default.nix
diff --git a/pkgs/servers/http/unit/drop_cap.patch b/nixpkgs/pkgs/servers/http/unit/drop_cap.patch
index 87caf77904e..87caf77904e 100644
--- a/pkgs/servers/http/unit/drop_cap.patch
+++ b/nixpkgs/pkgs/servers/http/unit/drop_cap.patch
diff --git a/pkgs/servers/http/webfs/default.nix b/nixpkgs/pkgs/servers/http/webfs/default.nix
index 79c7d9e9eca..79c7d9e9eca 100644
--- a/pkgs/servers/http/webfs/default.nix
+++ b/nixpkgs/pkgs/servers/http/webfs/default.nix
diff --git a/pkgs/servers/http/webfs/ls.c.patch b/nixpkgs/pkgs/servers/http/webfs/ls.c.patch
index 78b83b72588..78b83b72588 100644
--- a/pkgs/servers/http/webfs/ls.c.patch
+++ b/nixpkgs/pkgs/servers/http/webfs/ls.c.patch
diff --git a/pkgs/servers/http/webhook/default.nix b/nixpkgs/pkgs/servers/http/webhook/default.nix
index 707b4878648..707b4878648 100644
--- a/pkgs/servers/http/webhook/default.nix
+++ b/nixpkgs/pkgs/servers/http/webhook/default.nix
diff --git a/pkgs/servers/http/yaws/default.nix b/nixpkgs/pkgs/servers/http/yaws/default.nix
index 109f7bc06dc..109f7bc06dc 100644
--- a/pkgs/servers/http/yaws/default.nix
+++ b/nixpkgs/pkgs/servers/http/yaws/default.nix
diff --git a/pkgs/servers/hydron/default.nix b/nixpkgs/pkgs/servers/hydron/default.nix
index 6ac37a98dee..6ac37a98dee 100644
--- a/pkgs/servers/hydron/default.nix
+++ b/nixpkgs/pkgs/servers/hydron/default.nix
diff --git a/pkgs/servers/hydron/deps.nix b/nixpkgs/pkgs/servers/hydron/deps.nix
index 08f165af76b..08f165af76b 100644
--- a/pkgs/servers/hydron/deps.nix
+++ b/nixpkgs/pkgs/servers/hydron/deps.nix
diff --git a/pkgs/servers/hylafaxplus/config.site b/nixpkgs/pkgs/servers/hylafaxplus/config.site
index 7c801444921..7c801444921 100644
--- a/pkgs/servers/hylafaxplus/config.site
+++ b/nixpkgs/pkgs/servers/hylafaxplus/config.site
diff --git a/pkgs/servers/hylafaxplus/default.nix b/nixpkgs/pkgs/servers/hylafaxplus/default.nix
index 828098e6de8..828098e6de8 100644
--- a/pkgs/servers/hylafaxplus/default.nix
+++ b/nixpkgs/pkgs/servers/hylafaxplus/default.nix
diff --git a/pkgs/servers/hylafaxplus/post-install-check.sh b/nixpkgs/pkgs/servers/hylafaxplus/post-install-check.sh
index 2850738edcc..2850738edcc 100644
--- a/pkgs/servers/hylafaxplus/post-install-check.sh
+++ b/nixpkgs/pkgs/servers/hylafaxplus/post-install-check.sh
diff --git a/pkgs/servers/hylafaxplus/post-install.sh b/nixpkgs/pkgs/servers/hylafaxplus/post-install.sh
index ddc7c3f85ed..ddc7c3f85ed 100644
--- a/pkgs/servers/hylafaxplus/post-install.sh
+++ b/nixpkgs/pkgs/servers/hylafaxplus/post-install.sh
diff --git a/pkgs/servers/hylafaxplus/post-patch.sh b/nixpkgs/pkgs/servers/hylafaxplus/post-patch.sh
index 6ec5937147e..6ec5937147e 100644
--- a/pkgs/servers/hylafaxplus/post-patch.sh
+++ b/nixpkgs/pkgs/servers/hylafaxplus/post-patch.sh
diff --git a/pkgs/servers/icecast/default.nix b/nixpkgs/pkgs/servers/icecast/default.nix
index 55ec611d605..55ec611d605 100644
--- a/pkgs/servers/icecast/default.nix
+++ b/nixpkgs/pkgs/servers/icecast/default.nix
diff --git a/pkgs/servers/icingaweb2/default.nix b/nixpkgs/pkgs/servers/icingaweb2/default.nix
index c4aaedf4ab6..c4aaedf4ab6 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/nixpkgs/pkgs/servers/icingaweb2/default.nix
diff --git a/pkgs/servers/icingaweb2/theme-april/default.nix b/nixpkgs/pkgs/servers/icingaweb2/theme-april/default.nix
index 7c592fca33b..7c592fca33b 100644
--- a/pkgs/servers/icingaweb2/theme-april/default.nix
+++ b/nixpkgs/pkgs/servers/icingaweb2/theme-april/default.nix
diff --git a/pkgs/servers/icingaweb2/theme-lsd/default.nix b/nixpkgs/pkgs/servers/icingaweb2/theme-lsd/default.nix
index 273bcf6945d..273bcf6945d 100644
--- a/pkgs/servers/icingaweb2/theme-lsd/default.nix
+++ b/nixpkgs/pkgs/servers/icingaweb2/theme-lsd/default.nix
diff --git a/pkgs/servers/icingaweb2/theme-particles/default.nix b/nixpkgs/pkgs/servers/icingaweb2/theme-particles/default.nix
index 3d28481cd84..3d28481cd84 100644
--- a/pkgs/servers/icingaweb2/theme-particles/default.nix
+++ b/nixpkgs/pkgs/servers/icingaweb2/theme-particles/default.nix
diff --git a/pkgs/servers/icingaweb2/theme-snow/default.nix b/nixpkgs/pkgs/servers/icingaweb2/theme-snow/default.nix
index 941138bb0a5..941138bb0a5 100644
--- a/pkgs/servers/icingaweb2/theme-snow/default.nix
+++ b/nixpkgs/pkgs/servers/icingaweb2/theme-snow/default.nix
diff --git a/pkgs/servers/icingaweb2/theme-spring/default.nix b/nixpkgs/pkgs/servers/icingaweb2/theme-spring/default.nix
index a21f6cc89a2..a21f6cc89a2 100644
--- a/pkgs/servers/icingaweb2/theme-spring/default.nix
+++ b/nixpkgs/pkgs/servers/icingaweb2/theme-spring/default.nix
diff --git a/pkgs/servers/icingaweb2/theme-unicorn/default.nix b/nixpkgs/pkgs/servers/icingaweb2/theme-unicorn/default.nix
index a43f7d7c09a..a43f7d7c09a 100644
--- a/pkgs/servers/icingaweb2/theme-unicorn/default.nix
+++ b/nixpkgs/pkgs/servers/icingaweb2/theme-unicorn/default.nix
diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix
index 8171f61c112..8171f61c112 100644
--- a/pkgs/servers/identd/nullidentdmod/default.nix
+++ b/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix
diff --git a/pkgs/servers/identd/oidentd/default.nix b/nixpkgs/pkgs/servers/identd/oidentd/default.nix
index 85d1186f525..85d1186f525 100644
--- a/pkgs/servers/identd/oidentd/default.nix
+++ b/nixpkgs/pkgs/servers/identd/oidentd/default.nix
diff --git a/pkgs/servers/interlock/default.nix b/nixpkgs/pkgs/servers/interlock/default.nix
index 9823a36d754..9823a36d754 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/nixpkgs/pkgs/servers/interlock/default.nix
diff --git a/pkgs/servers/interlock/deps.nix b/nixpkgs/pkgs/servers/interlock/deps.nix
index be5c0529573..be5c0529573 100644
--- a/pkgs/servers/interlock/deps.nix
+++ b/nixpkgs/pkgs/servers/interlock/deps.nix
diff --git a/pkgs/servers/irc/atheme/default.nix b/nixpkgs/pkgs/servers/irc/atheme/default.nix
index d7aa0610240..d7aa0610240 100644
--- a/pkgs/servers/irc/atheme/default.nix
+++ b/nixpkgs/pkgs/servers/irc/atheme/default.nix
diff --git a/pkgs/servers/irc/charybdis/default.nix b/nixpkgs/pkgs/servers/irc/charybdis/default.nix
index ecbedcfbec8..ecbedcfbec8 100644
--- a/pkgs/servers/irc/charybdis/default.nix
+++ b/nixpkgs/pkgs/servers/irc/charybdis/default.nix
diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix
index cf5b572c9eb..cf5b572c9eb 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix
diff --git a/pkgs/servers/irc/ngircd/default.nix b/nixpkgs/pkgs/servers/irc/ngircd/default.nix
index 5194ab278bf..5194ab278bf 100644
--- a/pkgs/servers/irc/ngircd/default.nix
+++ b/nixpkgs/pkgs/servers/irc/ngircd/default.nix
diff --git a/pkgs/servers/irker/default.nix b/nixpkgs/pkgs/servers/irker/default.nix
index c056a543aa1..c056a543aa1 100644
--- a/pkgs/servers/irker/default.nix
+++ b/nixpkgs/pkgs/servers/irker/default.nix
diff --git a/pkgs/servers/isso/default.nix b/nixpkgs/pkgs/servers/isso/default.nix
index 16655509958..16655509958 100644
--- a/pkgs/servers/isso/default.nix
+++ b/nixpkgs/pkgs/servers/isso/default.nix
diff --git a/pkgs/servers/jackett/default.nix b/nixpkgs/pkgs/servers/jackett/default.nix
index 9f411c69a8d..9f411c69a8d 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/nixpkgs/pkgs/servers/jackett/default.nix
diff --git a/pkgs/servers/jellyfin/default.nix b/nixpkgs/pkgs/servers/jellyfin/default.nix
index 6da342ae880..6da342ae880 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/nixpkgs/pkgs/servers/jellyfin/default.nix
diff --git a/pkgs/servers/jetbrains/youtrack.nix b/nixpkgs/pkgs/servers/jetbrains/youtrack.nix
index 2f8241e7b09..2f8241e7b09 100644
--- a/pkgs/servers/jetbrains/youtrack.nix
+++ b/nixpkgs/pkgs/servers/jetbrains/youtrack.nix
diff --git a/pkgs/servers/kippo/default.nix b/nixpkgs/pkgs/servers/kippo/default.nix
index bec8ccbbf18..bec8ccbbf18 100644
--- a/pkgs/servers/kippo/default.nix
+++ b/nixpkgs/pkgs/servers/kippo/default.nix
diff --git a/pkgs/servers/kwakd/default.nix b/nixpkgs/pkgs/servers/kwakd/default.nix
index e65e6b5ab59..e65e6b5ab59 100644
--- a/pkgs/servers/kwakd/default.nix
+++ b/nixpkgs/pkgs/servers/kwakd/default.nix
diff --git a/pkgs/servers/ldap/389/default.nix b/nixpkgs/pkgs/servers/ldap/389/default.nix
index 8de4c471e22..8de4c471e22 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/nixpkgs/pkgs/servers/ldap/389/default.nix
diff --git a/pkgs/servers/lidarr/default.nix b/nixpkgs/pkgs/servers/lidarr/default.nix
index 915e4233ebe..915e4233ebe 100644
--- a/pkgs/servers/lidarr/default.nix
+++ b/nixpkgs/pkgs/servers/lidarr/default.nix
diff --git a/pkgs/servers/limesurvey/default.nix b/nixpkgs/pkgs/servers/limesurvey/default.nix
index 21863018087..21863018087 100644
--- a/pkgs/servers/limesurvey/default.nix
+++ b/nixpkgs/pkgs/servers/limesurvey/default.nix
diff --git a/pkgs/servers/livepeer/default.nix b/nixpkgs/pkgs/servers/livepeer/default.nix
index 64edcb2ef4f..64edcb2ef4f 100644
--- a/pkgs/servers/livepeer/default.nix
+++ b/nixpkgs/pkgs/servers/livepeer/default.nix
diff --git a/pkgs/servers/livepeer/deps.nix b/nixpkgs/pkgs/servers/livepeer/deps.nix
index 297d0724a49..297d0724a49 100644
--- a/pkgs/servers/livepeer/deps.nix
+++ b/nixpkgs/pkgs/servers/livepeer/deps.nix
diff --git a/pkgs/servers/ma1sd/0001-gradle.patch b/nixpkgs/pkgs/servers/ma1sd/0001-gradle.patch
index 0980ec9a5df..0980ec9a5df 100644
--- a/pkgs/servers/ma1sd/0001-gradle.patch
+++ b/nixpkgs/pkgs/servers/ma1sd/0001-gradle.patch
diff --git a/pkgs/servers/ma1sd/default.nix b/nixpkgs/pkgs/servers/ma1sd/default.nix
index f35bc3bb302..f35bc3bb302 100644
--- a/pkgs/servers/ma1sd/default.nix
+++ b/nixpkgs/pkgs/servers/ma1sd/default.nix
diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix
index 55cc4c121f0..55cc4c121f0 100644
--- a/pkgs/servers/mail/archiveopteryx/default.nix
+++ b/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix
diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/nixpkgs/pkgs/servers/mail/clamsmtp/default.nix
index 7214c08d242..7214c08d242 100644
--- a/pkgs/servers/mail/clamsmtp/default.nix
+++ b/nixpkgs/pkgs/servers/mail/clamsmtp/default.nix
diff --git a/pkgs/servers/mail/clamsmtp/header-order.patch b/nixpkgs/pkgs/servers/mail/clamsmtp/header-order.patch
index 102ae0a471d..102ae0a471d 100644
--- a/pkgs/servers/mail/clamsmtp/header-order.patch
+++ b/nixpkgs/pkgs/servers/mail/clamsmtp/header-order.patch
diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix
index d4bfd3c6ca5..d4bfd3c6ca5 100644
--- a/pkgs/servers/mail/dkimproxy/default.nix
+++ b/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix
diff --git a/pkgs/servers/mail/dovecot/2.3.x-module_dir.patch b/nixpkgs/pkgs/servers/mail/dovecot/2.3.x-module_dir.patch
index 0f987b44d8a..0f987b44d8a 100644
--- a/pkgs/servers/mail/dovecot/2.3.x-module_dir.patch
+++ b/nixpkgs/pkgs/servers/mail/dovecot/2.3.x-module_dir.patch
diff --git a/pkgs/servers/mail/dovecot/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/default.nix
index 3aff9f53ce7..3aff9f53ce7 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/nixpkgs/pkgs/servers/mail/dovecot/default.nix
diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index 71a5c20dea3..71a5c20dea3 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
diff --git a/pkgs/servers/mail/dspam/default.nix b/nixpkgs/pkgs/servers/mail/dspam/default.nix
index 44e2223960a..44e2223960a 100644
--- a/pkgs/servers/mail/dspam/default.nix
+++ b/nixpkgs/pkgs/servers/mail/dspam/default.nix
diff --git a/pkgs/servers/mail/exim/default.nix b/nixpkgs/pkgs/servers/mail/exim/default.nix
index dd4d1850b59..dd4d1850b59 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/nixpkgs/pkgs/servers/mail/exim/default.nix
diff --git a/pkgs/servers/mail/freepops/default.nix b/nixpkgs/pkgs/servers/mail/freepops/default.nix
index b4f671862f8..b4f671862f8 100644
--- a/pkgs/servers/mail/freepops/default.nix
+++ b/nixpkgs/pkgs/servers/mail/freepops/default.nix
diff --git a/pkgs/servers/mail/mailhog/default.nix b/nixpkgs/pkgs/servers/mail/mailhog/default.nix
index 429d735ffcd..429d735ffcd 100644
--- a/pkgs/servers/mail/mailhog/default.nix
+++ b/nixpkgs/pkgs/servers/mail/mailhog/default.nix
diff --git a/pkgs/servers/mail/mailhog/deps.nix b/nixpkgs/pkgs/servers/mail/mailhog/deps.nix
index 9967c3a549a..9967c3a549a 100644
--- a/pkgs/servers/mail/mailhog/deps.nix
+++ b/nixpkgs/pkgs/servers/mail/mailhog/deps.nix
diff --git a/pkgs/servers/mail/mailman/default.nix b/nixpkgs/pkgs/servers/mail/mailman/default.nix
index d6b73aea3da..d6b73aea3da 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/nixpkgs/pkgs/servers/mail/mailman/default.nix
diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix
index 57c1b355bf2..57c1b355bf2 100644
--- a/pkgs/servers/mail/mailman/hyperkitty.nix
+++ b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix
diff --git a/pkgs/servers/mail/mailman/postorius.nix b/nixpkgs/pkgs/servers/mail/mailman/postorius.nix
index bcb92051fc8..bcb92051fc8 100644
--- a/pkgs/servers/mail/mailman/postorius.nix
+++ b/nixpkgs/pkgs/servers/mail/mailman/postorius.nix
diff --git a/pkgs/servers/mail/mailman/web.nix b/nixpkgs/pkgs/servers/mail/mailman/web.nix
index 408840c3f93..408840c3f93 100644
--- a/pkgs/servers/mail/mailman/web.nix
+++ b/nixpkgs/pkgs/servers/mail/mailman/web.nix
diff --git a/pkgs/servers/mail/mailman/wrapped.nix b/nixpkgs/pkgs/servers/mail/mailman/wrapped.nix
index 2a620763d87..2a620763d87 100644
--- a/pkgs/servers/mail/mailman/wrapped.nix
+++ b/nixpkgs/pkgs/servers/mail/mailman/wrapped.nix
diff --git a/pkgs/servers/mail/mlmmj/default.nix b/nixpkgs/pkgs/servers/mail/mlmmj/default.nix
index 2c1c07e502a..2c1c07e502a 100644
--- a/pkgs/servers/mail/mlmmj/default.nix
+++ b/nixpkgs/pkgs/servers/mail/mlmmj/default.nix
diff --git a/pkgs/servers/mail/nullmailer/default.nix b/nixpkgs/pkgs/servers/mail/nullmailer/default.nix
index 7738c4eb3d4..7738c4eb3d4 100644
--- a/pkgs/servers/mail/nullmailer/default.nix
+++ b/nixpkgs/pkgs/servers/mail/nullmailer/default.nix
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix
index 48e2666c580..48e2666c580 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix
index 14d36ad6554..14d36ad6554 100644
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix
diff --git a/pkgs/servers/mail/opensmtpd/proc_path.diff b/nixpkgs/pkgs/servers/mail/opensmtpd/proc_path.diff
index 5e1cfd00429..5e1cfd00429 100644
--- a/pkgs/servers/mail/opensmtpd/proc_path.diff
+++ b/nixpkgs/pkgs/servers/mail/opensmtpd/proc_path.diff
diff --git a/pkgs/servers/mail/petidomo/default.nix b/nixpkgs/pkgs/servers/mail/petidomo/default.nix
index c97d8e4ccf3..c97d8e4ccf3 100644
--- a/pkgs/servers/mail/petidomo/default.nix
+++ b/nixpkgs/pkgs/servers/mail/petidomo/default.nix
diff --git a/pkgs/servers/mail/popa3d/default.nix b/nixpkgs/pkgs/servers/mail/popa3d/default.nix
index e14b62a8597..e14b62a8597 100644
--- a/pkgs/servers/mail/popa3d/default.nix
+++ b/nixpkgs/pkgs/servers/mail/popa3d/default.nix
diff --git a/pkgs/servers/mail/popa3d/enable-standalone-mode.patch b/nixpkgs/pkgs/servers/mail/popa3d/enable-standalone-mode.patch
index 763ede102f2..763ede102f2 100644
--- a/pkgs/servers/mail/popa3d/enable-standalone-mode.patch
+++ b/nixpkgs/pkgs/servers/mail/popa3d/enable-standalone-mode.patch
diff --git a/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch b/nixpkgs/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch
index 4f440ae5966..4f440ae5966 100644
--- a/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch
+++ b/nixpkgs/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch
diff --git a/pkgs/servers/mail/popa3d/use-glibc-crypt.patch b/nixpkgs/pkgs/servers/mail/popa3d/use-glibc-crypt.patch
index 35843a38bb3..35843a38bb3 100644
--- a/pkgs/servers/mail/popa3d/use-glibc-crypt.patch
+++ b/nixpkgs/pkgs/servers/mail/popa3d/use-glibc-crypt.patch
diff --git a/pkgs/servers/mail/popa3d/use-openssl.patch b/nixpkgs/pkgs/servers/mail/popa3d/use-openssl.patch
index 54301dd873b..54301dd873b 100644
--- a/pkgs/servers/mail/popa3d/use-openssl.patch
+++ b/nixpkgs/pkgs/servers/mail/popa3d/use-openssl.patch
diff --git a/pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch b/nixpkgs/pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch
index 5de22573ea3..5de22573ea3 100644
--- a/pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch
+++ b/nixpkgs/pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch
diff --git a/pkgs/servers/mail/postfix/default.nix b/nixpkgs/pkgs/servers/mail/postfix/default.nix
index c0e6252a551..c0e6252a551 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/nixpkgs/pkgs/servers/mail/postfix/default.nix
diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix
index 9fb441a92de..9fb441a92de 100644
--- a/pkgs/servers/mail/postfix/pfixtools.nix
+++ b/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix
diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix
index 8f85bc5f6d6..8f85bc5f6d6 100644
--- a/pkgs/servers/mail/postfix/pflogsumm.nix
+++ b/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix
diff --git a/pkgs/servers/mail/postfix/post-install-script.patch b/nixpkgs/pkgs/servers/mail/postfix/post-install-script.patch
index 350fbf929b7..350fbf929b7 100644
--- a/pkgs/servers/mail/postfix/post-install-script.patch
+++ b/nixpkgs/pkgs/servers/mail/postfix/post-install-script.patch
diff --git a/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch b/nixpkgs/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch
index d93eaf0aaa0..d93eaf0aaa0 100644
--- a/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch
+++ b/nixpkgs/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch
diff --git a/pkgs/servers/mail/postfix/postfix-script-shell.patch b/nixpkgs/pkgs/servers/mail/postfix/postfix-script-shell.patch
index 4f5d2f61111..4f5d2f61111 100644
--- a/pkgs/servers/mail/postfix/postfix-script-shell.patch
+++ b/nixpkgs/pkgs/servers/mail/postfix/postfix-script-shell.patch
diff --git a/pkgs/servers/mail/postfix/relative-symlinks.patch b/nixpkgs/pkgs/servers/mail/postfix/relative-symlinks.patch
index f7a2078c034..f7a2078c034 100644
--- a/pkgs/servers/mail/postfix/relative-symlinks.patch
+++ b/nixpkgs/pkgs/servers/mail/postfix/relative-symlinks.patch
diff --git a/pkgs/servers/mail/postgrey/default.nix b/nixpkgs/pkgs/servers/mail/postgrey/default.nix
index 0abfc00fdd6..0abfc00fdd6 100644
--- a/pkgs/servers/mail/postgrey/default.nix
+++ b/nixpkgs/pkgs/servers/mail/postgrey/default.nix
diff --git a/pkgs/servers/mail/postsrsd/default.nix b/nixpkgs/pkgs/servers/mail/postsrsd/default.nix
index 49854927e57..49854927e57 100644
--- a/pkgs/servers/mail/postsrsd/default.nix
+++ b/nixpkgs/pkgs/servers/mail/postsrsd/default.nix
diff --git a/pkgs/servers/mail/public-inbox/0002-msgtime-drop-Date-Parse-for-RFC2822.patch b/nixpkgs/pkgs/servers/mail/public-inbox/0002-msgtime-drop-Date-Parse-for-RFC2822.patch
index ebc9a6f2237..ebc9a6f2237 100644
--- a/pkgs/servers/mail/public-inbox/0002-msgtime-drop-Date-Parse-for-RFC2822.patch
+++ b/nixpkgs/pkgs/servers/mail/public-inbox/0002-msgtime-drop-Date-Parse-for-RFC2822.patch
diff --git a/pkgs/servers/mail/public-inbox/default.nix b/nixpkgs/pkgs/servers/mail/public-inbox/default.nix
index affcb0e8b23..affcb0e8b23 100644
--- a/pkgs/servers/mail/public-inbox/default.nix
+++ b/nixpkgs/pkgs/servers/mail/public-inbox/default.nix
diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix
index 5da94ca8026..5da94ca8026 100644
--- a/pkgs/servers/mail/pypolicyd-spf/default.nix
+++ b/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix
diff --git a/pkgs/servers/mail/rmilter/default.nix b/nixpkgs/pkgs/servers/mail/rmilter/default.nix
index 9d7730e399f..9d7730e399f 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/nixpkgs/pkgs/servers/mail/rmilter/default.nix
diff --git a/pkgs/servers/mail/rspamd/default.nix b/nixpkgs/pkgs/servers/mail/rspamd/default.nix
index 0823ed2fe4b..0823ed2fe4b 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/nixpkgs/pkgs/servers/mail/rspamd/default.nix
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
index 6980dca9403..6980dca9403 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
diff --git a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch b/nixpkgs/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch
index bac048892fe..bac048892fe 100644
--- a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch
+++ b/nixpkgs/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch
diff --git a/pkgs/servers/mail/system-sendmail/default.nix b/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix
index 7bd7df84924..7bd7df84924 100644
--- a/pkgs/servers/mail/system-sendmail/default.nix
+++ b/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix
diff --git a/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix
index 295881b03a3..295881b03a3 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix
diff --git a/pkgs/servers/matrix-synapse/homeserver-script.patch b/nixpkgs/pkgs/servers/matrix-synapse/homeserver-script.patch
index 554a2c5f66c..554a2c5f66c 100644
--- a/pkgs/servers/matrix-synapse/homeserver-script.patch
+++ b/nixpkgs/pkgs/servers/matrix-synapse/homeserver-script.patch
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
index f4b89981d69..f4b89981d69 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
+++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
index bf93cae5bc2..bf93cae5bc2 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
+++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
index 8fe405e1b3e..8fe405e1b3e 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
+++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
index d46e3d75f02..d46e3d75f02 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
+++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
index 87dada8f027..87dada8f027 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
+++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
diff --git a/pkgs/servers/matterbridge/default.nix b/nixpkgs/pkgs/servers/matterbridge/default.nix
index 2226d960581..2226d960581 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/nixpkgs/pkgs/servers/matterbridge/default.nix
diff --git a/pkgs/servers/mattermost/default.nix b/nixpkgs/pkgs/servers/mattermost/default.nix
index 2919647e573..2919647e573 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/nixpkgs/pkgs/servers/mattermost/default.nix
diff --git a/pkgs/servers/mattermost/matterircd.nix b/nixpkgs/pkgs/servers/mattermost/matterircd.nix
index bb6d1584a67..bb6d1584a67 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/nixpkgs/pkgs/servers/mattermost/matterircd.nix
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/nixpkgs/pkgs/servers/mautrix-telegram/default.nix
index 5089acc2a0f..5089acc2a0f 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/nixpkgs/pkgs/servers/mautrix-telegram/default.nix
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix
index bb72ce1b45f..bb72ce1b45f 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix
diff --git a/pkgs/servers/mediatomb/default.nix b/nixpkgs/pkgs/servers/mediatomb/default.nix
index 33151c4063b..33151c4063b 100644
--- a/pkgs/servers/mediatomb/default.nix
+++ b/nixpkgs/pkgs/servers/mediatomb/default.nix
diff --git a/pkgs/servers/meguca/default.nix b/nixpkgs/pkgs/servers/meguca/default.nix
index 47530ba9db6..47530ba9db6 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/nixpkgs/pkgs/servers/meguca/default.nix
diff --git a/pkgs/servers/meguca/server_deps.nix b/nixpkgs/pkgs/servers/meguca/server_deps.nix
index bff9d5624e8..bff9d5624e8 100644
--- a/pkgs/servers/meguca/server_deps.nix
+++ b/nixpkgs/pkgs/servers/meguca/server_deps.nix
diff --git a/pkgs/servers/memcached/default.nix b/nixpkgs/pkgs/servers/memcached/default.nix
index 004822b906c..004822b906c 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/nixpkgs/pkgs/servers/memcached/default.nix
diff --git a/pkgs/servers/mesos-dns/default.nix b/nixpkgs/pkgs/servers/mesos-dns/default.nix
index 8430f2d61e8..8430f2d61e8 100644
--- a/pkgs/servers/mesos-dns/default.nix
+++ b/nixpkgs/pkgs/servers/mesos-dns/default.nix
diff --git a/pkgs/servers/mesos-dns/deps.nix b/nixpkgs/pkgs/servers/mesos-dns/deps.nix
index 00f0f245f6b..00f0f245f6b 100644
--- a/pkgs/servers/mesos-dns/deps.nix
+++ b/nixpkgs/pkgs/servers/mesos-dns/deps.nix
diff --git a/pkgs/servers/metabase/default.nix b/nixpkgs/pkgs/servers/metabase/default.nix
index 69a92942f5c..69a92942f5c 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/nixpkgs/pkgs/servers/metabase/default.nix
diff --git a/pkgs/servers/meteor/default.nix b/nixpkgs/pkgs/servers/meteor/default.nix
index c2f0ffa59b9..c2f0ffa59b9 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/nixpkgs/pkgs/servers/meteor/default.nix
diff --git a/pkgs/servers/meteor/main.patch b/nixpkgs/pkgs/servers/meteor/main.patch
index 3282c91abac..3282c91abac 100644
--- a/pkgs/servers/meteor/main.patch
+++ b/nixpkgs/pkgs/servers/meteor/main.patch
diff --git a/pkgs/servers/miniflux/default.nix b/nixpkgs/pkgs/servers/miniflux/default.nix
index dd06c358358..dd06c358358 100644
--- a/pkgs/servers/miniflux/default.nix
+++ b/nixpkgs/pkgs/servers/miniflux/default.nix
diff --git a/pkgs/servers/minio/default.nix b/nixpkgs/pkgs/servers/minio/default.nix
index e1f4d16b0b8..e1f4d16b0b8 100644
--- a/pkgs/servers/minio/default.nix
+++ b/nixpkgs/pkgs/servers/minio/default.nix
diff --git a/pkgs/servers/mirrorbits/default.nix b/nixpkgs/pkgs/servers/mirrorbits/default.nix
index 0761468bd1f..0761468bd1f 100644
--- a/pkgs/servers/mirrorbits/default.nix
+++ b/nixpkgs/pkgs/servers/mirrorbits/default.nix
diff --git a/pkgs/servers/mirrorbits/deps.nix b/nixpkgs/pkgs/servers/mirrorbits/deps.nix
index 37365412661..37365412661 100644
--- a/pkgs/servers/mirrorbits/deps.nix
+++ b/nixpkgs/pkgs/servers/mirrorbits/deps.nix
diff --git a/pkgs/servers/misc/airsonic/default.nix b/nixpkgs/pkgs/servers/misc/airsonic/default.nix
index d8501878435..d8501878435 100644
--- a/pkgs/servers/misc/airsonic/default.nix
+++ b/nixpkgs/pkgs/servers/misc/airsonic/default.nix
diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/nixpkgs/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
index ec1f82507ce..ec1f82507ce 100644
--- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
+++ b/nixpkgs/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
diff --git a/pkgs/servers/misc/client-ip-echo/default.nix b/nixpkgs/pkgs/servers/misc/client-ip-echo/default.nix
index 5bc0ea45e2b..5bc0ea45e2b 100644
--- a/pkgs/servers/misc/client-ip-echo/default.nix
+++ b/nixpkgs/pkgs/servers/misc/client-ip-echo/default.nix
diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix
index ddf69d10968..ddf69d10968 100644
--- a/pkgs/servers/misc/qremotecontrol-server/default.nix
+++ b/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix
diff --git a/pkgs/servers/misc/subsonic/default.nix b/nixpkgs/pkgs/servers/misc/subsonic/default.nix
index a7041fc57d0..a7041fc57d0 100644
--- a/pkgs/servers/misc/subsonic/default.nix
+++ b/nixpkgs/pkgs/servers/misc/subsonic/default.nix
diff --git a/pkgs/servers/misc/taskserver/default.nix b/nixpkgs/pkgs/servers/misc/taskserver/default.nix
index 0ab921a6f6f..0ab921a6f6f 100644
--- a/pkgs/servers/misc/taskserver/default.nix
+++ b/nixpkgs/pkgs/servers/misc/taskserver/default.nix
diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix
index 8677a8d03f2..8677a8d03f2 100644
--- a/pkgs/servers/monitoring/alertmanager-bot/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix
diff --git a/pkgs/servers/monitoring/alertmanager-bot/deps.nix b/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/deps.nix
index 51e98ccbc93..51e98ccbc93 100644
--- a/pkgs/servers/monitoring/alertmanager-bot/deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/deps.nix
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/nixpkgs/pkgs/servers/monitoring/bosun/default.nix
index 957bb59b121..957bb59b121 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/bosun/default.nix
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix
index aa4db2239f0..aa4db2239f0 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix
index cafccfeb8f2..cafccfeb8f2 100644
--- a/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix
diff --git a/pkgs/servers/monitoring/consul-alerts/deps.nix b/nixpkgs/pkgs/servers/monitoring/consul-alerts/deps.nix
index 6494dc61a87..6494dc61a87 100644
--- a/pkgs/servers/monitoring/consul-alerts/deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/consul-alerts/deps.nix
diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix
index 572535b7fcd..572535b7fcd 100644
--- a/pkgs/servers/monitoring/do-agent/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix
diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix
index 27e3cfdab9d..27e3cfdab9d 100644
--- a/pkgs/servers/monitoring/fusion-inventory/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix
diff --git a/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch
index b360f418aa0..b360f418aa0 100644
--- a/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch
+++ b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch
diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix
index 502ff10b092..502ff10b092 100644
--- a/pkgs/servers/monitoring/grafana-reporter/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
index 1148f6ca25e..1148f6ca25e 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
diff --git a/pkgs/servers/monitoring/heapster/default.nix b/nixpkgs/pkgs/servers/monitoring/heapster/default.nix
index 39c04857638..39c04857638 100644
--- a/pkgs/servers/monitoring/heapster/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/heapster/default.nix
diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix
index f33a418fe5c..f33a418fe5c 100644
--- a/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix
diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix
index cc67bdfa56d..cc67bdfa56d 100644
--- a/pkgs/servers/monitoring/lcdproc/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix
diff --git a/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch b/nixpkgs/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch
index 33c4b8e83b2..33c4b8e83b2 100644
--- a/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch
+++ b/nixpkgs/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch
diff --git a/pkgs/servers/monitoring/loki/default.nix b/nixpkgs/pkgs/servers/monitoring/loki/default.nix
index b5e63a3aed4..b5e63a3aed4 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/loki/default.nix
diff --git a/pkgs/servers/monitoring/longview/default.nix b/nixpkgs/pkgs/servers/monitoring/longview/default.nix
index 5459d58ceb9..5459d58ceb9 100644
--- a/pkgs/servers/monitoring/longview/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/longview/default.nix
diff --git a/pkgs/servers/monitoring/longview/log-stdout.patch b/nixpkgs/pkgs/servers/monitoring/longview/log-stdout.patch
index 3e009254bca..3e009254bca 100644
--- a/pkgs/servers/monitoring/longview/log-stdout.patch
+++ b/nixpkgs/pkgs/servers/monitoring/longview/log-stdout.patch
diff --git a/pkgs/servers/monitoring/mtail/default.nix b/nixpkgs/pkgs/servers/monitoring/mtail/default.nix
index 31a6501ea3a..31a6501ea3a 100644
--- a/pkgs/servers/monitoring/mtail/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/mtail/default.nix
diff --git a/pkgs/servers/monitoring/mtail/deps.nix b/nixpkgs/pkgs/servers/monitoring/mtail/deps.nix
index 6de3c8b6e13..6de3c8b6e13 100644
--- a/pkgs/servers/monitoring/mtail/deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/mtail/deps.nix
diff --git a/pkgs/servers/monitoring/mtail/fix-gopath.patch b/nixpkgs/pkgs/servers/monitoring/mtail/fix-gopath.patch
index 9421d194a9e..9421d194a9e 100644
--- a/pkgs/servers/monitoring/mtail/fix-gopath.patch
+++ b/nixpkgs/pkgs/servers/monitoring/mtail/fix-gopath.patch
diff --git a/pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch b/nixpkgs/pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch
index 6e14d613703..6e14d613703 100644
--- a/pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch
+++ b/nixpkgs/pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch
diff --git a/pkgs/servers/monitoring/munin/adding_servicedir_munin-node.patch b/nixpkgs/pkgs/servers/monitoring/munin/adding_servicedir_munin-node.patch
index 856f3d73011..856f3d73011 100644
--- a/pkgs/servers/monitoring/munin/adding_servicedir_munin-node.patch
+++ b/nixpkgs/pkgs/servers/monitoring/munin/adding_servicedir_munin-node.patch
diff --git a/pkgs/servers/monitoring/munin/default.nix b/nixpkgs/pkgs/servers/monitoring/munin/default.nix
index 46e1460d795..46e1460d795 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/munin/default.nix
diff --git a/pkgs/servers/monitoring/munin/dont_preserve_source_dir_permissions.patch b/nixpkgs/pkgs/servers/monitoring/munin/dont_preserve_source_dir_permissions.patch
index 78eac728305..78eac728305 100644
--- a/pkgs/servers/monitoring/munin/dont_preserve_source_dir_permissions.patch
+++ b/nixpkgs/pkgs/servers/monitoring/munin/dont_preserve_source_dir_permissions.patch
diff --git a/pkgs/servers/monitoring/munin/preserve_environment.patch b/nixpkgs/pkgs/servers/monitoring/munin/preserve_environment.patch
index ef66f48ecb4..ef66f48ecb4 100644
--- a/pkgs/servers/monitoring/munin/preserve_environment.patch
+++ b/nixpkgs/pkgs/servers/monitoring/munin/preserve_environment.patch
diff --git a/pkgs/servers/monitoring/nagios/default.nix b/nixpkgs/pkgs/servers/monitoring/nagios/default.nix
index 006d91ef74e..006d91ef74e 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/nagios/default.nix
diff --git a/pkgs/servers/monitoring/nagios/nagios.patch b/nixpkgs/pkgs/servers/monitoring/nagios/nagios.patch
index cec4c4942b5..cec4c4942b5 100644
--- a/pkgs/servers/monitoring/nagios/nagios.patch
+++ b/nixpkgs/pkgs/servers/monitoring/nagios/nagios.patch
diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index 35d02a5f9e2..35d02a5f9e2 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
diff --git a/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix b/nixpkgs/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix
index 62f6bc96a52..62f6bc96a52 100644
--- a/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix
+++ b/nixpkgs/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix
diff --git a/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch b/nixpkgs/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch
index 0ebb1751d6b..0ebb1751d6b 100644
--- a/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch
+++ b/nixpkgs/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch
diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix
index ed2abbc7fc8..ed2abbc7fc8 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix
diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/nixpkgs/pkgs/servers/monitoring/newrelic-sysmond/default.nix
index 2dc1bdf9681..2dc1bdf9681 100644
--- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/newrelic-sysmond/default.nix
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/nixpkgs/pkgs/servers/monitoring/plugins/default.nix
index f72fa16cd12..f72fa16cd12 100644
--- a/pkgs/servers/monitoring/plugins/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/default.nix
diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/nixpkgs/pkgs/servers/monitoring/plugins/esxi.nix
index dfa13c805e5..dfa13c805e5 100644
--- a/pkgs/servers/monitoring/plugins/esxi.nix
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/esxi.nix
diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/nixpkgs/pkgs/servers/monitoring/plugins/labs_consol_de.nix
index a703c80b61a..a703c80b61a 100644
--- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/labs_consol_de.nix
diff --git a/pkgs/servers/monitoring/plugins/openvpn.nix b/nixpkgs/pkgs/servers/monitoring/plugins/openvpn.nix
index 2b7e69ab8f0..2b7e69ab8f0 100644
--- a/pkgs/servers/monitoring/plugins/openvpn.nix
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/openvpn.nix
diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix
index 9b4f3144a37..9b4f3144a37 100644
--- a/pkgs/servers/monitoring/plugins/uptime.nix
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix
diff --git a/pkgs/servers/monitoring/plugins/wmic-bin.nix b/nixpkgs/pkgs/servers/monitoring/plugins/wmic-bin.nix
index c8f4eb77c46..c8f4eb77c46 100644
--- a/pkgs/servers/monitoring/plugins/wmic-bin.nix
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/wmic-bin.nix
diff --git a/pkgs/servers/monitoring/plugins/wmiplus/default.nix b/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/default.nix
index 9a4e5d706e9..9a4e5d706e9 100644
--- a/pkgs/servers/monitoring/plugins/wmiplus/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/default.nix
diff --git a/pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch b/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch
index 16e81d1014d..16e81d1014d 100644
--- a/pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 5ad5cfc0613..5ad5cfc0613 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix
diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
index c1d7f792830..c1d7f792830 100644
--- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix
index 3950ae89bf2..3950ae89bf2 100644
--- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
index 21c469694c8..21c469694c8 100644
--- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix
index 5ca160cb16f..5ca160cb16f 100644
--- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix
index 07c8a14ce0b..07c8a14ce0b 100644
--- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index b44ebd35e9a..b44ebd35e9a 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index ce4bacfc9b7..ce4bacfc9b7 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix
index aaee2e8d770..aaee2e8d770 100644
--- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/cups-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/cups-exporter.nix
index 9ba73b3d210..9ba73b3d210 100644
--- a/pkgs/servers/monitoring/prometheus/cups-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/cups-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix
index d772d9935bc..d772d9935bc 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix
diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
index c8013e6bc15..c8013e6bc15 100644
--- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix
index d94aad82148..d94aad82148 100644
--- a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
index 479ff174d11..479ff174d11 100644
--- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix
index 2d94ffeba26..2d94ffeba26 100644
--- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
index 95b0db7dbc6..95b0db7dbc6 100644
--- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
index 06eba474c99..06eba474c99 100644
--- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix
index d439c9aab10..d439c9aab10 100644
--- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index 4a84db38f78..4a84db38f78 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix
index ca1dc83e96a..ca1dc83e96a 100644
--- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix
diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix
index 4d92532c90e..4d92532c90e 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix
index 9416125bc0c..9416125bc0c 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix
index 1e29eefba2b..1e29eefba2b 100644
--- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter_deps.nix
index 221f179940b..221f179940b 100644
--- a/pkgs/servers/monitoring/prometheus/mail-exporter_deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter_deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
index 04fbc7fbed9..04fbc7fbed9 100644
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix
index e8fdcc95da2..e8fdcc95da2 100644
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
index 7d460773802..7d460773802 100644
--- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix
index 1993975e2bf..1993975e2bf 100644
--- a/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index f5c438a87dc..f5c438a87dc 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter-deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter-deps.nix
index bca32bdeccf..bca32bdeccf 100644
--- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter-deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter-deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
index f3211280f7d..f3211280f7d 100644
--- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index ce3ed9ab9d6..ce3ed9ab9d6 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
index 68bac5c560e..68bac5c560e 100644
--- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter_deps.nix
index 3051258a636..3051258a636 100644
--- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter_deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter_deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 857a7667c13..857a7667c13 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix
index 93aae1b867e..93aae1b867e 100644
--- a/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
index 5d62ff8c50f..5d62ff8c50f 100644
--- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
index 07bedaba9f3..07bedaba9f3 100644
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
index 8202a8c8c29..8202a8c8c29 100644
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
index e8af00b277b..e8af00b277b 100644
--- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix
index a29ab649633..a29ab649633 100644
--- a/pkgs/servers/monitoring/prometheus/process-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix
index c8880119207..c8880119207 100644
--- a/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix
index c101e55bc87..c101e55bc87 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix
diff --git a/pkgs/servers/monitoring/prometheus/prom2json_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json_deps.nix
index 20cabe3d385..20cabe3d385 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json_deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json_deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 48afc610c61..48afc610c61 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix
diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
index c6af09743ce..c6af09743ce 100644
--- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix
index 7a15a6a7b68..7a15a6a7b68 100644
--- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index f3dfccee3bc..f3dfccee3bc 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
index f4aa8344f77..f4aa8344f77 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
index 07b5055831e..07b5055831e 100644
--- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/tor-exporter.nix
index ef971ce0474..ef971ce0474 100644
--- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/tor-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
index 5682c3ccd2a..5682c3ccd2a 100644
--- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
diff --git a/pkgs/servers/monitoring/prometheus/update-webui-deps.sh b/nixpkgs/pkgs/servers/monitoring/prometheus/update-webui-deps.sh
index 812f6d5d9cf..812f6d5d9cf 100755
--- a/pkgs/servers/monitoring/prometheus/update-webui-deps.sh
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/update-webui-deps.sh
diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
index d7767567195..d7767567195 100644
--- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
diff --git a/pkgs/servers/monitoring/prometheus/webui-package.json b/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json
index 1a96845d15e..1a96845d15e 100644
--- a/pkgs/servers/monitoring/prometheus/webui-package.json
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json
diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
index 3cc45a2f691..3cc45a2f691 100644
--- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 7b92fc98e28..7b92fc98e28 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile b/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile
index 9abae119ca8..9abae119ca8 100644
--- a/pkgs/servers/monitoring/riemann-dash/Gemfile
+++ b/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile
diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
index ed780f6ce4b..ed780f6ce4b 100644
--- a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
+++ b/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
diff --git a/pkgs/servers/monitoring/riemann-dash/default.nix b/nixpkgs/pkgs/servers/monitoring/riemann-dash/default.nix
index 943fa0af63f..943fa0af63f 100644
--- a/pkgs/servers/monitoring/riemann-dash/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/riemann-dash/default.nix
diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/nixpkgs/pkgs/servers/monitoring/riemann-dash/gemset.nix
index f2446be79f6..f2446be79f6 100644
--- a/pkgs/servers/monitoring/riemann-dash/gemset.nix
+++ b/nixpkgs/pkgs/servers/monitoring/riemann-dash/gemset.nix
diff --git a/pkgs/servers/monitoring/riemann/default.nix b/nixpkgs/pkgs/servers/monitoring/riemann/default.nix
index 295a7592880..295a7592880 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/riemann/default.nix
diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix
index a4e2b1eb313..a4e2b1eb313 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix
diff --git a/pkgs/servers/monitoring/sensu/Gemfile b/nixpkgs/pkgs/servers/monitoring/sensu/Gemfile
index 3f570024feb..3f570024feb 100644
--- a/pkgs/servers/monitoring/sensu/Gemfile
+++ b/nixpkgs/pkgs/servers/monitoring/sensu/Gemfile
diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/nixpkgs/pkgs/servers/monitoring/sensu/Gemfile.lock
index 2d0b31e999f..2d0b31e999f 100644
--- a/pkgs/servers/monitoring/sensu/Gemfile.lock
+++ b/nixpkgs/pkgs/servers/monitoring/sensu/Gemfile.lock
diff --git a/pkgs/servers/monitoring/sensu/default.nix b/nixpkgs/pkgs/servers/monitoring/sensu/default.nix
index 82c52b18d40..82c52b18d40 100644
--- a/pkgs/servers/monitoring/sensu/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/sensu/default.nix
diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/nixpkgs/pkgs/servers/monitoring/sensu/gemset.nix
index 32134255711..32134255711 100644
--- a/pkgs/servers/monitoring/sensu/gemset.nix
+++ b/nixpkgs/pkgs/servers/monitoring/sensu/gemset.nix
diff --git a/pkgs/servers/monitoring/seyren/default.nix b/nixpkgs/pkgs/servers/monitoring/seyren/default.nix
index 5312ecb0692..5312ecb0692 100644
--- a/pkgs/servers/monitoring/seyren/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/seyren/default.nix
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix
index 35bf759af8e..35bf759af8e 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix
diff --git a/pkgs/servers/monitoring/telegraf/deps.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/deps.nix
index 091984f5bdf..091984f5bdf 100644
--- a/pkgs/servers/monitoring/telegraf/deps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/telegraf/deps.nix
diff --git a/pkgs/servers/monitoring/thanos/default.nix b/nixpkgs/pkgs/servers/monitoring/thanos/default.nix
index 01068a909b9..01068a909b9 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/thanos/default.nix
diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/nixpkgs/pkgs/servers/monitoring/uchiwa/bower-packages.nix
index 8585df3349c..8585df3349c 100644
--- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix
+++ b/nixpkgs/pkgs/servers/monitoring/uchiwa/bower-packages.nix
diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix
index 95f8ca4432b..95f8ca4432b 100644
--- a/pkgs/servers/monitoring/uchiwa/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix
diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/nixpkgs/pkgs/servers/monitoring/uchiwa/src.nix
index 36e46ea083e..36e46ea083e 100644
--- a/pkgs/servers/monitoring/uchiwa/src.nix
+++ b/nixpkgs/pkgs/servers/monitoring/uchiwa/src.nix
diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/nixpkgs/pkgs/servers/monitoring/uchiwa/update.sh
index 10da7f8adbf..10da7f8adbf 100755
--- a/pkgs/servers/monitoring/uchiwa/update.sh
+++ b/nixpkgs/pkgs/servers/monitoring/uchiwa/update.sh
diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/nixpkgs/pkgs/servers/monitoring/zabbix/agent.nix
index 09f43c755f1..09f43c755f1 100644
--- a/pkgs/servers/monitoring/zabbix/agent.nix
+++ b/nixpkgs/pkgs/servers/monitoring/zabbix/agent.nix
diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/nixpkgs/pkgs/servers/monitoring/zabbix/proxy.nix
index 697492d9627..697492d9627 100644
--- a/pkgs/servers/monitoring/zabbix/proxy.nix
+++ b/nixpkgs/pkgs/servers/monitoring/zabbix/proxy.nix
diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/nixpkgs/pkgs/servers/monitoring/zabbix/server.nix
index 4046cc7d8bb..4046cc7d8bb 100644
--- a/pkgs/servers/monitoring/zabbix/server.nix
+++ b/nixpkgs/pkgs/servers/monitoring/zabbix/server.nix
diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix
index aa27b6b18ea..aa27b6b18ea 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix
diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/nixpkgs/pkgs/servers/monitoring/zabbix/web.nix
index c4cf5d044da..c4cf5d044da 100644
--- a/pkgs/servers/monitoring/zabbix/web.nix
+++ b/nixpkgs/pkgs/servers/monitoring/zabbix/web.nix
diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix
index fe90d4d6408..fe90d4d6408 100644
--- a/pkgs/servers/monitoring/zipkin/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix
diff --git a/pkgs/servers/mpd/clientlib.nix b/nixpkgs/pkgs/servers/mpd/clientlib.nix
index f19d3a1e18a..f19d3a1e18a 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/nixpkgs/pkgs/servers/mpd/clientlib.nix
diff --git a/pkgs/servers/mpd/default.nix b/nixpkgs/pkgs/servers/mpd/default.nix
index f4081e5fa01..f4081e5fa01 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/nixpkgs/pkgs/servers/mpd/default.nix
diff --git a/pkgs/servers/mpd/x86.patch b/nixpkgs/pkgs/servers/mpd/x86.patch
index 3e4c036418d..3e4c036418d 100644
--- a/pkgs/servers/mpd/x86.patch
+++ b/nixpkgs/pkgs/servers/mpd/x86.patch
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix
index b52cfb09d4f..b52cfb09d4f 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix
diff --git a/pkgs/servers/mtprotoproxy/default.nix b/nixpkgs/pkgs/servers/mtprotoproxy/default.nix
index 4838fed47fb..4838fed47fb 100644
--- a/pkgs/servers/mtprotoproxy/default.nix
+++ b/nixpkgs/pkgs/servers/mtprotoproxy/default.nix
diff --git a/pkgs/servers/mumsi/default.nix b/nixpkgs/pkgs/servers/mumsi/default.nix
index 3cc3f338f2f..3cc3f338f2f 100644
--- a/pkgs/servers/mumsi/default.nix
+++ b/nixpkgs/pkgs/servers/mumsi/default.nix
diff --git a/pkgs/servers/mxisd/0001-gradle.patch b/nixpkgs/pkgs/servers/mxisd/0001-gradle.patch
index 8a9f5a81180..8a9f5a81180 100644
--- a/pkgs/servers/mxisd/0001-gradle.patch
+++ b/nixpkgs/pkgs/servers/mxisd/0001-gradle.patch
diff --git a/pkgs/servers/mxisd/default.nix b/nixpkgs/pkgs/servers/mxisd/default.nix
index c5841d4d1a8..c5841d4d1a8 100644
--- a/pkgs/servers/mxisd/default.nix
+++ b/nixpkgs/pkgs/servers/mxisd/default.nix
diff --git a/pkgs/servers/nas/default.nix b/nixpkgs/pkgs/servers/nas/default.nix
index 0b6451d104f..0b6451d104f 100644
--- a/pkgs/servers/nas/default.nix
+++ b/nixpkgs/pkgs/servers/nas/default.nix
diff --git a/pkgs/servers/nats-server/default.nix b/nixpkgs/pkgs/servers/nats-server/default.nix
index 7f75579b51c..7f75579b51c 100644
--- a/pkgs/servers/nats-server/default.nix
+++ b/nixpkgs/pkgs/servers/nats-server/default.nix
diff --git a/pkgs/servers/nats-streaming-server/default.nix b/nixpkgs/pkgs/servers/nats-streaming-server/default.nix
index 29f0f29a1bc..29f0f29a1bc 100644
--- a/pkgs/servers/nats-streaming-server/default.nix
+++ b/nixpkgs/pkgs/servers/nats-streaming-server/default.nix
diff --git a/pkgs/servers/neard/default.nix b/nixpkgs/pkgs/servers/neard/default.nix
index de317ada6e4..de317ada6e4 100644
--- a/pkgs/servers/neard/default.nix
+++ b/nixpkgs/pkgs/servers/neard/default.nix
diff --git a/pkgs/servers/news/leafnode/default.nix b/nixpkgs/pkgs/servers/news/leafnode/default.nix
index 0f1a8e120f6..0f1a8e120f6 100644
--- a/pkgs/servers/news/leafnode/default.nix
+++ b/nixpkgs/pkgs/servers/news/leafnode/default.nix
diff --git a/pkgs/servers/nextcloud/default.nix b/nixpkgs/pkgs/servers/nextcloud/default.nix
index 9fb7a2e3e0e..9fb7a2e3e0e 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/nixpkgs/pkgs/servers/nextcloud/default.nix
diff --git a/pkgs/servers/nextcloud/news-updater.nix b/nixpkgs/pkgs/servers/nextcloud/news-updater.nix
index 0fcb5047549..0fcb5047549 100644
--- a/pkgs/servers/nextcloud/news-updater.nix
+++ b/nixpkgs/pkgs/servers/nextcloud/news-updater.nix
diff --git a/pkgs/servers/nginx-sso/default.nix b/nixpkgs/pkgs/servers/nginx-sso/default.nix
index 10a0c99996d..10a0c99996d 100644
--- a/pkgs/servers/nginx-sso/default.nix
+++ b/nixpkgs/pkgs/servers/nginx-sso/default.nix
diff --git a/pkgs/servers/nosql/aerospike/default.nix b/nixpkgs/pkgs/servers/nosql/aerospike/default.nix
index b7b43edc1cd..b7b43edc1cd 100644
--- a/pkgs/servers/nosql/aerospike/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/aerospike/default.nix
diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix
index f3d5d121c38..f3d5d121c38 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix
diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
index 05153a7f859..05153a7f859 100644
--- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
+++ b/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream b/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream
index a18675347d5..a18675347d5 100644
--- a/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream
+++ b/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/nixpkgs/pkgs/servers/nosql/arangodb/default.nix
index e41930a2f48..e41930a2f48 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/arangodb/default.nix
diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/nixpkgs/pkgs/servers/nosql/cassandra/2.1.nix
index d73e242a942..d73e242a942 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/nixpkgs/pkgs/servers/nosql/cassandra/2.1.nix
diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/nixpkgs/pkgs/servers/nosql/cassandra/2.2.nix
index f9966b1ccd5..f9966b1ccd5 100644
--- a/pkgs/servers/nosql/cassandra/2.2.nix
+++ b/nixpkgs/pkgs/servers/nosql/cassandra/2.2.nix
diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix
index a1aad75ce3f..a1aad75ce3f 100644
--- a/pkgs/servers/nosql/cassandra/3.0.nix
+++ b/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix
diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix
index 56a3c5705b5..56a3c5705b5 100644
--- a/pkgs/servers/nosql/cassandra/3.11.nix
+++ b/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix
diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix
index fd0a97d029d..fd0a97d029d 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix
diff --git a/pkgs/servers/nosql/eventstore/create-deps.sh b/nixpkgs/pkgs/servers/nosql/eventstore/create-deps.sh
index da73bcf1e3b..da73bcf1e3b 100644
--- a/pkgs/servers/nosql/eventstore/create-deps.sh
+++ b/nixpkgs/pkgs/servers/nosql/eventstore/create-deps.sh
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/nixpkgs/pkgs/servers/nosql/eventstore/default.nix
index 21658a273b4..21658a273b4 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/eventstore/default.nix
diff --git a/pkgs/servers/nosql/eventstore/deps.nix b/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix
index 937bd818144..937bd818144 100644
--- a/pkgs/servers/nosql/eventstore/deps.nix
+++ b/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/nixpkgs/pkgs/servers/nosql/influxdb/default.nix
index 3669df47ee2..3669df47ee2 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/influxdb/default.nix
diff --git a/pkgs/servers/nosql/influxdb/deps.nix b/nixpkgs/pkgs/servers/nosql/influxdb/deps.nix
index 5492ad9d8ea..5492ad9d8ea 100644
--- a/pkgs/servers/nosql/influxdb/deps.nix
+++ b/nixpkgs/pkgs/servers/nosql/influxdb/deps.nix
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/nixpkgs/pkgs/servers/nosql/mongodb/default.nix
index c2ae83f3e8a..c2ae83f3e8a 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/mongodb/default.nix
diff --git a/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch b/nixpkgs/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
index ca2c043deb2..ca2c043deb2 100644
--- a/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
+++ b/nixpkgs/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/nixpkgs/pkgs/servers/nosql/neo4j/default.nix
index 98dd604c76d..98dd604c76d 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/neo4j/default.nix
diff --git a/pkgs/servers/nosql/redis/default.nix b/nixpkgs/pkgs/servers/nosql/redis/default.nix
index 278ba8d13c5..278ba8d13c5 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/redis/default.nix
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix
index 63c1b3b5fd7..63c1b3b5fd7 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix
diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix
index 4ebcbafde5d..4ebcbafde5d 100644
--- a/pkgs/servers/nosql/riak-cs/2.1.1.nix
+++ b/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix
diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix
index 5fe4ce45f84..5fe4ce45f84 100644
--- a/pkgs/servers/nosql/riak-cs/stanchion.nix
+++ b/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix
diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix
index efa43f7a844..efa43f7a844 100644
--- a/pkgs/servers/nosql/riak/2.2.0.nix
+++ b/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix
diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix
index 45d3d3cc559..45d3d3cc559 100644
--- a/pkgs/servers/nosql/victoriametrics/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix
diff --git a/pkgs/servers/nsq/default.nix b/nixpkgs/pkgs/servers/nsq/default.nix
index 19352984712..19352984712 100644
--- a/pkgs/servers/nsq/default.nix
+++ b/nixpkgs/pkgs/servers/nsq/default.nix
diff --git a/pkgs/servers/nsq/deps.nix b/nixpkgs/pkgs/servers/nsq/deps.nix
index 751a18ca92d..751a18ca92d 100644
--- a/pkgs/servers/nsq/deps.nix
+++ b/nixpkgs/pkgs/servers/nsq/deps.nix
diff --git a/pkgs/servers/oauth2_proxy/default.nix b/nixpkgs/pkgs/servers/oauth2_proxy/default.nix
index d094fda84b4..d094fda84b4 100644
--- a/pkgs/servers/oauth2_proxy/default.nix
+++ b/nixpkgs/pkgs/servers/oauth2_proxy/default.nix
diff --git a/pkgs/servers/oauth2_proxy/deps.nix b/nixpkgs/pkgs/servers/oauth2_proxy/deps.nix
index dd10ab28668..dd10ab28668 100644
--- a/pkgs/servers/oauth2_proxy/deps.nix
+++ b/nixpkgs/pkgs/servers/oauth2_proxy/deps.nix
diff --git a/pkgs/servers/openafs/1.6/default.nix b/nixpkgs/pkgs/servers/openafs/1.6/default.nix
index a1e56ca161e..a1e56ca161e 100644
--- a/pkgs/servers/openafs/1.6/default.nix
+++ b/nixpkgs/pkgs/servers/openafs/1.6/default.nix
diff --git a/pkgs/servers/openafs/1.6/module.nix b/nixpkgs/pkgs/servers/openafs/1.6/module.nix
index 0d61b1cd104..0d61b1cd104 100644
--- a/pkgs/servers/openafs/1.6/module.nix
+++ b/nixpkgs/pkgs/servers/openafs/1.6/module.nix
diff --git a/pkgs/servers/openafs/1.6/srcs.nix b/nixpkgs/pkgs/servers/openafs/1.6/srcs.nix
index 17048b68024..17048b68024 100644
--- a/pkgs/servers/openafs/1.6/srcs.nix
+++ b/nixpkgs/pkgs/servers/openafs/1.6/srcs.nix
diff --git a/pkgs/servers/openafs/1.6/tsmbac.patch b/nixpkgs/pkgs/servers/openafs/1.6/tsmbac.patch
index 412765fe8a5..412765fe8a5 100644
--- a/pkgs/servers/openafs/1.6/tsmbac.patch
+++ b/nixpkgs/pkgs/servers/openafs/1.6/tsmbac.patch
diff --git a/pkgs/servers/openafs/1.8/bosserver.patch b/nixpkgs/pkgs/servers/openafs/1.8/bosserver.patch
index 094d9871f64..094d9871f64 100644
--- a/pkgs/servers/openafs/1.8/bosserver.patch
+++ b/nixpkgs/pkgs/servers/openafs/1.8/bosserver.patch
diff --git a/pkgs/servers/openafs/1.8/cross-build.patch b/nixpkgs/pkgs/servers/openafs/1.8/cross-build.patch
index 62254164a1b..62254164a1b 100644
--- a/pkgs/servers/openafs/1.8/cross-build.patch
+++ b/nixpkgs/pkgs/servers/openafs/1.8/cross-build.patch
diff --git a/pkgs/servers/openafs/1.8/default.nix b/nixpkgs/pkgs/servers/openafs/1.8/default.nix
index 5fe4cad021f..5fe4cad021f 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/nixpkgs/pkgs/servers/openafs/1.8/default.nix
diff --git a/pkgs/servers/openafs/1.8/module.nix b/nixpkgs/pkgs/servers/openafs/1.8/module.nix
index dab97f10bee..dab97f10bee 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/nixpkgs/pkgs/servers/openafs/1.8/module.nix
diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/nixpkgs/pkgs/servers/openafs/1.8/srcs.nix
index 4a5591ef464..4a5591ef464 100644
--- a/pkgs/servers/openafs/1.8/srcs.nix
+++ b/nixpkgs/pkgs/servers/openafs/1.8/srcs.nix
diff --git a/pkgs/servers/openafs/1.8/tsmbac.patch b/nixpkgs/pkgs/servers/openafs/1.8/tsmbac.patch
index f68c777b6f0..f68c777b6f0 100644
--- a/pkgs/servers/openafs/1.8/tsmbac.patch
+++ b/nixpkgs/pkgs/servers/openafs/1.8/tsmbac.patch
diff --git a/pkgs/servers/openxpki/default.nix b/nixpkgs/pkgs/servers/openxpki/default.nix
index 7bd0ee2eede..7bd0ee2eede 100644
--- a/pkgs/servers/openxpki/default.nix
+++ b/nixpkgs/pkgs/servers/openxpki/default.nix
diff --git a/pkgs/servers/openxpki/vergen_revision_state b/nixpkgs/pkgs/servers/openxpki/vergen_revision_state
index 9a5d7b531de..9a5d7b531de 100644
--- a/pkgs/servers/openxpki/vergen_revision_state
+++ b/nixpkgs/pkgs/servers/openxpki/vergen_revision_state
diff --git a/pkgs/servers/osrm-backend/default.nix b/nixpkgs/pkgs/servers/osrm-backend/default.nix
index b744c58d4fb..b744c58d4fb 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/nixpkgs/pkgs/servers/osrm-backend/default.nix
diff --git a/pkgs/servers/p910nd/default.nix b/nixpkgs/pkgs/servers/p910nd/default.nix
index 67e125d7a8c..67e125d7a8c 100644
--- a/pkgs/servers/p910nd/default.nix
+++ b/nixpkgs/pkgs/servers/p910nd/default.nix
diff --git a/pkgs/servers/pies/default.nix b/nixpkgs/pkgs/servers/pies/default.nix
index a113d583cb1..a113d583cb1 100644
--- a/pkgs/servers/pies/default.nix
+++ b/nixpkgs/pkgs/servers/pies/default.nix
diff --git a/pkgs/servers/plex/default.nix b/nixpkgs/pkgs/servers/plex/default.nix
index 3d69d219780..3d69d219780 100644
--- a/pkgs/servers/plex/default.nix
+++ b/nixpkgs/pkgs/servers/plex/default.nix
diff --git a/pkgs/servers/plex/raw.nix b/nixpkgs/pkgs/servers/plex/raw.nix
index 380e5bb4be5..380e5bb4be5 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/nixpkgs/pkgs/servers/plex/raw.nix
diff --git a/pkgs/servers/polipo/default.nix b/nixpkgs/pkgs/servers/polipo/default.nix
index a6b65cde89f..a6b65cde89f 100644
--- a/pkgs/servers/polipo/default.nix
+++ b/nixpkgs/pkgs/servers/polipo/default.nix
diff --git a/pkgs/servers/pounce/default.nix b/nixpkgs/pkgs/servers/pounce/default.nix
index c581027530e..c581027530e 100644
--- a/pkgs/servers/pounce/default.nix
+++ b/nixpkgs/pkgs/servers/pounce/default.nix
diff --git a/pkgs/servers/prayer/default.nix b/nixpkgs/pkgs/servers/prayer/default.nix
index d1351afa0b3..d1351afa0b3 100644
--- a/pkgs/servers/prayer/default.nix
+++ b/nixpkgs/pkgs/servers/prayer/default.nix
diff --git a/pkgs/servers/prayer/install.patch b/nixpkgs/pkgs/servers/prayer/install.patch
index 439202dd955..439202dd955 100644
--- a/pkgs/servers/prayer/install.patch
+++ b/nixpkgs/pkgs/servers/prayer/install.patch
diff --git a/pkgs/servers/ps3netsrv/default.nix b/nixpkgs/pkgs/servers/ps3netsrv/default.nix
index 7e6b92a0376..7e6b92a0376 100644
--- a/pkgs/servers/ps3netsrv/default.nix
+++ b/nixpkgs/pkgs/servers/ps3netsrv/default.nix
diff --git a/pkgs/servers/pulseaudio/default.nix b/nixpkgs/pkgs/servers/pulseaudio/default.nix
index da201765e55..da201765e55 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/nixpkgs/pkgs/servers/pulseaudio/default.nix
diff --git a/pkgs/servers/quagga/default.nix b/nixpkgs/pkgs/servers/quagga/default.nix
index bd679fd3ff8..bd679fd3ff8 100644
--- a/pkgs/servers/quagga/default.nix
+++ b/nixpkgs/pkgs/servers/quagga/default.nix
diff --git a/pkgs/servers/radarr/default.nix b/nixpkgs/pkgs/servers/radarr/default.nix
index 854f73be187..854f73be187 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/nixpkgs/pkgs/servers/radarr/default.nix
diff --git a/pkgs/servers/radicale/1.x.nix b/nixpkgs/pkgs/servers/radicale/1.x.nix
index bfc681c921b..bfc681c921b 100644
--- a/pkgs/servers/radicale/1.x.nix
+++ b/nixpkgs/pkgs/servers/radicale/1.x.nix
diff --git a/pkgs/servers/radicale/default.nix b/nixpkgs/pkgs/servers/radicale/default.nix
index da55131773b..da55131773b 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/nixpkgs/pkgs/servers/radicale/default.nix
diff --git a/pkgs/servers/rainloop/default.nix b/nixpkgs/pkgs/servers/rainloop/default.nix
index ff6cb8c98eb..ff6cb8c98eb 100644
--- a/pkgs/servers/rainloop/default.nix
+++ b/nixpkgs/pkgs/servers/rainloop/default.nix
diff --git a/pkgs/servers/rippled/data-api.nix b/nixpkgs/pkgs/servers/rippled/data-api.nix
index 04d520b412c..04d520b412c 100644
--- a/pkgs/servers/rippled/data-api.nix
+++ b/nixpkgs/pkgs/servers/rippled/data-api.nix
diff --git a/pkgs/servers/rippled/default.nix b/nixpkgs/pkgs/servers/rippled/default.nix
index 905e776ea36..905e776ea36 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/nixpkgs/pkgs/servers/rippled/default.nix
diff --git a/pkgs/servers/rippled/package.nix b/nixpkgs/pkgs/servers/rippled/package.nix
index 87f4326c48c..87f4326c48c 100644
--- a/pkgs/servers/rippled/package.nix
+++ b/nixpkgs/pkgs/servers/rippled/package.nix
diff --git a/pkgs/servers/rippled/validator-keys-tool.nix b/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix
index 684e070292c..684e070292c 100644
--- a/pkgs/servers/rippled/validator-keys-tool.nix
+++ b/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix
diff --git a/pkgs/servers/roon-server/default.nix b/nixpkgs/pkgs/servers/roon-server/default.nix
index 64b212eb49f..64b212eb49f 100644
--- a/pkgs/servers/roon-server/default.nix
+++ b/nixpkgs/pkgs/servers/roon-server/default.nix
diff --git a/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch b/nixpkgs/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch
index 27ebd59a48d..27ebd59a48d 100644
--- a/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch
+++ b/nixpkgs/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch
diff --git a/pkgs/servers/roundcube/default.nix b/nixpkgs/pkgs/servers/roundcube/default.nix
index 27ff5b409f7..27ff5b409f7 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/nixpkgs/pkgs/servers/roundcube/default.nix
diff --git a/pkgs/servers/roundcube/plugins/default.nix b/nixpkgs/pkgs/servers/roundcube/plugins/default.nix
index 42333b69eb1..42333b69eb1 100644
--- a/pkgs/servers/roundcube/plugins/default.nix
+++ b/nixpkgs/pkgs/servers/roundcube/plugins/default.nix
diff --git a/pkgs/servers/roundcube/plugins/persistent_login/default.nix b/nixpkgs/pkgs/servers/roundcube/plugins/persistent_login/default.nix
index b66386222f7..b66386222f7 100644
--- a/pkgs/servers/roundcube/plugins/persistent_login/default.nix
+++ b/nixpkgs/pkgs/servers/roundcube/plugins/persistent_login/default.nix
diff --git a/pkgs/servers/roundcube/plugins/plugins.nix b/nixpkgs/pkgs/servers/roundcube/plugins/plugins.nix
index 4eed1227be6..4eed1227be6 100644
--- a/pkgs/servers/roundcube/plugins/plugins.nix
+++ b/nixpkgs/pkgs/servers/roundcube/plugins/plugins.nix
diff --git a/pkgs/servers/roundcube/plugins/roundcube-plugin.nix b/nixpkgs/pkgs/servers/roundcube/plugins/roundcube-plugin.nix
index a756a3140cb..a756a3140cb 100644
--- a/pkgs/servers/roundcube/plugins/roundcube-plugin.nix
+++ b/nixpkgs/pkgs/servers/roundcube/plugins/roundcube-plugin.nix
diff --git a/pkgs/servers/routinator/default.nix b/nixpkgs/pkgs/servers/routinator/default.nix
index 7d91dc91a93..7d91dc91a93 100644
--- a/pkgs/servers/routinator/default.nix
+++ b/nixpkgs/pkgs/servers/routinator/default.nix
diff --git a/pkgs/servers/rpcbind/default.nix b/nixpkgs/pkgs/servers/rpcbind/default.nix
index 00d01b01efe..00d01b01efe 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/nixpkgs/pkgs/servers/rpcbind/default.nix
diff --git a/pkgs/servers/rpcbind/sunrpc.patch b/nixpkgs/pkgs/servers/rpcbind/sunrpc.patch
index 450d33aa1c4..450d33aa1c4 100644
--- a/pkgs/servers/rpcbind/sunrpc.patch
+++ b/nixpkgs/pkgs/servers/rpcbind/sunrpc.patch
diff --git a/pkgs/servers/rt/default.nix b/nixpkgs/pkgs/servers/rt/default.nix
index b4400215dd0..b4400215dd0 100644
--- a/pkgs/servers/rt/default.nix
+++ b/nixpkgs/pkgs/servers/rt/default.nix
diff --git a/pkgs/servers/rt/override-generated.patch b/nixpkgs/pkgs/servers/rt/override-generated.patch
index 5727a9b50c5..5727a9b50c5 100644
--- a/pkgs/servers/rt/override-generated.patch
+++ b/nixpkgs/pkgs/servers/rt/override-generated.patch
diff --git a/pkgs/servers/sabnzbd/default.nix b/nixpkgs/pkgs/servers/sabnzbd/default.nix
index 57c774ebcb0..57c774ebcb0 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/nixpkgs/pkgs/servers/sabnzbd/default.nix
diff --git a/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch b/nixpkgs/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch
index 7c973e5bd26..7c973e5bd26 100644
--- a/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch
+++ b/nixpkgs/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch
diff --git a/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch b/nixpkgs/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch
index 6576a43322e..6576a43322e 100644
--- a/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch
+++ b/nixpkgs/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch
diff --git a/pkgs/servers/samba/4.x-no-persistent-install.patch b/nixpkgs/pkgs/servers/samba/4.x-no-persistent-install.patch
index 820470f939e..820470f939e 100644
--- a/pkgs/servers/samba/4.x-no-persistent-install.patch
+++ b/nixpkgs/pkgs/servers/samba/4.x-no-persistent-install.patch
diff --git a/pkgs/servers/samba/4.x.nix b/nixpkgs/pkgs/servers/samba/4.x.nix
index c7ee15bc9f8..c7ee15bc9f8 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/nixpkgs/pkgs/servers/samba/4.x.nix
diff --git a/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch b/nixpkgs/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch
index 9f6577c65c1..9f6577c65c1 100644
--- a/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch
+++ b/nixpkgs/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch
diff --git a/pkgs/servers/scylladb/configure-etc-osrelease.patch b/nixpkgs/pkgs/servers/scylladb/configure-etc-osrelease.patch
index 5fd6c7caf08..5fd6c7caf08 100644
--- a/pkgs/servers/scylladb/configure-etc-osrelease.patch
+++ b/nixpkgs/pkgs/servers/scylladb/configure-etc-osrelease.patch
diff --git a/pkgs/servers/scylladb/default.nix b/nixpkgs/pkgs/servers/scylladb/default.nix
index a2671e17cb7..a2671e17cb7 100644
--- a/pkgs/servers/scylladb/default.nix
+++ b/nixpkgs/pkgs/servers/scylladb/default.nix
diff --git a/pkgs/servers/scylladb/seastar-configure-script-paths.patch b/nixpkgs/pkgs/servers/scylladb/seastar-configure-script-paths.patch
index 19c5c816129..19c5c816129 100644
--- a/pkgs/servers/scylladb/seastar-configure-script-paths.patch
+++ b/nixpkgs/pkgs/servers/scylladb/seastar-configure-script-paths.patch
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix
index 04e81fe150a..04e81fe150a 100644
--- a/pkgs/servers/search/elasticsearch/6.x.nix
+++ b/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix
index 73a947066bf..73a947066bf 100644
--- a/pkgs/servers/search/elasticsearch/7.x.nix
+++ b/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix
diff --git a/pkgs/servers/search/elasticsearch/es-home-6.x.patch b/nixpkgs/pkgs/servers/search/elasticsearch/es-home-6.x.patch
index aba8d396a69..aba8d396a69 100644
--- a/pkgs/servers/search/elasticsearch/es-home-6.x.patch
+++ b/nixpkgs/pkgs/servers/search/elasticsearch/es-home-6.x.patch
diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix
index cdab1fce7b0..cdab1fce7b0 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix
diff --git a/pkgs/servers/search/groonga/default.nix b/nixpkgs/pkgs/servers/search/groonga/default.nix
index 235e113728d..235e113728d 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/nixpkgs/pkgs/servers/search/groonga/default.nix
diff --git a/pkgs/servers/search/solr/default.nix b/nixpkgs/pkgs/servers/search/solr/default.nix
index 701d3880cbd..701d3880cbd 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/nixpkgs/pkgs/servers/search/solr/default.nix
diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix
index 6241380ea0c..6241380ea0c 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix
diff --git a/pkgs/servers/ser2net/default.nix b/nixpkgs/pkgs/servers/ser2net/default.nix
index e18d96013e4..e18d96013e4 100644
--- a/pkgs/servers/ser2net/default.nix
+++ b/nixpkgs/pkgs/servers/ser2net/default.nix
diff --git a/pkgs/servers/serf/default.nix b/nixpkgs/pkgs/servers/serf/default.nix
index 585fc2b73ef..585fc2b73ef 100644
--- a/pkgs/servers/serf/default.nix
+++ b/nixpkgs/pkgs/servers/serf/default.nix
diff --git a/pkgs/servers/serviio/default.nix b/nixpkgs/pkgs/servers/serviio/default.nix
index 03d86c209f0..03d86c209f0 100644
--- a/pkgs/servers/serviio/default.nix
+++ b/nixpkgs/pkgs/servers/serviio/default.nix
diff --git a/pkgs/servers/shairplay/default.nix b/nixpkgs/pkgs/servers/shairplay/default.nix
index 1c726c47764..1c726c47764 100644
--- a/pkgs/servers/shairplay/default.nix
+++ b/nixpkgs/pkgs/servers/shairplay/default.nix
diff --git a/pkgs/servers/shairport-sync/default.nix b/nixpkgs/pkgs/servers/shairport-sync/default.nix
index 99402b3e1be..99402b3e1be 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/nixpkgs/pkgs/servers/shairport-sync/default.nix
diff --git a/pkgs/servers/shellinabox/default.nix b/nixpkgs/pkgs/servers/shellinabox/default.nix
index fe1837e907a..fe1837e907a 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/nixpkgs/pkgs/servers/shellinabox/default.nix
diff --git a/pkgs/servers/shellinabox/shellinabox-minus.patch b/nixpkgs/pkgs/servers/shellinabox/shellinabox-minus.patch
index d84bdd2eb16..d84bdd2eb16 100644
--- a/pkgs/servers/shellinabox/shellinabox-minus.patch
+++ b/nixpkgs/pkgs/servers/shellinabox/shellinabox-minus.patch
diff --git a/pkgs/servers/shishi/default.nix b/nixpkgs/pkgs/servers/shishi/default.nix
index 060b58d18b1..060b58d18b1 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/nixpkgs/pkgs/servers/shishi/default.nix
diff --git a/pkgs/servers/shishi/freebsd-unistd.patch b/nixpkgs/pkgs/servers/shishi/freebsd-unistd.patch
index 9399e20205b..9399e20205b 100644
--- a/pkgs/servers/shishi/freebsd-unistd.patch
+++ b/nixpkgs/pkgs/servers/shishi/freebsd-unistd.patch
diff --git a/pkgs/servers/shishi/gcrypt-fix.patch b/nixpkgs/pkgs/servers/shishi/gcrypt-fix.patch
index ccc37389401..ccc37389401 100644
--- a/pkgs/servers/shishi/gcrypt-fix.patch
+++ b/nixpkgs/pkgs/servers/shishi/gcrypt-fix.patch
diff --git a/pkgs/servers/sickbeard/default.nix b/nixpkgs/pkgs/servers/sickbeard/default.nix
index 6cca58a175e..6cca58a175e 100644
--- a/pkgs/servers/sickbeard/default.nix
+++ b/nixpkgs/pkgs/servers/sickbeard/default.nix
diff --git a/pkgs/servers/sickbeard/sickgear.nix b/nixpkgs/pkgs/servers/sickbeard/sickgear.nix
index 1b7a57e8b50..1b7a57e8b50 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/nixpkgs/pkgs/servers/sickbeard/sickgear.nix
diff --git a/pkgs/servers/sickbeard/sickrage.nix b/nixpkgs/pkgs/servers/sickbeard/sickrage.nix
index cbde11e3dc0..cbde11e3dc0 100644
--- a/pkgs/servers/sickbeard/sickrage.nix
+++ b/nixpkgs/pkgs/servers/sickbeard/sickrage.nix
diff --git a/pkgs/servers/silc-server/default.nix b/nixpkgs/pkgs/servers/silc-server/default.nix
index fdb1dcbd1cf..fdb1dcbd1cf 100644
--- a/pkgs/servers/silc-server/default.nix
+++ b/nixpkgs/pkgs/servers/silc-server/default.nix
diff --git a/pkgs/servers/simplehttp2server/default.nix b/nixpkgs/pkgs/servers/simplehttp2server/default.nix
index 3ac32509ba3..3ac32509ba3 100644
--- a/pkgs/servers/simplehttp2server/default.nix
+++ b/nixpkgs/pkgs/servers/simplehttp2server/default.nix
diff --git a/pkgs/servers/simplehttp2server/deps.nix b/nixpkgs/pkgs/servers/simplehttp2server/deps.nix
index e6a26bf2506..e6a26bf2506 100644
--- a/pkgs/servers/simplehttp2server/deps.nix
+++ b/nixpkgs/pkgs/servers/simplehttp2server/deps.nix
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/nixpkgs/pkgs/servers/sip/freeswitch/default.nix
index f6791d01088..f6791d01088 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/nixpkgs/pkgs/servers/sip/freeswitch/default.nix
diff --git a/pkgs/servers/sip/freeswitch/modules.nix b/nixpkgs/pkgs/servers/sip/freeswitch/modules.nix
index be80fe56dda..be80fe56dda 100644
--- a/pkgs/servers/sip/freeswitch/modules.nix
+++ b/nixpkgs/pkgs/servers/sip/freeswitch/modules.nix
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/nixpkgs/pkgs/servers/sip/sipwitch/default.nix
index 1252153b79a..1252153b79a 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/nixpkgs/pkgs/servers/sip/sipwitch/default.nix
diff --git a/pkgs/servers/sks/adapt-to-nixos.patch b/nixpkgs/pkgs/servers/sks/adapt-to-nixos.patch
index b4403e8c7bc..b4403e8c7bc 100644
--- a/pkgs/servers/sks/adapt-to-nixos.patch
+++ b/nixpkgs/pkgs/servers/sks/adapt-to-nixos.patch
diff --git a/pkgs/servers/sks/default.nix b/nixpkgs/pkgs/servers/sks/default.nix
index f6f914b7cbd..f6f914b7cbd 100644
--- a/pkgs/servers/sks/default.nix
+++ b/nixpkgs/pkgs/servers/sks/default.nix
diff --git a/pkgs/servers/skydns/default.nix b/nixpkgs/pkgs/servers/skydns/default.nix
index 2fc67008b89..2fc67008b89 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/nixpkgs/pkgs/servers/skydns/default.nix
diff --git a/pkgs/servers/skydns/deps.nix b/nixpkgs/pkgs/servers/skydns/deps.nix
index a4f4eb12045..a4f4eb12045 100644
--- a/pkgs/servers/skydns/deps.nix
+++ b/nixpkgs/pkgs/servers/skydns/deps.nix
diff --git a/pkgs/servers/slimserver/default.nix b/nixpkgs/pkgs/servers/slimserver/default.nix
index d755f864d4e..d755f864d4e 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/nixpkgs/pkgs/servers/slimserver/default.nix
diff --git a/pkgs/servers/smcroute/default.nix b/nixpkgs/pkgs/servers/smcroute/default.nix
index 730d1bbdddc..730d1bbdddc 100644
--- a/pkgs/servers/smcroute/default.nix
+++ b/nixpkgs/pkgs/servers/smcroute/default.nix
diff --git a/pkgs/servers/softether/4.25.nix b/nixpkgs/pkgs/servers/softether/4.25.nix
index 2b21bef7d6f..2b21bef7d6f 100644
--- a/pkgs/servers/softether/4.25.nix
+++ b/nixpkgs/pkgs/servers/softether/4.25.nix
diff --git a/pkgs/servers/softether/4.29.nix b/nixpkgs/pkgs/servers/softether/4.29.nix
index 1d80752a41a..1d80752a41a 100644
--- a/pkgs/servers/softether/4.29.nix
+++ b/nixpkgs/pkgs/servers/softether/4.29.nix
diff --git a/pkgs/servers/sonarr/default.nix b/nixpkgs/pkgs/servers/sonarr/default.nix
index 7a546d5813c..7a546d5813c 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/nixpkgs/pkgs/servers/sonarr/default.nix
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix
index 6637a75ea2f..6637a75ea2f 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix
diff --git a/pkgs/servers/sql/dolt/default.nix b/nixpkgs/pkgs/servers/sql/dolt/default.nix
index b9876fbc5ea..b9876fbc5ea 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/nixpkgs/pkgs/servers/sql/dolt/default.nix
diff --git a/pkgs/servers/sql/mariadb/cmake-includedir.patch b/nixpkgs/pkgs/servers/sql/mariadb/cmake-includedir.patch
index 0c4fe7d321e..0c4fe7d321e 100644
--- a/pkgs/servers/sql/mariadb/cmake-includedir.patch
+++ b/nixpkgs/pkgs/servers/sql/mariadb/cmake-includedir.patch
diff --git a/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch b/nixpkgs/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch
index d2a4535f7ba..d2a4535f7ba 100644
--- a/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch
+++ b/nixpkgs/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch
diff --git a/pkgs/servers/sql/mariadb/cmake-without-client.patch b/nixpkgs/pkgs/servers/sql/mariadb/cmake-without-client.patch
index ce36d036b6d..ce36d036b6d 100644
--- a/pkgs/servers/sql/mariadb/cmake-without-client.patch
+++ b/nixpkgs/pkgs/servers/sql/mariadb/cmake-without-client.patch
diff --git a/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch b/nixpkgs/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch
index 173fa1e0c63..173fa1e0c63 100644
--- a/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch
+++ b/nixpkgs/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch
diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_1.nix
index 257fa93d2b5..257fa93d2b5 100644
--- a/pkgs/servers/sql/mariadb/connector-c/3_1.nix
+++ b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_1.nix
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix
index af344d63721..af344d63721 100644
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix
diff --git a/pkgs/servers/sql/mariadb/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/default.nix
index d451c1dab5c..d451c1dab5c 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/nixpkgs/pkgs/servers/sql/mariadb/default.nix
diff --git a/pkgs/servers/sql/mariadb/galera/25.nix b/nixpkgs/pkgs/servers/sql/mariadb/galera/25.nix
index 2772d60e398..2772d60e398 100644
--- a/pkgs/servers/sql/mariadb/galera/25.nix
+++ b/nixpkgs/pkgs/servers/sql/mariadb/galera/25.nix
diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix
index 73d37ba11a2..73d37ba11a2 100644
--- a/pkgs/servers/sql/mariadb/galera/default.nix
+++ b/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix
diff --git a/pkgs/servers/sql/monetdb/default.nix b/nixpkgs/pkgs/servers/sql/monetdb/default.nix
index 08d2f8e504b..08d2f8e504b 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/nixpkgs/pkgs/servers/sql/monetdb/default.nix
diff --git a/pkgs/servers/sql/mssql/jdbc/builder.sh b/nixpkgs/pkgs/servers/sql/mssql/jdbc/builder.sh
index a5ba86cb080..a5ba86cb080 100644
--- a/pkgs/servers/sql/mssql/jdbc/builder.sh
+++ b/nixpkgs/pkgs/servers/sql/mssql/jdbc/builder.sh
diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix
index f6edfe388ac..f6edfe388ac 100644
--- a/pkgs/servers/sql/mssql/jdbc/default.nix
+++ b/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix
diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix
index 6636c099e83..6636c099e83 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix
diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix
index fcb64550d6f..fcb64550d6f 100644
--- a/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix
diff --git a/pkgs/servers/sql/mysql/abi-check.patch b/nixpkgs/pkgs/servers/sql/mysql/abi-check.patch
index de45d9c3ea2..de45d9c3ea2 100644
--- a/pkgs/servers/sql/mysql/abi-check.patch
+++ b/nixpkgs/pkgs/servers/sql/mysql/abi-check.patch
diff --git a/pkgs/servers/sql/mysql/jdbc/builder.sh b/nixpkgs/pkgs/servers/sql/mysql/jdbc/builder.sh
index 56336e04135..56336e04135 100644
--- a/pkgs/servers/sql/mysql/jdbc/builder.sh
+++ b/nixpkgs/pkgs/servers/sql/mysql/jdbc/builder.sh
diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix
index 66e62b823d9..66e62b823d9 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix
diff --git a/pkgs/servers/sql/mysql/libutils.patch b/nixpkgs/pkgs/servers/sql/mysql/libutils.patch
index fa1a35e12f2..fa1a35e12f2 100644
--- a/pkgs/servers/sql/mysql/libutils.patch
+++ b/nixpkgs/pkgs/servers/sql/mysql/libutils.patch
diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/nixpkgs/pkgs/servers/sql/oracle-xe/default.nix
index 062de0c2368..062de0c2368 100644
--- a/pkgs/servers/sql/oracle-xe/default.nix
+++ b/nixpkgs/pkgs/servers/sql/oracle-xe/default.nix
diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix
index 860c1f8e94f..860c1f8e94f 100644
--- a/pkgs/servers/sql/percona/5.6.x.nix
+++ b/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix
diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix
index f71afc2b674..f71afc2b674 100644
--- a/pkgs/servers/sql/pgbouncer/default.nix
+++ b/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix
diff --git a/pkgs/servers/sql/pgpool/default.nix b/nixpkgs/pkgs/servers/sql/pgpool/default.nix
index 32c30836f6d..32c30836f6d 100644
--- a/pkgs/servers/sql/pgpool/default.nix
+++ b/nixpkgs/pkgs/servers/sql/pgpool/default.nix
diff --git a/pkgs/servers/sql/pgpool/pgpool.patch b/nixpkgs/pkgs/servers/sql/pgpool/pgpool.patch
index 7c9d92a88bf..7c9d92a88bf 100644
--- a/pkgs/servers/sql/pgpool/pgpool.patch
+++ b/nixpkgs/pkgs/servers/sql/pgpool/pgpool.patch
diff --git a/pkgs/servers/sql/postgresql/default.nix b/nixpkgs/pkgs/servers/sql/postgresql/default.nix
index 3f05b3e36c1..3f05b3e36c1 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/default.nix
diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
index 8e30683737d..8e30683737d 100644
--- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index 5946b8f5ec3..5946b8f5ec3 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
index 055d1de3c78..055d1de3c78 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index 1e5824d60d8..1e5824d60d8 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index deac1072e65..deac1072e65 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix
index 94a71cf223a..94a71cf223a 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix
index aeaff17889f..aeaff17889f 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
index b835141e2ca..b835141e2ca 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
index 301160ce132..301160ce132 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix
index b6300f78af2..b6300f78af2 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix
index 9576c418611..9576c418611 100644
--- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index 866dd8021d0..866dd8021d0 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix
index 13aa5d942e5..13aa5d942e5 100644
--- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix
index 54e92b977bc..54e92b977bc 100644
--- a/pkgs/servers/sql/postgresql/ext/pgtap.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix
index 4a80e5cafcb..4a80e5cafcb 100644
--- a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix
diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8.nix
index ffba1bd8e3b..ffba1bd8e3b 100644
--- a/pkgs/servers/sql/postgresql/ext/plv8.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8.nix
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
index c7bceb232f6..c7bceb232f6 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix
index 6dc3be727c6..6dc3be727c6 100644
--- a/pkgs/servers/sql/postgresql/ext/repmgr.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix
diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
index ddefaea1549..ddefaea1549 100644
--- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
index 7a4b1ed88fc..7a4b1ed88fc 100644
--- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 6f0ec04cd75..6f0ec04cd75 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
index 77e4cd9df7a..77e4cd9df7a 100644
--- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
diff --git a/pkgs/servers/sql/postgresql/packages.nix b/nixpkgs/pkgs/servers/sql/postgresql/packages.nix
index a6821373389..a6821373389 100644
--- a/pkgs/servers/sql/postgresql/packages.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/packages.nix
diff --git a/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch b/nixpkgs/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch
index fadeea90ac4..fadeea90ac4 100644
--- a/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch
+++ b/nixpkgs/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch
diff --git a/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch b/nixpkgs/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch
index 3e6fd5e838a..3e6fd5e838a 100644
--- a/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch
+++ b/nixpkgs/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch
diff --git a/pkgs/servers/sql/postgresql/patches/findstring.patch b/nixpkgs/pkgs/servers/sql/postgresql/patches/findstring.patch
index 959bf6a6caa..959bf6a6caa 100644
--- a/pkgs/servers/sql/postgresql/patches/findstring.patch
+++ b/nixpkgs/pkgs/servers/sql/postgresql/patches/findstring.patch
diff --git a/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch b/nixpkgs/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch
index 6cd449769ba..6cd449769ba 100644
--- a/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch
+++ b/nixpkgs/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch
diff --git a/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch b/nixpkgs/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch
index 355813ffe20..355813ffe20 100644
--- a/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch
+++ b/nixpkgs/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch
diff --git a/pkgs/servers/sql/postgresql/patches/less-is-more-96.patch b/nixpkgs/pkgs/servers/sql/postgresql/patches/less-is-more-96.patch
index f14af9dc220..f14af9dc220 100644
--- a/pkgs/servers/sql/postgresql/patches/less-is-more-96.patch
+++ b/nixpkgs/pkgs/servers/sql/postgresql/patches/less-is-more-96.patch
diff --git a/pkgs/servers/sql/postgresql/patches/less-is-more.patch b/nixpkgs/pkgs/servers/sql/postgresql/patches/less-is-more.patch
index d640d24bdaa..d640d24bdaa 100644
--- a/pkgs/servers/sql/postgresql/patches/less-is-more.patch
+++ b/nixpkgs/pkgs/servers/sql/postgresql/patches/less-is-more.patch
diff --git a/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch b/nixpkgs/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch
index 969f80ff8fc..969f80ff8fc 100644
--- a/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch
+++ b/nixpkgs/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch
diff --git a/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch b/nixpkgs/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch
index fe95d2ee99f..fe95d2ee99f 100644
--- a/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch
+++ b/nixpkgs/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch
diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/nixpkgs/pkgs/servers/sql/sqlite/jdbc/default.nix
index f5444bb0683..f5444bb0683 100644
--- a/pkgs/servers/sql/sqlite/jdbc/default.nix
+++ b/nixpkgs/pkgs/servers/sql/sqlite/jdbc/default.nix
diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/nixpkgs/pkgs/servers/sql/virtuoso/6.x.nix
index 0daf7533a60..0daf7533a60 100644
--- a/pkgs/servers/sql/virtuoso/6.x.nix
+++ b/nixpkgs/pkgs/servers/sql/virtuoso/6.x.nix
diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/nixpkgs/pkgs/servers/sql/virtuoso/7.x.nix
index 17ec49d1613..17ec49d1613 100644
--- a/pkgs/servers/sql/virtuoso/7.x.nix
+++ b/nixpkgs/pkgs/servers/sql/virtuoso/7.x.nix
diff --git a/pkgs/servers/squid/default.nix b/nixpkgs/pkgs/servers/squid/default.nix
index 8452adcf222..8452adcf222 100644
--- a/pkgs/servers/squid/default.nix
+++ b/nixpkgs/pkgs/servers/squid/default.nix
diff --git a/pkgs/servers/sslh/default.nix b/nixpkgs/pkgs/servers/sslh/default.nix
index f7b4dd84d32..f7b4dd84d32 100644
--- a/pkgs/servers/sslh/default.nix
+++ b/nixpkgs/pkgs/servers/sslh/default.nix
diff --git a/pkgs/servers/syncserver/default.nix b/nixpkgs/pkgs/servers/syncserver/default.nix
index d4192375801..d4192375801 100644
--- a/pkgs/servers/syncserver/default.nix
+++ b/nixpkgs/pkgs/servers/syncserver/default.nix
diff --git a/pkgs/servers/tacacsplus/default.nix b/nixpkgs/pkgs/servers/tacacsplus/default.nix
index 400298d15d5..400298d15d5 100644
--- a/pkgs/servers/tacacsplus/default.nix
+++ b/nixpkgs/pkgs/servers/tacacsplus/default.nix
diff --git a/pkgs/servers/tautulli/default.nix b/nixpkgs/pkgs/servers/tautulli/default.nix
index b6e5fa7deee..b6e5fa7deee 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/nixpkgs/pkgs/servers/tautulli/default.nix
diff --git a/pkgs/servers/tegola/default.nix b/nixpkgs/pkgs/servers/tegola/default.nix
index ac3dccdab73..ac3dccdab73 100644
--- a/pkgs/servers/tegola/default.nix
+++ b/nixpkgs/pkgs/servers/tegola/default.nix
diff --git a/pkgs/servers/teleport/default.nix b/nixpkgs/pkgs/servers/teleport/default.nix
index dc92a10fe24..dc92a10fe24 100644
--- a/pkgs/servers/teleport/default.nix
+++ b/nixpkgs/pkgs/servers/teleport/default.nix
diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/nixpkgs/pkgs/servers/tmate-ssh-server/default.nix
index 836fa33f3f7..836fa33f3f7 100644
--- a/pkgs/servers/tmate-ssh-server/default.nix
+++ b/nixpkgs/pkgs/servers/tmate-ssh-server/default.nix
diff --git a/pkgs/servers/traefik/default.nix b/nixpkgs/pkgs/servers/traefik/default.nix
index 1707eb403b7..1707eb403b7 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/nixpkgs/pkgs/servers/traefik/default.nix
diff --git a/pkgs/servers/trezord/default.nix b/nixpkgs/pkgs/servers/trezord/default.nix
index 134d36258a5..134d36258a5 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/nixpkgs/pkgs/servers/trezord/default.nix
diff --git a/pkgs/servers/trickster/trickster.nix b/nixpkgs/pkgs/servers/trickster/trickster.nix
index 3c03193e770..3c03193e770 100644
--- a/pkgs/servers/trickster/trickster.nix
+++ b/nixpkgs/pkgs/servers/trickster/trickster.nix
diff --git a/pkgs/servers/trickster/trickster_deps.nix b/nixpkgs/pkgs/servers/trickster/trickster_deps.nix
index ab100bed760..ab100bed760 100644
--- a/pkgs/servers/trickster/trickster_deps.nix
+++ b/nixpkgs/pkgs/servers/trickster/trickster_deps.nix
diff --git a/pkgs/servers/tt-rss/default.nix b/nixpkgs/pkgs/servers/tt-rss/default.nix
index c1694316f3e..c1694316f3e 100644
--- a/pkgs/servers/tt-rss/default.nix
+++ b/nixpkgs/pkgs/servers/tt-rss/default.nix
diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
index 0600640155b..0600640155b 100644
--- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
+++ b/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
index fd6ca990947..fd6ca990947 100644
--- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
+++ b/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
index 7c3d6a5b57e..7c3d6a5b57e 100644
--- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
+++ b/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix
index 8ad511e5b5b..8ad511e5b5b 100644
--- a/pkgs/servers/tt-rss/theme-feedly/default.nix
+++ b/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix
diff --git a/pkgs/servers/ttyd/default.nix b/nixpkgs/pkgs/servers/ttyd/default.nix
index 3358973fc4e..3358973fc4e 100644
--- a/pkgs/servers/ttyd/default.nix
+++ b/nixpkgs/pkgs/servers/ttyd/default.nix
diff --git a/pkgs/servers/tvheadend/default.nix b/nixpkgs/pkgs/servers/tvheadend/default.nix
index 9a01bf3eed6..9a01bf3eed6 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/nixpkgs/pkgs/servers/tvheadend/default.nix
diff --git a/pkgs/servers/u9fs/default.nix b/nixpkgs/pkgs/servers/u9fs/default.nix
index 4f5d9636fe6..4f5d9636fe6 100644
--- a/pkgs/servers/u9fs/default.nix
+++ b/nixpkgs/pkgs/servers/u9fs/default.nix
diff --git a/pkgs/servers/udpt/default.nix b/nixpkgs/pkgs/servers/udpt/default.nix
index cddfdf9f48f..cddfdf9f48f 100644
--- a/pkgs/servers/udpt/default.nix
+++ b/nixpkgs/pkgs/servers/udpt/default.nix
diff --git a/pkgs/servers/uftp/default.nix b/nixpkgs/pkgs/servers/uftp/default.nix
index 13e7fb7b93b..13e7fb7b93b 100644
--- a/pkgs/servers/uftp/default.nix
+++ b/nixpkgs/pkgs/servers/uftp/default.nix
diff --git a/pkgs/servers/uhub/default.nix b/nixpkgs/pkgs/servers/uhub/default.nix
index 11dd5449b4b..11dd5449b4b 100644
--- a/pkgs/servers/uhub/default.nix
+++ b/nixpkgs/pkgs/servers/uhub/default.nix
diff --git a/pkgs/servers/uhub/plugin-dir.patch b/nixpkgs/pkgs/servers/uhub/plugin-dir.patch
index d29d600425f..d29d600425f 100644
--- a/pkgs/servers/uhub/plugin-dir.patch
+++ b/nixpkgs/pkgs/servers/uhub/plugin-dir.patch
diff --git a/pkgs/servers/ums/default.nix b/nixpkgs/pkgs/servers/ums/default.nix
index 3fb2817277a..3fb2817277a 100644
--- a/pkgs/servers/ums/default.nix
+++ b/nixpkgs/pkgs/servers/ums/default.nix
diff --git a/pkgs/servers/unfs3/default.nix b/nixpkgs/pkgs/servers/unfs3/default.nix
index 4304dc229e3..4304dc229e3 100644
--- a/pkgs/servers/unfs3/default.nix
+++ b/nixpkgs/pkgs/servers/unfs3/default.nix
diff --git a/pkgs/servers/unifi/default.nix b/nixpkgs/pkgs/servers/unifi/default.nix
index f86ae9d7cec..f86ae9d7cec 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/nixpkgs/pkgs/servers/unifi/default.nix
diff --git a/pkgs/servers/unpfs/default.nix b/nixpkgs/pkgs/servers/unpfs/default.nix
index df6cfb70438..df6cfb70438 100644
--- a/pkgs/servers/unpfs/default.nix
+++ b/nixpkgs/pkgs/servers/unpfs/default.nix
diff --git a/pkgs/servers/uwsgi/default.nix b/nixpkgs/pkgs/servers/uwsgi/default.nix
index 7669053d229..7669053d229 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/nixpkgs/pkgs/servers/uwsgi/default.nix
diff --git a/pkgs/servers/uwsgi/nixos.ini b/nixpkgs/pkgs/servers/uwsgi/nixos.ini
index 51bc6da33f6..51bc6da33f6 100644
--- a/pkgs/servers/uwsgi/nixos.ini
+++ b/nixpkgs/pkgs/servers/uwsgi/nixos.ini
diff --git a/pkgs/servers/varnish/default.nix b/nixpkgs/pkgs/servers/varnish/default.nix
index 8d49846cbc0..8d49846cbc0 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/nixpkgs/pkgs/servers/varnish/default.nix
diff --git a/pkgs/servers/varnish/digest.nix b/nixpkgs/pkgs/servers/varnish/digest.nix
index f11c577288f..f11c577288f 100644
--- a/pkgs/servers/varnish/digest.nix
+++ b/nixpkgs/pkgs/servers/varnish/digest.nix
diff --git a/pkgs/servers/varnish/dynamic.nix b/nixpkgs/pkgs/servers/varnish/dynamic.nix
index 7db4680ac62..7db4680ac62 100644
--- a/pkgs/servers/varnish/dynamic.nix
+++ b/nixpkgs/pkgs/servers/varnish/dynamic.nix
diff --git a/pkgs/servers/varnish/modules.nix b/nixpkgs/pkgs/servers/varnish/modules.nix
index 32c462e4a77..32c462e4a77 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/nixpkgs/pkgs/servers/varnish/modules.nix
diff --git a/pkgs/servers/varnish/packages.nix b/nixpkgs/pkgs/servers/varnish/packages.nix
index a5c5fe868d0..a5c5fe868d0 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/nixpkgs/pkgs/servers/varnish/packages.nix
diff --git a/pkgs/servers/web-apps/codimd/default.nix b/nixpkgs/pkgs/servers/web-apps/codimd/default.nix
index 5b61de48b8d..5b61de48b8d 100644
--- a/pkgs/servers/web-apps/codimd/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/default.nix
diff --git a/pkgs/servers/web-apps/codimd/package.json b/nixpkgs/pkgs/servers/web-apps/codimd/package.json
index 172822a26b3..172822a26b3 100644
--- a/pkgs/servers/web-apps/codimd/package.json
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/package.json
diff --git a/pkgs/servers/web-apps/codimd/yarn.lock b/nixpkgs/pkgs/servers/web-apps/codimd/yarn.lock
index 7c9d4997d79..7c9d4997d79 100644
--- a/pkgs/servers/web-apps/codimd/yarn.lock
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/yarn.lock
diff --git a/pkgs/servers/web-apps/codimd/yarn.nix b/nixpkgs/pkgs/servers/web-apps/codimd/yarn.nix
index add7d6a9ba5..add7d6a9ba5 100644
--- a/pkgs/servers/web-apps/codimd/yarn.nix
+++ b/nixpkgs/pkgs/servers/web-apps/codimd/yarn.nix
diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/bower-packages.nix
index 9b87924e0b9..9b87924e0b9 100644
--- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix
+++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/bower-packages.nix
diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/default.nix
index 77e529f26ab..77e529f26ab 100644
--- a/pkgs/servers/web-apps/cryptpad/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/default.nix
diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/nixpkgs/pkgs/servers/web-apps/cryptpad/generate.sh
index 8abf47409d4..8abf47409d4 100755
--- a/pkgs/servers/web-apps/cryptpad/generate.sh
+++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/generate.sh
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
index 9fb93c02085..9fb93c02085 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
+++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json
index c0c86f9848a..c0c86f9848a 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.json
+++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix
index 82739d484f2..82739d484f2 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix
diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix
index f12a75c8e18..f12a75c8e18 100644
--- a/pkgs/servers/web-apps/dokuwiki/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix
diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/nixpkgs/pkgs/servers/web-apps/fileshelter/default.nix
index 928d80b1297..928d80b1297 100644
--- a/pkgs/servers/web-apps/fileshelter/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/fileshelter/default.nix
diff --git a/pkgs/servers/web-apps/frab/Gemfile b/nixpkgs/pkgs/servers/web-apps/frab/Gemfile
index 098b8f3d7d7..098b8f3d7d7 100644
--- a/pkgs/servers/web-apps/frab/Gemfile
+++ b/nixpkgs/pkgs/servers/web-apps/frab/Gemfile
diff --git a/pkgs/servers/web-apps/frab/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/frab/Gemfile.lock
index dc18be7a33d..dc18be7a33d 100644
--- a/pkgs/servers/web-apps/frab/Gemfile.lock
+++ b/nixpkgs/pkgs/servers/web-apps/frab/Gemfile.lock
diff --git a/pkgs/servers/web-apps/frab/default.nix b/nixpkgs/pkgs/servers/web-apps/frab/default.nix
index 0b0583f1fb6..0b0583f1fb6 100644
--- a/pkgs/servers/web-apps/frab/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/frab/default.nix
diff --git a/pkgs/servers/web-apps/frab/gemset.nix b/nixpkgs/pkgs/servers/web-apps/frab/gemset.nix
index c3259a2709c..c3259a2709c 100644
--- a/pkgs/servers/web-apps/frab/gemset.nix
+++ b/nixpkgs/pkgs/servers/web-apps/frab/gemset.nix
diff --git a/pkgs/servers/web-apps/matomo/bootstrap.php b/nixpkgs/pkgs/servers/web-apps/matomo/bootstrap.php
index a8163f33e5c..a8163f33e5c 100644
--- a/pkgs/servers/web-apps/matomo/bootstrap.php
+++ b/nixpkgs/pkgs/servers/web-apps/matomo/bootstrap.php
diff --git a/pkgs/servers/web-apps/matomo/default.nix b/nixpkgs/pkgs/servers/web-apps/matomo/default.nix
index d5f0b7057f0..d5f0b7057f0 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/matomo/default.nix
diff --git a/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch b/nixpkgs/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch
index 5af8ef860b2..5af8ef860b2 100644
--- a/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch
+++ b/nixpkgs/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch
diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix
index d16d59af6b9..d16d59af6b9 100644
--- a/pkgs/servers/web-apps/mediawiki/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix
diff --git a/pkgs/servers/web-apps/moodle/default.nix b/nixpkgs/pkgs/servers/web-apps/moodle/default.nix
index 3de6005a3cf..3de6005a3cf 100644
--- a/pkgs/servers/web-apps/moodle/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/moodle/default.nix
diff --git a/pkgs/servers/web-apps/morty/default.nix b/nixpkgs/pkgs/servers/web-apps/morty/default.nix
index 3d43862cbe0..3d43862cbe0 100644
--- a/pkgs/servers/web-apps/morty/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/morty/default.nix
diff --git a/pkgs/servers/web-apps/morty/deps.nix b/nixpkgs/pkgs/servers/web-apps/morty/deps.nix
index 643fc5bb763..643fc5bb763 100644
--- a/pkgs/servers/web-apps/morty/deps.nix
+++ b/nixpkgs/pkgs/servers/web-apps/morty/deps.nix
diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
index 1b61632824f..1b61632824f 100644
--- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix
index 5c105e85a87..5c105e85a87 100644
--- a/pkgs/servers/web-apps/restya-board/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix
diff --git a/pkgs/servers/web-apps/restya-board/fix_request-uri.patch b/nixpkgs/pkgs/servers/web-apps/restya-board/fix_request-uri.patch
index 9b96756e829..9b96756e829 100644
--- a/pkgs/servers/web-apps/restya-board/fix_request-uri.patch
+++ b/nixpkgs/pkgs/servers/web-apps/restya-board/fix_request-uri.patch
diff --git a/pkgs/servers/web-apps/searx/default.nix b/nixpkgs/pkgs/servers/web-apps/searx/default.nix
index 6545151df23..6545151df23 100644
--- a/pkgs/servers/web-apps/searx/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/searx/default.nix
diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/nixpkgs/pkgs/servers/web-apps/selfoss/default.nix
index f6000fc4211..f6000fc4211 100644
--- a/pkgs/servers/web-apps/selfoss/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/selfoss/default.nix
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix
index f5bce90c234..f5bce90c234 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix
diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix
index b0829fce733..b0829fce733 100644
--- a/pkgs/servers/web-apps/shaarli/material-theme.nix
+++ b/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix
diff --git a/pkgs/servers/web-apps/shiori/default.nix b/nixpkgs/pkgs/servers/web-apps/shiori/default.nix
index dd4cdc08287..dd4cdc08287 100644
--- a/pkgs/servers/web-apps/shiori/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/shiori/default.nix
diff --git a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch b/nixpkgs/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch
index e20acdb04a9..e20acdb04a9 100644
--- a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch
+++ b/nixpkgs/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch
diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix
index 4be14b37bd2..4be14b37bd2 100644
--- a/pkgs/servers/web-apps/virtlyst/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix
index a105531ff4e..a105531ff4e 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix
diff --git a/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/nixpkgs/pkgs/servers/web-apps/wallabag/wallabag-data.patch
index 086e9395980..086e9395980 100644
--- a/pkgs/servers/web-apps/wallabag/wallabag-data.patch
+++ b/nixpkgs/pkgs/servers/web-apps/wallabag/wallabag-data.patch
diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
index 00ea34829aa..00ea34829aa 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
diff --git a/pkgs/servers/webmetro/default.nix b/nixpkgs/pkgs/servers/webmetro/default.nix
index fc9876e10c2..fc9876e10c2 100644
--- a/pkgs/servers/webmetro/default.nix
+++ b/nixpkgs/pkgs/servers/webmetro/default.nix
diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/nixpkgs/pkgs/servers/x11/quartz-wm/default.nix
index 84904d48b1e..84904d48b1e 100644
--- a/pkgs/servers/x11/quartz-wm/default.nix
+++ b/nixpkgs/pkgs/servers/x11/quartz-wm/default.nix
diff --git a/pkgs/servers/x11/quartz-wm/extern-patch.patch b/nixpkgs/pkgs/servers/x11/quartz-wm/extern-patch.patch
index cd7b47fc7b0..cd7b47fc7b0 100644
--- a/pkgs/servers/x11/quartz-wm/extern-patch.patch
+++ b/nixpkgs/pkgs/servers/x11/quartz-wm/extern-patch.patch
diff --git a/pkgs/servers/x11/quartz-wm/no_title_crash.patch b/nixpkgs/pkgs/servers/x11/quartz-wm/no_title_crash.patch
index 751a35072bc..751a35072bc 100644
--- a/pkgs/servers/x11/quartz-wm/no_title_crash.patch
+++ b/nixpkgs/pkgs/servers/x11/quartz-wm/no_title_crash.patch
diff --git a/pkgs/servers/x11/xorg/.gitignore b/nixpkgs/pkgs/servers/x11/xorg/.gitignore
index 1bf88f244e8..1bf88f244e8 100644
--- a/pkgs/servers/x11/xorg/.gitignore
+++ b/nixpkgs/pkgs/servers/x11/xorg/.gitignore
diff --git a/pkgs/servers/x11/xorg/builder.sh b/nixpkgs/pkgs/servers/x11/xorg/builder.sh
index 5a832cb14d5..5a832cb14d5 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/nixpkgs/pkgs/servers/x11/xorg/builder.sh
diff --git a/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h b/nixpkgs/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h
index b012570ae13..b012570ae13 100644
--- a/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h
+++ b/nixpkgs/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h
diff --git a/pkgs/servers/x11/xorg/default.nix b/nixpkgs/pkgs/servers/x11/xorg/default.nix
index 97506ce7447..97506ce7447 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/nixpkgs/pkgs/servers/x11/xorg/default.nix
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 21e61bc54d0..21e61bc54d0 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
diff --git a/pkgs/servers/x11/xorg/imake-cc-wrapper-uberhack.patch b/nixpkgs/pkgs/servers/x11/xorg/imake-cc-wrapper-uberhack.patch
index fe079eeb42a..fe079eeb42a 100644
--- a/pkgs/servers/x11/xorg/imake-cc-wrapper-uberhack.patch
+++ b/nixpkgs/pkgs/servers/x11/xorg/imake-cc-wrapper-uberhack.patch
diff --git a/pkgs/servers/x11/xorg/imake-setup-hook.sh b/nixpkgs/pkgs/servers/x11/xorg/imake-setup-hook.sh
index 351ffab34d0..351ffab34d0 100644
--- a/pkgs/servers/x11/xorg/imake-setup-hook.sh
+++ b/nixpkgs/pkgs/servers/x11/xorg/imake-setup-hook.sh
diff --git a/pkgs/servers/x11/xorg/imake.patch b/nixpkgs/pkgs/servers/x11/xorg/imake.patch
index 1d0ec88761d..1d0ec88761d 100644
--- a/pkgs/servers/x11/xorg/imake.patch
+++ b/nixpkgs/pkgs/servers/x11/xorg/imake.patch
diff --git a/pkgs/servers/x11/xorg/imake.sh b/nixpkgs/pkgs/servers/x11/xorg/imake.sh
index 4ab5e2ae160..4ab5e2ae160 100644
--- a/pkgs/servers/x11/xorg/imake.sh
+++ b/nixpkgs/pkgs/servers/x11/xorg/imake.sh
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
index 7a9ffcfc646..7a9ffcfc646 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
index 8db2034f1bc..8db2034f1bc 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/nixpkgs/pkgs/servers/x11/xorg/xcb-util-xrm.nix
index af526730ca9..af526730ca9 100644
--- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix
+++ b/nixpkgs/pkgs/servers/x11/xorg/xcb-util-xrm.nix
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix
index d033f211c3a..d033f211c3a 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix
diff --git a/pkgs/servers/x11/xquartz/X11 b/nixpkgs/pkgs/servers/x11/xquartz/X11
index e6bb87fab3f..e6bb87fab3f 100755
--- a/pkgs/servers/x11/xquartz/X11
+++ b/nixpkgs/pkgs/servers/x11/xquartz/X11
diff --git a/pkgs/servers/x11/xquartz/default.nix b/nixpkgs/pkgs/servers/x11/xquartz/default.nix
index cd5fac60abe..cd5fac60abe 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/nixpkgs/pkgs/servers/x11/xquartz/default.nix
diff --git a/pkgs/servers/x11/xquartz/font_cache b/nixpkgs/pkgs/servers/x11/xquartz/font_cache
index b1191980d77..b1191980d77 100755
--- a/pkgs/servers/x11/xquartz/font_cache
+++ b/nixpkgs/pkgs/servers/x11/xquartz/font_cache
diff --git a/pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist b/nixpkgs/pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist
index 190b383676d..190b383676d 100644
--- a/pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist
+++ b/nixpkgs/pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist
diff --git a/pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist b/nixpkgs/pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist
index 7a95916da16..7a95916da16 100644
--- a/pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist
+++ b/nixpkgs/pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist
diff --git a/pkgs/servers/x11/xquartz/patch_plist.rb b/nixpkgs/pkgs/servers/x11/xquartz/patch_plist.rb
index 9b0f778426e..9b0f778426e 100644
--- a/pkgs/servers/x11/xquartz/patch_plist.rb
+++ b/nixpkgs/pkgs/servers/x11/xquartz/patch_plist.rb
diff --git a/pkgs/servers/x11/xquartz/privileged b/nixpkgs/pkgs/servers/x11/xquartz/privileged
index 9d9c802002b..9d9c802002b 100755
--- a/pkgs/servers/x11/xquartz/privileged
+++ b/nixpkgs/pkgs/servers/x11/xquartz/privileged
diff --git a/pkgs/servers/x11/xquartz/startx b/nixpkgs/pkgs/servers/x11/xquartz/startx
index b4afebce57c..b4afebce57c 100755
--- a/pkgs/servers/x11/xquartz/startx
+++ b/nixpkgs/pkgs/servers/x11/xquartz/startx
diff --git a/pkgs/servers/x11/xquartz/system-fonts.nix b/nixpkgs/pkgs/servers/x11/xquartz/system-fonts.nix
index db47f8afe01..db47f8afe01 100644
--- a/pkgs/servers/x11/xquartz/system-fonts.nix
+++ b/nixpkgs/pkgs/servers/x11/xquartz/system-fonts.nix
diff --git a/pkgs/servers/x11/xquartz/xinitrc b/nixpkgs/pkgs/servers/x11/xquartz/xinitrc
index 276aeca7c84..276aeca7c84 100755
--- a/pkgs/servers/x11/xquartz/xinitrc
+++ b/nixpkgs/pkgs/servers/x11/xquartz/xinitrc
diff --git a/pkgs/servers/xandikos/default.nix b/nixpkgs/pkgs/servers/xandikos/default.nix
index 27fb93a8803..27fb93a8803 100644
--- a/pkgs/servers/xandikos/default.nix
+++ b/nixpkgs/pkgs/servers/xandikos/default.nix
diff --git a/pkgs/servers/xinetd/default.nix b/nixpkgs/pkgs/servers/xinetd/default.nix
index 445c6c57bbf..445c6c57bbf 100644
--- a/pkgs/servers/xinetd/default.nix
+++ b/nixpkgs/pkgs/servers/xinetd/default.nix
diff --git a/pkgs/servers/xmpp/biboumi/catch.patch b/nixpkgs/pkgs/servers/xmpp/biboumi/catch.patch
index bbd0a66909f..bbd0a66909f 100644
--- a/pkgs/servers/xmpp/biboumi/catch.patch
+++ b/nixpkgs/pkgs/servers/xmpp/biboumi/catch.patch
diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix
index c25c4baf13b..c25c4baf13b 100644
--- a/pkgs/servers/xmpp/biboumi/default.nix
+++ b/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix
index 0ac216b8e52..0ac216b8e52 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix
diff --git a/pkgs/servers/xmpp/openfire/default.nix b/nixpkgs/pkgs/servers/xmpp/openfire/default.nix
index ab377e3d53b..ab377e3d53b 100644
--- a/pkgs/servers/xmpp/openfire/default.nix
+++ b/nixpkgs/pkgs/servers/xmpp/openfire/default.nix
diff --git a/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix
new file mode 100644
index 00000000000..b96b4b1e8f0
--- /dev/null
+++ b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg
+, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop
+, withLibevent ? true, luaevent ? null
+, withDBI ? true, luadbi ? null
+# use withExtraLibs to add additional dependencies of community modules
+, withExtraLibs ? [ ]
+, withOnlyInstalledCommunityModules ? [ ]
+, withCommunityModules ? [ ] }:
+
+assert withLibevent -> luaevent != null;
+assert withDBI -> luadbi != null;
+
+with stdenv.lib;
+
+
+stdenv.mkDerivation rec {
+  version = "0.11.3"; # also update communityModules
+  pname = "prosody";
+
+  src = fetchurl {
+    url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
+    sha256 = "11xz4milv2962qf75vrdwsvd8sy2332nf69202rmvz5989pvvnng";
+  };
+
+  # A note to all those merging automated updates: Please also update this
+  # attribute as some modules might not be compatible with a newer prosody
+  # version.
+  communityModules = fetchhg {
+    url = "https://hg.prosody.im/prosody-modules";
+    rev = "bdbbf11eac0c";
+    sha256 = "17gkwx73fckcypnkpwz1lx74dk4hyhr66kj2nbwkdp6cb66c2k6d";
+  };
+
+  buildInputs = [
+    lua5 makeWrapper libidn openssl
+  ]
+  # Lua libraries
+  ++ [
+    luasocket luasec luaexpat luafilesystem luabitop
+  ]
+  ++ optional withLibevent luaevent
+  ++ optional withDBI luadbi
+  ++ withExtraLibs;
+
+
+  configureFlags = [
+    "--ostype=linux"
+    "--with-lua-include=${lua5}/include"
+    "--with-lua=${lua5}"
+  ];
+
+  postInstall = ''
+      ${concatMapStringsSep "\n" (module: ''
+        cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
+      '') (withCommunityModules ++ withOnlyInstalledCommunityModules)}
+      wrapProgram $out/bin/prosody \
+        --prefix LUA_PATH ';' "$LUA_PATH" \
+        --prefix LUA_CPATH ';' "$LUA_CPATH"
+      wrapProgram $out/bin/prosodyctl \
+        --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \
+        --prefix LUA_PATH ';' "$LUA_PATH" \
+        --prefix LUA_CPATH ';' "$LUA_CPATH"
+    '';
+
+  passthru.communityModules = withCommunityModules;
+
+  meta = {
+    description = "Open-source XMPP application server written in Lua";
+    license = licenses.mit;
+    homepage = https://prosody.im;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fpletz globin ];
+  };
+}
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix
index 7db8ec3b604..7db8ec3b604 100644
--- a/pkgs/servers/xmpp/pyIRCt/default.nix
+++ b/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix
diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix
index 0c85f322f48..0c85f322f48 100644
--- a/pkgs/servers/xmpp/pyMAILt/default.nix
+++ b/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix
diff --git a/pkgs/servers/zoneminder/default-to-http-1dot1.patch b/nixpkgs/pkgs/servers/zoneminder/default-to-http-1dot1.patch
index abd7ffccbb5..abd7ffccbb5 100644
--- a/pkgs/servers/zoneminder/default-to-http-1dot1.patch
+++ b/nixpkgs/pkgs/servers/zoneminder/default-to-http-1dot1.patch
diff --git a/pkgs/servers/zoneminder/default.nix b/nixpkgs/pkgs/servers/zoneminder/default.nix
index e536ea0373c..e536ea0373c 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/nixpkgs/pkgs/servers/zoneminder/default.nix
diff --git a/pkgs/servers/zoneminder/link-with-libdl.patch b/nixpkgs/pkgs/servers/zoneminder/link-with-libdl.patch
index 53aaf9b25f7..53aaf9b25f7 100644
--- a/pkgs/servers/zoneminder/link-with-libdl.patch
+++ b/nixpkgs/pkgs/servers/zoneminder/link-with-libdl.patch
diff --git a/pkgs/servers/zookeeper/default.nix b/nixpkgs/pkgs/servers/zookeeper/default.nix
index e4584535901..e4584535901 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/nixpkgs/pkgs/servers/zookeeper/default.nix
diff --git a/pkgs/shells/any-nix-shell/default.nix b/nixpkgs/pkgs/shells/any-nix-shell/default.nix
index d2b7a4929e1..d2b7a4929e1 100644
--- a/pkgs/shells/any-nix-shell/default.nix
+++ b/nixpkgs/pkgs/shells/any-nix-shell/default.nix
diff --git a/pkgs/shells/bash/4.4.nix b/nixpkgs/pkgs/shells/bash/4.4.nix
index 7ca57ac0156..7ca57ac0156 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/nixpkgs/pkgs/shells/bash/4.4.nix
diff --git a/pkgs/shells/bash/5.0.nix b/nixpkgs/pkgs/shells/bash/5.0.nix
index 05aaf39b340..05aaf39b340 100644
--- a/pkgs/shells/bash/5.0.nix
+++ b/nixpkgs/pkgs/shells/bash/5.0.nix
diff --git a/pkgs/shells/bash/bash-4.4-patches.nix b/nixpkgs/pkgs/shells/bash/bash-4.4-patches.nix
index a79ec90213a..a79ec90213a 100644
--- a/pkgs/shells/bash/bash-4.4-patches.nix
+++ b/nixpkgs/pkgs/shells/bash/bash-4.4-patches.nix
diff --git a/pkgs/shells/bash/bash-5.0-patches.nix b/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix
index 1f24a6dec12..1f24a6dec12 100644
--- a/pkgs/shells/bash/bash-5.0-patches.nix
+++ b/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix
diff --git a/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch b/nixpkgs/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch
index c0d94a1a76d..c0d94a1a76d 100644
--- a/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch
+++ b/nixpkgs/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch
diff --git a/pkgs/shells/bash/bash-completion/default.nix b/nixpkgs/pkgs/shells/bash/bash-completion/default.nix
index a741633340d..a741633340d 100644
--- a/pkgs/shells/bash/bash-completion/default.nix
+++ b/nixpkgs/pkgs/shells/bash/bash-completion/default.nix
diff --git a/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch b/nixpkgs/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch
index 48837310962..48837310962 100644
--- a/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch
+++ b/nixpkgs/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch
diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/nixpkgs/pkgs/shells/bash/nix-bash-completions/default.nix
index affbd219958..affbd219958 100644
--- a/pkgs/shells/bash/nix-bash-completions/default.nix
+++ b/nixpkgs/pkgs/shells/bash/nix-bash-completions/default.nix
diff --git a/pkgs/shells/bash/pgrp-pipe-4.4.patch b/nixpkgs/pkgs/shells/bash/pgrp-pipe-4.4.patch
index ea3d7bdf92b..ea3d7bdf92b 100644
--- a/pkgs/shells/bash/pgrp-pipe-4.4.patch
+++ b/nixpkgs/pkgs/shells/bash/pgrp-pipe-4.4.patch
diff --git a/pkgs/shells/bash/pgrp-pipe-5.0.patch b/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.0.patch
index 2a9fa6f33c3..2a9fa6f33c3 100644
--- a/pkgs/shells/bash/pgrp-pipe-5.0.patch
+++ b/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.0.patch
diff --git a/pkgs/shells/bash/update-patch-set.sh b/nixpkgs/pkgs/shells/bash/update-patch-set.sh
index 003c7a26d20..003c7a26d20 100755
--- a/pkgs/shells/bash/update-patch-set.sh
+++ b/nixpkgs/pkgs/shells/bash/update-patch-set.sh
diff --git a/pkgs/shells/dash/default.nix b/nixpkgs/pkgs/shells/dash/default.nix
index f8d592748b3..f8d592748b3 100644
--- a/pkgs/shells/dash/default.nix
+++ b/nixpkgs/pkgs/shells/dash/default.nix
diff --git a/pkgs/shells/dgsh/default.nix b/nixpkgs/pkgs/shells/dgsh/default.nix
index e2fd845c286..e2fd845c286 100644
--- a/pkgs/shells/dgsh/default.nix
+++ b/nixpkgs/pkgs/shells/dgsh/default.nix
diff --git a/pkgs/shells/dgsh/glibc-2.26.patch b/nixpkgs/pkgs/shells/dgsh/glibc-2.26.patch
index c6676815131..c6676815131 100644
--- a/pkgs/shells/dgsh/glibc-2.26.patch
+++ b/nixpkgs/pkgs/shells/dgsh/glibc-2.26.patch
diff --git a/pkgs/shells/elvish/default.nix b/nixpkgs/pkgs/shells/elvish/default.nix
index 80b0f386051..80b0f386051 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/nixpkgs/pkgs/shells/elvish/default.nix
diff --git a/pkgs/shells/es/default.nix b/nixpkgs/pkgs/shells/es/default.nix
index 446f28ba652..446f28ba652 100644
--- a/pkgs/shells/es/default.nix
+++ b/nixpkgs/pkgs/shells/es/default.nix
diff --git a/pkgs/shells/fish/default.nix b/nixpkgs/pkgs/shells/fish/default.nix
index 5f59c33af0d..5f59c33af0d 100644
--- a/pkgs/shells/fish/default.nix
+++ b/nixpkgs/pkgs/shells/fish/default.nix
diff --git a/pkgs/shells/fish/fish-foreign-env/default.nix b/nixpkgs/pkgs/shells/fish/fish-foreign-env/default.nix
index a5f429ed373..a5f429ed373 100644
--- a/pkgs/shells/fish/fish-foreign-env/default.nix
+++ b/nixpkgs/pkgs/shells/fish/fish-foreign-env/default.nix
diff --git a/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch b/nixpkgs/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch
index 5e4569f0a15..5e4569f0a15 100644
--- a/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch
+++ b/nixpkgs/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch
diff --git a/pkgs/shells/ion/default.nix b/nixpkgs/pkgs/shells/ion/default.nix
index 2010f34ef7e..2010f34ef7e 100644
--- a/pkgs/shells/ion/default.nix
+++ b/nixpkgs/pkgs/shells/ion/default.nix
diff --git a/pkgs/shells/jush/default.nix b/nixpkgs/pkgs/shells/jush/default.nix
index 833947a6ddb..833947a6ddb 100644
--- a/pkgs/shells/jush/default.nix
+++ b/nixpkgs/pkgs/shells/jush/default.nix
diff --git a/pkgs/shells/ksh/default.nix b/nixpkgs/pkgs/shells/ksh/default.nix
index 108d1a58758..108d1a58758 100644
--- a/pkgs/shells/ksh/default.nix
+++ b/nixpkgs/pkgs/shells/ksh/default.nix
diff --git a/pkgs/shells/liquidprompt/default.nix b/nixpkgs/pkgs/shells/liquidprompt/default.nix
index 62efabb022c..62efabb022c 100644
--- a/pkgs/shells/liquidprompt/default.nix
+++ b/nixpkgs/pkgs/shells/liquidprompt/default.nix
diff --git a/pkgs/shells/mksh/default.nix b/nixpkgs/pkgs/shells/mksh/default.nix
index 9b48c5c68a1..9b48c5c68a1 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/nixpkgs/pkgs/shells/mksh/default.nix
diff --git a/pkgs/shells/mrsh/default.nix b/nixpkgs/pkgs/shells/mrsh/default.nix
index bbd56e510b7..bbd56e510b7 100644
--- a/pkgs/shells/mrsh/default.nix
+++ b/nixpkgs/pkgs/shells/mrsh/default.nix
diff --git a/pkgs/shells/nushell/default.nix b/nixpkgs/pkgs/shells/nushell/default.nix
index de8502618c6..de8502618c6 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/nixpkgs/pkgs/shells/nushell/default.nix
diff --git a/pkgs/shells/oh/default.nix b/nixpkgs/pkgs/shells/oh/default.nix
index 3ae8a7c600a..3ae8a7c600a 100644
--- a/pkgs/shells/oh/default.nix
+++ b/nixpkgs/pkgs/shells/oh/default.nix
diff --git a/pkgs/shells/oh/deps.nix b/nixpkgs/pkgs/shells/oh/deps.nix
index b4b98f10c3a..b4b98f10c3a 100644
--- a/pkgs/shells/oh/deps.nix
+++ b/nixpkgs/pkgs/shells/oh/deps.nix
diff --git a/pkgs/shells/oil/default.nix b/nixpkgs/pkgs/shells/oil/default.nix
index 81c86284394..81c86284394 100644
--- a/pkgs/shells/oil/default.nix
+++ b/nixpkgs/pkgs/shells/oil/default.nix
diff --git a/pkgs/shells/pash/default.nix b/nixpkgs/pkgs/shells/pash/default.nix
index 8b8601e326c..8b8601e326c 100644
--- a/pkgs/shells/pash/default.nix
+++ b/nixpkgs/pkgs/shells/pash/default.nix
diff --git a/pkgs/shells/powershell/default.nix b/nixpkgs/pkgs/shells/powershell/default.nix
index faab933ae25..faab933ae25 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/nixpkgs/pkgs/shells/powershell/default.nix
diff --git a/pkgs/shells/rc/default.nix b/nixpkgs/pkgs/shells/rc/default.nix
index a8a7d4f6e77..a8a7d4f6e77 100644
--- a/pkgs/shells/rc/default.nix
+++ b/nixpkgs/pkgs/shells/rc/default.nix
diff --git a/pkgs/shells/rssh/default.nix b/nixpkgs/pkgs/shells/rssh/default.nix
index ecefbff7d22..ecefbff7d22 100644
--- a/pkgs/shells/rssh/default.nix
+++ b/nixpkgs/pkgs/shells/rssh/default.nix
diff --git a/pkgs/shells/rssh/fix-config-path.patch b/nixpkgs/pkgs/shells/rssh/fix-config-path.patch
index eecffb376ab..eecffb376ab 100644
--- a/pkgs/shells/rssh/fix-config-path.patch
+++ b/nixpkgs/pkgs/shells/rssh/fix-config-path.patch
diff --git a/pkgs/shells/rush/default.nix b/nixpkgs/pkgs/shells/rush/default.nix
index 9db36bc85fc..9db36bc85fc 100644
--- a/pkgs/shells/rush/default.nix
+++ b/nixpkgs/pkgs/shells/rush/default.nix
diff --git a/pkgs/shells/tcsh/default.nix b/nixpkgs/pkgs/shells/tcsh/default.nix
index 110beb82804..110beb82804 100644
--- a/pkgs/shells/tcsh/default.nix
+++ b/nixpkgs/pkgs/shells/tcsh/default.nix
diff --git a/pkgs/shells/xonsh/default.nix b/nixpkgs/pkgs/shells/xonsh/default.nix
index 0e2490ff434..0e2490ff434 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/nixpkgs/pkgs/shells/xonsh/default.nix
diff --git a/pkgs/shells/zsh/antibody/default.nix b/nixpkgs/pkgs/shells/zsh/antibody/default.nix
index e1bfc68dc4d..e1bfc68dc4d 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/antibody/default.nix
diff --git a/pkgs/shells/zsh/antigen/default.nix b/nixpkgs/pkgs/shells/zsh/antigen/default.nix
index c754d7bbe58..c754d7bbe58 100644
--- a/pkgs/shells/zsh/antigen/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/antigen/default.nix
diff --git a/pkgs/shells/zsh/default.nix b/nixpkgs/pkgs/shells/zsh/default.nix
index 0a26b8a7821..0a26b8a7821 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/default.nix
diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix
index e97ef1074f1..e97ef1074f1 100644
--- a/pkgs/shells/zsh/fzf-zsh/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix
diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix
index d13fd8aee00..d13fd8aee00 100644
--- a/pkgs/shells/zsh/gradle-completion/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix
diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix
index d23999abf3d..d23999abf3d 100644
--- a/pkgs/shells/zsh/grml-zsh-config/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix
diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
index 1794979bedf..1794979bedf 100644
--- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 036c388fbda..036c388fbda 100644
--- a/pkgs/shells/zsh/nix-zsh-completions/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
index 86e786668e1..86e786668e1 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
diff --git a/pkgs/shells/zsh/oh-my-zsh/update.sh b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh
index 0146cac8496..0146cac8496 100755
--- a/pkgs/shells/zsh/oh-my-zsh/update.sh
+++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh
diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix
index 0e7536b4fa1..0e7536b4fa1 100644
--- a/pkgs/shells/zsh/spaceship-prompt/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix
diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix
index 8c9c65c24e4..8c9c65c24e4 100644
--- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix
diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-bd/default.nix
index b5b66af6ca3..b5b66af6ca3 100644
--- a/pkgs/shells/zsh/zsh-bd/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-bd/default.nix
diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix
index 6228b97685a..6228b97685a 100644
--- a/pkgs/shells/zsh/zsh-command-time/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix
diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix
index 35355fe374d..35355fe374d 100644
--- a/pkgs/shells/zsh/zsh-completions/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix
diff --git a/pkgs/shells/zsh/zsh-deer/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-deer/default.nix
index 735d6a2b761..735d6a2b761 100644
--- a/pkgs/shells/zsh/zsh-deer/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-deer/default.nix
diff --git a/pkgs/shells/zsh/zsh-deer/realpath.patch b/nixpkgs/pkgs/shells/zsh/zsh-deer/realpath.patch
index 03850d7e5c1..03850d7e5c1 100644
--- a/pkgs/shells/zsh/zsh-deer/realpath.patch
+++ b/nixpkgs/pkgs/shells/zsh/zsh-deer/realpath.patch
diff --git a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix
index 452419bf8b0..452419bf8b0 100644
--- a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix
diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix
index 6aadf3163d3..6aadf3163d3 100644
--- a/pkgs/shells/zsh/zsh-git-prompt/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix
diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix
index fcd294f4dce..fcd294f4dce 100644
--- a/pkgs/shells/zsh/zsh-history-substring-search/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix
diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix
index ece3c87cb66..ece3c87cb66 100644
--- a/pkgs/shells/zsh/zsh-history/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix
diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index 5b649a3923e..5b649a3923e 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch
index a4440079e4b..a4440079e4b 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch
+++ b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch
diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
index c80ff0da60a..c80ff0da60a 100644
--- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix
index 383d1967531..383d1967531 100644
--- a/pkgs/shells/zsh/zsh-prezto/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix
diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
index 0dbfba52c0f..0dbfba52c0f 100644
--- a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix
index 91cf34268ac..91cf34268ac 100644
--- a/pkgs/shells/zsh/zsh-you-should-use/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix
diff --git a/pkgs/stdenv/adapters.nix b/nixpkgs/pkgs/stdenv/adapters.nix
index 8b23d3dadd2..8b23d3dadd2 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/nixpkgs/pkgs/stdenv/adapters.nix
diff --git a/pkgs/stdenv/booter.nix b/nixpkgs/pkgs/stdenv/booter.nix
index 51d617354e8..51d617354e8 100644
--- a/pkgs/stdenv/booter.nix
+++ b/nixpkgs/pkgs/stdenv/booter.nix
diff --git a/pkgs/stdenv/common-path.nix b/nixpkgs/pkgs/stdenv/common-path.nix
index da468d56a2c..da468d56a2c 100644
--- a/pkgs/stdenv/common-path.nix
+++ b/nixpkgs/pkgs/stdenv/common-path.nix
diff --git a/pkgs/stdenv/cross/default.nix b/nixpkgs/pkgs/stdenv/cross/default.nix
index cc49af7de3b..cc49af7de3b 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/nixpkgs/pkgs/stdenv/cross/default.nix
diff --git a/pkgs/stdenv/custom/default.nix b/nixpkgs/pkgs/stdenv/custom/default.nix
index 4c7380118f7..4c7380118f7 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/nixpkgs/pkgs/stdenv/custom/default.nix
diff --git a/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh b/nixpkgs/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh
index 7cb6a58f180..7cb6a58f180 100644
--- a/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh
+++ b/nixpkgs/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh
diff --git a/pkgs/stdenv/cygwin/rebase-i686.sh b/nixpkgs/pkgs/stdenv/cygwin/rebase-i686.sh
index 6b8ec441ca7..6b8ec441ca7 100644
--- a/pkgs/stdenv/cygwin/rebase-i686.sh
+++ b/nixpkgs/pkgs/stdenv/cygwin/rebase-i686.sh
diff --git a/pkgs/stdenv/cygwin/rebase-x86_64.sh b/nixpkgs/pkgs/stdenv/cygwin/rebase-x86_64.sh
index 6dccdc40c72..6dccdc40c72 100644
--- a/pkgs/stdenv/cygwin/rebase-x86_64.sh
+++ b/nixpkgs/pkgs/stdenv/cygwin/rebase-x86_64.sh
diff --git a/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh b/nixpkgs/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh
index d0da8c1b65c..d0da8c1b65c 100644
--- a/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh
+++ b/nixpkgs/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh
diff --git a/pkgs/stdenv/darwin/default.nix b/nixpkgs/pkgs/stdenv/darwin/default.nix
index 874b26ba89e..874b26ba89e 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/nixpkgs/pkgs/stdenv/darwin/default.nix
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index a299879693c..a299879693c 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix
diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/nixpkgs/pkgs/stdenv/darwin/portable-libsystem.sh
index f50ccc8d32e..f50ccc8d32e 100644
--- a/pkgs/stdenv/darwin/portable-libsystem.sh
+++ b/nixpkgs/pkgs/stdenv/darwin/portable-libsystem.sh
diff --git a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh b/nixpkgs/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
index 0da80ec5ce5..0da80ec5ce5 100644
--- a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
+++ b/nixpkgs/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
diff --git a/pkgs/stdenv/default.nix b/nixpkgs/pkgs/stdenv/default.nix
index b0db1be5f44..b0db1be5f44 100644
--- a/pkgs/stdenv/default.nix
+++ b/nixpkgs/pkgs/stdenv/default.nix
diff --git a/pkgs/stdenv/freebsd/default.nix b/nixpkgs/pkgs/stdenv/freebsd/default.nix
index dbb4a056455..dbb4a056455 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/nixpkgs/pkgs/stdenv/freebsd/default.nix
diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/nixpkgs/pkgs/stdenv/freebsd/trivial-bootstrap.sh
index fbff4575e5a..fbff4575e5a 100644
--- a/pkgs/stdenv/freebsd/trivial-bootstrap.sh
+++ b/nixpkgs/pkgs/stdenv/freebsd/trivial-bootstrap.sh
diff --git a/pkgs/stdenv/generic/builder.sh b/nixpkgs/pkgs/stdenv/generic/builder.sh
index 79bf21ab473..79bf21ab473 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/nixpkgs/pkgs/stdenv/generic/builder.sh
diff --git a/pkgs/stdenv/generic/check-meta.nix b/nixpkgs/pkgs/stdenv/generic/check-meta.nix
index 21ae809a222..21ae809a222 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/nixpkgs/pkgs/stdenv/generic/check-meta.nix
diff --git a/pkgs/stdenv/generic/default-builder.sh b/nixpkgs/pkgs/stdenv/generic/default-builder.sh
index 273fc55c755..273fc55c755 100644
--- a/pkgs/stdenv/generic/default-builder.sh
+++ b/nixpkgs/pkgs/stdenv/generic/default-builder.sh
diff --git a/pkgs/stdenv/generic/default.nix b/nixpkgs/pkgs/stdenv/generic/default.nix
index df2d35d541b..df2d35d541b 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/nixpkgs/pkgs/stdenv/generic/default.nix
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/nixpkgs/pkgs/stdenv/generic/make-derivation.nix
index a11b280b047..a11b280b047 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/nixpkgs/pkgs/stdenv/generic/make-derivation.nix
diff --git a/pkgs/stdenv/generic/setup.sh b/nixpkgs/pkgs/stdenv/generic/setup.sh
index 5b8fdde5796..5b8fdde5796 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/nixpkgs/pkgs/stdenv/generic/setup.sh
diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix
index ff0eec893f2..ff0eec893f2 100644
--- a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix
diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/aarch64.nix
index ca7e84502ab..ca7e84502ab 100644
--- a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/aarch64.nix
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
index 37471e9ce42..37471e9ce42 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix
index 45ac0d5f9ac..45ac0d5f9ac 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
index 44718975682..44718975682 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
index b97fd9967ea..b97fd9967ea 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
diff --git a/pkgs/stdenv/linux/bootstrap-files/i686.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/i686.nix
index cf484fd9253..cf484fd9253 100644
--- a/pkgs/stdenv/linux/bootstrap-files/i686.nix
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/i686.nix
diff --git a/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
index 8e22a274974..8e22a274974 100644
--- a/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix
index 543c1c83849..543c1c83849 100644
--- a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix
diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/x86_64.nix
index 69d08c5e981..69d08c5e981 100644
--- a/pkgs/stdenv/linux/bootstrap-files/x86_64.nix
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-files/x86_64.nix
diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
index 6118585d545..6118585d545 100644
--- a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh b/nixpkgs/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh
index b160a748d8d..b160a748d8d 100644
--- a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh
diff --git a/pkgs/stdenv/linux/bootstrap-tools/default.nix b/nixpkgs/pkgs/stdenv/linux/bootstrap-tools/default.nix
index 6118585d545..6118585d545 100644
--- a/pkgs/stdenv/linux/bootstrap-tools/default.nix
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-tools/default.nix
diff --git a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh b/nixpkgs/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
index 64583f80fa8..64583f80fa8 100644
--- a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
+++ b/nixpkgs/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
diff --git a/pkgs/stdenv/linux/default.nix b/nixpkgs/pkgs/stdenv/linux/default.nix
index 8344c9dfb2b..8344c9dfb2b 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/nixpkgs/pkgs/stdenv/linux/default.nix
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index d1ee317a2bc..d1ee317a2bc 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 0c285f9661e..0c285f9661e 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix
diff --git a/pkgs/stdenv/native/default.nix b/nixpkgs/pkgs/stdenv/native/default.nix
index f6e0df161ad..f6e0df161ad 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/nixpkgs/pkgs/stdenv/native/default.nix
diff --git a/pkgs/stdenv/nix/default.nix b/nixpkgs/pkgs/stdenv/nix/default.nix
index a8311f49609..a8311f49609 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/nixpkgs/pkgs/stdenv/nix/default.nix
diff --git a/pkgs/test/cc-wrapper/cc-main.c b/nixpkgs/pkgs/test/cc-wrapper/cc-main.c
index 06f28bc33c6..06f28bc33c6 100644
--- a/pkgs/test/cc-wrapper/cc-main.c
+++ b/nixpkgs/pkgs/test/cc-wrapper/cc-main.c
diff --git a/pkgs/test/cc-wrapper/cflags-main.c b/nixpkgs/pkgs/test/cc-wrapper/cflags-main.c
index 9491232b538..9491232b538 100644
--- a/pkgs/test/cc-wrapper/cflags-main.c
+++ b/nixpkgs/pkgs/test/cc-wrapper/cflags-main.c
diff --git a/pkgs/test/cc-wrapper/core-foundation-main.c b/nixpkgs/pkgs/test/cc-wrapper/core-foundation-main.c
index fb3bd312619..fb3bd312619 100644
--- a/pkgs/test/cc-wrapper/core-foundation-main.c
+++ b/nixpkgs/pkgs/test/cc-wrapper/core-foundation-main.c
diff --git a/pkgs/test/cc-wrapper/cxx-main.cc b/nixpkgs/pkgs/test/cc-wrapper/cxx-main.cc
index 83f704617a4..83f704617a4 100644
--- a/pkgs/test/cc-wrapper/cxx-main.cc
+++ b/nixpkgs/pkgs/test/cc-wrapper/cxx-main.cc
diff --git a/pkgs/test/cc-wrapper/default.nix b/nixpkgs/pkgs/test/cc-wrapper/default.nix
index 7bd82b4ab2a..7bd82b4ab2a 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/nixpkgs/pkgs/test/cc-wrapper/default.nix
diff --git a/pkgs/test/cc-wrapper/foo.c b/nixpkgs/pkgs/test/cc-wrapper/foo.c
index 8be674be310..8be674be310 100644
--- a/pkgs/test/cc-wrapper/foo.c
+++ b/nixpkgs/pkgs/test/cc-wrapper/foo.c
diff --git a/pkgs/test/cc-wrapper/ldflags-main.c b/nixpkgs/pkgs/test/cc-wrapper/ldflags-main.c
index 89832b3bbad..89832b3bbad 100644
--- a/pkgs/test/cc-wrapper/ldflags-main.c
+++ b/nixpkgs/pkgs/test/cc-wrapper/ldflags-main.c
diff --git a/pkgs/test/cc-wrapper/multilib.nix b/nixpkgs/pkgs/test/cc-wrapper/multilib.nix
index 5ea50b5eb26..5ea50b5eb26 100644
--- a/pkgs/test/cc-wrapper/multilib.nix
+++ b/nixpkgs/pkgs/test/cc-wrapper/multilib.nix
diff --git a/pkgs/test/cc-wrapper/sanitizers.c b/nixpkgs/pkgs/test/cc-wrapper/sanitizers.c
index 93dd78a903c..93dd78a903c 100644
--- a/pkgs/test/cc-wrapper/sanitizers.c
+++ b/nixpkgs/pkgs/test/cc-wrapper/sanitizers.c
diff --git a/pkgs/test/cross/default.nix b/nixpkgs/pkgs/test/cross/default.nix
index 6c31a16f2fd..6c31a16f2fd 100644
--- a/pkgs/test/cross/default.nix
+++ b/nixpkgs/pkgs/test/cross/default.nix
diff --git a/pkgs/test/default.nix b/nixpkgs/pkgs/test/default.nix
index c248eebaec3..c248eebaec3 100644
--- a/pkgs/test/default.nix
+++ b/nixpkgs/pkgs/test/default.nix
diff --git a/pkgs/test/haskell-shellFor/default.nix b/nixpkgs/pkgs/test/haskell-shellFor/default.nix
index 1b3de999d22..1b3de999d22 100644
--- a/pkgs/test/haskell-shellFor/default.nix
+++ b/nixpkgs/pkgs/test/haskell-shellFor/default.nix
diff --git a/pkgs/test/kernel.nix b/nixpkgs/pkgs/test/kernel.nix
index 86f1b8d8e9a..86f1b8d8e9a 100644
--- a/pkgs/test/kernel.nix
+++ b/nixpkgs/pkgs/test/kernel.nix
diff --git a/pkgs/test/ld-library-path/default.nix b/nixpkgs/pkgs/test/ld-library-path/default.nix
index bda3f0be84a..bda3f0be84a 100644
--- a/pkgs/test/ld-library-path/default.nix
+++ b/nixpkgs/pkgs/test/ld-library-path/default.nix
diff --git a/pkgs/test/macos-sierra-shared/default.nix b/nixpkgs/pkgs/test/macos-sierra-shared/default.nix
index 810d5d97829..810d5d97829 100644
--- a/pkgs/test/macos-sierra-shared/default.nix
+++ b/nixpkgs/pkgs/test/macos-sierra-shared/default.nix
diff --git a/pkgs/test/mkOption/declare.nix b/nixpkgs/pkgs/test/mkOption/declare.nix
index 9e89a1c096d..9e89a1c096d 100644
--- a/pkgs/test/mkOption/declare.nix
+++ b/nixpkgs/pkgs/test/mkOption/declare.nix
diff --git a/pkgs/test/mkOption/keep.nix b/nixpkgs/pkgs/test/mkOption/keep.nix
index 26fb8c28dd5..26fb8c28dd5 100644
--- a/pkgs/test/mkOption/keep.nix
+++ b/nixpkgs/pkgs/test/mkOption/keep.nix
diff --git a/pkgs/test/mkOption/keep.ref b/nixpkgs/pkgs/test/mkOption/keep.ref
index a3a051eb48c..a3a051eb48c 100644
--- a/pkgs/test/mkOption/keep.ref
+++ b/nixpkgs/pkgs/test/mkOption/keep.ref
diff --git a/pkgs/test/mkOption/merge.nix b/nixpkgs/pkgs/test/mkOption/merge.nix
index bbf68218aa0..bbf68218aa0 100644
--- a/pkgs/test/mkOption/merge.nix
+++ b/nixpkgs/pkgs/test/mkOption/merge.nix
diff --git a/pkgs/test/mkOption/merge.ref b/nixpkgs/pkgs/test/mkOption/merge.ref
index 6956f65dbbc..6956f65dbbc 100644
--- a/pkgs/test/mkOption/merge.ref
+++ b/nixpkgs/pkgs/test/mkOption/merge.ref
diff --git a/pkgs/test/mkOption/test.sh b/nixpkgs/pkgs/test/mkOption/test.sh
index 5478846d563..5478846d563 100755
--- a/pkgs/test/mkOption/test.sh
+++ b/nixpkgs/pkgs/test/mkOption/test.sh
diff --git a/pkgs/test/nixos-functions/default.nix b/nixpkgs/pkgs/test/nixos-functions/default.nix
index 6dee0a27a79..6dee0a27a79 100644
--- a/pkgs/test/nixos-functions/default.nix
+++ b/nixpkgs/pkgs/test/nixos-functions/default.nix
diff --git a/pkgs/test/patch-shebangs/default.nix b/nixpkgs/pkgs/test/patch-shebangs/default.nix
index 3e68d96004f..3e68d96004f 100644
--- a/pkgs/test/patch-shebangs/default.nix
+++ b/nixpkgs/pkgs/test/patch-shebangs/default.nix
diff --git a/pkgs/test/simple/builder.sh b/nixpkgs/pkgs/test/simple/builder.sh
index 65f7e4c11ba..65f7e4c11ba 100644
--- a/pkgs/test/simple/builder.sh
+++ b/nixpkgs/pkgs/test/simple/builder.sh
diff --git a/pkgs/test/stdenv-inputs/bar.c b/nixpkgs/pkgs/test/stdenv-inputs/bar.c
index 2d7299c2d46..2d7299c2d46 100644
--- a/pkgs/test/stdenv-inputs/bar.c
+++ b/nixpkgs/pkgs/test/stdenv-inputs/bar.c
diff --git a/pkgs/test/stdenv-inputs/cc-main.c b/nixpkgs/pkgs/test/stdenv-inputs/cc-main.c
index 06f28bc33c6..06f28bc33c6 100644
--- a/pkgs/test/stdenv-inputs/cc-main.c
+++ b/nixpkgs/pkgs/test/stdenv-inputs/cc-main.c
diff --git a/pkgs/test/stdenv-inputs/default.nix b/nixpkgs/pkgs/test/stdenv-inputs/default.nix
index 4db10e75086..4db10e75086 100644
--- a/pkgs/test/stdenv-inputs/default.nix
+++ b/nixpkgs/pkgs/test/stdenv-inputs/default.nix
diff --git a/pkgs/test/stdenv-inputs/foo.c b/nixpkgs/pkgs/test/stdenv-inputs/foo.c
index 0253a26d5d2..0253a26d5d2 100644
--- a/pkgs/test/stdenv-inputs/foo.c
+++ b/nixpkgs/pkgs/test/stdenv-inputs/foo.c
diff --git a/pkgs/test/stdenv-inputs/include-main.c b/nixpkgs/pkgs/test/stdenv-inputs/include-main.c
index 35e5ee0d90f..35e5ee0d90f 100644
--- a/pkgs/test/stdenv-inputs/include-main.c
+++ b/nixpkgs/pkgs/test/stdenv-inputs/include-main.c
diff --git a/pkgs/test/stdenv-inputs/lib-main.c b/nixpkgs/pkgs/test/stdenv-inputs/lib-main.c
index c9488fe43e5..c9488fe43e5 100644
--- a/pkgs/test/stdenv-inputs/lib-main.c
+++ b/nixpkgs/pkgs/test/stdenv-inputs/lib-main.c
diff --git a/pkgs/tools/X11/alttab/default.nix b/nixpkgs/pkgs/tools/X11/alttab/default.nix
index 4efd86ca63f..4efd86ca63f 100644
--- a/pkgs/tools/X11/alttab/default.nix
+++ b/nixpkgs/pkgs/tools/X11/alttab/default.nix
diff --git a/pkgs/tools/X11/arandr/default.nix b/nixpkgs/pkgs/tools/X11/arandr/default.nix
index 51f2f5ec249..51f2f5ec249 100644
--- a/pkgs/tools/X11/arandr/default.nix
+++ b/nixpkgs/pkgs/tools/X11/arandr/default.nix
diff --git a/pkgs/tools/X11/autocutsel/default.nix b/nixpkgs/pkgs/tools/X11/autocutsel/default.nix
index db17788cea0..db17788cea0 100644
--- a/pkgs/tools/X11/autocutsel/default.nix
+++ b/nixpkgs/pkgs/tools/X11/autocutsel/default.nix
diff --git a/pkgs/tools/X11/bgs/default.nix b/nixpkgs/pkgs/tools/X11/bgs/default.nix
index 66d845b0587..66d845b0587 100644
--- a/pkgs/tools/X11/bgs/default.nix
+++ b/nixpkgs/pkgs/tools/X11/bgs/default.nix
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/nixpkgs/pkgs/tools/X11/bumblebee/default.nix
index f5a8fd24f5e..f5a8fd24f5e 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/nixpkgs/pkgs/tools/X11/bumblebee/default.nix
diff --git a/pkgs/tools/X11/bumblebee/nixos.patch b/nixpkgs/pkgs/tools/X11/bumblebee/nixos.patch
index cf6ee5add98..cf6ee5add98 100644
--- a/pkgs/tools/X11/bumblebee/nixos.patch
+++ b/nixpkgs/pkgs/tools/X11/bumblebee/nixos.patch
diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix
index c161a7c7737..c161a7c7737 100644
--- a/pkgs/tools/X11/caffeine-ng/default.nix
+++ b/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix
index 1948dd2b9c5..1948dd2b9c5 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix
diff --git a/pkgs/tools/X11/dex/default.nix b/nixpkgs/pkgs/tools/X11/dex/default.nix
index 9387c62c2a5..9387c62c2a5 100644
--- a/pkgs/tools/X11/dex/default.nix
+++ b/nixpkgs/pkgs/tools/X11/dex/default.nix
diff --git a/pkgs/tools/X11/dispad/default.nix b/nixpkgs/pkgs/tools/X11/dispad/default.nix
index 7c1457d3e2a..7c1457d3e2a 100644
--- a/pkgs/tools/X11/dispad/default.nix
+++ b/nixpkgs/pkgs/tools/X11/dispad/default.nix
diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/nixpkgs/pkgs/tools/X11/dragon-drop/default.nix
index 54ece6a9a16..54ece6a9a16 100644
--- a/pkgs/tools/X11/dragon-drop/default.nix
+++ b/nixpkgs/pkgs/tools/X11/dragon-drop/default.nix
diff --git a/pkgs/tools/X11/ffcast/default.nix b/nixpkgs/pkgs/tools/X11/ffcast/default.nix
index ff84dde6f99..ff84dde6f99 100644
--- a/pkgs/tools/X11/ffcast/default.nix
+++ b/nixpkgs/pkgs/tools/X11/ffcast/default.nix
diff --git a/pkgs/tools/X11/go-sct/default.nix b/nixpkgs/pkgs/tools/X11/go-sct/default.nix
index 01d82b4a112..01d82b4a112 100644
--- a/pkgs/tools/X11/go-sct/default.nix
+++ b/nixpkgs/pkgs/tools/X11/go-sct/default.nix
diff --git a/pkgs/tools/X11/go-sct/deps.nix b/nixpkgs/pkgs/tools/X11/go-sct/deps.nix
index f808858e091..f808858e091 100644
--- a/pkgs/tools/X11/go-sct/deps.nix
+++ b/nixpkgs/pkgs/tools/X11/go-sct/deps.nix
diff --git a/pkgs/tools/X11/grobi/default.nix b/nixpkgs/pkgs/tools/X11/grobi/default.nix
index 976cabc33f8..976cabc33f8 100644
--- a/pkgs/tools/X11/grobi/default.nix
+++ b/nixpkgs/pkgs/tools/X11/grobi/default.nix
diff --git a/pkgs/tools/X11/hsetroot/default.nix b/nixpkgs/pkgs/tools/X11/hsetroot/default.nix
index 6bae355812c..6bae355812c 100644
--- a/pkgs/tools/X11/hsetroot/default.nix
+++ b/nixpkgs/pkgs/tools/X11/hsetroot/default.nix
diff --git a/pkgs/tools/X11/imwheel/default.nix b/nixpkgs/pkgs/tools/X11/imwheel/default.nix
index efed00f9639..efed00f9639 100644
--- a/pkgs/tools/X11/imwheel/default.nix
+++ b/nixpkgs/pkgs/tools/X11/imwheel/default.nix
diff --git a/pkgs/tools/X11/jumpapp/default.nix b/nixpkgs/pkgs/tools/X11/jumpapp/default.nix
index 23ba445b674..23ba445b674 100644
--- a/pkgs/tools/X11/jumpapp/default.nix
+++ b/nixpkgs/pkgs/tools/X11/jumpapp/default.nix
diff --git a/pkgs/tools/X11/keynav/default.nix b/nixpkgs/pkgs/tools/X11/keynav/default.nix
index 5eb74a26798..5eb74a26798 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/nixpkgs/pkgs/tools/X11/keynav/default.nix
diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix
index 1472e39c83c..1472e39c83c 100644
--- a/pkgs/tools/X11/ksuperkey/default.nix
+++ b/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix
diff --git a/pkgs/tools/X11/libstrangle/default.nix b/nixpkgs/pkgs/tools/X11/libstrangle/default.nix
index d24654ce3ad..d24654ce3ad 100644
--- a/pkgs/tools/X11/libstrangle/default.nix
+++ b/nixpkgs/pkgs/tools/X11/libstrangle/default.nix
diff --git a/pkgs/tools/X11/libstrangle/nixos.patch b/nixpkgs/pkgs/tools/X11/libstrangle/nixos.patch
index 03c8c19b54c..03c8c19b54c 100644
--- a/pkgs/tools/X11/libstrangle/nixos.patch
+++ b/nixpkgs/pkgs/tools/X11/libstrangle/nixos.patch
diff --git a/pkgs/tools/X11/ncview/default.nix b/nixpkgs/pkgs/tools/X11/ncview/default.nix
index 1f793aa6c4c..1f793aa6c4c 100644
--- a/pkgs/tools/X11/ncview/default.nix
+++ b/nixpkgs/pkgs/tools/X11/ncview/default.nix
diff --git a/pkgs/tools/X11/nitrogen/default.nix b/nixpkgs/pkgs/tools/X11/nitrogen/default.nix
index 95aa15840da..95aa15840da 100644
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ b/nixpkgs/pkgs/tools/X11/nitrogen/default.nix
diff --git a/pkgs/tools/X11/numlockx/default.nix b/nixpkgs/pkgs/tools/X11/numlockx/default.nix
index b59e9dc30ac..b59e9dc30ac 100644
--- a/pkgs/tools/X11/numlockx/default.nix
+++ b/nixpkgs/pkgs/tools/X11/numlockx/default.nix
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/nixpkgs/pkgs/tools/X11/nx-libs/default.nix
index 77aada9f83f..77aada9f83f 100644
--- a/pkgs/tools/X11/nx-libs/default.nix
+++ b/nixpkgs/pkgs/tools/X11/nx-libs/default.nix
diff --git a/pkgs/tools/X11/obconf/default.nix b/nixpkgs/pkgs/tools/X11/obconf/default.nix
index 6b1b353b09b..6b1b353b09b 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/nixpkgs/pkgs/tools/X11/obconf/default.nix
diff --git a/pkgs/tools/X11/primus/default.nix b/nixpkgs/pkgs/tools/X11/primus/default.nix
index eb8aa042e7b..eb8aa042e7b 100644
--- a/pkgs/tools/X11/primus/default.nix
+++ b/nixpkgs/pkgs/tools/X11/primus/default.nix
diff --git a/pkgs/tools/X11/primus/lib.nix b/nixpkgs/pkgs/tools/X11/primus/lib.nix
index 13d7e06c730..13d7e06c730 100644
--- a/pkgs/tools/X11/primus/lib.nix
+++ b/nixpkgs/pkgs/tools/X11/primus/lib.nix
diff --git a/pkgs/tools/X11/ratmen/default.nix b/nixpkgs/pkgs/tools/X11/ratmen/default.nix
index aa5e346334a..aa5e346334a 100644
--- a/pkgs/tools/X11/ratmen/default.nix
+++ b/nixpkgs/pkgs/tools/X11/ratmen/default.nix
diff --git a/pkgs/tools/X11/run-scaled/default.nix b/nixpkgs/pkgs/tools/X11/run-scaled/default.nix
index fc0068e6e27..fc0068e6e27 100644
--- a/pkgs/tools/X11/run-scaled/default.nix
+++ b/nixpkgs/pkgs/tools/X11/run-scaled/default.nix
diff --git a/pkgs/tools/X11/runningx/default.nix b/nixpkgs/pkgs/tools/X11/runningx/default.nix
index 31e2320e1b9..31e2320e1b9 100644
--- a/pkgs/tools/X11/runningx/default.nix
+++ b/nixpkgs/pkgs/tools/X11/runningx/default.nix
diff --git a/pkgs/tools/X11/screen-message/default.nix b/nixpkgs/pkgs/tools/X11/screen-message/default.nix
index c57c4f82431..c57c4f82431 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/nixpkgs/pkgs/tools/X11/screen-message/default.nix
diff --git a/pkgs/tools/X11/sct/DISPLAY-segfault.patch b/nixpkgs/pkgs/tools/X11/sct/DISPLAY-segfault.patch
index 6b83afa332b..6b83afa332b 100644
--- a/pkgs/tools/X11/sct/DISPLAY-segfault.patch
+++ b/nixpkgs/pkgs/tools/X11/sct/DISPLAY-segfault.patch
diff --git a/pkgs/tools/X11/sct/default.nix b/nixpkgs/pkgs/tools/X11/sct/default.nix
index 9f45bbe3087..9f45bbe3087 100644
--- a/pkgs/tools/X11/sct/default.nix
+++ b/nixpkgs/pkgs/tools/X11/sct/default.nix
diff --git a/pkgs/tools/X11/setroot/default.nix b/nixpkgs/pkgs/tools/X11/setroot/default.nix
index a9b5f17af83..a9b5f17af83 100644
--- a/pkgs/tools/X11/setroot/default.nix
+++ b/nixpkgs/pkgs/tools/X11/setroot/default.nix
diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix
index 4fd9678733d..4fd9678733d 100644
--- a/pkgs/tools/X11/skippy-xd/default.nix
+++ b/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix
diff --git a/pkgs/tools/X11/srandrd/default.nix b/nixpkgs/pkgs/tools/X11/srandrd/default.nix
index 6d5fa0f3d98..6d5fa0f3d98 100644
--- a/pkgs/tools/X11/srandrd/default.nix
+++ b/nixpkgs/pkgs/tools/X11/srandrd/default.nix
diff --git a/pkgs/tools/X11/sselp/default.nix b/nixpkgs/pkgs/tools/X11/sselp/default.nix
index 30f99cd40f2..30f99cd40f2 100644
--- a/pkgs/tools/X11/sselp/default.nix
+++ b/nixpkgs/pkgs/tools/X11/sselp/default.nix
diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/nixpkgs/pkgs/tools/X11/vdpauinfo/default.nix
index 153ff45d2a7..153ff45d2a7 100644
--- a/pkgs/tools/X11/vdpauinfo/default.nix
+++ b/nixpkgs/pkgs/tools/X11/vdpauinfo/default.nix
diff --git a/pkgs/tools/X11/virtualgl/default.nix b/nixpkgs/pkgs/tools/X11/virtualgl/default.nix
index aa839e6d684..aa839e6d684 100644
--- a/pkgs/tools/X11/virtualgl/default.nix
+++ b/nixpkgs/pkgs/tools/X11/virtualgl/default.nix
diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix
index 92afa30e616..92afa30e616 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix
diff --git a/pkgs/tools/X11/wayv/default.nix b/nixpkgs/pkgs/tools/X11/wayv/default.nix
index f906a6d403e..f906a6d403e 100644
--- a/pkgs/tools/X11/wayv/default.nix
+++ b/nixpkgs/pkgs/tools/X11/wayv/default.nix
diff --git a/pkgs/tools/X11/wmctrl/64-bit-data.patch b/nixpkgs/pkgs/tools/X11/wmctrl/64-bit-data.patch
index 3ec1c913ffe..3ec1c913ffe 100644
--- a/pkgs/tools/X11/wmctrl/64-bit-data.patch
+++ b/nixpkgs/pkgs/tools/X11/wmctrl/64-bit-data.patch
diff --git a/pkgs/tools/X11/wmctrl/default.nix b/nixpkgs/pkgs/tools/X11/wmctrl/default.nix
index e4cb70c8f24..e4cb70c8f24 100644
--- a/pkgs/tools/X11/wmctrl/default.nix
+++ b/nixpkgs/pkgs/tools/X11/wmctrl/default.nix
diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix
index fe5c70f6ce2..fe5c70f6ce2 100644
--- a/pkgs/tools/X11/wmutils-core/default.nix
+++ b/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix
diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/nixpkgs/pkgs/tools/X11/wmutils-opt/default.nix
index c1230303862..c1230303862 100644
--- a/pkgs/tools/X11/wmutils-opt/default.nix
+++ b/nixpkgs/pkgs/tools/X11/wmutils-opt/default.nix
diff --git a/pkgs/tools/X11/wpgtk/default.nix b/nixpkgs/pkgs/tools/X11/wpgtk/default.nix
index fce3df19718..fce3df19718 100644
--- a/pkgs/tools/X11/wpgtk/default.nix
+++ b/nixpkgs/pkgs/tools/X11/wpgtk/default.nix
diff --git a/pkgs/tools/X11/x11spice/default.nix b/nixpkgs/pkgs/tools/X11/x11spice/default.nix
index 513149049fa..513149049fa 100644
--- a/pkgs/tools/X11/x11spice/default.nix
+++ b/nixpkgs/pkgs/tools/X11/x11spice/default.nix
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/nixpkgs/pkgs/tools/X11/x11vnc/default.nix
index acf0fc9aabf..acf0fc9aabf 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/nixpkgs/pkgs/tools/X11/x11vnc/default.nix
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/nixpkgs/pkgs/tools/X11/x2vnc/default.nix
index 6075f0070f9..6075f0070f9 100644
--- a/pkgs/tools/X11/x2vnc/default.nix
+++ b/nixpkgs/pkgs/tools/X11/x2vnc/default.nix
diff --git a/pkgs/tools/X11/x2x/default.nix b/nixpkgs/pkgs/tools/X11/x2x/default.nix
index 5c8e3d4f8fb..5c8e3d4f8fb 100644
--- a/pkgs/tools/X11/x2x/default.nix
+++ b/nixpkgs/pkgs/tools/X11/x2x/default.nix
diff --git a/pkgs/tools/X11/xannotate/default.nix b/nixpkgs/pkgs/tools/X11/xannotate/default.nix
index d52698b0ed7..d52698b0ed7 100644
--- a/pkgs/tools/X11/xannotate/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xannotate/default.nix
diff --git a/pkgs/tools/X11/xautomation/default.nix b/nixpkgs/pkgs/tools/X11/xautomation/default.nix
index a648eefcdde..a648eefcdde 100644
--- a/pkgs/tools/X11/xautomation/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xautomation/default.nix
diff --git a/pkgs/tools/X11/xbanish/default.nix b/nixpkgs/pkgs/tools/X11/xbanish/default.nix
index af522cca9e1..af522cca9e1 100644
--- a/pkgs/tools/X11/xbanish/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xbanish/default.nix
diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix
index bb83effe601..bb83effe601 100644
--- a/pkgs/tools/X11/xbindkeys-config/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix
diff --git a/pkgs/tools/X11/xbindkeys-config/xbindkeys-config-patch1.patch b/nixpkgs/pkgs/tools/X11/xbindkeys-config/xbindkeys-config-patch1.patch
index d4620b5d907..d4620b5d907 100644
--- a/pkgs/tools/X11/xbindkeys-config/xbindkeys-config-patch1.patch
+++ b/nixpkgs/pkgs/tools/X11/xbindkeys-config/xbindkeys-config-patch1.patch
diff --git a/pkgs/tools/X11/xbindkeys-config/xbindkeys-config.1 b/nixpkgs/pkgs/tools/X11/xbindkeys-config/xbindkeys-config.1
index e3f8de1a804..e3f8de1a804 100644
--- a/pkgs/tools/X11/xbindkeys-config/xbindkeys-config.1
+++ b/nixpkgs/pkgs/tools/X11/xbindkeys-config/xbindkeys-config.1
diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix
index 23e0ce63e5b..23e0ce63e5b 100644
--- a/pkgs/tools/X11/xbindkeys/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix
diff --git a/pkgs/tools/X11/xbrightness/default.nix b/nixpkgs/pkgs/tools/X11/xbrightness/default.nix
index e196411ce41..e196411ce41 100644
--- a/pkgs/tools/X11/xbrightness/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xbrightness/default.nix
diff --git a/pkgs/tools/X11/xcalib/default.nix b/nixpkgs/pkgs/tools/X11/xcalib/default.nix
index 4e400ee8a24..4e400ee8a24 100644
--- a/pkgs/tools/X11/xcalib/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xcalib/default.nix
diff --git a/pkgs/tools/X11/xcape/default.nix b/nixpkgs/pkgs/tools/X11/xcape/default.nix
index d1b6f9b23b6..d1b6f9b23b6 100644
--- a/pkgs/tools/X11/xcape/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xcape/default.nix
diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/nixpkgs/pkgs/tools/X11/xchainkeys/default.nix
index f06b4cc6b37..f06b4cc6b37 100644
--- a/pkgs/tools/X11/xchainkeys/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xchainkeys/default.nix
diff --git a/pkgs/tools/X11/xcwd/default.nix b/nixpkgs/pkgs/tools/X11/xcwd/default.nix
index d50a7c006c8..d50a7c006c8 100644
--- a/pkgs/tools/X11/xcwd/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xcwd/default.nix
diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix
index 066b566be1f..066b566be1f 100644
--- a/pkgs/tools/X11/xdg-user-dirs/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix
index 99d5df2591a..99d5df2591a 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix
diff --git a/pkgs/tools/X11/xdotool/default.nix b/nixpkgs/pkgs/tools/X11/xdotool/default.nix
index 6fa185dfeab..6fa185dfeab 100644
--- a/pkgs/tools/X11/xdotool/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xdotool/default.nix
diff --git a/pkgs/tools/X11/xgeometry-select/default.nix b/nixpkgs/pkgs/tools/X11/xgeometry-select/default.nix
index 76493dfb73e..76493dfb73e 100644
--- a/pkgs/tools/X11/xgeometry-select/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xgeometry-select/default.nix
diff --git a/pkgs/tools/X11/xidlehook/default.nix b/nixpkgs/pkgs/tools/X11/xidlehook/default.nix
index 67c6a594db7..67c6a594db7 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xidlehook/default.nix
diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/nixpkgs/pkgs/tools/X11/xinput_calibrator/default.nix
index 9aee0d778c4..9aee0d778c4 100644
--- a/pkgs/tools/X11/xinput_calibrator/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xinput_calibrator/default.nix
diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix
index a837e73983f..a837e73983f 100644
--- a/pkgs/tools/X11/xkb-switch/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix
diff --git a/pkgs/tools/X11/xkbset/default.nix b/nixpkgs/pkgs/tools/X11/xkbset/default.nix
index e6f6622f85a..e6f6622f85a 100644
--- a/pkgs/tools/X11/xkbset/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xkbset/default.nix
diff --git a/pkgs/tools/X11/xkbvalidate/default.nix b/nixpkgs/pkgs/tools/X11/xkbvalidate/default.nix
index 92a47aa6563..92a47aa6563 100644
--- a/pkgs/tools/X11/xkbvalidate/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xkbvalidate/default.nix
diff --git a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c b/nixpkgs/pkgs/tools/X11/xkbvalidate/xkbvalidate.c
index d25eef154b3..d25eef154b3 100644
--- a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c
+++ b/nixpkgs/pkgs/tools/X11/xkbvalidate/xkbvalidate.c
diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/nixpkgs/pkgs/tools/X11/xlayoutdisplay/default.nix
index 7f3d9cfda56..7f3d9cfda56 100644
--- a/pkgs/tools/X11/xlayoutdisplay/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xlayoutdisplay/default.nix
diff --git a/pkgs/tools/X11/xloadimage/default.nix b/nixpkgs/pkgs/tools/X11/xloadimage/default.nix
index 3bd9f525683..3bd9f525683 100644
--- a/pkgs/tools/X11/xloadimage/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xloadimage/default.nix
diff --git a/pkgs/tools/X11/xmacro/default.nix b/nixpkgs/pkgs/tools/X11/xmacro/default.nix
index 13a18efccba..13a18efccba 100644
--- a/pkgs/tools/X11/xmacro/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xmacro/default.nix
diff --git a/pkgs/tools/X11/xmagnify/default.nix b/nixpkgs/pkgs/tools/X11/xmagnify/default.nix
index dfd28e31771..dfd28e31771 100644
--- a/pkgs/tools/X11/xmagnify/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xmagnify/default.nix
diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/nixpkgs/pkgs/tools/X11/xmousepasteblock/default.nix
index 0cace7f452b..0cace7f452b 100644
--- a/pkgs/tools/X11/xmousepasteblock/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xmousepasteblock/default.nix
diff --git a/pkgs/tools/X11/xnee/default.nix b/nixpkgs/pkgs/tools/X11/xnee/default.nix
index f8f48ea4cdb..f8f48ea4cdb 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xnee/default.nix
diff --git a/pkgs/tools/X11/xob/default.nix b/nixpkgs/pkgs/tools/X11/xob/default.nix
index 164802470e5..164802470e5 100644
--- a/pkgs/tools/X11/xob/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xob/default.nix
diff --git a/pkgs/tools/X11/xosview2/default.nix b/nixpkgs/pkgs/tools/X11/xosview2/default.nix
index 5dfe74fd373..5dfe74fd373 100644
--- a/pkgs/tools/X11/xosview2/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xosview2/default.nix
diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix
index 4dbe31df03c..4dbe31df03c 100644
--- a/pkgs/tools/X11/xpointerbarrier/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix
diff --git a/pkgs/tools/X11/xpra/default.nix b/nixpkgs/pkgs/tools/X11/xpra/default.nix
index da7bfb445a9..da7bfb445a9 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xpra/default.nix
diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/nixpkgs/pkgs/tools/X11/xpra/fix-paths.patch
index eb982682586..eb982682586 100644
--- a/pkgs/tools/X11/xpra/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/X11/xpra/fix-paths.patch
diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix
index 770024aa4ba..770024aa4ba 100644
--- a/pkgs/tools/X11/xpra/libfakeXinerama.nix
+++ b/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch b/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch
index f91e53d1e49..f91e53d1e49 100644
--- a/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch
+++ b/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch b/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch
index 3dbb6fd179f..3dbb6fd179f 100644
--- a/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch
+++ b/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch b/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch
index 567db3fc386..567db3fc386 100644
--- a/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch
+++ b/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/default.nix b/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/default.nix
index 4e9f8860892..4e9f8860892 100644
--- a/pkgs/tools/X11/xpra/xf86videodummy/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/default.nix
diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix
index 117a612381f..117a612381f 100644
--- a/pkgs/tools/X11/xprintidle-ng/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix
diff --git a/pkgs/tools/X11/xrectsel/default.nix b/nixpkgs/pkgs/tools/X11/xrectsel/default.nix
index 4712192eacf..4712192eacf 100644
--- a/pkgs/tools/X11/xrectsel/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xrectsel/default.nix
diff --git a/pkgs/tools/X11/xrestop/default.nix b/nixpkgs/pkgs/tools/X11/xrestop/default.nix
index 6f75d2360cf..6f75d2360cf 100644
--- a/pkgs/tools/X11/xrestop/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xrestop/default.nix
diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix
index 548101c34c3..548101c34c3 100644
--- a/pkgs/tools/X11/xsecurelock/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix
diff --git a/pkgs/tools/X11/xsettingsd/SConstruct.patch b/nixpkgs/pkgs/tools/X11/xsettingsd/SConstruct.patch
index bae8d1efc14..bae8d1efc14 100644
--- a/pkgs/tools/X11/xsettingsd/SConstruct.patch
+++ b/nixpkgs/pkgs/tools/X11/xsettingsd/SConstruct.patch
diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix
index bee6cdb748f..bee6cdb748f 100644
--- a/pkgs/tools/X11/xsettingsd/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix
diff --git a/pkgs/tools/X11/xtrace/default.nix b/nixpkgs/pkgs/tools/X11/xtrace/default.nix
index aae31d649f4..aae31d649f4 100644
--- a/pkgs/tools/X11/xtrace/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xtrace/default.nix
diff --git a/pkgs/tools/X11/xtruss/default.nix b/nixpkgs/pkgs/tools/X11/xtruss/default.nix
index 043514ebb43..043514ebb43 100644
--- a/pkgs/tools/X11/xtruss/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xtruss/default.nix
diff --git a/pkgs/tools/X11/xvkbd/default.nix b/nixpkgs/pkgs/tools/X11/xvkbd/default.nix
index 3c1dc3de2b4..3c1dc3de2b4 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xvkbd/default.nix
diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix
index 7b30e5c5815..7b30e5c5815 100644
--- a/pkgs/tools/X11/xwinmosaic/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix
diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix
index b9d48f54574..b9d48f54574 100644
--- a/pkgs/tools/X11/xwinwrap/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix
diff --git a/pkgs/tools/X11/xzoom/default.nix b/nixpkgs/pkgs/tools/X11/xzoom/default.nix
index ed7828f37e2..ed7828f37e2 100644
--- a/pkgs/tools/X11/xzoom/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xzoom/default.nix
diff --git a/pkgs/tools/admin/acme.sh/default.nix b/nixpkgs/pkgs/tools/admin/acme.sh/default.nix
index 25a92f1117b..25a92f1117b 100644
--- a/pkgs/tools/admin/acme.sh/default.nix
+++ b/nixpkgs/pkgs/tools/admin/acme.sh/default.nix
diff --git a/pkgs/tools/admin/adtool/default.nix b/nixpkgs/pkgs/tools/admin/adtool/default.nix
index 5522fd7a68b..5522fd7a68b 100644
--- a/pkgs/tools/admin/adtool/default.nix
+++ b/nixpkgs/pkgs/tools/admin/adtool/default.nix
diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
index b3e688c681d..b3e688c681d 100644
--- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
+++ b/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
diff --git a/pkgs/tools/admin/analog/default.nix b/nixpkgs/pkgs/tools/admin/analog/default.nix
index 68046be2eee..68046be2eee 100644
--- a/pkgs/tools/admin/analog/default.nix
+++ b/nixpkgs/pkgs/tools/admin/analog/default.nix
diff --git a/pkgs/tools/admin/ansible/default.nix b/nixpkgs/pkgs/tools/admin/ansible/default.nix
index 7dde0e4764c..7dde0e4764c 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/nixpkgs/pkgs/tools/admin/ansible/default.nix
diff --git a/pkgs/tools/admin/aws-env/default.nix b/nixpkgs/pkgs/tools/admin/aws-env/default.nix
index dff37520797..dff37520797 100644
--- a/pkgs/tools/admin/aws-env/default.nix
+++ b/nixpkgs/pkgs/tools/admin/aws-env/default.nix
diff --git a/pkgs/tools/admin/aws-env/deps.nix b/nixpkgs/pkgs/tools/admin/aws-env/deps.nix
index 891a6ecb596..891a6ecb596 100644
--- a/pkgs/tools/admin/aws-env/deps.nix
+++ b/nixpkgs/pkgs/tools/admin/aws-env/deps.nix
diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix
index e878369f177..e878369f177 100644
--- a/pkgs/tools/admin/aws-google-auth/default.nix
+++ b/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix
diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix
index 830dcee26e4..830dcee26e4 100644
--- a/pkgs/tools/admin/aws-rotate-key/default.nix
+++ b/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix
diff --git a/pkgs/tools/admin/aws-rotate-key/deps.nix b/nixpkgs/pkgs/tools/admin/aws-rotate-key/deps.nix
index 680a18e7e2d..680a18e7e2d 100644
--- a/pkgs/tools/admin/aws-rotate-key/deps.nix
+++ b/nixpkgs/pkgs/tools/admin/aws-rotate-key/deps.nix
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/nixpkgs/pkgs/tools/admin/aws-vault/default.nix
index ddecd15b6ad..ddecd15b6ad 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/nixpkgs/pkgs/tools/admin/aws-vault/default.nix
diff --git a/pkgs/tools/admin/aws_shell/default.nix b/nixpkgs/pkgs/tools/admin/aws_shell/default.nix
index b9169691808..b9169691808 100644
--- a/pkgs/tools/admin/aws_shell/default.nix
+++ b/nixpkgs/pkgs/tools/admin/aws_shell/default.nix
diff --git a/pkgs/tools/admin/awscli/default.nix b/nixpkgs/pkgs/tools/admin/awscli/default.nix
index f38d4cd1a1d..f38d4cd1a1d 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/nixpkgs/pkgs/tools/admin/awscli/default.nix
diff --git a/pkgs/tools/admin/awslogs/default.nix b/nixpkgs/pkgs/tools/admin/awslogs/default.nix
index 92b6d62a8a2..92b6d62a8a2 100644
--- a/pkgs/tools/admin/awslogs/default.nix
+++ b/nixpkgs/pkgs/tools/admin/awslogs/default.nix
diff --git a/pkgs/tools/admin/awsweeper/default.nix b/nixpkgs/pkgs/tools/admin/awsweeper/default.nix
index 91ef7ee022e..91ef7ee022e 100644
--- a/pkgs/tools/admin/awsweeper/default.nix
+++ b/nixpkgs/pkgs/tools/admin/awsweeper/default.nix
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix
index cc793f8300d..cc793f8300d 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
index 290800e4226..290800e4226 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
diff --git a/pkgs/tools/admin/berglas/default.nix b/nixpkgs/pkgs/tools/admin/berglas/default.nix
index aaca67baa16..aaca67baa16 100644
--- a/pkgs/tools/admin/berglas/default.nix
+++ b/nixpkgs/pkgs/tools/admin/berglas/default.nix
diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix
index f97a6e5df89..f97a6e5df89 100644
--- a/pkgs/tools/admin/bluemix-cli/default.nix
+++ b/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix
diff --git a/pkgs/tools/admin/boulder/default.nix b/nixpkgs/pkgs/tools/admin/boulder/default.nix
index a21a3ebdde1..a21a3ebdde1 100644
--- a/pkgs/tools/admin/boulder/default.nix
+++ b/nixpkgs/pkgs/tools/admin/boulder/default.nix
diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix
index 8e2ef7c87e1..8e2ef7c87e1 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix
diff --git a/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch b/nixpkgs/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch
index 62351a70160..62351a70160 100644
--- a/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch
+++ b/nixpkgs/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch
diff --git a/pkgs/tools/admin/certbot/default.nix b/nixpkgs/pkgs/tools/admin/certbot/default.nix
index 8fdbfd12778..8fdbfd12778 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/nixpkgs/pkgs/tools/admin/certbot/default.nix
diff --git a/pkgs/tools/admin/certigo/default.nix b/nixpkgs/pkgs/tools/admin/certigo/default.nix
index 923344c6411..923344c6411 100644
--- a/pkgs/tools/admin/certigo/default.nix
+++ b/nixpkgs/pkgs/tools/admin/certigo/default.nix
diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix
index a4b119f126a..a4b119f126a 100644
--- a/pkgs/tools/admin/chkcrontab/default.nix
+++ b/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix
diff --git a/pkgs/tools/admin/clair/default.nix b/nixpkgs/pkgs/tools/admin/clair/default.nix
index 3f4d00736ad..3f4d00736ad 100644
--- a/pkgs/tools/admin/clair/default.nix
+++ b/nixpkgs/pkgs/tools/admin/clair/default.nix
diff --git a/pkgs/tools/admin/cli53/default.nix b/nixpkgs/pkgs/tools/admin/cli53/default.nix
index 8195207ef60..8195207ef60 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/nixpkgs/pkgs/tools/admin/cli53/default.nix
diff --git a/pkgs/tools/admin/cli53/deps.nix b/nixpkgs/pkgs/tools/admin/cli53/deps.nix
index 4742bc00851..4742bc00851 100644
--- a/pkgs/tools/admin/cli53/deps.nix
+++ b/nixpkgs/pkgs/tools/admin/cli53/deps.nix
diff --git a/pkgs/tools/admin/daemontools/default.nix b/nixpkgs/pkgs/tools/admin/daemontools/default.nix
index 7e8c1bccc3e..7e8c1bccc3e 100644
--- a/pkgs/tools/admin/daemontools/default.nix
+++ b/nixpkgs/pkgs/tools/admin/daemontools/default.nix
diff --git a/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch b/nixpkgs/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch
index 9b784e7ca11..9b784e7ca11 100644
--- a/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch
+++ b/nixpkgs/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch
diff --git a/pkgs/tools/admin/dehydrated/default.nix b/nixpkgs/pkgs/tools/admin/dehydrated/default.nix
index 6cc69c2290d..6cc69c2290d 100644
--- a/pkgs/tools/admin/dehydrated/default.nix
+++ b/nixpkgs/pkgs/tools/admin/dehydrated/default.nix
diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix
index a71958f8a09..a71958f8a09 100644
--- a/pkgs/tools/admin/docker-credential-gcr/default.nix
+++ b/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix
diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix
index 1f4315afc40..1f4315afc40 100644
--- a/pkgs/tools/admin/docker-credential-helpers/default.nix
+++ b/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix
diff --git a/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix
index 89c8e2866e4..89c8e2866e4 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix
diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix
index 8d8f9070499..8d8f9070499 100644
--- a/pkgs/tools/admin/elasticsearch-curator/default.nix
+++ b/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix
diff --git a/pkgs/tools/admin/fastlane/Gemfile b/nixpkgs/pkgs/tools/admin/fastlane/Gemfile
index 1fa8dbca63b..1fa8dbca63b 100644
--- a/pkgs/tools/admin/fastlane/Gemfile
+++ b/nixpkgs/pkgs/tools/admin/fastlane/Gemfile
diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock
index e3cfc580fab..e3cfc580fab 100644
--- a/pkgs/tools/admin/fastlane/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock
diff --git a/pkgs/tools/admin/fastlane/default.nix b/nixpkgs/pkgs/tools/admin/fastlane/default.nix
index 1cdc969ea2e..1cdc969ea2e 100644
--- a/pkgs/tools/admin/fastlane/default.nix
+++ b/nixpkgs/pkgs/tools/admin/fastlane/default.nix
diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix
index 2511822a9fc..2511822a9fc 100644
--- a/pkgs/tools/admin/fastlane/gemset.nix
+++ b/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix
diff --git a/pkgs/tools/admin/fbvnc/default.nix b/nixpkgs/pkgs/tools/admin/fbvnc/default.nix
index ec32b5f0a26..ec32b5f0a26 100644
--- a/pkgs/tools/admin/fbvnc/default.nix
+++ b/nixpkgs/pkgs/tools/admin/fbvnc/default.nix
diff --git a/pkgs/tools/admin/gixy/default.nix b/nixpkgs/pkgs/tools/admin/gixy/default.nix
index bbec64c0aee..bbec64c0aee 100644
--- a/pkgs/tools/admin/gixy/default.nix
+++ b/nixpkgs/pkgs/tools/admin/gixy/default.nix
diff --git a/pkgs/tools/admin/google-cloud-sdk/alpha__init__.py b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/alpha__init__.py
index d120969d8fb..d120969d8fb 100755
--- a/pkgs/tools/admin/google-cloud-sdk/alpha__init__.py
+++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/alpha__init__.py
diff --git a/pkgs/tools/admin/google-cloud-sdk/beta__init__.py b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/beta__init__.py
index bb52c5a0bc4..bb52c5a0bc4 100755
--- a/pkgs/tools/admin/google-cloud-sdk/beta__init__.py
+++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/beta__init__.py
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix
index 5bcc25ea989..5bcc25ea989 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix
diff --git a/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch
index 64ec6cdb1b6..64ec6cdb1b6 100644
--- a/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch
+++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix
index 37a27127bab..37a27127bab 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix
diff --git a/pkgs/tools/admin/iamy/default.nix b/nixpkgs/pkgs/tools/admin/iamy/default.nix
index e09cd2f5285..e09cd2f5285 100644
--- a/pkgs/tools/admin/iamy/default.nix
+++ b/nixpkgs/pkgs/tools/admin/iamy/default.nix
diff --git a/pkgs/tools/admin/intecture/agent.nix b/nixpkgs/pkgs/tools/admin/intecture/agent.nix
index f0945d7d778..f0945d7d778 100644
--- a/pkgs/tools/admin/intecture/agent.nix
+++ b/nixpkgs/pkgs/tools/admin/intecture/agent.nix
diff --git a/pkgs/tools/admin/intecture/auth.nix b/nixpkgs/pkgs/tools/admin/intecture/auth.nix
index a3208bddabe..a3208bddabe 100644
--- a/pkgs/tools/admin/intecture/auth.nix
+++ b/nixpkgs/pkgs/tools/admin/intecture/auth.nix
diff --git a/pkgs/tools/admin/intecture/cli.nix b/nixpkgs/pkgs/tools/admin/intecture/cli.nix
index 90d65a3f295..90d65a3f295 100644
--- a/pkgs/tools/admin/intecture/cli.nix
+++ b/nixpkgs/pkgs/tools/admin/intecture/cli.nix
diff --git a/pkgs/tools/admin/lego/default.nix b/nixpkgs/pkgs/tools/admin/lego/default.nix
index 48daaa418bb..48daaa418bb 100644
--- a/pkgs/tools/admin/lego/default.nix
+++ b/nixpkgs/pkgs/tools/admin/lego/default.nix
diff --git a/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix
index fd8ee9e04a3..fd8ee9e04a3 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix
diff --git a/pkgs/tools/admin/mycli/default.nix b/nixpkgs/pkgs/tools/admin/mycli/default.nix
index 1783c1ae04d..1783c1ae04d 100644
--- a/pkgs/tools/admin/mycli/default.nix
+++ b/nixpkgs/pkgs/tools/admin/mycli/default.nix
diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix
index 9e93b5f2f75..9e93b5f2f75 100644
--- a/pkgs/tools/admin/nomachine-client/default.nix
+++ b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix
diff --git a/pkgs/tools/admin/oxidized/Gemfile b/nixpkgs/pkgs/tools/admin/oxidized/Gemfile
index bddfe1adee5..bddfe1adee5 100644
--- a/pkgs/tools/admin/oxidized/Gemfile
+++ b/nixpkgs/pkgs/tools/admin/oxidized/Gemfile
diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/nixpkgs/pkgs/tools/admin/oxidized/Gemfile.lock
index 0832bce6d2e..0832bce6d2e 100644
--- a/pkgs/tools/admin/oxidized/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/admin/oxidized/Gemfile.lock
diff --git a/pkgs/tools/admin/oxidized/default.nix b/nixpkgs/pkgs/tools/admin/oxidized/default.nix
index a11906e80f0..a11906e80f0 100644
--- a/pkgs/tools/admin/oxidized/default.nix
+++ b/nixpkgs/pkgs/tools/admin/oxidized/default.nix
diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/nixpkgs/pkgs/tools/admin/oxidized/gemset.nix
index ff77102af12..ff77102af12 100644
--- a/pkgs/tools/admin/oxidized/gemset.nix
+++ b/nixpkgs/pkgs/tools/admin/oxidized/gemset.nix
diff --git a/pkgs/tools/admin/pebble/default.nix b/nixpkgs/pkgs/tools/admin/pebble/default.nix
index 5aa220fd89e..5aa220fd89e 100644
--- a/pkgs/tools/admin/pebble/default.nix
+++ b/nixpkgs/pkgs/tools/admin/pebble/default.nix
diff --git a/pkgs/tools/admin/procs/default.nix b/nixpkgs/pkgs/tools/admin/procs/default.nix
index b1faa129f34..b1faa129f34 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/nixpkgs/pkgs/tools/admin/procs/default.nix
diff --git a/pkgs/tools/admin/pulumi/data.nix b/nixpkgs/pkgs/tools/admin/pulumi/data.nix
index 1edc80c24e2..1edc80c24e2 100644
--- a/pkgs/tools/admin/pulumi/data.nix
+++ b/nixpkgs/pkgs/tools/admin/pulumi/data.nix
diff --git a/pkgs/tools/admin/pulumi/default.nix b/nixpkgs/pkgs/tools/admin/pulumi/default.nix
index 977c1991fab..977c1991fab 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/nixpkgs/pkgs/tools/admin/pulumi/default.nix
diff --git a/pkgs/tools/admin/pulumi/update.sh b/nixpkgs/pkgs/tools/admin/pulumi/update.sh
index 7cb500ee9d3..7cb500ee9d3 100644
--- a/pkgs/tools/admin/pulumi/update.sh
+++ b/nixpkgs/pkgs/tools/admin/pulumi/update.sh
diff --git a/pkgs/tools/admin/salt/default.nix b/nixpkgs/pkgs/tools/admin/salt/default.nix
index c94686c93c1..c94686c93c1 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/nixpkgs/pkgs/tools/admin/salt/default.nix
diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/nixpkgs/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
index f7560b1fc56..f7560b1fc56 100644
--- a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
+++ b/nixpkgs/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix
index 4bf24e3092d..4bf24e3092d 100644
--- a/pkgs/tools/admin/salt/pepper/default.nix
+++ b/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix
diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix
index 3365d87bba4..3365d87bba4 100644
--- a/pkgs/tools/admin/scaleway-cli/default.nix
+++ b/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix
diff --git a/pkgs/tools/admin/sec/default.nix b/nixpkgs/pkgs/tools/admin/sec/default.nix
index f6f5923eb4a..f6f5923eb4a 100644
--- a/pkgs/tools/admin/sec/default.nix
+++ b/nixpkgs/pkgs/tools/admin/sec/default.nix
diff --git a/pkgs/tools/admin/sewer/default.nix b/nixpkgs/pkgs/tools/admin/sewer/default.nix
index 776ba89e48c..776ba89e48c 100644
--- a/pkgs/tools/admin/sewer/default.nix
+++ b/nixpkgs/pkgs/tools/admin/sewer/default.nix
diff --git a/pkgs/tools/admin/simp_le/default.nix b/nixpkgs/pkgs/tools/admin/simp_le/default.nix
index eaefba36545..eaefba36545 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/nixpkgs/pkgs/tools/admin/simp_le/default.nix
diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/nixpkgs/pkgs/tools/admin/ssl-cert-check/default.nix
index e6a83c397c5..e6a83c397c5 100644
--- a/pkgs/tools/admin/ssl-cert-check/default.nix
+++ b/nixpkgs/pkgs/tools/admin/ssl-cert-check/default.nix
diff --git a/pkgs/tools/admin/swiftclient/default.nix b/nixpkgs/pkgs/tools/admin/swiftclient/default.nix
index 788a64f928a..788a64f928a 100644
--- a/pkgs/tools/admin/swiftclient/default.nix
+++ b/nixpkgs/pkgs/tools/admin/swiftclient/default.nix
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/nixpkgs/pkgs/tools/admin/tigervnc/default.nix
index 1c2243d04f1..1c2243d04f1 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/nixpkgs/pkgs/tools/admin/tigervnc/default.nix
diff --git a/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-15678.patch b/nixpkgs/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-15678.patch
index cd65d2fb5dd..cd65d2fb5dd 100644
--- a/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-15678.patch
+++ b/nixpkgs/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-15678.patch
diff --git a/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-15679.patch b/nixpkgs/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-15679.patch
index 6d7b3e89e0c..6d7b3e89e0c 100644
--- a/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-15679.patch
+++ b/nixpkgs/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-15679.patch
diff --git a/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-15680.patch b/nixpkgs/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-15680.patch
index 7426a2b58b1..7426a2b58b1 100644
--- a/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-15680.patch
+++ b/nixpkgs/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-15680.patch
diff --git a/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-8287.patch b/nixpkgs/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-8287.patch
index 5bfd1b9ea87..5bfd1b9ea87 100644
--- a/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-8287.patch
+++ b/nixpkgs/pkgs/tools/admin/tightvnc/1.3.10-CVE-2019-8287.patch
diff --git a/pkgs/tools/admin/tightvnc/default.nix b/nixpkgs/pkgs/tools/admin/tightvnc/default.nix
index 1a65c31102e..1a65c31102e 100644
--- a/pkgs/tools/admin/tightvnc/default.nix
+++ b/nixpkgs/pkgs/tools/admin/tightvnc/default.nix
diff --git a/pkgs/tools/admin/virtscreen/default.nix b/nixpkgs/pkgs/tools/admin/virtscreen/default.nix
index 73a81fcff87..73a81fcff87 100644
--- a/pkgs/tools/admin/virtscreen/default.nix
+++ b/nixpkgs/pkgs/tools/admin/virtscreen/default.nix
diff --git a/pkgs/tools/admin/vncdo/default.nix b/nixpkgs/pkgs/tools/admin/vncdo/default.nix
index 3dd7a45aa2b..3dd7a45aa2b 100644
--- a/pkgs/tools/admin/vncdo/default.nix
+++ b/nixpkgs/pkgs/tools/admin/vncdo/default.nix
diff --git a/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch b/nixpkgs/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch
index d5299528134..d5299528134 100644
--- a/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch
+++ b/nixpkgs/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch
diff --git a/pkgs/tools/archivers/afio/default.nix b/nixpkgs/pkgs/tools/archivers/afio/default.nix
index 8d1e28fed29..8d1e28fed29 100644
--- a/pkgs/tools/archivers/afio/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/afio/default.nix
diff --git a/pkgs/tools/archivers/atool/default.nix b/nixpkgs/pkgs/tools/archivers/atool/default.nix
index 64a606a4cb5..64a606a4cb5 100644
--- a/pkgs/tools/archivers/atool/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/atool/default.nix
diff --git a/pkgs/tools/archivers/cabextract/default.nix b/nixpkgs/pkgs/tools/archivers/cabextract/default.nix
index d8a874d0b2e..d8a874d0b2e 100644
--- a/pkgs/tools/archivers/cabextract/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/cabextract/default.nix
diff --git a/pkgs/tools/archivers/cpio/default.nix b/nixpkgs/pkgs/tools/archivers/cpio/default.nix
index 3f6b3ba4598..3f6b3ba4598 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/cpio/default.nix
diff --git a/pkgs/tools/archivers/cromfs/default.nix b/nixpkgs/pkgs/tools/archivers/cromfs/default.nix
index 57a8a8e9738..57a8a8e9738 100644
--- a/pkgs/tools/archivers/cromfs/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/cromfs/default.nix
diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix
index 97abeadffc0..97abeadffc0 100644
--- a/pkgs/tools/archivers/ctrtool/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix
diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix
index 3f958f7f958..3f958f7f958 100644
--- a/pkgs/tools/archivers/fsarchiver/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/nixpkgs/pkgs/tools/archivers/gnutar/default.nix
index caf507670f4..caf507670f4 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/gnutar/default.nix
diff --git a/pkgs/tools/archivers/innoextract/default.nix b/nixpkgs/pkgs/tools/archivers/innoextract/default.nix
index 6a8c8c71274..6a8c8c71274 100644
--- a/pkgs/tools/archivers/innoextract/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/innoextract/default.nix
diff --git a/pkgs/tools/archivers/ndstool/default.nix b/nixpkgs/pkgs/tools/archivers/ndstool/default.nix
index 7af30e313f4..7af30e313f4 100644
--- a/pkgs/tools/archivers/ndstool/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/ndstool/default.nix
diff --git a/pkgs/tools/archivers/p7zip/12-CVE-2016-9296.patch b/nixpkgs/pkgs/tools/archivers/p7zip/12-CVE-2016-9296.patch
index 42245c92c0a..42245c92c0a 100644
--- a/pkgs/tools/archivers/p7zip/12-CVE-2016-9296.patch
+++ b/nixpkgs/pkgs/tools/archivers/p7zip/12-CVE-2016-9296.patch
diff --git a/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch b/nixpkgs/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch
index a9787c4a908..a9787c4a908 100644
--- a/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch
+++ b/nixpkgs/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/nixpkgs/pkgs/tools/archivers/p7zip/default.nix
index 465bc474a9e..465bc474a9e 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/p7zip/default.nix
diff --git a/pkgs/tools/archivers/p7zip/setup-hook.sh b/nixpkgs/pkgs/tools/archivers/p7zip/setup-hook.sh
index 4dc88f07c0b..4dc88f07c0b 100644
--- a/pkgs/tools/archivers/p7zip/setup-hook.sh
+++ b/nixpkgs/pkgs/tools/archivers/p7zip/setup-hook.sh
diff --git a/pkgs/tools/archivers/pxattr/default.nix b/nixpkgs/pkgs/tools/archivers/pxattr/default.nix
index b507b60287c..b507b60287c 100644
--- a/pkgs/tools/archivers/pxattr/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/pxattr/default.nix
diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix
index 59ff67e3eef..59ff67e3eef 100644
--- a/pkgs/tools/archivers/rpmextract/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix
diff --git a/pkgs/tools/archivers/rpmextract/rpmextract.sh b/nixpkgs/pkgs/tools/archivers/rpmextract/rpmextract.sh
index 6ebfa251955..6ebfa251955 100644
--- a/pkgs/tools/archivers/rpmextract/rpmextract.sh
+++ b/nixpkgs/pkgs/tools/archivers/rpmextract/rpmextract.sh
diff --git a/pkgs/tools/archivers/runzip/default.nix b/nixpkgs/pkgs/tools/archivers/runzip/default.nix
index b9eaf3dba65..b9eaf3dba65 100644
--- a/pkgs/tools/archivers/runzip/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/runzip/default.nix
diff --git a/pkgs/tools/archivers/s-tar/default.nix b/nixpkgs/pkgs/tools/archivers/s-tar/default.nix
index 48e5cc6c436..48e5cc6c436 100644
--- a/pkgs/tools/archivers/s-tar/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/s-tar/default.nix
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/nixpkgs/pkgs/tools/archivers/sharutils/default.nix
index 0dfd234bc75..0dfd234bc75 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/sharutils/default.nix
diff --git a/pkgs/tools/archivers/snzip/default.nix b/nixpkgs/pkgs/tools/archivers/snzip/default.nix
index 031cac64b75..031cac64b75 100644
--- a/pkgs/tools/archivers/snzip/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/snzip/default.nix
diff --git a/pkgs/tools/archivers/unar/default.nix b/nixpkgs/pkgs/tools/archivers/unar/default.nix
index 1104548f77f..1104548f77f 100644
--- a/pkgs/tools/archivers/unar/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/unar/default.nix
diff --git a/pkgs/tools/archivers/unarj/default.nix b/nixpkgs/pkgs/tools/archivers/unarj/default.nix
index 61e60996e75..61e60996e75 100644
--- a/pkgs/tools/archivers/unarj/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/unarj/default.nix
diff --git a/pkgs/tools/archivers/undmg/default.nix b/nixpkgs/pkgs/tools/archivers/undmg/default.nix
index 72be49d9792..72be49d9792 100644
--- a/pkgs/tools/archivers/undmg/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/undmg/default.nix
diff --git a/pkgs/tools/archivers/undmg/setup-hook.sh b/nixpkgs/pkgs/tools/archivers/undmg/setup-hook.sh
index e5c8dda23b6..e5c8dda23b6 100644
--- a/pkgs/tools/archivers/undmg/setup-hook.sh
+++ b/nixpkgs/pkgs/tools/archivers/undmg/setup-hook.sh
diff --git a/pkgs/tools/archivers/unp/default.nix b/nixpkgs/pkgs/tools/archivers/unp/default.nix
index 82e83a8c6a3..82e83a8c6a3 100644
--- a/pkgs/tools/archivers/unp/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/unp/default.nix
diff --git a/pkgs/tools/archivers/unrar/default.nix b/nixpkgs/pkgs/tools/archivers/unrar/default.nix
index ad71ff6b1fe..ad71ff6b1fe 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/unrar/default.nix
diff --git a/pkgs/tools/archivers/unrar/setup-hook.sh b/nixpkgs/pkgs/tools/archivers/unrar/setup-hook.sh
index 41d6a5cd217..41d6a5cd217 100644
--- a/pkgs/tools/archivers/unrar/setup-hook.sh
+++ b/nixpkgs/pkgs/tools/archivers/unrar/setup-hook.sh
diff --git a/pkgs/tools/archivers/unshield/default.nix b/nixpkgs/pkgs/tools/archivers/unshield/default.nix
index cfab2443032..cfab2443032 100644
--- a/pkgs/tools/archivers/unshield/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/unshield/default.nix
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-8139.diff b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-8139.diff
index 3bcc21c7c0d..3bcc21c7c0d 100644
--- a/pkgs/tools/archivers/unzip/CVE-2014-8139.diff
+++ b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-8139.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-8140.diff b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-8140.diff
index 81b96b8df7d..81b96b8df7d 100644
--- a/pkgs/tools/archivers/unzip/CVE-2014-8140.diff
+++ b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-8140.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-8141.diff b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-8141.diff
index 11007195b1f..11007195b1f 100644
--- a/pkgs/tools/archivers/unzip/CVE-2014-8141.diff
+++ b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-8141.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9636.diff b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-9636.diff
index d4c7f752975..d4c7f752975 100644
--- a/pkgs/tools/archivers/unzip/CVE-2014-9636.diff
+++ b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-9636.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9913.patch b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-9913.patch
index a5675f4fb7c..a5675f4fb7c 100644
--- a/pkgs/tools/archivers/unzip/CVE-2014-9913.patch
+++ b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-9913.patch
diff --git a/pkgs/tools/archivers/unzip/CVE-2015-7696.diff b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2015-7696.diff
index 3aad17bddd7..3aad17bddd7 100644
--- a/pkgs/tools/archivers/unzip/CVE-2015-7696.diff
+++ b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2015-7696.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2015-7697.diff b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2015-7697.diff
index 98ebf53c478..98ebf53c478 100644
--- a/pkgs/tools/archivers/unzip/CVE-2015-7697.diff
+++ b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2015-7697.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2016-9844.patch b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2016-9844.patch
index 52d07987b33..52d07987b33 100644
--- a/pkgs/tools/archivers/unzip/CVE-2016-9844.patch
+++ b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2016-9844.patch
diff --git a/pkgs/tools/archivers/unzip/CVE-2018-18384.patch b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2018-18384.patch
index e9320e125cf..e9320e125cf 100644
--- a/pkgs/tools/archivers/unzip/CVE-2018-18384.patch
+++ b/nixpkgs/pkgs/tools/archivers/unzip/CVE-2018-18384.patch
diff --git a/pkgs/tools/archivers/unzip/default.nix b/nixpkgs/pkgs/tools/archivers/unzip/default.nix
index b8f649fbdcb..b8f649fbdcb 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/unzip/default.nix
diff --git a/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch b/nixpkgs/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch
index 15dbbfe4c53..15dbbfe4c53 100644
--- a/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch
+++ b/nixpkgs/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch
diff --git a/pkgs/tools/archivers/unzip/setup-hook.sh b/nixpkgs/pkgs/tools/archivers/unzip/setup-hook.sh
index 4055d2fab51..4055d2fab51 100644
--- a/pkgs/tools/archivers/unzip/setup-hook.sh
+++ b/nixpkgs/pkgs/tools/archivers/unzip/setup-hook.sh
diff --git a/pkgs/tools/archivers/wimlib/default.nix b/nixpkgs/pkgs/tools/archivers/wimlib/default.nix
index 9d58bf5c2f8..9d58bf5c2f8 100644
--- a/pkgs/tools/archivers/wimlib/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/wimlib/default.nix
diff --git a/pkgs/tools/archivers/xarchive/default.nix b/nixpkgs/pkgs/tools/archivers/xarchive/default.nix
index 53da140b7fd..53da140b7fd 100644
--- a/pkgs/tools/archivers/xarchive/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/xarchive/default.nix
diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix
index 1a05c1ba269..1a05c1ba269 100644
--- a/pkgs/tools/archivers/xarchiver/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix
diff --git a/pkgs/tools/archivers/zip/default.nix b/nixpkgs/pkgs/tools/archivers/zip/default.nix
index 09ba6510707..09ba6510707 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/zip/default.nix
diff --git a/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2 b/nixpkgs/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2
index 816f32aba3c..816f32aba3c 100644
--- a/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2
+++ b/nixpkgs/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/nixpkgs/pkgs/tools/archivers/zpaq/default.nix
index 09c4e914bd8..09c4e914bd8 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/zpaq/default.nix
diff --git a/pkgs/tools/archivers/zpaq/default.upstream b/nixpkgs/pkgs/tools/archivers/zpaq/default.upstream
index 84daee900ce..84daee900ce 100644
--- a/pkgs/tools/archivers/zpaq/default.upstream
+++ b/nixpkgs/pkgs/tools/archivers/zpaq/default.upstream
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/nixpkgs/pkgs/tools/archivers/zpaq/zpaqd.nix
index 611654331c3..611654331c3 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/nixpkgs/pkgs/tools/archivers/zpaq/zpaqd.nix
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.upstream b/nixpkgs/pkgs/tools/archivers/zpaq/zpaqd.upstream
index ef83c58e460..ef83c58e460 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.upstream
+++ b/nixpkgs/pkgs/tools/archivers/zpaq/zpaqd.upstream
diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix
index 575517829ff..575517829ff 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix
diff --git a/pkgs/tools/audio/abcmidi/default.nix b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
index 804f9f3ed24..804f9f3ed24 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix
index 4590a0dfbc3..4590a0dfbc3 100644
--- a/pkgs/tools/audio/accuraterip-checksum/default.nix
+++ b/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix
index 7b92b973df4..7b92b973df4 100644
--- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix
+++ b/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch b/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch
index f3eacae26f7..f3eacae26f7 100644
--- a/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch
+++ b/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch
diff --git a/pkgs/tools/audio/aucdtect/default.nix b/nixpkgs/pkgs/tools/audio/aucdtect/default.nix
index ad9d5fb8690..ad9d5fb8690 100644
--- a/pkgs/tools/audio/aucdtect/default.nix
+++ b/nixpkgs/pkgs/tools/audio/aucdtect/default.nix
diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/nixpkgs/pkgs/tools/audio/beets/alternatives-plugin.nix
index 75d8975ab32..75d8975ab32 100644
--- a/pkgs/tools/audio/beets/alternatives-plugin.nix
+++ b/nixpkgs/pkgs/tools/audio/beets/alternatives-plugin.nix
diff --git a/pkgs/tools/audio/beets/beet-check-tests.patch b/nixpkgs/pkgs/tools/audio/beets/beet-check-tests.patch
index 2de97b86c8b..2de97b86c8b 100644
--- a/pkgs/tools/audio/beets/beet-check-tests.patch
+++ b/nixpkgs/pkgs/tools/audio/beets/beet-check-tests.patch
diff --git a/pkgs/tools/audio/beets/check-plugin.nix b/nixpkgs/pkgs/tools/audio/beets/check-plugin.nix
index 49ee97ead06..49ee97ead06 100644
--- a/pkgs/tools/audio/beets/check-plugin.nix
+++ b/nixpkgs/pkgs/tools/audio/beets/check-plugin.nix
diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix
index fac37962f3c..fac37962f3c 100644
--- a/pkgs/tools/audio/beets/copyartifacts-plugin.nix
+++ b/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix
diff --git a/pkgs/tools/audio/beets/default.nix b/nixpkgs/pkgs/tools/audio/beets/default.nix
index b4dfa71ca96..b4dfa71ca96 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/nixpkgs/pkgs/tools/audio/beets/default.nix
diff --git a/pkgs/tools/audio/beets/keyfinder-default-bin.patch b/nixpkgs/pkgs/tools/audio/beets/keyfinder-default-bin.patch
index 1ea195a678e..1ea195a678e 100644
--- a/pkgs/tools/audio/beets/keyfinder-default-bin.patch
+++ b/nixpkgs/pkgs/tools/audio/beets/keyfinder-default-bin.patch
diff --git a/pkgs/tools/audio/beets/replaygain-default-bs1770gain.patch b/nixpkgs/pkgs/tools/audio/beets/replaygain-default-bs1770gain.patch
index 538f9e93303..538f9e93303 100644
--- a/pkgs/tools/audio/beets/replaygain-default-bs1770gain.patch
+++ b/nixpkgs/pkgs/tools/audio/beets/replaygain-default-bs1770gain.patch
diff --git a/pkgs/tools/audio/bpm-tools/default.nix b/nixpkgs/pkgs/tools/audio/bpm-tools/default.nix
index 035fbf09533..035fbf09533 100644
--- a/pkgs/tools/audio/bpm-tools/default.nix
+++ b/nixpkgs/pkgs/tools/audio/bpm-tools/default.nix
diff --git a/pkgs/tools/audio/darkice/default.nix b/nixpkgs/pkgs/tools/audio/darkice/default.nix
index c5f7bcd5a71..c5f7bcd5a71 100644
--- a/pkgs/tools/audio/darkice/default.nix
+++ b/nixpkgs/pkgs/tools/audio/darkice/default.nix
diff --git a/pkgs/tools/audio/darkice/fix-undeclared-memmove.patch b/nixpkgs/pkgs/tools/audio/darkice/fix-undeclared-memmove.patch
index 9b8baf9701d..9b8baf9701d 100644
--- a/pkgs/tools/audio/darkice/fix-undeclared-memmove.patch
+++ b/nixpkgs/pkgs/tools/audio/darkice/fix-undeclared-memmove.patch
diff --git a/pkgs/tools/audio/dir2opus/default.nix b/nixpkgs/pkgs/tools/audio/dir2opus/default.nix
index d6c988ef0be..d6c988ef0be 100644
--- a/pkgs/tools/audio/dir2opus/default.nix
+++ b/nixpkgs/pkgs/tools/audio/dir2opus/default.nix
diff --git a/pkgs/tools/audio/essentia-extractor/default.nix b/nixpkgs/pkgs/tools/audio/essentia-extractor/default.nix
index 0d2bb17a75d..0d2bb17a75d 100644
--- a/pkgs/tools/audio/essentia-extractor/default.nix
+++ b/nixpkgs/pkgs/tools/audio/essentia-extractor/default.nix
diff --git a/pkgs/tools/audio/ezstream/default.nix b/nixpkgs/pkgs/tools/audio/ezstream/default.nix
index fbf90d2211c..fbf90d2211c 100644
--- a/pkgs/tools/audio/ezstream/default.nix
+++ b/nixpkgs/pkgs/tools/audio/ezstream/default.nix
diff --git a/pkgs/tools/audio/glyr/default.nix b/nixpkgs/pkgs/tools/audio/glyr/default.nix
index 2acca151040..2acca151040 100644
--- a/pkgs/tools/audio/glyr/default.nix
+++ b/nixpkgs/pkgs/tools/audio/glyr/default.nix
diff --git a/pkgs/tools/audio/google-music-scripts/default.nix b/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix
index f7e96971ab1..f7e96971ab1 100644
--- a/pkgs/tools/audio/google-music-scripts/default.nix
+++ b/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix
diff --git a/pkgs/tools/audio/google-music-scripts/loguru.patch b/nixpkgs/pkgs/tools/audio/google-music-scripts/loguru.patch
index 141ce044c43..141ce044c43 100644
--- a/pkgs/tools/audio/google-music-scripts/loguru.patch
+++ b/nixpkgs/pkgs/tools/audio/google-music-scripts/loguru.patch
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/nixpkgs/pkgs/tools/audio/gvolicon/default.nix
index 9029eb38b06..9029eb38b06 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/nixpkgs/pkgs/tools/audio/gvolicon/default.nix
diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix
index f69e60117ce..f69e60117ce 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix
diff --git a/pkgs/tools/audio/mididings/default.nix b/nixpkgs/pkgs/tools/audio/mididings/default.nix
index 35d1af1e767..35d1af1e767 100644
--- a/pkgs/tools/audio/mididings/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mididings/default.nix
diff --git a/pkgs/tools/audio/mp3cat/default.nix b/nixpkgs/pkgs/tools/audio/mp3cat/default.nix
index acd11bc75e6..acd11bc75e6 100644
--- a/pkgs/tools/audio/mp3cat/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mp3cat/default.nix
diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix
index a4cea2b07ed..a4cea2b07ed 100644
--- a/pkgs/tools/audio/mpd-mpris/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix
diff --git a/pkgs/tools/audio/mpdas/default.nix b/nixpkgs/pkgs/tools/audio/mpdas/default.nix
index bfb4f81c816..bfb4f81c816 100644
--- a/pkgs/tools/audio/mpdas/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mpdas/default.nix
diff --git a/pkgs/tools/audio/mpdcron/Gemfile b/nixpkgs/pkgs/tools/audio/mpdcron/Gemfile
index e0814bc4dda..e0814bc4dda 100644
--- a/pkgs/tools/audio/mpdcron/Gemfile
+++ b/nixpkgs/pkgs/tools/audio/mpdcron/Gemfile
diff --git a/pkgs/tools/audio/mpdcron/Gemfile.lock b/nixpkgs/pkgs/tools/audio/mpdcron/Gemfile.lock
index 39df4ddec9f..39df4ddec9f 100644
--- a/pkgs/tools/audio/mpdcron/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/audio/mpdcron/Gemfile.lock
diff --git a/pkgs/tools/audio/mpdcron/default.nix b/nixpkgs/pkgs/tools/audio/mpdcron/default.nix
index a791a81db35..a791a81db35 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mpdcron/default.nix
diff --git a/pkgs/tools/audio/mpdcron/gemset.nix b/nixpkgs/pkgs/tools/audio/mpdcron/gemset.nix
index 025eb96b065..025eb96b065 100644
--- a/pkgs/tools/audio/mpdcron/gemset.nix
+++ b/nixpkgs/pkgs/tools/audio/mpdcron/gemset.nix
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/nixpkgs/pkgs/tools/audio/mpdris2/default.nix
index 0dbdcd7d25a..0dbdcd7d25a 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mpdris2/default.nix
diff --git a/pkgs/tools/audio/mpdsync/default.nix b/nixpkgs/pkgs/tools/audio/mpdsync/default.nix
index 51f5ba65616..51f5ba65616 100644
--- a/pkgs/tools/audio/mpdsync/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mpdsync/default.nix
diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix
index 0503f9bad69..0503f9bad69 100644
--- a/pkgs/tools/audio/opl3bankeditor/default.nix
+++ b/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix
diff --git a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix b/nixpkgs/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix
index d8f15a65b45..d8f15a65b45 100644
--- a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix
+++ b/nixpkgs/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix
diff --git a/pkgs/tools/audio/pa-applet/default.nix b/nixpkgs/pkgs/tools/audio/pa-applet/default.nix
index 69e5976e6d5..69e5976e6d5 100644
--- a/pkgs/tools/audio/pa-applet/default.nix
+++ b/nixpkgs/pkgs/tools/audio/pa-applet/default.nix
diff --git a/pkgs/tools/audio/pasystray/default.nix b/nixpkgs/pkgs/tools/audio/pasystray/default.nix
index 782ea314359..782ea314359 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/nixpkgs/pkgs/tools/audio/pasystray/default.nix
diff --git a/pkgs/tools/audio/picotts/default.nix b/nixpkgs/pkgs/tools/audio/picotts/default.nix
index d1b055f1d5f..d1b055f1d5f 100644
--- a/pkgs/tools/audio/picotts/default.nix
+++ b/nixpkgs/pkgs/tools/audio/picotts/default.nix
diff --git a/pkgs/tools/audio/playerctl/default.nix b/nixpkgs/pkgs/tools/audio/playerctl/default.nix
index 8a8cd258145..8a8cd258145 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/nixpkgs/pkgs/tools/audio/playerctl/default.nix
diff --git a/pkgs/tools/audio/pnmixer/default.nix b/nixpkgs/pkgs/tools/audio/pnmixer/default.nix
index 5b27a00a955..5b27a00a955 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/nixpkgs/pkgs/tools/audio/pnmixer/default.nix
diff --git a/pkgs/tools/audio/pulsemixer/default.nix b/nixpkgs/pkgs/tools/audio/pulsemixer/default.nix
index 051743b46e7..051743b46e7 100644
--- a/pkgs/tools/audio/pulsemixer/default.nix
+++ b/nixpkgs/pkgs/tools/audio/pulsemixer/default.nix
diff --git a/pkgs/tools/audio/qastools/default.nix b/nixpkgs/pkgs/tools/audio/qastools/default.nix
index bdc431bcb92..bdc431bcb92 100644
--- a/pkgs/tools/audio/qastools/default.nix
+++ b/nixpkgs/pkgs/tools/audio/qastools/default.nix
diff --git a/pkgs/tools/audio/trx/default.nix b/nixpkgs/pkgs/tools/audio/trx/default.nix
index 1d052adbba9..1d052adbba9 100644
--- a/pkgs/tools/audio/trx/default.nix
+++ b/nixpkgs/pkgs/tools/audio/trx/default.nix
diff --git a/pkgs/tools/audio/video2midi/default.nix b/nixpkgs/pkgs/tools/audio/video2midi/default.nix
index dca8a0610da..dca8a0610da 100644
--- a/pkgs/tools/audio/video2midi/default.nix
+++ b/nixpkgs/pkgs/tools/audio/video2midi/default.nix
diff --git a/pkgs/tools/audio/volctl/default.nix b/nixpkgs/pkgs/tools/audio/volctl/default.nix
index 7b4cdd6b531..7b4cdd6b531 100644
--- a/pkgs/tools/audio/volctl/default.nix
+++ b/nixpkgs/pkgs/tools/audio/volctl/default.nix
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/nixpkgs/pkgs/tools/audio/volumeicon/default.nix
index 3871bbd39a1..3871bbd39a1 100644
--- a/pkgs/tools/audio/volumeicon/default.nix
+++ b/nixpkgs/pkgs/tools/audio/volumeicon/default.nix
diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
index 3d219eed012..3d219eed012 100644
--- a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
+++ b/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix
index 44c14f2dc32..44c14f2dc32 100644
--- a/pkgs/tools/backup/automysqlbackup/default.nix
+++ b/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix
diff --git a/pkgs/tools/backup/bacula/default.nix b/nixpkgs/pkgs/tools/backup/bacula/default.nix
index e5e26169b74..e5e26169b74 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/nixpkgs/pkgs/tools/backup/bacula/default.nix
diff --git a/pkgs/tools/backup/bareos/default.nix b/nixpkgs/pkgs/tools/backup/bareos/default.nix
index 949e45de5e1..949e45de5e1 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/nixpkgs/pkgs/tools/backup/bareos/default.nix
diff --git a/pkgs/tools/backup/bdsync/default.nix b/nixpkgs/pkgs/tools/backup/bdsync/default.nix
index be8746932ca..be8746932ca 100644
--- a/pkgs/tools/backup/bdsync/default.nix
+++ b/nixpkgs/pkgs/tools/backup/bdsync/default.nix
diff --git a/pkgs/tools/backup/borg/default.nix b/nixpkgs/pkgs/tools/backup/borg/default.nix
index ed8fbbf76cd..ed8fbbf76cd 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/nixpkgs/pkgs/tools/backup/borg/default.nix
diff --git a/pkgs/tools/backup/btar/default.nix b/nixpkgs/pkgs/tools/backup/btar/default.nix
index 89f577e93ad..89f577e93ad 100644
--- a/pkgs/tools/backup/btar/default.nix
+++ b/nixpkgs/pkgs/tools/backup/btar/default.nix
diff --git a/pkgs/tools/backup/btrbk/default.nix b/nixpkgs/pkgs/tools/backup/btrbk/default.nix
index cd45edfa2d5..cd45edfa2d5 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/nixpkgs/pkgs/tools/backup/btrbk/default.nix
diff --git a/pkgs/tools/backup/bup/default.nix b/nixpkgs/pkgs/tools/backup/bup/default.nix
index 4788091a5f4..4788091a5f4 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/nixpkgs/pkgs/tools/backup/bup/default.nix
diff --git a/pkgs/tools/backup/burp/default.nix b/nixpkgs/pkgs/tools/backup/burp/default.nix
index 5c0be4a2de7..5c0be4a2de7 100644
--- a/pkgs/tools/backup/burp/default.nix
+++ b/nixpkgs/pkgs/tools/backup/burp/default.nix
diff --git a/pkgs/tools/backup/chunksync/default.nix b/nixpkgs/pkgs/tools/backup/chunksync/default.nix
index 736a3122a6f..736a3122a6f 100644
--- a/pkgs/tools/backup/chunksync/default.nix
+++ b/nixpkgs/pkgs/tools/backup/chunksync/default.nix
diff --git a/pkgs/tools/backup/dar/default.nix b/nixpkgs/pkgs/tools/backup/dar/default.nix
index 5d5bff7bfa1..5d5bff7bfa1 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/nixpkgs/pkgs/tools/backup/dar/default.nix
diff --git a/pkgs/tools/backup/ddar/default.nix b/nixpkgs/pkgs/tools/backup/ddar/default.nix
index 4c8d1a28c27..4c8d1a28c27 100644
--- a/pkgs/tools/backup/ddar/default.nix
+++ b/nixpkgs/pkgs/tools/backup/ddar/default.nix
diff --git a/pkgs/tools/backup/dedup/default.nix b/nixpkgs/pkgs/tools/backup/dedup/default.nix
index 05a43604926..05a43604926 100644
--- a/pkgs/tools/backup/dedup/default.nix
+++ b/nixpkgs/pkgs/tools/backup/dedup/default.nix
diff --git a/pkgs/tools/backup/dirvish/default.nix b/nixpkgs/pkgs/tools/backup/dirvish/default.nix
index 0127e32fe93..0127e32fe93 100644
--- a/pkgs/tools/backup/dirvish/default.nix
+++ b/nixpkgs/pkgs/tools/backup/dirvish/default.nix
diff --git a/pkgs/tools/backup/diskrsync/default.nix b/nixpkgs/pkgs/tools/backup/diskrsync/default.nix
index b2ef04dcffc..b2ef04dcffc 100644
--- a/pkgs/tools/backup/diskrsync/default.nix
+++ b/nixpkgs/pkgs/tools/backup/diskrsync/default.nix
diff --git a/pkgs/tools/backup/diskrsync/deps.nix b/nixpkgs/pkgs/tools/backup/diskrsync/deps.nix
index 8045737164b..8045737164b 100644
--- a/pkgs/tools/backup/diskrsync/deps.nix
+++ b/nixpkgs/pkgs/tools/backup/diskrsync/deps.nix
diff --git a/pkgs/tools/backup/duplicacy/default.nix b/nixpkgs/pkgs/tools/backup/duplicacy/default.nix
index d217864e93e..d217864e93e 100644
--- a/pkgs/tools/backup/duplicacy/default.nix
+++ b/nixpkgs/pkgs/tools/backup/duplicacy/default.nix
diff --git a/pkgs/tools/backup/duplicacy/deps.nix b/nixpkgs/pkgs/tools/backup/duplicacy/deps.nix
index 5511b2e6716..5511b2e6716 100644
--- a/pkgs/tools/backup/duplicacy/deps.nix
+++ b/nixpkgs/pkgs/tools/backup/duplicacy/deps.nix
diff --git a/pkgs/tools/backup/duplicati/default.nix b/nixpkgs/pkgs/tools/backup/duplicati/default.nix
index bb24cb35d87..bb24cb35d87 100644
--- a/pkgs/tools/backup/duplicati/default.nix
+++ b/nixpkgs/pkgs/tools/backup/duplicati/default.nix
diff --git a/pkgs/tools/backup/duplicity/default.nix b/nixpkgs/pkgs/tools/backup/duplicity/default.nix
index a33067e8897..a33067e8897 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/nixpkgs/pkgs/tools/backup/duplicity/default.nix
diff --git a/pkgs/tools/backup/duplicity/gnutar-in-test.patch b/nixpkgs/pkgs/tools/backup/duplicity/gnutar-in-test.patch
index b2820feb019..b2820feb019 100644
--- a/pkgs/tools/backup/duplicity/gnutar-in-test.patch
+++ b/nixpkgs/pkgs/tools/backup/duplicity/gnutar-in-test.patch
diff --git a/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch b/nixpkgs/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch
index b5e6df18a15..b5e6df18a15 100644
--- a/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch
+++ b/nixpkgs/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch
diff --git a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch b/nixpkgs/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch
index 191808abc63..191808abc63 100644
--- a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch
+++ b/nixpkgs/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch
diff --git a/pkgs/tools/backup/duply/default.nix b/nixpkgs/pkgs/tools/backup/duply/default.nix
index 3e4375cb76c..3e4375cb76c 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/nixpkgs/pkgs/tools/backup/duply/default.nix
diff --git a/pkgs/tools/backup/easysnap/default.nix b/nixpkgs/pkgs/tools/backup/easysnap/default.nix
index a56d1274f92..a56d1274f92 100644
--- a/pkgs/tools/backup/easysnap/default.nix
+++ b/nixpkgs/pkgs/tools/backup/easysnap/default.nix
diff --git a/pkgs/tools/backup/flockit/default.nix b/nixpkgs/pkgs/tools/backup/flockit/default.nix
index 8d71671f6fe..8d71671f6fe 100644
--- a/pkgs/tools/backup/flockit/default.nix
+++ b/nixpkgs/pkgs/tools/backup/flockit/default.nix
diff --git a/pkgs/tools/backup/grab-site/default.nix b/nixpkgs/pkgs/tools/backup/grab-site/default.nix
index c8093f4453e..c8093f4453e 100644
--- a/pkgs/tools/backup/grab-site/default.nix
+++ b/nixpkgs/pkgs/tools/backup/grab-site/default.nix
diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/nixpkgs/pkgs/tools/backup/hpe-ltfs/default.nix
index d289febe1f0..d289febe1f0 100644
--- a/pkgs/tools/backup/hpe-ltfs/default.nix
+++ b/nixpkgs/pkgs/tools/backup/hpe-ltfs/default.nix
diff --git a/pkgs/tools/backup/httrack/default.nix b/nixpkgs/pkgs/tools/backup/httrack/default.nix
index 6fe614195a4..6fe614195a4 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/nixpkgs/pkgs/tools/backup/httrack/default.nix
diff --git a/pkgs/tools/backup/httrack/qt.nix b/nixpkgs/pkgs/tools/backup/httrack/qt.nix
index 8cf3eb29462..8cf3eb29462 100644
--- a/pkgs/tools/backup/httrack/qt.nix
+++ b/nixpkgs/pkgs/tools/backup/httrack/qt.nix
diff --git a/pkgs/tools/backup/iceshelf/default.nix b/nixpkgs/pkgs/tools/backup/iceshelf/default.nix
index 546339ca002..546339ca002 100644
--- a/pkgs/tools/backup/iceshelf/default.nix
+++ b/nixpkgs/pkgs/tools/backup/iceshelf/default.nix
diff --git a/pkgs/tools/backup/luckybackup/default.nix b/nixpkgs/pkgs/tools/backup/luckybackup/default.nix
index 3e89be15391..3e89be15391 100644
--- a/pkgs/tools/backup/luckybackup/default.nix
+++ b/nixpkgs/pkgs/tools/backup/luckybackup/default.nix
diff --git a/pkgs/tools/backup/lvmsync/Gemfile b/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile
index a87462e2b8a..a87462e2b8a 100644
--- a/pkgs/tools/backup/lvmsync/Gemfile
+++ b/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile
diff --git a/pkgs/tools/backup/lvmsync/Gemfile.lock b/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile.lock
index 1fe903f1508..1fe903f1508 100644
--- a/pkgs/tools/backup/lvmsync/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile.lock
diff --git a/pkgs/tools/backup/lvmsync/default.nix b/nixpkgs/pkgs/tools/backup/lvmsync/default.nix
index a52c6bf1ba7..a52c6bf1ba7 100644
--- a/pkgs/tools/backup/lvmsync/default.nix
+++ b/nixpkgs/pkgs/tools/backup/lvmsync/default.nix
diff --git a/pkgs/tools/backup/lvmsync/gemset.nix b/nixpkgs/pkgs/tools/backup/lvmsync/gemset.nix
index 7f80e928660..7f80e928660 100644
--- a/pkgs/tools/backup/lvmsync/gemset.nix
+++ b/nixpkgs/pkgs/tools/backup/lvmsync/gemset.nix
diff --git a/pkgs/tools/backup/mt-st/default.nix b/nixpkgs/pkgs/tools/backup/mt-st/default.nix
index 0b7b7469af1..0b7b7469af1 100644
--- a/pkgs/tools/backup/mt-st/default.nix
+++ b/nixpkgs/pkgs/tools/backup/mt-st/default.nix
diff --git a/pkgs/tools/backup/mtx/default.nix b/nixpkgs/pkgs/tools/backup/mtx/default.nix
index 46f213a6ef4..46f213a6ef4 100644
--- a/pkgs/tools/backup/mtx/default.nix
+++ b/nixpkgs/pkgs/tools/backup/mtx/default.nix
diff --git a/pkgs/tools/backup/mydumper/default.nix b/nixpkgs/pkgs/tools/backup/mydumper/default.nix
index 7160e7f1950..7160e7f1950 100644
--- a/pkgs/tools/backup/mydumper/default.nix
+++ b/nixpkgs/pkgs/tools/backup/mydumper/default.nix
diff --git a/pkgs/tools/backup/ori/default.nix b/nixpkgs/pkgs/tools/backup/ori/default.nix
index 30ee0041c7c..30ee0041c7c 100644
--- a/pkgs/tools/backup/ori/default.nix
+++ b/nixpkgs/pkgs/tools/backup/ori/default.nix
diff --git a/pkgs/tools/backup/partclone/default.nix b/nixpkgs/pkgs/tools/backup/partclone/default.nix
index fa4346c8ccc..fa4346c8ccc 100644
--- a/pkgs/tools/backup/partclone/default.nix
+++ b/nixpkgs/pkgs/tools/backup/partclone/default.nix
diff --git a/pkgs/tools/backup/partimage/default.nix b/nixpkgs/pkgs/tools/backup/partimage/default.nix
index 4a18deeb57c..4a18deeb57c 100644
--- a/pkgs/tools/backup/partimage/default.nix
+++ b/nixpkgs/pkgs/tools/backup/partimage/default.nix
diff --git a/pkgs/tools/backup/partimage/gentoos-zlib.patch b/nixpkgs/pkgs/tools/backup/partimage/gentoos-zlib.patch
index 05150e131e3..05150e131e3 100644
--- a/pkgs/tools/backup/partimage/gentoos-zlib.patch
+++ b/nixpkgs/pkgs/tools/backup/partimage/gentoos-zlib.patch
diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix
index 98eae9cc670..98eae9cc670 100644
--- a/pkgs/tools/backup/percona-xtrabackup/default.nix
+++ b/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix
diff --git a/pkgs/tools/backup/pyznap/default.nix b/nixpkgs/pkgs/tools/backup/pyznap/default.nix
index 42df651e1a8..42df651e1a8 100644
--- a/pkgs/tools/backup/pyznap/default.nix
+++ b/nixpkgs/pkgs/tools/backup/pyznap/default.nix
diff --git a/pkgs/tools/backup/rdedup/default.nix b/nixpkgs/pkgs/tools/backup/rdedup/default.nix
index 29204417b22..29204417b22 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/nixpkgs/pkgs/tools/backup/rdedup/default.nix
diff --git a/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch b/nixpkgs/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch
index 7dafc7765b7..7dafc7765b7 100644
--- a/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch
+++ b/nixpkgs/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch
diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix
index f3910893b7b..f3910893b7b 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix
diff --git a/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch b/nixpkgs/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch
index ce23c8a8124..ce23c8a8124 100644
--- a/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch
+++ b/nixpkgs/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch
diff --git a/pkgs/tools/backup/rdup/default.nix b/nixpkgs/pkgs/tools/backup/rdup/default.nix
index 0df4ecda89e..0df4ecda89e 100644
--- a/pkgs/tools/backup/rdup/default.nix
+++ b/nixpkgs/pkgs/tools/backup/rdup/default.nix
diff --git a/pkgs/tools/backup/restic/default.nix b/nixpkgs/pkgs/tools/backup/restic/default.nix
index 26f05d41954..26f05d41954 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/nixpkgs/pkgs/tools/backup/restic/default.nix
diff --git a/pkgs/tools/backup/restic/rest-server.nix b/nixpkgs/pkgs/tools/backup/restic/rest-server.nix
index c7f12cb751b..c7f12cb751b 100644
--- a/pkgs/tools/backup/restic/rest-server.nix
+++ b/nixpkgs/pkgs/tools/backup/restic/rest-server.nix
diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/nixpkgs/pkgs/tools/backup/rotate-backups/default.nix
index 17397ce838f..17397ce838f 100644
--- a/pkgs/tools/backup/rotate-backups/default.nix
+++ b/nixpkgs/pkgs/tools/backup/rotate-backups/default.nix
diff --git a/pkgs/tools/backup/rsbep/default.nix b/nixpkgs/pkgs/tools/backup/rsbep/default.nix
index 90a8c665cd4..90a8c665cd4 100644
--- a/pkgs/tools/backup/rsbep/default.nix
+++ b/nixpkgs/pkgs/tools/backup/rsbep/default.nix
diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix
index eebdcf7ba91..eebdcf7ba91 100644
--- a/pkgs/tools/backup/rsnapshot/default.nix
+++ b/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix
diff --git a/pkgs/tools/backup/s3ql/default.nix b/nixpkgs/pkgs/tools/backup/s3ql/default.nix
index 346f8d27964..346f8d27964 100644
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/nixpkgs/pkgs/tools/backup/s3ql/default.nix
diff --git a/pkgs/tools/backup/stenc/default.nix b/nixpkgs/pkgs/tools/backup/stenc/default.nix
index ed4f944a960..ed4f944a960 100644
--- a/pkgs/tools/backup/stenc/default.nix
+++ b/nixpkgs/pkgs/tools/backup/stenc/default.nix
diff --git a/pkgs/tools/backup/store-backup/default.nix b/nixpkgs/pkgs/tools/backup/store-backup/default.nix
index a0f568b16b3..a0f568b16b3 100644
--- a/pkgs/tools/backup/store-backup/default.nix
+++ b/nixpkgs/pkgs/tools/backup/store-backup/default.nix
diff --git a/pkgs/tools/backup/tarsnap/default.nix b/nixpkgs/pkgs/tools/backup/tarsnap/default.nix
index 8d23e955095..8d23e955095 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/nixpkgs/pkgs/tools/backup/tarsnap/default.nix
diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/nixpkgs/pkgs/tools/backup/tarsnapper/default.nix
index b02ce82291a..b02ce82291a 100644
--- a/pkgs/tools/backup/tarsnapper/default.nix
+++ b/nixpkgs/pkgs/tools/backup/tarsnapper/default.nix
diff --git a/pkgs/tools/backup/tarsnapper/remove-argparse.patch b/nixpkgs/pkgs/tools/backup/tarsnapper/remove-argparse.patch
index 19c7f9f172e..19c7f9f172e 100644
--- a/pkgs/tools/backup/tarsnapper/remove-argparse.patch
+++ b/nixpkgs/pkgs/tools/backup/tarsnapper/remove-argparse.patch
diff --git a/pkgs/tools/backup/tsm-client/default.nix b/nixpkgs/pkgs/tools/backup/tsm-client/default.nix
index a1f7b1aba84..a1f7b1aba84 100644
--- a/pkgs/tools/backup/tsm-client/default.nix
+++ b/nixpkgs/pkgs/tools/backup/tsm-client/default.nix
diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/default.nix
index 8f93474f8f1..8f93474f8f1 100644
--- a/pkgs/tools/backup/ugarit-manifest-maker/default.nix
+++ b/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/default.nix
diff --git a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix b/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
index 889d698188e..889d698188e 100644
--- a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
+++ b/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
diff --git a/pkgs/tools/backup/ugarit/default.nix b/nixpkgs/pkgs/tools/backup/ugarit/default.nix
index e8f0ea22df1..e8f0ea22df1 100644
--- a/pkgs/tools/backup/ugarit/default.nix
+++ b/nixpkgs/pkgs/tools/backup/ugarit/default.nix
diff --git a/pkgs/tools/backup/ugarit/eggs.nix b/nixpkgs/pkgs/tools/backup/ugarit/eggs.nix
index fe958cb55cc..fe958cb55cc 100644
--- a/pkgs/tools/backup/ugarit/eggs.nix
+++ b/nixpkgs/pkgs/tools/backup/ugarit/eggs.nix
diff --git a/pkgs/tools/backup/wal-e/default.nix b/nixpkgs/pkgs/tools/backup/wal-e/default.nix
index 9c7cb0a83fd..9c7cb0a83fd 100644
--- a/pkgs/tools/backup/wal-e/default.nix
+++ b/nixpkgs/pkgs/tools/backup/wal-e/default.nix
diff --git a/pkgs/tools/backup/wal-g/default.nix b/nixpkgs/pkgs/tools/backup/wal-g/default.nix
index c6c47ce4f16..c6c47ce4f16 100644
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/nixpkgs/pkgs/tools/backup/wal-g/default.nix
diff --git a/pkgs/tools/backup/zbackup/default.nix b/nixpkgs/pkgs/tools/backup/zbackup/default.nix
index d7a160328ed..d7a160328ed 100644
--- a/pkgs/tools/backup/zbackup/default.nix
+++ b/nixpkgs/pkgs/tools/backup/zbackup/default.nix
diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix
index 1cb7e647441..1cb7e647441 100644
--- a/pkgs/tools/backup/zfs-replicate/default.nix
+++ b/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix
diff --git a/pkgs/tools/backup/zfsbackup/default.nix b/nixpkgs/pkgs/tools/backup/zfsbackup/default.nix
index 7b3cbdeaa10..7b3cbdeaa10 100644
--- a/pkgs/tools/backup/zfsbackup/default.nix
+++ b/nixpkgs/pkgs/tools/backup/zfsbackup/default.nix
diff --git a/pkgs/tools/backup/zfsbackup/deps.nix b/nixpkgs/pkgs/tools/backup/zfsbackup/deps.nix
index f1fa23755bc..f1fa23755bc 100644
--- a/pkgs/tools/backup/zfsbackup/deps.nix
+++ b/nixpkgs/pkgs/tools/backup/zfsbackup/deps.nix
diff --git a/pkgs/tools/backup/zfsnap/default.nix b/nixpkgs/pkgs/tools/backup/zfsnap/default.nix
index 89d7414246c..89d7414246c 100644
--- a/pkgs/tools/backup/zfsnap/default.nix
+++ b/nixpkgs/pkgs/tools/backup/zfsnap/default.nix
diff --git a/pkgs/tools/backup/znapzend/default.nix b/nixpkgs/pkgs/tools/backup/znapzend/default.nix
index b44564efb82..b44564efb82 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/nixpkgs/pkgs/tools/backup/znapzend/default.nix
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix
index 1a7fb5c3a08..1a7fb5c3a08 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix
diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix
index 097b7ae00d7..097b7ae00d7 100644
--- a/pkgs/tools/bluetooth/bluez-alsa/default.nix
+++ b/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix
diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/nixpkgs/pkgs/tools/bluetooth/bluez-tools/default.nix
index 47aaadc9ccf..47aaadc9ccf 100644
--- a/pkgs/tools/bluetooth/bluez-tools/default.nix
+++ b/nixpkgs/pkgs/tools/bluetooth/bluez-tools/default.nix
diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix
index 5c8f65ae514..5c8f65ae514 100644
--- a/pkgs/tools/bluetooth/obex-data-server/default.nix
+++ b/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix
diff --git a/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/nixpkgs/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch
index b5fde8db589..b5fde8db589 100644
--- a/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch
+++ b/nixpkgs/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch
diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/nixpkgs/pkgs/tools/bluetooth/obexd/default.nix
index 0771505b726..0771505b726 100644
--- a/pkgs/tools/bluetooth/obexd/default.nix
+++ b/nixpkgs/pkgs/tools/bluetooth/obexd/default.nix
diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/nixpkgs/pkgs/tools/bluetooth/obexfs/default.nix
index 81d0849b408..81d0849b408 100644
--- a/pkgs/tools/bluetooth/obexfs/default.nix
+++ b/nixpkgs/pkgs/tools/bluetooth/obexfs/default.nix
diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/nixpkgs/pkgs/tools/bluetooth/obexftp/default.nix
index 3e40c7d8ef6..3e40c7d8ef6 100644
--- a/pkgs/tools/bluetooth/obexftp/default.nix
+++ b/nixpkgs/pkgs/tools/bluetooth/obexftp/default.nix
diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix
index e3a360818e6..e3a360818e6 100644
--- a/pkgs/tools/bluetooth/openobex/default.nix
+++ b/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix
diff --git a/pkgs/tools/bootloaders/refind/0001-toolchain.patch b/nixpkgs/pkgs/tools/bootloaders/refind/0001-toolchain.patch
index 13c4c88f95f..13c4c88f95f 100644
--- a/pkgs/tools/bootloaders/refind/0001-toolchain.patch
+++ b/nixpkgs/pkgs/tools/bootloaders/refind/0001-toolchain.patch
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/nixpkgs/pkgs/tools/bootloaders/refind/default.nix
index cf0ad78d1d7..cf0ad78d1d7 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/nixpkgs/pkgs/tools/bootloaders/refind/default.nix
diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix
index ccf632dfe5a..ccf632dfe5a 100644
--- a/pkgs/tools/cd-dvd/bashburn/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix
diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix
index b4f0d1039ed..b4f0d1039ed 100644
--- a/pkgs/tools/cd-dvd/bchunk/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix
index a9f5b321d3d..a9f5b321d3d 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix
diff --git a/pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch b/nixpkgs/pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch
index 028ac12c4a0..028ac12c4a0 100644
--- a/pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch
diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/nixpkgs/pkgs/tools/cd-dvd/brasero/wrapper.nix
index 8112b0971f3..8112b0971f3 100644
--- a/pkgs/tools/cd-dvd/brasero/wrapper.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/brasero/wrapper.nix
diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix
index c7aab91adbe..c7aab91adbe 100644
--- a/pkgs/tools/cd-dvd/ccd2iso/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix
diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix
index 00a1864b035..00a1864b035 100644
--- a/pkgs/tools/cd-dvd/cdi2iso/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix
diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix
index ece45944c5c..ece45944c5c 100644
--- a/pkgs/tools/cd-dvd/cdimgtools/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix
diff --git a/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch b/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch
index 5ed389c46ca..5ed389c46ca 100644
--- a/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch
diff --git a/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch b/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch
index cb265eae05b..cb265eae05b 100644
--- a/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch
diff --git a/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch b/nixpkgs/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch
index 6d58eb6e9a5..6d58eb6e9a5 100644
--- a/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch
diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix
index 908808b79f3..908808b79f3 100644
--- a/pkgs/tools/cd-dvd/cdrdao/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix
diff --git a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch b/nixpkgs/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch
index 45f910b03e6..45f910b03e6 100644
--- a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch
diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix
index 7de086dba60..7de086dba60 100644
--- a/pkgs/tools/cd-dvd/cdrkit/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix
diff --git a/pkgs/tools/cd-dvd/cdrkit/include-path.patch b/nixpkgs/pkgs/tools/cd-dvd/cdrkit/include-path.patch
index c071e182d7f..c071e182d7f 100644
--- a/pkgs/tools/cd-dvd/cdrkit/include-path.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/cdrkit/include-path.patch
diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdrtools/default.nix
index f4f07143a20..f4f07143a20 100644
--- a/pkgs/tools/cd-dvd/cdrtools/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/cdrtools/default.nix
diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix
index 2ee69682a1d..2ee69682a1d 100644
--- a/pkgs/tools/cd-dvd/cue2pops/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix
diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cuetools/default.nix
index e4e34aa919b..e4e34aa919b 100644
--- a/pkgs/tools/cd-dvd/cuetools/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/cuetools/default.nix
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
index 40925a14537..40925a14537 100644
--- a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix
index 2cb90129ed9..2cb90129ed9 100644
--- a/pkgs/tools/cd-dvd/dvd-vr/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix
index 6a4161ba1fa..6a4161ba1fa 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix
diff --git a/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch b/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch
index ce3f3de2bc0..ce3f3de2bc0 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch
diff --git a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch b/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/encryption.patch
index 21e35889382..21e35889382 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/encryption.patch
diff --git a/pkgs/tools/cd-dvd/ecm-tools/default.nix b/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix
index 922ab39063a..922ab39063a 100644
--- a/pkgs/tools/cd-dvd/ecm-tools/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix
diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/nixpkgs/pkgs/tools/cd-dvd/isomd5sum/default.nix
index 3bc1f886ccd..3bc1f886ccd 100644
--- a/pkgs/tools/cd-dvd/isomd5sum/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/isomd5sum/default.nix
diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix
index 09fbc8b38c8..09fbc8b38c8 100644
--- a/pkgs/tools/cd-dvd/lsdvd/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix
diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/mdf2iso/default.nix
index dbad9d36247..dbad9d36247 100644
--- a/pkgs/tools/cd-dvd/mdf2iso/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/mdf2iso/default.nix
diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/nixpkgs/pkgs/tools/cd-dvd/mkcue/default.nix
index 357992d7291..357992d7291 100644
--- a/pkgs/tools/cd-dvd/mkcue/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/mkcue/default.nix
diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/default.nix
index 43ed7ea7d38..43ed7ea7d38 100644
--- a/pkgs/tools/cd-dvd/nrg2iso/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/default.nix
diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix
index 94cd09674da..94cd09674da 100644
--- a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix
diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch b/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch
index abddae6d071..abddae6d071 100644
--- a/pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch
+++ b/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch
diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix
index 4e3a2daafe8..4e3a2daafe8 100644
--- a/pkgs/tools/cd-dvd/uif2iso/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix
index a6c2885d4b4..a6c2885d4b4 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix
diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/nixpkgs/pkgs/tools/cd-dvd/vobcopy/default.nix
index 48a58c0c7d1..48a58c0c7d1 100644
--- a/pkgs/tools/cd-dvd/vobcopy/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/vobcopy/default.nix
diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix
index fe7a1a04414..fe7a1a04414 100644
--- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix
diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/xorriso/default.nix
index 901b0c329c5..901b0c329c5 100644
--- a/pkgs/tools/cd-dvd/xorriso/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/xorriso/default.nix
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/nixpkgs/pkgs/tools/compression/advancecomp/default.nix
index 46c8f4338c6..46c8f4338c6 100644
--- a/pkgs/tools/compression/advancecomp/default.nix
+++ b/nixpkgs/pkgs/tools/compression/advancecomp/default.nix
diff --git a/pkgs/tools/compression/brotli/default.nix b/nixpkgs/pkgs/tools/compression/brotli/default.nix
index 229c6c8b8e4..229c6c8b8e4 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/nixpkgs/pkgs/tools/compression/brotli/default.nix
diff --git a/pkgs/tools/compression/bsc/default.nix b/nixpkgs/pkgs/tools/compression/bsc/default.nix
index c1ddb242dad..c1ddb242dad 100644
--- a/pkgs/tools/compression/bsc/default.nix
+++ b/nixpkgs/pkgs/tools/compression/bsc/default.nix
diff --git a/pkgs/tools/compression/bsdiff/default.nix b/nixpkgs/pkgs/tools/compression/bsdiff/default.nix
index a5b527d70b7..a5b527d70b7 100644
--- a/pkgs/tools/compression/bsdiff/default.nix
+++ b/nixpkgs/pkgs/tools/compression/bsdiff/default.nix
diff --git a/pkgs/tools/compression/bsdiff/include-systypes.patch b/nixpkgs/pkgs/tools/compression/bsdiff/include-systypes.patch
index d070a8bb0f8..d070a8bb0f8 100644
--- a/pkgs/tools/compression/bsdiff/include-systypes.patch
+++ b/nixpkgs/pkgs/tools/compression/bsdiff/include-systypes.patch
diff --git a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch b/nixpkgs/pkgs/tools/compression/bzip2/CVE-2016-3189.patch
index eff324b3250..eff324b3250 100644
--- a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch
+++ b/nixpkgs/pkgs/tools/compression/bzip2/CVE-2016-3189.patch
diff --git a/pkgs/tools/compression/bzip2/cve-2019-12900.patch b/nixpkgs/pkgs/tools/compression/bzip2/cve-2019-12900.patch
index bf3d13a7a69..bf3d13a7a69 100644
--- a/pkgs/tools/compression/bzip2/cve-2019-12900.patch
+++ b/nixpkgs/pkgs/tools/compression/bzip2/cve-2019-12900.patch
diff --git a/pkgs/tools/compression/bzip2/default.nix b/nixpkgs/pkgs/tools/compression/bzip2/default.nix
index a440c08bd1b..a440c08bd1b 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/nixpkgs/pkgs/tools/compression/bzip2/default.nix
diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix
index 53b968c5134..53b968c5134 100644
--- a/pkgs/tools/compression/dejsonlz4/default.nix
+++ b/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix
diff --git a/pkgs/tools/compression/dtrx/default.nix b/nixpkgs/pkgs/tools/compression/dtrx/default.nix
index 19bc2fdc176..19bc2fdc176 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/nixpkgs/pkgs/tools/compression/dtrx/default.nix
diff --git a/pkgs/tools/compression/gzip/default.nix b/nixpkgs/pkgs/tools/compression/gzip/default.nix
index e6409f05122..e6409f05122 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/nixpkgs/pkgs/tools/compression/gzip/default.nix
diff --git a/pkgs/tools/compression/gzrt/default.nix b/nixpkgs/pkgs/tools/compression/gzrt/default.nix
index 6ce50bb3d99..6ce50bb3d99 100644
--- a/pkgs/tools/compression/gzrt/default.nix
+++ b/nixpkgs/pkgs/tools/compression/gzrt/default.nix
diff --git a/pkgs/tools/compression/kzipmix/default.nix b/nixpkgs/pkgs/tools/compression/kzipmix/default.nix
index 6fcff7b2928..6fcff7b2928 100644
--- a/pkgs/tools/compression/kzipmix/default.nix
+++ b/nixpkgs/pkgs/tools/compression/kzipmix/default.nix
diff --git a/pkgs/tools/compression/lbzip2/default.nix b/nixpkgs/pkgs/tools/compression/lbzip2/default.nix
index 7e9cc055abf..7e9cc055abf 100644
--- a/pkgs/tools/compression/lbzip2/default.nix
+++ b/nixpkgs/pkgs/tools/compression/lbzip2/default.nix
diff --git a/pkgs/tools/compression/lhasa/default.nix b/nixpkgs/pkgs/tools/compression/lhasa/default.nix
index 64a9ad7f656..64a9ad7f656 100644
--- a/pkgs/tools/compression/lhasa/default.nix
+++ b/nixpkgs/pkgs/tools/compression/lhasa/default.nix
diff --git a/pkgs/tools/compression/lrzip/default.nix b/nixpkgs/pkgs/tools/compression/lrzip/default.nix
index 2c6765b2e83..2c6765b2e83 100644
--- a/pkgs/tools/compression/lrzip/default.nix
+++ b/nixpkgs/pkgs/tools/compression/lrzip/default.nix
diff --git a/pkgs/tools/compression/lrzip/default.upstream b/nixpkgs/pkgs/tools/compression/lrzip/default.upstream
index 1b834598637..1b834598637 100644
--- a/pkgs/tools/compression/lrzip/default.upstream
+++ b/nixpkgs/pkgs/tools/compression/lrzip/default.upstream
diff --git a/pkgs/tools/compression/lz4/default.nix b/nixpkgs/pkgs/tools/compression/lz4/default.nix
index 3ce0eac3fc5..3ce0eac3fc5 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/nixpkgs/pkgs/tools/compression/lz4/default.nix
diff --git a/pkgs/tools/compression/lzbench/default.nix b/nixpkgs/pkgs/tools/compression/lzbench/default.nix
index df7700d41cb..df7700d41cb 100644
--- a/pkgs/tools/compression/lzbench/default.nix
+++ b/nixpkgs/pkgs/tools/compression/lzbench/default.nix
diff --git a/pkgs/tools/compression/lzfse/default.nix b/nixpkgs/pkgs/tools/compression/lzfse/default.nix
index 0c54c3b452b..0c54c3b452b 100644
--- a/pkgs/tools/compression/lzfse/default.nix
+++ b/nixpkgs/pkgs/tools/compression/lzfse/default.nix
diff --git a/pkgs/tools/compression/lzham/default.nix b/nixpkgs/pkgs/tools/compression/lzham/default.nix
index 0aa30ceb663..0aa30ceb663 100644
--- a/pkgs/tools/compression/lzham/default.nix
+++ b/nixpkgs/pkgs/tools/compression/lzham/default.nix
diff --git a/pkgs/tools/compression/lzip/default.nix b/nixpkgs/pkgs/tools/compression/lzip/default.nix
index 4ec40deab6c..4ec40deab6c 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/nixpkgs/pkgs/tools/compression/lzip/default.nix
diff --git a/pkgs/tools/compression/lzip/lzip-setup-hook.sh b/nixpkgs/pkgs/tools/compression/lzip/lzip-setup-hook.sh
index 092ad7737dd..092ad7737dd 100644
--- a/pkgs/tools/compression/lzip/lzip-setup-hook.sh
+++ b/nixpkgs/pkgs/tools/compression/lzip/lzip-setup-hook.sh
diff --git a/pkgs/tools/compression/lzop/default.nix b/nixpkgs/pkgs/tools/compression/lzop/default.nix
index 00eb5f265aa..00eb5f265aa 100644
--- a/pkgs/tools/compression/lzop/default.nix
+++ b/nixpkgs/pkgs/tools/compression/lzop/default.nix
diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix
index 28c7c1d69f7..28c7c1d69f7 100644
--- a/pkgs/tools/compression/mozlz4a/default.nix
+++ b/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix
diff --git a/pkgs/tools/compression/ncompress/builder.sh b/nixpkgs/pkgs/tools/compression/ncompress/builder.sh
index 7a3f34aae46..7a3f34aae46 100644
--- a/pkgs/tools/compression/ncompress/builder.sh
+++ b/nixpkgs/pkgs/tools/compression/ncompress/builder.sh
diff --git a/pkgs/tools/compression/ncompress/default.nix b/nixpkgs/pkgs/tools/compression/ncompress/default.nix
index 8e55d24fc98..8e55d24fc98 100644
--- a/pkgs/tools/compression/ncompress/default.nix
+++ b/nixpkgs/pkgs/tools/compression/ncompress/default.nix
diff --git a/pkgs/tools/compression/ncompress/makefile.patch b/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch
index 49aa4e65c76..49aa4e65c76 100644
--- a/pkgs/tools/compression/ncompress/makefile.patch
+++ b/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch
diff --git a/pkgs/tools/compression/pbzip2/default.nix b/nixpkgs/pkgs/tools/compression/pbzip2/default.nix
index 3314544084f..3314544084f 100644
--- a/pkgs/tools/compression/pbzip2/default.nix
+++ b/nixpkgs/pkgs/tools/compression/pbzip2/default.nix
diff --git a/pkgs/tools/compression/pbzx/default.nix b/nixpkgs/pkgs/tools/compression/pbzx/default.nix
index 13e5882788d..13e5882788d 100644
--- a/pkgs/tools/compression/pbzx/default.nix
+++ b/nixpkgs/pkgs/tools/compression/pbzx/default.nix
diff --git a/pkgs/tools/compression/pigz/default.nix b/nixpkgs/pkgs/tools/compression/pigz/default.nix
index 1fabedaf62d..1fabedaf62d 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/nixpkgs/pkgs/tools/compression/pigz/default.nix
diff --git a/pkgs/tools/compression/pixz/default.nix b/nixpkgs/pkgs/tools/compression/pixz/default.nix
index 7eca80f8400..7eca80f8400 100644
--- a/pkgs/tools/compression/pixz/default.nix
+++ b/nixpkgs/pkgs/tools/compression/pixz/default.nix
diff --git a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch b/nixpkgs/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch
index fac8f1fc147..fac8f1fc147 100644
--- a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch
+++ b/nixpkgs/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch
diff --git a/pkgs/tools/compression/pxz/default.nix b/nixpkgs/pkgs/tools/compression/pxz/default.nix
index f9ca3aa1857..f9ca3aa1857 100644
--- a/pkgs/tools/compression/pxz/default.nix
+++ b/nixpkgs/pkgs/tools/compression/pxz/default.nix
diff --git a/pkgs/tools/compression/rzip/default.nix b/nixpkgs/pkgs/tools/compression/rzip/default.nix
index 8773121e646..8773121e646 100644
--- a/pkgs/tools/compression/rzip/default.nix
+++ b/nixpkgs/pkgs/tools/compression/rzip/default.nix
diff --git a/pkgs/tools/compression/upx/default.nix b/nixpkgs/pkgs/tools/compression/upx/default.nix
index f602a52d85a..f602a52d85a 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/nixpkgs/pkgs/tools/compression/upx/default.nix
diff --git a/pkgs/tools/compression/xar/default.nix b/nixpkgs/pkgs/tools/compression/xar/default.nix
index 691f3a8ee5d..691f3a8ee5d 100644
--- a/pkgs/tools/compression/xar/default.nix
+++ b/nixpkgs/pkgs/tools/compression/xar/default.nix
diff --git a/pkgs/tools/compression/xdelta/default.nix b/nixpkgs/pkgs/tools/compression/xdelta/default.nix
index 034cdb7d94e..034cdb7d94e 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/nixpkgs/pkgs/tools/compression/xdelta/default.nix
diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/nixpkgs/pkgs/tools/compression/xdelta/unstable.nix
index bf2601dd373..bf2601dd373 100644
--- a/pkgs/tools/compression/xdelta/unstable.nix
+++ b/nixpkgs/pkgs/tools/compression/xdelta/unstable.nix
diff --git a/pkgs/tools/compression/xz/default.nix b/nixpkgs/pkgs/tools/compression/xz/default.nix
index 0ff349e96e8..0ff349e96e8 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/nixpkgs/pkgs/tools/compression/xz/default.nix
diff --git a/pkgs/tools/compression/zdelta/builder.sh b/nixpkgs/pkgs/tools/compression/zdelta/builder.sh
index 03db413181d..03db413181d 100644
--- a/pkgs/tools/compression/zdelta/builder.sh
+++ b/nixpkgs/pkgs/tools/compression/zdelta/builder.sh
diff --git a/pkgs/tools/compression/zdelta/default.nix b/nixpkgs/pkgs/tools/compression/zdelta/default.nix
index 20748c31ab8..20748c31ab8 100644
--- a/pkgs/tools/compression/zdelta/default.nix
+++ b/nixpkgs/pkgs/tools/compression/zdelta/default.nix
diff --git a/pkgs/tools/compression/zopfli/default.nix b/nixpkgs/pkgs/tools/compression/zopfli/default.nix
index 586c47de582..586c47de582 100644
--- a/pkgs/tools/compression/zopfli/default.nix
+++ b/nixpkgs/pkgs/tools/compression/zopfli/default.nix
diff --git a/pkgs/tools/compression/zstd/default.nix b/nixpkgs/pkgs/tools/compression/zstd/default.nix
index 82a6a3a8a53..82a6a3a8a53 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/nixpkgs/pkgs/tools/compression/zstd/default.nix
diff --git a/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch b/nixpkgs/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch
index 69921c0c7ba..69921c0c7ba 100644
--- a/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch
+++ b/nixpkgs/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch
diff --git a/pkgs/tools/compression/zsync/default.nix b/nixpkgs/pkgs/tools/compression/zsync/default.nix
index 830e5f10ef6..830e5f10ef6 100644
--- a/pkgs/tools/compression/zsync/default.nix
+++ b/nixpkgs/pkgs/tools/compression/zsync/default.nix
diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix
index b9c5c55a8e4..b9c5c55a8e4 100644
--- a/pkgs/tools/filesystems/9pfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix
diff --git a/pkgs/tools/filesystems/aefs/default.nix b/nixpkgs/pkgs/tools/filesystems/aefs/default.nix
index 1be33e1299d..1be33e1299d 100644
--- a/pkgs/tools/filesystems/aefs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/aefs/default.nix
diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix
index 7f8a8c4f931..7f8a8c4f931 100644
--- a/pkgs/tools/filesystems/afpfs-ng/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
index 001e644b7e7..001e644b7e7 100644
--- a/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix
index 2c7b1c27156..2c7b1c27156 100644
--- a/pkgs/tools/filesystems/apfs-fuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix
diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix
index 18bde25267d..18bde25267d 100644
--- a/pkgs/tools/filesystems/archivemount/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix
diff --git a/pkgs/tools/filesystems/avfs/default.nix b/nixpkgs/pkgs/tools/filesystems/avfs/default.nix
index b66d67fbc9f..b66d67fbc9f 100644
--- a/pkgs/tools/filesystems/avfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/avfs/default.nix
diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix
index d449bf1266a..d449bf1266a 100644
--- a/pkgs/tools/filesystems/bashmount/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix
diff --git a/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch b/nixpkgs/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch
index c6cf79785b7..c6cf79785b7 100644
--- a/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch
+++ b/nixpkgs/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix
index d3e790a3cf1..d3e790a3cf1 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix
diff --git a/pkgs/tools/filesystems/bcache-tools/fix-static.patch b/nixpkgs/pkgs/tools/filesystems/bcache-tools/fix-static.patch
index e5dd2df5299..e5dd2df5299 100644
--- a/pkgs/tools/filesystems/bcache-tools/fix-static.patch
+++ b/nixpkgs/pkgs/tools/filesystems/bcache-tools/fix-static.patch
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix
index 144ed0a3845..144ed0a3845 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix
diff --git a/pkgs/tools/filesystems/bees/bees-service-wrapper b/nixpkgs/pkgs/tools/filesystems/bees/bees-service-wrapper
index 8ef46afc18f..8ef46afc18f 100755
--- a/pkgs/tools/filesystems/bees/bees-service-wrapper
+++ b/nixpkgs/pkgs/tools/filesystems/bees/bees-service-wrapper
diff --git a/pkgs/tools/filesystems/bees/default.nix b/nixpkgs/pkgs/tools/filesystems/bees/default.nix
index c6bb07e7b87..c6bb07e7b87 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bees/default.nix
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
index 834aa7290ab..834aa7290ab 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix
index 3c6f6228329..3c6f6228329 100644
--- a/pkgs/tools/filesystems/blobfuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix
diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix
index 57dc51e4111..57dc51e4111 100644
--- a/pkgs/tools/filesystems/bonnie/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix
diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix
index 3ddc9527397..3ddc9527397 100644
--- a/pkgs/tools/filesystems/boxfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix
diff --git a/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch b/nixpkgs/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch
index b74e7f32466..b74e7f32466 100644
--- a/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch
+++ b/nixpkgs/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch
diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-dedupe/default.nix
index e2538387d45..e2538387d45 100644
--- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/btrfs-dedupe/default.nix
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix
index e3545315d6f..e3545315d6f 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix
diff --git a/pkgs/tools/filesystems/buttersink/default.nix b/nixpkgs/pkgs/tools/filesystems/buttersink/default.nix
index 791d59b7ac2..791d59b7ac2 100644
--- a/pkgs/tools/filesystems/buttersink/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/buttersink/default.nix
diff --git a/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch b/nixpkgs/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch
index 9604da87fb5..9604da87fb5 100644
--- a/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch
+++ b/nixpkgs/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch
diff --git a/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch b/nixpkgs/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch
index b04082537b5..b04082537b5 100644
--- a/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch
+++ b/nixpkgs/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
index e3b1d7c661c..e3b1d7c661c 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix
index 6c0a6c28703..6c0a6c28703 100644
--- a/pkgs/tools/filesystems/chunkfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix
diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix
index 533bb2322e7..533bb2322e7 100644
--- a/pkgs/tools/filesystems/ciopfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix
diff --git a/pkgs/tools/filesystems/convoy/default.nix b/nixpkgs/pkgs/tools/filesystems/convoy/default.nix
index 00ef368ad3d..00ef368ad3d 100644
--- a/pkgs/tools/filesystems/convoy/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/convoy/default.nix
diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix
index 46635aa6741..46635aa6741 100644
--- a/pkgs/tools/filesystems/cpcfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix
diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
index 93a70f1f088..93a70f1f088 100644
--- a/pkgs/tools/filesystems/cryfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix
index 5636909093e..5636909093e 100644
--- a/pkgs/tools/filesystems/curlftpfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix
diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix
index 0890db67fe7..0890db67fe7 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix
diff --git a/pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch b/nixpkgs/pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch
index 3fbbc4c7d0f..3fbbc4c7d0f 100644
--- a/pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch
+++ b/nixpkgs/pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch
diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix
index 366db929f58..366db929f58 100644
--- a/pkgs/tools/filesystems/davfs2/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix
diff --git a/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch b/nixpkgs/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch
index f71248a28f4..f71248a28f4 100644
--- a/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch
+++ b/nixpkgs/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch
diff --git a/pkgs/tools/filesystems/davfs2/isdir.patch b/nixpkgs/pkgs/tools/filesystems/davfs2/isdir.patch
index ae69b4460f5..ae69b4460f5 100644
--- a/pkgs/tools/filesystems/davfs2/isdir.patch
+++ b/nixpkgs/pkgs/tools/filesystems/davfs2/isdir.patch
diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix
index cf87f9ca98e..cf87f9ca98e 100644
--- a/pkgs/tools/filesystems/dislocker/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix
diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/nixpkgs/pkgs/tools/filesystems/disorderfs/default.nix
index 5137719790a..5137719790a 100644
--- a/pkgs/tools/filesystems/disorderfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/disorderfs/default.nix
diff --git a/pkgs/tools/filesystems/djmount/default.nix b/nixpkgs/pkgs/tools/filesystems/djmount/default.nix
index e3c8c2944fb..e3c8c2944fb 100644
--- a/pkgs/tools/filesystems/djmount/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/djmount/default.nix
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix
index 369d2e74f30..369d2e74f30 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix
diff --git a/pkgs/tools/filesystems/duff/default.nix b/nixpkgs/pkgs/tools/filesystems/duff/default.nix
index d68ad10bd0d..d68ad10bd0d 100644
--- a/pkgs/tools/filesystems/duff/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/duff/default.nix
diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix
index 0950445bd3e..0950445bd3e 100644
--- a/pkgs/tools/filesystems/duperemove/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
index 0fd7062ac6c..0fd7062ac6c 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix
index 14f6afa99f0..14f6afa99f0 100644
--- a/pkgs/tools/filesystems/e2tools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/nixpkgs/pkgs/tools/filesystems/encfs/default.nix
index 19767b7013a..19767b7013a 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/encfs/default.nix
diff --git a/pkgs/tools/filesystems/exfat/default.nix b/nixpkgs/pkgs/tools/filesystems/exfat/default.nix
index 24db663aee0..24db663aee0 100644
--- a/pkgs/tools/filesystems/exfat/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/exfat/default.nix
diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix
index 40159b5fb6e..40159b5fb6e 100644
--- a/pkgs/tools/filesystems/ext4magic/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix
diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix
index b84992e1acb..b84992e1acb 100644
--- a/pkgs/tools/filesystems/extundelete/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix
diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix
index c5ec523e247..c5ec523e247 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix
diff --git a/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
index e01a97b0bc3..e01a97b0bc3 100644
--- a/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
+++ b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
diff --git a/pkgs/tools/filesystems/f3/default.nix b/nixpkgs/pkgs/tools/filesystems/f3/default.nix
index d2887582938..d2887582938 100644
--- a/pkgs/tools/filesystems/f3/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/f3/default.nix
diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix
index 5a60f8c055e..5a60f8c055e 100644
--- a/pkgs/tools/filesystems/fatresize/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix
diff --git a/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch b/nixpkgs/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch
index e9aa87a2d56..e9aa87a2d56 100644
--- a/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch
+++ b/nixpkgs/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch
diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix
index aee053ad135..aee053ad135 100644
--- a/pkgs/tools/filesystems/fatsort/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix
diff --git a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch b/nixpkgs/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch
index 9c9f58e97ab..9c9f58e97ab 100644
--- a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch
+++ b/nixpkgs/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch
diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix
index 8eeb052b22f..8eeb052b22f 100644
--- a/pkgs/tools/filesystems/file-rename/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix
diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix
index 75e5280d391..75e5280d391 100644
--- a/pkgs/tools/filesystems/fsfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix
diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix
index a8eb1118f4d..a8eb1118f4d 100644
--- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix
diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index 8287a84d30d..8287a84d30d 100644
--- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix
index 41c4cc84f96..41c4cc84f96 100644
--- a/pkgs/tools/filesystems/fuseiso/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
index f8d955dbfc1..f8d955dbfc1 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix
index 0ef85abd2b7..0ef85abd2b7 100644
--- a/pkgs/tools/filesystems/genext2fs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix
diff --git a/pkgs/tools/filesystems/genimage/default.nix b/nixpkgs/pkgs/tools/filesystems/genimage/default.nix
index e905222ad45..e905222ad45 100644
--- a/pkgs/tools/filesystems/genimage/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/genimage/default.nix
diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix
index 1e6c73f725a..1e6c73f725a 100644
--- a/pkgs/tools/filesystems/genromfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix
diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix
index 5b379414666..5b379414666 100644
--- a/pkgs/tools/filesystems/gitfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
index db5c469e63b..db5c469e63b 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch b/nixpkgs/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
index f08d73cf3a6..f08d73cf3a6 100644
--- a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
+++ b/nixpkgs/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix
index 605e341c4d7..605e341c4d7 100644
--- a/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix
diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.nix b/nixpkgs/pkgs/tools/filesystems/go-mtpfs/deps.nix
index f558a53f7d2..f558a53f7d2 100644
--- a/pkgs/tools/filesystems/go-mtpfs/deps.nix
+++ b/nixpkgs/pkgs/tools/filesystems/go-mtpfs/deps.nix
diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix
index 8491bf20e8f..8491bf20e8f 100644
--- a/pkgs/tools/filesystems/gocryptfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix
diff --git a/pkgs/tools/filesystems/gocryptfs/deps.nix b/nixpkgs/pkgs/tools/filesystems/gocryptfs/deps.nix
index cebad12327e..cebad12327e 100644
--- a/pkgs/tools/filesystems/gocryptfs/deps.nix
+++ b/nixpkgs/pkgs/tools/filesystems/gocryptfs/deps.nix
diff --git a/pkgs/tools/filesystems/gpart/default.nix b/nixpkgs/pkgs/tools/filesystems/gpart/default.nix
index 59b4785888b..59b4785888b 100644
--- a/pkgs/tools/filesystems/gpart/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/gpart/default.nix
diff --git a/pkgs/tools/filesystems/grive2/default.nix b/nixpkgs/pkgs/tools/filesystems/grive2/default.nix
index f325fc97e32..f325fc97e32 100644
--- a/pkgs/tools/filesystems/grive2/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/grive2/default.nix
diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix
index 2032ca1c1e7..2032ca1c1e7 100644
--- a/pkgs/tools/filesystems/hfsprogs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix
diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix
index b0f7981ebb3..b0f7981ebb3 100644
--- a/pkgs/tools/filesystems/httpfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix
diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix
index 9b1c2b66e7a..9b1c2b66e7a 100644
--- a/pkgs/tools/filesystems/hubicfuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix
diff --git a/pkgs/tools/filesystems/idsk/default.nix b/nixpkgs/pkgs/tools/filesystems/idsk/default.nix
index 72ed4f0ee1b..72ed4f0ee1b 100644
--- a/pkgs/tools/filesystems/idsk/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/idsk/default.nix
diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix
index aef6087d3f2..aef6087d3f2 100644
--- a/pkgs/tools/filesystems/ifuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix
diff --git a/pkgs/tools/filesystems/irods/common.nix b/nixpkgs/pkgs/tools/filesystems/irods/common.nix
index 902d7d7d1a1..902d7d7d1a1 100644
--- a/pkgs/tools/filesystems/irods/common.nix
+++ b/nixpkgs/pkgs/tools/filesystems/irods/common.nix
diff --git a/pkgs/tools/filesystems/irods/default.nix b/nixpkgs/pkgs/tools/filesystems/irods/default.nix
index b6099c099f3..b6099c099f3 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/irods/default.nix
diff --git a/pkgs/tools/filesystems/irods/irods_root_path.patch b/nixpkgs/pkgs/tools/filesystems/irods/irods_root_path.patch
index 16b6ba08cbb..16b6ba08cbb 100644
--- a/pkgs/tools/filesystems/irods/irods_root_path.patch
+++ b/nixpkgs/pkgs/tools/filesystems/irods/irods_root_path.patch
diff --git a/pkgs/tools/filesystems/jfsutils/ar-fix.patch b/nixpkgs/pkgs/tools/filesystems/jfsutils/ar-fix.patch
index 697029cd5a8..697029cd5a8 100644
--- a/pkgs/tools/filesystems/jfsutils/ar-fix.patch
+++ b/nixpkgs/pkgs/tools/filesystems/jfsutils/ar-fix.patch
diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix
index 92dfe00c951..92dfe00c951 100644
--- a/pkgs/tools/filesystems/jfsutils/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix
diff --git a/pkgs/tools/filesystems/jfsutils/hardening-format.patch b/nixpkgs/pkgs/tools/filesystems/jfsutils/hardening-format.patch
index dd2a93a81ec..dd2a93a81ec 100644
--- a/pkgs/tools/filesystems/jfsutils/hardening-format.patch
+++ b/nixpkgs/pkgs/tools/filesystems/jfsutils/hardening-format.patch
diff --git a/pkgs/tools/filesystems/jfsutils/types.patch b/nixpkgs/pkgs/tools/filesystems/jfsutils/types.patch
index a682f2695f9..a682f2695f9 100644
--- a/pkgs/tools/filesystems/jfsutils/types.patch
+++ b/nixpkgs/pkgs/tools/filesystems/jfsutils/types.patch
diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix
index 58963753a51..58963753a51 100644
--- a/pkgs/tools/filesystems/jmtpfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix
index 3ae898d4ba8..3ae898d4ba8 100644
--- a/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix
diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix
index a7c9421f46a..a7c9421f46a 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix
diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/nixpkgs/pkgs/tools/filesystems/mergerfs/tools.nix
index 44337cf1161..44337cf1161 100644
--- a/pkgs/tools/filesystems/mergerfs/tools.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mergerfs/tools.nix
diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix
index 4d90e189b95..4d90e189b95 100644
--- a/pkgs/tools/filesystems/mhddfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix
diff --git a/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch b/nixpkgs/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch
index 35e58cf0ce9..35e58cf0ce9 100644
--- a/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch
+++ b/nixpkgs/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch
diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix
index 6733b3df45e..6733b3df45e 100644
--- a/pkgs/tools/filesystems/mkspiffs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix
diff --git a/pkgs/tools/filesystems/mkspiffs/presets.nix b/nixpkgs/pkgs/tools/filesystems/mkspiffs/presets.nix
index c0b74d9cf1b..c0b74d9cf1b 100644
--- a/pkgs/tools/filesystems/mkspiffs/presets.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mkspiffs/presets.nix
diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix
index 5d3c2d15fb2..5d3c2d15fb2 100644
--- a/pkgs/tools/filesystems/moosefs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix
diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix
index b453067eaef..b453067eaef 100644
--- a/pkgs/tools/filesystems/mp3fs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix
diff --git a/pkgs/tools/filesystems/mp3fs/fix-statfs-operation.patch b/nixpkgs/pkgs/tools/filesystems/mp3fs/fix-statfs-operation.patch
index 9b3094e6005..9b3094e6005 100644
--- a/pkgs/tools/filesystems/mp3fs/fix-statfs-operation.patch
+++ b/nixpkgs/pkgs/tools/filesystems/mp3fs/fix-statfs-operation.patch
diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix
index 3b355c92226..3b355c92226 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix
diff --git a/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch b/nixpkgs/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch
index 46b790afd30..46b790afd30 100644
--- a/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch
+++ b/nixpkgs/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch
diff --git a/pkgs/tools/filesystems/mtools/default.nix b/nixpkgs/pkgs/tools/filesystems/mtools/default.nix
index b477ad8deac..b477ad8deac 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mtools/default.nix
diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix
index bf048113714..bf048113714 100644
--- a/pkgs/tools/filesystems/mtpfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix
index 0a4207d0715..0a4207d0715 100644
--- a/pkgs/tools/filesystems/netatalk/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix
diff --git a/pkgs/tools/filesystems/netatalk/no-suid.patch b/nixpkgs/pkgs/tools/filesystems/netatalk/no-suid.patch
index 194c1f5fac9..194c1f5fac9 100644
--- a/pkgs/tools/filesystems/netatalk/no-suid.patch
+++ b/nixpkgs/pkgs/tools/filesystems/netatalk/no-suid.patch
diff --git a/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch b/nixpkgs/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch
index 01c4ee9ba47..01c4ee9ba47 100644
--- a/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch
+++ b/nixpkgs/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch
diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix
index dd8116ff401..dd8116ff401 100644
--- a/pkgs/tools/filesystems/nilfs-utils/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index 003a0e24fb5..003a0e24fb5 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.patch b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.patch
index d53231a84fd..d53231a84fd 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.patch
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.patch
diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
index b5f3a2f3e1f..b5f3a2f3e1f 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 5d7a9dd14ec..5d7a9dd14ec 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix
diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix
index fd608889102..fd608889102 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix
diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
index 804b052b61a..804b052b61a 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
index f30bd958cf3..f30bd958cf3 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix
index 046fe81e64a..046fe81e64a 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
index 2abab905737..2abab905737 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
index 9d067359c44..9d067359c44 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
index e0947b01f51..e0947b01f51 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/default.nix
index 809c5256873..809c5256873 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/default.nix
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix
index 1d402090355..1d402090355 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix
diff --git a/pkgs/tools/filesystems/orangefs/default.nix b/nixpkgs/pkgs/tools/filesystems/orangefs/default.nix
index 37f4026799b..37f4026799b 100644
--- a/pkgs/tools/filesystems/orangefs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/orangefs/default.nix
diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix
index 996e3c52ec2..996e3c52ec2 100644
--- a/pkgs/tools/filesystems/rar2fs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix
diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix
index 424f84ec34f..424f84ec34f 100644
--- a/pkgs/tools/filesystems/rdfind/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix
diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix
index dbc391d0082..dbc391d0082 100644
--- a/pkgs/tools/filesystems/reiser4progs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix
diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix
index a89ea065750..a89ea065750 100644
--- a/pkgs/tools/filesystems/reiserfsprogs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix
diff --git a/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch b/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch
index 356782a3d98..356782a3d98 100644
--- a/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch
+++ b/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch
diff --git a/pkgs/tools/filesystems/relfs/default.nix b/nixpkgs/pkgs/tools/filesystems/relfs/default.nix
index c99a95714c0..c99a95714c0 100644
--- a/pkgs/tools/filesystems/relfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/relfs/default.nix
diff --git a/pkgs/tools/filesystems/rmount/default.nix b/nixpkgs/pkgs/tools/filesystems/rmount/default.nix
index 46be9e30f70..46be9e30f70 100644
--- a/pkgs/tools/filesystems/rmount/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/rmount/default.nix
diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix
index 186da6255eb..186da6255eb 100644
--- a/pkgs/tools/filesystems/s3backer/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix
index 3fc082dad46..3fc082dad46 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix
diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix
index 36ac3630e54..36ac3630e54 100644
--- a/pkgs/tools/filesystems/sasquatch/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix
diff --git a/pkgs/tools/filesystems/securefs/default.nix b/nixpkgs/pkgs/tools/filesystems/securefs/default.nix
index c5a5af212d9..c5a5af212d9 100644
--- a/pkgs/tools/filesystems/securefs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/securefs/default.nix
diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/nixpkgs/pkgs/tools/filesystems/simg2img/default.nix
index 78f80ecfa87..78f80ecfa87 100644
--- a/pkgs/tools/filesystems/simg2img/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/simg2img/default.nix
diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix
index be46abb2694..be46abb2694 100644
--- a/pkgs/tools/filesystems/smbnetfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix
diff --git a/pkgs/tools/filesystems/smbnetfs/default.upstream b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.upstream
index d56fa42f1d1..d56fa42f1d1 100644
--- a/pkgs/tools/filesystems/smbnetfs/default.upstream
+++ b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.upstream
diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix
index b5ffdade98f..b5ffdade98f 100644
--- a/pkgs/tools/filesystems/snapraid/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix
diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix
index bc8ce7b19c5..bc8ce7b19c5 100644
--- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix
diff --git a/pkgs/tools/filesystems/squashfs/4k-align.patch b/nixpkgs/pkgs/tools/filesystems/squashfs/4k-align.patch
index e73c0678875..e73c0678875 100644
--- a/pkgs/tools/filesystems/squashfs/4k-align.patch
+++ b/nixpkgs/pkgs/tools/filesystems/squashfs/4k-align.patch
diff --git a/pkgs/tools/filesystems/squashfs/darwin.patch b/nixpkgs/pkgs/tools/filesystems/squashfs/darwin.patch
index eb2dc24ec1a..eb2dc24ec1a 100644
--- a/pkgs/tools/filesystems/squashfs/darwin.patch
+++ b/nixpkgs/pkgs/tools/filesystems/squashfs/darwin.patch
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix
index f02a913bc25..f02a913bc25 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix
diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix
index e828698b0e9..e828698b0e9 100644
--- a/pkgs/tools/filesystems/squashfuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 018dfe7858e..018dfe7858e 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix
diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix
index ebfb211732e..ebfb211732e 100644
--- a/pkgs/tools/filesystems/svnfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix
diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix
index 67e21ac4c2c..67e21ac4c2c 100644
--- a/pkgs/tools/filesystems/tmsu/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix
diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix
index 62b4b930139..62b4b930139 100644
--- a/pkgs/tools/filesystems/u3-tool/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix
diff --git a/pkgs/tools/filesystems/udftools/default.nix b/nixpkgs/pkgs/tools/filesystems/udftools/default.nix
index 9efaf96182d..9efaf96182d 100644
--- a/pkgs/tools/filesystems/udftools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/udftools/default.nix
diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix
index 73272b83989..73272b83989 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix
diff --git a/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch b/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch
index 0a98b83282b..0a98b83282b 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch
+++ b/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch
diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/vmfs-tools/default.nix
index c15a782fa3c..c15a782fa3c 100644
--- a/pkgs/tools/filesystems/vmfs-tools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/vmfs-tools/default.nix
diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix
index 50a50ad18f0..50a50ad18f0 100644
--- a/pkgs/tools/filesystems/wdfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix
index aa28ee62596..aa28ee62596 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix
index d8d41450079..d8d41450079 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix
index b97480d655b..b97480d655b 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix
diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix
index 734c8df9b6a..734c8df9b6a 100644
--- a/pkgs/tools/filesystems/zerofree/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix
diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix
index 476d8065312..476d8065312 100644
--- a/pkgs/tools/filesystems/zfstools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix
diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix
index 89516d525af..89516d525af 100644
--- a/pkgs/tools/filesystems/zkfuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix
diff --git a/pkgs/tools/graphics/appleseed/default.nix b/nixpkgs/pkgs/tools/graphics/appleseed/default.nix
index cafe0bb7b11..cafe0bb7b11 100644
--- a/pkgs/tools/graphics/appleseed/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/appleseed/default.nix
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix
index 3f8bdf3ac6b..3f8bdf3ac6b 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix
diff --git a/pkgs/tools/graphics/argyllcms/gcc5.patch b/nixpkgs/pkgs/tools/graphics/argyllcms/gcc5.patch
index 28067455c33..28067455c33 100644
--- a/pkgs/tools/graphics/argyllcms/gcc5.patch
+++ b/nixpkgs/pkgs/tools/graphics/argyllcms/gcc5.patch
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/nixpkgs/pkgs/tools/graphics/asymptote/default.nix
index 6246a573340..6246a573340 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/asymptote/default.nix
diff --git a/pkgs/tools/graphics/asymptote/default.upstream b/nixpkgs/pkgs/tools/graphics/asymptote/default.upstream
index e86d81ba443..e86d81ba443 100644
--- a/pkgs/tools/graphics/asymptote/default.upstream
+++ b/nixpkgs/pkgs/tools/graphics/asymptote/default.upstream
diff --git a/pkgs/tools/graphics/barcode/default.nix b/nixpkgs/pkgs/tools/graphics/barcode/default.nix
index 179085e1fd6..179085e1fd6 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/barcode/default.nix
diff --git a/pkgs/tools/graphics/blockhash/default.nix b/nixpkgs/pkgs/tools/graphics/blockhash/default.nix
index b4f99a9192c..b4f99a9192c 100644
--- a/pkgs/tools/graphics/blockhash/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/blockhash/default.nix
diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/nixpkgs/pkgs/tools/graphics/blur-effect/default.nix
index 49900401319..49900401319 100644
--- a/pkgs/tools/graphics/blur-effect/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/blur-effect/default.nix
diff --git a/pkgs/tools/graphics/briss/default.nix b/nixpkgs/pkgs/tools/graphics/briss/default.nix
index e57f80f738f..e57f80f738f 100644
--- a/pkgs/tools/graphics/briss/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/briss/default.nix
diff --git a/pkgs/tools/graphics/cfdg/default.nix b/nixpkgs/pkgs/tools/graphics/cfdg/default.nix
index 1fd4d3324a0..1fd4d3324a0 100644
--- a/pkgs/tools/graphics/cfdg/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/cfdg/default.nix
diff --git a/pkgs/tools/graphics/cfdg/src-for-default.nix b/nixpkgs/pkgs/tools/graphics/cfdg/src-for-default.nix
index 6d98ea240de..6d98ea240de 100644
--- a/pkgs/tools/graphics/cfdg/src-for-default.nix
+++ b/nixpkgs/pkgs/tools/graphics/cfdg/src-for-default.nix
diff --git a/pkgs/tools/graphics/cfdg/src-info-for-default.nix b/nixpkgs/pkgs/tools/graphics/cfdg/src-info-for-default.nix
index 0e2018b6bfd..0e2018b6bfd 100644
--- a/pkgs/tools/graphics/cfdg/src-info-for-default.nix
+++ b/nixpkgs/pkgs/tools/graphics/cfdg/src-info-for-default.nix
diff --git a/pkgs/tools/graphics/convchain/default.nix b/nixpkgs/pkgs/tools/graphics/convchain/default.nix
index b1ce3082d25..b1ce3082d25 100644
--- a/pkgs/tools/graphics/convchain/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/convchain/default.nix
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix
index 3d48b328934..3d48b328934 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix
diff --git a/pkgs/tools/graphics/cuneiform/default.upstream b/nixpkgs/pkgs/tools/graphics/cuneiform/default.upstream
index 4fb85a2a1e8..4fb85a2a1e8 100644
--- a/pkgs/tools/graphics/cuneiform/default.upstream
+++ b/nixpkgs/pkgs/tools/graphics/cuneiform/default.upstream
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/nixpkgs/pkgs/tools/graphics/dcraw/default.nix
index 11ff4b743dd..11ff4b743dd 100644
--- a/pkgs/tools/graphics/dcraw/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/dcraw/default.nix
diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix
index a12e5dbb8bb..a12e5dbb8bb 100644
--- a/pkgs/tools/graphics/diagrams-builder/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix
diff --git a/pkgs/tools/graphics/ditaa/default.nix b/nixpkgs/pkgs/tools/graphics/ditaa/default.nix
index c8c330d80e5..c8c330d80e5 100644
--- a/pkgs/tools/graphics/ditaa/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/ditaa/default.nix
diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix
index bb816e48940..bb816e48940 100644
--- a/pkgs/tools/graphics/dmtx-utils/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix
diff --git a/pkgs/tools/graphics/dmtx-utils/default.upstream b/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.upstream
index 2bb7fe31bf7..2bb7fe31bf7 100644
--- a/pkgs/tools/graphics/dmtx-utils/default.upstream
+++ b/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.upstream
diff --git a/pkgs/tools/graphics/dpic/default.nix b/nixpkgs/pkgs/tools/graphics/dpic/default.nix
index 62fa83800cb..62fa83800cb 100644
--- a/pkgs/tools/graphics/dpic/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/dpic/default.nix
diff --git a/pkgs/tools/graphics/editres/default.nix b/nixpkgs/pkgs/tools/graphics/editres/default.nix
index cb83e02689c..cb83e02689c 100644
--- a/pkgs/tools/graphics/editres/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/editres/default.nix
diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix
index 8c46e8154c1..8c46e8154c1 100644
--- a/pkgs/tools/graphics/enblend-enfuse/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix
diff --git a/pkgs/tools/graphics/eplot/default.nix b/nixpkgs/pkgs/tools/graphics/eplot/default.nix
index ff2091fc299..ff2091fc299 100644
--- a/pkgs/tools/graphics/eplot/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/eplot/default.nix
diff --git a/pkgs/tools/graphics/epstool/default.nix b/nixpkgs/pkgs/tools/graphics/epstool/default.nix
index 2ad52d2de43..2ad52d2de43 100644
--- a/pkgs/tools/graphics/epstool/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/epstool/default.nix
diff --git a/pkgs/tools/graphics/epstool/gcc43.patch b/nixpkgs/pkgs/tools/graphics/epstool/gcc43.patch
index 398ce08c518..398ce08c518 100644
--- a/pkgs/tools/graphics/epstool/gcc43.patch
+++ b/nixpkgs/pkgs/tools/graphics/epstool/gcc43.patch
diff --git a/pkgs/tools/graphics/escrotum/default.nix b/nixpkgs/pkgs/tools/graphics/escrotum/default.nix
index 16f33251dd6..16f33251dd6 100644
--- a/pkgs/tools/graphics/escrotum/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/escrotum/default.nix
diff --git a/pkgs/tools/graphics/exif/default.nix b/nixpkgs/pkgs/tools/graphics/exif/default.nix
index 83fec1287a6..83fec1287a6 100644
--- a/pkgs/tools/graphics/exif/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/exif/default.nix
diff --git a/pkgs/tools/graphics/exiftags/default.nix b/nixpkgs/pkgs/tools/graphics/exiftags/default.nix
index 9ce95154cb0..9ce95154cb0 100644
--- a/pkgs/tools/graphics/exiftags/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/exiftags/default.nix
diff --git a/pkgs/tools/graphics/facedetect/default.nix b/nixpkgs/pkgs/tools/graphics/facedetect/default.nix
index cb697148d04..cb697148d04 100644
--- a/pkgs/tools/graphics/facedetect/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/facedetect/default.nix
diff --git a/pkgs/tools/graphics/fast-neural-doodle/default.nix b/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/default.nix
index 17e1c710586..17e1c710586 100644
--- a/pkgs/tools/graphics/fast-neural-doodle/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/default.nix
diff --git a/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh b/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh
index a089d5a9506..a089d5a9506 100644
--- a/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh
+++ b/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh
diff --git a/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh b/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh
index cfff76d141f..cfff76d141f 100644
--- a/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh
+++ b/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh
diff --git a/pkgs/tools/graphics/fbv/default.nix b/nixpkgs/pkgs/tools/graphics/fbv/default.nix
index c7fab171067..c7fab171067 100644
--- a/pkgs/tools/graphics/fbv/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/fbv/default.nix
diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix
index 8f94624febe..8f94624febe 100644
--- a/pkgs/tools/graphics/feedgnuplot/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix
diff --git a/pkgs/tools/graphics/fgallery/default.nix b/nixpkgs/pkgs/tools/graphics/fgallery/default.nix
index 2bce8ec4941..2bce8ec4941 100644
--- a/pkgs/tools/graphics/fgallery/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/fgallery/default.nix
diff --git a/pkgs/tools/graphics/fim/default.nix b/nixpkgs/pkgs/tools/graphics/fim/default.nix
index 3fc82a9c72a..3fc82a9c72a 100644
--- a/pkgs/tools/graphics/fim/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/fim/default.nix
diff --git a/pkgs/tools/graphics/flam3/default.nix b/nixpkgs/pkgs/tools/graphics/flam3/default.nix
index a6277f58cbd..a6277f58cbd 100644
--- a/pkgs/tools/graphics/flam3/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/flam3/default.nix
diff --git a/pkgs/tools/graphics/ggobi/default.nix b/nixpkgs/pkgs/tools/graphics/ggobi/default.nix
index de02865c36e..de02865c36e 100644
--- a/pkgs/tools/graphics/ggobi/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/ggobi/default.nix
diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/nixpkgs/pkgs/tools/graphics/gifsicle/default.nix
index 9b3836b9dec..9b3836b9dec 100644
--- a/pkgs/tools/graphics/gifsicle/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/gifsicle/default.nix
diff --git a/pkgs/tools/graphics/gifski/default.nix b/nixpkgs/pkgs/tools/graphics/gifski/default.nix
index f5076801326..f5076801326 100644
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/gifski/default.nix
diff --git a/pkgs/tools/graphics/glee/default.nix b/nixpkgs/pkgs/tools/graphics/glee/default.nix
index a68e64c0894..a68e64c0894 100644
--- a/pkgs/tools/graphics/glee/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/glee/default.nix
diff --git a/pkgs/tools/graphics/glmark2/default.nix b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix
index 5668e755d01..5668e755d01 100644
--- a/pkgs/tools/graphics/glmark2/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix
index 0710f47cb57..0710f47cb57 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix
diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix
index a8dd35ce7b0..a8dd35ce7b0 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix
diff --git a/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch b/nixpkgs/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch
index ac0600fb76c..ac0600fb76c 100644
--- a/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch
+++ b/nixpkgs/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch
diff --git a/pkgs/tools/graphics/gmic/default.nix b/nixpkgs/pkgs/tools/graphics/gmic/default.nix
index 3f181d12ba0..3f181d12ba0 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/gmic/default.nix
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix
index 0ac1c1a2155..0ac1c1a2155 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix
diff --git a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh b/nixpkgs/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh
index 92ad2e97b5b..92ad2e97b5b 100644
--- a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh
+++ b/nixpkgs/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh
diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/nixpkgs/pkgs/tools/graphics/graph-easy/default.nix
index 009a86094ec..009a86094ec 100644
--- a/pkgs/tools/graphics/graph-easy/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/graph-easy/default.nix
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/nixpkgs/pkgs/tools/graphics/graphviz/2.32.nix
index 544949f33b7..544949f33b7 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/nixpkgs/pkgs/tools/graphics/graphviz/2.32.nix
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/nixpkgs/pkgs/tools/graphics/graphviz/base.nix
index 3b9d8a4cca5..3b9d8a4cca5 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/nixpkgs/pkgs/tools/graphics/graphviz/base.nix
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/nixpkgs/pkgs/tools/graphics/graphviz/default.nix
index c79fe3aaf4d..c79fe3aaf4d 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/graphviz/default.nix
diff --git a/pkgs/tools/graphics/grim/default.nix b/nixpkgs/pkgs/tools/graphics/grim/default.nix
index ed7ed5fdef0..ed7ed5fdef0 100644
--- a/pkgs/tools/graphics/grim/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/grim/default.nix
diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix
index 7465ebb7883..7465ebb7883 100644
--- a/pkgs/tools/graphics/gromit-mpx/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix
diff --git a/pkgs/tools/graphics/guff/default.nix b/nixpkgs/pkgs/tools/graphics/guff/default.nix
index db218a812e6..db218a812e6 100644
--- a/pkgs/tools/graphics/guff/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/guff/default.nix
diff --git a/pkgs/tools/graphics/ibniz/default.nix b/nixpkgs/pkgs/tools/graphics/ibniz/default.nix
index 564685c1cea..564685c1cea 100644
--- a/pkgs/tools/graphics/ibniz/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/ibniz/default.nix
diff --git a/pkgs/tools/graphics/icoutils/default.nix b/nixpkgs/pkgs/tools/graphics/icoutils/default.nix
index b16dbe21985..b16dbe21985 100644
--- a/pkgs/tools/graphics/icoutils/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/icoutils/default.nix
diff --git a/pkgs/tools/graphics/ifm/default.nix b/nixpkgs/pkgs/tools/graphics/ifm/default.nix
index c6e8df31dd0..c6e8df31dd0 100644
--- a/pkgs/tools/graphics/ifm/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/ifm/default.nix
diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix
index 1099b11176c..1099b11176c 100644
--- a/pkgs/tools/graphics/imgur-screenshot/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix
diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix
index 883453379c4..883453379c4 100644
--- a/pkgs/tools/graphics/imgurbash2/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix
diff --git a/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch b/nixpkgs/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch
index 13e18fd0447..13e18fd0447 100644
--- a/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch
+++ b/nixpkgs/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch
diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix
index 1be5f0120fd..1be5f0120fd 100644
--- a/pkgs/tools/graphics/jbig2enc/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix
diff --git a/pkgs/tools/graphics/jhead/default.nix b/nixpkgs/pkgs/tools/graphics/jhead/default.nix
index 13df4ede8ec..13df4ede8ec 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/jhead/default.nix
diff --git a/pkgs/tools/graphics/jpegexiforient/default.nix b/nixpkgs/pkgs/tools/graphics/jpegexiforient/default.nix
index 9397f46fd2c..9397f46fd2c 100644
--- a/pkgs/tools/graphics/jpegexiforient/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/jpegexiforient/default.nix
diff --git a/pkgs/tools/graphics/kst/default.nix b/nixpkgs/pkgs/tools/graphics/kst/default.nix
index 480ae328cd3..480ae328cd3 100644
--- a/pkgs/tools/graphics/kst/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/kst/default.nix
diff --git a/pkgs/tools/graphics/leela/default.nix b/nixpkgs/pkgs/tools/graphics/leela/default.nix
index d1b31f39152..d1b31f39152 100644
--- a/pkgs/tools/graphics/leela/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/leela/default.nix
diff --git a/pkgs/tools/graphics/lepton/default.nix b/nixpkgs/pkgs/tools/graphics/lepton/default.nix
index 0b6c1263942..0b6c1263942 100644
--- a/pkgs/tools/graphics/lepton/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/lepton/default.nix
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix
index aed8b0573ba..aed8b0573ba 100644
--- a/pkgs/tools/graphics/logstalgia/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix
diff --git a/pkgs/tools/graphics/lprof/default.nix b/nixpkgs/pkgs/tools/graphics/lprof/default.nix
index 42ccc4d5022..42ccc4d5022 100644
--- a/pkgs/tools/graphics/lprof/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/lprof/default.nix
diff --git a/pkgs/tools/graphics/lprof/keep-environment.patch b/nixpkgs/pkgs/tools/graphics/lprof/keep-environment.patch
index 4dcb5b0448d..4dcb5b0448d 100644
--- a/pkgs/tools/graphics/lprof/keep-environment.patch
+++ b/nixpkgs/pkgs/tools/graphics/lprof/keep-environment.patch
diff --git a/pkgs/tools/graphics/lprof/lcms-1.17.patch b/nixpkgs/pkgs/tools/graphics/lprof/lcms-1.17.patch
index a88471e143f..a88471e143f 100644
--- a/pkgs/tools/graphics/lprof/lcms-1.17.patch
+++ b/nixpkgs/pkgs/tools/graphics/lprof/lcms-1.17.patch
diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix
index 6a0db954da6..6a0db954da6 100644
--- a/pkgs/tools/graphics/luxcorerender/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix
diff --git a/pkgs/tools/graphics/maim/default.nix b/nixpkgs/pkgs/tools/graphics/maim/default.nix
index 8f3a4dc5c65..8f3a4dc5c65 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/maim/default.nix
diff --git a/pkgs/tools/graphics/mscgen/default.nix b/nixpkgs/pkgs/tools/graphics/mscgen/default.nix
index 832a48baab7..832a48baab7 100644
--- a/pkgs/tools/graphics/mscgen/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/mscgen/default.nix
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/nixpkgs/pkgs/tools/graphics/netpbm/default.nix
index 9de7603c973..9de7603c973 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/netpbm/default.nix
diff --git a/pkgs/tools/graphics/neural-style/default.nix b/nixpkgs/pkgs/tools/graphics/neural-style/default.nix
index a4706e95cee..a4706e95cee 100644
--- a/pkgs/tools/graphics/neural-style/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/neural-style/default.nix
diff --git a/pkgs/tools/graphics/neural-style/neural-style.sh b/nixpkgs/pkgs/tools/graphics/neural-style/neural-style.sh
index 07a4d6dedc0..07a4d6dedc0 100644
--- a/pkgs/tools/graphics/neural-style/neural-style.sh
+++ b/nixpkgs/pkgs/tools/graphics/neural-style/neural-style.sh
diff --git a/pkgs/tools/graphics/nifskope/default.nix b/nixpkgs/pkgs/tools/graphics/nifskope/default.nix
index 65ccfecedd6..65ccfecedd6 100644
--- a/pkgs/tools/graphics/nifskope/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/nifskope/default.nix
diff --git a/pkgs/tools/graphics/nifskope/external-lib-paths.patch b/nixpkgs/pkgs/tools/graphics/nifskope/external-lib-paths.patch
index a7f329caf74..a7f329caf74 100644
--- a/pkgs/tools/graphics/nifskope/external-lib-paths.patch
+++ b/nixpkgs/pkgs/tools/graphics/nifskope/external-lib-paths.patch
diff --git a/pkgs/tools/graphics/nifskope/no-sse-on-arm.patch b/nixpkgs/pkgs/tools/graphics/nifskope/no-sse-on-arm.patch
index 452fb1a76d5..452fb1a76d5 100644
--- a/pkgs/tools/graphics/nifskope/no-sse-on-arm.patch
+++ b/nixpkgs/pkgs/tools/graphics/nifskope/no-sse-on-arm.patch
diff --git a/pkgs/tools/graphics/nifskope/qttools-bins.patch b/nixpkgs/pkgs/tools/graphics/nifskope/qttools-bins.patch
index 5d85f9ef4fd..5d85f9ef4fd 100644
--- a/pkgs/tools/graphics/nifskope/qttools-bins.patch
+++ b/nixpkgs/pkgs/tools/graphics/nifskope/qttools-bins.patch
diff --git a/pkgs/tools/graphics/nip2/default.nix b/nixpkgs/pkgs/tools/graphics/nip2/default.nix
index ac4d8441bf5..ac4d8441bf5 100644
--- a/pkgs/tools/graphics/nip2/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/nip2/default.nix
diff --git a/pkgs/tools/graphics/optar/default.nix b/nixpkgs/pkgs/tools/graphics/optar/default.nix
index b831e359e9c..b831e359e9c 100644
--- a/pkgs/tools/graphics/optar/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/optar/default.nix
diff --git a/pkgs/tools/graphics/optipng/default.nix b/nixpkgs/pkgs/tools/graphics/optipng/default.nix
index bc849b21117..bc849b21117 100644
--- a/pkgs/tools/graphics/optipng/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/optipng/default.nix
diff --git a/pkgs/tools/graphics/oxipng/default.nix b/nixpkgs/pkgs/tools/graphics/oxipng/default.nix
index 0bbd7c21aa6..0bbd7c21aa6 100644
--- a/pkgs/tools/graphics/oxipng/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/oxipng/default.nix
diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/nixpkgs/pkgs/tools/graphics/pdf2svg/default.nix
index 46eb61d1cf7..46eb61d1cf7 100644
--- a/pkgs/tools/graphics/pdf2svg/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pdf2svg/default.nix
diff --git a/pkgs/tools/graphics/pdfread/default.nix b/nixpkgs/pkgs/tools/graphics/pdfread/default.nix
index 8733b2c1caa..8733b2c1caa 100644
--- a/pkgs/tools/graphics/pdfread/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pdfread/default.nix
diff --git a/pkgs/tools/graphics/pdfredacttools/default.nix b/nixpkgs/pkgs/tools/graphics/pdfredacttools/default.nix
index 28b13c782b9..28b13c782b9 100644
--- a/pkgs/tools/graphics/pdfredacttools/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pdfredacttools/default.nix
diff --git a/pkgs/tools/graphics/pdftag/default.nix b/nixpkgs/pkgs/tools/graphics/pdftag/default.nix
index 7e022936318..7e022936318 100644
--- a/pkgs/tools/graphics/pdftag/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pdftag/default.nix
diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/nixpkgs/pkgs/tools/graphics/perceptualdiff/default.nix
index dc5acc9433f..dc5acc9433f 100644
--- a/pkgs/tools/graphics/perceptualdiff/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/perceptualdiff/default.nix
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/nixpkgs/pkgs/tools/graphics/pfstools/default.nix
index 6a0385614e8..6a0385614e8 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pfstools/default.nix
diff --git a/pkgs/tools/graphics/pfstools/pfsalign.patch b/nixpkgs/pkgs/tools/graphics/pfstools/pfsalign.patch
index f079415ddcb..f079415ddcb 100644
--- a/pkgs/tools/graphics/pfstools/pfsalign.patch
+++ b/nixpkgs/pkgs/tools/graphics/pfstools/pfsalign.patch
diff --git a/pkgs/tools/graphics/pfstools/pfstools.patch b/nixpkgs/pkgs/tools/graphics/pfstools/pfstools.patch
index c678a25b01b..c678a25b01b 100644
--- a/pkgs/tools/graphics/pfstools/pfstools.patch
+++ b/nixpkgs/pkgs/tools/graphics/pfstools/pfstools.patch
diff --git a/pkgs/tools/graphics/pfstools/threads.patch b/nixpkgs/pkgs/tools/graphics/pfstools/threads.patch
index e3f61db6089..e3f61db6089 100644
--- a/pkgs/tools/graphics/pfstools/threads.patch
+++ b/nixpkgs/pkgs/tools/graphics/pfstools/threads.patch
diff --git a/pkgs/tools/graphics/pgf/default.nix b/nixpkgs/pkgs/tools/graphics/pgf/default.nix
index 6ae45cc8533..6ae45cc8533 100644
--- a/pkgs/tools/graphics/pgf/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pgf/default.nix
diff --git a/pkgs/tools/graphics/ploticus/builder.sh b/nixpkgs/pkgs/tools/graphics/ploticus/builder.sh
index 2fb16b259bd..2fb16b259bd 100644
--- a/pkgs/tools/graphics/ploticus/builder.sh
+++ b/nixpkgs/pkgs/tools/graphics/ploticus/builder.sh
diff --git a/pkgs/tools/graphics/ploticus/default.nix b/nixpkgs/pkgs/tools/graphics/ploticus/default.nix
index d0e67857872..d0e67857872 100644
--- a/pkgs/tools/graphics/ploticus/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/ploticus/default.nix
diff --git a/pkgs/tools/graphics/ploticus/ploticus-install.patch b/nixpkgs/pkgs/tools/graphics/ploticus/ploticus-install.patch
index 04edbc709d0..04edbc709d0 100644
--- a/pkgs/tools/graphics/ploticus/ploticus-install.patch
+++ b/nixpkgs/pkgs/tools/graphics/ploticus/ploticus-install.patch
diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/nixpkgs/pkgs/tools/graphics/plotutils/debian-patches.nix
index d7c60a11eb6..d7c60a11eb6 100644
--- a/pkgs/tools/graphics/plotutils/debian-patches.nix
+++ b/nixpkgs/pkgs/tools/graphics/plotutils/debian-patches.nix
diff --git a/pkgs/tools/graphics/plotutils/debian-patches.txt b/nixpkgs/pkgs/tools/graphics/plotutils/debian-patches.txt
index c28d96fdd5b..c28d96fdd5b 100644
--- a/pkgs/tools/graphics/plotutils/debian-patches.txt
+++ b/nixpkgs/pkgs/tools/graphics/plotutils/debian-patches.txt
diff --git a/pkgs/tools/graphics/plotutils/default.nix b/nixpkgs/pkgs/tools/graphics/plotutils/default.nix
index 61e21b1a33d..61e21b1a33d 100644
--- a/pkgs/tools/graphics/plotutils/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/plotutils/default.nix
diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix
index f7bd8d520c8..f7bd8d520c8 100644
--- a/pkgs/tools/graphics/pngcheck/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix
diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix
index fce1f3f913c..fce1f3f913c 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix
diff --git a/pkgs/tools/graphics/pngnq/default.nix b/nixpkgs/pkgs/tools/graphics/pngnq/default.nix
index e01f3ea2acc..e01f3ea2acc 100644
--- a/pkgs/tools/graphics/pngnq/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pngnq/default.nix
diff --git a/pkgs/tools/graphics/pngout/default.nix b/nixpkgs/pkgs/tools/graphics/pngout/default.nix
index 9d0e1b0ea87..9d0e1b0ea87 100644
--- a/pkgs/tools/graphics/pngout/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pngout/default.nix
diff --git a/pkgs/tools/graphics/pngquant/default.nix b/nixpkgs/pkgs/tools/graphics/pngquant/default.nix
index 51be6afd102..51be6afd102 100644
--- a/pkgs/tools/graphics/pngquant/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pngquant/default.nix
diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix
index ed8fa5ee519..ed8fa5ee519 100644
--- a/pkgs/tools/graphics/pngtoico/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix
diff --git a/pkgs/tools/graphics/povray/default.nix b/nixpkgs/pkgs/tools/graphics/povray/default.nix
index ead44897968..ead44897968 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/povray/default.nix
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix
index ebd265b8a80..ebd265b8a80 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix
diff --git a/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch b/nixpkgs/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch
index 64fe805d501..64fe805d501 100644
--- a/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch
+++ b/nixpkgs/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch
diff --git a/pkgs/tools/graphics/qrcode/default.nix b/nixpkgs/pkgs/tools/graphics/qrcode/default.nix
index 909f0e39726..909f0e39726 100644
--- a/pkgs/tools/graphics/qrcode/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/qrcode/default.nix
diff --git a/pkgs/tools/graphics/quirc/default.nix b/nixpkgs/pkgs/tools/graphics/quirc/default.nix
index 4b610ebbfef..4b610ebbfef 100644
--- a/pkgs/tools/graphics/quirc/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/quirc/default.nix
diff --git a/pkgs/tools/graphics/rocket/default.nix b/nixpkgs/pkgs/tools/graphics/rocket/default.nix
index 97c400fbc9e..97c400fbc9e 100644
--- a/pkgs/tools/graphics/rocket/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/rocket/default.nix
diff --git a/pkgs/tools/graphics/s2png/default.nix b/nixpkgs/pkgs/tools/graphics/s2png/default.nix
index e7d3b8151a4..e7d3b8151a4 100644
--- a/pkgs/tools/graphics/s2png/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/s2png/default.nix
diff --git a/pkgs/tools/graphics/scanbd/default.nix b/nixpkgs/pkgs/tools/graphics/scanbd/default.nix
index fd26869d298..fd26869d298 100644
--- a/pkgs/tools/graphics/scanbd/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/scanbd/default.nix
diff --git a/pkgs/tools/graphics/scrot/default.nix b/nixpkgs/pkgs/tools/graphics/scrot/default.nix
index 413bc8c52f1..413bc8c52f1 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/scrot/default.nix
diff --git a/pkgs/tools/graphics/shotgun/default.nix b/nixpkgs/pkgs/tools/graphics/shotgun/default.nix
index 1ab47dfce2d..1ab47dfce2d 100644
--- a/pkgs/tools/graphics/shotgun/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/shotgun/default.nix
diff --git a/pkgs/tools/graphics/sng/default.nix b/nixpkgs/pkgs/tools/graphics/sng/default.nix
index c7d2f49406b..c7d2f49406b 100644
--- a/pkgs/tools/graphics/sng/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/sng/default.nix
diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix
index 2c586cd3b1f..2c586cd3b1f 100644
--- a/pkgs/tools/graphics/structure-synth/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix
diff --git a/pkgs/tools/graphics/structure-synth/gcc47.patch b/nixpkgs/pkgs/tools/graphics/structure-synth/gcc47.patch
index 8726e89c830..8726e89c830 100644
--- a/pkgs/tools/graphics/structure-synth/gcc47.patch
+++ b/nixpkgs/pkgs/tools/graphics/structure-synth/gcc47.patch
diff --git a/pkgs/tools/graphics/svgbob/default.nix b/nixpkgs/pkgs/tools/graphics/svgbob/default.nix
index 24736b8f0ff..24736b8f0ff 100644
--- a/pkgs/tools/graphics/svgbob/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/svgbob/default.nix
diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix
index 50aeae78fce..50aeae78fce 100644
--- a/pkgs/tools/graphics/svgcleaner/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix
diff --git a/pkgs/tools/graphics/swfdec/default.nix b/nixpkgs/pkgs/tools/graphics/swfdec/default.nix
index 8a64e25d879..8a64e25d879 100644
--- a/pkgs/tools/graphics/swfdec/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/swfdec/default.nix
diff --git a/pkgs/tools/graphics/syntex/default.nix b/nixpkgs/pkgs/tools/graphics/syntex/default.nix
index 693f116a6e8..693f116a6e8 100644
--- a/pkgs/tools/graphics/syntex/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/syntex/default.nix
diff --git a/pkgs/tools/graphics/transfig/default.nix b/nixpkgs/pkgs/tools/graphics/transfig/default.nix
index db204113226..db204113226 100644
--- a/pkgs/tools/graphics/transfig/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/transfig/default.nix
diff --git a/pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile b/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile
index 9c1895b1519..9c1895b1519 100644
--- a/pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile
+++ b/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile
diff --git a/pkgs/tools/graphics/transfig/patch-fig2dev-dev-Imakefile b/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-dev-Imakefile
index 87f01f70d30..87f01f70d30 100644
--- a/pkgs/tools/graphics/transfig/patch-fig2dev-dev-Imakefile
+++ b/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-dev-Imakefile
diff --git a/pkgs/tools/graphics/transfig/patch-fig2dev-dev-gensvg.c b/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-dev-gensvg.c
index 5bd05c97be8..5bd05c97be8 100644
--- a/pkgs/tools/graphics/transfig/patch-fig2dev-dev-gensvg.c
+++ b/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-dev-gensvg.c
diff --git a/pkgs/tools/graphics/transfig/patch-fig2dev-fig2dev.h b/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-fig2dev.h
index 3f330c164e7..3f330c164e7 100644
--- a/pkgs/tools/graphics/transfig/patch-fig2dev-fig2dev.h
+++ b/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-fig2dev.h
diff --git a/pkgs/tools/graphics/transfig/patch-transfig-Imakefile b/nixpkgs/pkgs/tools/graphics/transfig/patch-transfig-Imakefile
index 4639658dccd..4639658dccd 100644
--- a/pkgs/tools/graphics/transfig/patch-transfig-Imakefile
+++ b/nixpkgs/pkgs/tools/graphics/transfig/patch-transfig-Imakefile
diff --git a/pkgs/tools/graphics/twilight/default.nix b/nixpkgs/pkgs/tools/graphics/twilight/default.nix
index 42a86187a72..42a86187a72 100644
--- a/pkgs/tools/graphics/twilight/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/twilight/default.nix
diff --git a/pkgs/tools/graphics/unpaper/default.nix b/nixpkgs/pkgs/tools/graphics/unpaper/default.nix
index 44a86e961ec..44a86e961ec 100644
--- a/pkgs/tools/graphics/unpaper/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/unpaper/default.nix
diff --git a/pkgs/tools/graphics/vips/default.nix b/nixpkgs/pkgs/tools/graphics/vips/default.nix
index 486ab65970b..486ab65970b 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/vips/default.nix
diff --git a/pkgs/tools/graphics/viu/default.nix b/nixpkgs/pkgs/tools/graphics/viu/default.nix
index 5de5b7e5be5..5de5b7e5be5 100644
--- a/pkgs/tools/graphics/viu/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/viu/default.nix
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix
index 5851e4a2d46..5851e4a2d46 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix
diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
index 5537540382b..5537540382b 100644
--- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
diff --git a/pkgs/tools/graphics/wallutils/default.nix b/nixpkgs/pkgs/tools/graphics/wallutils/default.nix
index 263425aef1d..263425aef1d 100644
--- a/pkgs/tools/graphics/wallutils/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/wallutils/default.nix
diff --git a/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch b/nixpkgs/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch
index 77c55b35c96..77c55b35c96 100644
--- a/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch
+++ b/nixpkgs/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch
diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix
index 65fe38937df..65fe38937df 100644
--- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix
diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix
index 9b003868bd0..9b003868bd0 100644
--- a/pkgs/tools/graphics/wdisplays/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix
diff --git a/pkgs/tools/graphics/welkin/default.nix b/nixpkgs/pkgs/tools/graphics/welkin/default.nix
index be4ba53319a..be4ba53319a 100644
--- a/pkgs/tools/graphics/welkin/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/welkin/default.nix
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/nixpkgs/pkgs/tools/graphics/wkhtmltopdf/default.nix
index 2aa6abcccfc..2aa6abcccfc 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/wkhtmltopdf/default.nix
diff --git a/pkgs/tools/graphics/xcftools/default.nix b/nixpkgs/pkgs/tools/graphics/xcftools/default.nix
index 749631999e4..749631999e4 100644
--- a/pkgs/tools/graphics/xcftools/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/xcftools/default.nix
diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix
index 1e3da5dddec..1e3da5dddec 100644
--- a/pkgs/tools/graphics/xcur2png/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix
diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix
index 6dd0b206878..6dd0b206878 100644
--- a/pkgs/tools/graphics/yafaray-core/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix
diff --git a/pkgs/tools/graphics/yaxg/default.nix b/nixpkgs/pkgs/tools/graphics/yaxg/default.nix
index 094ec2d5bc4..094ec2d5bc4 100644
--- a/pkgs/tools/graphics/yaxg/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/yaxg/default.nix
diff --git a/pkgs/tools/graphics/zbar/default.nix b/nixpkgs/pkgs/tools/graphics/zbar/default.nix
index 7610b4e56fb..7610b4e56fb 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/zbar/default.nix
diff --git a/pkgs/tools/graphics/zxing/default.nix b/nixpkgs/pkgs/tools/graphics/zxing/default.nix
index 97bbeb4d2d4..97bbeb4d2d4 100644
--- a/pkgs/tools/graphics/zxing/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/zxing/default.nix
diff --git a/pkgs/tools/graphics/zxing/java-zxing.sh b/nixpkgs/pkgs/tools/graphics/zxing/java-zxing.sh
index bee3ac9e27a..bee3ac9e27a 100644
--- a/pkgs/tools/graphics/zxing/java-zxing.sh
+++ b/nixpkgs/pkgs/tools/graphics/zxing/java-zxing.sh
diff --git a/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh b/nixpkgs/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh
index a17ba49cecf..a17ba49cecf 100644
--- a/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh
+++ b/nixpkgs/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh
diff --git a/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh b/nixpkgs/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh
index cb2a25dc03f..cb2a25dc03f 100644
--- a/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh
+++ b/nixpkgs/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh
diff --git a/pkgs/tools/graphics/zxing/zxing.sh b/nixpkgs/pkgs/tools/graphics/zxing/zxing.sh
index ca6ac60bab6..ca6ac60bab6 100644
--- a/pkgs/tools/graphics/zxing/zxing.sh
+++ b/nixpkgs/pkgs/tools/graphics/zxing/zxing.sh
diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix
index 9214edfefb0..9214edfefb0 100644
--- a/pkgs/tools/inputmethods/anthy/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix
diff --git a/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/nixpkgs/pkgs/tools/inputmethods/evdevremapkeys/default.nix
index 0dc6f673925..0dc6f673925 100644
--- a/pkgs/tools/inputmethods/evdevremapkeys/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/evdevremapkeys/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
index d1e7f85f75f..d1e7f85f75f 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
index d9b202f7ef1..d9b202f7ef1 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
index 230b2926561..230b2926561 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
index c9a40b84a6d..c9a40b84a6d 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch
index 84dd5fc8f46..84dd5fc8f46 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
index 9e0ef551d82..9e0ef551d82 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
index 8b25b2846ff..8b25b2846ff 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
index 9f062036438..9f062036438 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
index 095be7469cd..095be7469cd 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
index 187587fbfb4..187587fbfb4 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
index 833e417ae91..833e417ae91 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
index ffee83875a1..ffee83875a1 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
index 1deff93e201..1deff93e201 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx/default.nix
index 69e4425d8c3..69e4425d8c3 100644
--- a/pkgs/tools/inputmethods/fcitx/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx/default.nix
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
index ae9d8d0f53f..ae9d8d0f53f 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index 3fd1efcc343..3fd1efcc343 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
diff --git a/pkgs/tools/inputmethods/fcitx/find-enchant-lib.patch b/nixpkgs/pkgs/tools/inputmethods/fcitx/find-enchant-lib.patch
index 90c9c79aa73..90c9c79aa73 100644
--- a/pkgs/tools/inputmethods/fcitx/find-enchant-lib.patch
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx/find-enchant-lib.patch
diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix
index 60de9e6910e..60de9e6910e 100644
--- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix
diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx/wrapper.nix
index 28a08e39b22..28a08e39b22 100644
--- a/pkgs/tools/inputmethods/fcitx/wrapper.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fcitx/wrapper.nix
diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile b/nixpkgs/pkgs/tools/inputmethods/fusuma/Gemfile
index 9aa2c3ac71a..9aa2c3ac71a 100644
--- a/pkgs/tools/inputmethods/fusuma/Gemfile
+++ b/nixpkgs/pkgs/tools/inputmethods/fusuma/Gemfile
diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile.lock b/nixpkgs/pkgs/tools/inputmethods/fusuma/Gemfile.lock
index c35e7658d63..c35e7658d63 100644
--- a/pkgs/tools/inputmethods/fusuma/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/inputmethods/fusuma/Gemfile.lock
diff --git a/pkgs/tools/inputmethods/fusuma/default.nix b/nixpkgs/pkgs/tools/inputmethods/fusuma/default.nix
index a8901dfb0e4..a8901dfb0e4 100644
--- a/pkgs/tools/inputmethods/fusuma/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fusuma/default.nix
diff --git a/pkgs/tools/inputmethods/fusuma/gemset.nix b/nixpkgs/pkgs/tools/inputmethods/fusuma/gemset.nix
index 2dd9af421ba..2dd9af421ba 100644
--- a/pkgs/tools/inputmethods/fusuma/gemset.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/fusuma/gemset.nix
diff --git a/pkgs/tools/inputmethods/gebaar-libinput/default.nix b/nixpkgs/pkgs/tools/inputmethods/gebaar-libinput/default.nix
index 6d4947e517e..6d4947e517e 100644
--- a/pkgs/tools/inputmethods/gebaar-libinput/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/gebaar-libinput/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index cfdfa85ad9f..cfdfa85ad9f 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index d5e2f50299e..d5e2f50299e 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch
index 7487d074d55..7487d074d55 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
index 589ddd09144..589ddd09144 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index 2c1d558f04d..2c1d558f04d 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index c026a9d1a81..c026a9d1a81 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index a33eb277926..a33eb277926 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
index b77394f218b..b77394f218b 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index b74378f0793..b74378f0793 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index c95a9c1651c..c95a9c1651c 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index f1ca4226b47..f1ca4226b47 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch
index 7b624b379a2..7b624b379a2 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix
index 56ddf93af45..56ddf93af45 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/allow-wrapping.patch b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/allow-wrapping.patch
index 434c85d3dbe..434c85d3dbe 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/allow-wrapping.patch
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/allow-wrapping.patch
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index 435d1154d4a..435d1154d4a 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix
index 4951074bc43..4951074bc43 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix
diff --git a/pkgs/tools/inputmethods/ibus/fix-paths.patch b/nixpkgs/pkgs/tools/inputmethods/ibus/fix-paths.patch
index 60269c6c241..60269c6c241 100644
--- a/pkgs/tools/inputmethods/ibus/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus/fix-paths.patch
diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix
index 85fccc46de0..85fccc46de0 100644
--- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix
diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/nixpkgs/pkgs/tools/inputmethods/ibus/wrapper.nix
index 1b14629d283..1b14629d283 100644
--- a/pkgs/tools/inputmethods/ibus/wrapper.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/ibus/wrapper.nix
diff --git a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix b/nixpkgs/pkgs/tools/inputmethods/interception-tools/caps2esc.nix
index 994e9da3e43..994e9da3e43 100644
--- a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/interception-tools/caps2esc.nix
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix
index a6aed47d964..a6aed47d964 100644
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix
diff --git a/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch b/nixpkgs/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch
index 469c96647d6..469c96647d6 100644
--- a/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch
+++ b/nixpkgs/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch
diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix
index a2f01c7367c..a2f01c7367c 100644
--- a/pkgs/tools/inputmethods/keyfuzz/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix
diff --git a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch b/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch
index 4655879149d..4655879149d 100644
--- a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch
+++ b/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch
diff --git a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch b/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch
index 407450c8bcc..407450c8bcc 100644
--- a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch
+++ b/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch
diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix
index 2764d2fee72..2764d2fee72 100644
--- a/pkgs/tools/inputmethods/libinput-gestures/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix
diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/nixpkgs/pkgs/tools/inputmethods/libkkc/default.nix
index 68889d45df0..68889d45df0 100644
--- a/pkgs/tools/inputmethods/libkkc/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/libkkc/default.nix
diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix
index 8732d1a816d..8732d1a816d 100644
--- a/pkgs/tools/inputmethods/m17n-db/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix
diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix
index baf57ed9049..baf57ed9049 100644
--- a/pkgs/tools/inputmethods/m17n-lib/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix
diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/nixpkgs/pkgs/tools/inputmethods/m17n-lib/otf.nix
index a69f46e9678..a69f46e9678 100644
--- a/pkgs/tools/inputmethods/m17n-lib/otf.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/m17n-lib/otf.nix
diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/nixpkgs/pkgs/tools/inputmethods/nabi/default.nix
index b93c59d9789..b93c59d9789 100644
--- a/pkgs/tools/inputmethods/nabi/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/nabi/default.nix
diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
index 2f8425bd8b5..2f8425bd8b5 100644
--- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix
index 19d871bc77f..19d871bc77f 100644
--- a/pkgs/tools/inputmethods/skk/skktools/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix
diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
index afacc302eda..afacc302eda 100644
--- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix
index c915e812891..c915e812891 100644
--- a/pkgs/tools/inputmethods/touchegg/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix
diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/nixpkgs/pkgs/tools/inputmethods/triggerhappy/default.nix
index a9e106f2c72..a9e106f2c72 100644
--- a/pkgs/tools/inputmethods/triggerhappy/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/triggerhappy/default.nix
diff --git a/pkgs/tools/inputmethods/uim/data-hook.patch b/nixpkgs/pkgs/tools/inputmethods/uim/data-hook.patch
index be80962527b..be80962527b 100644
--- a/pkgs/tools/inputmethods/uim/data-hook.patch
+++ b/nixpkgs/pkgs/tools/inputmethods/uim/data-hook.patch
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/nixpkgs/pkgs/tools/inputmethods/uim/default.nix
index 7fe00bd4dfc..7fe00bd4dfc 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/uim/default.nix
diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix
index b23e0c369a6..b23e0c369a6 100644
--- a/pkgs/tools/inputmethods/zinnia/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix
diff --git a/pkgs/tools/misc/0x0/default.nix b/nixpkgs/pkgs/tools/misc/0x0/default.nix
index d78846922c6..d78846922c6 100644
--- a/pkgs/tools/misc/0x0/default.nix
+++ b/nixpkgs/pkgs/tools/misc/0x0/default.nix
diff --git a/pkgs/tools/misc/3llo/Gemfile b/nixpkgs/pkgs/tools/misc/3llo/Gemfile
index 17a1086d78f..17a1086d78f 100644
--- a/pkgs/tools/misc/3llo/Gemfile
+++ b/nixpkgs/pkgs/tools/misc/3llo/Gemfile
diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/nixpkgs/pkgs/tools/misc/3llo/Gemfile.lock
index 0696ba34165..0696ba34165 100644
--- a/pkgs/tools/misc/3llo/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/3llo/Gemfile.lock
diff --git a/pkgs/tools/misc/3llo/default.nix b/nixpkgs/pkgs/tools/misc/3llo/default.nix
index 82a8d2aaad1..82a8d2aaad1 100644
--- a/pkgs/tools/misc/3llo/default.nix
+++ b/nixpkgs/pkgs/tools/misc/3llo/default.nix
diff --git a/pkgs/tools/misc/3llo/gemset.nix b/nixpkgs/pkgs/tools/misc/3llo/gemset.nix
index 5c50ea9b212..5c50ea9b212 100644
--- a/pkgs/tools/misc/3llo/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/3llo/gemset.nix
diff --git a/pkgs/tools/misc/abduco/default.nix b/nixpkgs/pkgs/tools/misc/abduco/default.nix
index 8545d86427a..8545d86427a 100644
--- a/pkgs/tools/misc/abduco/default.nix
+++ b/nixpkgs/pkgs/tools/misc/abduco/default.nix
diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix
index be47d42dc89..be47d42dc89 100644
--- a/pkgs/tools/misc/adafruit-ampy/default.nix
+++ b/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix
diff --git a/pkgs/tools/misc/aescrypt/default.nix b/nixpkgs/pkgs/tools/misc/aescrypt/default.nix
index 75d8d71b895..75d8d71b895 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/nixpkgs/pkgs/tools/misc/aescrypt/default.nix
diff --git a/pkgs/tools/misc/agedu/default.nix b/nixpkgs/pkgs/tools/misc/agedu/default.nix
index d0254e9ce9f..d0254e9ce9f 100644
--- a/pkgs/tools/misc/agedu/default.nix
+++ b/nixpkgs/pkgs/tools/misc/agedu/default.nix
diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix
index 7b869d66d1c..7b869d66d1c 100644
--- a/pkgs/tools/misc/alarm-clock-applet/default.nix
+++ b/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix
diff --git a/pkgs/tools/misc/antimicro/default.nix b/nixpkgs/pkgs/tools/misc/antimicro/default.nix
index ad86bdef80a..ad86bdef80a 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/nixpkgs/pkgs/tools/misc/antimicro/default.nix
diff --git a/pkgs/tools/misc/apparix/default.nix b/nixpkgs/pkgs/tools/misc/apparix/default.nix
index 550ab4972d9..550ab4972d9 100644
--- a/pkgs/tools/misc/apparix/default.nix
+++ b/nixpkgs/pkgs/tools/misc/apparix/default.nix
diff --git a/pkgs/tools/misc/apt-offline/default.nix b/nixpkgs/pkgs/tools/misc/apt-offline/default.nix
index 921c1af4ad6..921c1af4ad6 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/nixpkgs/pkgs/tools/misc/apt-offline/default.nix
diff --git a/pkgs/tools/misc/aptly/default.nix b/nixpkgs/pkgs/tools/misc/aptly/default.nix
index 55cfa09aa24..55cfa09aa24 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/nixpkgs/pkgs/tools/misc/aptly/default.nix
diff --git a/pkgs/tools/misc/argtable/default.nix b/nixpkgs/pkgs/tools/misc/argtable/default.nix
index c16e4aded0d..c16e4aded0d 100644
--- a/pkgs/tools/misc/argtable/default.nix
+++ b/nixpkgs/pkgs/tools/misc/argtable/default.nix
diff --git a/pkgs/tools/misc/arp-scan/default.nix b/nixpkgs/pkgs/tools/misc/arp-scan/default.nix
index 9a3164db5d7..9a3164db5d7 100644
--- a/pkgs/tools/misc/arp-scan/default.nix
+++ b/nixpkgs/pkgs/tools/misc/arp-scan/default.nix
diff --git a/pkgs/tools/misc/asciinema/default.nix b/nixpkgs/pkgs/tools/misc/asciinema/default.nix
index d42c666e967..d42c666e967 100644
--- a/pkgs/tools/misc/asciinema/default.nix
+++ b/nixpkgs/pkgs/tools/misc/asciinema/default.nix
diff --git a/pkgs/tools/misc/aspcud/default.nix b/nixpkgs/pkgs/tools/misc/aspcud/default.nix
index b58f603ce59..b58f603ce59 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/nixpkgs/pkgs/tools/misc/aspcud/default.nix
diff --git a/pkgs/tools/misc/autojump/default.nix b/nixpkgs/pkgs/tools/misc/autojump/default.nix
index 8294e92d13f..8294e92d13f 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/nixpkgs/pkgs/tools/misc/autojump/default.nix
diff --git a/pkgs/tools/misc/automirror/default.nix b/nixpkgs/pkgs/tools/misc/automirror/default.nix
index 84778fb1c2d..84778fb1c2d 100644
--- a/pkgs/tools/misc/automirror/default.nix
+++ b/nixpkgs/pkgs/tools/misc/automirror/default.nix
diff --git a/pkgs/tools/misc/autorandr/default.nix b/nixpkgs/pkgs/tools/misc/autorandr/default.nix
index adf73037af8..adf73037af8 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/nixpkgs/pkgs/tools/misc/autorandr/default.nix
diff --git a/pkgs/tools/misc/autorevision/default.nix b/nixpkgs/pkgs/tools/misc/autorevision/default.nix
index ee07221b755..ee07221b755 100644
--- a/pkgs/tools/misc/autorevision/default.nix
+++ b/nixpkgs/pkgs/tools/misc/autorevision/default.nix
diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix
index c7829239c41..c7829239c41 100644
--- a/pkgs/tools/misc/aws-mturk-clt/default.nix
+++ b/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix
diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix
index 6f2afc888e8..6f2afc888e8 100644
--- a/pkgs/tools/misc/azure-vhd-utils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix
diff --git a/pkgs/tools/misc/azure-vhd-utils/deps.nix b/nixpkgs/pkgs/tools/misc/azure-vhd-utils/deps.nix
index d07af99d5e5..d07af99d5e5 100644
--- a/pkgs/tools/misc/azure-vhd-utils/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/azure-vhd-utils/deps.nix
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/nixpkgs/pkgs/tools/misc/bandwidth/default.nix
index b4cbc747b1d..b4cbc747b1d 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bandwidth/default.nix
diff --git a/pkgs/tools/misc/bash_unit/default.nix b/nixpkgs/pkgs/tools/misc/bash_unit/default.nix
index f23ab45cfab..f23ab45cfab 100644
--- a/pkgs/tools/misc/bash_unit/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bash_unit/default.nix
diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix
index 14ab790d9c7..14ab790d9c7 100644
--- a/pkgs/tools/misc/bashplotlib/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix
diff --git a/pkgs/tools/misc/bat/default.nix b/nixpkgs/pkgs/tools/misc/bat/default.nix
index 6f5dc209b96..6f5dc209b96 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bat/default.nix
diff --git a/pkgs/tools/misc/bbe/default.nix b/nixpkgs/pkgs/tools/misc/bbe/default.nix
index b0af13160d2..b0af13160d2 100644
--- a/pkgs/tools/misc/bbe/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bbe/default.nix
diff --git a/pkgs/tools/misc/bc/cross-bc.patch b/nixpkgs/pkgs/tools/misc/bc/cross-bc.patch
index ba8857abb58..ba8857abb58 100644
--- a/pkgs/tools/misc/bc/cross-bc.patch
+++ b/nixpkgs/pkgs/tools/misc/bc/cross-bc.patch
diff --git a/pkgs/tools/misc/bc/default.nix b/nixpkgs/pkgs/tools/misc/bc/default.nix
index 111ab254acc..111ab254acc 100644
--- a/pkgs/tools/misc/bc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bc/default.nix
diff --git a/pkgs/tools/misc/bcunit/default.nix b/nixpkgs/pkgs/tools/misc/bcunit/default.nix
index 4a440e133fe..4a440e133fe 100644
--- a/pkgs/tools/misc/bcunit/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bcunit/default.nix
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix
index defdd9494e5..defdd9494e5 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix
diff --git a/pkgs/tools/misc/bepasty/default.nix b/nixpkgs/pkgs/tools/misc/bepasty/default.nix
index 532d1155fbe..532d1155fbe 100644
--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bepasty/default.nix
diff --git a/pkgs/tools/misc/bfr/default.nix b/nixpkgs/pkgs/tools/misc/bfr/default.nix
index 4ec73641842..4ec73641842 100644
--- a/pkgs/tools/misc/bfr/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bfr/default.nix
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix
index c0339834b64..c0339834b64 100644
--- a/pkgs/tools/misc/bibtex2html/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix
diff --git a/pkgs/tools/misc/bibtool/default.nix b/nixpkgs/pkgs/tools/misc/bibtool/default.nix
index df7564a4b84..df7564a4b84 100644
--- a/pkgs/tools/misc/bibtool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bibtool/default.nix
diff --git a/pkgs/tools/misc/bibutils/default.nix b/nixpkgs/pkgs/tools/misc/bibutils/default.nix
index d099a8aba9b..d099a8aba9b 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bibutils/default.nix
diff --git a/pkgs/tools/misc/birdfont/default.nix b/nixpkgs/pkgs/tools/misc/birdfont/default.nix
index 8cc21158e8a..8cc21158e8a 100644
--- a/pkgs/tools/misc/birdfont/default.nix
+++ b/nixpkgs/pkgs/tools/misc/birdfont/default.nix
diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix
index 3d51f282dae..3d51f282dae 100644
--- a/pkgs/tools/misc/birdfont/xmlbird.nix
+++ b/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix
diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/nixpkgs/pkgs/tools/misc/blink1-tool/default.nix
index 8d587e34af4..8d587e34af4 100644
--- a/pkgs/tools/misc/blink1-tool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/blink1-tool/default.nix
diff --git a/pkgs/tools/misc/blsd/default.nix b/nixpkgs/pkgs/tools/misc/blsd/default.nix
index 23bd7ed172c..23bd7ed172c 100644
--- a/pkgs/tools/misc/blsd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/blsd/default.nix
diff --git a/pkgs/tools/misc/blsd/deps.nix b/nixpkgs/pkgs/tools/misc/blsd/deps.nix
index d212f213a60..d212f213a60 100644
--- a/pkgs/tools/misc/blsd/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/blsd/deps.nix
diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix
index 6b7a51e08f5..6b7a51e08f5 100644
--- a/pkgs/tools/misc/bmap-tools/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix
diff --git a/pkgs/tools/misc/bmon/default.nix b/nixpkgs/pkgs/tools/misc/bmon/default.nix
index e4664e34b96..e4664e34b96 100644
--- a/pkgs/tools/misc/bmon/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bmon/default.nix
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/nixpkgs/pkgs/tools/misc/bogofilter/default.nix
index f86d44c580d..f86d44c580d 100644
--- a/pkgs/tools/misc/bogofilter/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bogofilter/default.nix
diff --git a/pkgs/tools/misc/bonfire/default.nix b/nixpkgs/pkgs/tools/misc/bonfire/default.nix
index 12b0ad2abf1..12b0ad2abf1 100644
--- a/pkgs/tools/misc/bonfire/default.nix
+++ b/nixpkgs/pkgs/tools/misc/bonfire/default.nix
diff --git a/pkgs/tools/misc/brltty/default.nix b/nixpkgs/pkgs/tools/misc/brltty/default.nix
index fa7457b417e..fa7457b417e 100644
--- a/pkgs/tools/misc/brltty/default.nix
+++ b/nixpkgs/pkgs/tools/misc/brltty/default.nix
diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix
index c40ccad5e39..c40ccad5e39 100644
--- a/pkgs/tools/misc/broadlink-cli/default.nix
+++ b/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix
diff --git a/pkgs/tools/misc/broot/default.nix b/nixpkgs/pkgs/tools/misc/broot/default.nix
index 7f8a9dbde57..7f8a9dbde57 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/nixpkgs/pkgs/tools/misc/broot/default.nix
diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix
index b86bc38cb26..b86bc38cb26 100644
--- a/pkgs/tools/misc/buildtorrent/default.nix
+++ b/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix
diff --git a/pkgs/tools/misc/byobu/default.nix b/nixpkgs/pkgs/tools/misc/byobu/default.nix
index 94db365f6d6..94db365f6d6 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/nixpkgs/pkgs/tools/misc/byobu/default.nix
diff --git a/pkgs/tools/misc/calamares/default.nix b/nixpkgs/pkgs/tools/misc/calamares/default.nix
index 8f365d023d2..8f365d023d2 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/nixpkgs/pkgs/tools/misc/calamares/default.nix
diff --git a/pkgs/tools/misc/capture/default.nix b/nixpkgs/pkgs/tools/misc/capture/default.nix
index e7134961c25..e7134961c25 100644
--- a/pkgs/tools/misc/capture/default.nix
+++ b/nixpkgs/pkgs/tools/misc/capture/default.nix
diff --git a/pkgs/tools/misc/catimg/default.nix b/nixpkgs/pkgs/tools/misc/catimg/default.nix
index ac2f3f3411a..ac2f3f3411a 100644
--- a/pkgs/tools/misc/catimg/default.nix
+++ b/nixpkgs/pkgs/tools/misc/catimg/default.nix
diff --git a/pkgs/tools/misc/ccze/default.nix b/nixpkgs/pkgs/tools/misc/ccze/default.nix
index 409297de9f7..409297de9f7 100644
--- a/pkgs/tools/misc/ccze/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ccze/default.nix
diff --git a/pkgs/tools/misc/chafa/default.nix b/nixpkgs/pkgs/tools/misc/chafa/default.nix
index 5055ce67d30..5055ce67d30 100644
--- a/pkgs/tools/misc/chafa/default.nix
+++ b/nixpkgs/pkgs/tools/misc/chafa/default.nix
diff --git a/pkgs/tools/misc/chafa/xmlcatalog_patch.patch b/nixpkgs/pkgs/tools/misc/chafa/xmlcatalog_patch.patch
index 6bf988d6117..6bf988d6117 100644
--- a/pkgs/tools/misc/chafa/xmlcatalog_patch.patch
+++ b/nixpkgs/pkgs/tools/misc/chafa/xmlcatalog_patch.patch
diff --git a/pkgs/tools/misc/chelf/default.nix b/nixpkgs/pkgs/tools/misc/chelf/default.nix
index f9740f22375..f9740f22375 100644
--- a/pkgs/tools/misc/chelf/default.nix
+++ b/nixpkgs/pkgs/tools/misc/chelf/default.nix
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
index 637f7a17695..637f7a17695 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
diff --git a/pkgs/tools/misc/chrome-export/default.nix b/nixpkgs/pkgs/tools/misc/chrome-export/default.nix
index 8639f6f6f79..8639f6f6f79 100644
--- a/pkgs/tools/misc/chrome-export/default.nix
+++ b/nixpkgs/pkgs/tools/misc/chrome-export/default.nix
diff --git a/pkgs/tools/misc/cht.sh/default.nix b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix
index 4d33d957b4d..4d33d957b4d 100644
--- a/pkgs/tools/misc/cht.sh/default.nix
+++ b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix
diff --git a/pkgs/tools/misc/ckb-next/default.nix b/nixpkgs/pkgs/tools/misc/ckb-next/default.nix
index 738430f561b..738430f561b 100644
--- a/pkgs/tools/misc/ckb-next/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ckb-next/default.nix
diff --git a/pkgs/tools/misc/ckb-next/install-dirs.patch b/nixpkgs/pkgs/tools/misc/ckb-next/install-dirs.patch
index 0f113d71aa3..0f113d71aa3 100644
--- a/pkgs/tools/misc/ckb-next/install-dirs.patch
+++ b/nixpkgs/pkgs/tools/misc/ckb-next/install-dirs.patch
diff --git a/pkgs/tools/misc/ckb-next/modprobe.patch b/nixpkgs/pkgs/tools/misc/ckb-next/modprobe.patch
index a2cbe262e89..a2cbe262e89 100644
--- a/pkgs/tools/misc/ckb-next/modprobe.patch
+++ b/nixpkgs/pkgs/tools/misc/ckb-next/modprobe.patch
diff --git a/pkgs/tools/misc/clac/default.nix b/nixpkgs/pkgs/tools/misc/clac/default.nix
index 544379d8d21..544379d8d21 100644
--- a/pkgs/tools/misc/clac/default.nix
+++ b/nixpkgs/pkgs/tools/misc/clac/default.nix
diff --git a/pkgs/tools/misc/clasp/default.nix b/nixpkgs/pkgs/tools/misc/clasp/default.nix
index 31c35af8118..31c35af8118 100644
--- a/pkgs/tools/misc/clasp/default.nix
+++ b/nixpkgs/pkgs/tools/misc/clasp/default.nix
diff --git a/pkgs/tools/misc/claws/default.nix b/nixpkgs/pkgs/tools/misc/claws/default.nix
index 10347e6e794..10347e6e794 100644
--- a/pkgs/tools/misc/claws/default.nix
+++ b/nixpkgs/pkgs/tools/misc/claws/default.nix
diff --git a/pkgs/tools/misc/clex/default.nix b/nixpkgs/pkgs/tools/misc/clex/default.nix
index d5fd4e97df1..d5fd4e97df1 100644
--- a/pkgs/tools/misc/clex/default.nix
+++ b/nixpkgs/pkgs/tools/misc/clex/default.nix
diff --git a/pkgs/tools/misc/clipman/default.nix b/nixpkgs/pkgs/tools/misc/clipman/default.nix
index 861d384f1f8..861d384f1f8 100644
--- a/pkgs/tools/misc/clipman/default.nix
+++ b/nixpkgs/pkgs/tools/misc/clipman/default.nix
diff --git a/pkgs/tools/misc/clipnotify/default.nix b/nixpkgs/pkgs/tools/misc/clipnotify/default.nix
index 91c428def28..91c428def28 100644
--- a/pkgs/tools/misc/clipnotify/default.nix
+++ b/nixpkgs/pkgs/tools/misc/clipnotify/default.nix
diff --git a/pkgs/tools/misc/clipster/default.nix b/nixpkgs/pkgs/tools/misc/clipster/default.nix
index 699285f2664..699285f2664 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/nixpkgs/pkgs/tools/misc/clipster/default.nix
diff --git a/pkgs/tools/misc/cloc/default.nix b/nixpkgs/pkgs/tools/misc/cloc/default.nix
index 6d567f6119a..6d567f6119a 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/cloc/default.nix
diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix
index bc23958b581..bc23958b581 100644
--- a/pkgs/tools/misc/cloud-sql-proxy/default.nix
+++ b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix
diff --git a/pkgs/tools/misc/cloud-sql-proxy/deps.nix b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/deps.nix
index 6898833b6f1..6898833b6f1 100644
--- a/pkgs/tools/misc/cloud-sql-proxy/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/deps.nix
diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix
index cdd1891fb40..cdd1891fb40 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix
diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/nixpkgs/pkgs/tools/misc/colord-gtk/default.nix
index b2113f8304c..b2113f8304c 100644
--- a/pkgs/tools/misc/colord-gtk/default.nix
+++ b/nixpkgs/pkgs/tools/misc/colord-gtk/default.nix
diff --git a/pkgs/tools/misc/colord-kde/default.nix b/nixpkgs/pkgs/tools/misc/colord-kde/default.nix
index 41c80146e68..41c80146e68 100644
--- a/pkgs/tools/misc/colord-kde/default.nix
+++ b/nixpkgs/pkgs/tools/misc/colord-kde/default.nix
diff --git a/pkgs/tools/misc/colord/default.nix b/nixpkgs/pkgs/tools/misc/colord/default.nix
index 54379ec08f0..54379ec08f0 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/nixpkgs/pkgs/tools/misc/colord/default.nix
diff --git a/pkgs/tools/misc/colord/installed-tests-path.patch b/nixpkgs/pkgs/tools/misc/colord/installed-tests-path.patch
index 6d91cbbcb02..6d91cbbcb02 100644
--- a/pkgs/tools/misc/colord/installed-tests-path.patch
+++ b/nixpkgs/pkgs/tools/misc/colord/installed-tests-path.patch
diff --git a/pkgs/tools/misc/contacts/default.nix b/nixpkgs/pkgs/tools/misc/contacts/default.nix
index f3d7fbd8127..f3d7fbd8127 100644
--- a/pkgs/tools/misc/contacts/default.nix
+++ b/nixpkgs/pkgs/tools/misc/contacts/default.nix
diff --git a/pkgs/tools/misc/convmv/default.nix b/nixpkgs/pkgs/tools/misc/convmv/default.nix
index 56b9d5c849a..56b9d5c849a 100644
--- a/pkgs/tools/misc/convmv/default.nix
+++ b/nixpkgs/pkgs/tools/misc/convmv/default.nix
diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix
index 3f6988f1f65..3f6988f1f65 100644
--- a/pkgs/tools/misc/coreboot-utils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix
diff --git a/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch b/nixpkgs/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch
index ae1a02d4d20..ae1a02d4d20 100644
--- a/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch
+++ b/nixpkgs/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch
diff --git a/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch b/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch
index 2f69347ffab..2f69347ffab 100644
--- a/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch
+++ b/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch
diff --git a/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch b/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch
index 97d95d1c5b1..97d95d1c5b1 100644
--- a/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch
+++ b/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch
diff --git a/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch b/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch
index 02b0b85db31..02b0b85db31 100644
--- a/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch
+++ b/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch
diff --git a/pkgs/tools/misc/coreutils/default.nix b/nixpkgs/pkgs/tools/misc/coreutils/default.nix
index 519a33c60d6..519a33c60d6 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/coreutils/default.nix
diff --git a/pkgs/tools/misc/cowsay/default.nix b/nixpkgs/pkgs/tools/misc/cowsay/default.nix
index fb44b051b7e..fb44b051b7e 100644
--- a/pkgs/tools/misc/cowsay/default.nix
+++ b/nixpkgs/pkgs/tools/misc/cowsay/default.nix
diff --git a/pkgs/tools/misc/cpulimit/default.nix b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix
index 1978476a12d..1978476a12d 100644
--- a/pkgs/tools/misc/cpulimit/default.nix
+++ b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix
diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix
index 5792fa4121b..5792fa4121b 100644
--- a/pkgs/tools/misc/cpuminer-multi/default.nix
+++ b/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix
diff --git a/pkgs/tools/misc/cpuminer/default.nix b/nixpkgs/pkgs/tools/misc/cpuminer/default.nix
index db0ab75d916..db0ab75d916 100644
--- a/pkgs/tools/misc/cpuminer/default.nix
+++ b/nixpkgs/pkgs/tools/misc/cpuminer/default.nix
diff --git a/pkgs/tools/misc/crex/default.nix b/nixpkgs/pkgs/tools/misc/crex/default.nix
index a00f8d6654f..a00f8d6654f 100644
--- a/pkgs/tools/misc/crex/default.nix
+++ b/nixpkgs/pkgs/tools/misc/crex/default.nix
diff --git a/pkgs/tools/misc/crudini/default.nix b/nixpkgs/pkgs/tools/misc/crudini/default.nix
index f63cd0d32c9..f63cd0d32c9 100644
--- a/pkgs/tools/misc/crudini/default.nix
+++ b/nixpkgs/pkgs/tools/misc/crudini/default.nix
diff --git a/pkgs/tools/misc/cunit/default.nix b/nixpkgs/pkgs/tools/misc/cunit/default.nix
index f1930c925ff..f1930c925ff 100644
--- a/pkgs/tools/misc/cunit/default.nix
+++ b/nixpkgs/pkgs/tools/misc/cunit/default.nix
diff --git a/pkgs/tools/misc/cutecom/default.nix b/nixpkgs/pkgs/tools/misc/cutecom/default.nix
index d825b555e19..d825b555e19 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/nixpkgs/pkgs/tools/misc/cutecom/default.nix
diff --git a/pkgs/tools/misc/dashing/default.nix b/nixpkgs/pkgs/tools/misc/dashing/default.nix
index f45889e78d8..f45889e78d8 100644
--- a/pkgs/tools/misc/dashing/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dashing/default.nix
diff --git a/pkgs/tools/misc/dashing/deps.nix b/nixpkgs/pkgs/tools/misc/dashing/deps.nix
index 4ad5a10149e..4ad5a10149e 100644
--- a/pkgs/tools/misc/dashing/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/dashing/deps.nix
diff --git a/pkgs/tools/misc/dasht/default.nix b/nixpkgs/pkgs/tools/misc/dasht/default.nix
index e1286820797..e1286820797 100644
--- a/pkgs/tools/misc/dasht/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dasht/default.nix
diff --git a/pkgs/tools/misc/datamash/default.nix b/nixpkgs/pkgs/tools/misc/datamash/default.nix
index 18e80ab6e4a..18e80ab6e4a 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/nixpkgs/pkgs/tools/misc/datamash/default.nix
diff --git a/pkgs/tools/misc/dateutils/default.nix b/nixpkgs/pkgs/tools/misc/dateutils/default.nix
index b440808833f..b440808833f 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dateutils/default.nix
diff --git a/pkgs/tools/misc/dbacl/default.nix b/nixpkgs/pkgs/tools/misc/dbacl/default.nix
index 9107debfd12..9107debfd12 100644
--- a/pkgs/tools/misc/dbacl/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dbacl/default.nix
diff --git a/pkgs/tools/misc/dbus-map/default.nix b/nixpkgs/pkgs/tools/misc/dbus-map/default.nix
index 72687f4bfa4..72687f4bfa4 100644
--- a/pkgs/tools/misc/dbus-map/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dbus-map/default.nix
diff --git a/pkgs/tools/misc/ddate/default.nix b/nixpkgs/pkgs/tools/misc/ddate/default.nix
index c602a4c9235..c602a4c9235 100644
--- a/pkgs/tools/misc/ddate/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ddate/default.nix
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix
index 0d5efb2ca22..0d5efb2ca22 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix
diff --git a/pkgs/tools/misc/ddcutil/default.nix b/nixpkgs/pkgs/tools/misc/ddcutil/default.nix
index e3ba0abb8bc..e3ba0abb8bc 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ddcutil/default.nix
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix
index 35db9ef7db3..35db9ef7db3 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix
diff --git a/pkgs/tools/misc/debianutils/default.nix b/nixpkgs/pkgs/tools/misc/debianutils/default.nix
index 74aec9bae6a..74aec9bae6a 100644
--- a/pkgs/tools/misc/debianutils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/debianutils/default.nix
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/nixpkgs/pkgs/tools/misc/debootstrap/default.nix
index da810b3c9d8..da810b3c9d8 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/nixpkgs/pkgs/tools/misc/debootstrap/default.nix
diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix
index 6b47027a5b9..6b47027a5b9 100644
--- a/pkgs/tools/misc/desktop-file-utils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix
diff --git a/pkgs/tools/misc/desktop-file-utils/setup-hook.sh b/nixpkgs/pkgs/tools/misc/desktop-file-utils/setup-hook.sh
index 728070e3458..728070e3458 100644
--- a/pkgs/tools/misc/desktop-file-utils/setup-hook.sh
+++ b/nixpkgs/pkgs/tools/misc/desktop-file-utils/setup-hook.sh
diff --git a/pkgs/tools/misc/detox/default.nix b/nixpkgs/pkgs/tools/misc/detox/default.nix
index 9ad891fd9bd..9ad891fd9bd 100644
--- a/pkgs/tools/misc/detox/default.nix
+++ b/nixpkgs/pkgs/tools/misc/detox/default.nix
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
index 97b4aa1db28..97b4aa1db28 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
diff --git a/pkgs/tools/misc/diffoscope/ignore_links.patch b/nixpkgs/pkgs/tools/misc/diffoscope/ignore_links.patch
index b0841ce0bb5..b0841ce0bb5 100644
--- a/pkgs/tools/misc/diffoscope/ignore_links.patch
+++ b/nixpkgs/pkgs/tools/misc/diffoscope/ignore_links.patch
diff --git a/pkgs/tools/misc/diffoscope/list-missing-tools.sh b/nixpkgs/pkgs/tools/misc/diffoscope/list-missing-tools.sh
index 5f4d118cfed..5f4d118cfed 100755
--- a/pkgs/tools/misc/diffoscope/list-missing-tools.sh
+++ b/nixpkgs/pkgs/tools/misc/diffoscope/list-missing-tools.sh
diff --git a/pkgs/tools/misc/ding-libs/default.nix b/nixpkgs/pkgs/tools/misc/ding-libs/default.nix
index e99e9289b67..e99e9289b67 100644
--- a/pkgs/tools/misc/ding-libs/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ding-libs/default.nix
diff --git a/pkgs/tools/misc/direnv/default.nix b/nixpkgs/pkgs/tools/misc/direnv/default.nix
index c358e24095a..c358e24095a 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/nixpkgs/pkgs/tools/misc/direnv/default.nix
diff --git a/pkgs/tools/misc/diskscan/default.nix b/nixpkgs/pkgs/tools/misc/diskscan/default.nix
index 10406b8bf03..10406b8bf03 100644
--- a/pkgs/tools/misc/diskscan/default.nix
+++ b/nixpkgs/pkgs/tools/misc/diskscan/default.nix
diff --git a/pkgs/tools/misc/diskus/default.nix b/nixpkgs/pkgs/tools/misc/diskus/default.nix
index 7b1e5ed6c0a..7b1e5ed6c0a 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/nixpkgs/pkgs/tools/misc/diskus/default.nix
diff --git a/pkgs/tools/misc/disper/default.nix b/nixpkgs/pkgs/tools/misc/disper/default.nix
index 167b4a547f8..167b4a547f8 100644
--- a/pkgs/tools/misc/disper/default.nix
+++ b/nixpkgs/pkgs/tools/misc/disper/default.nix
diff --git a/pkgs/tools/misc/dmg2img/default.nix b/nixpkgs/pkgs/tools/misc/dmg2img/default.nix
index df084579b79..df084579b79 100644
--- a/pkgs/tools/misc/dmg2img/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dmg2img/default.nix
diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/nixpkgs/pkgs/tools/misc/docbook2mdoc/default.nix
index efe65683e07..efe65683e07 100644
--- a/pkgs/tools/misc/docbook2mdoc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/docbook2mdoc/default.nix
diff --git a/pkgs/tools/misc/docker-ls/default.nix b/nixpkgs/pkgs/tools/misc/docker-ls/default.nix
index c1baf8e82f5..c1baf8e82f5 100644
--- a/pkgs/tools/misc/docker-ls/default.nix
+++ b/nixpkgs/pkgs/tools/misc/docker-ls/default.nix
diff --git a/pkgs/tools/misc/docker-sync/Gemfile b/nixpkgs/pkgs/tools/misc/docker-sync/Gemfile
index 2c8125a4616..2c8125a4616 100644
--- a/pkgs/tools/misc/docker-sync/Gemfile
+++ b/nixpkgs/pkgs/tools/misc/docker-sync/Gemfile
diff --git a/pkgs/tools/misc/docker-sync/Gemfile.lock b/nixpkgs/pkgs/tools/misc/docker-sync/Gemfile.lock
index ff7aa6b3f9f..ff7aa6b3f9f 100644
--- a/pkgs/tools/misc/docker-sync/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/docker-sync/Gemfile.lock
diff --git a/pkgs/tools/misc/docker-sync/default.nix b/nixpkgs/pkgs/tools/misc/docker-sync/default.nix
index e75b8347568..e75b8347568 100644
--- a/pkgs/tools/misc/docker-sync/default.nix
+++ b/nixpkgs/pkgs/tools/misc/docker-sync/default.nix
diff --git a/pkgs/tools/misc/docker-sync/gemset.nix b/nixpkgs/pkgs/tools/misc/docker-sync/gemset.nix
index 739d11c7b5a..739d11c7b5a 100644
--- a/pkgs/tools/misc/docker-sync/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/docker-sync/gemset.nix
diff --git a/pkgs/tools/misc/docui/default.nix b/nixpkgs/pkgs/tools/misc/docui/default.nix
index 66c0cfc82b1..66c0cfc82b1 100644
--- a/pkgs/tools/misc/docui/default.nix
+++ b/nixpkgs/pkgs/tools/misc/docui/default.nix
diff --git a/pkgs/tools/misc/doitlive/default.nix b/nixpkgs/pkgs/tools/misc/doitlive/default.nix
index 6edcefb11d5..6edcefb11d5 100644
--- a/pkgs/tools/misc/doitlive/default.nix
+++ b/nixpkgs/pkgs/tools/misc/doitlive/default.nix
diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix
index 88359adc318..88359adc318 100644
--- a/pkgs/tools/misc/dpt-rp1-py/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix
diff --git a/pkgs/tools/misc/dtach/default.nix b/nixpkgs/pkgs/tools/misc/dtach/default.nix
index 7d85decbb84..7d85decbb84 100644
--- a/pkgs/tools/misc/dtach/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dtach/default.nix
diff --git a/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix
index 5ac8a661c9a..5ac8a661c9a 100644
--- a/pkgs/tools/misc/dua/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dua/default.nix
diff --git a/pkgs/tools/misc/duc/default.nix b/nixpkgs/pkgs/tools/misc/duc/default.nix
index c5ea2cd46a1..c5ea2cd46a1 100644
--- a/pkgs/tools/misc/duc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/duc/default.nix
diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix
index 1b9a6c9bbea..1b9a6c9bbea 100644
--- a/pkgs/tools/misc/dumptorrent/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix
diff --git a/pkgs/tools/misc/dupd/default.nix b/nixpkgs/pkgs/tools/misc/dupd/default.nix
index 06b9f3adac9..06b9f3adac9 100644
--- a/pkgs/tools/misc/dupd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dupd/default.nix
diff --git a/pkgs/tools/misc/dust/default.nix b/nixpkgs/pkgs/tools/misc/dust/default.nix
index caa8451585e..caa8451585e 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dust/default.nix
diff --git a/pkgs/tools/misc/dvtm/default.nix b/nixpkgs/pkgs/tools/misc/dvtm/default.nix
index bedfebd9681..bedfebd9681 100644
--- a/pkgs/tools/misc/dvtm/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dvtm/default.nix
diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix
index df2e25c7ea3..df2e25c7ea3 100644
--- a/pkgs/tools/misc/dvtm/dvtm.nix
+++ b/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix
diff --git a/pkgs/tools/misc/dvtm/unstable.nix b/nixpkgs/pkgs/tools/misc/dvtm/unstable.nix
index 6ee2a465c69..6ee2a465c69 100644
--- a/pkgs/tools/misc/dvtm/unstable.nix
+++ b/nixpkgs/pkgs/tools/misc/dvtm/unstable.nix
diff --git a/pkgs/tools/misc/dylibbundler/default.nix b/nixpkgs/pkgs/tools/misc/dylibbundler/default.nix
index c4209442de8..c4209442de8 100644
--- a/pkgs/tools/misc/dylibbundler/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dylibbundler/default.nix
diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/nixpkgs/pkgs/tools/misc/dynamic-colors/default.nix
index 6cb01f14a2c..6cb01f14a2c 100644
--- a/pkgs/tools/misc/dynamic-colors/default.nix
+++ b/nixpkgs/pkgs/tools/misc/dynamic-colors/default.nix
diff --git a/pkgs/tools/misc/edid-decode/default.nix b/nixpkgs/pkgs/tools/misc/edid-decode/default.nix
index 11a46f620c0..11a46f620c0 100644
--- a/pkgs/tools/misc/edid-decode/default.nix
+++ b/nixpkgs/pkgs/tools/misc/edid-decode/default.nix
diff --git a/pkgs/tools/misc/emv/default.nix b/nixpkgs/pkgs/tools/misc/emv/default.nix
index 6a5fcfb1217..6a5fcfb1217 100644
--- a/pkgs/tools/misc/emv/default.nix
+++ b/nixpkgs/pkgs/tools/misc/emv/default.nix
diff --git a/pkgs/tools/misc/ent/default.nix b/nixpkgs/pkgs/tools/misc/ent/default.nix
index 7e8d04b4209..7e8d04b4209 100644
--- a/pkgs/tools/misc/ent/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ent/default.nix
diff --git a/pkgs/tools/misc/entr/default.nix b/nixpkgs/pkgs/tools/misc/entr/default.nix
index 247572a379f..247572a379f 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/nixpkgs/pkgs/tools/misc/entr/default.nix
diff --git a/pkgs/tools/misc/envdir-go/default.nix b/nixpkgs/pkgs/tools/misc/envdir-go/default.nix
index db31df982cf..db31df982cf 100644
--- a/pkgs/tools/misc/envdir-go/default.nix
+++ b/nixpkgs/pkgs/tools/misc/envdir-go/default.nix
diff --git a/pkgs/tools/misc/envsubst/default.nix b/nixpkgs/pkgs/tools/misc/envsubst/default.nix
index 9b2153d17cb..9b2153d17cb 100644
--- a/pkgs/tools/misc/envsubst/default.nix
+++ b/nixpkgs/pkgs/tools/misc/envsubst/default.nix
diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix
index 8d65aee9e7a..8d65aee9e7a 100644
--- a/pkgs/tools/misc/eot-utilities/default.nix
+++ b/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix
diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix
index 52b56f10ea9..52b56f10ea9 100644
--- a/pkgs/tools/misc/esptool-ck/default.nix
+++ b/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix
diff --git a/pkgs/tools/misc/esptool/default.nix b/nixpkgs/pkgs/tools/misc/esptool/default.nix
index 8793685069a..8793685069a 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/esptool/default.nix
diff --git a/pkgs/tools/misc/etcher/default.nix b/nixpkgs/pkgs/tools/misc/etcher/default.nix
index 4944600108a..4944600108a 100644
--- a/pkgs/tools/misc/etcher/default.nix
+++ b/nixpkgs/pkgs/tools/misc/etcher/default.nix
diff --git a/pkgs/tools/misc/ethminer/default.nix b/nixpkgs/pkgs/tools/misc/ethminer/default.nix
index 1ec99f12d82..1ec99f12d82 100644
--- a/pkgs/tools/misc/ethminer/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ethminer/default.nix
diff --git a/pkgs/tools/misc/ethtool/default.nix b/nixpkgs/pkgs/tools/misc/ethtool/default.nix
index ec1e2c48e64..ec1e2c48e64 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ethtool/default.nix
diff --git a/pkgs/tools/misc/eva/Cargo.lock.patch b/nixpkgs/pkgs/tools/misc/eva/Cargo.lock.patch
index 67553f0d6d8..67553f0d6d8 100644
--- a/pkgs/tools/misc/eva/Cargo.lock.patch
+++ b/nixpkgs/pkgs/tools/misc/eva/Cargo.lock.patch
diff --git a/pkgs/tools/misc/eva/default.nix b/nixpkgs/pkgs/tools/misc/eva/default.nix
index bf43d11e566..bf43d11e566 100644
--- a/pkgs/tools/misc/eva/default.nix
+++ b/nixpkgs/pkgs/tools/misc/eva/default.nix
diff --git a/pkgs/tools/misc/exa/default.nix b/nixpkgs/pkgs/tools/misc/exa/default.nix
index 0edd8a1b318..0edd8a1b318 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/nixpkgs/pkgs/tools/misc/exa/default.nix
diff --git a/pkgs/tools/misc/execline/default.nix b/nixpkgs/pkgs/tools/misc/execline/default.nix
index fb685e65a4f..fb685e65a4f 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/nixpkgs/pkgs/tools/misc/execline/default.nix
diff --git a/pkgs/tools/misc/execline/execlineb-wrapper.c b/nixpkgs/pkgs/tools/misc/execline/execlineb-wrapper.c
index d31a76ca26e..d31a76ca26e 100644
--- a/pkgs/tools/misc/execline/execlineb-wrapper.c
+++ b/nixpkgs/pkgs/tools/misc/execline/execlineb-wrapper.c
diff --git a/pkgs/tools/misc/expect/default.nix b/nixpkgs/pkgs/tools/misc/expect/default.nix
index fe18a506560..fe18a506560 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/nixpkgs/pkgs/tools/misc/expect/default.nix
diff --git a/pkgs/tools/misc/fasd/default.nix b/nixpkgs/pkgs/tools/misc/fasd/default.nix
index 6c2cbd25744..6c2cbd25744 100644
--- a/pkgs/tools/misc/fasd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fasd/default.nix
diff --git a/pkgs/tools/misc/fd/default.nix b/nixpkgs/pkgs/tools/misc/fd/default.nix
index 76661c77f7b..76661c77f7b 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fd/default.nix
diff --git a/pkgs/tools/misc/fdupes/default.nix b/nixpkgs/pkgs/tools/misc/fdupes/default.nix
index af9a7c9a133..af9a7c9a133 100644
--- a/pkgs/tools/misc/fdupes/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fdupes/default.nix
diff --git a/pkgs/tools/misc/fffuu/default.nix b/nixpkgs/pkgs/tools/misc/fffuu/default.nix
index 5d79b26f230..5d79b26f230 100644
--- a/pkgs/tools/misc/fffuu/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fffuu/default.nix
diff --git a/pkgs/tools/misc/ffsend/default.nix b/nixpkgs/pkgs/tools/misc/ffsend/default.nix
index bb10bfe2ec7..bb10bfe2ec7 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ffsend/default.nix
diff --git a/pkgs/tools/misc/figlet/default.nix b/nixpkgs/pkgs/tools/misc/figlet/default.nix
index 86434847b4a..86434847b4a 100644
--- a/pkgs/tools/misc/figlet/default.nix
+++ b/nixpkgs/pkgs/tools/misc/figlet/default.nix
diff --git a/pkgs/tools/misc/file/default.nix b/nixpkgs/pkgs/tools/misc/file/default.nix
index 24a7143d8e1..24a7143d8e1 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/nixpkgs/pkgs/tools/misc/file/default.nix
diff --git a/pkgs/tools/misc/filebench/default.nix b/nixpkgs/pkgs/tools/misc/filebench/default.nix
index a16695cf7c3..a16695cf7c3 100644
--- a/pkgs/tools/misc/filebench/default.nix
+++ b/nixpkgs/pkgs/tools/misc/filebench/default.nix
diff --git a/pkgs/tools/misc/fileschanged/default.nix b/nixpkgs/pkgs/tools/misc/fileschanged/default.nix
index 6818bb708bb..6818bb708bb 100644
--- a/pkgs/tools/misc/fileschanged/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fileschanged/default.nix
diff --git a/pkgs/tools/misc/fileschanged/unused-variables.debian.patch b/nixpkgs/pkgs/tools/misc/fileschanged/unused-variables.debian.patch
index 73d307f9413..73d307f9413 100644
--- a/pkgs/tools/misc/fileschanged/unused-variables.debian.patch
+++ b/nixpkgs/pkgs/tools/misc/fileschanged/unused-variables.debian.patch
diff --git a/pkgs/tools/misc/findutils/default.nix b/nixpkgs/pkgs/tools/misc/findutils/default.nix
index 2df8ee420fa..2df8ee420fa 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/findutils/default.nix
diff --git a/pkgs/tools/misc/findutils/no-install-statedir.patch b/nixpkgs/pkgs/tools/misc/findutils/no-install-statedir.patch
index a7a48038a3a..a7a48038a3a 100644
--- a/pkgs/tools/misc/findutils/no-install-statedir.patch
+++ b/nixpkgs/pkgs/tools/misc/findutils/no-install-statedir.patch
diff --git a/pkgs/tools/misc/flameshot/default.nix b/nixpkgs/pkgs/tools/misc/flameshot/default.nix
index ad6ed6acb4c..ad6ed6acb4c 100644
--- a/pkgs/tools/misc/flameshot/default.nix
+++ b/nixpkgs/pkgs/tools/misc/flameshot/default.nix
diff --git a/pkgs/tools/misc/flashrom/default.nix b/nixpkgs/pkgs/tools/misc/flashrom/default.nix
index 18914a304f3..18914a304f3 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/nixpkgs/pkgs/tools/misc/flashrom/default.nix
diff --git a/pkgs/tools/misc/fltrdr/default.nix b/nixpkgs/pkgs/tools/misc/fltrdr/default.nix
index 8c2c5adfb5f..8c2c5adfb5f 100644
--- a/pkgs/tools/misc/fltrdr/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fltrdr/default.nix
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix
index 4e1a18efde4..4e1a18efde4 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix
diff --git a/pkgs/tools/misc/fluentd/Gemfile b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile
index 952c419ad31..952c419ad31 100644
--- a/pkgs/tools/misc/fluentd/Gemfile
+++ b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile
diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock
index e86371aed3b..e86371aed3b 100644
--- a/pkgs/tools/misc/fluentd/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock
diff --git a/pkgs/tools/misc/fluentd/default.nix b/nixpkgs/pkgs/tools/misc/fluentd/default.nix
index 18d03982f37..18d03982f37 100644
--- a/pkgs/tools/misc/fluentd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fluentd/default.nix
diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix
index 9c8343eb44a..9c8343eb44a 100644
--- a/pkgs/tools/misc/fluentd/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix
diff --git a/pkgs/tools/misc/fondu/default.nix b/nixpkgs/pkgs/tools/misc/fondu/default.nix
index 772ae236764..772ae236764 100644
--- a/pkgs/tools/misc/fondu/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fondu/default.nix
diff --git a/pkgs/tools/misc/fontforge/default.nix b/nixpkgs/pkgs/tools/misc/fontforge/default.nix
index 6239e839598..6239e839598 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fontforge/default.nix
diff --git a/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch b/nixpkgs/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch
index fb53c619b2b..fb53c619b2b 100644
--- a/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch
+++ b/nixpkgs/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch
diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/nixpkgs/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
index ea4acfc5f0b..ea4acfc5f0b 100644
--- a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
+++ b/nixpkgs/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
diff --git a/pkgs/tools/misc/fortune/default.nix b/nixpkgs/pkgs/tools/misc/fortune/default.nix
index 74c21d21fcc..74c21d21fcc 100644
--- a/pkgs/tools/misc/fortune/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fortune/default.nix
diff --git a/pkgs/tools/misc/fpart/default.nix b/nixpkgs/pkgs/tools/misc/fpart/default.nix
index e673c73d096..e673c73d096 100644
--- a/pkgs/tools/misc/fpart/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fpart/default.nix
diff --git a/pkgs/tools/misc/fpp/default.nix b/nixpkgs/pkgs/tools/misc/fpp/default.nix
index 7f036cb1f90..7f036cb1f90 100644
--- a/pkgs/tools/misc/fpp/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fpp/default.nix
diff --git a/pkgs/tools/misc/fselect/default.nix b/nixpkgs/pkgs/tools/misc/fselect/default.nix
index 0685ecf2440..0685ecf2440 100644
--- a/pkgs/tools/misc/fselect/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fselect/default.nix
diff --git a/pkgs/tools/misc/fsmark/default.nix b/nixpkgs/pkgs/tools/misc/fsmark/default.nix
index ac56d948bda..ac56d948bda 100644
--- a/pkgs/tools/misc/fsmark/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fsmark/default.nix
diff --git a/pkgs/tools/misc/fsmon/default.nix b/nixpkgs/pkgs/tools/misc/fsmon/default.nix
index e8e48d7879a..e8e48d7879a 100644
--- a/pkgs/tools/misc/fsmon/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fsmon/default.nix
diff --git a/pkgs/tools/misc/fsql/default.nix b/nixpkgs/pkgs/tools/misc/fsql/default.nix
index 4e7db2dc484..4e7db2dc484 100644
--- a/pkgs/tools/misc/fsql/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fsql/default.nix
diff --git a/pkgs/tools/misc/fwup/default.nix b/nixpkgs/pkgs/tools/misc/fwup/default.nix
index 99dcc194d01..99dcc194d01 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fwup/default.nix
diff --git a/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch b/nixpkgs/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch
index b04b436ff5b..b04b436ff5b 100644
--- a/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch
+++ b/nixpkgs/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch
diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/default.nix
index 7965b591afb..7965b591afb 100644
--- a/pkgs/tools/misc/fxlinuxprintutil/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/default.nix
diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch b/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch
index fbf211065e9..fbf211065e9 100644
--- a/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch
+++ b/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch
diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch b/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch
index 972152b2cc3..972152b2cc3 100644
--- a/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch
+++ b/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch
diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch b/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch
index 2bfbab450cb..2bfbab450cb 100644
--- a/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch
+++ b/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch
diff --git a/pkgs/tools/misc/fzf/default.nix b/nixpkgs/pkgs/tools/misc/fzf/default.nix
index 960373e7e5f..960373e7e5f 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fzf/default.nix
diff --git a/pkgs/tools/misc/fzy/default.nix b/nixpkgs/pkgs/tools/misc/fzy/default.nix
index 24daa7fc81f..24daa7fc81f 100644
--- a/pkgs/tools/misc/fzy/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fzy/default.nix
diff --git a/pkgs/tools/misc/gams/default.nix b/nixpkgs/pkgs/tools/misc/gams/default.nix
index ba0b76026a5..ba0b76026a5 100644
--- a/pkgs/tools/misc/gams/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gams/default.nix
diff --git a/pkgs/tools/misc/gawp/default.nix b/nixpkgs/pkgs/tools/misc/gawp/default.nix
index 865ce3c440d..865ce3c440d 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gawp/default.nix
diff --git a/pkgs/tools/misc/gawp/deps.nix b/nixpkgs/pkgs/tools/misc/gawp/deps.nix
index cf577a30354..cf577a30354 100644
--- a/pkgs/tools/misc/gawp/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/gawp/deps.nix
diff --git a/pkgs/tools/misc/gbdfed/Makefile.patch b/nixpkgs/pkgs/tools/misc/gbdfed/Makefile.patch
index 9c437deca07..9c437deca07 100644
--- a/pkgs/tools/misc/gbdfed/Makefile.patch
+++ b/nixpkgs/pkgs/tools/misc/gbdfed/Makefile.patch
diff --git a/pkgs/tools/misc/gbdfed/default.nix b/nixpkgs/pkgs/tools/misc/gbdfed/default.nix
index 9b41dba4e25..9b41dba4e25 100644
--- a/pkgs/tools/misc/gbdfed/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gbdfed/default.nix
diff --git a/pkgs/tools/misc/geekbench/default.nix b/nixpkgs/pkgs/tools/misc/geekbench/default.nix
index b18ac109382..b18ac109382 100644
--- a/pkgs/tools/misc/geekbench/default.nix
+++ b/nixpkgs/pkgs/tools/misc/geekbench/default.nix
diff --git a/pkgs/tools/misc/geteltorito/default.nix b/nixpkgs/pkgs/tools/misc/geteltorito/default.nix
index d6fbb623331..d6fbb623331 100644
--- a/pkgs/tools/misc/geteltorito/default.nix
+++ b/nixpkgs/pkgs/tools/misc/geteltorito/default.nix
diff --git a/pkgs/tools/misc/getopt/default.nix b/nixpkgs/pkgs/tools/misc/getopt/default.nix
index d168c8aaa14..d168c8aaa14 100644
--- a/pkgs/tools/misc/getopt/default.nix
+++ b/nixpkgs/pkgs/tools/misc/getopt/default.nix
diff --git a/pkgs/tools/misc/gh-ost/default.nix b/nixpkgs/pkgs/tools/misc/gh-ost/default.nix
index e5c0997c8e3..e5c0997c8e3 100644
--- a/pkgs/tools/misc/gh-ost/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gh-ost/default.nix
diff --git a/pkgs/tools/misc/gibo/default.nix b/nixpkgs/pkgs/tools/misc/gibo/default.nix
index a8e957ce484..a8e957ce484 100644
--- a/pkgs/tools/misc/gibo/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gibo/default.nix
diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix
index 771fc354da4..771fc354da4 100644
--- a/pkgs/tools/misc/gif-for-cli/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix
diff --git a/pkgs/tools/misc/git-fire/default.nix b/nixpkgs/pkgs/tools/misc/git-fire/default.nix
index 0b5deccaa90..0b5deccaa90 100644
--- a/pkgs/tools/misc/git-fire/default.nix
+++ b/nixpkgs/pkgs/tools/misc/git-fire/default.nix
diff --git a/pkgs/tools/misc/git-town/default.nix b/nixpkgs/pkgs/tools/misc/git-town/default.nix
index 5438f71930d..5438f71930d 100644
--- a/pkgs/tools/misc/git-town/default.nix
+++ b/nixpkgs/pkgs/tools/misc/git-town/default.nix
diff --git a/pkgs/tools/misc/gnokii/default.nix b/nixpkgs/pkgs/tools/misc/gnokii/default.nix
index 581a1f84fc7..581a1f84fc7 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gnokii/default.nix
diff --git a/pkgs/tools/misc/gnuvd/default.nix b/nixpkgs/pkgs/tools/misc/gnuvd/default.nix
index 4da5ec2e5d5..4da5ec2e5d5 100644
--- a/pkgs/tools/misc/gnuvd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gnuvd/default.nix
diff --git a/pkgs/tools/misc/goaccess/default.nix b/nixpkgs/pkgs/tools/misc/goaccess/default.nix
index 0fe9001fcdb..0fe9001fcdb 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/nixpkgs/pkgs/tools/misc/goaccess/default.nix
diff --git a/pkgs/tools/misc/gosu/default.nix b/nixpkgs/pkgs/tools/misc/gosu/default.nix
index bd53529a5d2..bd53529a5d2 100644
--- a/pkgs/tools/misc/gosu/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gosu/default.nix
diff --git a/pkgs/tools/misc/gosu/deps.nix b/nixpkgs/pkgs/tools/misc/gosu/deps.nix
index 9bdfa392340..9bdfa392340 100644
--- a/pkgs/tools/misc/gosu/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/gosu/deps.nix
diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix
index a4b9af09712..a4b9af09712 100644
--- a/pkgs/tools/misc/gotify-cli/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix
diff --git a/pkgs/tools/misc/gparted/default.nix b/nixpkgs/pkgs/tools/misc/gparted/default.nix
index 1884cb3ce31..1884cb3ce31 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gparted/default.nix
diff --git a/pkgs/tools/misc/gparted/polkit.patch b/nixpkgs/pkgs/tools/misc/gparted/polkit.patch
index a42ed785de9..a42ed785de9 100644
--- a/pkgs/tools/misc/gparted/polkit.patch
+++ b/nixpkgs/pkgs/tools/misc/gparted/polkit.patch
diff --git a/pkgs/tools/misc/graylog/default.nix b/nixpkgs/pkgs/tools/misc/graylog/default.nix
index 46812da8954..46812da8954 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/nixpkgs/pkgs/tools/misc/graylog/default.nix
diff --git a/pkgs/tools/misc/graylog/plugins.nix b/nixpkgs/pkgs/tools/misc/graylog/plugins.nix
index e7d32dd4b37..e7d32dd4b37 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/nixpkgs/pkgs/tools/misc/graylog/plugins.nix
diff --git a/pkgs/tools/misc/grc/default.nix b/nixpkgs/pkgs/tools/misc/grc/default.nix
index 828d4e4dab7..828d4e4dab7 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/grc/default.nix
diff --git a/pkgs/tools/misc/gringo/default.nix b/nixpkgs/pkgs/tools/misc/gringo/default.nix
index 705c1a7e1d6..705c1a7e1d6 100644
--- a/pkgs/tools/misc/gringo/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gringo/default.nix
diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/nixpkgs/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch
index 7b5510e2344..7b5510e2344 100644
--- a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch
+++ b/nixpkgs/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch
diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch b/nixpkgs/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch
index b81eab4cd67..b81eab4cd67 100644
--- a/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch
+++ b/nixpkgs/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix
index 3f5485718dc..3f5485718dc 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix
diff --git a/pkgs/tools/misc/grub/buggybios.patch b/nixpkgs/pkgs/tools/misc/grub/buggybios.patch
index 1453a8adaa0..1453a8adaa0 100644
--- a/pkgs/tools/misc/grub/buggybios.patch
+++ b/nixpkgs/pkgs/tools/misc/grub/buggybios.patch
diff --git a/pkgs/tools/misc/grub/default.nix b/nixpkgs/pkgs/tools/misc/grub/default.nix
index 87e9814d899..87e9814d899 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/nixpkgs/pkgs/tools/misc/grub/default.nix
diff --git a/pkgs/tools/misc/grub/fix-bash-completion.patch b/nixpkgs/pkgs/tools/misc/grub/fix-bash-completion.patch
index 97cecdce373..97cecdce373 100644
--- a/pkgs/tools/misc/grub/fix-bash-completion.patch
+++ b/nixpkgs/pkgs/tools/misc/grub/fix-bash-completion.patch
diff --git a/pkgs/tools/misc/grub/grub1.patches.nix b/nixpkgs/pkgs/tools/misc/grub/grub1.patches.nix
index 5ee8722b5ec..5ee8722b5ec 100644
--- a/pkgs/tools/misc/grub/grub1.patches.nix
+++ b/nixpkgs/pkgs/tools/misc/grub/grub1.patches.nix
diff --git a/pkgs/tools/misc/grub/grub1.patches.sh b/nixpkgs/pkgs/tools/misc/grub/grub1.patches.sh
index d3b138ad357..d3b138ad357 100755
--- a/pkgs/tools/misc/grub/grub1.patches.sh
+++ b/nixpkgs/pkgs/tools/misc/grub/grub1.patches.sh
diff --git a/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg b/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg
index e9883149ab5..e9883149ab5 100644
--- a/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg
+++ b/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg
diff --git a/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg b/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg
index 69115b7101c..69115b7101c 100644
--- a/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg
+++ b/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg
diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix
index 6b796dedb0a..6b796dedb0a 100644
--- a/pkgs/tools/misc/grub/pvgrub_image/default.nix
+++ b/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix
diff --git a/pkgs/tools/misc/grub/symlink.patch b/nixpkgs/pkgs/tools/misc/grub/symlink.patch
index ac38be04618..ac38be04618 100644
--- a/pkgs/tools/misc/grub/symlink.patch
+++ b/nixpkgs/pkgs/tools/misc/grub/symlink.patch
diff --git a/pkgs/tools/misc/grub/trusted.nix b/nixpkgs/pkgs/tools/misc/grub/trusted.nix
index 1033a489c76..1033a489c76 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/nixpkgs/pkgs/tools/misc/grub/trusted.nix
diff --git a/pkgs/tools/misc/grub4dos/default.nix b/nixpkgs/pkgs/tools/misc/grub4dos/default.nix
index 2dd8688232f..2dd8688232f 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/nixpkgs/pkgs/tools/misc/grub4dos/default.nix
diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix
index 78a678f0714..78a678f0714 100644
--- a/pkgs/tools/misc/gsmartcontrol/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix
diff --git a/pkgs/tools/misc/gsmartcontrol/fix-paths.patch b/nixpkgs/pkgs/tools/misc/gsmartcontrol/fix-paths.patch
index 905b63bee0c..905b63bee0c 100644
--- a/pkgs/tools/misc/gsmartcontrol/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/misc/gsmartcontrol/fix-paths.patch
diff --git a/pkgs/tools/misc/gti/default.nix b/nixpkgs/pkgs/tools/misc/gti/default.nix
index bca481cade4..bca481cade4 100644
--- a/pkgs/tools/misc/gti/default.nix
+++ b/nixpkgs/pkgs/tools/misc/gti/default.nix
diff --git a/pkgs/tools/misc/h/default.nix b/nixpkgs/pkgs/tools/misc/h/default.nix
index f4897a54cb1..f4897a54cb1 100644
--- a/pkgs/tools/misc/h/default.nix
+++ b/nixpkgs/pkgs/tools/misc/h/default.nix
diff --git a/pkgs/tools/misc/h5utils/default.nix b/nixpkgs/pkgs/tools/misc/h5utils/default.nix
index 9fe26777110..9fe26777110 100644
--- a/pkgs/tools/misc/h5utils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/h5utils/default.nix
diff --git a/pkgs/tools/misc/hackertyper/default.nix b/nixpkgs/pkgs/tools/misc/hackertyper/default.nix
index 4b5973e7eec..4b5973e7eec 100644
--- a/pkgs/tools/misc/hackertyper/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hackertyper/default.nix
diff --git a/pkgs/tools/misc/hakuneko/default.nix b/nixpkgs/pkgs/tools/misc/hakuneko/default.nix
index 34405ccc7be..34405ccc7be 100644
--- a/pkgs/tools/misc/hakuneko/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hakuneko/default.nix
diff --git a/pkgs/tools/misc/hashit/default.nix b/nixpkgs/pkgs/tools/misc/hashit/default.nix
index 9a3ffe93510..9a3ffe93510 100644
--- a/pkgs/tools/misc/hashit/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hashit/default.nix
diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix
index af4d4228c2c..af4d4228c2c 100644
--- a/pkgs/tools/misc/hdaps-gl/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix
diff --git a/pkgs/tools/misc/hddtemp/byteswap.patch b/nixpkgs/pkgs/tools/misc/hddtemp/byteswap.patch
index 7b0dddc2ae4..7b0dddc2ae4 100644
--- a/pkgs/tools/misc/hddtemp/byteswap.patch
+++ b/nixpkgs/pkgs/tools/misc/hddtemp/byteswap.patch
diff --git a/pkgs/tools/misc/hddtemp/default.nix b/nixpkgs/pkgs/tools/misc/hddtemp/default.nix
index 13b69dad971..13b69dad971 100644
--- a/pkgs/tools/misc/hddtemp/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hddtemp/default.nix
diff --git a/pkgs/tools/misc/hddtemp/dontwake.patch b/nixpkgs/pkgs/tools/misc/hddtemp/dontwake.patch
index 969da7a70e4..969da7a70e4 100644
--- a/pkgs/tools/misc/hddtemp/dontwake.patch
+++ b/nixpkgs/pkgs/tools/misc/hddtemp/dontwake.patch
diff --git a/pkgs/tools/misc/hddtemp/execinfo.patch b/nixpkgs/pkgs/tools/misc/hddtemp/execinfo.patch
index 1e7239535d4..1e7239535d4 100644
--- a/pkgs/tools/misc/hddtemp/execinfo.patch
+++ b/nixpkgs/pkgs/tools/misc/hddtemp/execinfo.patch
diff --git a/pkgs/tools/misc/hddtemp/satacmds.patch b/nixpkgs/pkgs/tools/misc/hddtemp/satacmds.patch
index d67e0681f33..d67e0681f33 100644
--- a/pkgs/tools/misc/hddtemp/satacmds.patch
+++ b/nixpkgs/pkgs/tools/misc/hddtemp/satacmds.patch
diff --git a/pkgs/tools/misc/hdf4/default.nix b/nixpkgs/pkgs/tools/misc/hdf4/default.nix
index e765e923474..e765e923474 100644
--- a/pkgs/tools/misc/hdf4/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hdf4/default.nix
diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix
index d27f6fc01bc..d27f6fc01bc 100644
--- a/pkgs/tools/misc/hdf5/1_8.nix
+++ b/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix
diff --git a/pkgs/tools/misc/hdf5/bin-mv.patch b/nixpkgs/pkgs/tools/misc/hdf5/bin-mv.patch
index 45649977e56..45649977e56 100644
--- a/pkgs/tools/misc/hdf5/bin-mv.patch
+++ b/nixpkgs/pkgs/tools/misc/hdf5/bin-mv.patch
diff --git a/pkgs/tools/misc/hdf5/default.nix b/nixpkgs/pkgs/tools/misc/hdf5/default.nix
index 59055e4114a..59055e4114a 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hdf5/default.nix
diff --git a/pkgs/tools/misc/hdfjava/default.nix b/nixpkgs/pkgs/tools/misc/hdfjava/default.nix
index 6087a76e6bd..6087a76e6bd 100644
--- a/pkgs/tools/misc/hdfjava/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hdfjava/default.nix
diff --git a/pkgs/tools/misc/hdfview/default.nix b/nixpkgs/pkgs/tools/misc/hdfview/default.nix
index fb6914c01d0..fb6914c01d0 100644
--- a/pkgs/tools/misc/hdfview/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hdfview/default.nix
diff --git a/pkgs/tools/misc/heatseeker/default.nix b/nixpkgs/pkgs/tools/misc/heatseeker/default.nix
index bf6740d7ee4..bf6740d7ee4 100644
--- a/pkgs/tools/misc/heatseeker/default.nix
+++ b/nixpkgs/pkgs/tools/misc/heatseeker/default.nix
diff --git a/pkgs/tools/misc/hebcal/default.nix b/nixpkgs/pkgs/tools/misc/hebcal/default.nix
index 8b435fcef56..8b435fcef56 100644
--- a/pkgs/tools/misc/hebcal/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hebcal/default.nix
diff --git a/pkgs/tools/misc/heimdall/default.nix b/nixpkgs/pkgs/tools/misc/heimdall/default.nix
index 26396fee507..26396fee507 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/nixpkgs/pkgs/tools/misc/heimdall/default.nix
diff --git a/pkgs/tools/misc/hexd/default.nix b/nixpkgs/pkgs/tools/misc/hexd/default.nix
index eabb7838e8a..eabb7838e8a 100644
--- a/pkgs/tools/misc/hexd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hexd/default.nix
diff --git a/pkgs/tools/misc/hexyl/default.nix b/nixpkgs/pkgs/tools/misc/hexyl/default.nix
index c00e47433c1..c00e47433c1 100644
--- a/pkgs/tools/misc/hexyl/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hexyl/default.nix
diff --git a/pkgs/tools/misc/hhpc/default.nix b/nixpkgs/pkgs/tools/misc/hhpc/default.nix
index 4b1b0d0c762..4b1b0d0c762 100644
--- a/pkgs/tools/misc/hhpc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hhpc/default.nix
diff --git a/pkgs/tools/misc/hid-listen/default.nix b/nixpkgs/pkgs/tools/misc/hid-listen/default.nix
index 6bbe4888d1b..6bbe4888d1b 100644
--- a/pkgs/tools/misc/hid-listen/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hid-listen/default.nix
diff --git a/pkgs/tools/misc/homesick/Gemfile b/nixpkgs/pkgs/tools/misc/homesick/Gemfile
index fb1d6a5584f..fb1d6a5584f 100644
--- a/pkgs/tools/misc/homesick/Gemfile
+++ b/nixpkgs/pkgs/tools/misc/homesick/Gemfile
diff --git a/pkgs/tools/misc/homesick/Gemfile.lock b/nixpkgs/pkgs/tools/misc/homesick/Gemfile.lock
index 42ab916db3e..42ab916db3e 100644
--- a/pkgs/tools/misc/homesick/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/homesick/Gemfile.lock
diff --git a/pkgs/tools/misc/homesick/default.nix b/nixpkgs/pkgs/tools/misc/homesick/default.nix
index 00a9bf85650..00a9bf85650 100644
--- a/pkgs/tools/misc/homesick/default.nix
+++ b/nixpkgs/pkgs/tools/misc/homesick/default.nix
diff --git a/pkgs/tools/misc/homesick/gemset.nix b/nixpkgs/pkgs/tools/misc/homesick/gemset.nix
index f5144827680..f5144827680 100644
--- a/pkgs/tools/misc/homesick/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/homesick/gemset.nix
diff --git a/pkgs/tools/misc/hostsblock/default.nix b/nixpkgs/pkgs/tools/misc/hostsblock/default.nix
index a6ed7bf92ff..a6ed7bf92ff 100644
--- a/pkgs/tools/misc/hostsblock/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hostsblock/default.nix
diff --git a/pkgs/tools/misc/hpl/default.nix b/nixpkgs/pkgs/tools/misc/hpl/default.nix
index 16bc0393f23..16bc0393f23 100644
--- a/pkgs/tools/misc/hpl/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hpl/default.nix
diff --git a/pkgs/tools/misc/html-proofer/Gemfile b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile
index a7c369cc680..a7c369cc680 100644
--- a/pkgs/tools/misc/html-proofer/Gemfile
+++ b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile
diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock
index cab69d41f93..cab69d41f93 100644
--- a/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock
diff --git a/pkgs/tools/misc/html-proofer/default.nix b/nixpkgs/pkgs/tools/misc/html-proofer/default.nix
index 49881f1b0b4..49881f1b0b4 100644
--- a/pkgs/tools/misc/html-proofer/default.nix
+++ b/nixpkgs/pkgs/tools/misc/html-proofer/default.nix
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix
index fbf65a8a0c0..fbf65a8a0c0 100644
--- a/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix
diff --git a/pkgs/tools/misc/hyperfine/default.nix b/nixpkgs/pkgs/tools/misc/hyperfine/default.nix
index 9a27c4df772..9a27c4df772 100644
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hyperfine/default.nix
diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix
index a66923b03f4..a66923b03f4 100644
--- a/pkgs/tools/misc/hyperledger-fabric/default.nix
+++ b/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix
diff --git a/pkgs/tools/misc/i3cat/default.nix b/nixpkgs/pkgs/tools/misc/i3cat/default.nix
index bc934c424f3..bc934c424f3 100644
--- a/pkgs/tools/misc/i3cat/default.nix
+++ b/nixpkgs/pkgs/tools/misc/i3cat/default.nix
diff --git a/pkgs/tools/misc/i3cat/deps.nix b/nixpkgs/pkgs/tools/misc/i3cat/deps.nix
index 01e85cbd824..01e85cbd824 100644
--- a/pkgs/tools/misc/i3cat/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/i3cat/deps.nix
diff --git a/pkgs/tools/misc/i3minator/default.nix b/nixpkgs/pkgs/tools/misc/i3minator/default.nix
index 372eebb59f6..372eebb59f6 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/nixpkgs/pkgs/tools/misc/i3minator/default.nix
diff --git a/pkgs/tools/misc/ical2org/default.nix b/nixpkgs/pkgs/tools/misc/ical2org/default.nix
index 872de2c702b..872de2c702b 100644
--- a/pkgs/tools/misc/ical2org/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ical2org/default.nix
diff --git a/pkgs/tools/misc/ical2org/deps.nix b/nixpkgs/pkgs/tools/misc/ical2org/deps.nix
index b948fac3d11..b948fac3d11 100644
--- a/pkgs/tools/misc/ical2org/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/ical2org/deps.nix
diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix
index 98b039e3f8a..98b039e3f8a 100644
--- a/pkgs/tools/misc/ideviceinstaller/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix
diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix
index ec9d1f52853..ec9d1f52853 100644
--- a/pkgs/tools/misc/idevicerestore/default.nix
+++ b/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix
diff --git a/pkgs/tools/misc/idutils/default.nix b/nixpkgs/pkgs/tools/misc/idutils/default.nix
index 959be2a4eb1..959be2a4eb1 100644
--- a/pkgs/tools/misc/idutils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/idutils/default.nix
diff --git a/pkgs/tools/misc/idutils/nix-mapping.patch b/nixpkgs/pkgs/tools/misc/idutils/nix-mapping.patch
index 6f92ffa07b5..6f92ffa07b5 100644
--- a/pkgs/tools/misc/idutils/nix-mapping.patch
+++ b/nixpkgs/pkgs/tools/misc/idutils/nix-mapping.patch
diff --git a/pkgs/tools/misc/ili2c/default.nix b/nixpkgs/pkgs/tools/misc/ili2c/default.nix
index 4d78f797f10..4d78f797f10 100644
--- a/pkgs/tools/misc/ili2c/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ili2c/default.nix
diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix
index 981d9f2dc6c..981d9f2dc6c 100644
--- a/pkgs/tools/misc/ipad_charge/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix
diff --git a/pkgs/tools/misc/ipxe/default.nix b/nixpkgs/pkgs/tools/misc/ipxe/default.nix
index 6946010b52a..6946010b52a 100644
--- a/pkgs/tools/misc/ipxe/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ipxe/default.nix
diff --git a/pkgs/tools/misc/ised/default.nix b/nixpkgs/pkgs/tools/misc/ised/default.nix
index 3529324b30a..3529324b30a 100644
--- a/pkgs/tools/misc/ised/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ised/default.nix
diff --git a/pkgs/tools/misc/ised/default.upstream b/nixpkgs/pkgs/tools/misc/ised/default.upstream
index 6539bf477e5..6539bf477e5 100644
--- a/pkgs/tools/misc/ised/default.upstream
+++ b/nixpkgs/pkgs/tools/misc/ised/default.upstream
diff --git a/pkgs/tools/misc/ix/default.nix b/nixpkgs/pkgs/tools/misc/ix/default.nix
index cedaa13b74a..cedaa13b74a 100644
--- a/pkgs/tools/misc/ix/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ix/default.nix
diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/nixpkgs/pkgs/tools/misc/jdiskreport/builder.sh
index f95dafedd32..f95dafedd32 100644
--- a/pkgs/tools/misc/jdiskreport/builder.sh
+++ b/nixpkgs/pkgs/tools/misc/jdiskreport/builder.sh
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix
index b1d71a892d6..b1d71a892d6 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix
diff --git a/pkgs/tools/misc/jdupes/default.nix b/nixpkgs/pkgs/tools/misc/jdupes/default.nix
index 109a84de631..109a84de631 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/nixpkgs/pkgs/tools/misc/jdupes/default.nix
diff --git a/pkgs/tools/misc/journaldriver/default.nix b/nixpkgs/pkgs/tools/misc/journaldriver/default.nix
index 56a1dc75a45..56a1dc75a45 100644
--- a/pkgs/tools/misc/journaldriver/default.nix
+++ b/nixpkgs/pkgs/tools/misc/journaldriver/default.nix
diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix
index e3551b8f404..e3551b8f404 100644
--- a/pkgs/tools/misc/kak-lsp/default.nix
+++ b/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix
diff --git a/pkgs/tools/misc/kanshi/default.nix b/nixpkgs/pkgs/tools/misc/kanshi/default.nix
index d3e0ba029f3..d3e0ba029f3 100644
--- a/pkgs/tools/misc/kanshi/default.nix
+++ b/nixpkgs/pkgs/tools/misc/kanshi/default.nix
diff --git a/pkgs/tools/misc/kargo/default.nix b/nixpkgs/pkgs/tools/misc/kargo/default.nix
index 480c0abc728..480c0abc728 100644
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/nixpkgs/pkgs/tools/misc/kargo/default.nix
diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix
index 0fd1c7c5cd7..0fd1c7c5cd7 100644
--- a/pkgs/tools/misc/kdecoration-viewer/default.nix
+++ b/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix
diff --git a/pkgs/tools/misc/kermit/default.nix b/nixpkgs/pkgs/tools/misc/kermit/default.nix
index 9f739da0afa..9f739da0afa 100644
--- a/pkgs/tools/misc/kermit/default.nix
+++ b/nixpkgs/pkgs/tools/misc/kermit/default.nix
diff --git a/pkgs/tools/misc/keychain/default.nix b/nixpkgs/pkgs/tools/misc/keychain/default.nix
index e10b42273be..e10b42273be 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/nixpkgs/pkgs/tools/misc/keychain/default.nix
diff --git a/pkgs/tools/misc/kisslicer/default.nix b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix
index 5e5a7174a14..5e5a7174a14 100644
--- a/pkgs/tools/misc/kisslicer/default.nix
+++ b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix
diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/nixpkgs/pkgs/tools/misc/kodi-cli/default.nix
index d2fb32319bf..d2fb32319bf 100644
--- a/pkgs/tools/misc/kodi-cli/default.nix
+++ b/nixpkgs/pkgs/tools/misc/kodi-cli/default.nix
diff --git a/pkgs/tools/misc/kronometer/default.nix b/nixpkgs/pkgs/tools/misc/kronometer/default.nix
index 632001f6329..632001f6329 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/nixpkgs/pkgs/tools/misc/kronometer/default.nix
diff --git a/pkgs/tools/misc/kt/default.nix b/nixpkgs/pkgs/tools/misc/kt/default.nix
index c272584e2c0..c272584e2c0 100644
--- a/pkgs/tools/misc/kt/default.nix
+++ b/nixpkgs/pkgs/tools/misc/kt/default.nix
diff --git a/pkgs/tools/misc/latex2html/default.nix b/nixpkgs/pkgs/tools/misc/latex2html/default.nix
index 59f52c5cf6f..59f52c5cf6f 100644
--- a/pkgs/tools/misc/latex2html/default.nix
+++ b/nixpkgs/pkgs/tools/misc/latex2html/default.nix
diff --git a/pkgs/tools/misc/lazydocker/default.nix b/nixpkgs/pkgs/tools/misc/lazydocker/default.nix
index 96c13010fac..96c13010fac 100644
--- a/pkgs/tools/misc/lazydocker/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lazydocker/default.nix
diff --git a/pkgs/tools/misc/lbdb/add-methods-to-rc.patch b/nixpkgs/pkgs/tools/misc/lbdb/add-methods-to-rc.patch
index d388467559a..d388467559a 100644
--- a/pkgs/tools/misc/lbdb/add-methods-to-rc.patch
+++ b/nixpkgs/pkgs/tools/misc/lbdb/add-methods-to-rc.patch
diff --git a/pkgs/tools/misc/lbdb/default.nix b/nixpkgs/pkgs/tools/misc/lbdb/default.nix
index 6624eb5102d..6624eb5102d 100644
--- a/pkgs/tools/misc/lbdb/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lbdb/default.nix
diff --git a/pkgs/tools/misc/lcdf-typetools/default.nix b/nixpkgs/pkgs/tools/misc/lcdf-typetools/default.nix
index 44f6768fd3b..44f6768fd3b 100644
--- a/pkgs/tools/misc/lcdf-typetools/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lcdf-typetools/default.nix
diff --git a/pkgs/tools/misc/ldapvi/default.nix b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix
index 3d2b7c5b214..3d2b7c5b214 100644
--- a/pkgs/tools/misc/ldapvi/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix
diff --git a/pkgs/tools/misc/ldmtool/default.nix b/nixpkgs/pkgs/tools/misc/ldmtool/default.nix
index 2ec68348495..2ec68348495 100644
--- a/pkgs/tools/misc/ldmtool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ldmtool/default.nix
diff --git a/pkgs/tools/misc/less/default.nix b/nixpkgs/pkgs/tools/misc/less/default.nix
index e98b085c78d..e98b085c78d 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/nixpkgs/pkgs/tools/misc/less/default.nix
diff --git a/pkgs/tools/misc/lesspipe/default.nix b/nixpkgs/pkgs/tools/misc/lesspipe/default.nix
index bb99521cc27..bb99521cc27 100644
--- a/pkgs/tools/misc/lesspipe/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lesspipe/default.nix
diff --git a/pkgs/tools/misc/lesspipe/fix-paths.patch b/nixpkgs/pkgs/tools/misc/lesspipe/fix-paths.patch
index 1bffcf53c82..1bffcf53c82 100644
--- a/pkgs/tools/misc/lesspipe/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/misc/lesspipe/fix-paths.patch
diff --git a/pkgs/tools/misc/lf/default.nix b/nixpkgs/pkgs/tools/misc/lf/default.nix
index c2f281ecb17..c2f281ecb17 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lf/default.nix
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
index eb3b6aa11e6..eb3b6aa11e6 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
+++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
index d0395ecbd7f..d0395ecbd7f 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
+++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix
index cb9e2cbf1e8..cb9e2cbf1e8 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix
+++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
index 2c13927dfad..2c13927dfad 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
+++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix
index 8009fe563ee..8009fe563ee 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix
+++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix
diff --git a/pkgs/tools/misc/libcpuid/default.nix b/nixpkgs/pkgs/tools/misc/libcpuid/default.nix
index e31112a74d8..e31112a74d8 100644
--- a/pkgs/tools/misc/libcpuid/default.nix
+++ b/nixpkgs/pkgs/tools/misc/libcpuid/default.nix
diff --git a/pkgs/tools/misc/libcpuid/stdint.patch b/nixpkgs/pkgs/tools/misc/libcpuid/stdint.patch
index beb8890c5a2..beb8890c5a2 100644
--- a/pkgs/tools/misc/libcpuid/stdint.patch
+++ b/nixpkgs/pkgs/tools/misc/libcpuid/stdint.patch
diff --git a/pkgs/tools/misc/lice/default.nix b/nixpkgs/pkgs/tools/misc/lice/default.nix
index bb0f93ba328..bb0f93ba328 100644
--- a/pkgs/tools/misc/lice/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lice/default.nix
diff --git a/pkgs/tools/misc/licensor/default.nix b/nixpkgs/pkgs/tools/misc/licensor/default.nix
index 0913b9afbf5..0913b9afbf5 100644
--- a/pkgs/tools/misc/licensor/default.nix
+++ b/nixpkgs/pkgs/tools/misc/licensor/default.nix
diff --git a/pkgs/tools/misc/linuxquota/default.nix b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix
index 9bc7c372d93..9bc7c372d93 100644
--- a/pkgs/tools/misc/linuxquota/default.nix
+++ b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix
diff --git a/pkgs/tools/misc/lnav/default.nix b/nixpkgs/pkgs/tools/misc/lnav/default.nix
index 90560d32157..90560d32157 100644
--- a/pkgs/tools/misc/lnav/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lnav/default.nix
diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix
index bc52598ff80..bc52598ff80 100644
--- a/pkgs/tools/misc/loadlibrary/default.nix
+++ b/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix
diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix
index e851855834a..e851855834a 100644
--- a/pkgs/tools/misc/lockfile-progs/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix
diff --git a/pkgs/tools/misc/logstash/6.x.nix b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix
index c926d220b05..c926d220b05 100644
--- a/pkgs/tools/misc/logstash/6.x.nix
+++ b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix
diff --git a/pkgs/tools/misc/logstash/7.x.nix b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix
index 1bd30733765..1bd30733765 100644
--- a/pkgs/tools/misc/logstash/7.x.nix
+++ b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix
diff --git a/pkgs/tools/misc/logstash/contrib.nix b/nixpkgs/pkgs/tools/misc/logstash/contrib.nix
index b580d559868..b580d559868 100644
--- a/pkgs/tools/misc/logstash/contrib.nix
+++ b/nixpkgs/pkgs/tools/misc/logstash/contrib.nix
diff --git a/pkgs/tools/misc/lolcat/Gemfile b/nixpkgs/pkgs/tools/misc/lolcat/Gemfile
index ea1216e2405..ea1216e2405 100644
--- a/pkgs/tools/misc/lolcat/Gemfile
+++ b/nixpkgs/pkgs/tools/misc/lolcat/Gemfile
diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock
index ed48cc5921b..ed48cc5921b 100644
--- a/pkgs/tools/misc/lolcat/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock
diff --git a/pkgs/tools/misc/lolcat/default.nix b/nixpkgs/pkgs/tools/misc/lolcat/default.nix
index 25efcdf3461..25efcdf3461 100644
--- a/pkgs/tools/misc/lolcat/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lolcat/default.nix
diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix
index 2c2bc9cead1..2c2bc9cead1 100644
--- a/pkgs/tools/misc/lolcat/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix
diff --git a/pkgs/tools/misc/loop/default.nix b/nixpkgs/pkgs/tools/misc/loop/default.nix
index ef7a3e3ada4..ef7a3e3ada4 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/nixpkgs/pkgs/tools/misc/loop/default.nix
diff --git a/pkgs/tools/misc/lorri/default.nix b/nixpkgs/pkgs/tools/misc/lorri/default.nix
index ea0bbe3dfe2..ea0bbe3dfe2 100644
--- a/pkgs/tools/misc/lorri/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lorri/default.nix
diff --git a/pkgs/tools/misc/lorri/runtime-closure.nix.template b/nixpkgs/pkgs/tools/misc/lorri/runtime-closure.nix.template
index 2cb2ec4bbb9..2cb2ec4bbb9 100644
--- a/pkgs/tools/misc/lorri/runtime-closure.nix.template
+++ b/nixpkgs/pkgs/tools/misc/lorri/runtime-closure.nix.template
diff --git a/pkgs/tools/misc/lorri/runtime.nix b/nixpkgs/pkgs/tools/misc/lorri/runtime.nix
index 96b14b26e82..96b14b26e82 100644
--- a/pkgs/tools/misc/lorri/runtime.nix
+++ b/nixpkgs/pkgs/tools/misc/lorri/runtime.nix
diff --git a/pkgs/tools/misc/lrzsz/default.nix b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix
index 11351790bec..11351790bec 100644
--- a/pkgs/tools/misc/lrzsz/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix
diff --git a/pkgs/tools/misc/lsd/default.nix b/nixpkgs/pkgs/tools/misc/lsd/default.nix
index 9b7ff7fd600..9b7ff7fd600 100644
--- a/pkgs/tools/misc/lsd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/lsd/default.nix
diff --git a/pkgs/tools/misc/ltunify/default.nix b/nixpkgs/pkgs/tools/misc/ltunify/default.nix
index 84a92ec7712..84a92ec7712 100644
--- a/pkgs/tools/misc/ltunify/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ltunify/default.nix
diff --git a/pkgs/tools/misc/makebootfat/default.nix b/nixpkgs/pkgs/tools/misc/makebootfat/default.nix
index e23e12bcb30..e23e12bcb30 100644
--- a/pkgs/tools/misc/makebootfat/default.nix
+++ b/nixpkgs/pkgs/tools/misc/makebootfat/default.nix
diff --git a/pkgs/tools/misc/man-db/default.nix b/nixpkgs/pkgs/tools/misc/man-db/default.nix
index 918e8372dcb..918e8372dcb 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/nixpkgs/pkgs/tools/misc/man-db/default.nix
diff --git a/pkgs/tools/misc/mandoc/default.nix b/nixpkgs/pkgs/tools/misc/mandoc/default.nix
index 828e2358236..828e2358236 100644
--- a/pkgs/tools/misc/mandoc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mandoc/default.nix
diff --git a/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch b/nixpkgs/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch
index 580226d165b..580226d165b 100644
--- a/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch
+++ b/nixpkgs/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch
diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix
index c7222f696c9..c7222f696c9 100644
--- a/pkgs/tools/misc/marlin-calc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix
diff --git a/pkgs/tools/misc/massren/default.nix b/nixpkgs/pkgs/tools/misc/massren/default.nix
index 6d198a35605..6d198a35605 100644
--- a/pkgs/tools/misc/massren/default.nix
+++ b/nixpkgs/pkgs/tools/misc/massren/default.nix
diff --git a/pkgs/tools/misc/mbuffer/default.nix b/nixpkgs/pkgs/tools/misc/mbuffer/default.nix
index 7edfb280e43..7edfb280e43 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mbuffer/default.nix
diff --git a/pkgs/tools/misc/mc/default.nix b/nixpkgs/pkgs/tools/misc/mc/default.nix
index 168afc7efed..168afc7efed 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mc/default.nix
diff --git a/pkgs/tools/misc/mcfly/default.nix b/nixpkgs/pkgs/tools/misc/mcfly/default.nix
index 7d85e709f73..7d85e709f73 100644
--- a/pkgs/tools/misc/mcfly/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mcfly/default.nix
diff --git a/pkgs/tools/misc/mcrypt/default.nix b/nixpkgs/pkgs/tools/misc/mcrypt/default.nix
index bc520c57a33..bc520c57a33 100644
--- a/pkgs/tools/misc/mcrypt/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mcrypt/default.nix
diff --git a/pkgs/tools/misc/mcrypt/format-string.patch b/nixpkgs/pkgs/tools/misc/mcrypt/format-string.patch
index 322ab473811..322ab473811 100644
--- a/pkgs/tools/misc/mcrypt/format-string.patch
+++ b/nixpkgs/pkgs/tools/misc/mcrypt/format-string.patch
diff --git a/pkgs/tools/misc/mcrypt/overflow.patch b/nixpkgs/pkgs/tools/misc/mcrypt/overflow.patch
index bf747a58266..bf747a58266 100644
--- a/pkgs/tools/misc/mcrypt/overflow.patch
+++ b/nixpkgs/pkgs/tools/misc/mcrypt/overflow.patch
diff --git a/pkgs/tools/misc/mcrypt/segv.patch b/nixpkgs/pkgs/tools/misc/mcrypt/segv.patch
index 6796163418f..6796163418f 100644
--- a/pkgs/tools/misc/mcrypt/segv.patch
+++ b/nixpkgs/pkgs/tools/misc/mcrypt/segv.patch
diff --git a/pkgs/tools/misc/mcrypt/sprintf.patch b/nixpkgs/pkgs/tools/misc/mcrypt/sprintf.patch
index 1c9ade80777..1c9ade80777 100644
--- a/pkgs/tools/misc/mcrypt/sprintf.patch
+++ b/nixpkgs/pkgs/tools/misc/mcrypt/sprintf.patch
diff --git a/pkgs/tools/misc/mdbtools/default.nix b/nixpkgs/pkgs/tools/misc/mdbtools/default.nix
index b365086c46d..b365086c46d 100644
--- a/pkgs/tools/misc/mdbtools/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mdbtools/default.nix
diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix
index d224ad1dcc5..d224ad1dcc5 100644
--- a/pkgs/tools/misc/me_cleaner/default.nix
+++ b/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix
diff --git a/pkgs/tools/misc/megacli/default.nix b/nixpkgs/pkgs/tools/misc/megacli/default.nix
index e202cc7ae46..e202cc7ae46 100644
--- a/pkgs/tools/misc/megacli/default.nix
+++ b/nixpkgs/pkgs/tools/misc/megacli/default.nix
diff --git a/pkgs/tools/misc/memtest86+/default.nix b/nixpkgs/pkgs/tools/misc/memtest86+/default.nix
index 57cf5bb97e2..57cf5bb97e2 100644
--- a/pkgs/tools/misc/memtest86+/default.nix
+++ b/nixpkgs/pkgs/tools/misc/memtest86+/default.nix
diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix
index 71409b1c3a8..71409b1c3a8 100644
--- a/pkgs/tools/misc/memtest86-efi/default.nix
+++ b/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix
diff --git a/pkgs/tools/misc/mht2htm/default.nix b/nixpkgs/pkgs/tools/misc/mht2htm/default.nix
index e382db0b92c..e382db0b92c 100644
--- a/pkgs/tools/misc/mht2htm/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mht2htm/default.nix
diff --git a/pkgs/tools/misc/mimeo/default.nix b/nixpkgs/pkgs/tools/misc/mimeo/default.nix
index ea596a94213..ea596a94213 100644
--- a/pkgs/tools/misc/mimeo/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mimeo/default.nix
diff --git a/pkgs/tools/misc/minicom/default.nix b/nixpkgs/pkgs/tools/misc/minicom/default.nix
index 168e1dac3a3..168e1dac3a3 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/nixpkgs/pkgs/tools/misc/minicom/default.nix
diff --git a/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch b/nixpkgs/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch
index 18535253d9f..18535253d9f 100644
--- a/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch
+++ b/nixpkgs/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch
diff --git a/pkgs/tools/misc/miniserve/default.nix b/nixpkgs/pkgs/tools/misc/miniserve/default.nix
index 09640b30be9..09640b30be9 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/nixpkgs/pkgs/tools/misc/miniserve/default.nix
diff --git a/pkgs/tools/misc/ministat/default.nix b/nixpkgs/pkgs/tools/misc/ministat/default.nix
index 7b8b8a82b72..7b8b8a82b72 100644
--- a/pkgs/tools/misc/ministat/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ministat/default.nix
diff --git a/pkgs/tools/misc/mktorrent/default.nix b/nixpkgs/pkgs/tools/misc/mktorrent/default.nix
index c88f12c74d1..c88f12c74d1 100644
--- a/pkgs/tools/misc/mktorrent/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mktorrent/default.nix
diff --git a/pkgs/tools/misc/mlocate/default.nix b/nixpkgs/pkgs/tools/misc/mlocate/default.nix
index f8fb253af47..f8fb253af47 100644
--- a/pkgs/tools/misc/mlocate/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mlocate/default.nix
diff --git a/pkgs/tools/misc/mmake/default.nix b/nixpkgs/pkgs/tools/misc/mmake/default.nix
index a791cbe5d48..a791cbe5d48 100644
--- a/pkgs/tools/misc/mmake/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mmake/default.nix
diff --git a/pkgs/tools/misc/mmake/deps.nix b/nixpkgs/pkgs/tools/misc/mmake/deps.nix
index 0721ad0af60..0721ad0af60 100644
--- a/pkgs/tools/misc/mmake/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/mmake/deps.nix
diff --git a/pkgs/tools/misc/mmv/default.nix b/nixpkgs/pkgs/tools/misc/mmv/default.nix
index 6129f15c734..6129f15c734 100644
--- a/pkgs/tools/misc/mmv/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mmv/default.nix
diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix
index 95c87cb35fc..95c87cb35fc 100644
--- a/pkgs/tools/misc/mongodb-compass/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix
index dbccbf9b2f6..dbccbf9b2f6 100644
--- a/pkgs/tools/misc/mongodb-tools/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix
diff --git a/pkgs/tools/misc/moreutils/default.nix b/nixpkgs/pkgs/tools/misc/moreutils/default.nix
index 44f791e5b8a..44f791e5b8a 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/moreutils/default.nix
diff --git a/pkgs/tools/misc/most/default.nix b/nixpkgs/pkgs/tools/misc/most/default.nix
index 7adac5ee2ee..7adac5ee2ee 100644
--- a/pkgs/tools/misc/most/default.nix
+++ b/nixpkgs/pkgs/tools/misc/most/default.nix
diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix
index df84084fc9c..df84084fc9c 100644
--- a/pkgs/tools/misc/mpdscribble/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix
diff --git a/pkgs/tools/misc/mprime/default.nix b/nixpkgs/pkgs/tools/misc/mprime/default.nix
index 363e90ab5f2..363e90ab5f2 100644
--- a/pkgs/tools/misc/mprime/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mprime/default.nix
diff --git a/pkgs/tools/misc/mprime/makefile.patch b/nixpkgs/pkgs/tools/misc/mprime/makefile.patch
index 6ed9cf69384..6ed9cf69384 100644
--- a/pkgs/tools/misc/mprime/makefile.patch
+++ b/nixpkgs/pkgs/tools/misc/mprime/makefile.patch
diff --git a/pkgs/tools/misc/mrtg/default.nix b/nixpkgs/pkgs/tools/misc/mrtg/default.nix
index 922592a256d..922592a256d 100644
--- a/pkgs/tools/misc/mrtg/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mrtg/default.nix
diff --git a/pkgs/tools/misc/ms-sys/default.nix b/nixpkgs/pkgs/tools/misc/ms-sys/default.nix
index 0a862834dfb..0a862834dfb 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ms-sys/default.nix
diff --git a/pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch b/nixpkgs/pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch
index 7b031cb34f1..7b031cb34f1 100644
--- a/pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch
+++ b/nixpkgs/pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch
diff --git a/pkgs/tools/misc/mstflint/default.nix b/nixpkgs/pkgs/tools/misc/mstflint/default.nix
index f3cd1c6e527..f3cd1c6e527 100644
--- a/pkgs/tools/misc/mstflint/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mstflint/default.nix
diff --git a/pkgs/tools/misc/mtm/default.nix b/nixpkgs/pkgs/tools/misc/mtm/default.nix
index 5b45c0b712b..5b45c0b712b 100644
--- a/pkgs/tools/misc/mtm/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mtm/default.nix
diff --git a/pkgs/tools/misc/multitail/default.nix b/nixpkgs/pkgs/tools/misc/multitail/default.nix
index 6ca0c6e8e08..6ca0c6e8e08 100644
--- a/pkgs/tools/misc/multitail/default.nix
+++ b/nixpkgs/pkgs/tools/misc/multitail/default.nix
diff --git a/pkgs/tools/misc/multitime/default.nix b/nixpkgs/pkgs/tools/misc/multitime/default.nix
index a46ee2b7c9c..a46ee2b7c9c 100644
--- a/pkgs/tools/misc/multitime/default.nix
+++ b/nixpkgs/pkgs/tools/misc/multitime/default.nix
diff --git a/pkgs/tools/misc/mutagen/default.nix b/nixpkgs/pkgs/tools/misc/mutagen/default.nix
index 3c355dbddf3..3c355dbddf3 100644
--- a/pkgs/tools/misc/mutagen/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mutagen/default.nix
diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix
index 83e6ee5b5ca..83e6ee5b5ca 100644
--- a/pkgs/tools/misc/mysql2pgsql/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix
diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix
index 9b7453ad1cc..9b7453ad1cc 100644
--- a/pkgs/tools/misc/mysqltuner/default.nix
+++ b/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix
diff --git a/pkgs/tools/misc/nagstamon/default.nix b/nixpkgs/pkgs/tools/misc/nagstamon/default.nix
index 525c16b6024..525c16b6024 100644
--- a/pkgs/tools/misc/nagstamon/default.nix
+++ b/nixpkgs/pkgs/tools/misc/nagstamon/default.nix
diff --git a/pkgs/tools/misc/nbench/default.nix b/nixpkgs/pkgs/tools/misc/nbench/default.nix
index a1a6347642b..a1a6347642b 100644
--- a/pkgs/tools/misc/nbench/default.nix
+++ b/nixpkgs/pkgs/tools/misc/nbench/default.nix
diff --git a/pkgs/tools/misc/ncdu/default.nix b/nixpkgs/pkgs/tools/misc/ncdu/default.nix
index d29626c99d1..d29626c99d1 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ncdu/default.nix
diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix
index 128d582e32e..128d582e32e 100644
--- a/pkgs/tools/misc/neo-cowsay/default.nix
+++ b/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix
diff --git a/pkgs/tools/misc/neofetch/default.nix b/nixpkgs/pkgs/tools/misc/neofetch/default.nix
index 5850c4a90af..5850c4a90af 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/nixpkgs/pkgs/tools/misc/neofetch/default.nix
diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix
index db60010490e..db60010490e 100644
--- a/pkgs/tools/misc/nginx-config-formatter/default.nix
+++ b/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix
diff --git a/pkgs/tools/misc/nms/default.nix b/nixpkgs/pkgs/tools/misc/nms/default.nix
index 0005ffe824b..0005ffe824b 100644
--- a/pkgs/tools/misc/nms/default.nix
+++ b/nixpkgs/pkgs/tools/misc/nms/default.nix
diff --git a/pkgs/tools/misc/noteshrink/default.nix b/nixpkgs/pkgs/tools/misc/noteshrink/default.nix
index b197e9bc5d2..b197e9bc5d2 100644
--- a/pkgs/tools/misc/noteshrink/default.nix
+++ b/nixpkgs/pkgs/tools/misc/noteshrink/default.nix
diff --git a/pkgs/tools/misc/noti/default.nix b/nixpkgs/pkgs/tools/misc/noti/default.nix
index a6288b32295..a6288b32295 100644
--- a/pkgs/tools/misc/noti/default.nix
+++ b/nixpkgs/pkgs/tools/misc/noti/default.nix
diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix
index 61aa2c41c4f..61aa2c41c4f 100644
--- a/pkgs/tools/misc/notify-desktop/default.nix
+++ b/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix
diff --git a/pkgs/tools/misc/ntfy/default.nix b/nixpkgs/pkgs/tools/misc/ntfy/default.nix
index 26517361ae2..26517361ae2 100644
--- a/pkgs/tools/misc/ntfy/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ntfy/default.nix
diff --git a/pkgs/tools/misc/nyancat/default.nix b/nixpkgs/pkgs/tools/misc/nyancat/default.nix
index 47a91915c43..47a91915c43 100644
--- a/pkgs/tools/misc/nyancat/default.nix
+++ b/nixpkgs/pkgs/tools/misc/nyancat/default.nix
diff --git a/pkgs/tools/misc/oci-image-tool/default.nix b/nixpkgs/pkgs/tools/misc/oci-image-tool/default.nix
index 3b45b7b0644..3b45b7b0644 100644
--- a/pkgs/tools/misc/oci-image-tool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/oci-image-tool/default.nix
diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix
index d54302b31d1..d54302b31d1 100644
--- a/pkgs/tools/misc/ocz-ssd-guru/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix
diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/nixpkgs/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
index 3896ca77a16..3896ca77a16 100644
--- a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
+++ b/nixpkgs/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
diff --git a/pkgs/tools/misc/odyssey/default.nix b/nixpkgs/pkgs/tools/misc/odyssey/default.nix
index 160474f8152..160474f8152 100644
--- a/pkgs/tools/misc/odyssey/default.nix
+++ b/nixpkgs/pkgs/tools/misc/odyssey/default.nix
diff --git a/pkgs/tools/misc/onefetch/default.nix b/nixpkgs/pkgs/tools/misc/onefetch/default.nix
index e51a00dc7bd..e51a00dc7bd 100644
--- a/pkgs/tools/misc/onefetch/default.nix
+++ b/nixpkgs/pkgs/tools/misc/onefetch/default.nix
diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/nixpkgs/pkgs/tools/misc/opentimestamps-client/default.nix
index 94984c57e49..94984c57e49 100644
--- a/pkgs/tools/misc/opentimestamps-client/default.nix
+++ b/nixpkgs/pkgs/tools/misc/opentimestamps-client/default.nix
diff --git a/pkgs/tools/misc/opentsdb/default.nix b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix
index 2a0846dd511..2a0846dd511 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix
diff --git a/pkgs/tools/misc/oppai-ng/default.nix b/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix
index 46b2fd444ec..46b2fd444ec 100644
--- a/pkgs/tools/misc/oppai-ng/default.nix
+++ b/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix
diff --git a/pkgs/tools/misc/os-prober/default.nix b/nixpkgs/pkgs/tools/misc/os-prober/default.nix
index d68ed9c5cd3..d68ed9c5cd3 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/nixpkgs/pkgs/tools/misc/os-prober/default.nix
diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix
index 0b7a7826a97..0b7a7826a97 100644
--- a/pkgs/tools/misc/osinfo-db-tools/default.nix
+++ b/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix
diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix
index 8905f9eb36a..8905f9eb36a 100644
--- a/pkgs/tools/misc/osm2pgsql/default.nix
+++ b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix
diff --git a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch b/nixpkgs/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch
index 9c334436162..9c334436162 100644
--- a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch
+++ b/nixpkgs/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch
diff --git a/pkgs/tools/misc/ostree/default.nix b/nixpkgs/pkgs/tools/misc/ostree/default.nix
index 8ec9fc1d488..8ec9fc1d488 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ostree/default.nix
diff --git a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch b/nixpkgs/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch
index 8da2fb82dd0..8da2fb82dd0 100644
--- a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch
+++ b/nixpkgs/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch
diff --git a/pkgs/tools/misc/ostree/fix-1592.patch b/nixpkgs/pkgs/tools/misc/ostree/fix-1592.patch
index 1eccd74bfa7..1eccd74bfa7 100644
--- a/pkgs/tools/misc/ostree/fix-1592.patch
+++ b/nixpkgs/pkgs/tools/misc/ostree/fix-1592.patch
diff --git a/pkgs/tools/misc/otfcc/default.nix b/nixpkgs/pkgs/tools/misc/otfcc/default.nix
index 4b28a7c45e5..4b28a7c45e5 100644
--- a/pkgs/tools/misc/otfcc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/otfcc/default.nix
diff --git a/pkgs/tools/misc/pal/default.nix b/nixpkgs/pkgs/tools/misc/pal/default.nix
index 85bad70edc9..85bad70edc9 100644
--- a/pkgs/tools/misc/pal/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pal/default.nix
diff --git a/pkgs/tools/misc/pandoc-imagine/default.nix b/nixpkgs/pkgs/tools/misc/pandoc-imagine/default.nix
index 811e44a6ce8..811e44a6ce8 100644
--- a/pkgs/tools/misc/pandoc-imagine/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pandoc-imagine/default.nix
diff --git a/pkgs/tools/misc/paps/default.nix b/nixpkgs/pkgs/tools/misc/paps/default.nix
index 8084f49f1b3..8084f49f1b3 100644
--- a/pkgs/tools/misc/paps/default.nix
+++ b/nixpkgs/pkgs/tools/misc/paps/default.nix
diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/nixpkgs/pkgs/tools/misc/parallel-rust/default.nix
index c77ca56655a..c77ca56655a 100644
--- a/pkgs/tools/misc/parallel-rust/default.nix
+++ b/nixpkgs/pkgs/tools/misc/parallel-rust/default.nix
diff --git a/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch b/nixpkgs/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch
index 75a1ba35e12..75a1ba35e12 100644
--- a/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch
+++ b/nixpkgs/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch
diff --git a/pkgs/tools/misc/parallel/default.nix b/nixpkgs/pkgs/tools/misc/parallel/default.nix
index d1a786b3b91..d1a786b3b91 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/nixpkgs/pkgs/tools/misc/parallel/default.nix
diff --git a/pkgs/tools/misc/parcellite/default.nix b/nixpkgs/pkgs/tools/misc/parcellite/default.nix
index 46606e3b43b..46606e3b43b 100644
--- a/pkgs/tools/misc/parcellite/default.nix
+++ b/nixpkgs/pkgs/tools/misc/parcellite/default.nix
diff --git a/pkgs/tools/misc/parted/default.nix b/nixpkgs/pkgs/tools/misc/parted/default.nix
index 0eed491e8a9..0eed491e8a9 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/nixpkgs/pkgs/tools/misc/parted/default.nix
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/nixpkgs/pkgs/tools/misc/partition-manager/default.nix
index ab3c4b5a6c4..ab3c4b5a6c4 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/nixpkgs/pkgs/tools/misc/partition-manager/default.nix
diff --git a/pkgs/tools/misc/pastebinit/default.nix b/nixpkgs/pkgs/tools/misc/pastebinit/default.nix
index c2c8e2b8573..c2c8e2b8573 100644
--- a/pkgs/tools/misc/pastebinit/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pastebinit/default.nix
diff --git a/pkgs/tools/misc/patdiff/default.nix b/nixpkgs/pkgs/tools/misc/patdiff/default.nix
index 1c5e5b04474..1c5e5b04474 100644
--- a/pkgs/tools/misc/patdiff/default.nix
+++ b/nixpkgs/pkgs/tools/misc/patdiff/default.nix
diff --git a/pkgs/tools/misc/pazi/default.nix b/nixpkgs/pkgs/tools/misc/pazi/default.nix
index d3df890385f..d3df890385f 100644
--- a/pkgs/tools/misc/pazi/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pazi/default.nix
diff --git a/pkgs/tools/misc/pb_cli/default.nix b/nixpkgs/pkgs/tools/misc/pb_cli/default.nix
index 858422b8532..858422b8532 100644
--- a/pkgs/tools/misc/pb_cli/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pb_cli/default.nix
diff --git a/pkgs/tools/misc/pdd/default.nix b/nixpkgs/pkgs/tools/misc/pdd/default.nix
index f94d2cc2737..f94d2cc2737 100644
--- a/pkgs/tools/misc/pdd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pdd/default.nix
diff --git a/pkgs/tools/misc/peruse/default.nix b/nixpkgs/pkgs/tools/misc/peruse/default.nix
index a5ce018545a..a5ce018545a 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/nixpkgs/pkgs/tools/misc/peruse/default.nix
diff --git a/pkgs/tools/misc/pfetch/default.nix b/nixpkgs/pkgs/tools/misc/pfetch/default.nix
index a858ad696af..a858ad696af 100644
--- a/pkgs/tools/misc/pfetch/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pfetch/default.nix
diff --git a/pkgs/tools/misc/pg_flame/default.nix b/nixpkgs/pkgs/tools/misc/pg_flame/default.nix
index fbeba0ff1bd..fbeba0ff1bd 100644
--- a/pkgs/tools/misc/pg_flame/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pg_flame/default.nix
diff --git a/pkgs/tools/misc/pg_top/default.nix b/nixpkgs/pkgs/tools/misc/pg_top/default.nix
index 4f4bd7e754c..4f4bd7e754c 100644
--- a/pkgs/tools/misc/pg_top/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pg_top/default.nix
diff --git a/pkgs/tools/misc/pgcenter/default.nix b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix
index 7cb810b2fe2..7cb810b2fe2 100644
--- a/pkgs/tools/misc/pgcenter/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix
diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix
index bfacb713567..bfacb713567 100644
--- a/pkgs/tools/misc/pgmetrics/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix
diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix
index bdb86cbb802..bdb86cbb802 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix
diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix
index dd07fee3405..dd07fee3405 100644
--- a/pkgs/tools/misc/phraseapp-client/default.nix
+++ b/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix
diff --git a/pkgs/tools/misc/pick/default.nix b/nixpkgs/pkgs/tools/misc/pick/default.nix
index ceb2bace7db..ceb2bace7db 100644
--- a/pkgs/tools/misc/pick/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pick/default.nix
diff --git a/pkgs/tools/misc/picocom/default.nix b/nixpkgs/pkgs/tools/misc/picocom/default.nix
index 1ad21940368..1ad21940368 100644
--- a/pkgs/tools/misc/picocom/default.nix
+++ b/nixpkgs/pkgs/tools/misc/picocom/default.nix
diff --git a/pkgs/tools/misc/pipelight/default.nix b/nixpkgs/pkgs/tools/misc/pipelight/default.nix
index 4c7e9d0892c..4c7e9d0892c 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pipelight/default.nix
diff --git a/pkgs/tools/misc/pipelight/pipelight.patch b/nixpkgs/pkgs/tools/misc/pipelight/pipelight.patch
index fc6666f8f12..fc6666f8f12 100644
--- a/pkgs/tools/misc/pipelight/pipelight.patch
+++ b/nixpkgs/pkgs/tools/misc/pipelight/pipelight.patch
diff --git a/pkgs/tools/misc/pipreqs/default.nix b/nixpkgs/pkgs/tools/misc/pipreqs/default.nix
index 9925021b3f6..9925021b3f6 100644
--- a/pkgs/tools/misc/pipreqs/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pipreqs/default.nix
diff --git a/pkgs/tools/misc/pixd/default.nix b/nixpkgs/pkgs/tools/misc/pixd/default.nix
index a16333f6e44..a16333f6e44 100644
--- a/pkgs/tools/misc/pixd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pixd/default.nix
diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix
index c1db4f9d597..c1db4f9d597 100644
--- a/pkgs/tools/misc/pk2cmd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix
diff --git a/pkgs/tools/misc/pkgdiff/default.nix b/nixpkgs/pkgs/tools/misc/pkgdiff/default.nix
index 3c9c0f9bfaf..3c9c0f9bfaf 100644
--- a/pkgs/tools/misc/pkgdiff/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pkgdiff/default.nix
diff --git a/pkgs/tools/misc/plantuml/default.nix b/nixpkgs/pkgs/tools/misc/plantuml/default.nix
index b42be5b548c..b42be5b548c 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/nixpkgs/pkgs/tools/misc/plantuml/default.nix
diff --git a/pkgs/tools/misc/plotinus/default.nix b/nixpkgs/pkgs/tools/misc/plotinus/default.nix
index 58a6c7c4071..58a6c7c4071 100644
--- a/pkgs/tools/misc/plotinus/default.nix
+++ b/nixpkgs/pkgs/tools/misc/plotinus/default.nix
diff --git a/pkgs/tools/misc/plowshare/default.nix b/nixpkgs/pkgs/tools/misc/plowshare/default.nix
index 1d3e8c6c33d..1d3e8c6c33d 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/nixpkgs/pkgs/tools/misc/plowshare/default.nix
diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/nixpkgs/pkgs/tools/misc/pod2mdoc/default.nix
index 5712e02e8ea..5712e02e8ea 100644
--- a/pkgs/tools/misc/pod2mdoc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pod2mdoc/default.nix
diff --git a/pkgs/tools/misc/ponysay/default.nix b/nixpkgs/pkgs/tools/misc/ponysay/default.nix
index 3fc3efa0eda..3fc3efa0eda 100644
--- a/pkgs/tools/misc/ponysay/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ponysay/default.nix
diff --git a/pkgs/tools/misc/powerline-go/default.nix b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix
index 47336e54d67..47336e54d67 100644
--- a/pkgs/tools/misc/powerline-go/default.nix
+++ b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix
diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix
index 309ccf8070b..309ccf8070b 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix
diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix
index 0c9d3a0ea79..0c9d3a0ea79 100644
--- a/pkgs/tools/misc/profile-cleaner/default.nix
+++ b/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix
index c1496e0dbc9..c1496e0dbc9 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix
diff --git a/pkgs/tools/misc/progress/default.nix b/nixpkgs/pkgs/tools/misc/progress/default.nix
index 3edca413f3a..3edca413f3a 100644
--- a/pkgs/tools/misc/progress/default.nix
+++ b/nixpkgs/pkgs/tools/misc/progress/default.nix
diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix
index 335bddd6730..335bddd6730 100644
--- a/pkgs/tools/misc/proxytunnel/default.nix
+++ b/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix
diff --git a/pkgs/tools/misc/pspg/default.nix b/nixpkgs/pkgs/tools/misc/pspg/default.nix
index 4cf98ef8b48..4cf98ef8b48 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pspg/default.nix
diff --git a/pkgs/tools/misc/psrecord/default.nix b/nixpkgs/pkgs/tools/misc/psrecord/default.nix
index 7df2b47497f..7df2b47497f 100644
--- a/pkgs/tools/misc/psrecord/default.nix
+++ b/nixpkgs/pkgs/tools/misc/psrecord/default.nix
diff --git a/pkgs/tools/misc/pubs/default.nix b/nixpkgs/pkgs/tools/misc/pubs/default.nix
index 4e840957ce3..4e840957ce3 100644
--- a/pkgs/tools/misc/pubs/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pubs/default.nix
diff --git a/pkgs/tools/misc/pv/default.nix b/nixpkgs/pkgs/tools/misc/pv/default.nix
index 3642653944b..3642653944b 100644
--- a/pkgs/tools/misc/pv/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pv/default.nix
diff --git a/pkgs/tools/misc/pws/Gemfile b/nixpkgs/pkgs/tools/misc/pws/Gemfile
index 43b6b931860..43b6b931860 100644
--- a/pkgs/tools/misc/pws/Gemfile
+++ b/nixpkgs/pkgs/tools/misc/pws/Gemfile
diff --git a/pkgs/tools/misc/pws/Gemfile.lock b/nixpkgs/pkgs/tools/misc/pws/Gemfile.lock
index c9cf6a3157c..c9cf6a3157c 100644
--- a/pkgs/tools/misc/pws/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/pws/Gemfile.lock
diff --git a/pkgs/tools/misc/pws/default.nix b/nixpkgs/pkgs/tools/misc/pws/default.nix
index 50952435dd7..50952435dd7 100644
--- a/pkgs/tools/misc/pws/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pws/default.nix
diff --git a/pkgs/tools/misc/pws/gemset.nix b/nixpkgs/pkgs/tools/misc/pws/gemset.nix
index 2aa26f9a020..2aa26f9a020 100644
--- a/pkgs/tools/misc/pws/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/pws/gemset.nix
diff --git a/pkgs/tools/misc/q-text-as-data/default.nix b/nixpkgs/pkgs/tools/misc/q-text-as-data/default.nix
index e70b8274d36..e70b8274d36 100644
--- a/pkgs/tools/misc/q-text-as-data/default.nix
+++ b/nixpkgs/pkgs/tools/misc/q-text-as-data/default.nix
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/nixpkgs/pkgs/tools/misc/qjoypad/default.nix
index 3e7e3870959..3e7e3870959 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/nixpkgs/pkgs/tools/misc/qjoypad/default.nix
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/nixpkgs/pkgs/tools/misc/qt5ct/default.nix
index d7598b0c6dd..d7598b0c6dd 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/nixpkgs/pkgs/tools/misc/qt5ct/default.nix
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix
index 90498767c99..90498767c99 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix
diff --git a/pkgs/tools/misc/rcm/default.nix b/nixpkgs/pkgs/tools/misc/rcm/default.nix
index 3d97874df7d..3d97874df7d 100644
--- a/pkgs/tools/misc/rcm/default.nix
+++ b/nixpkgs/pkgs/tools/misc/rcm/default.nix
diff --git a/pkgs/tools/misc/rcm/fix-rcmlib-path.patch b/nixpkgs/pkgs/tools/misc/rcm/fix-rcmlib-path.patch
index e7d600d2a1f..e7d600d2a1f 100644
--- a/pkgs/tools/misc/rcm/fix-rcmlib-path.patch
+++ b/nixpkgs/pkgs/tools/misc/rcm/fix-rcmlib-path.patch
diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix
index 88aff4f3c08..88aff4f3c08 100644
--- a/pkgs/tools/misc/recoverjpeg/default.nix
+++ b/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix
diff --git a/pkgs/tools/misc/recutils/default.nix b/nixpkgs/pkgs/tools/misc/recutils/default.nix
index 8d648e293c5..8d648e293c5 100644
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/recutils/default.nix
diff --git a/pkgs/tools/misc/remind/default.nix b/nixpkgs/pkgs/tools/misc/remind/default.nix
index 91d8e472130..91d8e472130 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/nixpkgs/pkgs/tools/misc/remind/default.nix
diff --git a/pkgs/tools/misc/rename/default.nix b/nixpkgs/pkgs/tools/misc/rename/default.nix
index e32b016016b..e32b016016b 100644
--- a/pkgs/tools/misc/rename/default.nix
+++ b/nixpkgs/pkgs/tools/misc/rename/default.nix
diff --git a/pkgs/tools/misc/renameutils/default.nix b/nixpkgs/pkgs/tools/misc/renameutils/default.nix
index b5e5d64dda6..b5e5d64dda6 100644
--- a/pkgs/tools/misc/renameutils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/renameutils/default.nix
diff --git a/pkgs/tools/misc/renameutils/install-exec.patch b/nixpkgs/pkgs/tools/misc/renameutils/install-exec.patch
index 32b8de5adb8..32b8de5adb8 100644
--- a/pkgs/tools/misc/renameutils/install-exec.patch
+++ b/nixpkgs/pkgs/tools/misc/renameutils/install-exec.patch
diff --git a/pkgs/tools/misc/reredirect/default.nix b/nixpkgs/pkgs/tools/misc/reredirect/default.nix
index 15045d4bd8a..15045d4bd8a 100644
--- a/pkgs/tools/misc/reredirect/default.nix
+++ b/nixpkgs/pkgs/tools/misc/reredirect/default.nix
diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix
index d52910b5a84..d52910b5a84 100644
--- a/pkgs/tools/misc/riemann-c-client/default.nix
+++ b/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix
diff --git a/pkgs/tools/misc/riemann-tools/Gemfile b/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile
index b2e34d5120e..b2e34d5120e 100644
--- a/pkgs/tools/misc/riemann-tools/Gemfile
+++ b/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile
diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock
index 881b8aefcdf..881b8aefcdf 100644
--- a/pkgs/tools/misc/riemann-tools/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock
diff --git a/pkgs/tools/misc/riemann-tools/default.nix b/nixpkgs/pkgs/tools/misc/riemann-tools/default.nix
index a9977aefd66..a9977aefd66 100644
--- a/pkgs/tools/misc/riemann-tools/default.nix
+++ b/nixpkgs/pkgs/tools/misc/riemann-tools/default.nix
diff --git a/pkgs/tools/misc/riemann-tools/gemset.nix b/nixpkgs/pkgs/tools/misc/riemann-tools/gemset.nix
index e775de987d6..e775de987d6 100644
--- a/pkgs/tools/misc/riemann-tools/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/riemann-tools/gemset.nix
diff --git a/pkgs/tools/misc/rig/default.nix b/nixpkgs/pkgs/tools/misc/rig/default.nix
index 627758e9c5e..627758e9c5e 100644
--- a/pkgs/tools/misc/rig/default.nix
+++ b/nixpkgs/pkgs/tools/misc/rig/default.nix
diff --git a/pkgs/tools/misc/rig/rig_1.11-1.diff b/nixpkgs/pkgs/tools/misc/rig/rig_1.11-1.diff
index 301cf78b5a9..301cf78b5a9 100644
--- a/pkgs/tools/misc/rig/rig_1.11-1.diff
+++ b/nixpkgs/pkgs/tools/misc/rig/rig_1.11-1.diff
diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix
index fb55b15bbd5..fb55b15bbd5 100644
--- a/pkgs/tools/misc/rkflashtool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix
diff --git a/pkgs/tools/misc/rlwrap/default.nix b/nixpkgs/pkgs/tools/misc/rlwrap/default.nix
index 96df0707153..96df0707153 100644
--- a/pkgs/tools/misc/rlwrap/default.nix
+++ b/nixpkgs/pkgs/tools/misc/rlwrap/default.nix
diff --git a/pkgs/tools/misc/rmlint/default.nix b/nixpkgs/pkgs/tools/misc/rmlint/default.nix
index 408660bf3d9..408660bf3d9 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/nixpkgs/pkgs/tools/misc/rmlint/default.nix
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix
index 232949b7dac..232949b7dac 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix
diff --git a/pkgs/tools/misc/roundup/default.nix b/nixpkgs/pkgs/tools/misc/roundup/default.nix
index 7eebc194300..7eebc194300 100644
--- a/pkgs/tools/misc/roundup/default.nix
+++ b/nixpkgs/pkgs/tools/misc/roundup/default.nix
diff --git a/pkgs/tools/misc/routino/default.nix b/nixpkgs/pkgs/tools/misc/routino/default.nix
index d946ed91c72..d946ed91c72 100644
--- a/pkgs/tools/misc/routino/default.nix
+++ b/nixpkgs/pkgs/tools/misc/routino/default.nix
diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix
index 09f2150cdce..09f2150cdce 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix
diff --git a/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch b/nixpkgs/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch
index b82ad5b24b5..b82ad5b24b5 100644
--- a/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch
+++ b/nixpkgs/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch
diff --git a/pkgs/tools/misc/rrdtool/default.nix b/nixpkgs/pkgs/tools/misc/rrdtool/default.nix
index 8365a47830a..8365a47830a 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/rrdtool/default.nix
diff --git a/pkgs/tools/misc/rw/default.nix b/nixpkgs/pkgs/tools/misc/rw/default.nix
index b6e53e46536..b6e53e46536 100644
--- a/pkgs/tools/misc/rw/default.nix
+++ b/nixpkgs/pkgs/tools/misc/rw/default.nix
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix
index 18813531033..18813531033 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix
diff --git a/pkgs/tools/misc/sam-ba/default.nix b/nixpkgs/pkgs/tools/misc/sam-ba/default.nix
index acab41e8ff5..acab41e8ff5 100644
--- a/pkgs/tools/misc/sam-ba/default.nix
+++ b/nixpkgs/pkgs/tools/misc/sam-ba/default.nix
diff --git a/pkgs/tools/misc/scanmem/default.nix b/nixpkgs/pkgs/tools/misc/scanmem/default.nix
index 65b7b47256a..65b7b47256a 100644
--- a/pkgs/tools/misc/scanmem/default.nix
+++ b/nixpkgs/pkgs/tools/misc/scanmem/default.nix
diff --git a/pkgs/tools/misc/scfbuild/default.nix b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix
index 7fbe13fd44e..7fbe13fd44e 100644
--- a/pkgs/tools/misc/scfbuild/default.nix
+++ b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix
diff --git a/pkgs/tools/misc/scfbuild/python-3.patch b/nixpkgs/pkgs/tools/misc/scfbuild/python-3.patch
index 5a0178ad8c8..5a0178ad8c8 100644
--- a/pkgs/tools/misc/scfbuild/python-3.patch
+++ b/nixpkgs/pkgs/tools/misc/scfbuild/python-3.patch
diff --git a/pkgs/tools/misc/screen/default.nix b/nixpkgs/pkgs/tools/misc/screen/default.nix
index bb02c286c4d..bb02c286c4d 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/nixpkgs/pkgs/tools/misc/screen/default.nix
diff --git a/pkgs/tools/misc/screenfetch/default.nix b/nixpkgs/pkgs/tools/misc/screenfetch/default.nix
index d01a3a877f2..d01a3a877f2 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/nixpkgs/pkgs/tools/misc/screenfetch/default.nix
diff --git a/pkgs/tools/misc/sdate/default.nix b/nixpkgs/pkgs/tools/misc/sdate/default.nix
index 742b25601c0..742b25601c0 100644
--- a/pkgs/tools/misc/sdate/default.nix
+++ b/nixpkgs/pkgs/tools/misc/sdate/default.nix
diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix
index 0be5b8d1379..0be5b8d1379 100644
--- a/pkgs/tools/misc/sdl-jstest/default.nix
+++ b/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix
diff --git a/pkgs/tools/misc/shadowenv/default.nix b/nixpkgs/pkgs/tools/misc/shadowenv/default.nix
index faa4220200c..faa4220200c 100644
--- a/pkgs/tools/misc/shadowenv/default.nix
+++ b/nixpkgs/pkgs/tools/misc/shadowenv/default.nix
diff --git a/pkgs/tools/misc/shallot/default.nix b/nixpkgs/pkgs/tools/misc/shallot/default.nix
index ced15038b0c..ced15038b0c 100644
--- a/pkgs/tools/misc/shallot/default.nix
+++ b/nixpkgs/pkgs/tools/misc/shallot/default.nix
diff --git a/pkgs/tools/misc/shell-hist/default.nix b/nixpkgs/pkgs/tools/misc/shell-hist/default.nix
index b44cbf100e8..b44cbf100e8 100644
--- a/pkgs/tools/misc/shell-hist/default.nix
+++ b/nixpkgs/pkgs/tools/misc/shell-hist/default.nix
diff --git a/pkgs/tools/misc/shelldap/default.nix b/nixpkgs/pkgs/tools/misc/shelldap/default.nix
index 89257c8ffc4..89257c8ffc4 100644
--- a/pkgs/tools/misc/shelldap/default.nix
+++ b/nixpkgs/pkgs/tools/misc/shelldap/default.nix
diff --git a/pkgs/tools/misc/shunit2/default.nix b/nixpkgs/pkgs/tools/misc/shunit2/default.nix
index acfbd48c606..acfbd48c606 100644
--- a/pkgs/tools/misc/shunit2/default.nix
+++ b/nixpkgs/pkgs/tools/misc/shunit2/default.nix
diff --git a/pkgs/tools/misc/sixpair/default.nix b/nixpkgs/pkgs/tools/misc/sixpair/default.nix
index 055fa9418a9..055fa9418a9 100644
--- a/pkgs/tools/misc/sixpair/default.nix
+++ b/nixpkgs/pkgs/tools/misc/sixpair/default.nix
diff --git a/pkgs/tools/misc/sixpair/hcitool.patch b/nixpkgs/pkgs/tools/misc/sixpair/hcitool.patch
index b66e791dd0e..b66e791dd0e 100644
--- a/pkgs/tools/misc/sixpair/hcitool.patch
+++ b/nixpkgs/pkgs/tools/misc/sixpair/hcitool.patch
diff --git a/pkgs/tools/misc/skim/default.nix b/nixpkgs/pkgs/tools/misc/skim/default.nix
index 0c8e2da36df..0c8e2da36df 100644
--- a/pkgs/tools/misc/skim/default.nix
+++ b/nixpkgs/pkgs/tools/misc/skim/default.nix
diff --git a/pkgs/tools/misc/sl/default.nix b/nixpkgs/pkgs/tools/misc/sl/default.nix
index 4ef91f6c55a..4ef91f6c55a 100644
--- a/pkgs/tools/misc/sl/default.nix
+++ b/nixpkgs/pkgs/tools/misc/sl/default.nix
diff --git a/pkgs/tools/misc/slop/default.nix b/nixpkgs/pkgs/tools/misc/slop/default.nix
index 335a687dbc2..335a687dbc2 100644
--- a/pkgs/tools/misc/slop/default.nix
+++ b/nixpkgs/pkgs/tools/misc/slop/default.nix
diff --git a/pkgs/tools/misc/slsnif/default.nix b/nixpkgs/pkgs/tools/misc/slsnif/default.nix
index 72363de7653..72363de7653 100644
--- a/pkgs/tools/misc/slsnif/default.nix
+++ b/nixpkgs/pkgs/tools/misc/slsnif/default.nix
diff --git a/pkgs/tools/misc/slurp/default.nix b/nixpkgs/pkgs/tools/misc/slurp/default.nix
index bc0e86f1b51..bc0e86f1b51 100644
--- a/pkgs/tools/misc/slurp/default.nix
+++ b/nixpkgs/pkgs/tools/misc/slurp/default.nix
diff --git a/pkgs/tools/misc/smc/default.nix b/nixpkgs/pkgs/tools/misc/smc/default.nix
index f442df399d9..f442df399d9 100644
--- a/pkgs/tools/misc/smc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/smc/default.nix
diff --git a/pkgs/tools/misc/smenu/default.nix b/nixpkgs/pkgs/tools/misc/smenu/default.nix
index c6661ee62e4..c6661ee62e4 100644
--- a/pkgs/tools/misc/smenu/default.nix
+++ b/nixpkgs/pkgs/tools/misc/smenu/default.nix
diff --git a/pkgs/tools/misc/snapper/default.nix b/nixpkgs/pkgs/tools/misc/snapper/default.nix
index 283503f2878..283503f2878 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/nixpkgs/pkgs/tools/misc/snapper/default.nix
diff --git a/pkgs/tools/misc/snore/default.nix b/nixpkgs/pkgs/tools/misc/snore/default.nix
index f6f177811b0..f6f177811b0 100644
--- a/pkgs/tools/misc/snore/default.nix
+++ b/nixpkgs/pkgs/tools/misc/snore/default.nix
diff --git a/pkgs/tools/misc/sonota/default.nix b/nixpkgs/pkgs/tools/misc/sonota/default.nix
index d111e0b2b71..d111e0b2b71 100644
--- a/pkgs/tools/misc/sonota/default.nix
+++ b/nixpkgs/pkgs/tools/misc/sonota/default.nix
diff --git a/pkgs/tools/misc/sonota/set_resource_path.patch b/nixpkgs/pkgs/tools/misc/sonota/set_resource_path.patch
index f9a80265776..f9a80265776 100644
--- a/pkgs/tools/misc/sonota/set_resource_path.patch
+++ b/nixpkgs/pkgs/tools/misc/sonota/set_resource_path.patch
diff --git a/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix
index 9c9a4450ee8..9c9a4450ee8 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/nixpkgs/pkgs/tools/misc/starship/default.nix
diff --git a/pkgs/tools/misc/staruml/default.nix b/nixpkgs/pkgs/tools/misc/staruml/default.nix
index e4e1adf2001..e4e1adf2001 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/nixpkgs/pkgs/tools/misc/staruml/default.nix
diff --git a/pkgs/tools/misc/stow/default.nix b/nixpkgs/pkgs/tools/misc/stow/default.nix
index d5eecff7278..d5eecff7278 100644
--- a/pkgs/tools/misc/stow/default.nix
+++ b/nixpkgs/pkgs/tools/misc/stow/default.nix
diff --git a/pkgs/tools/misc/subberthehut/default.nix b/nixpkgs/pkgs/tools/misc/subberthehut/default.nix
index e54dc3b3f2b..e54dc3b3f2b 100644
--- a/pkgs/tools/misc/subberthehut/default.nix
+++ b/nixpkgs/pkgs/tools/misc/subberthehut/default.nix
diff --git a/pkgs/tools/misc/sutils/default.nix b/nixpkgs/pkgs/tools/misc/sutils/default.nix
index 8d42d2d823f..8d42d2d823f 100644
--- a/pkgs/tools/misc/sutils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/sutils/default.nix
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix
index 66ed0a11fd9..66ed0a11fd9 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix
diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix
index 0d1ebd70041..0d1ebd70041 100644
--- a/pkgs/tools/misc/sweep-visualizer/default.nix
+++ b/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix
index e9ee91de677..e9ee91de677 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix
diff --git a/pkgs/tools/misc/system-config-printer/detect_serverbindir.patch b/nixpkgs/pkgs/tools/misc/system-config-printer/detect_serverbindir.patch
index 2cd3058f233..2cd3058f233 100644
--- a/pkgs/tools/misc/system-config-printer/detect_serverbindir.patch
+++ b/nixpkgs/pkgs/tools/misc/system-config-printer/detect_serverbindir.patch
diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix
index dd48156d456..dd48156d456 100644
--- a/pkgs/tools/misc/systrayhelper/default.nix
+++ b/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix
diff --git a/pkgs/tools/misc/systrayhelper/deps.nix b/nixpkgs/pkgs/tools/misc/systrayhelper/deps.nix
index 93c984337e6..93c984337e6 100644
--- a/pkgs/tools/misc/systrayhelper/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/systrayhelper/deps.nix
diff --git a/pkgs/tools/misc/t/Gemfile b/nixpkgs/pkgs/tools/misc/t/Gemfile
index 29813d30ba6..29813d30ba6 100644
--- a/pkgs/tools/misc/t/Gemfile
+++ b/nixpkgs/pkgs/tools/misc/t/Gemfile
diff --git a/pkgs/tools/misc/t/Gemfile.lock b/nixpkgs/pkgs/tools/misc/t/Gemfile.lock
index 0aa9ef4e6da..0aa9ef4e6da 100644
--- a/pkgs/tools/misc/t/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/t/Gemfile.lock
diff --git a/pkgs/tools/misc/t/default.nix b/nixpkgs/pkgs/tools/misc/t/default.nix
index aa34b98bbe2..aa34b98bbe2 100644
--- a/pkgs/tools/misc/t/default.nix
+++ b/nixpkgs/pkgs/tools/misc/t/default.nix
diff --git a/pkgs/tools/misc/t/gemset.nix b/nixpkgs/pkgs/tools/misc/t/gemset.nix
index f3627e8d6e9..f3627e8d6e9 100644
--- a/pkgs/tools/misc/t/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/t/gemset.nix
diff --git a/pkgs/tools/misc/t1utils/default.nix b/nixpkgs/pkgs/tools/misc/t1utils/default.nix
index 03926b95538..03926b95538 100644
--- a/pkgs/tools/misc/t1utils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/t1utils/default.nix
diff --git a/pkgs/tools/misc/td/Gemfile b/nixpkgs/pkgs/tools/misc/td/Gemfile
index d22bf73732c..d22bf73732c 100644
--- a/pkgs/tools/misc/td/Gemfile
+++ b/nixpkgs/pkgs/tools/misc/td/Gemfile
diff --git a/pkgs/tools/misc/td/Gemfile.lock b/nixpkgs/pkgs/tools/misc/td/Gemfile.lock
index 5726611b9af..5726611b9af 100644
--- a/pkgs/tools/misc/td/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/td/Gemfile.lock
diff --git a/pkgs/tools/misc/td/default.nix b/nixpkgs/pkgs/tools/misc/td/default.nix
index 437bdb0373f..437bdb0373f 100644
--- a/pkgs/tools/misc/td/default.nix
+++ b/nixpkgs/pkgs/tools/misc/td/default.nix
diff --git a/pkgs/tools/misc/td/gemset.nix b/nixpkgs/pkgs/tools/misc/td/gemset.nix
index e4680640ae2..e4680640ae2 100644
--- a/pkgs/tools/misc/td/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/td/gemset.nix
diff --git a/pkgs/tools/misc/tealdeer/default.nix b/nixpkgs/pkgs/tools/misc/tealdeer/default.nix
index 547cb2d1075..547cb2d1075 100644
--- a/pkgs/tools/misc/tealdeer/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tealdeer/default.nix
diff --git a/pkgs/tools/misc/teamocil/Gemfile b/nixpkgs/pkgs/tools/misc/teamocil/Gemfile
index 046ba3d536e..046ba3d536e 100644
--- a/pkgs/tools/misc/teamocil/Gemfile
+++ b/nixpkgs/pkgs/tools/misc/teamocil/Gemfile
diff --git a/pkgs/tools/misc/teamocil/Gemfile.lock b/nixpkgs/pkgs/tools/misc/teamocil/Gemfile.lock
index 419c2ae49d3..419c2ae49d3 100644
--- a/pkgs/tools/misc/teamocil/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/teamocil/Gemfile.lock
diff --git a/pkgs/tools/misc/teamocil/default.nix b/nixpkgs/pkgs/tools/misc/teamocil/default.nix
index a5e356edbf4..a5e356edbf4 100644
--- a/pkgs/tools/misc/teamocil/default.nix
+++ b/nixpkgs/pkgs/tools/misc/teamocil/default.nix
diff --git a/pkgs/tools/misc/teamocil/gemset.nix b/nixpkgs/pkgs/tools/misc/teamocil/gemset.nix
index f363d62b6d6..f363d62b6d6 100644
--- a/pkgs/tools/misc/teamocil/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/teamocil/gemset.nix
diff --git a/pkgs/tools/misc/teleconsole/default.nix b/nixpkgs/pkgs/tools/misc/teleconsole/default.nix
index b8e984e90c4..b8e984e90c4 100644
--- a/pkgs/tools/misc/teleconsole/default.nix
+++ b/nixpkgs/pkgs/tools/misc/teleconsole/default.nix
diff --git a/pkgs/tools/misc/teleconsole/deps.nix b/nixpkgs/pkgs/tools/misc/teleconsole/deps.nix
index f13529d4b25..f13529d4b25 100644
--- a/pkgs/tools/misc/teleconsole/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/teleconsole/deps.nix
diff --git a/pkgs/tools/misc/tensorman/default.nix b/nixpkgs/pkgs/tools/misc/tensorman/default.nix
index 97912b3c5fa..97912b3c5fa 100644
--- a/pkgs/tools/misc/tensorman/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tensorman/default.nix
diff --git a/pkgs/tools/misc/termplay/default.nix b/nixpkgs/pkgs/tools/misc/termplay/default.nix
index dd045f1cfac..dd045f1cfac 100644
--- a/pkgs/tools/misc/termplay/default.nix
+++ b/nixpkgs/pkgs/tools/misc/termplay/default.nix
diff --git a/pkgs/tools/misc/termtosvg/default.nix b/nixpkgs/pkgs/tools/misc/termtosvg/default.nix
index 93b52ad175e..93b52ad175e 100644
--- a/pkgs/tools/misc/termtosvg/default.nix
+++ b/nixpkgs/pkgs/tools/misc/termtosvg/default.nix
diff --git a/pkgs/tools/misc/tewisay/default.nix b/nixpkgs/pkgs/tools/misc/tewisay/default.nix
index d875b098ab5..d875b098ab5 100644
--- a/pkgs/tools/misc/tewisay/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tewisay/default.nix
diff --git a/pkgs/tools/misc/tewisay/deps.nix b/nixpkgs/pkgs/tools/misc/tewisay/deps.nix
index b6b1356dcf8..b6b1356dcf8 100644
--- a/pkgs/tools/misc/tewisay/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/tewisay/deps.nix
diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/nixpkgs/pkgs/tools/misc/texi2mdoc/default.nix
index abc25db2fa7..abc25db2fa7 100644
--- a/pkgs/tools/misc/texi2mdoc/default.nix
+++ b/nixpkgs/pkgs/tools/misc/texi2mdoc/default.nix
diff --git a/pkgs/tools/misc/thefuck/default.nix b/nixpkgs/pkgs/tools/misc/thefuck/default.nix
index 4ac9b32b355..4ac9b32b355 100644
--- a/pkgs/tools/misc/thefuck/default.nix
+++ b/nixpkgs/pkgs/tools/misc/thefuck/default.nix
diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 0739435084d..0739435084d 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix
diff --git a/pkgs/tools/misc/time/default.nix b/nixpkgs/pkgs/tools/misc/time/default.nix
index bb6276f7065..bb6276f7065 100644
--- a/pkgs/tools/misc/time/default.nix
+++ b/nixpkgs/pkgs/tools/misc/time/default.nix
diff --git a/pkgs/tools/misc/timidity/default.nix b/nixpkgs/pkgs/tools/misc/timidity/default.nix
index c307c96199f..c307c96199f 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/nixpkgs/pkgs/tools/misc/timidity/default.nix
diff --git a/pkgs/tools/misc/timidity/timidity.cfg b/nixpkgs/pkgs/tools/misc/timidity/timidity.cfg
index fa07eb43eee..fa07eb43eee 100644
--- a/pkgs/tools/misc/timidity/timidity.cfg
+++ b/nixpkgs/pkgs/tools/misc/timidity/timidity.cfg
diff --git a/pkgs/tools/misc/tio/default.nix b/nixpkgs/pkgs/tools/misc/tio/default.nix
index 9ee9b977ab2..9ee9b977ab2 100644
--- a/pkgs/tools/misc/tio/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tio/default.nix
diff --git a/pkgs/tools/misc/tldr/default.nix b/nixpkgs/pkgs/tools/misc/tldr/default.nix
index d4ff9d8c844..d4ff9d8c844 100644
--- a/pkgs/tools/misc/tldr/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tldr/default.nix
diff --git a/pkgs/tools/misc/tlp/default.nix b/nixpkgs/pkgs/tools/misc/tlp/default.nix
index e5932d9e946..e5932d9e946 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tlp/default.nix
diff --git a/pkgs/tools/misc/tmate/default.nix b/nixpkgs/pkgs/tools/misc/tmate/default.nix
index 86ab2492877..86ab2492877 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tmate/default.nix
diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix
index 006cef6f102..006cef6f102 100644
--- a/pkgs/tools/misc/tmpwatch/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix
diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix
index f54cd2756eb..f54cd2756eb 100644
--- a/pkgs/tools/misc/tmux-cssh/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix
diff --git a/pkgs/tools/misc/tmux-xpanes/default.nix b/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix
index 3ea5f758050..3ea5f758050 100644
--- a/pkgs/tools/misc/tmux-xpanes/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix
diff --git a/pkgs/tools/misc/tmux/default.nix b/nixpkgs/pkgs/tools/misc/tmux/default.nix
index 1aa221bd59e..1aa221bd59e 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tmux/default.nix
diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix
index b7c9150e12d..b7c9150e12d 100644
--- a/pkgs/tools/misc/tmuxinator/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix
diff --git a/pkgs/tools/misc/tmuxp/default.nix b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix
index 9ffa89f5919..9ffa89f5919 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix
diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix
index e2d263817ee..e2d263817ee 100644
--- a/pkgs/tools/misc/togglesg-download/default.nix
+++ b/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix
diff --git a/pkgs/tools/misc/toilet/default.nix b/nixpkgs/pkgs/tools/misc/toilet/default.nix
index abc6933a777..abc6933a777 100644
--- a/pkgs/tools/misc/toilet/default.nix
+++ b/nixpkgs/pkgs/tools/misc/toilet/default.nix
diff --git a/pkgs/tools/misc/topgrade/default.nix b/nixpkgs/pkgs/tools/misc/topgrade/default.nix
index 17d11d7e48a..17d11d7e48a 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/nixpkgs/pkgs/tools/misc/topgrade/default.nix
diff --git a/pkgs/tools/misc/toybox/default.nix b/nixpkgs/pkgs/tools/misc/toybox/default.nix
index b863786145c..b863786145c 100644
--- a/pkgs/tools/misc/toybox/default.nix
+++ b/nixpkgs/pkgs/tools/misc/toybox/default.nix
diff --git a/pkgs/tools/misc/trac/default.nix b/nixpkgs/pkgs/tools/misc/trac/default.nix
index 39bbf6850eb..39bbf6850eb 100644
--- a/pkgs/tools/misc/trac/default.nix
+++ b/nixpkgs/pkgs/tools/misc/trac/default.nix
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
index ac8feaef275..ac8feaef275 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
diff --git a/pkgs/tools/misc/trash-cli/nix-paths.patch b/nixpkgs/pkgs/tools/misc/trash-cli/nix-paths.patch
index d7b485eec15..d7b485eec15 100644
--- a/pkgs/tools/misc/trash-cli/nix-paths.patch
+++ b/nixpkgs/pkgs/tools/misc/trash-cli/nix-paths.patch
diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix
index 7142d346336..7142d346336 100644
--- a/pkgs/tools/misc/ttf2pt1/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix
diff --git a/pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch b/nixpkgs/pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch
index 84854606131..84854606131 100644
--- a/pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch
+++ b/nixpkgs/pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch
diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix
index f82917239e6..f82917239e6 100644
--- a/pkgs/tools/misc/ttfautohint/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix
diff --git a/pkgs/tools/misc/ttmkfdir/cstring.patch b/nixpkgs/pkgs/tools/misc/ttmkfdir/cstring.patch
index e1da347c64f..e1da347c64f 100644
--- a/pkgs/tools/misc/ttmkfdir/cstring.patch
+++ b/nixpkgs/pkgs/tools/misc/ttmkfdir/cstring.patch
diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix
index 4a2ab0d3475..4a2ab0d3475 100644
--- a/pkgs/tools/misc/ttmkfdir/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix
diff --git a/pkgs/tools/misc/ttwatch/default.nix b/nixpkgs/pkgs/tools/misc/ttwatch/default.nix
index 5a2d1aaa427..5a2d1aaa427 100644
--- a/pkgs/tools/misc/ttwatch/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ttwatch/default.nix
diff --git a/pkgs/tools/misc/tty-clock/default.nix b/nixpkgs/pkgs/tools/misc/tty-clock/default.nix
index b261f0ef841..b261f0ef841 100644
--- a/pkgs/tools/misc/tty-clock/default.nix
+++ b/nixpkgs/pkgs/tools/misc/tty-clock/default.nix
diff --git a/pkgs/tools/misc/ttygif/default.nix b/nixpkgs/pkgs/tools/misc/ttygif/default.nix
index 2fbd4360698..2fbd4360698 100644
--- a/pkgs/tools/misc/ttygif/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ttygif/default.nix
diff --git a/pkgs/tools/misc/ttylog/default.nix b/nixpkgs/pkgs/tools/misc/ttylog/default.nix
index 70856fba731..70856fba731 100644
--- a/pkgs/tools/misc/ttylog/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ttylog/default.nix
diff --git a/pkgs/tools/misc/ttyplot/default.nix b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix
index 45aa9ea5c0b..45aa9ea5c0b 100644
--- a/pkgs/tools/misc/ttyplot/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix
diff --git a/pkgs/tools/misc/ttyrec/clang-fixes.patch b/nixpkgs/pkgs/tools/misc/ttyrec/clang-fixes.patch
index 126ab44090e..126ab44090e 100644
--- a/pkgs/tools/misc/ttyrec/clang-fixes.patch
+++ b/nixpkgs/pkgs/tools/misc/ttyrec/clang-fixes.patch
diff --git a/pkgs/tools/misc/ttyrec/default.nix b/nixpkgs/pkgs/tools/misc/ttyrec/default.nix
index 56ec9afea43..56ec9afea43 100644
--- a/pkgs/tools/misc/ttyrec/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ttyrec/default.nix
diff --git a/pkgs/tools/misc/txr/default.nix b/nixpkgs/pkgs/tools/misc/txr/default.nix
index a6b851e18ae..a6b851e18ae 100644
--- a/pkgs/tools/misc/txr/default.nix
+++ b/nixpkgs/pkgs/tools/misc/txr/default.nix
diff --git a/pkgs/tools/misc/txt2man/default.nix b/nixpkgs/pkgs/tools/misc/txt2man/default.nix
index 90f9559e6b7..90f9559e6b7 100644
--- a/pkgs/tools/misc/txt2man/default.nix
+++ b/nixpkgs/pkgs/tools/misc/txt2man/default.nix
diff --git a/pkgs/tools/misc/txtw/default.nix b/nixpkgs/pkgs/tools/misc/txtw/default.nix
index ab8256842ae..ab8256842ae 100644
--- a/pkgs/tools/misc/txtw/default.nix
+++ b/nixpkgs/pkgs/tools/misc/txtw/default.nix
diff --git a/pkgs/tools/misc/uhubctl/default.nix b/nixpkgs/pkgs/tools/misc/uhubctl/default.nix
index a6fe1853ae5..a6fe1853ae5 100644
--- a/pkgs/tools/misc/uhubctl/default.nix
+++ b/nixpkgs/pkgs/tools/misc/uhubctl/default.nix
diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix
index dd9742293ac..dd9742293ac 100644
--- a/pkgs/tools/misc/ultrastar-creator/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix
diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix
index 19d126d98f6..19d126d98f6 100644
--- a/pkgs/tools/misc/ultrastar-manager/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix
diff --git a/pkgs/tools/misc/umlet/default.nix b/nixpkgs/pkgs/tools/misc/umlet/default.nix
index 2b70848cbb8..2b70848cbb8 100644
--- a/pkgs/tools/misc/umlet/default.nix
+++ b/nixpkgs/pkgs/tools/misc/umlet/default.nix
diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix
index 7d2e5e0c367..7d2e5e0c367 100644
--- a/pkgs/tools/misc/unclutter-xfixes/default.nix
+++ b/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix
diff --git a/pkgs/tools/misc/unclutter/default.nix b/nixpkgs/pkgs/tools/misc/unclutter/default.nix
index 978a3d541ab..978a3d541ab 100644
--- a/pkgs/tools/misc/unclutter/default.nix
+++ b/nixpkgs/pkgs/tools/misc/unclutter/default.nix
diff --git a/pkgs/tools/misc/unicode/default.nix b/nixpkgs/pkgs/tools/misc/unicode/default.nix
index 9ace1f137b8..9ace1f137b8 100644
--- a/pkgs/tools/misc/unicode/default.nix
+++ b/nixpkgs/pkgs/tools/misc/unicode/default.nix
diff --git a/pkgs/tools/misc/units/default.nix b/nixpkgs/pkgs/tools/misc/units/default.nix
index 8bea94770ba..8bea94770ba 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/nixpkgs/pkgs/tools/misc/units/default.nix
diff --git a/pkgs/tools/misc/up/default.nix b/nixpkgs/pkgs/tools/misc/up/default.nix
index b3937175604..b3937175604 100644
--- a/pkgs/tools/misc/up/default.nix
+++ b/nixpkgs/pkgs/tools/misc/up/default.nix
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/nixpkgs/pkgs/tools/misc/upower-notify/default.nix
index 607cb47ed4e..607cb47ed4e 100644
--- a/pkgs/tools/misc/upower-notify/default.nix
+++ b/nixpkgs/pkgs/tools/misc/upower-notify/default.nix
diff --git a/pkgs/tools/misc/upower-notify/deps.nix b/nixpkgs/pkgs/tools/misc/upower-notify/deps.nix
index 8a729857b81..8a729857b81 100644
--- a/pkgs/tools/misc/upower-notify/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/upower-notify/deps.nix
diff --git a/pkgs/tools/misc/urjtag/default.nix b/nixpkgs/pkgs/tools/misc/urjtag/default.nix
index 865fd4f44f8..865fd4f44f8 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/nixpkgs/pkgs/tools/misc/urjtag/default.nix
diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/nixpkgs/pkgs/tools/misc/usbmuxd/default.nix
index 5935710164c..5935710164c 100644
--- a/pkgs/tools/misc/usbmuxd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/usbmuxd/default.nix
diff --git a/pkgs/tools/misc/uucp/default.nix b/nixpkgs/pkgs/tools/misc/uucp/default.nix
index 0fae40a5c96..0fae40a5c96 100644
--- a/pkgs/tools/misc/uucp/default.nix
+++ b/nixpkgs/pkgs/tools/misc/uucp/default.nix
diff --git a/pkgs/tools/misc/uudeview/default.nix b/nixpkgs/pkgs/tools/misc/uudeview/default.nix
index 3e8b7d494de..3e8b7d494de 100644
--- a/pkgs/tools/misc/uudeview/default.nix
+++ b/nixpkgs/pkgs/tools/misc/uudeview/default.nix
diff --git a/pkgs/tools/misc/uudeview/matherr.patch b/nixpkgs/pkgs/tools/misc/uudeview/matherr.patch
index a93db7d7858..a93db7d7858 100644
--- a/pkgs/tools/misc/uudeview/matherr.patch
+++ b/nixpkgs/pkgs/tools/misc/uudeview/matherr.patch
diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix
index 5aa9f8c34a4..5aa9f8c34a4 100644
--- a/pkgs/tools/misc/uutils-coreutils/default.nix
+++ b/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix
diff --git a/pkgs/tools/misc/vcs_query/default.nix b/nixpkgs/pkgs/tools/misc/vcs_query/default.nix
index a39619f354b..a39619f354b 100644
--- a/pkgs/tools/misc/vcs_query/default.nix
+++ b/nixpkgs/pkgs/tools/misc/vcs_query/default.nix
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix
index 328c343ba70..328c343ba70 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix
diff --git a/pkgs/tools/misc/vdirsyncer/stable.nix b/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix
index ac950894035..ac950894035 100644
--- a/pkgs/tools/misc/vdirsyncer/stable.nix
+++ b/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix
diff --git a/pkgs/tools/misc/vector/default.nix b/nixpkgs/pkgs/tools/misc/vector/default.nix
index f2fef36f842..f2fef36f842 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/nixpkgs/pkgs/tools/misc/vector/default.nix
diff --git a/pkgs/tools/misc/venus/default.nix b/nixpkgs/pkgs/tools/misc/venus/default.nix
index 534a500c7bc..534a500c7bc 100644
--- a/pkgs/tools/misc/venus/default.nix
+++ b/nixpkgs/pkgs/tools/misc/venus/default.nix
diff --git a/pkgs/tools/misc/vimer/default.nix b/nixpkgs/pkgs/tools/misc/vimer/default.nix
index 7f81774aebe..7f81774aebe 100644
--- a/pkgs/tools/misc/vimer/default.nix
+++ b/nixpkgs/pkgs/tools/misc/vimer/default.nix
diff --git a/pkgs/tools/misc/vimpager/build.nix b/nixpkgs/pkgs/tools/misc/vimpager/build.nix
index 60389f6862b..60389f6862b 100644
--- a/pkgs/tools/misc/vimpager/build.nix
+++ b/nixpkgs/pkgs/tools/misc/vimpager/build.nix
diff --git a/pkgs/tools/misc/vimpager/default.nix b/nixpkgs/pkgs/tools/misc/vimpager/default.nix
index 1b1512db3cf..1b1512db3cf 100644
--- a/pkgs/tools/misc/vimpager/default.nix
+++ b/nixpkgs/pkgs/tools/misc/vimpager/default.nix
diff --git a/pkgs/tools/misc/vimpager/latest.nix b/nixpkgs/pkgs/tools/misc/vimpager/latest.nix
index c98b9a00014..c98b9a00014 100644
--- a/pkgs/tools/misc/vimpager/latest.nix
+++ b/nixpkgs/pkgs/tools/misc/vimpager/latest.nix
diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix
index 241da2acbb4..241da2acbb4 100644
--- a/pkgs/tools/misc/vimwiki-markdown/default.nix
+++ b/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix
diff --git a/pkgs/tools/misc/vivid/default.nix b/nixpkgs/pkgs/tools/misc/vivid/default.nix
index a3df78abd25..a3df78abd25 100644
--- a/pkgs/tools/misc/vivid/default.nix
+++ b/nixpkgs/pkgs/tools/misc/vivid/default.nix
diff --git a/pkgs/tools/misc/vmtouch/default.nix b/nixpkgs/pkgs/tools/misc/vmtouch/default.nix
index 6397a093347..6397a093347 100644
--- a/pkgs/tools/misc/vmtouch/default.nix
+++ b/nixpkgs/pkgs/tools/misc/vmtouch/default.nix
diff --git a/pkgs/tools/misc/void/default.nix b/nixpkgs/pkgs/tools/misc/void/default.nix
index ec19ae5bd18..ec19ae5bd18 100644
--- a/pkgs/tools/misc/void/default.nix
+++ b/nixpkgs/pkgs/tools/misc/void/default.nix
diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix
index 90b721ad58a..90b721ad58a 100644
--- a/pkgs/tools/misc/vorbisgain/default.nix
+++ b/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix
diff --git a/pkgs/tools/misc/vttest/default.nix b/nixpkgs/pkgs/tools/misc/vttest/default.nix
index 0aa51363ff8..0aa51363ff8 100644
--- a/pkgs/tools/misc/vttest/default.nix
+++ b/nixpkgs/pkgs/tools/misc/vttest/default.nix
diff --git a/pkgs/tools/misc/wacomtablet/default.nix b/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix
index d0fbcecf027..d0fbcecf027 100644
--- a/pkgs/tools/misc/wacomtablet/default.nix
+++ b/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix
diff --git a/pkgs/tools/misc/wagyu/default.nix b/nixpkgs/pkgs/tools/misc/wagyu/default.nix
index d56d21b1516..d56d21b1516 100644
--- a/pkgs/tools/misc/wagyu/default.nix
+++ b/nixpkgs/pkgs/tools/misc/wagyu/default.nix
diff --git a/pkgs/tools/misc/wakatime/default.nix b/nixpkgs/pkgs/tools/misc/wakatime/default.nix
index 58ad9182261..58ad9182261 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/nixpkgs/pkgs/tools/misc/wakatime/default.nix
diff --git a/pkgs/tools/misc/watchexec/default.nix b/nixpkgs/pkgs/tools/misc/watchexec/default.nix
index 9729f110bb7..9729f110bb7 100644
--- a/pkgs/tools/misc/watchexec/default.nix
+++ b/nixpkgs/pkgs/tools/misc/watchexec/default.nix
diff --git a/pkgs/tools/misc/websocat/default.nix b/nixpkgs/pkgs/tools/misc/websocat/default.nix
index f682bb3d2eb..f682bb3d2eb 100644
--- a/pkgs/tools/misc/websocat/default.nix
+++ b/nixpkgs/pkgs/tools/misc/websocat/default.nix
diff --git a/pkgs/tools/misc/wev/default.nix b/nixpkgs/pkgs/tools/misc/wev/default.nix
index fa69cc4445e..fa69cc4445e 100644
--- a/pkgs/tools/misc/wev/default.nix
+++ b/nixpkgs/pkgs/tools/misc/wev/default.nix
diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix
index 349d910dafc..349d910dafc 100644
--- a/pkgs/tools/misc/wl-clipboard/default.nix
+++ b/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix
diff --git a/pkgs/tools/misc/wlr-randr/default.nix b/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix
index c9f43964696..c9f43964696 100644
--- a/pkgs/tools/misc/wlr-randr/default.nix
+++ b/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix
diff --git a/pkgs/tools/misc/wob/default.nix b/nixpkgs/pkgs/tools/misc/wob/default.nix
index c3b3cd11239..c3b3cd11239 100644
--- a/pkgs/tools/misc/wob/default.nix
+++ b/nixpkgs/pkgs/tools/misc/wob/default.nix
diff --git a/pkgs/tools/misc/woeusb/default.nix b/nixpkgs/pkgs/tools/misc/woeusb/default.nix
index cc53b26e238..cc53b26e238 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/nixpkgs/pkgs/tools/misc/woeusb/default.nix
diff --git a/pkgs/tools/misc/woeusb/remove-workaround.patch b/nixpkgs/pkgs/tools/misc/woeusb/remove-workaround.patch
index 094da2cb2bc..094da2cb2bc 100644
--- a/pkgs/tools/misc/woeusb/remove-workaround.patch
+++ b/nixpkgs/pkgs/tools/misc/woeusb/remove-workaround.patch
diff --git a/pkgs/tools/misc/woof/default.nix b/nixpkgs/pkgs/tools/misc/woof/default.nix
index fa3ab747f64..fa3ab747f64 100644
--- a/pkgs/tools/misc/woof/default.nix
+++ b/nixpkgs/pkgs/tools/misc/woof/default.nix
diff --git a/pkgs/tools/misc/wv/default.nix b/nixpkgs/pkgs/tools/misc/wv/default.nix
index 78affe34b58..78affe34b58 100644
--- a/pkgs/tools/misc/wv/default.nix
+++ b/nixpkgs/pkgs/tools/misc/wv/default.nix
diff --git a/pkgs/tools/misc/wv2/default.nix b/nixpkgs/pkgs/tools/misc/wv2/default.nix
index b9a8f70ff71..b9a8f70ff71 100644
--- a/pkgs/tools/misc/wv2/default.nix
+++ b/nixpkgs/pkgs/tools/misc/wv2/default.nix
diff --git a/pkgs/tools/misc/wv2/fix-include.patch b/nixpkgs/pkgs/tools/misc/wv2/fix-include.patch
index df34d24af94..df34d24af94 100644
--- a/pkgs/tools/misc/wv2/fix-include.patch
+++ b/nixpkgs/pkgs/tools/misc/wv2/fix-include.patch
diff --git a/pkgs/tools/misc/wyrd/default.nix b/nixpkgs/pkgs/tools/misc/wyrd/default.nix
index 6a5ec867222..6a5ec867222 100644
--- a/pkgs/tools/misc/wyrd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/wyrd/default.nix
diff --git a/pkgs/tools/misc/x11idle/default.nix b/nixpkgs/pkgs/tools/misc/x11idle/default.nix
index 270b39f8110..270b39f8110 100644
--- a/pkgs/tools/misc/x11idle/default.nix
+++ b/nixpkgs/pkgs/tools/misc/x11idle/default.nix
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix
index 62e2b31fa15..62e2b31fa15 100644
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix
diff --git a/pkgs/tools/misc/xclip/default.nix b/nixpkgs/pkgs/tools/misc/xclip/default.nix
index 69009b86af8..69009b86af8 100644
--- a/pkgs/tools/misc/xclip/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xclip/default.nix
diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix
index 28268052826..28268052826 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix
diff --git a/pkgs/tools/misc/xdo/default.nix b/nixpkgs/pkgs/tools/misc/xdo/default.nix
index 77a2ef763a9..77a2ef763a9 100644
--- a/pkgs/tools/misc/xdo/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xdo/default.nix
diff --git a/pkgs/tools/misc/xdummy/default.nix b/nixpkgs/pkgs/tools/misc/xdummy/default.nix
index 7d7942f7ca9..7d7942f7ca9 100644
--- a/pkgs/tools/misc/xdummy/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xdummy/default.nix
diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix
index b6801130a45..b6801130a45 100644
--- a/pkgs/tools/misc/xdxf2slob/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix
diff --git a/pkgs/tools/misc/xflux/default.nix b/nixpkgs/pkgs/tools/misc/xflux/default.nix
index d0f35844695..d0f35844695 100644
--- a/pkgs/tools/misc/xflux/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xflux/default.nix
diff --git a/pkgs/tools/misc/xflux/gui.nix b/nixpkgs/pkgs/tools/misc/xflux/gui.nix
index 6a629af61ba..6a629af61ba 100644
--- a/pkgs/tools/misc/xflux/gui.nix
+++ b/nixpkgs/pkgs/tools/misc/xflux/gui.nix
diff --git a/pkgs/tools/misc/xfstests/default.nix b/nixpkgs/pkgs/tools/misc/xfstests/default.nix
index 20405991331..20405991331 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xfstests/default.nix
diff --git a/pkgs/tools/misc/xiccd/default.nix b/nixpkgs/pkgs/tools/misc/xiccd/default.nix
index 43a67406970..43a67406970 100644
--- a/pkgs/tools/misc/xiccd/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xiccd/default.nix
diff --git a/pkgs/tools/misc/xilinx-bootgen/default.nix b/nixpkgs/pkgs/tools/misc/xilinx-bootgen/default.nix
index e7aa30ac059..e7aa30ac059 100644
--- a/pkgs/tools/misc/xilinx-bootgen/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xilinx-bootgen/default.nix
diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix
index ad5086f2f59..ad5086f2f59 100644
--- a/pkgs/tools/misc/xmonad-log/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix
diff --git a/pkgs/tools/misc/xmonad-log/deps.nix b/nixpkgs/pkgs/tools/misc/xmonad-log/deps.nix
index f5a7c7e5dd1..f5a7c7e5dd1 100644
--- a/pkgs/tools/misc/xmonad-log/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/xmonad-log/deps.nix
diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/nixpkgs/pkgs/tools/misc/xprite-editor/default.nix
index e2615bef6ce..e2615bef6ce 100644
--- a/pkgs/tools/misc/xprite-editor/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xprite-editor/default.nix
diff --git a/pkgs/tools/misc/xsel/default.nix b/nixpkgs/pkgs/tools/misc/xsel/default.nix
index 4c39babc317..4c39babc317 100644
--- a/pkgs/tools/misc/xsel/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xsel/default.nix
diff --git a/pkgs/tools/misc/xtitle/default.nix b/nixpkgs/pkgs/tools/misc/xtitle/default.nix
index 84cf506fb63..84cf506fb63 100644
--- a/pkgs/tools/misc/xtitle/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xtitle/default.nix
diff --git a/pkgs/tools/misc/xv/default.nix b/nixpkgs/pkgs/tools/misc/xv/default.nix
index 8d8c2fa55b2..8d8c2fa55b2 100644
--- a/pkgs/tools/misc/xv/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xv/default.nix
diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix
index d6adbde5ea9..d6adbde5ea9 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix
diff --git a/pkgs/tools/misc/yad/default.nix b/nixpkgs/pkgs/tools/misc/yad/default.nix
index 776b41ac1aa..776b41ac1aa 100644
--- a/pkgs/tools/misc/yad/default.nix
+++ b/nixpkgs/pkgs/tools/misc/yad/default.nix
diff --git a/pkgs/tools/misc/yank/default.nix b/nixpkgs/pkgs/tools/misc/yank/default.nix
index 9fb5399fd72..9fb5399fd72 100644
--- a/pkgs/tools/misc/yank/default.nix
+++ b/nixpkgs/pkgs/tools/misc/yank/default.nix
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix
index e106c3b8595..e106c3b8595 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix
diff --git a/pkgs/tools/misc/you-get/default.nix b/nixpkgs/pkgs/tools/misc/you-get/default.nix
index 223fb4883ae..223fb4883ae 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/nixpkgs/pkgs/tools/misc/you-get/default.nix
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
index 59fd4fa70c9..59fd4fa70c9 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix
index b5c5aca0883..b5c5aca0883 100644
--- a/pkgs/tools/misc/yubico-piv-tool/default.nix
+++ b/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix
diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix
index 810c2f49a5e..810c2f49a5e 100644
--- a/pkgs/tools/misc/yubikey-manager-qt/default.nix
+++ b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix
diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix
index ee555637474..ee555637474 100644
--- a/pkgs/tools/misc/yubikey-manager/default.nix
+++ b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix
diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix
index acc0bac04ff..acc0bac04ff 100644
--- a/pkgs/tools/misc/yubikey-neo-manager/default.nix
+++ b/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix
diff --git a/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff b/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff
index d11a3a1cc6d..d11a3a1cc6d 100644
--- a/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff
+++ b/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff
diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix
index 59685aa721a..59685aa721a 100644
--- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix
+++ b/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix
index c20fe68b7b2..c20fe68b7b2 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix
diff --git a/pkgs/tools/misc/z-lua/default.nix b/nixpkgs/pkgs/tools/misc/z-lua/default.nix
index 171c86e805b..171c86e805b 100644
--- a/pkgs/tools/misc/z-lua/default.nix
+++ b/nixpkgs/pkgs/tools/misc/z-lua/default.nix
diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix
index d2157388512..d2157388512 100644
--- a/pkgs/tools/misc/zabbix-cli/default.nix
+++ b/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix
diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix
index b74ab51680d..b74ab51680d 100644
--- a/pkgs/tools/misc/zabbixctl/default.nix
+++ b/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix
diff --git a/pkgs/tools/misc/zabbixctl/deps.nix b/nixpkgs/pkgs/tools/misc/zabbixctl/deps.nix
index 2bf015acf5f..2bf015acf5f 100644
--- a/pkgs/tools/misc/zabbixctl/deps.nix
+++ b/nixpkgs/pkgs/tools/misc/zabbixctl/deps.nix
diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix
index 4b19331f392..4b19331f392 100644
--- a/pkgs/tools/misc/zsh-autoenv/default.nix
+++ b/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix
diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/nixpkgs/pkgs/tools/misc/zsh-navigation-tools/default.nix
index be64ff47e6b..be64ff47e6b 100644
--- a/pkgs/tools/misc/zsh-navigation-tools/default.nix
+++ b/nixpkgs/pkgs/tools/misc/zsh-navigation-tools/default.nix
diff --git a/pkgs/tools/networking/6tunnel/default.nix b/nixpkgs/pkgs/tools/networking/6tunnel/default.nix
index bf0e8ba3316..bf0e8ba3316 100644
--- a/pkgs/tools/networking/6tunnel/default.nix
+++ b/nixpkgs/pkgs/tools/networking/6tunnel/default.nix
diff --git a/pkgs/tools/networking/acme-client/default.nix b/nixpkgs/pkgs/tools/networking/acme-client/default.nix
index 06c2898248d..06c2898248d 100644
--- a/pkgs/tools/networking/acme-client/default.nix
+++ b/nixpkgs/pkgs/tools/networking/acme-client/default.nix
diff --git a/pkgs/tools/networking/ahcpd/default.nix b/nixpkgs/pkgs/tools/networking/ahcpd/default.nix
index 4b03c3cf278..4b03c3cf278 100644
--- a/pkgs/tools/networking/ahcpd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ahcpd/default.nix
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix
index 9d948eaf822..9d948eaf822 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix
diff --git a/pkgs/tools/networking/airfield/default.nix b/nixpkgs/pkgs/tools/networking/airfield/default.nix
index a31bc57904d..a31bc57904d 100644
--- a/pkgs/tools/networking/airfield/default.nix
+++ b/nixpkgs/pkgs/tools/networking/airfield/default.nix
diff --git a/pkgs/tools/networking/airfield/deps.json b/nixpkgs/pkgs/tools/networking/airfield/deps.json
index f6b3c5a9146..f6b3c5a9146 100644
--- a/pkgs/tools/networking/airfield/deps.json
+++ b/nixpkgs/pkgs/tools/networking/airfield/deps.json
diff --git a/pkgs/tools/networking/airfield/deps.sh b/nixpkgs/pkgs/tools/networking/airfield/deps.sh
index 77648e2fbfb..77648e2fbfb 100755
--- a/pkgs/tools/networking/airfield/deps.sh
+++ b/nixpkgs/pkgs/tools/networking/airfield/deps.sh
diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix
index 1febe36898b..1febe36898b 100644
--- a/pkgs/tools/networking/airfield/node-packages.nix
+++ b/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix
diff --git a/pkgs/tools/networking/airfield/node.nix b/nixpkgs/pkgs/tools/networking/airfield/node.nix
index 4377681e20d..4377681e20d 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/nixpkgs/pkgs/tools/networking/airfield/node.nix
diff --git a/pkgs/tools/networking/altermime/default.nix b/nixpkgs/pkgs/tools/networking/altermime/default.nix
index b1481b2208c..b1481b2208c 100644
--- a/pkgs/tools/networking/altermime/default.nix
+++ b/nixpkgs/pkgs/tools/networking/altermime/default.nix
diff --git a/pkgs/tools/networking/amass/default.nix b/nixpkgs/pkgs/tools/networking/amass/default.nix
index 06eabec0618..06eabec0618 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/nixpkgs/pkgs/tools/networking/amass/default.nix
diff --git a/pkgs/tools/networking/argus-clients/default.nix b/nixpkgs/pkgs/tools/networking/argus-clients/default.nix
index 08db7b4f58d..08db7b4f58d 100644
--- a/pkgs/tools/networking/argus-clients/default.nix
+++ b/nixpkgs/pkgs/tools/networking/argus-clients/default.nix
diff --git a/pkgs/tools/networking/argus/default.nix b/nixpkgs/pkgs/tools/networking/argus/default.nix
index bb9abccc933..bb9abccc933 100644
--- a/pkgs/tools/networking/argus/default.nix
+++ b/nixpkgs/pkgs/tools/networking/argus/default.nix
diff --git a/pkgs/tools/networking/aria2/default.nix b/nixpkgs/pkgs/tools/networking/aria2/default.nix
index 0b4d77881b4..0b4d77881b4 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/nixpkgs/pkgs/tools/networking/aria2/default.nix
diff --git a/pkgs/tools/networking/arping/default.nix b/nixpkgs/pkgs/tools/networking/arping/default.nix
index 5d1ebc74800..5d1ebc74800 100644
--- a/pkgs/tools/networking/arping/default.nix
+++ b/nixpkgs/pkgs/tools/networking/arping/default.nix
diff --git a/pkgs/tools/networking/arpoison/default.nix b/nixpkgs/pkgs/tools/networking/arpoison/default.nix
index cedd8597870..cedd8597870 100644
--- a/pkgs/tools/networking/arpoison/default.nix
+++ b/nixpkgs/pkgs/tools/networking/arpoison/default.nix
diff --git a/pkgs/tools/networking/assh/default.nix b/nixpkgs/pkgs/tools/networking/assh/default.nix
index bfb1abaeaf2..bfb1abaeaf2 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/nixpkgs/pkgs/tools/networking/assh/default.nix
diff --git a/pkgs/tools/networking/asynk/default.nix b/nixpkgs/pkgs/tools/networking/asynk/default.nix
index 4d069a7e6d7..4d069a7e6d7 100644
--- a/pkgs/tools/networking/asynk/default.nix
+++ b/nixpkgs/pkgs/tools/networking/asynk/default.nix
diff --git a/pkgs/tools/networking/atftp/default.nix b/nixpkgs/pkgs/tools/networking/atftp/default.nix
index 7fcd677044f..7fcd677044f 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/atftp/default.nix
diff --git a/pkgs/tools/networking/atinout/default.nix b/nixpkgs/pkgs/tools/networking/atinout/default.nix
index 16b3ee668da..16b3ee668da 100644
--- a/pkgs/tools/networking/atinout/default.nix
+++ b/nixpkgs/pkgs/tools/networking/atinout/default.nix
diff --git a/pkgs/tools/networking/autossh/default.nix b/nixpkgs/pkgs/tools/networking/autossh/default.nix
index 55b464607b1..55b464607b1 100644
--- a/pkgs/tools/networking/autossh/default.nix
+++ b/nixpkgs/pkgs/tools/networking/autossh/default.nix
diff --git a/pkgs/tools/networking/axel/default.nix b/nixpkgs/pkgs/tools/networking/axel/default.nix
index a9ddd9a8b68..a9ddd9a8b68 100644
--- a/pkgs/tools/networking/axel/default.nix
+++ b/nixpkgs/pkgs/tools/networking/axel/default.nix
diff --git a/pkgs/tools/networking/babeld/default.nix b/nixpkgs/pkgs/tools/networking/babeld/default.nix
index 5fccd9c0ebc..5fccd9c0ebc 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/nixpkgs/pkgs/tools/networking/babeld/default.nix
diff --git a/pkgs/tools/networking/badvpn/default.nix b/nixpkgs/pkgs/tools/networking/badvpn/default.nix
index c9ebc12b0db..c9ebc12b0db 100644
--- a/pkgs/tools/networking/badvpn/default.nix
+++ b/nixpkgs/pkgs/tools/networking/badvpn/default.nix
diff --git a/pkgs/tools/networking/badvpn/default.upstream b/nixpkgs/pkgs/tools/networking/badvpn/default.upstream
index 2a85ba7cb51..2a85ba7cb51 100644
--- a/pkgs/tools/networking/badvpn/default.upstream
+++ b/nixpkgs/pkgs/tools/networking/badvpn/default.upstream
diff --git a/pkgs/tools/networking/bandwhich/default.nix b/nixpkgs/pkgs/tools/networking/bandwhich/default.nix
index 4203e0c5c82..4203e0c5c82 100644
--- a/pkgs/tools/networking/bandwhich/default.nix
+++ b/nixpkgs/pkgs/tools/networking/bandwhich/default.nix
diff --git a/pkgs/tools/networking/bgpdump/default.nix b/nixpkgs/pkgs/tools/networking/bgpdump/default.nix
index 3c84de29bf1..3c84de29bf1 100644
--- a/pkgs/tools/networking/bgpdump/default.nix
+++ b/nixpkgs/pkgs/tools/networking/bgpdump/default.nix
diff --git a/pkgs/tools/networking/biosdevname/default.nix b/nixpkgs/pkgs/tools/networking/biosdevname/default.nix
index 7cd7254518a..7cd7254518a 100644
--- a/pkgs/tools/networking/biosdevname/default.nix
+++ b/nixpkgs/pkgs/tools/networking/biosdevname/default.nix
diff --git a/pkgs/tools/networking/biosdevname/makefile.patch b/nixpkgs/pkgs/tools/networking/biosdevname/makefile.patch
index 0fc083f9096..0fc083f9096 100644
--- a/pkgs/tools/networking/biosdevname/makefile.patch
+++ b/nixpkgs/pkgs/tools/networking/biosdevname/makefile.patch
diff --git a/pkgs/tools/networking/boringtun/default.nix b/nixpkgs/pkgs/tools/networking/boringtun/default.nix
index dfb13f2168b..dfb13f2168b 100644
--- a/pkgs/tools/networking/boringtun/default.nix
+++ b/nixpkgs/pkgs/tools/networking/boringtun/default.nix
diff --git a/pkgs/tools/networking/brook/default.nix b/nixpkgs/pkgs/tools/networking/brook/default.nix
index 1b3b22b2adf..1b3b22b2adf 100644
--- a/pkgs/tools/networking/brook/default.nix
+++ b/nixpkgs/pkgs/tools/networking/brook/default.nix
diff --git a/pkgs/tools/networking/brook/deps.nix b/nixpkgs/pkgs/tools/networking/brook/deps.nix
index 9ccb446b5e5..9ccb446b5e5 100644
--- a/pkgs/tools/networking/brook/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/brook/deps.nix
diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix
index d011665a492..d011665a492 100644
--- a/pkgs/tools/networking/bsd-finger/default.nix
+++ b/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix
diff --git a/pkgs/tools/networking/bsd-finger/ubuntu-0.17-9.patch b/nixpkgs/pkgs/tools/networking/bsd-finger/ubuntu-0.17-9.patch
index 24decb60281..24decb60281 100644
--- a/pkgs/tools/networking/bsd-finger/ubuntu-0.17-9.patch
+++ b/nixpkgs/pkgs/tools/networking/bsd-finger/ubuntu-0.17-9.patch
diff --git a/pkgs/tools/networking/bud/default.nix b/nixpkgs/pkgs/tools/networking/bud/default.nix
index a79cbdc8bbd..a79cbdc8bbd 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/nixpkgs/pkgs/tools/networking/bud/default.nix
diff --git a/pkgs/tools/networking/bukubrow/default.nix b/nixpkgs/pkgs/tools/networking/bukubrow/default.nix
index e83e72cbfb4..e83e72cbfb4 100644
--- a/pkgs/tools/networking/bukubrow/default.nix
+++ b/nixpkgs/pkgs/tools/networking/bukubrow/default.nix
diff --git a/pkgs/tools/networking/bully/default.nix b/nixpkgs/pkgs/tools/networking/bully/default.nix
index 46bac3d5b5b..46bac3d5b5b 100644
--- a/pkgs/tools/networking/bully/default.nix
+++ b/nixpkgs/pkgs/tools/networking/bully/default.nix
diff --git a/pkgs/tools/networking/burpsuite/default.nix b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix
index cc7fa9ddfb0..cc7fa9ddfb0 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix
diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix
index 8e766cdeeb5..8e766cdeeb5 100644
--- a/pkgs/tools/networking/bwm-ng/default.nix
+++ b/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix
diff --git a/pkgs/tools/networking/cadaver/default.nix b/nixpkgs/pkgs/tools/networking/cadaver/default.nix
index 95012208129..95012208129 100644
--- a/pkgs/tools/networking/cadaver/default.nix
+++ b/nixpkgs/pkgs/tools/networking/cadaver/default.nix
diff --git a/pkgs/tools/networking/carddav-util/default.nix b/nixpkgs/pkgs/tools/networking/carddav-util/default.nix
index 08014ed1226..08014ed1226 100644
--- a/pkgs/tools/networking/carddav-util/default.nix
+++ b/nixpkgs/pkgs/tools/networking/carddav-util/default.nix
diff --git a/pkgs/tools/networking/cassowary/default.nix b/nixpkgs/pkgs/tools/networking/cassowary/default.nix
index bc1f9cebb42..bc1f9cebb42 100644
--- a/pkgs/tools/networking/cassowary/default.nix
+++ b/nixpkgs/pkgs/tools/networking/cassowary/default.nix
diff --git a/pkgs/tools/networking/ccnet/default.nix b/nixpkgs/pkgs/tools/networking/ccnet/default.nix
index 2c78b20138a..2c78b20138a 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ccnet/default.nix
diff --git a/pkgs/tools/networking/chrony/allow-clock_adjtime.patch b/nixpkgs/pkgs/tools/networking/chrony/allow-clock_adjtime.patch
index 2fa3baca722..2fa3baca722 100644
--- a/pkgs/tools/networking/chrony/allow-clock_adjtime.patch
+++ b/nixpkgs/pkgs/tools/networking/chrony/allow-clock_adjtime.patch
diff --git a/pkgs/tools/networking/chrony/default.nix b/nixpkgs/pkgs/tools/networking/chrony/default.nix
index 2ec16aa430a..2ec16aa430a 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/nixpkgs/pkgs/tools/networking/chrony/default.nix
diff --git a/pkgs/tools/networking/chrony/fix-seccomp-build.patch b/nixpkgs/pkgs/tools/networking/chrony/fix-seccomp-build.patch
index 6888e7efeb7..6888e7efeb7 100644
--- a/pkgs/tools/networking/chrony/fix-seccomp-build.patch
+++ b/nixpkgs/pkgs/tools/networking/chrony/fix-seccomp-build.patch
diff --git a/pkgs/tools/networking/circus/default.nix b/nixpkgs/pkgs/tools/networking/circus/default.nix
index 10edc92a995..10edc92a995 100644
--- a/pkgs/tools/networking/circus/default.nix
+++ b/nixpkgs/pkgs/tools/networking/circus/default.nix
diff --git a/pkgs/tools/networking/cjdns/default.nix b/nixpkgs/pkgs/tools/networking/cjdns/default.nix
index 7dce5dc1044..7dce5dc1044 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/nixpkgs/pkgs/tools/networking/cjdns/default.nix
diff --git a/pkgs/tools/networking/cksfv/default.nix b/nixpkgs/pkgs/tools/networking/cksfv/default.nix
index 3098b091dc6..3098b091dc6 100644
--- a/pkgs/tools/networking/cksfv/default.nix
+++ b/nixpkgs/pkgs/tools/networking/cksfv/default.nix
diff --git a/pkgs/tools/networking/clash/default.nix b/nixpkgs/pkgs/tools/networking/clash/default.nix
index f3d0a584593..f3d0a584593 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/nixpkgs/pkgs/tools/networking/clash/default.nix
diff --git a/pkgs/tools/networking/cloud-custodian/default.nix b/nixpkgs/pkgs/tools/networking/cloud-custodian/default.nix
index a57d9f13d78..a57d9f13d78 100644
--- a/pkgs/tools/networking/cloud-custodian/default.nix
+++ b/nixpkgs/pkgs/tools/networking/cloud-custodian/default.nix
diff --git a/pkgs/tools/networking/cmst/default.nix b/nixpkgs/pkgs/tools/networking/cmst/default.nix
index dcda354e4b4..dcda354e4b4 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/nixpkgs/pkgs/tools/networking/cmst/default.nix
diff --git a/pkgs/tools/networking/cntlm/default.nix b/nixpkgs/pkgs/tools/networking/cntlm/default.nix
index 9b8a1f0e790..9b8a1f0e790 100644
--- a/pkgs/tools/networking/cntlm/default.nix
+++ b/nixpkgs/pkgs/tools/networking/cntlm/default.nix
diff --git a/pkgs/tools/networking/connect/default.nix b/nixpkgs/pkgs/tools/networking/connect/default.nix
index 17923081dfd..17923081dfd 100644
--- a/pkgs/tools/networking/connect/default.nix
+++ b/nixpkgs/pkgs/tools/networking/connect/default.nix
diff --git a/pkgs/tools/networking/connman/connman-gtk/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix
index a3c774a62b1..a3c774a62b1 100644
--- a/pkgs/tools/networking/connman/connman-gtk/default.nix
+++ b/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix
diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix
index 140105c2475..140105c2475 100644
--- a/pkgs/tools/networking/connman/connman-ncurses/default.nix
+++ b/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix
diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix
index d17729c691d..d17729c691d 100644
--- a/pkgs/tools/networking/connman/connman-notify/default.nix
+++ b/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix
diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix
index 7096b9b7586..7096b9b7586 100644
--- a/pkgs/tools/networking/connman/connman_dmenu/default.nix
+++ b/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix
diff --git a/pkgs/tools/networking/connman/connmanui/default.nix b/nixpkgs/pkgs/tools/networking/connman/connmanui/default.nix
index 17e8551fdda..17e8551fdda 100644
--- a/pkgs/tools/networking/connman/connmanui/default.nix
+++ b/nixpkgs/pkgs/tools/networking/connman/connmanui/default.nix
diff --git a/pkgs/tools/networking/connman/default.nix b/nixpkgs/pkgs/tools/networking/connman/default.nix
index e58b8362f95..e58b8362f95 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/nixpkgs/pkgs/tools/networking/connman/default.nix
diff --git a/pkgs/tools/networking/corerad/default.nix b/nixpkgs/pkgs/tools/networking/corerad/default.nix
index e8f17450688..e8f17450688 100644
--- a/pkgs/tools/networking/corerad/default.nix
+++ b/nixpkgs/pkgs/tools/networking/corerad/default.nix
diff --git a/pkgs/tools/networking/corkscrew/default.nix b/nixpkgs/pkgs/tools/networking/corkscrew/default.nix
index 9394b123bbe..9394b123bbe 100644
--- a/pkgs/tools/networking/corkscrew/default.nix
+++ b/nixpkgs/pkgs/tools/networking/corkscrew/default.nix
diff --git a/pkgs/tools/networking/croc/default.nix b/nixpkgs/pkgs/tools/networking/croc/default.nix
index b7782267b38..b7782267b38 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/nixpkgs/pkgs/tools/networking/croc/default.nix
diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix
index e6f2dec30e6..e6f2dec30e6 100644
--- a/pkgs/tools/networking/curl-unix-socket/default.nix
+++ b/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix
diff --git a/pkgs/tools/networking/curl/default.nix b/nixpkgs/pkgs/tools/networking/curl/default.nix
index a732ddcb89e..a732ddcb89e 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/nixpkgs/pkgs/tools/networking/curl/default.nix
diff --git a/pkgs/tools/networking/curlie/default.nix b/nixpkgs/pkgs/tools/networking/curlie/default.nix
index fa1471aa620..fa1471aa620 100644
--- a/pkgs/tools/networking/curlie/default.nix
+++ b/nixpkgs/pkgs/tools/networking/curlie/default.nix
diff --git a/pkgs/tools/networking/cutter/default.nix b/nixpkgs/pkgs/tools/networking/cutter/default.nix
index 28eab7f495a..28eab7f495a 100644
--- a/pkgs/tools/networking/cutter/default.nix
+++ b/nixpkgs/pkgs/tools/networking/cutter/default.nix
diff --git a/pkgs/tools/networking/darkstat/default.nix b/nixpkgs/pkgs/tools/networking/darkstat/default.nix
index 6509c9c3106..6509c9c3106 100644
--- a/pkgs/tools/networking/darkstat/default.nix
+++ b/nixpkgs/pkgs/tools/networking/darkstat/default.nix
diff --git a/pkgs/tools/networking/davix/default.nix b/nixpkgs/pkgs/tools/networking/davix/default.nix
index 9faad377520..9faad377520 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/nixpkgs/pkgs/tools/networking/davix/default.nix
diff --git a/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch b/nixpkgs/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch
index 9897a76c957..9897a76c957 100644
--- a/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch
+++ b/nixpkgs/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch
diff --git a/pkgs/tools/networking/dd-agent/5.nix b/nixpkgs/pkgs/tools/networking/dd-agent/5.nix
index 98902e9809b..98902e9809b 100644
--- a/pkgs/tools/networking/dd-agent/5.nix
+++ b/nixpkgs/pkgs/tools/networking/dd-agent/5.nix
diff --git a/pkgs/tools/networking/dd-agent/README.md b/nixpkgs/pkgs/tools/networking/dd-agent/README.md
index 8cff23b9574..8cff23b9574 100644
--- a/pkgs/tools/networking/dd-agent/README.md
+++ b/nixpkgs/pkgs/tools/networking/dd-agent/README.md
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix
index 1121ec0405c..1121ec0405c 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix
+++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix
index 2253daa2d11..2253daa2d11 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix
diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
index 2a81702feee..2a81702feee 100644
--- a/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
+++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
index 280619a5eca..280619a5eca 100644
--- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
+++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix
index edf7a8faaf8..edf7a8faaf8 100644
--- a/pkgs/tools/networking/dd-agent/integrations-core.nix
+++ b/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix
diff --git a/pkgs/tools/networking/ddclient/default.nix b/nixpkgs/pkgs/tools/networking/ddclient/default.nix
index 6efba72b1dc..6efba72b1dc 100644
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ddclient/default.nix
diff --git a/pkgs/tools/networking/dhcp/default.nix b/nixpkgs/pkgs/tools/networking/dhcp/default.nix
index 17e2417d3a6..17e2417d3a6 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dhcp/default.nix
diff --git a/pkgs/tools/networking/dhcp/set-hostname.patch b/nixpkgs/pkgs/tools/networking/dhcp/set-hostname.patch
index 7aa9d081451..7aa9d081451 100644
--- a/pkgs/tools/networking/dhcp/set-hostname.patch
+++ b/nixpkgs/pkgs/tools/networking/dhcp/set-hostname.patch
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
index c45d017e3f5..c45d017e3f5 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix
index a7cc90c2b33..a7cc90c2b33 100644
--- a/pkgs/tools/networking/dhcpdump/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix
diff --git a/pkgs/tools/networking/dhcping/default.nix b/nixpkgs/pkgs/tools/networking/dhcping/default.nix
index a6cb05b3865..a6cb05b3865 100644
--- a/pkgs/tools/networking/dhcping/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dhcping/default.nix
diff --git a/pkgs/tools/networking/dibbler/default.nix b/nixpkgs/pkgs/tools/networking/dibbler/default.nix
index 43c9455712d..43c9455712d 100644
--- a/pkgs/tools/networking/dibbler/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dibbler/default.nix
diff --git a/pkgs/tools/networking/dirb/default.nix b/nixpkgs/pkgs/tools/networking/dirb/default.nix
index fe845f3cae8..fe845f3cae8 100644
--- a/pkgs/tools/networking/dirb/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dirb/default.nix
diff --git a/pkgs/tools/networking/djbdns/default.nix b/nixpkgs/pkgs/tools/networking/djbdns/default.nix
index 974f8a1f346..974f8a1f346 100644
--- a/pkgs/tools/networking/djbdns/default.nix
+++ b/nixpkgs/pkgs/tools/networking/djbdns/default.nix
diff --git a/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch b/nixpkgs/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch
index abd9e756a21..abd9e756a21 100644
--- a/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch
+++ b/nixpkgs/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch
diff --git a/pkgs/tools/networking/djbdns/hier.patch b/nixpkgs/pkgs/tools/networking/djbdns/hier.patch
index 7fddd121383..7fddd121383 100644
--- a/pkgs/tools/networking/djbdns/hier.patch
+++ b/nixpkgs/pkgs/tools/networking/djbdns/hier.patch
diff --git a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
index fc4e40929c9..fc4e40929c9 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
diff --git a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix
index 5c5cb7333dd..5c5cb7333dd 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix
diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/nixpkgs/pkgs/tools/networking/dnscrypt-wrapper/default.nix
index 94d52b953d4..94d52b953d4 100644
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dnscrypt-wrapper/default.nix
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix
index f224ab1ac93..f224ab1ac93 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix
diff --git a/pkgs/tools/networking/dnsperf/default.nix b/nixpkgs/pkgs/tools/networking/dnsperf/default.nix
index 63e19e924fc..63e19e924fc 100644
--- a/pkgs/tools/networking/dnsperf/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dnsperf/default.nix
diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix
index 6554dd465d4..6554dd465d4 100644
--- a/pkgs/tools/networking/dnsproxy/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix
diff --git a/pkgs/tools/networking/dnstop/default.nix b/nixpkgs/pkgs/tools/networking/dnstop/default.nix
index 207078773b2..207078773b2 100644
--- a/pkgs/tools/networking/dnstop/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dnstop/default.nix
diff --git a/pkgs/tools/networking/dnstracer/default.nix b/nixpkgs/pkgs/tools/networking/dnstracer/default.nix
index 5261fdb1896..5261fdb1896 100644
--- a/pkgs/tools/networking/dnstracer/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dnstracer/default.nix
diff --git a/pkgs/tools/networking/driftnet/default.nix b/nixpkgs/pkgs/tools/networking/driftnet/default.nix
index a0f5b5b0842..a0f5b5b0842 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/nixpkgs/pkgs/tools/networking/driftnet/default.nix
diff --git a/pkgs/tools/networking/dropbear/default.nix b/nixpkgs/pkgs/tools/networking/dropbear/default.nix
index c51f0a4fdf0..c51f0a4fdf0 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dropbear/default.nix
diff --git a/pkgs/tools/networking/dropbear/pass-path.patch b/nixpkgs/pkgs/tools/networking/dropbear/pass-path.patch
index 2ce08b05799..2ce08b05799 100644
--- a/pkgs/tools/networking/dropbear/pass-path.patch
+++ b/nixpkgs/pkgs/tools/networking/dropbear/pass-path.patch
diff --git a/pkgs/tools/networking/dsniff/default.nix b/nixpkgs/pkgs/tools/networking/dsniff/default.nix
index 256e59628aa..256e59628aa 100644
--- a/pkgs/tools/networking/dsniff/default.nix
+++ b/nixpkgs/pkgs/tools/networking/dsniff/default.nix
diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix
index 9d6a1712e67..9d6a1712e67 100644
--- a/pkgs/tools/networking/easyrsa/2.x.nix
+++ b/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix
diff --git a/pkgs/tools/networking/easyrsa/default.nix b/nixpkgs/pkgs/tools/networking/easyrsa/default.nix
index 4d374cece3d..4d374cece3d 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/nixpkgs/pkgs/tools/networking/easyrsa/default.nix
diff --git a/pkgs/tools/networking/easyrsa/fix-paths.patch b/nixpkgs/pkgs/tools/networking/easyrsa/fix-paths.patch
index 82688fa7946..82688fa7946 100644
--- a/pkgs/tools/networking/easyrsa/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/networking/easyrsa/fix-paths.patch
diff --git a/pkgs/tools/networking/eggdrop/default.nix b/nixpkgs/pkgs/tools/networking/eggdrop/default.nix
index 5b85a680efd..5b85a680efd 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/nixpkgs/pkgs/tools/networking/eggdrop/default.nix
diff --git a/pkgs/tools/networking/email/default.nix b/nixpkgs/pkgs/tools/networking/email/default.nix
index d8c60882cd4..d8c60882cd4 100644
--- a/pkgs/tools/networking/email/default.nix
+++ b/nixpkgs/pkgs/tools/networking/email/default.nix
diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix
index 8dd18df28c7..8dd18df28c7 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix
diff --git a/pkgs/tools/networking/fakeroute/default.nix b/nixpkgs/pkgs/tools/networking/fakeroute/default.nix
index d5190331d33..d5190331d33 100644
--- a/pkgs/tools/networking/fakeroute/default.nix
+++ b/nixpkgs/pkgs/tools/networking/fakeroute/default.nix
diff --git a/pkgs/tools/networking/fastd/default.nix b/nixpkgs/pkgs/tools/networking/fastd/default.nix
index 43efe2090f2..43efe2090f2 100644
--- a/pkgs/tools/networking/fastd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/fastd/default.nix
diff --git a/pkgs/tools/networking/fdm/default.nix b/nixpkgs/pkgs/tools/networking/fdm/default.nix
index abb76e633ee..abb76e633ee 100644
--- a/pkgs/tools/networking/fdm/default.nix
+++ b/nixpkgs/pkgs/tools/networking/fdm/default.nix
diff --git a/pkgs/tools/networking/ferm/default.nix b/nixpkgs/pkgs/tools/networking/ferm/default.nix
index 6f1660484e7..6f1660484e7 100644
--- a/pkgs/tools/networking/ferm/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ferm/default.nix
diff --git a/pkgs/tools/networking/filegive/default.nix b/nixpkgs/pkgs/tools/networking/filegive/default.nix
index f9e334d8196..f9e334d8196 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/nixpkgs/pkgs/tools/networking/filegive/default.nix
diff --git a/pkgs/tools/networking/filegive/deps.nix b/nixpkgs/pkgs/tools/networking/filegive/deps.nix
index 24c26219508..24c26219508 100644
--- a/pkgs/tools/networking/filegive/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/filegive/deps.nix
diff --git a/pkgs/tools/networking/findomain/default.nix b/nixpkgs/pkgs/tools/networking/findomain/default.nix
index abc34abd77f..abc34abd77f 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/nixpkgs/pkgs/tools/networking/findomain/default.nix
diff --git a/pkgs/tools/networking/flannel/default.nix b/nixpkgs/pkgs/tools/networking/flannel/default.nix
index d2f0ec2ec63..d2f0ec2ec63 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/nixpkgs/pkgs/tools/networking/flannel/default.nix
diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix
index b5e61bee4df..b5e61bee4df 100644
--- a/pkgs/tools/networking/flvstreamer/default.nix
+++ b/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix
diff --git a/pkgs/tools/networking/fping/default.nix b/nixpkgs/pkgs/tools/networking/fping/default.nix
index 4b5242818b3..4b5242818b3 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/nixpkgs/pkgs/tools/networking/fping/default.nix
diff --git a/pkgs/tools/networking/freebind/default.nix b/nixpkgs/pkgs/tools/networking/freebind/default.nix
index 0c74f14e174..0c74f14e174 100644
--- a/pkgs/tools/networking/freebind/default.nix
+++ b/nixpkgs/pkgs/tools/networking/freebind/default.nix
diff --git a/pkgs/tools/networking/frp/default.nix b/nixpkgs/pkgs/tools/networking/frp/default.nix
index 46ccfc0d24c..46ccfc0d24c 100644
--- a/pkgs/tools/networking/frp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/frp/default.nix
diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix
index 2ea09404e34..2ea09404e34 100644
--- a/pkgs/tools/networking/gandi-cli/default.nix
+++ b/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix
diff --git a/pkgs/tools/networking/getmail/default.nix b/nixpkgs/pkgs/tools/networking/getmail/default.nix
index f107e410678..f107e410678 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/nixpkgs/pkgs/tools/networking/getmail/default.nix
diff --git a/pkgs/tools/networking/gftp/default.nix b/nixpkgs/pkgs/tools/networking/gftp/default.nix
index 9431216e251..9431216e251 100644
--- a/pkgs/tools/networking/gftp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/gftp/default.nix
diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix
index d942dce6a19..d942dce6a19 100644
--- a/pkgs/tools/networking/gmrender-resurrect/default.nix
+++ b/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix
diff --git a/pkgs/tools/networking/gmvault/default.nix b/nixpkgs/pkgs/tools/networking/gmvault/default.nix
index aab5b77351c..aab5b77351c 100644
--- a/pkgs/tools/networking/gmvault/default.nix
+++ b/nixpkgs/pkgs/tools/networking/gmvault/default.nix
diff --git a/pkgs/tools/networking/gmvault/gmvault.py b/nixpkgs/pkgs/tools/networking/gmvault/gmvault.py
index 127036577f3..127036577f3 100644
--- a/pkgs/tools/networking/gmvault/gmvault.py
+++ b/nixpkgs/pkgs/tools/networking/gmvault/gmvault.py
diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix
index 06faa064025..06faa064025 100644
--- a/pkgs/tools/networking/gnirehtet/default.nix
+++ b/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix
diff --git a/pkgs/tools/networking/gnirehtet/paths.patch b/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch
index e5df4b8e4fe..e5df4b8e4fe 100644
--- a/pkgs/tools/networking/gnirehtet/paths.patch
+++ b/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch
diff --git a/pkgs/tools/networking/go-shadowsocks2/default.nix b/nixpkgs/pkgs/tools/networking/go-shadowsocks2/default.nix
index 1591b6acf5b..1591b6acf5b 100644
--- a/pkgs/tools/networking/go-shadowsocks2/default.nix
+++ b/nixpkgs/pkgs/tools/networking/go-shadowsocks2/default.nix
diff --git a/pkgs/tools/networking/go-shadowsocks2/deps.nix b/nixpkgs/pkgs/tools/networking/go-shadowsocks2/deps.nix
index 7fe0c2b6985..7fe0c2b6985 100644
--- a/pkgs/tools/networking/go-shadowsocks2/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/go-shadowsocks2/deps.nix
diff --git a/pkgs/tools/networking/goklp/default.nix b/nixpkgs/pkgs/tools/networking/goklp/default.nix
index c260b47a633..c260b47a633 100644
--- a/pkgs/tools/networking/goklp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/goklp/default.nix
diff --git a/pkgs/tools/networking/goklp/deps.nix b/nixpkgs/pkgs/tools/networking/goklp/deps.nix
index 2f6481f237f..2f6481f237f 100644
--- a/pkgs/tools/networking/goklp/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/goklp/deps.nix
diff --git a/pkgs/tools/networking/gping/default.nix b/nixpkgs/pkgs/tools/networking/gping/default.nix
index 85f13f031b4..85f13f031b4 100644
--- a/pkgs/tools/networking/gping/default.nix
+++ b/nixpkgs/pkgs/tools/networking/gping/default.nix
diff --git a/pkgs/tools/networking/grpcui/default.nix b/nixpkgs/pkgs/tools/networking/grpcui/default.nix
index 58e698ed708..58e698ed708 100644
--- a/pkgs/tools/networking/grpcui/default.nix
+++ b/nixpkgs/pkgs/tools/networking/grpcui/default.nix
diff --git a/pkgs/tools/networking/grpcurl/default.nix b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix
index 12f285c2a60..12f285c2a60 100644
--- a/pkgs/tools/networking/grpcurl/default.nix
+++ b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix
diff --git a/pkgs/tools/networking/grpcurl/deps-darwin.nix b/nixpkgs/pkgs/tools/networking/grpcurl/deps-darwin.nix
index 52afa88708f..52afa88708f 100644
--- a/pkgs/tools/networking/grpcurl/deps-darwin.nix
+++ b/nixpkgs/pkgs/tools/networking/grpcurl/deps-darwin.nix
diff --git a/pkgs/tools/networking/grpcurl/deps-linux.nix b/nixpkgs/pkgs/tools/networking/grpcurl/deps-linux.nix
index e5e775e50fe..e5e775e50fe 100644
--- a/pkgs/tools/networking/grpcurl/deps-linux.nix
+++ b/nixpkgs/pkgs/tools/networking/grpcurl/deps-linux.nix
diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix
index a5e8dc10d34..a5e8dc10d34 100644
--- a/pkgs/tools/networking/guardian-agent/default.nix
+++ b/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix
diff --git a/pkgs/tools/networking/guardian-agent/deps.nix b/nixpkgs/pkgs/tools/networking/guardian-agent/deps.nix
index 950a346ce8b..950a346ce8b 100644
--- a/pkgs/tools/networking/guardian-agent/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/guardian-agent/deps.nix
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix
index 830d27fa6ce..830d27fa6ce 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix
diff --git a/pkgs/tools/networking/gvpe/default.nix b/nixpkgs/pkgs/tools/networking/gvpe/default.nix
index ba59870a6b8..ba59870a6b8 100644
--- a/pkgs/tools/networking/gvpe/default.nix
+++ b/nixpkgs/pkgs/tools/networking/gvpe/default.nix
diff --git a/pkgs/tools/networking/gvpe/gvpe-3.0-glibc-2.26.patch b/nixpkgs/pkgs/tools/networking/gvpe/gvpe-3.0-glibc-2.26.patch
index 9cfb6472c4e..9cfb6472c4e 100644
--- a/pkgs/tools/networking/gvpe/gvpe-3.0-glibc-2.26.patch
+++ b/nixpkgs/pkgs/tools/networking/gvpe/gvpe-3.0-glibc-2.26.patch
diff --git a/pkgs/tools/networking/hans/default.nix b/nixpkgs/pkgs/tools/networking/hans/default.nix
index ccc598b0692..ccc598b0692 100644
--- a/pkgs/tools/networking/hans/default.nix
+++ b/nixpkgs/pkgs/tools/networking/hans/default.nix
diff --git a/pkgs/tools/networking/haproxy/default.nix b/nixpkgs/pkgs/tools/networking/haproxy/default.nix
index 95457b01205..95457b01205 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/nixpkgs/pkgs/tools/networking/haproxy/default.nix
diff --git a/pkgs/tools/networking/horst/default.nix b/nixpkgs/pkgs/tools/networking/horst/default.nix
index 96fb342e27f..96fb342e27f 100644
--- a/pkgs/tools/networking/horst/default.nix
+++ b/nixpkgs/pkgs/tools/networking/horst/default.nix
diff --git a/pkgs/tools/networking/hping/default.nix b/nixpkgs/pkgs/tools/networking/hping/default.nix
index 6e00a6e9afa..6e00a6e9afa 100644
--- a/pkgs/tools/networking/hping/default.nix
+++ b/nixpkgs/pkgs/tools/networking/hping/default.nix
diff --git a/pkgs/tools/networking/hss/default.nix b/nixpkgs/pkgs/tools/networking/hss/default.nix
index 913e76c0f4b..913e76c0f4b 100644
--- a/pkgs/tools/networking/hss/default.nix
+++ b/nixpkgs/pkgs/tools/networking/hss/default.nix
diff --git a/pkgs/tools/networking/htpdate/default.nix b/nixpkgs/pkgs/tools/networking/htpdate/default.nix
index 9bb44b70f11..9bb44b70f11 100644
--- a/pkgs/tools/networking/htpdate/default.nix
+++ b/nixpkgs/pkgs/tools/networking/htpdate/default.nix
diff --git a/pkgs/tools/networking/http-prompt/default.nix b/nixpkgs/pkgs/tools/networking/http-prompt/default.nix
index 9ed2f000f32..9ed2f000f32 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/nixpkgs/pkgs/tools/networking/http-prompt/default.nix
diff --git a/pkgs/tools/networking/httperf/default.nix b/nixpkgs/pkgs/tools/networking/httperf/default.nix
index 271be9c2352..271be9c2352 100644
--- a/pkgs/tools/networking/httperf/default.nix
+++ b/nixpkgs/pkgs/tools/networking/httperf/default.nix
diff --git a/pkgs/tools/networking/httpie/default.nix b/nixpkgs/pkgs/tools/networking/httpie/default.nix
index 38fdab358c9..38fdab358c9 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/nixpkgs/pkgs/tools/networking/httpie/default.nix
diff --git a/pkgs/tools/networking/httpie/strip-venv.patch b/nixpkgs/pkgs/tools/networking/httpie/strip-venv.patch
index 99ea80a3f56..99ea80a3f56 100644
--- a/pkgs/tools/networking/httpie/strip-venv.patch
+++ b/nixpkgs/pkgs/tools/networking/httpie/strip-venv.patch
diff --git a/pkgs/tools/networking/httping/default.nix b/nixpkgs/pkgs/tools/networking/httping/default.nix
index e269a38f821..e269a38f821 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/nixpkgs/pkgs/tools/networking/httping/default.nix
diff --git a/pkgs/tools/networking/httplab/default.nix b/nixpkgs/pkgs/tools/networking/httplab/default.nix
index a7b157d3ebc..a7b157d3ebc 100644
--- a/pkgs/tools/networking/httplab/default.nix
+++ b/nixpkgs/pkgs/tools/networking/httplab/default.nix
diff --git a/pkgs/tools/networking/httplz/cargo-lock.patch b/nixpkgs/pkgs/tools/networking/httplz/cargo-lock.patch
index 5ded54799a7..5ded54799a7 100644
--- a/pkgs/tools/networking/httplz/cargo-lock.patch
+++ b/nixpkgs/pkgs/tools/networking/httplz/cargo-lock.patch
diff --git a/pkgs/tools/networking/httplz/default.nix b/nixpkgs/pkgs/tools/networking/httplz/default.nix
index 55630d7814c..55630d7814c 100644
--- a/pkgs/tools/networking/httplz/default.nix
+++ b/nixpkgs/pkgs/tools/networking/httplz/default.nix
diff --git a/pkgs/tools/networking/httpstat/default.nix b/nixpkgs/pkgs/tools/networking/httpstat/default.nix
index b3700fb9338..b3700fb9338 100644
--- a/pkgs/tools/networking/httpstat/default.nix
+++ b/nixpkgs/pkgs/tools/networking/httpstat/default.nix
diff --git a/pkgs/tools/networking/httptunnel/default.nix b/nixpkgs/pkgs/tools/networking/httptunnel/default.nix
index df62f90ad0b..df62f90ad0b 100644
--- a/pkgs/tools/networking/httptunnel/default.nix
+++ b/nixpkgs/pkgs/tools/networking/httptunnel/default.nix
diff --git a/pkgs/tools/networking/hue-cli/Gemfile b/nixpkgs/pkgs/tools/networking/hue-cli/Gemfile
index 7049659d503..7049659d503 100644
--- a/pkgs/tools/networking/hue-cli/Gemfile
+++ b/nixpkgs/pkgs/tools/networking/hue-cli/Gemfile
diff --git a/pkgs/tools/networking/hue-cli/Gemfile.lock b/nixpkgs/pkgs/tools/networking/hue-cli/Gemfile.lock
index 8109cd96ac2..8109cd96ac2 100644
--- a/pkgs/tools/networking/hue-cli/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/networking/hue-cli/Gemfile.lock
diff --git a/pkgs/tools/networking/hue-cli/default.nix b/nixpkgs/pkgs/tools/networking/hue-cli/default.nix
index b9b4a8eac9d..b9b4a8eac9d 100644
--- a/pkgs/tools/networking/hue-cli/default.nix
+++ b/nixpkgs/pkgs/tools/networking/hue-cli/default.nix
diff --git a/pkgs/tools/networking/hue-cli/gemset.nix b/nixpkgs/pkgs/tools/networking/hue-cli/gemset.nix
index 69d12f25a80..69d12f25a80 100644
--- a/pkgs/tools/networking/hue-cli/gemset.nix
+++ b/nixpkgs/pkgs/tools/networking/hue-cli/gemset.nix
diff --git a/pkgs/tools/networking/hyenae/default.nix b/nixpkgs/pkgs/tools/networking/hyenae/default.nix
index cbcaee4de78..cbcaee4de78 100644
--- a/pkgs/tools/networking/hyenae/default.nix
+++ b/nixpkgs/pkgs/tools/networking/hyenae/default.nix
diff --git a/pkgs/tools/networking/i2p/default.nix b/nixpkgs/pkgs/tools/networking/i2p/default.nix
index 681d5d0e7a9..681d5d0e7a9 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/nixpkgs/pkgs/tools/networking/i2p/default.nix
diff --git a/pkgs/tools/networking/i2p/i2p.patch b/nixpkgs/pkgs/tools/networking/i2p/i2p.patch
index 74031eb7aef..74031eb7aef 100644
--- a/pkgs/tools/networking/i2p/i2p.patch
+++ b/nixpkgs/pkgs/tools/networking/i2p/i2p.patch
diff --git a/pkgs/tools/networking/i2pd/default.nix b/nixpkgs/pkgs/tools/networking/i2pd/default.nix
index 971d8e69686..971d8e69686 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/i2pd/default.nix
diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix
index 72aaaa1e170..72aaaa1e170 100644
--- a/pkgs/tools/networking/ifstat-legacy/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix
diff --git a/pkgs/tools/networking/iftop/default.nix b/nixpkgs/pkgs/tools/networking/iftop/default.nix
index bc6f657f378..bc6f657f378 100644
--- a/pkgs/tools/networking/iftop/default.nix
+++ b/nixpkgs/pkgs/tools/networking/iftop/default.nix
diff --git a/pkgs/tools/networking/imapproxy/default.nix b/nixpkgs/pkgs/tools/networking/imapproxy/default.nix
index 984b0a2f87e..984b0a2f87e 100644
--- a/pkgs/tools/networking/imapproxy/default.nix
+++ b/nixpkgs/pkgs/tools/networking/imapproxy/default.nix
diff --git a/pkgs/tools/networking/imapsync/default.nix b/nixpkgs/pkgs/tools/networking/imapsync/default.nix
index c05928fa34b..c05928fa34b 100644
--- a/pkgs/tools/networking/imapsync/default.nix
+++ b/nixpkgs/pkgs/tools/networking/imapsync/default.nix
diff --git a/pkgs/tools/networking/inadyn/default.nix b/nixpkgs/pkgs/tools/networking/inadyn/default.nix
index 20169121cd9..20169121cd9 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/nixpkgs/pkgs/tools/networking/inadyn/default.nix
diff --git a/pkgs/tools/networking/inetutils/default.nix b/nixpkgs/pkgs/tools/networking/inetutils/default.nix
index 612e3ec0f83..612e3ec0f83 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/nixpkgs/pkgs/tools/networking/inetutils/default.nix
diff --git a/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch b/nixpkgs/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch
index 2592989a90a..2592989a90a 100644
--- a/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch
+++ b/nixpkgs/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch
diff --git a/pkgs/tools/networking/inetutils/service-name.patch b/nixpkgs/pkgs/tools/networking/inetutils/service-name.patch
index e34516313c5..e34516313c5 100644
--- a/pkgs/tools/networking/inetutils/service-name.patch
+++ b/nixpkgs/pkgs/tools/networking/inetutils/service-name.patch
diff --git a/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch b/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch
index d63d4e29daf..d63d4e29daf 100644
--- a/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch
+++ b/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch
diff --git a/pkgs/tools/networking/iodine/default.nix b/nixpkgs/pkgs/tools/networking/iodine/default.nix
index 44bf52c9933..44bf52c9933 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/nixpkgs/pkgs/tools/networking/iodine/default.nix
diff --git a/pkgs/tools/networking/iouyap/default.nix b/nixpkgs/pkgs/tools/networking/iouyap/default.nix
index b49b34d6dc7..b49b34d6dc7 100644
--- a/pkgs/tools/networking/iouyap/default.nix
+++ b/nixpkgs/pkgs/tools/networking/iouyap/default.nix
diff --git a/pkgs/tools/networking/ip2location/default.nix b/nixpkgs/pkgs/tools/networking/ip2location/default.nix
index c3304c385e7..c3304c385e7 100644
--- a/pkgs/tools/networking/ip2location/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ip2location/default.nix
diff --git a/pkgs/tools/networking/ip2unix/default.nix b/nixpkgs/pkgs/tools/networking/ip2unix/default.nix
index d2dbd235e11..d2dbd235e11 100644
--- a/pkgs/tools/networking/ip2unix/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ip2unix/default.nix
diff --git a/pkgs/tools/networking/ipcalc/default.nix b/nixpkgs/pkgs/tools/networking/ipcalc/default.nix
index 2727175f041..2727175f041 100644
--- a/pkgs/tools/networking/ipcalc/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ipcalc/default.nix
diff --git a/pkgs/tools/networking/iperf/2.nix b/nixpkgs/pkgs/tools/networking/iperf/2.nix
index 6494b907a3a..6494b907a3a 100644
--- a/pkgs/tools/networking/iperf/2.nix
+++ b/nixpkgs/pkgs/tools/networking/iperf/2.nix
diff --git a/pkgs/tools/networking/iperf/3.nix b/nixpkgs/pkgs/tools/networking/iperf/3.nix
index bea61b082ec..bea61b082ec 100644
--- a/pkgs/tools/networking/iperf/3.nix
+++ b/nixpkgs/pkgs/tools/networking/iperf/3.nix
diff --git a/pkgs/tools/networking/ipgrep/default.nix b/nixpkgs/pkgs/tools/networking/ipgrep/default.nix
index 6ea930fccaa..6ea930fccaa 100644
--- a/pkgs/tools/networking/ipgrep/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ipgrep/default.nix
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix
index 35aeb23a9a8..35aeb23a9a8 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix
diff --git a/pkgs/tools/networking/isync/default.nix b/nixpkgs/pkgs/tools/networking/isync/default.nix
index e62d819e1ec..e62d819e1ec 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/nixpkgs/pkgs/tools/networking/isync/default.nix
diff --git a/pkgs/tools/networking/jnettop/default.nix b/nixpkgs/pkgs/tools/networking/jnettop/default.nix
index 083ec23af56..083ec23af56 100644
--- a/pkgs/tools/networking/jnettop/default.nix
+++ b/nixpkgs/pkgs/tools/networking/jnettop/default.nix
diff --git a/pkgs/tools/networking/jnettop/no-dns-resolution.patch b/nixpkgs/pkgs/tools/networking/jnettop/no-dns-resolution.patch
index 65928a37300..65928a37300 100644
--- a/pkgs/tools/networking/jnettop/no-dns-resolution.patch
+++ b/nixpkgs/pkgs/tools/networking/jnettop/no-dns-resolution.patch
diff --git a/pkgs/tools/networking/junkie/default.nix b/nixpkgs/pkgs/tools/networking/junkie/default.nix
index 29fe71c9365..29fe71c9365 100644
--- a/pkgs/tools/networking/junkie/default.nix
+++ b/nixpkgs/pkgs/tools/networking/junkie/default.nix
diff --git a/pkgs/tools/networking/jwhois/connect.patch b/nixpkgs/pkgs/tools/networking/jwhois/connect.patch
index c26025a8239..c26025a8239 100644
--- a/pkgs/tools/networking/jwhois/connect.patch
+++ b/nixpkgs/pkgs/tools/networking/jwhois/connect.patch
diff --git a/pkgs/tools/networking/jwhois/default.nix b/nixpkgs/pkgs/tools/networking/jwhois/default.nix
index e9f43da981c..e9f43da981c 100644
--- a/pkgs/tools/networking/jwhois/default.nix
+++ b/nixpkgs/pkgs/tools/networking/jwhois/default.nix
diff --git a/pkgs/tools/networking/jwhois/service-name.patch b/nixpkgs/pkgs/tools/networking/jwhois/service-name.patch
index 170eddbad79..170eddbad79 100644
--- a/pkgs/tools/networking/jwhois/service-name.patch
+++ b/nixpkgs/pkgs/tools/networking/jwhois/service-name.patch
diff --git a/pkgs/tools/networking/kail/default.nix b/nixpkgs/pkgs/tools/networking/kail/default.nix
index 931cfa3a74d..931cfa3a74d 100644
--- a/pkgs/tools/networking/kail/default.nix
+++ b/nixpkgs/pkgs/tools/networking/kail/default.nix
diff --git a/pkgs/tools/networking/kail/deps.nix b/nixpkgs/pkgs/tools/networking/kail/deps.nix
index ee5d2fb8271..ee5d2fb8271 100644
--- a/pkgs/tools/networking/kail/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/kail/deps.nix
diff --git a/pkgs/tools/networking/kea/default.nix b/nixpkgs/pkgs/tools/networking/kea/default.nix
index 3986cadd08a..3986cadd08a 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/nixpkgs/pkgs/tools/networking/kea/default.nix
diff --git a/pkgs/tools/networking/kea/dont-create-var.patch b/nixpkgs/pkgs/tools/networking/kea/dont-create-var.patch
index 385113d160f..385113d160f 100644
--- a/pkgs/tools/networking/kea/dont-create-var.patch
+++ b/nixpkgs/pkgs/tools/networking/kea/dont-create-var.patch
diff --git a/pkgs/tools/networking/keepalived/default.nix b/nixpkgs/pkgs/tools/networking/keepalived/default.nix
index 68d253ef0b8..68d253ef0b8 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/nixpkgs/pkgs/tools/networking/keepalived/default.nix
diff --git a/pkgs/tools/networking/lftp/default.nix b/nixpkgs/pkgs/tools/networking/lftp/default.nix
index 602ada1476a..602ada1476a 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/lftp/default.nix
diff --git a/pkgs/tools/networking/libnids/default.nix b/nixpkgs/pkgs/tools/networking/libnids/default.nix
index ef753127c67..ef753127c67 100644
--- a/pkgs/tools/networking/libnids/default.nix
+++ b/nixpkgs/pkgs/tools/networking/libnids/default.nix
diff --git a/pkgs/tools/networking/libreswan/default.nix b/nixpkgs/pkgs/tools/networking/libreswan/default.nix
index 4c8b926b582..4c8b926b582 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/nixpkgs/pkgs/tools/networking/libreswan/default.nix
diff --git a/pkgs/tools/networking/linkchecker/default.nix b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix
index 3c361fe48ba..3c361fe48ba 100644
--- a/pkgs/tools/networking/linkchecker/default.nix
+++ b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix
diff --git a/pkgs/tools/networking/lldpd/default.nix b/nixpkgs/pkgs/tools/networking/lldpd/default.nix
index 23dbb60767e..23dbb60767e 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/lldpd/default.nix
diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix
index e8a83d38131..e8a83d38131 100644
--- a/pkgs/tools/networking/logmein-hamachi/default.nix
+++ b/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix
diff --git a/pkgs/tools/networking/lsh/default.nix b/nixpkgs/pkgs/tools/networking/lsh/default.nix
index 5d788af1682..5d788af1682 100644
--- a/pkgs/tools/networking/lsh/default.nix
+++ b/nixpkgs/pkgs/tools/networking/lsh/default.nix
diff --git a/pkgs/tools/networking/lsh/lshd-no-root-login.patch b/nixpkgs/pkgs/tools/networking/lsh/lshd-no-root-login.patch
index 9dd81de3fbc..9dd81de3fbc 100644
--- a/pkgs/tools/networking/lsh/lshd-no-root-login.patch
+++ b/nixpkgs/pkgs/tools/networking/lsh/lshd-no-root-login.patch
diff --git a/pkgs/tools/networking/lsh/pam-service-name.patch b/nixpkgs/pkgs/tools/networking/lsh/pam-service-name.patch
index 6a6156855c5..6a6156855c5 100644
--- a/pkgs/tools/networking/lsh/pam-service-name.patch
+++ b/nixpkgs/pkgs/tools/networking/lsh/pam-service-name.patch
diff --git a/pkgs/tools/networking/maildrop/default.nix b/nixpkgs/pkgs/tools/networking/maildrop/default.nix
index 44c8b9a9c4d..44c8b9a9c4d 100644
--- a/pkgs/tools/networking/maildrop/default.nix
+++ b/nixpkgs/pkgs/tools/networking/maildrop/default.nix
diff --git a/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch b/nixpkgs/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch
index 08988f6cde5..08988f6cde5 100644
--- a/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch
+++ b/nixpkgs/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch
diff --git a/pkgs/tools/networking/mailsend/default.nix b/nixpkgs/pkgs/tools/networking/mailsend/default.nix
index c888f354eae..c888f354eae 100644
--- a/pkgs/tools/networking/mailsend/default.nix
+++ b/nixpkgs/pkgs/tools/networking/mailsend/default.nix
diff --git a/pkgs/tools/networking/mailsend/default.upstream b/nixpkgs/pkgs/tools/networking/mailsend/default.upstream
index 3d9862a3de2..3d9862a3de2 100644
--- a/pkgs/tools/networking/mailsend/default.upstream
+++ b/nixpkgs/pkgs/tools/networking/mailsend/default.upstream
diff --git a/pkgs/tools/networking/mailutils/default.nix b/nixpkgs/pkgs/tools/networking/mailutils/default.nix
index dcf377ca0c0..dcf377ca0c0 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/nixpkgs/pkgs/tools/networking/mailutils/default.nix
diff --git a/pkgs/tools/networking/mailutils/fix-build-mb-len-max.patch b/nixpkgs/pkgs/tools/networking/mailutils/fix-build-mb-len-max.patch
index b28dfc5d99c..b28dfc5d99c 100644
--- a/pkgs/tools/networking/mailutils/fix-build-mb-len-max.patch
+++ b/nixpkgs/pkgs/tools/networking/mailutils/fix-build-mb-len-max.patch
diff --git a/pkgs/tools/networking/mailutils/path-to-cat.patch b/nixpkgs/pkgs/tools/networking/mailutils/path-to-cat.patch
index 698ee08f340..698ee08f340 100644
--- a/pkgs/tools/networking/mailutils/path-to-cat.patch
+++ b/nixpkgs/pkgs/tools/networking/mailutils/path-to-cat.patch
diff --git a/pkgs/tools/networking/maphosts/Gemfile b/nixpkgs/pkgs/tools/networking/maphosts/Gemfile
index cf3ea24c436..cf3ea24c436 100644
--- a/pkgs/tools/networking/maphosts/Gemfile
+++ b/nixpkgs/pkgs/tools/networking/maphosts/Gemfile
diff --git a/pkgs/tools/networking/maphosts/Gemfile.lock b/nixpkgs/pkgs/tools/networking/maphosts/Gemfile.lock
index c456210217e..c456210217e 100644
--- a/pkgs/tools/networking/maphosts/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/networking/maphosts/Gemfile.lock
diff --git a/pkgs/tools/networking/maphosts/default.nix b/nixpkgs/pkgs/tools/networking/maphosts/default.nix
index dd9886a65ee..dd9886a65ee 100644
--- a/pkgs/tools/networking/maphosts/default.nix
+++ b/nixpkgs/pkgs/tools/networking/maphosts/default.nix
diff --git a/pkgs/tools/networking/maphosts/gemset.nix b/nixpkgs/pkgs/tools/networking/maphosts/gemset.nix
index 3469d76ea65..3469d76ea65 100644
--- a/pkgs/tools/networking/maphosts/gemset.nix
+++ b/nixpkgs/pkgs/tools/networking/maphosts/gemset.nix
diff --git a/pkgs/tools/networking/maxscale/default.nix b/nixpkgs/pkgs/tools/networking/maxscale/default.nix
index 4288395cdac..4288395cdac 100644
--- a/pkgs/tools/networking/maxscale/default.nix
+++ b/nixpkgs/pkgs/tools/networking/maxscale/default.nix
diff --git a/pkgs/tools/networking/maxscale/getopt.patch b/nixpkgs/pkgs/tools/networking/maxscale/getopt.patch
index db09a8e8f1e..db09a8e8f1e 100644
--- a/pkgs/tools/networking/maxscale/getopt.patch
+++ b/nixpkgs/pkgs/tools/networking/maxscale/getopt.patch
diff --git a/pkgs/tools/networking/mcrcon/default.nix b/nixpkgs/pkgs/tools/networking/mcrcon/default.nix
index 469dd4cceb7..469dd4cceb7 100644
--- a/pkgs/tools/networking/mcrcon/default.nix
+++ b/nixpkgs/pkgs/tools/networking/mcrcon/default.nix
diff --git a/pkgs/tools/networking/megatools/default.nix b/nixpkgs/pkgs/tools/networking/megatools/default.nix
index a8154f26a71..a8154f26a71 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/nixpkgs/pkgs/tools/networking/megatools/default.nix
diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/nixpkgs/pkgs/tools/networking/memtier-benchmark/default.nix
index 075696cfba1..075696cfba1 100644
--- a/pkgs/tools/networking/memtier-benchmark/default.nix
+++ b/nixpkgs/pkgs/tools/networking/memtier-benchmark/default.nix
diff --git a/pkgs/tools/networking/minidlna/default.nix b/nixpkgs/pkgs/tools/networking/minidlna/default.nix
index 49cc5710e59..49cc5710e59 100644
--- a/pkgs/tools/networking/minidlna/default.nix
+++ b/nixpkgs/pkgs/tools/networking/minidlna/default.nix
diff --git a/pkgs/tools/networking/minio-client/default.nix b/nixpkgs/pkgs/tools/networking/minio-client/default.nix
index 3c8d1534684..3c8d1534684 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/nixpkgs/pkgs/tools/networking/minio-client/default.nix
diff --git a/pkgs/tools/networking/minissdpd/default.nix b/nixpkgs/pkgs/tools/networking/minissdpd/default.nix
index 1277a17f9ba..1277a17f9ba 100644
--- a/pkgs/tools/networking/minissdpd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/minissdpd/default.nix
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix
index ebe6a60291a..ebe6a60291a 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix
diff --git a/pkgs/tools/networking/miniupnpc/freebsd.patch b/nixpkgs/pkgs/tools/networking/miniupnpc/freebsd.patch
index 42ae85a8e6b..42ae85a8e6b 100644
--- a/pkgs/tools/networking/miniupnpc/freebsd.patch
+++ b/nixpkgs/pkgs/tools/networking/miniupnpc/freebsd.patch
diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix
index f65c0c63370..f65c0c63370 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix
diff --git a/pkgs/tools/networking/miredo/default.nix b/nixpkgs/pkgs/tools/networking/miredo/default.nix
index 26f6c2498e1..26f6c2498e1 100644
--- a/pkgs/tools/networking/miredo/default.nix
+++ b/nixpkgs/pkgs/tools/networking/miredo/default.nix
diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/nixpkgs/pkgs/tools/networking/mitmproxy/default.nix
index 53369baa01c..53369baa01c 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/nixpkgs/pkgs/tools/networking/mitmproxy/default.nix
diff --git a/pkgs/tools/networking/mitmproxy/pytest5.patch b/nixpkgs/pkgs/tools/networking/mitmproxy/pytest5.patch
index bfbf7253b9c..bfbf7253b9c 100644
--- a/pkgs/tools/networking/mitmproxy/pytest5.patch
+++ b/nixpkgs/pkgs/tools/networking/mitmproxy/pytest5.patch
diff --git a/pkgs/tools/networking/mmsd/default.nix b/nixpkgs/pkgs/tools/networking/mmsd/default.nix
index fee347dd201..fee347dd201 100644
--- a/pkgs/tools/networking/mmsd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/mmsd/default.nix
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix
index 8d173997d71..8d173997d71 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix
diff --git a/pkgs/tools/networking/mosh/default.nix b/nixpkgs/pkgs/tools/networking/mosh/default.nix
index 98d2625aade..98d2625aade 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/nixpkgs/pkgs/tools/networking/mosh/default.nix
diff --git a/pkgs/tools/networking/mosh/ssh_path.patch b/nixpkgs/pkgs/tools/networking/mosh/ssh_path.patch
index cb2a650718a..cb2a650718a 100644
--- a/pkgs/tools/networking/mosh/ssh_path.patch
+++ b/nixpkgs/pkgs/tools/networking/mosh/ssh_path.patch
diff --git a/pkgs/tools/networking/mosh/utempter_path.patch b/nixpkgs/pkgs/tools/networking/mosh/utempter_path.patch
index a981708ffad..a981708ffad 100644
--- a/pkgs/tools/networking/mosh/utempter_path.patch
+++ b/nixpkgs/pkgs/tools/networking/mosh/utempter_path.patch
diff --git a/pkgs/tools/networking/mpack/build-fix.patch b/nixpkgs/pkgs/tools/networking/mpack/build-fix.patch
index 0329bedd07f..0329bedd07f 100644
--- a/pkgs/tools/networking/mpack/build-fix.patch
+++ b/nixpkgs/pkgs/tools/networking/mpack/build-fix.patch
diff --git a/pkgs/tools/networking/mpack/default.nix b/nixpkgs/pkgs/tools/networking/mpack/default.nix
index 5a8af7de36a..5a8af7de36a 100644
--- a/pkgs/tools/networking/mpack/default.nix
+++ b/nixpkgs/pkgs/tools/networking/mpack/default.nix
diff --git a/pkgs/tools/networking/mpack/sendmail-via-execvp.diff b/nixpkgs/pkgs/tools/networking/mpack/sendmail-via-execvp.diff
index 8f10901038d..8f10901038d 100644
--- a/pkgs/tools/networking/mpack/sendmail-via-execvp.diff
+++ b/nixpkgs/pkgs/tools/networking/mpack/sendmail-via-execvp.diff
diff --git a/pkgs/tools/networking/mtr/default.nix b/nixpkgs/pkgs/tools/networking/mtr/default.nix
index 18850fab330..18850fab330 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/nixpkgs/pkgs/tools/networking/mtr/default.nix
diff --git a/pkgs/tools/networking/mu/default.nix b/nixpkgs/pkgs/tools/networking/mu/default.nix
index cdd954e1975..cdd954e1975 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/nixpkgs/pkgs/tools/networking/mu/default.nix
diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/nixpkgs/pkgs/tools/networking/nat-traverse/default.nix
index a4dcfb4a40f..a4dcfb4a40f 100644
--- a/pkgs/tools/networking/nat-traverse/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nat-traverse/default.nix
diff --git a/pkgs/tools/networking/nbd/default.nix b/nixpkgs/pkgs/tools/networking/nbd/default.nix
index 9c443696eda..9c443696eda 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nbd/default.nix
diff --git a/pkgs/tools/networking/ncftp/default.nix b/nixpkgs/pkgs/tools/networking/ncftp/default.nix
index acd9a0e27f8..acd9a0e27f8 100644
--- a/pkgs/tools/networking/ncftp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ncftp/default.nix
diff --git a/pkgs/tools/networking/ndisc6/default.nix b/nixpkgs/pkgs/tools/networking/ndisc6/default.nix
index 43018e401f1..43018e401f1 100644
--- a/pkgs/tools/networking/ndisc6/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ndisc6/default.nix
diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix
index 85de6d13183..85de6d13183 100644
--- a/pkgs/tools/networking/ndjbdns/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix
diff --git a/pkgs/tools/networking/nebula/default.nix b/nixpkgs/pkgs/tools/networking/nebula/default.nix
index 3411aca5551..3411aca5551 100644
--- a/pkgs/tools/networking/nebula/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nebula/default.nix
diff --git a/pkgs/tools/networking/netalyzr/default.nix b/nixpkgs/pkgs/tools/networking/netalyzr/default.nix
index 969084582ae..969084582ae 100644
--- a/pkgs/tools/networking/netalyzr/default.nix
+++ b/nixpkgs/pkgs/tools/networking/netalyzr/default.nix
diff --git a/pkgs/tools/networking/netboot/default.nix b/nixpkgs/pkgs/tools/networking/netboot/default.nix
index 7a1eac59eea..7a1eac59eea 100644
--- a/pkgs/tools/networking/netboot/default.nix
+++ b/nixpkgs/pkgs/tools/networking/netboot/default.nix
diff --git a/pkgs/tools/networking/netcat/default.nix b/nixpkgs/pkgs/tools/networking/netcat/default.nix
index 47ec804e5d4..47ec804e5d4 100644
--- a/pkgs/tools/networking/netcat/default.nix
+++ b/nixpkgs/pkgs/tools/networking/netcat/default.nix
diff --git a/pkgs/tools/networking/nethogs/default.nix b/nixpkgs/pkgs/tools/networking/nethogs/default.nix
index a85d4d7ad10..a85d4d7ad10 100644
--- a/pkgs/tools/networking/nethogs/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nethogs/default.nix
diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix
index de53cfdd224..de53cfdd224 100644
--- a/pkgs/tools/networking/netkit/tftp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix
diff --git a/pkgs/tools/networking/netmask/default.nix b/nixpkgs/pkgs/tools/networking/netmask/default.nix
index 864838bdd39..864838bdd39 100644
--- a/pkgs/tools/networking/netmask/default.nix
+++ b/nixpkgs/pkgs/tools/networking/netmask/default.nix
diff --git a/pkgs/tools/networking/netrw/default.nix b/nixpkgs/pkgs/tools/networking/netrw/default.nix
index dfd355237dc..dfd355237dc 100644
--- a/pkgs/tools/networking/netrw/default.nix
+++ b/nixpkgs/pkgs/tools/networking/netrw/default.nix
diff --git a/pkgs/tools/networking/netselect/default.nix b/nixpkgs/pkgs/tools/networking/netselect/default.nix
index c40f43c214f..c40f43c214f 100644
--- a/pkgs/tools/networking/netselect/default.nix
+++ b/nixpkgs/pkgs/tools/networking/netselect/default.nix
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix
index 8da36d72fda..8da36d72fda 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix
diff --git a/pkgs/tools/networking/nettee/default.nix b/nixpkgs/pkgs/tools/networking/nettee/default.nix
index d95171807df..d95171807df 100644
--- a/pkgs/tools/networking/nettee/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nettee/default.nix
diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix
index 131ec675115..131ec675115 100644
--- a/pkgs/tools/networking/network-manager/0.9.8/default.nix
+++ b/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix
diff --git a/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch b/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch
index 17c2966b706..17c2966b706 100644
--- a/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch
+++ b/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch
diff --git a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch b/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch
index 9ebc080ba96..9ebc080ba96 100644
--- a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch
+++ b/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch
diff --git a/pkgs/tools/networking/network-manager/applet.nix b/nixpkgs/pkgs/tools/networking/network-manager/applet.nix
index 69b454ea72e..69b454ea72e 100644
--- a/pkgs/tools/networking/network-manager/applet.nix
+++ b/nixpkgs/pkgs/tools/networking/network-manager/applet.nix
diff --git a/pkgs/tools/networking/network-manager/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/default.nix
index 1a33a735cfe..1a33a735cfe 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/nixpkgs/pkgs/tools/networking/network-manager/default.nix
diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/nixpkgs/pkgs/tools/networking/network-manager/dmenu.nix
index 93a169a3fb0..93a169a3fb0 100644
--- a/pkgs/tools/networking/network-manager/dmenu.nix
+++ b/nixpkgs/pkgs/tools/networking/network-manager/dmenu.nix
diff --git a/pkgs/tools/networking/network-manager/fix-install-paths.patch b/nixpkgs/pkgs/tools/networking/network-manager/fix-install-paths.patch
index 02a006c1c3d..02a006c1c3d 100644
--- a/pkgs/tools/networking/network-manager/fix-install-paths.patch
+++ b/nixpkgs/pkgs/tools/networking/network-manager/fix-install-paths.patch
diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch
index af35fc0a36b..af35fc0a36b 100644
--- a/pkgs/tools/networking/network-manager/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
index 94a4c4b362a..94a4c4b362a 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
+++ b/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch b/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch
index a1241b6738c..a1241b6738c 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch
diff --git a/pkgs/tools/networking/network-manager/hardcode-gsettings.patch b/nixpkgs/pkgs/tools/networking/network-manager/hardcode-gsettings.patch
index a480fd6d91e..a480fd6d91e 100644
--- a/pkgs/tools/networking/network-manager/hardcode-gsettings.patch
+++ b/nixpkgs/pkgs/tools/networking/network-manager/hardcode-gsettings.patch
diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/iodine/default.nix
index 29c0d550fe2..29c0d550fe2 100644
--- a/pkgs/tools/networking/network-manager/iodine/default.nix
+++ b/nixpkgs/pkgs/tools/networking/network-manager/iodine/default.nix
diff --git a/pkgs/tools/networking/network-manager/iodine/fix-paths.patch b/nixpkgs/pkgs/tools/networking/network-manager/iodine/fix-paths.patch
index d32dbfadbaf..d32dbfadbaf 100644
--- a/pkgs/tools/networking/network-manager/iodine/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/networking/network-manager/iodine/fix-paths.patch
diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix
index e4ab74f08e3..e4ab74f08e3 100644
--- a/pkgs/tools/networking/network-manager/l2tp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix
diff --git a/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch b/nixpkgs/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch
index 531672c3936..531672c3936 100644
--- a/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch
diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/openconnect/default.nix
index 3c1a8d11042..3c1a8d11042 100644
--- a/pkgs/tools/networking/network-manager/openconnect/default.nix
+++ b/nixpkgs/pkgs/tools/networking/network-manager/openconnect/default.nix
diff --git a/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch b/nixpkgs/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch
index 9b342f5bd08..9b342f5bd08 100644
--- a/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch
diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix
index 2762b12a364..2762b12a364 100644
--- a/pkgs/tools/networking/network-manager/openvpn/default.nix
+++ b/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix
diff --git a/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch b/nixpkgs/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch
index b735da28dca..b735da28dca 100644
--- a/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix
index 843985bfa3e..843985bfa3e 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix
diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/vpnc/default.nix
index 66392325574..66392325574 100644
--- a/pkgs/tools/networking/network-manager/vpnc/default.nix
+++ b/nixpkgs/pkgs/tools/networking/network-manager/vpnc/default.nix
diff --git a/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch b/nixpkgs/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch
index 98238ac01f7..98238ac01f7 100644
--- a/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch
diff --git a/pkgs/tools/networking/nfdump/default.nix b/nixpkgs/pkgs/tools/networking/nfdump/default.nix
index 0ae309cf94d..0ae309cf94d 100644
--- a/pkgs/tools/networking/nfdump/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nfdump/default.nix
diff --git a/pkgs/tools/networking/nfstrace/default.nix b/nixpkgs/pkgs/tools/networking/nfstrace/default.nix
index 88510b9b887..88510b9b887 100644
--- a/pkgs/tools/networking/nfstrace/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nfstrace/default.nix
diff --git a/pkgs/tools/networking/ngrep/default.nix b/nixpkgs/pkgs/tools/networking/ngrep/default.nix
index ab8da6236cf..ab8da6236cf 100644
--- a/pkgs/tools/networking/ngrep/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ngrep/default.nix
diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix
index 19ae72aaac0..19ae72aaac0 100644
--- a/pkgs/tools/networking/ngrok-1/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix
diff --git a/pkgs/tools/networking/ngrok-1/deps.nix b/nixpkgs/pkgs/tools/networking/ngrok-1/deps.nix
index 1db3c3e6519..1db3c3e6519 100644
--- a/pkgs/tools/networking/ngrok-1/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/ngrok-1/deps.nix
diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix
index a0d6171efe2..a0d6171efe2 100644
--- a/pkgs/tools/networking/ngrok-2/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix
diff --git a/pkgs/tools/networking/ngrok-2/update.sh b/nixpkgs/pkgs/tools/networking/ngrok-2/update.sh
index 7908a1524e5..7908a1524e5 100755
--- a/pkgs/tools/networking/ngrok-2/update.sh
+++ b/nixpkgs/pkgs/tools/networking/ngrok-2/update.sh
diff --git a/pkgs/tools/networking/ngrok-2/versions.json b/nixpkgs/pkgs/tools/networking/ngrok-2/versions.json
index 656e6a640e5..656e6a640e5 100644
--- a/pkgs/tools/networking/ngrok-2/versions.json
+++ b/nixpkgs/pkgs/tools/networking/ngrok-2/versions.json
diff --git a/pkgs/tools/networking/noip/default.nix b/nixpkgs/pkgs/tools/networking/noip/default.nix
index 0ef2ce50867..0ef2ce50867 100644
--- a/pkgs/tools/networking/noip/default.nix
+++ b/nixpkgs/pkgs/tools/networking/noip/default.nix
diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix
index 9f83949e8de..9f83949e8de 100644
--- a/pkgs/tools/networking/nss-mdns/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix
diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix
index 569a6d118e7..569a6d118e7 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix
diff --git a/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch b/nixpkgs/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch
index d794efeac08..d794efeac08 100644
--- a/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch
+++ b/nixpkgs/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch
diff --git a/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch b/nixpkgs/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch
index 50ed1daebd4..50ed1daebd4 100644
--- a/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch
+++ b/nixpkgs/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch
diff --git a/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch b/nixpkgs/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch
index 51c9a706f89..51c9a706f89 100644
--- a/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch
+++ b/nixpkgs/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch
diff --git a/pkgs/tools/networking/ntopng/default.nix b/nixpkgs/pkgs/tools/networking/ntopng/default.nix
index 68f80106031..68f80106031 100644
--- a/pkgs/tools/networking/ntopng/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ntopng/default.nix
diff --git a/pkgs/tools/networking/ntp/default.nix b/nixpkgs/pkgs/tools/networking/ntp/default.nix
index b890e07845e..b890e07845e 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ntp/default.nix
diff --git a/pkgs/tools/networking/ntp/seccomp.patch b/nixpkgs/pkgs/tools/networking/ntp/seccomp.patch
index c75536dac7f..c75536dac7f 100644
--- a/pkgs/tools/networking/ntp/seccomp.patch
+++ b/nixpkgs/pkgs/tools/networking/ntp/seccomp.patch
diff --git a/pkgs/tools/networking/nuttcp/default.nix b/nixpkgs/pkgs/tools/networking/nuttcp/default.nix
index f01d5ccada1..f01d5ccada1 100644
--- a/pkgs/tools/networking/nuttcp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nuttcp/default.nix
diff --git a/pkgs/tools/networking/nylon/configure-use-solib.patch b/nixpkgs/pkgs/tools/networking/nylon/configure-use-solib.patch
index 02491d7660e..02491d7660e 100644
--- a/pkgs/tools/networking/nylon/configure-use-solib.patch
+++ b/nixpkgs/pkgs/tools/networking/nylon/configure-use-solib.patch
diff --git a/pkgs/tools/networking/nylon/default.nix b/nixpkgs/pkgs/tools/networking/nylon/default.nix
index 5c8f98101ee..5c8f98101ee 100644
--- a/pkgs/tools/networking/nylon/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nylon/default.nix
diff --git a/pkgs/tools/networking/nyx/default.nix b/nixpkgs/pkgs/tools/networking/nyx/default.nix
index 901187c6abb..901187c6abb 100644
--- a/pkgs/tools/networking/nyx/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nyx/default.nix
diff --git a/pkgs/tools/networking/nzbget/default.nix b/nixpkgs/pkgs/tools/networking/nzbget/default.nix
index b3c77f5b797..b3c77f5b797 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/nixpkgs/pkgs/tools/networking/nzbget/default.nix
diff --git a/pkgs/tools/networking/obfs4/default.nix b/nixpkgs/pkgs/tools/networking/obfs4/default.nix
index 005abb0968b..005abb0968b 100644
--- a/pkgs/tools/networking/obfs4/default.nix
+++ b/nixpkgs/pkgs/tools/networking/obfs4/default.nix
diff --git a/pkgs/tools/networking/ocproxy/default.nix b/nixpkgs/pkgs/tools/networking/ocproxy/default.nix
index 729f5b31998..729f5b31998 100644
--- a/pkgs/tools/networking/ocproxy/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ocproxy/default.nix
diff --git a/pkgs/tools/networking/ocserv/default.nix b/nixpkgs/pkgs/tools/networking/ocserv/default.nix
index 8d4b340ea2b..8d4b340ea2b 100644
--- a/pkgs/tools/networking/ocserv/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ocserv/default.nix
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix
index 983ba018473..983ba018473 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix
diff --git a/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch b/nixpkgs/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
index eb97209a693..eb97209a693 100644
--- a/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
+++ b/nixpkgs/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
diff --git a/pkgs/tools/networking/ofono/default.nix b/nixpkgs/pkgs/tools/networking/ofono/default.nix
index 5cae8a61203..5cae8a61203 100644
--- a/pkgs/tools/networking/ofono/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ofono/default.nix
diff --git a/pkgs/tools/networking/olsrd/default.nix b/nixpkgs/pkgs/tools/networking/olsrd/default.nix
index cff4b7e9713..cff4b7e9713 100644
--- a/pkgs/tools/networking/olsrd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/olsrd/default.nix
diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix
index 1cb8e02130f..1cb8e02130f 100644
--- a/pkgs/tools/networking/openapi-generator-cli/default.nix
+++ b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix
diff --git a/pkgs/tools/networking/openconnect/default.nix b/nixpkgs/pkgs/tools/networking/openconnect/default.nix
index a926ef1e1dd..a926ef1e1dd 100644
--- a/pkgs/tools/networking/openconnect/default.nix
+++ b/nixpkgs/pkgs/tools/networking/openconnect/default.nix
diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix
index 68d18bff777..68d18bff777 100644
--- a/pkgs/tools/networking/openconnect_pa/default.nix
+++ b/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix
diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix
index d1a73f1c148..d1a73f1c148 100644
--- a/pkgs/tools/networking/openfortivpn/default.nix
+++ b/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix
diff --git a/pkgs/tools/networking/openntpd/default.nix b/nixpkgs/pkgs/tools/networking/openntpd/default.nix
index 9cfb24ce95d..9cfb24ce95d 100644
--- a/pkgs/tools/networking/openntpd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/openntpd/default.nix
diff --git a/pkgs/tools/networking/openresolv/default.nix b/nixpkgs/pkgs/tools/networking/openresolv/default.nix
index 423282aa8c1..423282aa8c1 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/nixpkgs/pkgs/tools/networking/openresolv/default.nix
diff --git a/pkgs/tools/networking/opensm/default.nix b/nixpkgs/pkgs/tools/networking/opensm/default.nix
index e0a0dcd56cb..e0a0dcd56cb 100644
--- a/pkgs/tools/networking/opensm/default.nix
+++ b/nixpkgs/pkgs/tools/networking/opensm/default.nix
diff --git a/pkgs/tools/networking/openssh/default.nix b/nixpkgs/pkgs/tools/networking/openssh/default.nix
index 90ecba0891d..90ecba0891d 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/nixpkgs/pkgs/tools/networking/openssh/default.nix
diff --git a/pkgs/tools/networking/openssh/dont_create_privsep_path.patch b/nixpkgs/pkgs/tools/networking/openssh/dont_create_privsep_path.patch
index 23f3ab67a08..23f3ab67a08 100644
--- a/pkgs/tools/networking/openssh/dont_create_privsep_path.patch
+++ b/nixpkgs/pkgs/tools/networking/openssh/dont_create_privsep_path.patch
diff --git a/pkgs/tools/networking/openssh/locale_archive.patch b/nixpkgs/pkgs/tools/networking/openssh/locale_archive.patch
index 3fe4a21ea47..3fe4a21ea47 100644
--- a/pkgs/tools/networking/openssh/locale_archive.patch
+++ b/nixpkgs/pkgs/tools/networking/openssh/locale_archive.patch
diff --git a/pkgs/tools/networking/openssh/ssh-keysign.patch b/nixpkgs/pkgs/tools/networking/openssh/ssh-keysign.patch
index 7258f4a4db1..7258f4a4db1 100644
--- a/pkgs/tools/networking/openssh/ssh-keysign.patch
+++ b/nixpkgs/pkgs/tools/networking/openssh/ssh-keysign.patch
diff --git a/pkgs/tools/networking/openvpn/default.nix b/nixpkgs/pkgs/tools/networking/openvpn/default.nix
index c8aa2c1f5c5..c8aa2c1f5c5 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/nixpkgs/pkgs/tools/networking/openvpn/default.nix
diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/nixpkgs/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix
index 35b577ac37e..35b577ac37e 100644
--- a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix
+++ b/nixpkgs/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix
diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
index d86934d079b..d86934d079b 100644
--- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
+++ b/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix
index 0f7e8f2c445..0f7e8f2c445 100644
--- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix
+++ b/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix
diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
index ddb3cc8e377..ddb3cc8e377 100644
--- a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
+++ b/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix
index 264c6fd4e16..264c6fd4e16 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix
diff --git a/pkgs/tools/networking/p2p/azureus/builder.sh b/nixpkgs/pkgs/tools/networking/p2p/azureus/builder.sh
index 9d41dba2e43..9d41dba2e43 100644
--- a/pkgs/tools/networking/p2p/azureus/builder.sh
+++ b/nixpkgs/pkgs/tools/networking/p2p/azureus/builder.sh
diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix
index 4fcfc251f3f..4fcfc251f3f 100644
--- a/pkgs/tools/networking/p2p/azureus/default.nix
+++ b/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix
diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
index 70e36cb7ec5..70e36cb7ec5 100644
--- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
+++ b/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/nixpkgs/pkgs/tools/networking/p2p/libtorrent/default.nix
index f750e3b1bfe..f750e3b1bfe 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/nixpkgs/pkgs/tools/networking/p2p/libtorrent/default.nix
diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix
index 2ca31a6a1e7..2ca31a6a1e7 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix
diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/nixpkgs/pkgs/tools/networking/p2p/seeks/default.nix
index 2a89e419b2e..2a89e419b2e 100644
--- a/pkgs/tools/networking/p2p/seeks/default.nix
+++ b/nixpkgs/pkgs/tools/networking/p2p/seeks/default.nix
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index e8a4261ed12..e8a4261ed12 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
diff --git a/pkgs/tools/networking/packetdrill/default.nix b/nixpkgs/pkgs/tools/networking/packetdrill/default.nix
index 623645efc0c..623645efc0c 100644
--- a/pkgs/tools/networking/packetdrill/default.nix
+++ b/nixpkgs/pkgs/tools/networking/packetdrill/default.nix
diff --git a/pkgs/tools/networking/packetdrill/nix.patch b/nixpkgs/pkgs/tools/networking/packetdrill/nix.patch
index 6bad14421b9..6bad14421b9 100644
--- a/pkgs/tools/networking/packetdrill/nix.patch
+++ b/nixpkgs/pkgs/tools/networking/packetdrill/nix.patch
diff --git a/pkgs/tools/networking/pacparser/default.nix b/nixpkgs/pkgs/tools/networking/pacparser/default.nix
index 211256ea72b..211256ea72b 100644
--- a/pkgs/tools/networking/pacparser/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pacparser/default.nix
diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/nixpkgs/pkgs/tools/networking/par2cmdline/default.nix
index 9bc4c178665..9bc4c178665 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/nixpkgs/pkgs/tools/networking/par2cmdline/default.nix
diff --git a/pkgs/tools/networking/pcapc/default.nix b/nixpkgs/pkgs/tools/networking/pcapc/default.nix
index 663e04db460..663e04db460 100644
--- a/pkgs/tools/networking/pcapc/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pcapc/default.nix
diff --git a/pkgs/tools/networking/pcapfix/default.nix b/nixpkgs/pkgs/tools/networking/pcapfix/default.nix
index 92df5d55524..92df5d55524 100644
--- a/pkgs/tools/networking/pcapfix/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pcapfix/default.nix
diff --git a/pkgs/tools/networking/pdnsd/default.nix b/nixpkgs/pkgs/tools/networking/pdnsd/default.nix
index f5d30fa32a8..f5d30fa32a8 100644
--- a/pkgs/tools/networking/pdnsd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pdnsd/default.nix
diff --git a/pkgs/tools/networking/pdsh/default.nix b/nixpkgs/pkgs/tools/networking/pdsh/default.nix
index 68aa356261a..68aa356261a 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pdsh/default.nix
diff --git a/pkgs/tools/networking/persepolis/default.nix b/nixpkgs/pkgs/tools/networking/persepolis/default.nix
index 7412bc568a2..7412bc568a2 100644
--- a/pkgs/tools/networking/persepolis/default.nix
+++ b/nixpkgs/pkgs/tools/networking/persepolis/default.nix
diff --git a/pkgs/tools/networking/philter/default.nix b/nixpkgs/pkgs/tools/networking/philter/default.nix
index c8b44116846..c8b44116846 100644
--- a/pkgs/tools/networking/philter/default.nix
+++ b/nixpkgs/pkgs/tools/networking/philter/default.nix
diff --git a/pkgs/tools/networking/phodav/default.nix b/nixpkgs/pkgs/tools/networking/phodav/default.nix
index 0d7b30ae152..0d7b30ae152 100644
--- a/pkgs/tools/networking/phodav/default.nix
+++ b/nixpkgs/pkgs/tools/networking/phodav/default.nix
diff --git a/pkgs/tools/networking/photon/default.nix b/nixpkgs/pkgs/tools/networking/photon/default.nix
index 8d75ea413ec..8d75ea413ec 100644
--- a/pkgs/tools/networking/photon/default.nix
+++ b/nixpkgs/pkgs/tools/networking/photon/default.nix
diff --git a/pkgs/tools/networking/photon/destdir.patch b/nixpkgs/pkgs/tools/networking/photon/destdir.patch
index e6cf997f2e7..e6cf997f2e7 100644
--- a/pkgs/tools/networking/photon/destdir.patch
+++ b/nixpkgs/pkgs/tools/networking/photon/destdir.patch
diff --git a/pkgs/tools/networking/pingtcp/default.nix b/nixpkgs/pkgs/tools/networking/pingtcp/default.nix
index d791f6b91d9..d791f6b91d9 100644
--- a/pkgs/tools/networking/pingtcp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pingtcp/default.nix
diff --git a/pkgs/tools/networking/pirate-get/default.nix b/nixpkgs/pkgs/tools/networking/pirate-get/default.nix
index b92d255b719..b92d255b719 100644
--- a/pkgs/tools/networking/pirate-get/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pirate-get/default.nix
diff --git a/pkgs/tools/networking/pixiewps/default.nix b/nixpkgs/pkgs/tools/networking/pixiewps/default.nix
index 8bbf589f3b3..8bbf589f3b3 100644
--- a/pkgs/tools/networking/pixiewps/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pixiewps/default.nix
diff --git a/pkgs/tools/networking/pmacct/default.nix b/nixpkgs/pkgs/tools/networking/pmacct/default.nix
index 5d0c5cccded..5d0c5cccded 100644
--- a/pkgs/tools/networking/pmacct/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pmacct/default.nix
diff --git a/pkgs/tools/networking/polygraph/default.nix b/nixpkgs/pkgs/tools/networking/polygraph/default.nix
index bdc6e7b67f7..bdc6e7b67f7 100644
--- a/pkgs/tools/networking/polygraph/default.nix
+++ b/nixpkgs/pkgs/tools/networking/polygraph/default.nix
diff --git a/pkgs/tools/networking/polysh/default.nix b/nixpkgs/pkgs/tools/networking/polysh/default.nix
index cf963068d1c..cf963068d1c 100644
--- a/pkgs/tools/networking/polysh/default.nix
+++ b/nixpkgs/pkgs/tools/networking/polysh/default.nix
diff --git a/pkgs/tools/networking/ppp/default.nix b/nixpkgs/pkgs/tools/networking/ppp/default.nix
index 0efef74f6c3..0efef74f6c3 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ppp/default.nix
diff --git a/pkgs/tools/networking/ppp/musl-fix-headers.patch b/nixpkgs/pkgs/tools/networking/ppp/musl-fix-headers.patch
index 030cc97d157..030cc97d157 100644
--- a/pkgs/tools/networking/ppp/musl-fix-headers.patch
+++ b/nixpkgs/pkgs/tools/networking/ppp/musl-fix-headers.patch
diff --git a/pkgs/tools/networking/ppp/nix-purity.patch b/nixpkgs/pkgs/tools/networking/ppp/nix-purity.patch
index c74935c0ec8..c74935c0ec8 100644
--- a/pkgs/tools/networking/ppp/nix-purity.patch
+++ b/nixpkgs/pkgs/tools/networking/ppp/nix-purity.patch
diff --git a/pkgs/tools/networking/ppp/nonpriv.patch b/nixpkgs/pkgs/tools/networking/ppp/nonpriv.patch
index df6faaf8383..df6faaf8383 100644
--- a/pkgs/tools/networking/ppp/nonpriv.patch
+++ b/nixpkgs/pkgs/tools/networking/ppp/nonpriv.patch
diff --git a/pkgs/tools/networking/pptp/default.nix b/nixpkgs/pkgs/tools/networking/pptp/default.nix
index 6a97abfab59..6a97abfab59 100644
--- a/pkgs/tools/networking/pptp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pptp/default.nix
diff --git a/pkgs/tools/networking/pptpd/default.nix b/nixpkgs/pkgs/tools/networking/pptpd/default.nix
index f373f594df8..f373f594df8 100644
--- a/pkgs/tools/networking/pptpd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pptpd/default.nix
diff --git a/pkgs/tools/networking/prettyping/default.nix b/nixpkgs/pkgs/tools/networking/prettyping/default.nix
index fb0508b3c90..fb0508b3c90 100644
--- a/pkgs/tools/networking/prettyping/default.nix
+++ b/nixpkgs/pkgs/tools/networking/prettyping/default.nix
diff --git a/pkgs/tools/networking/privoxy/default.nix b/nixpkgs/pkgs/tools/networking/privoxy/default.nix
index 848a99f7771..848a99f7771 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/nixpkgs/pkgs/tools/networking/privoxy/default.nix
diff --git a/pkgs/tools/networking/proxychains/default.nix b/nixpkgs/pkgs/tools/networking/proxychains/default.nix
index 52ef43838c2..52ef43838c2 100644
--- a/pkgs/tools/networking/proxychains/default.nix
+++ b/nixpkgs/pkgs/tools/networking/proxychains/default.nix
diff --git a/pkgs/tools/networking/pssh/default.nix b/nixpkgs/pkgs/tools/networking/pssh/default.nix
index 43e465e05b6..43e465e05b6 100644
--- a/pkgs/tools/networking/pssh/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pssh/default.nix
diff --git a/pkgs/tools/networking/pwnat/default.nix b/nixpkgs/pkgs/tools/networking/pwnat/default.nix
index 9e06a644145..9e06a644145 100644
--- a/pkgs/tools/networking/pwnat/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pwnat/default.nix
diff --git a/pkgs/tools/networking/py-wmi-client/default.nix b/nixpkgs/pkgs/tools/networking/py-wmi-client/default.nix
index 7a277400289..7a277400289 100644
--- a/pkgs/tools/networking/py-wmi-client/default.nix
+++ b/nixpkgs/pkgs/tools/networking/py-wmi-client/default.nix
diff --git a/pkgs/tools/networking/pykms/default.nix b/nixpkgs/pkgs/tools/networking/pykms/default.nix
index e1a13b73120..e1a13b73120 100644
--- a/pkgs/tools/networking/pykms/default.nix
+++ b/nixpkgs/pkgs/tools/networking/pykms/default.nix
diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix
index b95d0facda8..b95d0facda8 100644
--- a/pkgs/tools/networking/qr-filetransfer/default.nix
+++ b/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix
diff --git a/pkgs/tools/networking/qr-filetransfer/deps.nix b/nixpkgs/pkgs/tools/networking/qr-filetransfer/deps.nix
index a15dd968943..a15dd968943 100644
--- a/pkgs/tools/networking/qr-filetransfer/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/qr-filetransfer/deps.nix
diff --git a/pkgs/tools/networking/quickserve/default.nix b/nixpkgs/pkgs/tools/networking/quickserve/default.nix
index 22589582e3b..22589582e3b 100644
--- a/pkgs/tools/networking/quickserve/default.nix
+++ b/nixpkgs/pkgs/tools/networking/quickserve/default.nix
diff --git a/pkgs/tools/networking/quicktun/default.nix b/nixpkgs/pkgs/tools/networking/quicktun/default.nix
index 87071e23a96..87071e23a96 100644
--- a/pkgs/tools/networking/quicktun/default.nix
+++ b/nixpkgs/pkgs/tools/networking/quicktun/default.nix
diff --git a/pkgs/tools/networking/quicktun/tar-1.30.diff b/nixpkgs/pkgs/tools/networking/quicktun/tar-1.30.diff
index 88498e54280..88498e54280 100644
--- a/pkgs/tools/networking/quicktun/tar-1.30.diff
+++ b/nixpkgs/pkgs/tools/networking/quicktun/tar-1.30.diff
diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix
index 5460bf80a07..5460bf80a07 100644
--- a/pkgs/tools/networking/radsecproxy/default.nix
+++ b/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix
diff --git a/pkgs/tools/networking/radvd/default.nix b/nixpkgs/pkgs/tools/networking/radvd/default.nix
index 30e706d6673..30e706d6673 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/radvd/default.nix
diff --git a/pkgs/tools/networking/ratools/default.nix b/nixpkgs/pkgs/tools/networking/ratools/default.nix
index f5353db6803..f5353db6803 100644
--- a/pkgs/tools/networking/ratools/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ratools/default.nix
diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/nixpkgs/pkgs/tools/networking/reaver-wps-t6x/default.nix
index 2d239180a93..2d239180a93 100644
--- a/pkgs/tools/networking/reaver-wps-t6x/default.nix
+++ b/nixpkgs/pkgs/tools/networking/reaver-wps-t6x/default.nix
diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/nixpkgs/pkgs/tools/networking/reaver-wps/default.nix
index 864a7fb5e61..864a7fb5e61 100644
--- a/pkgs/tools/networking/reaver-wps/default.nix
+++ b/nixpkgs/pkgs/tools/networking/reaver-wps/default.nix
diff --git a/pkgs/tools/networking/redir/default.nix b/nixpkgs/pkgs/tools/networking/redir/default.nix
index 1a6efb065e2..1a6efb065e2 100644
--- a/pkgs/tools/networking/redir/default.nix
+++ b/nixpkgs/pkgs/tools/networking/redir/default.nix
diff --git a/pkgs/tools/networking/redsocks/default.nix b/nixpkgs/pkgs/tools/networking/redsocks/default.nix
index 32a30f48ec6..32a30f48ec6 100644
--- a/pkgs/tools/networking/redsocks/default.nix
+++ b/nixpkgs/pkgs/tools/networking/redsocks/default.nix
diff --git a/pkgs/tools/networking/ripmime/default.nix b/nixpkgs/pkgs/tools/networking/ripmime/default.nix
index ae84d9662aa..ae84d9662aa 100644
--- a/pkgs/tools/networking/ripmime/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ripmime/default.nix
diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix
index bdb526c7054..bdb526c7054 100644
--- a/pkgs/tools/networking/rp-pppoe/default.nix
+++ b/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix
diff --git a/pkgs/tools/networking/s3cmd/default.nix b/nixpkgs/pkgs/tools/networking/s3cmd/default.nix
index 31b111f2b83..31b111f2b83 100644
--- a/pkgs/tools/networking/s3cmd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/s3cmd/default.nix
diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/nixpkgs/pkgs/tools/networking/s3gof3r/default.nix
index d53d60333ba..d53d60333ba 100644
--- a/pkgs/tools/networking/s3gof3r/default.nix
+++ b/nixpkgs/pkgs/tools/networking/s3gof3r/default.nix
diff --git a/pkgs/tools/networking/s3gof3r/deps.nix b/nixpkgs/pkgs/tools/networking/s3gof3r/deps.nix
index 49c5d600be2..49c5d600be2 100644
--- a/pkgs/tools/networking/s3gof3r/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/s3gof3r/deps.nix
diff --git a/pkgs/tools/networking/s4cmd/default.nix b/nixpkgs/pkgs/tools/networking/s4cmd/default.nix
index 8088cc0ec4d..8088cc0ec4d 100644
--- a/pkgs/tools/networking/s4cmd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/s4cmd/default.nix
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/nixpkgs/pkgs/tools/networking/s6-dns/default.nix
index 66bdcbbba54..66bdcbbba54 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/nixpkgs/pkgs/tools/networking/s6-dns/default.nix
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/nixpkgs/pkgs/tools/networking/s6-networking/default.nix
index 1551d6da97b..1551d6da97b 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/nixpkgs/pkgs/tools/networking/s6-networking/default.nix
diff --git a/pkgs/tools/networking/saldl/default.nix b/nixpkgs/pkgs/tools/networking/saldl/default.nix
index d51e5515bd6..d51e5515bd6 100644
--- a/pkgs/tools/networking/saldl/default.nix
+++ b/nixpkgs/pkgs/tools/networking/saldl/default.nix
diff --git a/pkgs/tools/networking/samplicator/default.nix b/nixpkgs/pkgs/tools/networking/samplicator/default.nix
index d8167b8a48f..d8167b8a48f 100644
--- a/pkgs/tools/networking/samplicator/default.nix
+++ b/nixpkgs/pkgs/tools/networking/samplicator/default.nix
diff --git a/pkgs/tools/networking/shadowfox/default.nix b/nixpkgs/pkgs/tools/networking/shadowfox/default.nix
index f2ae143e1b9..f2ae143e1b9 100644
--- a/pkgs/tools/networking/shadowfox/default.nix
+++ b/nixpkgs/pkgs/tools/networking/shadowfox/default.nix
diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix
index c9ff4c7f649..c9ff4c7f649 100644
--- a/pkgs/tools/networking/shadowsocks-libev/default.nix
+++ b/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix
diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix
index 2416ef23c8a..2416ef23c8a 100644
--- a/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix
diff --git a/pkgs/tools/networking/shncpd/default.nix b/nixpkgs/pkgs/tools/networking/shncpd/default.nix
index be861654f65..be861654f65 100644
--- a/pkgs/tools/networking/shncpd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/shncpd/default.nix
diff --git a/pkgs/tools/networking/shorewall/default.nix b/nixpkgs/pkgs/tools/networking/shorewall/default.nix
index 8e62aa735a4..8e62aa735a4 100644
--- a/pkgs/tools/networking/shorewall/default.nix
+++ b/nixpkgs/pkgs/tools/networking/shorewall/default.nix
diff --git a/pkgs/tools/networking/siege/default.nix b/nixpkgs/pkgs/tools/networking/siege/default.nix
index a0a65997414..a0a65997414 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/nixpkgs/pkgs/tools/networking/siege/default.nix
diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/nixpkgs/pkgs/tools/networking/simpleproxy/default.nix
index f94e177a858..f94e177a858 100644
--- a/pkgs/tools/networking/simpleproxy/default.nix
+++ b/nixpkgs/pkgs/tools/networking/simpleproxy/default.nix
diff --git a/pkgs/tools/networking/sipcalc/default.nix b/nixpkgs/pkgs/tools/networking/sipcalc/default.nix
index dff929e9fa1..dff929e9fa1 100644
--- a/pkgs/tools/networking/sipcalc/default.nix
+++ b/nixpkgs/pkgs/tools/networking/sipcalc/default.nix
diff --git a/pkgs/tools/networking/sipsak/default.nix b/nixpkgs/pkgs/tools/networking/sipsak/default.nix
index c1a2451328d..c1a2451328d 100644
--- a/pkgs/tools/networking/sipsak/default.nix
+++ b/nixpkgs/pkgs/tools/networking/sipsak/default.nix
diff --git a/pkgs/tools/networking/slack-cli/default.nix b/nixpkgs/pkgs/tools/networking/slack-cli/default.nix
index bdd650494b1..bdd650494b1 100644
--- a/pkgs/tools/networking/slack-cli/default.nix
+++ b/nixpkgs/pkgs/tools/networking/slack-cli/default.nix
diff --git a/pkgs/tools/networking/slimrat/default.nix b/nixpkgs/pkgs/tools/networking/slimrat/default.nix
index 8632a33e349..8632a33e349 100644
--- a/pkgs/tools/networking/slimrat/default.nix
+++ b/nixpkgs/pkgs/tools/networking/slimrat/default.nix
diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix
index f9add47dd3f..f9add47dd3f 100644
--- a/pkgs/tools/networking/slirp4netns/default.nix
+++ b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix
diff --git a/pkgs/tools/networking/smokeping/default.nix b/nixpkgs/pkgs/tools/networking/smokeping/default.nix
index 6a816615e9c..6a816615e9c 100644
--- a/pkgs/tools/networking/smokeping/default.nix
+++ b/nixpkgs/pkgs/tools/networking/smokeping/default.nix
diff --git a/pkgs/tools/networking/snabb/default.nix b/nixpkgs/pkgs/tools/networking/snabb/default.nix
index caca1c829ec..caca1c829ec 100644
--- a/pkgs/tools/networking/snabb/default.nix
+++ b/nixpkgs/pkgs/tools/networking/snabb/default.nix
diff --git a/pkgs/tools/networking/socat/2.x.nix b/nixpkgs/pkgs/tools/networking/socat/2.x.nix
index 99f0301c7c8..99f0301c7c8 100644
--- a/pkgs/tools/networking/socat/2.x.nix
+++ b/nixpkgs/pkgs/tools/networking/socat/2.x.nix
diff --git a/pkgs/tools/networking/socat/default.nix b/nixpkgs/pkgs/tools/networking/socat/default.nix
index ec62c105c62..ec62c105c62 100644
--- a/pkgs/tools/networking/socat/default.nix
+++ b/nixpkgs/pkgs/tools/networking/socat/default.nix
diff --git a/pkgs/tools/networking/socat/libressl-fixes.patch b/nixpkgs/pkgs/tools/networking/socat/libressl-fixes.patch
index cf66033584e..cf66033584e 100644
--- a/pkgs/tools/networking/socat/libressl-fixes.patch
+++ b/nixpkgs/pkgs/tools/networking/socat/libressl-fixes.patch
diff --git a/pkgs/tools/networking/socat/speed-type-fix.patch b/nixpkgs/pkgs/tools/networking/socat/speed-type-fix.patch
index 58e4c716bba..58e4c716bba 100644
--- a/pkgs/tools/networking/socat/speed-type-fix.patch
+++ b/nixpkgs/pkgs/tools/networking/socat/speed-type-fix.patch
diff --git a/pkgs/tools/networking/spiped/default.nix b/nixpkgs/pkgs/tools/networking/spiped/default.nix
index 9cc3370c0a1..9cc3370c0a1 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/nixpkgs/pkgs/tools/networking/spiped/default.nix
diff --git a/pkgs/tools/networking/spoofer/default.nix b/nixpkgs/pkgs/tools/networking/spoofer/default.nix
index 2b5aa2b7cbf..2b5aa2b7cbf 100644
--- a/pkgs/tools/networking/spoofer/default.nix
+++ b/nixpkgs/pkgs/tools/networking/spoofer/default.nix
diff --git a/pkgs/tools/networking/srelay/arm.patch b/nixpkgs/pkgs/tools/networking/srelay/arm.patch
index f56f2c0f2f0..f56f2c0f2f0 100644
--- a/pkgs/tools/networking/srelay/arm.patch
+++ b/nixpkgs/pkgs/tools/networking/srelay/arm.patch
diff --git a/pkgs/tools/networking/srelay/default.nix b/nixpkgs/pkgs/tools/networking/srelay/default.nix
index b55860a20c1..b55860a20c1 100644
--- a/pkgs/tools/networking/srelay/default.nix
+++ b/nixpkgs/pkgs/tools/networking/srelay/default.nix
diff --git a/pkgs/tools/networking/ssh-agents/default.nix b/nixpkgs/pkgs/tools/networking/ssh-agents/default.nix
index b01d373088b..b01d373088b 100644
--- a/pkgs/tools/networking/ssh-agents/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ssh-agents/default.nix
diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix
index cb07d73a631..cb07d73a631 100644
--- a/pkgs/tools/networking/ssh-ident/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix
diff --git a/pkgs/tools/networking/sshoogr/default.nix b/nixpkgs/pkgs/tools/networking/sshoogr/default.nix
index 764b34fc5a5..764b34fc5a5 100644
--- a/pkgs/tools/networking/sshoogr/default.nix
+++ b/nixpkgs/pkgs/tools/networking/sshoogr/default.nix
diff --git a/pkgs/tools/networking/sshpass/default.nix b/nixpkgs/pkgs/tools/networking/sshpass/default.nix
index 3765e6aa08f..3765e6aa08f 100644
--- a/pkgs/tools/networking/sshpass/default.nix
+++ b/nixpkgs/pkgs/tools/networking/sshpass/default.nix
diff --git a/pkgs/tools/networking/sshping/default.nix b/nixpkgs/pkgs/tools/networking/sshping/default.nix
index 20f0eaa7e47..20f0eaa7e47 100644
--- a/pkgs/tools/networking/sshping/default.nix
+++ b/nixpkgs/pkgs/tools/networking/sshping/default.nix
diff --git a/pkgs/tools/networking/ssldump/default.nix b/nixpkgs/pkgs/tools/networking/ssldump/default.nix
index 0081e7d1ddb..0081e7d1ddb 100644
--- a/pkgs/tools/networking/ssldump/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ssldump/default.nix
diff --git a/pkgs/tools/networking/sslsplit/default.nix b/nixpkgs/pkgs/tools/networking/sslsplit/default.nix
index bf23d06551d..bf23d06551d 100644
--- a/pkgs/tools/networking/sslsplit/default.nix
+++ b/nixpkgs/pkgs/tools/networking/sslsplit/default.nix
diff --git a/pkgs/tools/networking/ssmtp/default.nix b/nixpkgs/pkgs/tools/networking/ssmtp/default.nix
index 81da427a52c..81da427a52c 100644
--- a/pkgs/tools/networking/ssmtp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ssmtp/default.nix
diff --git a/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch b/nixpkgs/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch
index 371c0f6de2b..371c0f6de2b 100644
--- a/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch
+++ b/nixpkgs/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch
diff --git a/pkgs/tools/networking/sstp/default.nix b/nixpkgs/pkgs/tools/networking/sstp/default.nix
index de65298d648..de65298d648 100644
--- a/pkgs/tools/networking/sstp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/sstp/default.nix
diff --git a/pkgs/tools/networking/strongswan/default.nix b/nixpkgs/pkgs/tools/networking/strongswan/default.nix
index fb7de5486fb..fb7de5486fb 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/nixpkgs/pkgs/tools/networking/strongswan/default.nix
diff --git a/pkgs/tools/networking/strongswan/ext_auth-path.patch b/nixpkgs/pkgs/tools/networking/strongswan/ext_auth-path.patch
index 397537ad8d8..397537ad8d8 100644
--- a/pkgs/tools/networking/strongswan/ext_auth-path.patch
+++ b/nixpkgs/pkgs/tools/networking/strongswan/ext_auth-path.patch
diff --git a/pkgs/tools/networking/strongswan/firewall_defaults.patch b/nixpkgs/pkgs/tools/networking/strongswan/firewall_defaults.patch
index 12c446c8c9a..12c446c8c9a 100644
--- a/pkgs/tools/networking/strongswan/firewall_defaults.patch
+++ b/nixpkgs/pkgs/tools/networking/strongswan/firewall_defaults.patch
diff --git a/pkgs/tools/networking/strongswan/updown-path.patch b/nixpkgs/pkgs/tools/networking/strongswan/updown-path.patch
index f01da7d7bce..f01da7d7bce 100644
--- a/pkgs/tools/networking/strongswan/updown-path.patch
+++ b/nixpkgs/pkgs/tools/networking/strongswan/updown-path.patch
diff --git a/pkgs/tools/networking/stubby/default.nix b/nixpkgs/pkgs/tools/networking/stubby/default.nix
index 9b1ee7a9f79..9b1ee7a9f79 100644
--- a/pkgs/tools/networking/stubby/default.nix
+++ b/nixpkgs/pkgs/tools/networking/stubby/default.nix
diff --git a/pkgs/tools/networking/stun/default.nix b/nixpkgs/pkgs/tools/networking/stun/default.nix
index 9960e6f0030..9960e6f0030 100644
--- a/pkgs/tools/networking/stun/default.nix
+++ b/nixpkgs/pkgs/tools/networking/stun/default.nix
diff --git a/pkgs/tools/networking/stunnel/default.nix b/nixpkgs/pkgs/tools/networking/stunnel/default.nix
index eaa05bfdbad..eaa05bfdbad 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/nixpkgs/pkgs/tools/networking/stunnel/default.nix
diff --git a/pkgs/tools/networking/subfinder/default.nix b/nixpkgs/pkgs/tools/networking/subfinder/default.nix
index 70820ea0320..70820ea0320 100644
--- a/pkgs/tools/networking/subfinder/default.nix
+++ b/nixpkgs/pkgs/tools/networking/subfinder/default.nix
diff --git a/pkgs/tools/networking/subfinder/deps.nix b/nixpkgs/pkgs/tools/networking/subfinder/deps.nix
index 16427eddcf6..16427eddcf6 100644
--- a/pkgs/tools/networking/subfinder/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/subfinder/deps.nix
diff --git a/pkgs/tools/networking/surfraw/default.nix b/nixpkgs/pkgs/tools/networking/surfraw/default.nix
index eac73765300..eac73765300 100644
--- a/pkgs/tools/networking/surfraw/default.nix
+++ b/nixpkgs/pkgs/tools/networking/surfraw/default.nix
diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix
index 91f15573914..91f15573914 100644
--- a/pkgs/tools/networking/swagger-codegen/default.nix
+++ b/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix
diff --git a/pkgs/tools/networking/swaks/default.nix b/nixpkgs/pkgs/tools/networking/swaks/default.nix
index 81d0935f0b0..81d0935f0b0 100644
--- a/pkgs/tools/networking/swaks/default.nix
+++ b/nixpkgs/pkgs/tools/networking/swaks/default.nix
diff --git a/pkgs/tools/networking/swec/default.nix b/nixpkgs/pkgs/tools/networking/swec/default.nix
index 515fcee6963..515fcee6963 100644
--- a/pkgs/tools/networking/swec/default.nix
+++ b/nixpkgs/pkgs/tools/networking/swec/default.nix
diff --git a/pkgs/tools/networking/tayga/default.nix b/nixpkgs/pkgs/tools/networking/tayga/default.nix
index 97bcbdc999e..97bcbdc999e 100644
--- a/pkgs/tools/networking/tayga/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tayga/default.nix
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/nixpkgs/pkgs/tools/networking/tcpdump/default.nix
index a74dc7ca1d7..a74dc7ca1d7 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tcpdump/default.nix
diff --git a/pkgs/tools/networking/tcpflow/default.nix b/nixpkgs/pkgs/tools/networking/tcpflow/default.nix
index 8f502c5ef3f..8f502c5ef3f 100644
--- a/pkgs/tools/networking/tcpflow/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tcpflow/default.nix
diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix
index 032adbff74f..032adbff74f 100644
--- a/pkgs/tools/networking/tcpreplay/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix
diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix
index cfb627e8b3b..cfb627e8b3b 100644
--- a/pkgs/tools/networking/tcptraceroute/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix
diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/nixpkgs/pkgs/tools/networking/tdns-cli/default.nix
index 473ee8ace34..473ee8ace34 100644
--- a/pkgs/tools/networking/tdns-cli/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tdns-cli/default.nix
diff --git a/pkgs/tools/networking/telepresence/default.nix b/nixpkgs/pkgs/tools/networking/telepresence/default.nix
index e6d427b2bcb..e6d427b2bcb 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/nixpkgs/pkgs/tools/networking/telepresence/default.nix
diff --git a/pkgs/tools/networking/tendermint/default.nix b/nixpkgs/pkgs/tools/networking/tendermint/default.nix
index 0b9c254deeb..0b9c254deeb 100644
--- a/pkgs/tools/networking/tendermint/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tendermint/default.nix
diff --git a/pkgs/tools/networking/termshark/default.nix b/nixpkgs/pkgs/tools/networking/termshark/default.nix
index 3361127afed..3361127afed 100644
--- a/pkgs/tools/networking/termshark/default.nix
+++ b/nixpkgs/pkgs/tools/networking/termshark/default.nix
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/nixpkgs/pkgs/tools/networking/tftp-hpa/default.nix
index edd2abdd13e..edd2abdd13e 100644
--- a/pkgs/tools/networking/tftp-hpa/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tftp-hpa/default.nix
diff --git a/pkgs/tools/networking/tgt/default.nix b/nixpkgs/pkgs/tools/networking/tgt/default.nix
index 478c1ed35f2..478c1ed35f2 100644
--- a/pkgs/tools/networking/tgt/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tgt/default.nix
diff --git a/pkgs/tools/networking/tinc/default.nix b/nixpkgs/pkgs/tools/networking/tinc/default.nix
index e331916626e..e331916626e 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tinc/default.nix
diff --git a/pkgs/tools/networking/tinc/pre.nix b/nixpkgs/pkgs/tools/networking/tinc/pre.nix
index 85cdd19702f..85cdd19702f 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/nixpkgs/pkgs/tools/networking/tinc/pre.nix
diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/nixpkgs/pkgs/tools/networking/tinyfecvpn/default.nix
index aab937c994e..aab937c994e 100644
--- a/pkgs/tools/networking/tinyfecvpn/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tinyfecvpn/default.nix
diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix
index f3e6f2f156f..f3e6f2f156f 100644
--- a/pkgs/tools/networking/tinyproxy/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix
diff --git a/pkgs/tools/networking/tlspool/default.nix b/nixpkgs/pkgs/tools/networking/tlspool/default.nix
index df199869e60..df199869e60 100644
--- a/pkgs/tools/networking/tlspool/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tlspool/default.nix
diff --git a/pkgs/tools/networking/tox-node/default.nix b/nixpkgs/pkgs/tools/networking/tox-node/default.nix
index f47ccab45ea..f47ccab45ea 100644
--- a/pkgs/tools/networking/tox-node/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tox-node/default.nix
diff --git a/pkgs/tools/networking/toxvpn/default.nix b/nixpkgs/pkgs/tools/networking/toxvpn/default.nix
index e4faa5e30f4..e4faa5e30f4 100644
--- a/pkgs/tools/networking/toxvpn/default.nix
+++ b/nixpkgs/pkgs/tools/networking/toxvpn/default.nix
diff --git a/pkgs/tools/networking/tracebox/default.nix b/nixpkgs/pkgs/tools/networking/tracebox/default.nix
index 1d3c4190e38..1d3c4190e38 100644
--- a/pkgs/tools/networking/tracebox/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tracebox/default.nix
diff --git a/pkgs/tools/networking/traceroute/default.nix b/nixpkgs/pkgs/tools/networking/traceroute/default.nix
index 8591db4e016..8591db4e016 100644
--- a/pkgs/tools/networking/traceroute/default.nix
+++ b/nixpkgs/pkgs/tools/networking/traceroute/default.nix
diff --git a/pkgs/tools/networking/trickle/default.nix b/nixpkgs/pkgs/tools/networking/trickle/default.nix
index 7a4adc14c2d..7a4adc14c2d 100644
--- a/pkgs/tools/networking/trickle/default.nix
+++ b/nixpkgs/pkgs/tools/networking/trickle/default.nix
diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix
index 44daa23cd92..44daa23cd92 100644
--- a/pkgs/tools/networking/tridactyl-native/default.nix
+++ b/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix
diff --git a/pkgs/tools/networking/twa/default.nix b/nixpkgs/pkgs/tools/networking/twa/default.nix
index b15b6dcba31..b15b6dcba31 100644
--- a/pkgs/tools/networking/twa/default.nix
+++ b/nixpkgs/pkgs/tools/networking/twa/default.nix
diff --git a/pkgs/tools/networking/ua/default.nix b/nixpkgs/pkgs/tools/networking/ua/default.nix
index ddd0bab5d61..ddd0bab5d61 100644
--- a/pkgs/tools/networking/ua/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ua/default.nix
diff --git a/pkgs/tools/networking/ua/deps.nix b/nixpkgs/pkgs/tools/networking/ua/deps.nix
index e59b9f239a6..e59b9f239a6 100644
--- a/pkgs/tools/networking/ua/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/ua/deps.nix
diff --git a/pkgs/tools/networking/ubridge/default.nix b/nixpkgs/pkgs/tools/networking/ubridge/default.nix
index 42839a8ba2f..42839a8ba2f 100644
--- a/pkgs/tools/networking/ubridge/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ubridge/default.nix
diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/nixpkgs/pkgs/tools/networking/ucspi-tcp/default.nix
index 8a3b292ad81..8a3b292ad81 100644
--- a/pkgs/tools/networking/ucspi-tcp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ucspi-tcp/default.nix
diff --git a/pkgs/tools/networking/ucspi-tcp/remove-setuid.patch b/nixpkgs/pkgs/tools/networking/ucspi-tcp/remove-setuid.patch
index dd693320804..dd693320804 100644
--- a/pkgs/tools/networking/ucspi-tcp/remove-setuid.patch
+++ b/nixpkgs/pkgs/tools/networking/ucspi-tcp/remove-setuid.patch
diff --git a/pkgs/tools/networking/udptunnel/default.nix b/nixpkgs/pkgs/tools/networking/udptunnel/default.nix
index 4ee4fa41833..4ee4fa41833 100644
--- a/pkgs/tools/networking/udptunnel/default.nix
+++ b/nixpkgs/pkgs/tools/networking/udptunnel/default.nix
diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/nixpkgs/pkgs/tools/networking/uget-integrator/default.nix
index 68f457c2a63..68f457c2a63 100644
--- a/pkgs/tools/networking/uget-integrator/default.nix
+++ b/nixpkgs/pkgs/tools/networking/uget-integrator/default.nix
diff --git a/pkgs/tools/networking/uget/default.nix b/nixpkgs/pkgs/tools/networking/uget/default.nix
index b2da1384557..b2da1384557 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/nixpkgs/pkgs/tools/networking/uget/default.nix
diff --git a/pkgs/tools/networking/unbound/default.nix b/nixpkgs/pkgs/tools/networking/unbound/default.nix
index 18d9defdd94..18d9defdd94 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/nixpkgs/pkgs/tools/networking/unbound/default.nix
diff --git a/pkgs/tools/networking/unbound/python.nix b/nixpkgs/pkgs/tools/networking/unbound/python.nix
index c1186204104..c1186204104 100644
--- a/pkgs/tools/networking/unbound/python.nix
+++ b/nixpkgs/pkgs/tools/networking/unbound/python.nix
diff --git a/pkgs/tools/networking/uqmi/default.nix b/nixpkgs/pkgs/tools/networking/uqmi/default.nix
index 010d6a7f8e8..010d6a7f8e8 100644
--- a/pkgs/tools/networking/uqmi/default.nix
+++ b/nixpkgs/pkgs/tools/networking/uqmi/default.nix
diff --git a/pkgs/tools/networking/urlwatch/default.nix b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
index 3e572a10da0..3e572a10da0 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
diff --git a/pkgs/tools/networking/uwimap/default.nix b/nixpkgs/pkgs/tools/networking/uwimap/default.nix
index 4a8dab9366f..4a8dab9366f 100644
--- a/pkgs/tools/networking/uwimap/default.nix
+++ b/nixpkgs/pkgs/tools/networking/uwimap/default.nix
diff --git a/pkgs/tools/networking/v2ray/default.nix b/nixpkgs/pkgs/tools/networking/v2ray/default.nix
index 5d1cd4540d7..5d1cd4540d7 100644
--- a/pkgs/tools/networking/v2ray/default.nix
+++ b/nixpkgs/pkgs/tools/networking/v2ray/default.nix
diff --git a/pkgs/tools/networking/v2ray/generic.nix b/nixpkgs/pkgs/tools/networking/v2ray/generic.nix
index bf6e6cd55ae..bf6e6cd55ae 100644
--- a/pkgs/tools/networking/v2ray/generic.nix
+++ b/nixpkgs/pkgs/tools/networking/v2ray/generic.nix
diff --git a/pkgs/tools/networking/v2ray/update.sh b/nixpkgs/pkgs/tools/networking/v2ray/update.sh
index 38ad77e98f8..38ad77e98f8 100755
--- a/pkgs/tools/networking/v2ray/update.sh
+++ b/nixpkgs/pkgs/tools/networking/v2ray/update.sh
diff --git a/pkgs/tools/networking/vde2/default.nix b/nixpkgs/pkgs/tools/networking/vde2/default.nix
index e43c174ab3f..e43c174ab3f 100644
--- a/pkgs/tools/networking/vde2/default.nix
+++ b/nixpkgs/pkgs/tools/networking/vde2/default.nix
diff --git a/pkgs/tools/networking/vlan/default.nix b/nixpkgs/pkgs/tools/networking/vlan/default.nix
index 7a6a37c9112..7a6a37c9112 100644
--- a/pkgs/tools/networking/vlan/default.nix
+++ b/nixpkgs/pkgs/tools/networking/vlan/default.nix
diff --git a/pkgs/tools/networking/vpnc/default.nix b/nixpkgs/pkgs/tools/networking/vpnc/default.nix
index 424355e41df..424355e41df 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/nixpkgs/pkgs/tools/networking/vpnc/default.nix
diff --git a/pkgs/tools/networking/vpnc/makefile.patch b/nixpkgs/pkgs/tools/networking/vpnc/makefile.patch
index 89a8cd6da95..89a8cd6da95 100644
--- a/pkgs/tools/networking/vpnc/makefile.patch
+++ b/nixpkgs/pkgs/tools/networking/vpnc/makefile.patch
diff --git a/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch b/nixpkgs/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch
index fa12abe9b77..fa12abe9b77 100644
--- a/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch
+++ b/nixpkgs/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch
diff --git a/pkgs/tools/networking/vtun/default.nix b/nixpkgs/pkgs/tools/networking/vtun/default.nix
index d2cbb5d8a4e..d2cbb5d8a4e 100644
--- a/pkgs/tools/networking/vtun/default.nix
+++ b/nixpkgs/pkgs/tools/networking/vtun/default.nix
diff --git a/pkgs/tools/networking/wakelan/default.nix b/nixpkgs/pkgs/tools/networking/wakelan/default.nix
index ff96509e15c..ff96509e15c 100644
--- a/pkgs/tools/networking/wakelan/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wakelan/default.nix
diff --git a/pkgs/tools/networking/wavemon/default.nix b/nixpkgs/pkgs/tools/networking/wavemon/default.nix
index 89177f49ecf..89177f49ecf 100644
--- a/pkgs/tools/networking/wavemon/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wavemon/default.nix
diff --git a/pkgs/tools/networking/wbox/default.nix b/nixpkgs/pkgs/tools/networking/wbox/default.nix
index b1fb6ae8d90..b1fb6ae8d90 100644
--- a/pkgs/tools/networking/wbox/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wbox/default.nix
diff --git a/pkgs/tools/networking/webalizer/default.nix b/nixpkgs/pkgs/tools/networking/webalizer/default.nix
index bd80eae2beb..bd80eae2beb 100644
--- a/pkgs/tools/networking/webalizer/default.nix
+++ b/nixpkgs/pkgs/tools/networking/webalizer/default.nix
diff --git a/pkgs/tools/networking/weighttp/default.nix b/nixpkgs/pkgs/tools/networking/weighttp/default.nix
index 8ba47534cfb..8ba47534cfb 100644
--- a/pkgs/tools/networking/weighttp/default.nix
+++ b/nixpkgs/pkgs/tools/networking/weighttp/default.nix
diff --git a/pkgs/tools/networking/wget/default.nix b/nixpkgs/pkgs/tools/networking/wget/default.nix
index b7486ded4c8..b7486ded4c8 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wget/default.nix
diff --git a/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch b/nixpkgs/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch
index a6a1fcfcb37..a6a1fcfcb37 100644
--- a/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch
+++ b/nixpkgs/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch
diff --git a/pkgs/tools/networking/whois/default.nix b/nixpkgs/pkgs/tools/networking/whois/default.nix
index 2306359addf..2306359addf 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/nixpkgs/pkgs/tools/networking/whois/default.nix
diff --git a/pkgs/tools/networking/wicd/default.nix b/nixpkgs/pkgs/tools/networking/wicd/default.nix
index 2f95876c2f3..2f95876c2f3 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wicd/default.nix
diff --git a/pkgs/tools/networking/wicd/dhclient.patch b/nixpkgs/pkgs/tools/networking/wicd/dhclient.patch
index fbda1caacb7..fbda1caacb7 100644
--- a/pkgs/tools/networking/wicd/dhclient.patch
+++ b/nixpkgs/pkgs/tools/networking/wicd/dhclient.patch
diff --git a/pkgs/tools/networking/wicd/fix-app-icon.patch b/nixpkgs/pkgs/tools/networking/wicd/fix-app-icon.patch
index 31b47bb4588..31b47bb4588 100644
--- a/pkgs/tools/networking/wicd/fix-app-icon.patch
+++ b/nixpkgs/pkgs/tools/networking/wicd/fix-app-icon.patch
diff --git a/pkgs/tools/networking/wicd/fix-curses.patch b/nixpkgs/pkgs/tools/networking/wicd/fix-curses.patch
index 138dfbabfd5..138dfbabfd5 100644
--- a/pkgs/tools/networking/wicd/fix-curses.patch
+++ b/nixpkgs/pkgs/tools/networking/wicd/fix-curses.patch
diff --git a/pkgs/tools/networking/wicd/fix-gtk-issues.patch b/nixpkgs/pkgs/tools/networking/wicd/fix-gtk-issues.patch
index 31e553b46b5..31e553b46b5 100644
--- a/pkgs/tools/networking/wicd/fix-gtk-issues.patch
+++ b/nixpkgs/pkgs/tools/networking/wicd/fix-gtk-issues.patch
diff --git a/pkgs/tools/networking/wicd/no-optimization.patch b/nixpkgs/pkgs/tools/networking/wicd/no-optimization.patch
index 785cae7b6ed..785cae7b6ed 100644
--- a/pkgs/tools/networking/wicd/no-optimization.patch
+++ b/nixpkgs/pkgs/tools/networking/wicd/no-optimization.patch
diff --git a/pkgs/tools/networking/wicd/no-var-install.patch b/nixpkgs/pkgs/tools/networking/wicd/no-var-install.patch
index b01f0e5a438..b01f0e5a438 100644
--- a/pkgs/tools/networking/wicd/no-var-install.patch
+++ b/nixpkgs/pkgs/tools/networking/wicd/no-var-install.patch
diff --git a/pkgs/tools/networking/wicd/pygtk.patch b/nixpkgs/pkgs/tools/networking/wicd/pygtk.patch
index f015e50d684..f015e50d684 100644
--- a/pkgs/tools/networking/wicd/pygtk.patch
+++ b/nixpkgs/pkgs/tools/networking/wicd/pygtk.patch
diff --git a/pkgs/tools/networking/wicd/urwid-api-update.patch b/nixpkgs/pkgs/tools/networking/wicd/urwid-api-update.patch
index a794f6caaee..a794f6caaee 100644
--- a/pkgs/tools/networking/wicd/urwid-api-update.patch
+++ b/nixpkgs/pkgs/tools/networking/wicd/urwid-api-update.patch
diff --git a/pkgs/tools/networking/wicd/wpa2-ttls b/nixpkgs/pkgs/tools/networking/wicd/wpa2-ttls
index 650375cbbaa..650375cbbaa 100644
--- a/pkgs/tools/networking/wicd/wpa2-ttls
+++ b/nixpkgs/pkgs/tools/networking/wicd/wpa2-ttls
diff --git a/pkgs/tools/networking/wifite2/default.nix b/nixpkgs/pkgs/tools/networking/wifite2/default.nix
index 2333408f078..2333408f078 100644
--- a/pkgs/tools/networking/wifite2/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wifite2/default.nix
diff --git a/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch b/nixpkgs/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch
index d79d9e3531f..d79d9e3531f 100644
--- a/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch
+++ b/nixpkgs/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix
index 8832560b3b1..8832560b3b1 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix
diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/nixpkgs/pkgs/tools/networking/wireguard-go/deps.nix
index b1a92582b7c..b1a92582b7c 100644
--- a/pkgs/tools/networking/wireguard-go/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/wireguard-go/deps.nix
diff --git a/pkgs/tools/networking/wireguard-go/update.sh b/nixpkgs/pkgs/tools/networking/wireguard-go/update.sh
index 2b6b8317a1e..2b6b8317a1e 100755
--- a/pkgs/tools/networking/wireguard-go/update.sh
+++ b/nixpkgs/pkgs/tools/networking/wireguard-go/update.sh
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix
index df2cdf6b590..df2cdf6b590 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix
diff --git a/pkgs/tools/networking/wireguard-tools/update.sh b/nixpkgs/pkgs/tools/networking/wireguard-tools/update.sh
index e549228e8f1..e549228e8f1 100755
--- a/pkgs/tools/networking/wireguard-tools/update.sh
+++ b/nixpkgs/pkgs/tools/networking/wireguard-tools/update.sh
diff --git a/pkgs/tools/networking/wol/default.nix b/nixpkgs/pkgs/tools/networking/wol/default.nix
index 570d800311e..570d800311e 100644
--- a/pkgs/tools/networking/wol/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wol/default.nix
diff --git a/pkgs/tools/networking/wolfebin/default.nix b/nixpkgs/pkgs/tools/networking/wolfebin/default.nix
index 7eded00db85..7eded00db85 100644
--- a/pkgs/tools/networking/wolfebin/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wolfebin/default.nix
diff --git a/pkgs/tools/networking/wrk/default.nix b/nixpkgs/pkgs/tools/networking/wrk/default.nix
index 98705430c2f..98705430c2f 100644
--- a/pkgs/tools/networking/wrk/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wrk/default.nix
diff --git a/pkgs/tools/networking/wrk2/default.nix b/nixpkgs/pkgs/tools/networking/wrk2/default.nix
index 7908143bdab..7908143bdab 100644
--- a/pkgs/tools/networking/wrk2/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wrk2/default.nix
diff --git a/pkgs/tools/networking/wstunnel/default.nix b/nixpkgs/pkgs/tools/networking/wstunnel/default.nix
index 2488d874e6d..2488d874e6d 100644
--- a/pkgs/tools/networking/wstunnel/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wstunnel/default.nix
diff --git a/pkgs/tools/networking/wuzz/default.nix b/nixpkgs/pkgs/tools/networking/wuzz/default.nix
index e84a97525f1..e84a97525f1 100644
--- a/pkgs/tools/networking/wuzz/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wuzz/default.nix
diff --git a/pkgs/tools/networking/wuzz/deps.nix b/nixpkgs/pkgs/tools/networking/wuzz/deps.nix
index 8904596a712..8904596a712 100644
--- a/pkgs/tools/networking/wuzz/deps.nix
+++ b/nixpkgs/pkgs/tools/networking/wuzz/deps.nix
diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/nixpkgs/pkgs/tools/networking/x11-ssh-askpass/default.nix
index 1b9d5534903..1b9d5534903 100644
--- a/pkgs/tools/networking/x11-ssh-askpass/default.nix
+++ b/nixpkgs/pkgs/tools/networking/x11-ssh-askpass/default.nix
diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix
index 01453379022..01453379022 100644
--- a/pkgs/tools/networking/xl2tpd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix
diff --git a/pkgs/tools/networking/xnbd/default.nix b/nixpkgs/pkgs/tools/networking/xnbd/default.nix
index e898904c6d4..e898904c6d4 100644
--- a/pkgs/tools/networking/xnbd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/xnbd/default.nix
diff --git a/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch b/nixpkgs/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch
index b4edc6a8387..b4edc6a8387 100644
--- a/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch
+++ b/nixpkgs/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch
diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix
index ca10adae0e4..ca10adae0e4 100644
--- a/pkgs/tools/networking/yggdrasil/default.nix
+++ b/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix
diff --git a/pkgs/tools/networking/yrd/default.nix b/nixpkgs/pkgs/tools/networking/yrd/default.nix
index a259d892cc1..a259d892cc1 100644
--- a/pkgs/tools/networking/yrd/default.nix
+++ b/nixpkgs/pkgs/tools/networking/yrd/default.nix
diff --git a/pkgs/tools/networking/ytcc/default.nix b/nixpkgs/pkgs/tools/networking/ytcc/default.nix
index 4675dac5f47..4675dac5f47 100644
--- a/pkgs/tools/networking/ytcc/default.nix
+++ b/nixpkgs/pkgs/tools/networking/ytcc/default.nix
diff --git a/pkgs/tools/networking/zap/default.nix b/nixpkgs/pkgs/tools/networking/zap/default.nix
index 3acd207df95..3acd207df95 100644
--- a/pkgs/tools/networking/zap/default.nix
+++ b/nixpkgs/pkgs/tools/networking/zap/default.nix
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix
index da5b8837523..da5b8837523 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix
diff --git a/pkgs/tools/networking/zssh/default.nix b/nixpkgs/pkgs/tools/networking/zssh/default.nix
index b2016fe9452..b2016fe9452 100644
--- a/pkgs/tools/networking/zssh/default.nix
+++ b/nixpkgs/pkgs/tools/networking/zssh/default.nix
diff --git a/pkgs/tools/nix/info/default.nix b/nixpkgs/pkgs/tools/nix/info/default.nix
index 898026a6290..898026a6290 100644
--- a/pkgs/tools/nix/info/default.nix
+++ b/nixpkgs/pkgs/tools/nix/info/default.nix
diff --git a/pkgs/tools/nix/info/info.sh b/nixpkgs/pkgs/tools/nix/info/info.sh
index f108962b3ba..f108962b3ba 100755
--- a/pkgs/tools/nix/info/info.sh
+++ b/nixpkgs/pkgs/tools/nix/info/info.sh
diff --git a/pkgs/tools/nix/info/multiuser.nix b/nixpkgs/pkgs/tools/nix/info/multiuser.nix
index 827d5298767..827d5298767 100644
--- a/pkgs/tools/nix/info/multiuser.nix
+++ b/nixpkgs/pkgs/tools/nix/info/multiuser.nix
diff --git a/pkgs/tools/nix/info/relaxedsandbox.nix b/nixpkgs/pkgs/tools/nix/info/relaxedsandbox.nix
index 625a6ecc39e..625a6ecc39e 100644
--- a/pkgs/tools/nix/info/relaxedsandbox.nix
+++ b/nixpkgs/pkgs/tools/nix/info/relaxedsandbox.nix
diff --git a/pkgs/tools/nix/info/sandbox.nix b/nixpkgs/pkgs/tools/nix/info/sandbox.nix
index fa4288c2f94..fa4288c2f94 100644
--- a/pkgs/tools/nix/info/sandbox.nix
+++ b/nixpkgs/pkgs/tools/nix/info/sandbox.nix
diff --git a/pkgs/tools/nix/nix-script/default.nix b/nixpkgs/pkgs/tools/nix/nix-script/default.nix
index d69b5943123..d69b5943123 100644
--- a/pkgs/tools/nix/nix-script/default.nix
+++ b/nixpkgs/pkgs/tools/nix/nix-script/default.nix
diff --git a/pkgs/tools/nix/nix-store-gcs-proxy/default.nix b/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/default.nix
index c782607da85..c782607da85 100644
--- a/pkgs/tools/nix/nix-store-gcs-proxy/default.nix
+++ b/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/default.nix
diff --git a/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix b/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix
index b5ae542876d..b5ae542876d 100644
--- a/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix
+++ b/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix
diff --git a/pkgs/tools/nix/nixdoc/default.nix b/nixpkgs/pkgs/tools/nix/nixdoc/default.nix
index 13b7ffd2af7..13b7ffd2af7 100644
--- a/pkgs/tools/nix/nixdoc/default.nix
+++ b/nixpkgs/pkgs/tools/nix/nixdoc/default.nix
diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix
index 4e51b9b46dd..4e51b9b46dd 100644
--- a/pkgs/tools/nix/nixos-generators/default.nix
+++ b/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix
diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix
index 946710b1fdd..946710b1fdd 100644
--- a/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix
diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix
index 426cc7943e5..426cc7943e5 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix
diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix
index 21e869b7b01..21e869b7b01 100644
--- a/pkgs/tools/package-management/appimagekit/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix
diff --git a/pkgs/tools/package-management/appimagekit/nix.patch b/nixpkgs/pkgs/tools/package-management/appimagekit/nix.patch
index 9725cef5ba7..9725cef5ba7 100644
--- a/pkgs/tools/package-management/appimagekit/nix.patch
+++ b/nixpkgs/pkgs/tools/package-management/appimagekit/nix.patch
diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/nixpkgs/pkgs/tools/package-management/apt-dater/default.nix
index f161591c8f1..f161591c8f1 100644
--- a/pkgs/tools/package-management/apt-dater/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/apt-dater/default.nix
diff --git a/pkgs/tools/package-management/apt/default.nix b/nixpkgs/pkgs/tools/package-management/apt/default.nix
index 0438e340b21..0438e340b21 100644
--- a/pkgs/tools/package-management/apt/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/apt/default.nix
diff --git a/pkgs/tools/package-management/bunny/default.nix b/nixpkgs/pkgs/tools/package-management/bunny/default.nix
index 938a762ba30..938a762ba30 100644
--- a/pkgs/tools/package-management/bunny/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/bunny/default.nix
diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix
index 5d741e25fb9..5d741e25fb9 100644
--- a/pkgs/tools/package-management/cargo-about/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix
diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix
index 1a60675080d..1a60675080d 100644
--- a/pkgs/tools/package-management/cargo-audit/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix
diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix
index 1af8be3da44..1af8be3da44 100644
--- a/pkgs/tools/package-management/cargo-deb/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix
diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-deps/default.nix
index 8a43fb3cf11..8a43fb3cf11 100644
--- a/pkgs/tools/package-management/cargo-deps/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-deps/default.nix
diff --git a/pkgs/tools/package-management/cargo-download/Cargo.nix b/nixpkgs/pkgs/tools/package-management/cargo-download/Cargo.nix
index 21740ce2ead..21740ce2ead 100644
--- a/pkgs/tools/package-management/cargo-download/Cargo.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-download/Cargo.nix
diff --git a/pkgs/tools/package-management/cargo-download/crates-io.nix b/nixpkgs/pkgs/tools/package-management/cargo-download/crates-io.nix
index e0c0abf4dc6..e0c0abf4dc6 100644
--- a/pkgs/tools/package-management/cargo-download/crates-io.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-download/crates-io.nix
diff --git a/pkgs/tools/package-management/cargo-download/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-download/default.nix
index 1cb53a4b6c8..1cb53a4b6c8 100644
--- a/pkgs/tools/package-management/cargo-download/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-download/default.nix
diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix
index 0adc2add96d..0adc2add96d 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix
diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-graph/default.nix
index 2fe89ccfa98..2fe89ccfa98 100644
--- a/pkgs/tools/package-management/cargo-graph/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-graph/default.nix
diff --git a/pkgs/tools/package-management/cargo-license/add-Cargo.lock.patch b/nixpkgs/pkgs/tools/package-management/cargo-license/add-Cargo.lock.patch
index c6c4e3f62e1..c6c4e3f62e1 100644
--- a/pkgs/tools/package-management/cargo-license/add-Cargo.lock.patch
+++ b/nixpkgs/pkgs/tools/package-management/cargo-license/add-Cargo.lock.patch
diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-license/default.nix
index f697c57d3e8..f697c57d3e8 100644
--- a/pkgs/tools/package-management/cargo-license/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-license/default.nix
diff --git a/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch b/nixpkgs/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch
index 7e0528eda2a..7e0528eda2a 100644
--- a/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch
+++ b/nixpkgs/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch
diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix
index 7d684d943b9..7d684d943b9 100644
--- a/pkgs/tools/package-management/cargo-outdated/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix
diff --git a/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh b/nixpkgs/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh
index 21ee27c59b7..21ee27c59b7 100755
--- a/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh
+++ b/nixpkgs/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh
diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix
index 3e3ba47be05..3e3ba47be05 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix
diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix
index 37d546adb9d..37d546adb9d 100644
--- a/pkgs/tools/package-management/cargo-tree/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix
diff --git a/pkgs/tools/package-management/cargo-update/cargo-update.nix b/nixpkgs/pkgs/tools/package-management/cargo-update/cargo-update.nix
index 9b8cf24605a..9b8cf24605a 100644
--- a/pkgs/tools/package-management/cargo-update/cargo-update.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-update/cargo-update.nix
diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix
index 50dc748e07e..50dc748e07e 100644
--- a/pkgs/tools/package-management/cargo-update/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix
diff --git a/pkgs/tools/package-management/cde/default.nix b/nixpkgs/pkgs/tools/package-management/cde/default.nix
index 5354fbb5e5e..5354fbb5e5e 100644
--- a/pkgs/tools/package-management/cde/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/cde/default.nix
diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix
index 6605d9de65a..6605d9de65a 100644
--- a/pkgs/tools/package-management/checkinstall/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix
diff --git a/pkgs/tools/package-management/checkinstall/empty-dirs.patch b/nixpkgs/pkgs/tools/package-management/checkinstall/empty-dirs.patch
index 9a3e29c84c1..9a3e29c84c1 100644
--- a/pkgs/tools/package-management/checkinstall/empty-dirs.patch
+++ b/nixpkgs/pkgs/tools/package-management/checkinstall/empty-dirs.patch
diff --git a/pkgs/tools/package-management/checkinstall/etc-dirs.patch b/nixpkgs/pkgs/tools/package-management/checkinstall/etc-dirs.patch
index a811e4afbb9..a811e4afbb9 100644
--- a/pkgs/tools/package-management/checkinstall/etc-dirs.patch
+++ b/nixpkgs/pkgs/tools/package-management/checkinstall/etc-dirs.patch
diff --git a/pkgs/tools/package-management/checkinstall/glibc-check.patch b/nixpkgs/pkgs/tools/package-management/checkinstall/glibc-check.patch
index 7f8cbccae8e..7f8cbccae8e 100644
--- a/pkgs/tools/package-management/checkinstall/glibc-check.patch
+++ b/nixpkgs/pkgs/tools/package-management/checkinstall/glibc-check.patch
diff --git a/pkgs/tools/package-management/checkinstall/missing-functions.patch b/nixpkgs/pkgs/tools/package-management/checkinstall/missing-functions.patch
index 02066134b2e..02066134b2e 100644
--- a/pkgs/tools/package-management/checkinstall/missing-functions.patch
+++ b/nixpkgs/pkgs/tools/package-management/checkinstall/missing-functions.patch
diff --git a/pkgs/tools/package-management/checkinstall/readlink-types.patch b/nixpkgs/pkgs/tools/package-management/checkinstall/readlink-types.patch
index a860607fcf6..a860607fcf6 100644
--- a/pkgs/tools/package-management/checkinstall/readlink-types.patch
+++ b/nixpkgs/pkgs/tools/package-management/checkinstall/readlink-types.patch
diff --git a/pkgs/tools/package-management/checkinstall/scandir.patch b/nixpkgs/pkgs/tools/package-management/checkinstall/scandir.patch
index ae40100a980..ae40100a980 100644
--- a/pkgs/tools/package-management/checkinstall/scandir.patch
+++ b/nixpkgs/pkgs/tools/package-management/checkinstall/scandir.patch
diff --git a/pkgs/tools/package-management/checkinstall/set-buildroot.patch b/nixpkgs/pkgs/tools/package-management/checkinstall/set-buildroot.patch
index 58840f491ec..58840f491ec 100644
--- a/pkgs/tools/package-management/checkinstall/set-buildroot.patch
+++ b/nixpkgs/pkgs/tools/package-management/checkinstall/set-buildroot.patch
diff --git a/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch b/nixpkgs/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch
index c8be7f0b5e2..c8be7f0b5e2 100644
--- a/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch
+++ b/nixpkgs/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch
diff --git a/pkgs/tools/package-management/clib/default.nix b/nixpkgs/pkgs/tools/package-management/clib/default.nix
index 75c47dda0c4..75c47dda0c4 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/clib/default.nix
diff --git a/pkgs/tools/package-management/conda/default.nix b/nixpkgs/pkgs/tools/package-management/conda/default.nix
index 92d0e254312..92d0e254312 100644
--- a/pkgs/tools/package-management/conda/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/conda/default.nix
diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/nixpkgs/pkgs/tools/package-management/createrepo_c/default.nix
index 15a64ffd25e..15a64ffd25e 100644
--- a/pkgs/tools/package-management/createrepo_c/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/createrepo_c/default.nix
diff --git a/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch b/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch
index e184cc8facc..e184cc8facc 100644
--- a/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch
+++ b/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch
diff --git a/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch b/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch
index a247c6d9fe4..a247c6d9fe4 100644
--- a/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch
+++ b/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch
diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index dd64241fd37..dd64241fd37 100644
--- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
diff --git a/pkgs/tools/package-management/disnix/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/default.nix
index 2c5bc41e18d..2c5bc41e18d 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/disnix/default.nix
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix
index 319716c0f3e..319716c0f3e 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 7b5d99bef9e..7b5d99bef9e 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix
index 11672e6d456..11672e6d456 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix
diff --git a/pkgs/tools/package-management/elm-github-install/Gemfile b/nixpkgs/pkgs/tools/package-management/elm-github-install/Gemfile
index b97eab9777d..b97eab9777d 100644
--- a/pkgs/tools/package-management/elm-github-install/Gemfile
+++ b/nixpkgs/pkgs/tools/package-management/elm-github-install/Gemfile
diff --git a/pkgs/tools/package-management/elm-github-install/Gemfile.lock b/nixpkgs/pkgs/tools/package-management/elm-github-install/Gemfile.lock
index a551368eade..a551368eade 100644
--- a/pkgs/tools/package-management/elm-github-install/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/package-management/elm-github-install/Gemfile.lock
diff --git a/pkgs/tools/package-management/elm-github-install/default.nix b/nixpkgs/pkgs/tools/package-management/elm-github-install/default.nix
index 5703a13745b..5703a13745b 100644
--- a/pkgs/tools/package-management/elm-github-install/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/elm-github-install/default.nix
diff --git a/pkgs/tools/package-management/elm-github-install/gemset.nix b/nixpkgs/pkgs/tools/package-management/elm-github-install/gemset.nix
index d310b41d7aa..d310b41d7aa 100644
--- a/pkgs/tools/package-management/elm-github-install/gemset.nix
+++ b/nixpkgs/pkgs/tools/package-management/elm-github-install/gemset.nix
diff --git a/pkgs/tools/package-management/emplace/default.nix b/nixpkgs/pkgs/tools/package-management/emplace/default.nix
index bb361fd97c3..bb361fd97c3 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/emplace/default.nix
diff --git a/pkgs/tools/package-management/fpm/Gemfile b/nixpkgs/pkgs/tools/package-management/fpm/Gemfile
index 17ed0a0cb2a..17ed0a0cb2a 100644
--- a/pkgs/tools/package-management/fpm/Gemfile
+++ b/nixpkgs/pkgs/tools/package-management/fpm/Gemfile
diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/nixpkgs/pkgs/tools/package-management/fpm/Gemfile.lock
index 1045c7b495a..1045c7b495a 100644
--- a/pkgs/tools/package-management/fpm/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/package-management/fpm/Gemfile.lock
diff --git a/pkgs/tools/package-management/fpm/default.nix b/nixpkgs/pkgs/tools/package-management/fpm/default.nix
index ccb50717acc..ccb50717acc 100644
--- a/pkgs/tools/package-management/fpm/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/fpm/default.nix
diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/nixpkgs/pkgs/tools/package-management/fpm/gemset.nix
index 13d1669e540..13d1669e540 100644
--- a/pkgs/tools/package-management/fpm/gemset.nix
+++ b/nixpkgs/pkgs/tools/package-management/fpm/gemset.nix
diff --git a/pkgs/tools/package-management/gx/default.nix b/nixpkgs/pkgs/tools/package-management/gx/default.nix
index 8e8d30e4fcc..8e8d30e4fcc 100644
--- a/pkgs/tools/package-management/gx/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/gx/default.nix
diff --git a/pkgs/tools/package-management/gx/deps.nix b/nixpkgs/pkgs/tools/package-management/gx/deps.nix
index 766e58775b4..766e58775b4 100644
--- a/pkgs/tools/package-management/gx/deps.nix
+++ b/nixpkgs/pkgs/tools/package-management/gx/deps.nix
diff --git a/pkgs/tools/package-management/gx/go/default.nix b/nixpkgs/pkgs/tools/package-management/gx/go/default.nix
index 0a0793130d1..0a0793130d1 100644
--- a/pkgs/tools/package-management/gx/go/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/gx/go/default.nix
diff --git a/pkgs/tools/package-management/gx/go/deps.nix b/nixpkgs/pkgs/tools/package-management/gx/go/deps.nix
index 895e0e6bb1a..895e0e6bb1a 100644
--- a/pkgs/tools/package-management/gx/go/deps.nix
+++ b/nixpkgs/pkgs/tools/package-management/gx/go/deps.nix
diff --git a/pkgs/tools/package-management/home-manager/default.nix b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix
index 21b2fad1caa..21b2fad1caa 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix
diff --git a/pkgs/tools/package-management/librepo/default.nix b/nixpkgs/pkgs/tools/package-management/librepo/default.nix
index 61435cee284..61435cee284 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/librepo/default.nix
diff --git a/pkgs/tools/package-management/morph/default.nix b/nixpkgs/pkgs/tools/package-management/morph/default.nix
index d0cd7127c50..d0cd7127c50 100644
--- a/pkgs/tools/package-management/morph/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/morph/default.nix
diff --git a/pkgs/tools/package-management/morph/deps.nix b/nixpkgs/pkgs/tools/package-management/morph/deps.nix
index fdae5ef39ee..fdae5ef39ee 100644
--- a/pkgs/tools/package-management/morph/deps.nix
+++ b/nixpkgs/pkgs/tools/package-management/morph/deps.nix
diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix
index 3f307d38f02..3f307d38f02 100644
--- a/pkgs/tools/package-management/mynewt-newt/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix
diff --git a/pkgs/tools/package-management/mynewt-newt/deps.nix b/nixpkgs/pkgs/tools/package-management/mynewt-newt/deps.nix
index ea3d97ca67e..ea3d97ca67e 100644
--- a/pkgs/tools/package-management/mynewt-newt/deps.nix
+++ b/nixpkgs/pkgs/tools/package-management/mynewt-newt/deps.nix
diff --git a/pkgs/tools/package-management/nfpm/default.nix b/nixpkgs/pkgs/tools/package-management/nfpm/default.nix
index 60091742e0d..60091742e0d 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nfpm/default.nix
diff --git a/pkgs/tools/package-management/niff/default.nix b/nixpkgs/pkgs/tools/package-management/niff/default.nix
index 8c6a72cf131..8c6a72cf131 100644
--- a/pkgs/tools/package-management/niff/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/niff/default.nix
diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix
index b78b3bf07cd..b78b3bf07cd 100644
--- a/pkgs/tools/package-management/nix-bundle/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix
diff --git a/pkgs/tools/package-management/nix-du/default.nix b/nixpkgs/pkgs/tools/package-management/nix-du/default.nix
index 74543cef83b..74543cef83b 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-du/default.nix
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/nixpkgs/pkgs/tools/package-management/nix-index/default.nix
index b3a16633c1d..b3a16633c1d 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-index/default.nix
diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix
index f5dfacf319b..f5dfacf319b 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix
diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index c23db106ea1..c23db106ea1 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix
index 19a40b7395f..19a40b7395f 100644
--- a/pkgs/tools/package-management/nix-prefetch/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix
index 63f948db9db..63f948db9db 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix
diff --git a/pkgs/tools/package-management/nix-top/default.nix b/nixpkgs/pkgs/tools/package-management/nix-top/default.nix
index 1d2cad2e39e..1d2cad2e39e 100644
--- a/pkgs/tools/package-management/nix-top/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-top/default.nix
diff --git a/pkgs/tools/package-management/nix-universal-prefetch/default.nix b/nixpkgs/pkgs/tools/package-management/nix-universal-prefetch/default.nix
index a4e43f14967..a4e43f14967 100644
--- a/pkgs/tools/package-management/nix-universal-prefetch/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-universal-prefetch/default.nix
diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/nixpkgs/pkgs/tools/package-management/nix-update-source/default.nix
index a2add8f8a78..a2add8f8a78 100644
--- a/pkgs/tools/package-management/nix-update-source/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-update-source/default.nix
diff --git a/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix
index 28413971c00..28413971c00 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix
diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix b/nixpkgs/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix
index 462c9e615a1..462c9e615a1 100644
--- a/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix
diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix b/nixpkgs/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix
index fd47f8895fd..fd47f8895fd 100644
--- a/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix
diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix b/nixpkgs/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix
index aa037b48b4f..aa037b48b4f 100644
--- a/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix
diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix b/nixpkgs/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix
index b60e3aee340..b60e3aee340 100644
--- a/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix
diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix b/nixpkgs/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix
index 2e0523bb25c..2e0523bb25c 100644
--- a/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix
diff --git a/pkgs/tools/package-management/nixops/azure-storage/default.nix b/nixpkgs/pkgs/tools/package-management/nixops/azure-storage/default.nix
index 6693a7464d4..6693a7464d4 100644
--- a/pkgs/tools/package-management/nixops/azure-storage/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixops/azure-storage/default.nix
diff --git a/pkgs/tools/package-management/nixops/default.nix b/nixpkgs/pkgs/tools/package-management/nixops/default.nix
index c761a3a4779..c761a3a4779 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixops/default.nix
diff --git a/pkgs/tools/package-management/nixops/deps.nix b/nixpkgs/pkgs/tools/package-management/nixops/deps.nix
index 7da38f83e7f..7da38f83e7f 100644
--- a/pkgs/tools/package-management/nixops/deps.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixops/deps.nix
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/nixpkgs/pkgs/tools/package-management/nixops/generic.nix
index 79400a8e5ea..79400a8e5ea 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixops/generic.nix
diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/nixpkgs/pkgs/tools/package-management/nixops/nixops-dns.nix
index f63fe868e01..f63fe868e01 100644
--- a/pkgs/tools/package-management/nixops/nixops-dns.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixops/nixops-dns.nix
diff --git a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/nixpkgs/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
index e6e30b26240..e6e30b26240 100644
--- a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/nixpkgs/pkgs/tools/package-management/nixops/unstable.nix
index 94975807dea..94975807dea 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixops/unstable.nix
diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix
index 928c946de2b..928c946de2b 100644
--- a/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix
diff --git a/pkgs/tools/package-management/nixui/default.nix b/nixpkgs/pkgs/tools/package-management/nixui/default.nix
index 131a3bb5fdd..131a3bb5fdd 100644
--- a/pkgs/tools/package-management/nixui/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixui/default.nix
diff --git a/pkgs/tools/package-management/nixui/generate.sh b/nixpkgs/pkgs/tools/package-management/nixui/generate.sh
index 334edb4a027..334edb4a027 100755
--- a/pkgs/tools/package-management/nixui/generate.sh
+++ b/nixpkgs/pkgs/tools/package-management/nixui/generate.sh
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix
index 4377681e20d..4377681e20d 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix
diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix
index 07e3cd896f6..07e3cd896f6 100644
--- a/pkgs/tools/package-management/nixui/node-packages.nix
+++ b/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix
diff --git a/pkgs/tools/package-management/nixui/pkg.json b/nixpkgs/pkgs/tools/package-management/nixui/pkg.json
index 551df4f1b1c..551df4f1b1c 100644
--- a/pkgs/tools/package-management/nixui/pkg.json
+++ b/nixpkgs/pkgs/tools/package-management/nixui/pkg.json
diff --git a/pkgs/tools/package-management/nox/default.nix b/nixpkgs/pkgs/tools/package-management/nox/default.nix
index 673fc89e98d..673fc89e98d 100644
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nox/default.nix
diff --git a/pkgs/tools/package-management/nox/nox-review-wip.patch b/nixpkgs/pkgs/tools/package-management/nox/nox-review-wip.patch
index e82dc7a2c26..e82dc7a2c26 100644
--- a/pkgs/tools/package-management/nox/nox-review-wip.patch
+++ b/nixpkgs/pkgs/tools/package-management/nox/nox-review-wip.patch
diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/nixpkgs/pkgs/tools/package-management/opkg-utils/default.nix
index 1c97757ff8a..1c97757ff8a 100644
--- a/pkgs/tools/package-management/opkg-utils/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/opkg-utils/default.nix
diff --git a/pkgs/tools/package-management/opkg/default.nix b/nixpkgs/pkgs/tools/package-management/opkg/default.nix
index 1aae0290d5a..1aae0290d5a 100644
--- a/pkgs/tools/package-management/opkg/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/opkg/default.nix
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix
index dc69ae457dc..dc69ae457dc 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix
diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix
index 987c834f505..987c834f505 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix
diff --git a/pkgs/tools/package-management/pacman/default.nix b/nixpkgs/pkgs/tools/package-management/pacman/default.nix
index cdd0c83574a..cdd0c83574a 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/pacman/default.nix
diff --git a/pkgs/tools/package-management/protontricks/default.nix b/nixpkgs/pkgs/tools/package-management/protontricks/default.nix
index c8413c56854..c8413c56854 100644
--- a/pkgs/tools/package-management/protontricks/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/protontricks/default.nix
diff --git a/pkgs/tools/package-management/python2nix/default.nix b/nixpkgs/pkgs/tools/package-management/python2nix/default.nix
index 675ec61f4db..675ec61f4db 100644
--- a/pkgs/tools/package-management/python2nix/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/python2nix/default.nix
diff --git a/pkgs/tools/package-management/reuse/default.nix b/nixpkgs/pkgs/tools/package-management/reuse/default.nix
index 13a3a85f082..13a3a85f082 100644
--- a/pkgs/tools/package-management/reuse/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/reuse/default.nix
diff --git a/pkgs/tools/package-management/rpm/default.nix b/nixpkgs/pkgs/tools/package-management/rpm/default.nix
index 05d293b5bf1..05d293b5bf1 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/rpm/default.nix
diff --git a/pkgs/tools/package-management/xbps/cert-paths.patch b/nixpkgs/pkgs/tools/package-management/xbps/cert-paths.patch
index 569161d9f2e..569161d9f2e 100644
--- a/pkgs/tools/package-management/xbps/cert-paths.patch
+++ b/nixpkgs/pkgs/tools/package-management/xbps/cert-paths.patch
diff --git a/pkgs/tools/package-management/xbps/default.nix b/nixpkgs/pkgs/tools/package-management/xbps/default.nix
index 7ff079c0116..7ff079c0116 100644
--- a/pkgs/tools/package-management/xbps/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/xbps/default.nix
diff --git a/pkgs/tools/security/2fa/default.nix b/nixpkgs/pkgs/tools/security/2fa/default.nix
index c4ba7b67dc7..c4ba7b67dc7 100644
--- a/pkgs/tools/security/2fa/default.nix
+++ b/nixpkgs/pkgs/tools/security/2fa/default.nix
diff --git a/pkgs/tools/security/acsccid/default.nix b/nixpkgs/pkgs/tools/security/acsccid/default.nix
index 5a771917311..5a771917311 100644
--- a/pkgs/tools/security/acsccid/default.nix
+++ b/nixpkgs/pkgs/tools/security/acsccid/default.nix
diff --git a/pkgs/tools/security/aespipe/default.nix b/nixpkgs/pkgs/tools/security/aespipe/default.nix
index 69bef27258e..69bef27258e 100644
--- a/pkgs/tools/security/aespipe/default.nix
+++ b/nixpkgs/pkgs/tools/security/aespipe/default.nix
diff --git a/pkgs/tools/security/afl/README.md b/nixpkgs/pkgs/tools/security/afl/README.md
index 180cad6bc4c..180cad6bc4c 100644
--- a/pkgs/tools/security/afl/README.md
+++ b/nixpkgs/pkgs/tools/security/afl/README.md
diff --git a/pkgs/tools/security/afl/default.nix b/nixpkgs/pkgs/tools/security/afl/default.nix
index df5e3728943..df5e3728943 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/nixpkgs/pkgs/tools/security/afl/default.nix
diff --git a/pkgs/tools/security/afl/libdislocator.nix b/nixpkgs/pkgs/tools/security/afl/libdislocator.nix
index 953c59e435c..953c59e435c 100644
--- a/pkgs/tools/security/afl/libdislocator.nix
+++ b/nixpkgs/pkgs/tools/security/afl/libdislocator.nix
diff --git a/pkgs/tools/security/afl/qemu-patches/no-etc-install.patch b/nixpkgs/pkgs/tools/security/afl/qemu-patches/no-etc-install.patch
index 5dfbfd780f1..5dfbfd780f1 100644
--- a/pkgs/tools/security/afl/qemu-patches/no-etc-install.patch
+++ b/nixpkgs/pkgs/tools/security/afl/qemu-patches/no-etc-install.patch
diff --git a/pkgs/tools/security/afl/qemu.nix b/nixpkgs/pkgs/tools/security/afl/qemu.nix
index 479de4b4185..479de4b4185 100644
--- a/pkgs/tools/security/afl/qemu.nix
+++ b/nixpkgs/pkgs/tools/security/afl/qemu.nix
diff --git a/pkgs/tools/security/age/default.nix b/nixpkgs/pkgs/tools/security/age/default.nix
index bde597ba9f3..bde597ba9f3 100644
--- a/pkgs/tools/security/age/default.nix
+++ b/nixpkgs/pkgs/tools/security/age/default.nix
diff --git a/pkgs/tools/security/aide/default.nix b/nixpkgs/pkgs/tools/security/aide/default.nix
index ea14d89c45c..ea14d89c45c 100644
--- a/pkgs/tools/security/aide/default.nix
+++ b/nixpkgs/pkgs/tools/security/aide/default.nix
diff --git a/pkgs/tools/security/apg/apg.patch b/nixpkgs/pkgs/tools/security/apg/apg.patch
index abc22647d52..abc22647d52 100644
--- a/pkgs/tools/security/apg/apg.patch
+++ b/nixpkgs/pkgs/tools/security/apg/apg.patch
diff --git a/pkgs/tools/security/apg/default.nix b/nixpkgs/pkgs/tools/security/apg/default.nix
index db490c7822f..db490c7822f 100644
--- a/pkgs/tools/security/apg/default.nix
+++ b/nixpkgs/pkgs/tools/security/apg/default.nix
diff --git a/pkgs/tools/security/apg/phony-install-target.patch b/nixpkgs/pkgs/tools/security/apg/phony-install-target.patch
index 9edf50b4b59..9edf50b4b59 100644
--- a/pkgs/tools/security/apg/phony-install-target.patch
+++ b/nixpkgs/pkgs/tools/security/apg/phony-install-target.patch
diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
index 580cf7585c9..580cf7585c9 100644
--- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
+++ b/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix
index 44282d5f964..44282d5f964 100644
--- a/pkgs/tools/security/aws-iam-authenticator/default.nix
+++ b/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix
diff --git a/pkgs/tools/security/aws-okta/default.nix b/nixpkgs/pkgs/tools/security/aws-okta/default.nix
index 71732f26934..71732f26934 100644
--- a/pkgs/tools/security/aws-okta/default.nix
+++ b/nixpkgs/pkgs/tools/security/aws-okta/default.nix
diff --git a/pkgs/tools/security/aws-okta/deps.nix b/nixpkgs/pkgs/tools/security/aws-okta/deps.nix
index 180aa69d56c..180aa69d56c 100644
--- a/pkgs/tools/security/aws-okta/deps.nix
+++ b/nixpkgs/pkgs/tools/security/aws-okta/deps.nix
diff --git a/pkgs/tools/security/b2sum/default.nix b/nixpkgs/pkgs/tools/security/b2sum/default.nix
index fdd4f2c73fd..fdd4f2c73fd 100644
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/nixpkgs/pkgs/tools/security/b2sum/default.nix
diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix
index b745a2c872e..b745a2c872e 100644
--- a/pkgs/tools/security/bash-supergenpass/default.nix
+++ b/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix
diff --git a/pkgs/tools/security/bettercap/default.nix b/nixpkgs/pkgs/tools/security/bettercap/default.nix
index d0cda57e2d0..d0cda57e2d0 100644
--- a/pkgs/tools/security/bettercap/default.nix
+++ b/nixpkgs/pkgs/tools/security/bettercap/default.nix
diff --git a/pkgs/tools/security/bettercap/deps.nix b/nixpkgs/pkgs/tools/security/bettercap/deps.nix
index 12aeb1918c6..12aeb1918c6 100644
--- a/pkgs/tools/security/bettercap/deps.nix
+++ b/nixpkgs/pkgs/tools/security/bettercap/deps.nix
diff --git a/pkgs/tools/security/bitwarden/default.nix b/nixpkgs/pkgs/tools/security/bitwarden/default.nix
index fbef98df82d..fbef98df82d 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/nixpkgs/pkgs/tools/security/bitwarden/default.nix
diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix
index 1b262581eb2..1b262581eb2 100644
--- a/pkgs/tools/security/bitwarden_rs/default.nix
+++ b/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix
diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix
index 9cbf067d40b..9cbf067d40b 100644
--- a/pkgs/tools/security/bitwarden_rs/vault.nix
+++ b/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix
diff --git a/pkgs/tools/security/bmrsa/11.nix b/nixpkgs/pkgs/tools/security/bmrsa/11.nix
index 47851fbfa05..47851fbfa05 100644
--- a/pkgs/tools/security/bmrsa/11.nix
+++ b/nixpkgs/pkgs/tools/security/bmrsa/11.nix
diff --git a/pkgs/tools/security/browserpass/default.nix b/nixpkgs/pkgs/tools/security/browserpass/default.nix
index 966383163e6..966383163e6 100644
--- a/pkgs/tools/security/browserpass/default.nix
+++ b/nixpkgs/pkgs/tools/security/browserpass/default.nix
diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/nixpkgs/pkgs/tools/security/bruteforce-luks/default.nix
index cfa27a5c686..cfa27a5c686 100644
--- a/pkgs/tools/security/bruteforce-luks/default.nix
+++ b/nixpkgs/pkgs/tools/security/bruteforce-luks/default.nix
diff --git a/pkgs/tools/security/bundler-audit/Gemfile b/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile
index f9fb0e329bd..f9fb0e329bd 100644
--- a/pkgs/tools/security/bundler-audit/Gemfile
+++ b/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile
diff --git a/pkgs/tools/security/bundler-audit/Gemfile.lock b/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock
index 28cbcf5a9a6..28cbcf5a9a6 100644
--- a/pkgs/tools/security/bundler-audit/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock
diff --git a/pkgs/tools/security/bundler-audit/default.nix b/nixpkgs/pkgs/tools/security/bundler-audit/default.nix
index 3712c129cf6..3712c129cf6 100644
--- a/pkgs/tools/security/bundler-audit/default.nix
+++ b/nixpkgs/pkgs/tools/security/bundler-audit/default.nix
diff --git a/pkgs/tools/security/bundler-audit/gemset.nix b/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix
index 56d78b3e8f1..56d78b3e8f1 100644
--- a/pkgs/tools/security/bundler-audit/gemset.nix
+++ b/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix
diff --git a/pkgs/tools/security/ccid/default.nix b/nixpkgs/pkgs/tools/security/ccid/default.nix
index 8d0b3a89a34..8d0b3a89a34 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/nixpkgs/pkgs/tools/security/ccid/default.nix
diff --git a/pkgs/tools/security/ccrypt/default.nix b/nixpkgs/pkgs/tools/security/ccrypt/default.nix
index 77a15e2f27c..77a15e2f27c 100644
--- a/pkgs/tools/security/ccrypt/default.nix
+++ b/nixpkgs/pkgs/tools/security/ccrypt/default.nix
diff --git a/pkgs/tools/security/certmgr/default.nix b/nixpkgs/pkgs/tools/security/certmgr/default.nix
index 4f48522e613..4f48522e613 100644
--- a/pkgs/tools/security/certmgr/default.nix
+++ b/nixpkgs/pkgs/tools/security/certmgr/default.nix
diff --git a/pkgs/tools/security/certstrap/default.nix b/nixpkgs/pkgs/tools/security/certstrap/default.nix
index fb3c00e48f9..fb3c00e48f9 100644
--- a/pkgs/tools/security/certstrap/default.nix
+++ b/nixpkgs/pkgs/tools/security/certstrap/default.nix
diff --git a/pkgs/tools/security/cfssl/default.nix b/nixpkgs/pkgs/tools/security/cfssl/default.nix
index 8d8497f6cb9..8d8497f6cb9 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/nixpkgs/pkgs/tools/security/cfssl/default.nix
diff --git a/pkgs/tools/security/chaps/default.nix b/nixpkgs/pkgs/tools/security/chaps/default.nix
index c8ee9506968..c8ee9506968 100644
--- a/pkgs/tools/security/chaps/default.nix
+++ b/nixpkgs/pkgs/tools/security/chaps/default.nix
diff --git a/pkgs/tools/security/chaps/fix_absolute_path.patch b/nixpkgs/pkgs/tools/security/chaps/fix_absolute_path.patch
index 7dbd60c73c4..7dbd60c73c4 100644
--- a/pkgs/tools/security/chaps/fix_absolute_path.patch
+++ b/nixpkgs/pkgs/tools/security/chaps/fix_absolute_path.patch
diff --git a/pkgs/tools/security/chaps/fix_environment_variables.patch b/nixpkgs/pkgs/tools/security/chaps/fix_environment_variables.patch
index 2d7ee0d9a73..2d7ee0d9a73 100644
--- a/pkgs/tools/security/chaps/fix_environment_variables.patch
+++ b/nixpkgs/pkgs/tools/security/chaps/fix_environment_variables.patch
diff --git a/pkgs/tools/security/chaps/fix_scons.patch b/nixpkgs/pkgs/tools/security/chaps/fix_scons.patch
index 54843453c86..54843453c86 100644
--- a/pkgs/tools/security/chaps/fix_scons.patch
+++ b/nixpkgs/pkgs/tools/security/chaps/fix_scons.patch
diff --git a/pkgs/tools/security/chaps/insert_prefetches.patch b/nixpkgs/pkgs/tools/security/chaps/insert_prefetches.patch
index 8b8449a6e66..8b8449a6e66 100644
--- a/pkgs/tools/security/chaps/insert_prefetches.patch
+++ b/nixpkgs/pkgs/tools/security/chaps/insert_prefetches.patch
diff --git a/pkgs/tools/security/chipsec/default.nix b/nixpkgs/pkgs/tools/security/chipsec/default.nix
index 7b4c8cf68eb..7b4c8cf68eb 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/nixpkgs/pkgs/tools/security/chipsec/default.nix
diff --git a/pkgs/tools/security/chkrootkit/default.nix b/nixpkgs/pkgs/tools/security/chkrootkit/default.nix
index 1d85ba0b566..1d85ba0b566 100644
--- a/pkgs/tools/security/chkrootkit/default.nix
+++ b/nixpkgs/pkgs/tools/security/chkrootkit/default.nix
diff --git a/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch b/nixpkgs/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch
index 9c379adb7df..9c379adb7df 100644
--- a/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch
+++ b/nixpkgs/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch
diff --git a/pkgs/tools/security/chntpw/01-chntpw-install-target.patch b/nixpkgs/pkgs/tools/security/chntpw/01-chntpw-install-target.patch
index d3163a026f9..d3163a026f9 100644
--- a/pkgs/tools/security/chntpw/01-chntpw-install-target.patch
+++ b/nixpkgs/pkgs/tools/security/chntpw/01-chntpw-install-target.patch
diff --git a/pkgs/tools/security/chntpw/default.nix b/nixpkgs/pkgs/tools/security/chntpw/default.nix
index 5a037090801..5a037090801 100644
--- a/pkgs/tools/security/chntpw/default.nix
+++ b/nixpkgs/pkgs/tools/security/chntpw/default.nix
diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix
index 9e87c47ef39..9e87c47ef39 100644
--- a/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix
diff --git a/pkgs/tools/security/cipherscan/default.nix b/nixpkgs/pkgs/tools/security/cipherscan/default.nix
index eae5a5256df..eae5a5256df 100644
--- a/pkgs/tools/security/cipherscan/default.nix
+++ b/nixpkgs/pkgs/tools/security/cipherscan/default.nix
diff --git a/pkgs/tools/security/clamav/default.nix b/nixpkgs/pkgs/tools/security/clamav/default.nix
index 43f56352ceb..43f56352ceb 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/nixpkgs/pkgs/tools/security/clamav/default.nix
diff --git a/pkgs/tools/security/cowpatty/default.nix b/nixpkgs/pkgs/tools/security/cowpatty/default.nix
index 0fb9ed58997..0fb9ed58997 100644
--- a/pkgs/tools/security/cowpatty/default.nix
+++ b/nixpkgs/pkgs/tools/security/cowpatty/default.nix
diff --git a/pkgs/tools/security/crackxls/default.nix b/nixpkgs/pkgs/tools/security/crackxls/default.nix
index 04b7b5695b5..04b7b5695b5 100644
--- a/pkgs/tools/security/crackxls/default.nix
+++ b/nixpkgs/pkgs/tools/security/crackxls/default.nix
diff --git a/pkgs/tools/security/crunch/default.nix b/nixpkgs/pkgs/tools/security/crunch/default.nix
index 259ee38c68f..259ee38c68f 100644
--- a/pkgs/tools/security/crunch/default.nix
+++ b/nixpkgs/pkgs/tools/security/crunch/default.nix
diff --git a/pkgs/tools/security/ctmg/default.nix b/nixpkgs/pkgs/tools/security/ctmg/default.nix
index 104a615542b..104a615542b 100644
--- a/pkgs/tools/security/ctmg/default.nix
+++ b/nixpkgs/pkgs/tools/security/ctmg/default.nix
diff --git a/pkgs/tools/security/diceware/default.nix b/nixpkgs/pkgs/tools/security/diceware/default.nix
index dcd7e853564..dcd7e853564 100644
--- a/pkgs/tools/security/diceware/default.nix
+++ b/nixpkgs/pkgs/tools/security/diceware/default.nix
diff --git a/pkgs/tools/security/dirmngr/default.nix b/nixpkgs/pkgs/tools/security/dirmngr/default.nix
index ee97bda1906..ee97bda1906 100644
--- a/pkgs/tools/security/dirmngr/default.nix
+++ b/nixpkgs/pkgs/tools/security/dirmngr/default.nix
diff --git a/pkgs/tools/security/dnsenum/default.nix b/nixpkgs/pkgs/tools/security/dnsenum/default.nix
index 3374c827d75..3374c827d75 100644
--- a/pkgs/tools/security/dnsenum/default.nix
+++ b/nixpkgs/pkgs/tools/security/dnsenum/default.nix
diff --git a/pkgs/tools/security/dnsrecon/default.nix b/nixpkgs/pkgs/tools/security/dnsrecon/default.nix
index 2575636aeca..2575636aeca 100644
--- a/pkgs/tools/security/dnsrecon/default.nix
+++ b/nixpkgs/pkgs/tools/security/dnsrecon/default.nix
diff --git a/pkgs/tools/security/doas/default.nix b/nixpkgs/pkgs/tools/security/doas/default.nix
index ce8b5825647..ce8b5825647 100644
--- a/pkgs/tools/security/doas/default.nix
+++ b/nixpkgs/pkgs/tools/security/doas/default.nix
diff --git a/pkgs/tools/security/duo-unix/default.nix b/nixpkgs/pkgs/tools/security/duo-unix/default.nix
index 2cf9b92745f..2cf9b92745f 100644
--- a/pkgs/tools/security/duo-unix/default.nix
+++ b/nixpkgs/pkgs/tools/security/duo-unix/default.nix
diff --git a/pkgs/tools/security/ecdsatool/default.nix b/nixpkgs/pkgs/tools/security/ecdsatool/default.nix
index 0e57a5bab88..0e57a5bab88 100644
--- a/pkgs/tools/security/ecdsatool/default.nix
+++ b/nixpkgs/pkgs/tools/security/ecdsatool/default.nix
diff --git a/pkgs/tools/security/ecdsautils/default.nix b/nixpkgs/pkgs/tools/security/ecdsautils/default.nix
index 13280e3226d..13280e3226d 100644
--- a/pkgs/tools/security/ecdsautils/default.nix
+++ b/nixpkgs/pkgs/tools/security/ecdsautils/default.nix
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/nixpkgs/pkgs/tools/security/ecryptfs/default.nix
index 9fd8c3ac7a2..9fd8c3ac7a2 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/nixpkgs/pkgs/tools/security/ecryptfs/default.nix
diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix
index fcb8d091d93..fcb8d091d93 100644
--- a/pkgs/tools/security/ecryptfs/helper.nix
+++ b/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix
diff --git a/pkgs/tools/security/efitools/default.nix b/nixpkgs/pkgs/tools/security/efitools/default.nix
index 33b6c3b672d..33b6c3b672d 100644
--- a/pkgs/tools/security/efitools/default.nix
+++ b/nixpkgs/pkgs/tools/security/efitools/default.nix
diff --git a/pkgs/tools/security/eid-mw/default.nix b/nixpkgs/pkgs/tools/security/eid-mw/default.nix
index 13ab56aaa9a..13ab56aaa9a 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/nixpkgs/pkgs/tools/security/eid-mw/default.nix
diff --git a/pkgs/tools/security/eid-mw/eid-nssdb.in b/nixpkgs/pkgs/tools/security/eid-mw/eid-nssdb.in
index 636b4c1ee11..636b4c1ee11 100644
--- a/pkgs/tools/security/eid-mw/eid-nssdb.in
+++ b/nixpkgs/pkgs/tools/security/eid-mw/eid-nssdb.in
diff --git a/pkgs/tools/security/enchive/default.nix b/nixpkgs/pkgs/tools/security/enchive/default.nix
index 7e45ab76ed0..7e45ab76ed0 100644
--- a/pkgs/tools/security/enchive/default.nix
+++ b/nixpkgs/pkgs/tools/security/enchive/default.nix
diff --git a/pkgs/tools/security/encryptr/default.nix b/nixpkgs/pkgs/tools/security/encryptr/default.nix
index 01855ee3e5b..01855ee3e5b 100644
--- a/pkgs/tools/security/encryptr/default.nix
+++ b/nixpkgs/pkgs/tools/security/encryptr/default.nix
diff --git a/pkgs/tools/security/enpass/data.json b/nixpkgs/pkgs/tools/security/enpass/data.json
index a4a3b919e64..a4a3b919e64 100644
--- a/pkgs/tools/security/enpass/data.json
+++ b/nixpkgs/pkgs/tools/security/enpass/data.json
diff --git a/pkgs/tools/security/enpass/default.nix b/nixpkgs/pkgs/tools/security/enpass/default.nix
index 6e61f054122..6e61f054122 100644
--- a/pkgs/tools/security/enpass/default.nix
+++ b/nixpkgs/pkgs/tools/security/enpass/default.nix
diff --git a/pkgs/tools/security/enpass/update_script.py b/nixpkgs/pkgs/tools/security/enpass/update_script.py
index f8ec715cb5e..f8ec715cb5e 100644
--- a/pkgs/tools/security/enpass/update_script.py
+++ b/nixpkgs/pkgs/tools/security/enpass/update_script.py
diff --git a/pkgs/tools/security/enum4linux/default.nix b/nixpkgs/pkgs/tools/security/enum4linux/default.nix
index 9a7d1861d9b..9a7d1861d9b 100644
--- a/pkgs/tools/security/enum4linux/default.nix
+++ b/nixpkgs/pkgs/tools/security/enum4linux/default.nix
diff --git a/pkgs/tools/security/eschalot/default.nix b/nixpkgs/pkgs/tools/security/eschalot/default.nix
index 28df3a28442..28df3a28442 100644
--- a/pkgs/tools/security/eschalot/default.nix
+++ b/nixpkgs/pkgs/tools/security/eschalot/default.nix
diff --git a/pkgs/tools/security/fail2ban/default.nix b/nixpkgs/pkgs/tools/security/fail2ban/default.nix
index 39017d09886..39017d09886 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/nixpkgs/pkgs/tools/security/fail2ban/default.nix
diff --git a/pkgs/tools/security/fcrackzip/default.nix b/nixpkgs/pkgs/tools/security/fcrackzip/default.nix
index d923e81ae82..d923e81ae82 100644
--- a/pkgs/tools/security/fcrackzip/default.nix
+++ b/nixpkgs/pkgs/tools/security/fcrackzip/default.nix
diff --git a/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch b/nixpkgs/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch
index 8e508ec1f59..8e508ec1f59 100644
--- a/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch
+++ b/nixpkgs/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch
diff --git a/pkgs/tools/security/fido2luks/default.nix b/nixpkgs/pkgs/tools/security/fido2luks/default.nix
index 4682a09acf5..4682a09acf5 100644
--- a/pkgs/tools/security/fido2luks/default.nix
+++ b/nixpkgs/pkgs/tools/security/fido2luks/default.nix
diff --git a/pkgs/tools/security/fierce/default.nix b/nixpkgs/pkgs/tools/security/fierce/default.nix
index 5d12a000815..5d12a000815 100644
--- a/pkgs/tools/security/fierce/default.nix
+++ b/nixpkgs/pkgs/tools/security/fierce/default.nix
diff --git a/pkgs/tools/security/fpm2/default.nix b/nixpkgs/pkgs/tools/security/fpm2/default.nix
index b6669358f7f..b6669358f7f 100644
--- a/pkgs/tools/security/fpm2/default.nix
+++ b/nixpkgs/pkgs/tools/security/fpm2/default.nix
diff --git a/pkgs/tools/security/fprintd/default.nix b/nixpkgs/pkgs/tools/security/fprintd/default.nix
index 41a00306f69..41a00306f69 100644
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/nixpkgs/pkgs/tools/security/fprintd/default.nix
diff --git a/pkgs/tools/security/fprot/default.nix b/nixpkgs/pkgs/tools/security/fprot/default.nix
index 3fff99a6ce1..3fff99a6ce1 100644
--- a/pkgs/tools/security/fprot/default.nix
+++ b/nixpkgs/pkgs/tools/security/fprot/default.nix
diff --git a/pkgs/tools/security/fwknop/default.nix b/nixpkgs/pkgs/tools/security/fwknop/default.nix
index a9f69c8b96e..a9f69c8b96e 100644
--- a/pkgs/tools/security/fwknop/default.nix
+++ b/nixpkgs/pkgs/tools/security/fwknop/default.nix
diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix
index 89900d27bd2..89900d27bd2 100644
--- a/pkgs/tools/security/gen-oath-safe/default.nix
+++ b/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix
diff --git a/pkgs/tools/security/gencfsm/default.nix b/nixpkgs/pkgs/tools/security/gencfsm/default.nix
index 63d1bab89d7..63d1bab89d7 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/nixpkgs/pkgs/tools/security/gencfsm/default.nix
diff --git a/pkgs/tools/security/gencfsm/makefile-mkdir.patch b/nixpkgs/pkgs/tools/security/gencfsm/makefile-mkdir.patch
index 49c7b0b4d9d..49c7b0b4d9d 100644
--- a/pkgs/tools/security/gencfsm/makefile-mkdir.patch
+++ b/nixpkgs/pkgs/tools/security/gencfsm/makefile-mkdir.patch
diff --git a/pkgs/tools/security/ghidra/default.nix b/nixpkgs/pkgs/tools/security/ghidra/default.nix
index b3773725e6e..b3773725e6e 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/nixpkgs/pkgs/tools/security/ghidra/default.nix
diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix
index a559039d95a..a559039d95a 100644
--- a/pkgs/tools/security/gnome-keysign/default.nix
+++ b/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix
diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix
index 940a5b9a053..940a5b9a053 100644
--- a/pkgs/tools/security/gnu-pw-mgr/default.nix
+++ b/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix
diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix
index bc7cff99dc2..bc7cff99dc2 100644
--- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix
+++ b/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix
diff --git a/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch b/nixpkgs/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch
index 061fb0e8de9..061fb0e8de9 100644
--- a/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch
+++ b/nixpkgs/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch
diff --git a/pkgs/tools/security/gnupg/1.nix b/nixpkgs/pkgs/tools/security/gnupg/1.nix
index 3b916378bf5..3b916378bf5 100644
--- a/pkgs/tools/security/gnupg/1.nix
+++ b/nixpkgs/pkgs/tools/security/gnupg/1.nix
diff --git a/pkgs/tools/security/gnupg/1compat.nix b/nixpkgs/pkgs/tools/security/gnupg/1compat.nix
index 371a7ca67af..371a7ca67af 100644
--- a/pkgs/tools/security/gnupg/1compat.nix
+++ b/nixpkgs/pkgs/tools/security/gnupg/1compat.nix
diff --git a/pkgs/tools/security/gnupg/20.nix b/nixpkgs/pkgs/tools/security/gnupg/20.nix
index ef348e38834..ef348e38834 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/nixpkgs/pkgs/tools/security/gnupg/20.nix
diff --git a/pkgs/tools/security/gnupg/22.nix b/nixpkgs/pkgs/tools/security/gnupg/22.nix
index 9aa92fd6829..9aa92fd6829 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/nixpkgs/pkgs/tools/security/gnupg/22.nix
diff --git a/pkgs/tools/security/gnupg/clang.patch b/nixpkgs/pkgs/tools/security/gnupg/clang.patch
index 842785e5c93..842785e5c93 100644
--- a/pkgs/tools/security/gnupg/clang.patch
+++ b/nixpkgs/pkgs/tools/security/gnupg/clang.patch
diff --git a/pkgs/tools/security/gnupg/fix-libusb-include-path.patch b/nixpkgs/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
index a5432f8e3d9..a5432f8e3d9 100644
--- a/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
+++ b/nixpkgs/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/nixpkgs/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
index 65804bac764..65804bac764 100644
--- a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
+++ b/nixpkgs/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
diff --git a/pkgs/tools/security/gobuster/default.nix b/nixpkgs/pkgs/tools/security/gobuster/default.nix
index c3426bee965..c3426bee965 100644
--- a/pkgs/tools/security/gobuster/default.nix
+++ b/nixpkgs/pkgs/tools/security/gobuster/default.nix
diff --git a/pkgs/tools/security/gopass/default.nix b/nixpkgs/pkgs/tools/security/gopass/default.nix
index 41a0d6eb7a5..41a0d6eb7a5 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/nixpkgs/pkgs/tools/security/gopass/default.nix
diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix
index 1ba650f5af7..1ba650f5af7 100644
--- a/pkgs/tools/security/gorilla-bin/default.nix
+++ b/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix
diff --git a/pkgs/tools/security/gpgstats/default.nix b/nixpkgs/pkgs/tools/security/gpgstats/default.nix
index c3a14f62c76..c3a14f62c76 100644
--- a/pkgs/tools/security/gpgstats/default.nix
+++ b/nixpkgs/pkgs/tools/security/gpgstats/default.nix
diff --git a/pkgs/tools/security/haka/default.nix b/nixpkgs/pkgs/tools/security/haka/default.nix
index bfac54d2d86..bfac54d2d86 100644
--- a/pkgs/tools/security/haka/default.nix
+++ b/nixpkgs/pkgs/tools/security/haka/default.nix
diff --git a/pkgs/tools/security/hash-slinger/default.nix b/nixpkgs/pkgs/tools/security/hash-slinger/default.nix
index 4fa0499f1dd..4fa0499f1dd 100644
--- a/pkgs/tools/security/hash-slinger/default.nix
+++ b/nixpkgs/pkgs/tools/security/hash-slinger/default.nix
diff --git a/pkgs/tools/security/hash_extender/default.nix b/nixpkgs/pkgs/tools/security/hash_extender/default.nix
index 30ba2fb3087..30ba2fb3087 100644
--- a/pkgs/tools/security/hash_extender/default.nix
+++ b/nixpkgs/pkgs/tools/security/hash_extender/default.nix
diff --git a/pkgs/tools/security/hashcash/default.nix b/nixpkgs/pkgs/tools/security/hashcash/default.nix
index a28822ecd95..a28822ecd95 100644
--- a/pkgs/tools/security/hashcash/default.nix
+++ b/nixpkgs/pkgs/tools/security/hashcash/default.nix
diff --git a/pkgs/tools/security/hashcat-utils/default.nix b/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix
index 50508cfc494..50508cfc494 100644
--- a/pkgs/tools/security/hashcat-utils/default.nix
+++ b/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix
diff --git a/pkgs/tools/security/hashcat/default.nix b/nixpkgs/pkgs/tools/security/hashcat/default.nix
index 72a13c0f259..72a13c0f259 100644
--- a/pkgs/tools/security/hashcat/default.nix
+++ b/nixpkgs/pkgs/tools/security/hashcat/default.nix
diff --git a/pkgs/tools/security/haveged/default.nix b/nixpkgs/pkgs/tools/security/haveged/default.nix
index c47331f1bcb..c47331f1bcb 100644
--- a/pkgs/tools/security/haveged/default.nix
+++ b/nixpkgs/pkgs/tools/security/haveged/default.nix
diff --git a/pkgs/tools/security/hcxtools/default.nix b/nixpkgs/pkgs/tools/security/hcxtools/default.nix
index 8e70e0def41..8e70e0def41 100644
--- a/pkgs/tools/security/hcxtools/default.nix
+++ b/nixpkgs/pkgs/tools/security/hcxtools/default.nix
diff --git a/pkgs/tools/security/hologram/default.nix b/nixpkgs/pkgs/tools/security/hologram/default.nix
index e6c375599a9..e6c375599a9 100644
--- a/pkgs/tools/security/hologram/default.nix
+++ b/nixpkgs/pkgs/tools/security/hologram/default.nix
diff --git a/pkgs/tools/security/hologram/deps.nix b/nixpkgs/pkgs/tools/security/hologram/deps.nix
index a9b66da2a9c..a9b66da2a9c 100644
--- a/pkgs/tools/security/hologram/deps.nix
+++ b/nixpkgs/pkgs/tools/security/hologram/deps.nix
diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix
index e2e01fbb921..e2e01fbb921 100644
--- a/pkgs/tools/security/ibm-sw-tpm2/default.nix
+++ b/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix
diff --git a/pkgs/tools/security/ifdnfc/default.nix b/nixpkgs/pkgs/tools/security/ifdnfc/default.nix
index 5ec66a5b98c..5ec66a5b98c 100644
--- a/pkgs/tools/security/ifdnfc/default.nix
+++ b/nixpkgs/pkgs/tools/security/ifdnfc/default.nix
diff --git a/pkgs/tools/security/ipscan/default.nix b/nixpkgs/pkgs/tools/security/ipscan/default.nix
index 40546b6f1c3..40546b6f1c3 100644
--- a/pkgs/tools/security/ipscan/default.nix
+++ b/nixpkgs/pkgs/tools/security/ipscan/default.nix
diff --git a/pkgs/tools/security/jd-gui/default.nix b/nixpkgs/pkgs/tools/security/jd-gui/default.nix
index af88fd6270f..af88fd6270f 100644
--- a/pkgs/tools/security/jd-gui/default.nix
+++ b/nixpkgs/pkgs/tools/security/jd-gui/default.nix
diff --git a/pkgs/tools/security/john/default.nix b/nixpkgs/pkgs/tools/security/john/default.nix
index 17e02e736dc..17e02e736dc 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/nixpkgs/pkgs/tools/security/john/default.nix
diff --git a/pkgs/tools/security/jwt-cli/default.nix b/nixpkgs/pkgs/tools/security/jwt-cli/default.nix
index 83b630a4f4f..83b630a4f4f 100644
--- a/pkgs/tools/security/jwt-cli/default.nix
+++ b/nixpkgs/pkgs/tools/security/jwt-cli/default.nix
diff --git a/pkgs/tools/security/keybase/default.nix b/nixpkgs/pkgs/tools/security/keybase/default.nix
index 1edf86675c3..1edf86675c3 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/nixpkgs/pkgs/tools/security/keybase/default.nix
diff --git a/pkgs/tools/security/keybase/fix-paths-keybase.patch b/nixpkgs/pkgs/tools/security/keybase/fix-paths-keybase.patch
index b3de7bbb530..b3de7bbb530 100644
--- a/pkgs/tools/security/keybase/fix-paths-keybase.patch
+++ b/nixpkgs/pkgs/tools/security/keybase/fix-paths-keybase.patch
diff --git a/pkgs/tools/security/keybase/gui.nix b/nixpkgs/pkgs/tools/security/keybase/gui.nix
index 2ec97f88236..2ec97f88236 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/nixpkgs/pkgs/tools/security/keybase/gui.nix
diff --git a/pkgs/tools/security/keybase/kbfs.nix b/nixpkgs/pkgs/tools/security/keybase/kbfs.nix
index 20fadee6a40..20fadee6a40 100644
--- a/pkgs/tools/security/keybase/kbfs.nix
+++ b/nixpkgs/pkgs/tools/security/keybase/kbfs.nix
diff --git a/pkgs/tools/security/keycard-cli/default.nix b/nixpkgs/pkgs/tools/security/keycard-cli/default.nix
index a76c102b2bb..a76c102b2bb 100644
--- a/pkgs/tools/security/keycard-cli/default.nix
+++ b/nixpkgs/pkgs/tools/security/keycard-cli/default.nix
diff --git a/pkgs/tools/security/knockknock/default.nix b/nixpkgs/pkgs/tools/security/knockknock/default.nix
index ce7663b18cf..ce7663b18cf 100644
--- a/pkgs/tools/security/knockknock/default.nix
+++ b/nixpkgs/pkgs/tools/security/knockknock/default.nix
diff --git a/pkgs/tools/security/kpcli/default.nix b/nixpkgs/pkgs/tools/security/kpcli/default.nix
index 9d4c590efa1..9d4c590efa1 100644
--- a/pkgs/tools/security/kpcli/default.nix
+++ b/nixpkgs/pkgs/tools/security/kpcli/default.nix
diff --git a/pkgs/tools/security/krunner-pass/default.nix b/nixpkgs/pkgs/tools/security/krunner-pass/default.nix
index 57174148160..57174148160 100644
--- a/pkgs/tools/security/krunner-pass/default.nix
+++ b/nixpkgs/pkgs/tools/security/krunner-pass/default.nix
diff --git a/pkgs/tools/security/krunner-pass/pass-path.patch b/nixpkgs/pkgs/tools/security/krunner-pass/pass-path.patch
index 4ceb3c5d92d..4ceb3c5d92d 100644
--- a/pkgs/tools/security/krunner-pass/pass-path.patch
+++ b/nixpkgs/pkgs/tools/security/krunner-pass/pass-path.patch
diff --git a/pkgs/tools/security/kwalletcli/default.nix b/nixpkgs/pkgs/tools/security/kwalletcli/default.nix
index 9356e2f53f9..9356e2f53f9 100644
--- a/pkgs/tools/security/kwalletcli/default.nix
+++ b/nixpkgs/pkgs/tools/security/kwalletcli/default.nix
diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix
index 37da2022520..37da2022520 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix
diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix
index 76732170079..76732170079 100644
--- a/pkgs/tools/security/lesspass-cli/default.nix
+++ b/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix
diff --git a/pkgs/tools/security/libacr38u/default.nix b/nixpkgs/pkgs/tools/security/libacr38u/default.nix
index 248fbe008fc..248fbe008fc 100644
--- a/pkgs/tools/security/libacr38u/default.nix
+++ b/nixpkgs/pkgs/tools/security/libacr38u/default.nix
diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix
index 17861ac2da6..17861ac2da6 100644
--- a/pkgs/tools/security/libmodsecurity/default.nix
+++ b/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix
diff --git a/pkgs/tools/security/logkeys/default.nix b/nixpkgs/pkgs/tools/security/logkeys/default.nix
index f06ce2f246a..f06ce2f246a 100644
--- a/pkgs/tools/security/logkeys/default.nix
+++ b/nixpkgs/pkgs/tools/security/logkeys/default.nix
diff --git a/pkgs/tools/security/lynis/default.nix b/nixpkgs/pkgs/tools/security/lynis/default.nix
index bbed166d759..bbed166d759 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/nixpkgs/pkgs/tools/security/lynis/default.nix
diff --git a/pkgs/tools/security/masscan/default.nix b/nixpkgs/pkgs/tools/security/masscan/default.nix
index f6f9e0df655..f6f9e0df655 100644
--- a/pkgs/tools/security/masscan/default.nix
+++ b/nixpkgs/pkgs/tools/security/masscan/default.nix
diff --git a/pkgs/tools/security/mbox/default.nix b/nixpkgs/pkgs/tools/security/mbox/default.nix
index 1ef282b8b6e..1ef282b8b6e 100644
--- a/pkgs/tools/security/mbox/default.nix
+++ b/nixpkgs/pkgs/tools/security/mbox/default.nix
diff --git a/pkgs/tools/security/meo/default.nix b/nixpkgs/pkgs/tools/security/meo/default.nix
index d10c1659964..d10c1659964 100644
--- a/pkgs/tools/security/meo/default.nix
+++ b/nixpkgs/pkgs/tools/security/meo/default.nix
diff --git a/pkgs/tools/security/metasploit/Gemfile b/nixpkgs/pkgs/tools/security/metasploit/Gemfile
index 2aae6fc49d9..2aae6fc49d9 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/nixpkgs/pkgs/tools/security/metasploit/Gemfile
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
index 931ea65f54a..931ea65f54a 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
diff --git a/pkgs/tools/security/metasploit/default.nix b/nixpkgs/pkgs/tools/security/metasploit/default.nix
index 8486f10bab0..8486f10bab0 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/nixpkgs/pkgs/tools/security/metasploit/default.nix
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
index 28cc83b240f..28cc83b240f 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
diff --git a/pkgs/tools/security/metasploit/shell.nix b/nixpkgs/pkgs/tools/security/metasploit/shell.nix
index cd7a01214c6..cd7a01214c6 100644
--- a/pkgs/tools/security/metasploit/shell.nix
+++ b/nixpkgs/pkgs/tools/security/metasploit/shell.nix
diff --git a/pkgs/tools/security/mfcuk/default.nix b/nixpkgs/pkgs/tools/security/mfcuk/default.nix
index a23e2917561..a23e2917561 100644
--- a/pkgs/tools/security/mfcuk/default.nix
+++ b/nixpkgs/pkgs/tools/security/mfcuk/default.nix
diff --git a/pkgs/tools/security/mfoc/default.nix b/nixpkgs/pkgs/tools/security/mfoc/default.nix
index 1ae18e34353..1ae18e34353 100644
--- a/pkgs/tools/security/mfoc/default.nix
+++ b/nixpkgs/pkgs/tools/security/mfoc/default.nix
diff --git a/pkgs/tools/security/minisign/default.nix b/nixpkgs/pkgs/tools/security/minisign/default.nix
index 15ee2446922..15ee2446922 100644
--- a/pkgs/tools/security/minisign/default.nix
+++ b/nixpkgs/pkgs/tools/security/minisign/default.nix
diff --git a/pkgs/tools/security/mkp224o/default.nix b/nixpkgs/pkgs/tools/security/mkp224o/default.nix
index a4aae480ae1..a4aae480ae1 100644
--- a/pkgs/tools/security/mkp224o/default.nix
+++ b/nixpkgs/pkgs/tools/security/mkp224o/default.nix
diff --git a/pkgs/tools/security/mkpasswd/default.nix b/nixpkgs/pkgs/tools/security/mkpasswd/default.nix
index 3d30fef02e2..3d30fef02e2 100644
--- a/pkgs/tools/security/mkpasswd/default.nix
+++ b/nixpkgs/pkgs/tools/security/mkpasswd/default.nix
diff --git a/pkgs/tools/security/mkrand/default.nix b/nixpkgs/pkgs/tools/security/mkrand/default.nix
index bb9c932d19e..bb9c932d19e 100644
--- a/pkgs/tools/security/mkrand/default.nix
+++ b/nixpkgs/pkgs/tools/security/mkrand/default.nix
diff --git a/pkgs/tools/security/mktemp/default.nix b/nixpkgs/pkgs/tools/security/mktemp/default.nix
index 71bdd3af55d..71bdd3af55d 100644
--- a/pkgs/tools/security/mktemp/default.nix
+++ b/nixpkgs/pkgs/tools/security/mktemp/default.nix
diff --git a/pkgs/tools/security/modsecurity/Makefile.in.patch b/nixpkgs/pkgs/tools/security/modsecurity/Makefile.in.patch
index 98384c754ce..98384c754ce 100644
--- a/pkgs/tools/security/modsecurity/Makefile.in.patch
+++ b/nixpkgs/pkgs/tools/security/modsecurity/Makefile.in.patch
diff --git a/pkgs/tools/security/modsecurity/default.nix b/nixpkgs/pkgs/tools/security/modsecurity/default.nix
index 2a9e41ac0fa..2a9e41ac0fa 100644
--- a/pkgs/tools/security/modsecurity/default.nix
+++ b/nixpkgs/pkgs/tools/security/modsecurity/default.nix
diff --git a/pkgs/tools/security/monkeysphere/default.nix b/nixpkgs/pkgs/tools/security/monkeysphere/default.nix
index 1e585136d88..1e585136d88 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/nixpkgs/pkgs/tools/security/monkeysphere/default.nix
diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/nixpkgs/pkgs/tools/security/monkeysphere/monkeysphere.patch
index 8cdd85017b9..8cdd85017b9 100644
--- a/pkgs/tools/security/monkeysphere/monkeysphere.patch
+++ b/nixpkgs/pkgs/tools/security/monkeysphere/monkeysphere.patch
diff --git a/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch b/nixpkgs/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch
index 2a9a1fc8dfa..2a9a1fc8dfa 100644
--- a/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch
+++ b/nixpkgs/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch
diff --git a/pkgs/tools/security/mpw/default.nix b/nixpkgs/pkgs/tools/security/mpw/default.nix
index 4cff17ef849..4cff17ef849 100644
--- a/pkgs/tools/security/mpw/default.nix
+++ b/nixpkgs/pkgs/tools/security/mpw/default.nix
diff --git a/pkgs/tools/security/munge/default.nix b/nixpkgs/pkgs/tools/security/munge/default.nix
index ee1858ad284..ee1858ad284 100644
--- a/pkgs/tools/security/munge/default.nix
+++ b/nixpkgs/pkgs/tools/security/munge/default.nix
diff --git a/pkgs/tools/security/nasty/default.nix b/nixpkgs/pkgs/tools/security/nasty/default.nix
index d45861cf50e..d45861cf50e 100644
--- a/pkgs/tools/security/nasty/default.nix
+++ b/nixpkgs/pkgs/tools/security/nasty/default.nix
diff --git a/pkgs/tools/security/neopg/default.nix b/nixpkgs/pkgs/tools/security/neopg/default.nix
index c58772346ee..c58772346ee 100644
--- a/pkgs/tools/security/neopg/default.nix
+++ b/nixpkgs/pkgs/tools/security/neopg/default.nix
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix
index 48df486ef0a..48df486ef0a 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix
diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/nixpkgs/pkgs/tools/security/nitrokey-app/udev-rules.nix
index a89fa723826..a89fa723826 100644
--- a/pkgs/tools/security/nitrokey-app/udev-rules.nix
+++ b/nixpkgs/pkgs/tools/security/nitrokey-app/udev-rules.nix
diff --git a/pkgs/tools/security/nmap/default.nix b/nixpkgs/pkgs/tools/security/nmap/default.nix
index f88c533d71d..f88c533d71d 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/nixpkgs/pkgs/tools/security/nmap/default.nix
diff --git a/pkgs/tools/security/nmap/qt.nix b/nixpkgs/pkgs/tools/security/nmap/qt.nix
index 2dcd7fed0c4..2dcd7fed0c4 100644
--- a/pkgs/tools/security/nmap/qt.nix
+++ b/nixpkgs/pkgs/tools/security/nmap/qt.nix
diff --git a/pkgs/tools/security/nmap/zenmap.patch b/nixpkgs/pkgs/tools/security/nmap/zenmap.patch
index 3cd39750c88..3cd39750c88 100644
--- a/pkgs/tools/security/nmap/zenmap.patch
+++ b/nixpkgs/pkgs/tools/security/nmap/zenmap.patch
diff --git a/pkgs/tools/security/notary/default.nix b/nixpkgs/pkgs/tools/security/notary/default.nix
index d1e2ee58e48..d1e2ee58e48 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/nixpkgs/pkgs/tools/security/notary/default.nix
diff --git a/pkgs/tools/security/notary/no-git-usage.patch b/nixpkgs/pkgs/tools/security/notary/no-git-usage.patch
index 363eefe3692..363eefe3692 100644
--- a/pkgs/tools/security/notary/no-git-usage.patch
+++ b/nixpkgs/pkgs/tools/security/notary/no-git-usage.patch
diff --git a/pkgs/tools/security/nsjail/default.nix b/nixpkgs/pkgs/tools/security/nsjail/default.nix
index f1335a1ad1d..f1335a1ad1d 100644
--- a/pkgs/tools/security/nsjail/default.nix
+++ b/nixpkgs/pkgs/tools/security/nsjail/default.nix
diff --git a/pkgs/tools/security/nwipe/default.nix b/nixpkgs/pkgs/tools/security/nwipe/default.nix
index 62d7fb3b34a..62d7fb3b34a 100644
--- a/pkgs/tools/security/nwipe/default.nix
+++ b/nixpkgs/pkgs/tools/security/nwipe/default.nix
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix
index e31d62dc8b7..e31d62dc8b7 100644
--- a/pkgs/tools/security/oath-toolkit/default.nix
+++ b/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix
diff --git a/pkgs/tools/security/omapd/default.nix b/nixpkgs/pkgs/tools/security/omapd/default.nix
index baea02402d9..baea02402d9 100644
--- a/pkgs/tools/security/omapd/default.nix
+++ b/nixpkgs/pkgs/tools/security/omapd/default.nix
diff --git a/pkgs/tools/security/omapd/zlib.patch b/nixpkgs/pkgs/tools/security/omapd/zlib.patch
index dc0644f2a01..dc0644f2a01 100644
--- a/pkgs/tools/security/omapd/zlib.patch
+++ b/nixpkgs/pkgs/tools/security/omapd/zlib.patch
diff --git a/pkgs/tools/security/onioncircuits/default.nix b/nixpkgs/pkgs/tools/security/onioncircuits/default.nix
index 5a9f1012748..5a9f1012748 100644
--- a/pkgs/tools/security/onioncircuits/default.nix
+++ b/nixpkgs/pkgs/tools/security/onioncircuits/default.nix
diff --git a/pkgs/tools/security/open-ecard/default.nix b/nixpkgs/pkgs/tools/security/open-ecard/default.nix
index 98f2e56e749..98f2e56e749 100644
--- a/pkgs/tools/security/open-ecard/default.nix
+++ b/nixpkgs/pkgs/tools/security/open-ecard/default.nix
diff --git a/pkgs/tools/security/opencryptoki/default.nix b/nixpkgs/pkgs/tools/security/opencryptoki/default.nix
index 1d506928a52..1d506928a52 100644
--- a/pkgs/tools/security/opencryptoki/default.nix
+++ b/nixpkgs/pkgs/tools/security/opencryptoki/default.nix
diff --git a/pkgs/tools/security/opensc/default.nix b/nixpkgs/pkgs/tools/security/opensc/default.nix
index 315cd1c8c28..315cd1c8c28 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/nixpkgs/pkgs/tools/security/opensc/default.nix
diff --git a/pkgs/tools/security/ossec/default.nix b/nixpkgs/pkgs/tools/security/ossec/default.nix
index 2b52099e70b..2b52099e70b 100644
--- a/pkgs/tools/security/ossec/default.nix
+++ b/nixpkgs/pkgs/tools/security/ossec/default.nix
diff --git a/pkgs/tools/security/ossec/no-root.patch b/nixpkgs/pkgs/tools/security/ossec/no-root.patch
index ea6e9c54a9a..ea6e9c54a9a 100644
--- a/pkgs/tools/security/ossec/no-root.patch
+++ b/nixpkgs/pkgs/tools/security/ossec/no-root.patch
diff --git a/pkgs/tools/security/p0f/default.nix b/nixpkgs/pkgs/tools/security/p0f/default.nix
index 1e618cdce1a..1e618cdce1a 100644
--- a/pkgs/tools/security/p0f/default.nix
+++ b/nixpkgs/pkgs/tools/security/p0f/default.nix
diff --git a/pkgs/tools/security/pamtester/default.nix b/nixpkgs/pkgs/tools/security/pamtester/default.nix
index 21f58ef517e..21f58ef517e 100644
--- a/pkgs/tools/security/pamtester/default.nix
+++ b/nixpkgs/pkgs/tools/security/pamtester/default.nix
diff --git a/pkgs/tools/security/paperkey/default.nix b/nixpkgs/pkgs/tools/security/paperkey/default.nix
index dc3582b7369..dc3582b7369 100644
--- a/pkgs/tools/security/paperkey/default.nix
+++ b/nixpkgs/pkgs/tools/security/paperkey/default.nix
diff --git a/pkgs/tools/security/pass/clip-wayland-support.patch b/nixpkgs/pkgs/tools/security/pass/clip-wayland-support.patch
index 7b8d2eb010d..7b8d2eb010d 100644
--- a/pkgs/tools/security/pass/clip-wayland-support.patch
+++ b/nixpkgs/pkgs/tools/security/pass/clip-wayland-support.patch
diff --git a/pkgs/tools/security/pass/default.nix b/nixpkgs/pkgs/tools/security/pass/default.nix
index 54a8f4de7d7..54a8f4de7d7 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/nixpkgs/pkgs/tools/security/pass/default.nix
diff --git a/pkgs/tools/security/pass/extensions/audit.nix b/nixpkgs/pkgs/tools/security/pass/extensions/audit.nix
index ca5ca855337..ca5ca855337 100644
--- a/pkgs/tools/security/pass/extensions/audit.nix
+++ b/nixpkgs/pkgs/tools/security/pass/extensions/audit.nix
diff --git a/pkgs/tools/security/pass/extensions/checkup.nix b/nixpkgs/pkgs/tools/security/pass/extensions/checkup.nix
index 83a1d7a8872..83a1d7a8872 100644
--- a/pkgs/tools/security/pass/extensions/checkup.nix
+++ b/nixpkgs/pkgs/tools/security/pass/extensions/checkup.nix
diff --git a/pkgs/tools/security/pass/extensions/default.nix b/nixpkgs/pkgs/tools/security/pass/extensions/default.nix
index 6eb321229e0..6eb321229e0 100644
--- a/pkgs/tools/security/pass/extensions/default.nix
+++ b/nixpkgs/pkgs/tools/security/pass/extensions/default.nix
diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix
index 208012e2f88..208012e2f88 100644
--- a/pkgs/tools/security/pass/extensions/genphrase.nix
+++ b/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix
diff --git a/pkgs/tools/security/pass/extensions/import.nix b/nixpkgs/pkgs/tools/security/pass/extensions/import.nix
index 90e3105bbd8..90e3105bbd8 100644
--- a/pkgs/tools/security/pass/extensions/import.nix
+++ b/nixpkgs/pkgs/tools/security/pass/extensions/import.nix
diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/nixpkgs/pkgs/tools/security/pass/extensions/otp.nix
index 4b15c3d6803..4b15c3d6803 100644
--- a/pkgs/tools/security/pass/extensions/otp.nix
+++ b/nixpkgs/pkgs/tools/security/pass/extensions/otp.nix
diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix
index ccb558c9b85..ccb558c9b85 100644
--- a/pkgs/tools/security/pass/extensions/tomb.nix
+++ b/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix
diff --git a/pkgs/tools/security/pass/extensions/update.nix b/nixpkgs/pkgs/tools/security/pass/extensions/update.nix
index b712557ab3e..b712557ab3e 100644
--- a/pkgs/tools/security/pass/extensions/update.nix
+++ b/nixpkgs/pkgs/tools/security/pass/extensions/update.nix
diff --git a/pkgs/tools/security/pass/no-darwin-getopt.patch b/nixpkgs/pkgs/tools/security/pass/no-darwin-getopt.patch
index e8f7e138ff0..e8f7e138ff0 100644
--- a/pkgs/tools/security/pass/no-darwin-getopt.patch
+++ b/nixpkgs/pkgs/tools/security/pass/no-darwin-getopt.patch
diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix
index b188b411517..b188b411517 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix
diff --git a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch b/nixpkgs/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
index f3a844ad2d6..f3a844ad2d6 100644
--- a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
+++ b/nixpkgs/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
diff --git a/pkgs/tools/security/passff-host/default.nix b/nixpkgs/pkgs/tools/security/passff-host/default.nix
index 59f03db0200..59f03db0200 100644
--- a/pkgs/tools/security/passff-host/default.nix
+++ b/nixpkgs/pkgs/tools/security/passff-host/default.nix
diff --git a/pkgs/tools/security/pbis/default.nix b/nixpkgs/pkgs/tools/security/pbis/default.nix
index 176ef7f7616..176ef7f7616 100644
--- a/pkgs/tools/security/pbis/default.nix
+++ b/nixpkgs/pkgs/tools/security/pbis/default.nix
diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix
index 8aadb685aa8..8aadb685aa8 100644
--- a/pkgs/tools/security/pcsc-cyberjack/default.nix
+++ b/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix
diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix
index 0302fc6fc67..0302fc6fc67 100644
--- a/pkgs/tools/security/pcsc-scm-scl011/default.nix
+++ b/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix
diff --git a/pkgs/tools/security/pcsc-scm-scl011/eid.patch b/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/eid.patch
index 6e7ffd60f72..6e7ffd60f72 100644
--- a/pkgs/tools/security/pcsc-scm-scl011/eid.patch
+++ b/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/eid.patch
diff --git a/pkgs/tools/security/pcsclite/default.nix b/nixpkgs/pkgs/tools/security/pcsclite/default.nix
index 2141f12151f..2141f12151f 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/nixpkgs/pkgs/tools/security/pcsclite/default.nix
diff --git a/pkgs/tools/security/pcsclite/no-dropdir-literals.patch b/nixpkgs/pkgs/tools/security/pcsclite/no-dropdir-literals.patch
index 6e6734c9543..6e6734c9543 100644
--- a/pkgs/tools/security/pcsclite/no-dropdir-literals.patch
+++ b/nixpkgs/pkgs/tools/security/pcsclite/no-dropdir-literals.patch
diff --git a/pkgs/tools/security/pcsctools/default.nix b/nixpkgs/pkgs/tools/security/pcsctools/default.nix
index fa53b91a02f..fa53b91a02f 100644
--- a/pkgs/tools/security/pcsctools/default.nix
+++ b/nixpkgs/pkgs/tools/security/pcsctools/default.nix
diff --git a/pkgs/tools/security/pdfcrack/default.nix b/nixpkgs/pkgs/tools/security/pdfcrack/default.nix
index bf8f014bcfd..bf8f014bcfd 100644
--- a/pkgs/tools/security/pdfcrack/default.nix
+++ b/nixpkgs/pkgs/tools/security/pdfcrack/default.nix
diff --git a/pkgs/tools/security/pgpdump/default.nix b/nixpkgs/pkgs/tools/security/pgpdump/default.nix
index 8bf440d2b07..8bf440d2b07 100644
--- a/pkgs/tools/security/pgpdump/default.nix
+++ b/nixpkgs/pkgs/tools/security/pgpdump/default.nix
diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/nixpkgs/pkgs/tools/security/phrasendrescher/default.nix
index 71a9824bb62..71a9824bb62 100644
--- a/pkgs/tools/security/phrasendrescher/default.nix
+++ b/nixpkgs/pkgs/tools/security/phrasendrescher/default.nix
diff --git a/pkgs/tools/security/pinentry/autoconf-ar.patch b/nixpkgs/pkgs/tools/security/pinentry/autoconf-ar.patch
index 6f531cfce32..6f531cfce32 100644
--- a/pkgs/tools/security/pinentry/autoconf-ar.patch
+++ b/nixpkgs/pkgs/tools/security/pinentry/autoconf-ar.patch
diff --git a/pkgs/tools/security/pinentry/default.nix b/nixpkgs/pkgs/tools/security/pinentry/default.nix
index 87edc914131..87edc914131 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/nixpkgs/pkgs/tools/security/pinentry/default.nix
diff --git a/pkgs/tools/security/pinentry/mac.nix b/nixpkgs/pkgs/tools/security/pinentry/mac.nix
index 25fa180c48b..25fa180c48b 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/nixpkgs/pkgs/tools/security/pinentry/mac.nix
diff --git a/pkgs/tools/security/pius/default.nix b/nixpkgs/pkgs/tools/security/pius/default.nix
index 6d2b5569a0d..6d2b5569a0d 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/nixpkgs/pkgs/tools/security/pius/default.nix
diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/nixpkgs/pkgs/tools/security/polkit-gnome/default.nix
index 55991169968..55991169968 100644
--- a/pkgs/tools/security/polkit-gnome/default.nix
+++ b/nixpkgs/pkgs/tools/security/polkit-gnome/default.nix
diff --git a/pkgs/tools/security/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/nixpkgs/pkgs/tools/security/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
index 5ddda50cb01..5ddda50cb01 100644
--- a/pkgs/tools/security/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
+++ b/nixpkgs/pkgs/tools/security/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
diff --git a/pkgs/tools/security/prey/default.nix b/nixpkgs/pkgs/tools/security/prey/default.nix
index 2c03183fa96..2c03183fa96 100644
--- a/pkgs/tools/security/prey/default.nix
+++ b/nixpkgs/pkgs/tools/security/prey/default.nix
diff --git a/pkgs/tools/security/proxmark3/default.nix b/nixpkgs/pkgs/tools/security/proxmark3/default.nix
index e717558a24d..e717558a24d 100644
--- a/pkgs/tools/security/proxmark3/default.nix
+++ b/nixpkgs/pkgs/tools/security/proxmark3/default.nix
diff --git a/pkgs/tools/security/pwgen-secure/default.nix b/nixpkgs/pkgs/tools/security/pwgen-secure/default.nix
index c3141676b37..c3141676b37 100644
--- a/pkgs/tools/security/pwgen-secure/default.nix
+++ b/nixpkgs/pkgs/tools/security/pwgen-secure/default.nix
diff --git a/pkgs/tools/security/pwgen/default.nix b/nixpkgs/pkgs/tools/security/pwgen/default.nix
index 79e8fb071b3..79e8fb071b3 100644
--- a/pkgs/tools/security/pwgen/default.nix
+++ b/nixpkgs/pkgs/tools/security/pwgen/default.nix
diff --git a/pkgs/tools/security/qdigidoc/default.nix b/nixpkgs/pkgs/tools/security/qdigidoc/default.nix
index fcbc166689e..fcbc166689e 100644
--- a/pkgs/tools/security/qdigidoc/default.nix
+++ b/nixpkgs/pkgs/tools/security/qdigidoc/default.nix
diff --git a/pkgs/tools/security/qesteidutil/default.nix b/nixpkgs/pkgs/tools/security/qesteidutil/default.nix
index fac855f232a..fac855f232a 100644
--- a/pkgs/tools/security/qesteidutil/default.nix
+++ b/nixpkgs/pkgs/tools/security/qesteidutil/default.nix
diff --git a/pkgs/tools/security/radamsa/default.nix b/nixpkgs/pkgs/tools/security/radamsa/default.nix
index 7a78233dbce..7a78233dbce 100644
--- a/pkgs/tools/security/radamsa/default.nix
+++ b/nixpkgs/pkgs/tools/security/radamsa/default.nix
diff --git a/pkgs/tools/security/rage/default.nix b/nixpkgs/pkgs/tools/security/rage/default.nix
index 63cc2972a58..63cc2972a58 100644
--- a/pkgs/tools/security/rage/default.nix
+++ b/nixpkgs/pkgs/tools/security/rage/default.nix
diff --git a/pkgs/tools/security/rarcrack/default.nix b/nixpkgs/pkgs/tools/security/rarcrack/default.nix
index 68e5df80937..68e5df80937 100644
--- a/pkgs/tools/security/rarcrack/default.nix
+++ b/nixpkgs/pkgs/tools/security/rarcrack/default.nix
diff --git a/pkgs/tools/security/rhash/default.nix b/nixpkgs/pkgs/tools/security/rhash/default.nix
index 863b03a117c..863b03a117c 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/nixpkgs/pkgs/tools/security/rhash/default.nix
diff --git a/pkgs/tools/security/ripasso/cursive.nix b/nixpkgs/pkgs/tools/security/ripasso/cursive.nix
index da850c6d9da..da850c6d9da 100644
--- a/pkgs/tools/security/ripasso/cursive.nix
+++ b/nixpkgs/pkgs/tools/security/ripasso/cursive.nix
diff --git a/pkgs/tools/security/rng-tools/default.nix b/nixpkgs/pkgs/tools/security/rng-tools/default.nix
index bd289200fe8..bd289200fe8 100644
--- a/pkgs/tools/security/rng-tools/default.nix
+++ b/nixpkgs/pkgs/tools/security/rng-tools/default.nix
diff --git a/pkgs/tools/security/saml2aws/default.nix b/nixpkgs/pkgs/tools/security/saml2aws/default.nix
index 7d087884161..7d087884161 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/nixpkgs/pkgs/tools/security/saml2aws/default.nix
diff --git a/pkgs/tools/security/sbsigntool/autoconf.patch b/nixpkgs/pkgs/tools/security/sbsigntool/autoconf.patch
index f436a73bca7..f436a73bca7 100644
--- a/pkgs/tools/security/sbsigntool/autoconf.patch
+++ b/nixpkgs/pkgs/tools/security/sbsigntool/autoconf.patch
diff --git a/pkgs/tools/security/sbsigntool/default.nix b/nixpkgs/pkgs/tools/security/sbsigntool/default.nix
index e0e2896f6ff..e0e2896f6ff 100644
--- a/pkgs/tools/security/sbsigntool/default.nix
+++ b/nixpkgs/pkgs/tools/security/sbsigntool/default.nix
diff --git a/pkgs/tools/security/scallion/default.nix b/nixpkgs/pkgs/tools/security/scallion/default.nix
index e419232641b..e419232641b 100644
--- a/pkgs/tools/security/scallion/default.nix
+++ b/nixpkgs/pkgs/tools/security/scallion/default.nix
diff --git a/pkgs/tools/security/scrypt/default.nix b/nixpkgs/pkgs/tools/security/scrypt/default.nix
index 66313b53649..66313b53649 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/nixpkgs/pkgs/tools/security/scrypt/default.nix
diff --git a/pkgs/tools/security/seccure/default.nix b/nixpkgs/pkgs/tools/security/seccure/default.nix
index 686ef36f863..686ef36f863 100644
--- a/pkgs/tools/security/seccure/default.nix
+++ b/nixpkgs/pkgs/tools/security/seccure/default.nix
diff --git a/pkgs/tools/security/secp256k1/default.nix b/nixpkgs/pkgs/tools/security/secp256k1/default.nix
index 7189032454d..7189032454d 100644
--- a/pkgs/tools/security/secp256k1/default.nix
+++ b/nixpkgs/pkgs/tools/security/secp256k1/default.nix
diff --git a/pkgs/tools/security/sedutil/default.nix b/nixpkgs/pkgs/tools/security/sedutil/default.nix
index 9edd9745326..9edd9745326 100644
--- a/pkgs/tools/security/sedutil/default.nix
+++ b/nixpkgs/pkgs/tools/security/sedutil/default.nix
diff --git a/pkgs/tools/security/sequoia/default.nix b/nixpkgs/pkgs/tools/security/sequoia/default.nix
index 21403225aad..21403225aad 100644
--- a/pkgs/tools/security/sequoia/default.nix
+++ b/nixpkgs/pkgs/tools/security/sequoia/default.nix
diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/nixpkgs/pkgs/tools/security/sha1collisiondetection/default.nix
index 8c6a026a612..8c6a026a612 100644
--- a/pkgs/tools/security/sha1collisiondetection/default.nix
+++ b/nixpkgs/pkgs/tools/security/sha1collisiondetection/default.nix
diff --git a/pkgs/tools/security/shc/default.nix b/nixpkgs/pkgs/tools/security/shc/default.nix
index 18814eb7fa8..18814eb7fa8 100644
--- a/pkgs/tools/security/shc/default.nix
+++ b/nixpkgs/pkgs/tools/security/shc/default.nix
diff --git a/pkgs/tools/security/signify/default.nix b/nixpkgs/pkgs/tools/security/signify/default.nix
index 22604a3f70b..22604a3f70b 100644
--- a/pkgs/tools/security/signify/default.nix
+++ b/nixpkgs/pkgs/tools/security/signify/default.nix
diff --git a/pkgs/tools/security/signing-party/default.nix b/nixpkgs/pkgs/tools/security/signing-party/default.nix
index ea487fed2a1..ea487fed2a1 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/nixpkgs/pkgs/tools/security/signing-party/default.nix
diff --git a/pkgs/tools/security/signing-party/gpgwrap_makefile.patch b/nixpkgs/pkgs/tools/security/signing-party/gpgwrap_makefile.patch
index 4beaf5b8088..4beaf5b8088 100644
--- a/pkgs/tools/security/signing-party/gpgwrap_makefile.patch
+++ b/nixpkgs/pkgs/tools/security/signing-party/gpgwrap_makefile.patch
diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix
index 16056f9a59e..16056f9a59e 100644
--- a/pkgs/tools/security/simple-tpm-pk11/default.nix
+++ b/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix
diff --git a/pkgs/tools/security/softhsm/default.nix b/nixpkgs/pkgs/tools/security/softhsm/default.nix
index 94642700c33..94642700c33 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/nixpkgs/pkgs/tools/security/softhsm/default.nix
diff --git a/pkgs/tools/security/sops/default.nix b/nixpkgs/pkgs/tools/security/sops/default.nix
index 8aa2e219e7d..8aa2e219e7d 100644
--- a/pkgs/tools/security/sops/default.nix
+++ b/nixpkgs/pkgs/tools/security/sops/default.nix
diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix
index 656efbf390c..656efbf390c 100644
--- a/pkgs/tools/security/spectre-meltdown-checker/default.nix
+++ b/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix
diff --git a/pkgs/tools/security/srm/default.nix b/nixpkgs/pkgs/tools/security/srm/default.nix
index 9782d00267f..9782d00267f 100644
--- a/pkgs/tools/security/srm/default.nix
+++ b/nixpkgs/pkgs/tools/security/srm/default.nix
diff --git a/pkgs/tools/security/ssdeep/default.nix b/nixpkgs/pkgs/tools/security/ssdeep/default.nix
index 33ab4c373bc..33ab4c373bc 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/nixpkgs/pkgs/tools/security/ssdeep/default.nix
diff --git a/pkgs/tools/security/ssh-audit/default.nix b/nixpkgs/pkgs/tools/security/ssh-audit/default.nix
index e615cec945d..e615cec945d 100644
--- a/pkgs/tools/security/ssh-audit/default.nix
+++ b/nixpkgs/pkgs/tools/security/ssh-audit/default.nix
diff --git a/pkgs/tools/security/sshguard/default.nix b/nixpkgs/pkgs/tools/security/sshguard/default.nix
index a196fe9ca47..a196fe9ca47 100644
--- a/pkgs/tools/security/sshguard/default.nix
+++ b/nixpkgs/pkgs/tools/security/sshguard/default.nix
diff --git a/pkgs/tools/security/sshuttle/default.nix b/nixpkgs/pkgs/tools/security/sshuttle/default.nix
index 0e0e8c7ad75..0e0e8c7ad75 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/nixpkgs/pkgs/tools/security/sshuttle/default.nix
diff --git a/pkgs/tools/security/sshuttle/sudo.patch b/nixpkgs/pkgs/tools/security/sshuttle/sudo.patch
index 6e8634bd4a1..6e8634bd4a1 100644
--- a/pkgs/tools/security/sshuttle/sudo.patch
+++ b/nixpkgs/pkgs/tools/security/sshuttle/sudo.patch
diff --git a/pkgs/tools/security/sslscan/default.nix b/nixpkgs/pkgs/tools/security/sslscan/default.nix
index 15ac376d72a..15ac376d72a 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/nixpkgs/pkgs/tools/security/sslscan/default.nix
diff --git a/pkgs/tools/security/ssss/default.nix b/nixpkgs/pkgs/tools/security/ssss/default.nix
index 157e007c534..157e007c534 100644
--- a/pkgs/tools/security/ssss/default.nix
+++ b/nixpkgs/pkgs/tools/security/ssss/default.nix
diff --git a/pkgs/tools/security/steghide/default.nix b/nixpkgs/pkgs/tools/security/steghide/default.nix
index 7a759c3c333..7a759c3c333 100644
--- a/pkgs/tools/security/steghide/default.nix
+++ b/nixpkgs/pkgs/tools/security/steghide/default.nix
diff --git a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch b/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch
index 373316c7840..373316c7840 100644
--- a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch
+++ b/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch
diff --git a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch b/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch
index a8df1735e9d..a8df1735e9d 100644
--- a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch
+++ b/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch
diff --git a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch b/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch
index ca66b9c544f..ca66b9c544f 100644
--- a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch
+++ b/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch
diff --git a/pkgs/tools/security/step-ca/default.nix b/nixpkgs/pkgs/tools/security/step-ca/default.nix
index e5574be8ab9..e5574be8ab9 100644
--- a/pkgs/tools/security/step-ca/default.nix
+++ b/nixpkgs/pkgs/tools/security/step-ca/default.nix
diff --git a/pkgs/tools/security/step-ca/deps.nix b/nixpkgs/pkgs/tools/security/step-ca/deps.nix
index 07607b6f65d..07607b6f65d 100644
--- a/pkgs/tools/security/step-ca/deps.nix
+++ b/nixpkgs/pkgs/tools/security/step-ca/deps.nix
diff --git a/pkgs/tools/security/step-cli/default.nix b/nixpkgs/pkgs/tools/security/step-cli/default.nix
index 0ecd3bc8253..0ecd3bc8253 100644
--- a/pkgs/tools/security/step-cli/default.nix
+++ b/nixpkgs/pkgs/tools/security/step-cli/default.nix
diff --git a/pkgs/tools/security/step-cli/deps.nix b/nixpkgs/pkgs/tools/security/step-cli/deps.nix
index bae1ba070a6..bae1ba070a6 100644
--- a/pkgs/tools/security/step-cli/deps.nix
+++ b/nixpkgs/pkgs/tools/security/step-cli/deps.nix
diff --git a/pkgs/tools/security/stoken/default.nix b/nixpkgs/pkgs/tools/security/stoken/default.nix
index d6375bee649..d6375bee649 100644
--- a/pkgs/tools/security/stoken/default.nix
+++ b/nixpkgs/pkgs/tools/security/stoken/default.nix
diff --git a/pkgs/tools/security/stricat/default.nix b/nixpkgs/pkgs/tools/security/stricat/default.nix
index 28c462cbb0a..28c462cbb0a 100644
--- a/pkgs/tools/security/stricat/default.nix
+++ b/nixpkgs/pkgs/tools/security/stricat/default.nix
diff --git a/pkgs/tools/security/su-exec/default.nix b/nixpkgs/pkgs/tools/security/su-exec/default.nix
index 8ff33ee1ec9..8ff33ee1ec9 100644
--- a/pkgs/tools/security/su-exec/default.nix
+++ b/nixpkgs/pkgs/tools/security/su-exec/default.nix
diff --git a/pkgs/tools/security/sudo/default.nix b/nixpkgs/pkgs/tools/security/sudo/default.nix
index 71a71be9147..71a71be9147 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/nixpkgs/pkgs/tools/security/sudo/default.nix
diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix
index 97db4a28c45..97db4a28c45 100644
--- a/pkgs/tools/security/sudolikeaboss/default.nix
+++ b/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix
diff --git a/pkgs/tools/security/sudolikeaboss/deps.nix b/nixpkgs/pkgs/tools/security/sudolikeaboss/deps.nix
index 350306a24f4..350306a24f4 100644
--- a/pkgs/tools/security/sudolikeaboss/deps.nix
+++ b/nixpkgs/pkgs/tools/security/sudolikeaboss/deps.nix
diff --git a/pkgs/tools/security/super/default.nix b/nixpkgs/pkgs/tools/security/super/default.nix
index 716973a3e2e..716973a3e2e 100644
--- a/pkgs/tools/security/super/default.nix
+++ b/nixpkgs/pkgs/tools/security/super/default.nix
diff --git a/pkgs/tools/security/tboot/default.nix b/nixpkgs/pkgs/tools/security/tboot/default.nix
index 062bf40b7d6..062bf40b7d6 100644
--- a/pkgs/tools/security/tboot/default.nix
+++ b/nixpkgs/pkgs/tools/security/tboot/default.nix
diff --git a/pkgs/tools/security/tboot/tboot-add-well-known-secret-option-to-lcp_writepol.patch b/nixpkgs/pkgs/tools/security/tboot/tboot-add-well-known-secret-option-to-lcp_writepol.patch
index a16ba9f4fba..a16ba9f4fba 100644
--- a/pkgs/tools/security/tboot/tboot-add-well-known-secret-option-to-lcp_writepol.patch
+++ b/nixpkgs/pkgs/tools/security/tboot/tboot-add-well-known-secret-option-to-lcp_writepol.patch
diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix
index 86a65a06028..86a65a06028 100644
--- a/pkgs/tools/security/tcpcrypt/default.nix
+++ b/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/nixpkgs/pkgs/tools/security/thc-hydra/default.nix
index aa36901e46b..aa36901e46b 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/nixpkgs/pkgs/tools/security/thc-hydra/default.nix
diff --git a/pkgs/tools/security/theharvester/default.nix b/nixpkgs/pkgs/tools/security/theharvester/default.nix
index 4153ddafbf4..4153ddafbf4 100644
--- a/pkgs/tools/security/theharvester/default.nix
+++ b/nixpkgs/pkgs/tools/security/theharvester/default.nix
diff --git a/pkgs/tools/security/tor/default.nix b/nixpkgs/pkgs/tools/security/tor/default.nix
index 819b9688924..819b9688924 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/nixpkgs/pkgs/tools/security/tor/default.nix
diff --git a/pkgs/tools/security/tor/tor-arm.nix b/nixpkgs/pkgs/tools/security/tor/tor-arm.nix
index 896ab50562d..896ab50562d 100644
--- a/pkgs/tools/security/tor/tor-arm.nix
+++ b/nixpkgs/pkgs/tools/security/tor/tor-arm.nix
diff --git a/pkgs/tools/security/tor/torsocks.nix b/nixpkgs/pkgs/tools/security/tor/torsocks.nix
index 8681d80c2ed..8681d80c2ed 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/nixpkgs/pkgs/tools/security/tor/torsocks.nix
diff --git a/pkgs/tools/security/tor/update.nix b/nixpkgs/pkgs/tools/security/tor/update.nix
index c944883d417..c944883d417 100644
--- a/pkgs/tools/security/tor/update.nix
+++ b/nixpkgs/pkgs/tools/security/tor/update.nix
diff --git a/pkgs/tools/security/tpm-luks/default.nix b/nixpkgs/pkgs/tools/security/tpm-luks/default.nix
index 94d833ca746..94d833ca746 100644
--- a/pkgs/tools/security/tpm-luks/default.nix
+++ b/nixpkgs/pkgs/tools/security/tpm-luks/default.nix
diff --git a/pkgs/tools/security/tpm-luks/openssl-1.1.patch b/nixpkgs/pkgs/tools/security/tpm-luks/openssl-1.1.patch
index 10132242b34..10132242b34 100644
--- a/pkgs/tools/security/tpm-luks/openssl-1.1.patch
+++ b/nixpkgs/pkgs/tools/security/tpm-luks/openssl-1.1.patch
diff --git a/pkgs/tools/security/tpm-luks/signed-ptr.patch b/nixpkgs/pkgs/tools/security/tpm-luks/signed-ptr.patch
index 83e356a4ef9..83e356a4ef9 100644
--- a/pkgs/tools/security/tpm-luks/signed-ptr.patch
+++ b/nixpkgs/pkgs/tools/security/tpm-luks/signed-ptr.patch
diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix
index f7526ac7225..f7526ac7225 100644
--- a/pkgs/tools/security/tpm-quote-tools/default.nix
+++ b/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix
diff --git a/pkgs/tools/security/tpm-tools/default.nix b/nixpkgs/pkgs/tools/security/tpm-tools/default.nix
index e546cc5a10f..e546cc5a10f 100644
--- a/pkgs/tools/security/tpm-tools/default.nix
+++ b/nixpkgs/pkgs/tools/security/tpm-tools/default.nix
diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix
index 84dafca4e0c..84dafca4e0c 100644
--- a/pkgs/tools/security/tpm2-abrmd/default.nix
+++ b/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix
diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix
index b7c2141b0f7..b7c2141b0f7 100644
--- a/pkgs/tools/security/tpm2-tools/default.nix
+++ b/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix
diff --git a/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch b/nixpkgs/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch
index 774a14f72ba..774a14f72ba 100644
--- a/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch
+++ b/nixpkgs/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch
diff --git a/pkgs/tools/security/trousers/default.nix b/nixpkgs/pkgs/tools/security/trousers/default.nix
index a38c011d7a4..a38c011d7a4 100644
--- a/pkgs/tools/security/trousers/default.nix
+++ b/nixpkgs/pkgs/tools/security/trousers/default.nix
diff --git a/pkgs/tools/security/trufflehog/default.nix b/nixpkgs/pkgs/tools/security/trufflehog/default.nix
index 9492f2bb6ea..9492f2bb6ea 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/nixpkgs/pkgs/tools/security/trufflehog/default.nix
diff --git a/pkgs/tools/security/vault/default.nix b/nixpkgs/pkgs/tools/security/vault/default.nix
index 3b209d5c068..3b209d5c068 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/nixpkgs/pkgs/tools/security/vault/default.nix
diff --git a/pkgs/tools/security/vault/vault-bin.nix b/nixpkgs/pkgs/tools/security/vault/vault-bin.nix
index 6e2ab221c42..6e2ab221c42 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/nixpkgs/pkgs/tools/security/vault/vault-bin.nix
diff --git a/pkgs/tools/security/verifpal/default.nix b/nixpkgs/pkgs/tools/security/verifpal/default.nix
index 95afb580d4e..95afb580d4e 100644
--- a/pkgs/tools/security/verifpal/default.nix
+++ b/nixpkgs/pkgs/tools/security/verifpal/default.nix
diff --git a/pkgs/tools/security/verifpal/deps.nix b/nixpkgs/pkgs/tools/security/verifpal/deps.nix
index aaa4269416a..aaa4269416a 100644
--- a/pkgs/tools/security/verifpal/deps.nix
+++ b/nixpkgs/pkgs/tools/security/verifpal/deps.nix
diff --git a/pkgs/tools/security/volatility/default.nix b/nixpkgs/pkgs/tools/security/volatility/default.nix
index bc8f1ce52c1..bc8f1ce52c1 100644
--- a/pkgs/tools/security/volatility/default.nix
+++ b/nixpkgs/pkgs/tools/security/volatility/default.nix
diff --git a/pkgs/tools/security/vulnix/default.nix b/nixpkgs/pkgs/tools/security/vulnix/default.nix
index 59d8b8c0875..59d8b8c0875 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/nixpkgs/pkgs/tools/security/vulnix/default.nix
diff --git a/pkgs/tools/security/wipe/default.nix b/nixpkgs/pkgs/tools/security/wipe/default.nix
index 25c7921d34c..25c7921d34c 100644
--- a/pkgs/tools/security/wipe/default.nix
+++ b/nixpkgs/pkgs/tools/security/wipe/default.nix
diff --git a/pkgs/tools/security/wipe/fix-install.patch b/nixpkgs/pkgs/tools/security/wipe/fix-install.patch
index 2df3a1eec6a..2df3a1eec6a 100644
--- a/pkgs/tools/security/wipe/fix-install.patch
+++ b/nixpkgs/pkgs/tools/security/wipe/fix-install.patch
diff --git a/pkgs/tools/security/wpscan/Gemfile b/nixpkgs/pkgs/tools/security/wpscan/Gemfile
index 5d76cd24f3e..5d76cd24f3e 100644
--- a/pkgs/tools/security/wpscan/Gemfile
+++ b/nixpkgs/pkgs/tools/security/wpscan/Gemfile
diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock
index 7a29a18b7c3..7a29a18b7c3 100644
--- a/pkgs/tools/security/wpscan/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock
diff --git a/pkgs/tools/security/wpscan/default.nix b/nixpkgs/pkgs/tools/security/wpscan/default.nix
index e7a784c1a77..e7a784c1a77 100644
--- a/pkgs/tools/security/wpscan/default.nix
+++ b/nixpkgs/pkgs/tools/security/wpscan/default.nix
diff --git a/pkgs/tools/security/wpscan/gemset.nix b/nixpkgs/pkgs/tools/security/wpscan/gemset.nix
index 5c0691fda1b..5c0691fda1b 100644
--- a/pkgs/tools/security/wpscan/gemset.nix
+++ b/nixpkgs/pkgs/tools/security/wpscan/gemset.nix
diff --git a/pkgs/tools/security/yara/default.nix b/nixpkgs/pkgs/tools/security/yara/default.nix
index e09e1e69408..e09e1e69408 100644
--- a/pkgs/tools/security/yara/default.nix
+++ b/nixpkgs/pkgs/tools/security/yara/default.nix
diff --git a/pkgs/tools/security/zmap/default.nix b/nixpkgs/pkgs/tools/security/zmap/default.nix
index f98b4295e9e..f98b4295e9e 100644
--- a/pkgs/tools/security/zmap/default.nix
+++ b/nixpkgs/pkgs/tools/security/zmap/default.nix
diff --git a/pkgs/tools/security/zzuf/default.nix b/nixpkgs/pkgs/tools/security/zzuf/default.nix
index dc2cfe81746..dc2cfe81746 100644
--- a/pkgs/tools/security/zzuf/default.nix
+++ b/nixpkgs/pkgs/tools/security/zzuf/default.nix
diff --git a/pkgs/tools/system/acct/default.nix b/nixpkgs/pkgs/tools/system/acct/default.nix
index 669c91adf10..669c91adf10 100644
--- a/pkgs/tools/system/acct/default.nix
+++ b/nixpkgs/pkgs/tools/system/acct/default.nix
diff --git a/pkgs/tools/system/acpica-tools/default.nix b/nixpkgs/pkgs/tools/system/acpica-tools/default.nix
index a1c7527c46a..a1c7527c46a 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/nixpkgs/pkgs/tools/system/acpica-tools/default.nix
diff --git a/pkgs/tools/system/actkbd/default.nix b/nixpkgs/pkgs/tools/system/actkbd/default.nix
index 501311e9672..501311e9672 100644
--- a/pkgs/tools/system/actkbd/default.nix
+++ b/nixpkgs/pkgs/tools/system/actkbd/default.nix
diff --git a/pkgs/tools/system/amtterm/default.nix b/nixpkgs/pkgs/tools/system/amtterm/default.nix
index 7e92fc06b2d..7e92fc06b2d 100644
--- a/pkgs/tools/system/amtterm/default.nix
+++ b/nixpkgs/pkgs/tools/system/amtterm/default.nix
diff --git a/pkgs/tools/system/at/default.nix b/nixpkgs/pkgs/tools/system/at/default.nix
index fded1da861d..fded1da861d 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/nixpkgs/pkgs/tools/system/at/default.nix
diff --git a/pkgs/tools/system/at/install.patch b/nixpkgs/pkgs/tools/system/at/install.patch
index 41a35a78953..41a35a78953 100644
--- a/pkgs/tools/system/at/install.patch
+++ b/nixpkgs/pkgs/tools/system/at/install.patch
diff --git a/pkgs/tools/system/augeas/default.nix b/nixpkgs/pkgs/tools/system/augeas/default.nix
index 08731cd6db2..08731cd6db2 100644
--- a/pkgs/tools/system/augeas/default.nix
+++ b/nixpkgs/pkgs/tools/system/augeas/default.nix
diff --git a/pkgs/tools/system/awstats/default.nix b/nixpkgs/pkgs/tools/system/awstats/default.nix
index 6d191f33a64..6d191f33a64 100644
--- a/pkgs/tools/system/awstats/default.nix
+++ b/nixpkgs/pkgs/tools/system/awstats/default.nix
diff --git a/pkgs/tools/system/bar/default.nix b/nixpkgs/pkgs/tools/system/bar/default.nix
index a295da844af..a295da844af 100644
--- a/pkgs/tools/system/bar/default.nix
+++ b/nixpkgs/pkgs/tools/system/bar/default.nix
diff --git a/pkgs/tools/system/bfs/default.nix b/nixpkgs/pkgs/tools/system/bfs/default.nix
index 1387a6c6ed1..1387a6c6ed1 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/nixpkgs/pkgs/tools/system/bfs/default.nix
diff --git a/pkgs/tools/system/chase/default.nix b/nixpkgs/pkgs/tools/system/chase/default.nix
index 6c48d3341ec..6c48d3341ec 100644
--- a/pkgs/tools/system/chase/default.nix
+++ b/nixpkgs/pkgs/tools/system/chase/default.nix
diff --git a/pkgs/tools/system/clinfo/default.nix b/nixpkgs/pkgs/tools/system/clinfo/default.nix
index dd6e3d4a84b..dd6e3d4a84b 100644
--- a/pkgs/tools/system/clinfo/default.nix
+++ b/nixpkgs/pkgs/tools/system/clinfo/default.nix
diff --git a/pkgs/tools/system/collectd/data.nix b/nixpkgs/pkgs/tools/system/collectd/data.nix
index 378eb62d6cc..378eb62d6cc 100644
--- a/pkgs/tools/system/collectd/data.nix
+++ b/nixpkgs/pkgs/tools/system/collectd/data.nix
diff --git a/pkgs/tools/system/collectd/default.nix b/nixpkgs/pkgs/tools/system/collectd/default.nix
index 517d0afb95f..517d0afb95f 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/nixpkgs/pkgs/tools/system/collectd/default.nix
diff --git a/pkgs/tools/system/collectd/plugins.nix b/nixpkgs/pkgs/tools/system/collectd/plugins.nix
index f1a87847a5c..f1a87847a5c 100644
--- a/pkgs/tools/system/collectd/plugins.nix
+++ b/nixpkgs/pkgs/tools/system/collectd/plugins.nix
diff --git a/pkgs/tools/system/colorls/Gemfile b/nixpkgs/pkgs/tools/system/colorls/Gemfile
index 0d41bd279cc..0d41bd279cc 100644
--- a/pkgs/tools/system/colorls/Gemfile
+++ b/nixpkgs/pkgs/tools/system/colorls/Gemfile
diff --git a/pkgs/tools/system/colorls/Gemfile.lock b/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock
index 583fd3b1202..583fd3b1202 100644
--- a/pkgs/tools/system/colorls/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock
diff --git a/pkgs/tools/system/colorls/default.nix b/nixpkgs/pkgs/tools/system/colorls/default.nix
index 1631b9f7218..1631b9f7218 100644
--- a/pkgs/tools/system/colorls/default.nix
+++ b/nixpkgs/pkgs/tools/system/colorls/default.nix
diff --git a/pkgs/tools/system/colorls/gemset.nix b/nixpkgs/pkgs/tools/system/colorls/gemset.nix
index e7264a895a2..e7264a895a2 100644
--- a/pkgs/tools/system/colorls/gemset.nix
+++ b/nixpkgs/pkgs/tools/system/colorls/gemset.nix
diff --git a/pkgs/tools/system/confd/default.nix b/nixpkgs/pkgs/tools/system/confd/default.nix
index e7a5dc86578..e7a5dc86578 100644
--- a/pkgs/tools/system/confd/default.nix
+++ b/nixpkgs/pkgs/tools/system/confd/default.nix
diff --git a/pkgs/tools/system/confd/deps.nix b/nixpkgs/pkgs/tools/system/confd/deps.nix
index 74467ddf9cc..74467ddf9cc 100644
--- a/pkgs/tools/system/confd/deps.nix
+++ b/nixpkgs/pkgs/tools/system/confd/deps.nix
diff --git a/pkgs/tools/system/consul-template/default.nix b/nixpkgs/pkgs/tools/system/consul-template/default.nix
index ad120dd6481..ad120dd6481 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/nixpkgs/pkgs/tools/system/consul-template/default.nix
diff --git a/pkgs/tools/system/cron/default.nix b/nixpkgs/pkgs/tools/system/cron/default.nix
index aa047ca4a68..aa047ca4a68 100644
--- a/pkgs/tools/system/cron/default.nix
+++ b/nixpkgs/pkgs/tools/system/cron/default.nix
diff --git a/pkgs/tools/system/ctop/default.nix b/nixpkgs/pkgs/tools/system/ctop/default.nix
index 4f492def162..4f492def162 100644
--- a/pkgs/tools/system/ctop/default.nix
+++ b/nixpkgs/pkgs/tools/system/ctop/default.nix
diff --git a/pkgs/tools/system/daemon/default.nix b/nixpkgs/pkgs/tools/system/daemon/default.nix
index 76f53b55f3d..76f53b55f3d 100644
--- a/pkgs/tools/system/daemon/default.nix
+++ b/nixpkgs/pkgs/tools/system/daemon/default.nix
diff --git a/pkgs/tools/system/daemonize/default.nix b/nixpkgs/pkgs/tools/system/daemonize/default.nix
index 205b693dd92..205b693dd92 100644
--- a/pkgs/tools/system/daemonize/default.nix
+++ b/nixpkgs/pkgs/tools/system/daemonize/default.nix
diff --git a/pkgs/tools/system/das_watchdog/default.nix b/nixpkgs/pkgs/tools/system/das_watchdog/default.nix
index 29767c879ff..29767c879ff 100644
--- a/pkgs/tools/system/das_watchdog/default.nix
+++ b/nixpkgs/pkgs/tools/system/das_watchdog/default.nix
diff --git a/pkgs/tools/system/datefudge/default.nix b/nixpkgs/pkgs/tools/system/datefudge/default.nix
index 63aa563bfa0..63aa563bfa0 100644
--- a/pkgs/tools/system/datefudge/default.nix
+++ b/nixpkgs/pkgs/tools/system/datefudge/default.nix
diff --git a/pkgs/tools/system/dcfldd/default.nix b/nixpkgs/pkgs/tools/system/dcfldd/default.nix
index 240cc36f726..240cc36f726 100644
--- a/pkgs/tools/system/dcfldd/default.nix
+++ b/nixpkgs/pkgs/tools/system/dcfldd/default.nix
diff --git a/pkgs/tools/system/dd_rescue/default.nix b/nixpkgs/pkgs/tools/system/dd_rescue/default.nix
index 9962337de07..9962337de07 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/nixpkgs/pkgs/tools/system/dd_rescue/default.nix
diff --git a/pkgs/tools/system/ddrescue/default.nix b/nixpkgs/pkgs/tools/system/ddrescue/default.nix
index c2d3b33c749..c2d3b33c749 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/nixpkgs/pkgs/tools/system/ddrescue/default.nix
diff --git a/pkgs/tools/system/ddrescueview/default.nix b/nixpkgs/pkgs/tools/system/ddrescueview/default.nix
index 466232e2bf7..466232e2bf7 100644
--- a/pkgs/tools/system/ddrescueview/default.nix
+++ b/nixpkgs/pkgs/tools/system/ddrescueview/default.nix
diff --git a/pkgs/tools/system/ddrutility/default.nix b/nixpkgs/pkgs/tools/system/ddrutility/default.nix
index 54bf6fbaf42..54bf6fbaf42 100644
--- a/pkgs/tools/system/ddrutility/default.nix
+++ b/nixpkgs/pkgs/tools/system/ddrutility/default.nix
diff --git a/pkgs/tools/system/dfc/default.nix b/nixpkgs/pkgs/tools/system/dfc/default.nix
index 8575d971898..8575d971898 100644
--- a/pkgs/tools/system/dfc/default.nix
+++ b/nixpkgs/pkgs/tools/system/dfc/default.nix
diff --git a/pkgs/tools/system/di/default.nix b/nixpkgs/pkgs/tools/system/di/default.nix
index 3aef366ea06..3aef366ea06 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/nixpkgs/pkgs/tools/system/di/default.nix
diff --git a/pkgs/tools/system/dog/default.nix b/nixpkgs/pkgs/tools/system/dog/default.nix
index 8bb84c562b6..8bb84c562b6 100644
--- a/pkgs/tools/system/dog/default.nix
+++ b/nixpkgs/pkgs/tools/system/dog/default.nix
diff --git a/pkgs/tools/system/efibootmgr/default.nix b/nixpkgs/pkgs/tools/system/efibootmgr/default.nix
index 272809e486c..272809e486c 100644
--- a/pkgs/tools/system/efibootmgr/default.nix
+++ b/nixpkgs/pkgs/tools/system/efibootmgr/default.nix
diff --git a/pkgs/tools/system/efivar/default.nix b/nixpkgs/pkgs/tools/system/efivar/default.nix
index f02923de349..f02923de349 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/nixpkgs/pkgs/tools/system/efivar/default.nix
diff --git a/pkgs/tools/system/envconsul/default.nix b/nixpkgs/pkgs/tools/system/envconsul/default.nix
index c2f5556cec6..c2f5556cec6 100644
--- a/pkgs/tools/system/envconsul/default.nix
+++ b/nixpkgs/pkgs/tools/system/envconsul/default.nix
diff --git a/pkgs/tools/system/evemu/default.nix b/nixpkgs/pkgs/tools/system/evemu/default.nix
index 1ba2b78e860..1ba2b78e860 100644
--- a/pkgs/tools/system/evemu/default.nix
+++ b/nixpkgs/pkgs/tools/system/evemu/default.nix
diff --git a/pkgs/tools/system/facter/default.nix b/nixpkgs/pkgs/tools/system/facter/default.nix
index acc3990378f..acc3990378f 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/nixpkgs/pkgs/tools/system/facter/default.nix
diff --git a/pkgs/tools/system/fakechroot/default.nix b/nixpkgs/pkgs/tools/system/fakechroot/default.nix
index 77ba6689b0d..77ba6689b0d 100644
--- a/pkgs/tools/system/fakechroot/default.nix
+++ b/nixpkgs/pkgs/tools/system/fakechroot/default.nix
diff --git a/pkgs/tools/system/fakeroot/default.nix b/nixpkgs/pkgs/tools/system/fakeroot/default.nix
index 934b74dd384..934b74dd384 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/nixpkgs/pkgs/tools/system/fakeroot/default.nix
diff --git a/pkgs/tools/system/fakeroot/einval.patch b/nixpkgs/pkgs/tools/system/fakeroot/einval.patch
index f8d4fb83d13..f8d4fb83d13 100644
--- a/pkgs/tools/system/fakeroot/einval.patch
+++ b/nixpkgs/pkgs/tools/system/fakeroot/einval.patch
diff --git a/pkgs/tools/system/fcron/default.nix b/nixpkgs/pkgs/tools/system/fcron/default.nix
index 3dd84aa8a9c..3dd84aa8a9c 100644
--- a/pkgs/tools/system/fcron/default.nix
+++ b/nixpkgs/pkgs/tools/system/fcron/default.nix
diff --git a/pkgs/tools/system/fcron/relative-fcronsighup.patch b/nixpkgs/pkgs/tools/system/fcron/relative-fcronsighup.patch
index c0bbfc1ee3e..c0bbfc1ee3e 100644
--- a/pkgs/tools/system/fcron/relative-fcronsighup.patch
+++ b/nixpkgs/pkgs/tools/system/fcron/relative-fcronsighup.patch
diff --git a/pkgs/tools/system/fdisk/default.nix b/nixpkgs/pkgs/tools/system/fdisk/default.nix
index 0aea3ced3b5..0aea3ced3b5 100644
--- a/pkgs/tools/system/fdisk/default.nix
+++ b/nixpkgs/pkgs/tools/system/fdisk/default.nix
diff --git a/pkgs/tools/system/fio/default.nix b/nixpkgs/pkgs/tools/system/fio/default.nix
index 3718f69370e..3718f69370e 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/nixpkgs/pkgs/tools/system/fio/default.nix
diff --git a/pkgs/tools/system/foreman/Gemfile b/nixpkgs/pkgs/tools/system/foreman/Gemfile
index e25e6d790fc..e25e6d790fc 100644
--- a/pkgs/tools/system/foreman/Gemfile
+++ b/nixpkgs/pkgs/tools/system/foreman/Gemfile
diff --git a/pkgs/tools/system/foreman/Gemfile.lock b/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock
index 8fa9a213ab2..8fa9a213ab2 100644
--- a/pkgs/tools/system/foreman/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock
diff --git a/pkgs/tools/system/foreman/default.nix b/nixpkgs/pkgs/tools/system/foreman/default.nix
index e97d71f5c84..e97d71f5c84 100644
--- a/pkgs/tools/system/foreman/default.nix
+++ b/nixpkgs/pkgs/tools/system/foreman/default.nix
diff --git a/pkgs/tools/system/foreman/gemset.nix b/nixpkgs/pkgs/tools/system/foreman/gemset.nix
index b35bd15c974..b35bd15c974 100644
--- a/pkgs/tools/system/foreman/gemset.nix
+++ b/nixpkgs/pkgs/tools/system/foreman/gemset.nix
diff --git a/pkgs/tools/system/foremost/default.nix b/nixpkgs/pkgs/tools/system/foremost/default.nix
index be33f45ca9d..be33f45ca9d 100644
--- a/pkgs/tools/system/foremost/default.nix
+++ b/nixpkgs/pkgs/tools/system/foremost/default.nix
diff --git a/pkgs/tools/system/foremost/makefile.patch b/nixpkgs/pkgs/tools/system/foremost/makefile.patch
index 6626c9520ec..6626c9520ec 100644
--- a/pkgs/tools/system/foremost/makefile.patch
+++ b/nixpkgs/pkgs/tools/system/foremost/makefile.patch
diff --git a/pkgs/tools/system/freeipmi/default.nix b/nixpkgs/pkgs/tools/system/freeipmi/default.nix
index b057c80c74e..b057c80c74e 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/nixpkgs/pkgs/tools/system/freeipmi/default.nix
diff --git a/pkgs/tools/system/gdmap/default.nix b/nixpkgs/pkgs/tools/system/gdmap/default.nix
index 4adc8160829..4adc8160829 100644
--- a/pkgs/tools/system/gdmap/default.nix
+++ b/nixpkgs/pkgs/tools/system/gdmap/default.nix
diff --git a/pkgs/tools/system/gdmap/get_sensitive.patch b/nixpkgs/pkgs/tools/system/gdmap/get_sensitive.patch
index 3cdb6291dfa..3cdb6291dfa 100644
--- a/pkgs/tools/system/gdmap/get_sensitive.patch
+++ b/nixpkgs/pkgs/tools/system/gdmap/get_sensitive.patch
diff --git a/pkgs/tools/system/gdmap/set_flags.patch b/nixpkgs/pkgs/tools/system/gdmap/set_flags.patch
index 388836f6e5f..388836f6e5f 100644
--- a/pkgs/tools/system/gdmap/set_flags.patch
+++ b/nixpkgs/pkgs/tools/system/gdmap/set_flags.patch
diff --git a/pkgs/tools/system/gohai/default.nix b/nixpkgs/pkgs/tools/system/gohai/default.nix
index c0dd2c89d2f..c0dd2c89d2f 100644
--- a/pkgs/tools/system/gohai/default.nix
+++ b/nixpkgs/pkgs/tools/system/gohai/default.nix
diff --git a/pkgs/tools/system/gohai/deps.nix b/nixpkgs/pkgs/tools/system/gohai/deps.nix
index f6d63e46024..f6d63e46024 100644
--- a/pkgs/tools/system/gohai/deps.nix
+++ b/nixpkgs/pkgs/tools/system/gohai/deps.nix
diff --git a/pkgs/tools/system/goreman/default.nix b/nixpkgs/pkgs/tools/system/goreman/default.nix
index 22918f14145..22918f14145 100644
--- a/pkgs/tools/system/goreman/default.nix
+++ b/nixpkgs/pkgs/tools/system/goreman/default.nix
diff --git a/pkgs/tools/system/gotop/default.nix b/nixpkgs/pkgs/tools/system/gotop/default.nix
index daf9ce58c91..daf9ce58c91 100644
--- a/pkgs/tools/system/gotop/default.nix
+++ b/nixpkgs/pkgs/tools/system/gotop/default.nix
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/nixpkgs/pkgs/tools/system/gptfdisk/default.nix
index 71f82bfc386..71f82bfc386 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/nixpkgs/pkgs/tools/system/gptfdisk/default.nix
diff --git a/pkgs/tools/system/gt5/default.nix b/nixpkgs/pkgs/tools/system/gt5/default.nix
index ea121b0e43c..ea121b0e43c 100644
--- a/pkgs/tools/system/gt5/default.nix
+++ b/nixpkgs/pkgs/tools/system/gt5/default.nix
diff --git a/pkgs/tools/system/hardinfo/default.nix b/nixpkgs/pkgs/tools/system/hardinfo/default.nix
index 6c5019847ff..6c5019847ff 100644
--- a/pkgs/tools/system/hardinfo/default.nix
+++ b/nixpkgs/pkgs/tools/system/hardinfo/default.nix
diff --git a/pkgs/tools/system/hardlink/default.nix b/nixpkgs/pkgs/tools/system/hardlink/default.nix
index d1d2b7a3e76..d1d2b7a3e76 100644
--- a/pkgs/tools/system/hardlink/default.nix
+++ b/nixpkgs/pkgs/tools/system/hardlink/default.nix
diff --git a/pkgs/tools/system/hiera-eyaml/Gemfile b/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile
index 2c2e8f27e40..2c2e8f27e40 100644
--- a/pkgs/tools/system/hiera-eyaml/Gemfile
+++ b/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile
diff --git a/pkgs/tools/system/hiera-eyaml/Gemfile.lock b/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile.lock
index 259c2e170b0..259c2e170b0 100644
--- a/pkgs/tools/system/hiera-eyaml/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile.lock
diff --git a/pkgs/tools/system/hiera-eyaml/default.nix b/nixpkgs/pkgs/tools/system/hiera-eyaml/default.nix
index 33d97aa7d6b..33d97aa7d6b 100644
--- a/pkgs/tools/system/hiera-eyaml/default.nix
+++ b/nixpkgs/pkgs/tools/system/hiera-eyaml/default.nix
diff --git a/pkgs/tools/system/hiera-eyaml/gemset.nix b/nixpkgs/pkgs/tools/system/hiera-eyaml/gemset.nix
index d5aa722e5fc..d5aa722e5fc 100644
--- a/pkgs/tools/system/hiera-eyaml/gemset.nix
+++ b/nixpkgs/pkgs/tools/system/hiera-eyaml/gemset.nix
diff --git a/pkgs/tools/system/honcho/default.nix b/nixpkgs/pkgs/tools/system/honcho/default.nix
index fcdcc23961b..fcdcc23961b 100644
--- a/pkgs/tools/system/honcho/default.nix
+++ b/nixpkgs/pkgs/tools/system/honcho/default.nix
diff --git a/pkgs/tools/system/htop/default.nix b/nixpkgs/pkgs/tools/system/htop/default.nix
index 1b68273a570..1b68273a570 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/nixpkgs/pkgs/tools/system/htop/default.nix
diff --git a/pkgs/tools/system/hwinfo/default.nix b/nixpkgs/pkgs/tools/system/hwinfo/default.nix
index 048af14efb1..048af14efb1 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/nixpkgs/pkgs/tools/system/hwinfo/default.nix
diff --git a/pkgs/tools/system/idle3tools/default.nix b/nixpkgs/pkgs/tools/system/idle3tools/default.nix
index d1631776d39..d1631776d39 100644
--- a/pkgs/tools/system/idle3tools/default.nix
+++ b/nixpkgs/pkgs/tools/system/idle3tools/default.nix
diff --git a/pkgs/tools/system/illum/default.nix b/nixpkgs/pkgs/tools/system/illum/default.nix
index 767fccbd388..767fccbd388 100644
--- a/pkgs/tools/system/illum/default.nix
+++ b/nixpkgs/pkgs/tools/system/illum/default.nix
diff --git a/pkgs/tools/system/incron/default.nix b/nixpkgs/pkgs/tools/system/incron/default.nix
index 2afbed2f9bb..2afbed2f9bb 100644
--- a/pkgs/tools/system/incron/default.nix
+++ b/nixpkgs/pkgs/tools/system/incron/default.nix
diff --git a/pkgs/tools/system/incron/default_path.patch b/nixpkgs/pkgs/tools/system/incron/default_path.patch
index ae173ea29e6..ae173ea29e6 100644
--- a/pkgs/tools/system/incron/default_path.patch
+++ b/nixpkgs/pkgs/tools/system/incron/default_path.patch
diff --git a/pkgs/tools/system/inxi/default.nix b/nixpkgs/pkgs/tools/system/inxi/default.nix
index 7866bece066..7866bece066 100644
--- a/pkgs/tools/system/inxi/default.nix
+++ b/nixpkgs/pkgs/tools/system/inxi/default.nix
diff --git a/pkgs/tools/system/ioping/default.nix b/nixpkgs/pkgs/tools/system/ioping/default.nix
index 5cd3a707dde..5cd3a707dde 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/nixpkgs/pkgs/tools/system/ioping/default.nix
diff --git a/pkgs/tools/system/iops/default.nix b/nixpkgs/pkgs/tools/system/iops/default.nix
index 7e6854afe62..7e6854afe62 100644
--- a/pkgs/tools/system/iops/default.nix
+++ b/nixpkgs/pkgs/tools/system/iops/default.nix
diff --git a/pkgs/tools/system/ior/default.nix b/nixpkgs/pkgs/tools/system/ior/default.nix
index 6217f601121..6217f601121 100644
--- a/pkgs/tools/system/ior/default.nix
+++ b/nixpkgs/pkgs/tools/system/ior/default.nix
diff --git a/pkgs/tools/system/ipmitool/default.nix b/nixpkgs/pkgs/tools/system/ipmitool/default.nix
index 3105cba5a34..3105cba5a34 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/nixpkgs/pkgs/tools/system/ipmitool/default.nix
diff --git a/pkgs/tools/system/ipmiutil/default.nix b/nixpkgs/pkgs/tools/system/ipmiutil/default.nix
index 0d2a78efba1..0d2a78efba1 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/nixpkgs/pkgs/tools/system/ipmiutil/default.nix
diff --git a/pkgs/tools/system/ipmiutil/default.upstream b/nixpkgs/pkgs/tools/system/ipmiutil/default.upstream
index 45e3a936825..45e3a936825 100644
--- a/pkgs/tools/system/ipmiutil/default.upstream
+++ b/nixpkgs/pkgs/tools/system/ipmiutil/default.upstream
diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix
index 19502e5a352..19502e5a352 100644
--- a/pkgs/tools/system/java-service-wrapper/default.nix
+++ b/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix
diff --git a/pkgs/tools/system/journalwatch/default.nix b/nixpkgs/pkgs/tools/system/journalwatch/default.nix
index e0aaee31217..e0aaee31217 100644
--- a/pkgs/tools/system/journalwatch/default.nix
+++ b/nixpkgs/pkgs/tools/system/journalwatch/default.nix
diff --git a/pkgs/tools/system/jump/default.nix b/nixpkgs/pkgs/tools/system/jump/default.nix
index b11177b348c..b11177b348c 100644
--- a/pkgs/tools/system/jump/default.nix
+++ b/nixpkgs/pkgs/tools/system/jump/default.nix
diff --git a/pkgs/tools/system/krakenx/default.nix b/nixpkgs/pkgs/tools/system/krakenx/default.nix
index c6866264a9b..c6866264a9b 100644
--- a/pkgs/tools/system/krakenx/default.nix
+++ b/nixpkgs/pkgs/tools/system/krakenx/default.nix
diff --git a/pkgs/tools/system/ledmon/default.nix b/nixpkgs/pkgs/tools/system/ledmon/default.nix
index ab11fc9e27f..ab11fc9e27f 100644
--- a/pkgs/tools/system/ledmon/default.nix
+++ b/nixpkgs/pkgs/tools/system/ledmon/default.nix
diff --git a/pkgs/tools/system/loadwatch/default.nix b/nixpkgs/pkgs/tools/system/loadwatch/default.nix
index eb7f1e3bb59..eb7f1e3bb59 100644
--- a/pkgs/tools/system/loadwatch/default.nix
+++ b/nixpkgs/pkgs/tools/system/loadwatch/default.nix
diff --git a/pkgs/tools/system/localtime/default.nix b/nixpkgs/pkgs/tools/system/localtime/default.nix
index 39e1bc7b6e7..39e1bc7b6e7 100644
--- a/pkgs/tools/system/localtime/default.nix
+++ b/nixpkgs/pkgs/tools/system/localtime/default.nix
diff --git a/pkgs/tools/system/logcheck/default.nix b/nixpkgs/pkgs/tools/system/logcheck/default.nix
index d51df4f408a..d51df4f408a 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/nixpkgs/pkgs/tools/system/logcheck/default.nix
diff --git a/pkgs/tools/system/logrotate/default.nix b/nixpkgs/pkgs/tools/system/logrotate/default.nix
index 9fd6c4ea81a..9fd6c4ea81a 100644
--- a/pkgs/tools/system/logrotate/default.nix
+++ b/nixpkgs/pkgs/tools/system/logrotate/default.nix
diff --git a/pkgs/tools/system/lr/default.nix b/nixpkgs/pkgs/tools/system/lr/default.nix
index 788319c0c04..788319c0c04 100644
--- a/pkgs/tools/system/lr/default.nix
+++ b/nixpkgs/pkgs/tools/system/lr/default.nix
diff --git a/pkgs/tools/system/lshw/default.nix b/nixpkgs/pkgs/tools/system/lshw/default.nix
index 29c20ad8d53..29c20ad8d53 100644
--- a/pkgs/tools/system/lshw/default.nix
+++ b/nixpkgs/pkgs/tools/system/lshw/default.nix
diff --git a/pkgs/tools/system/mcron/default.nix b/nixpkgs/pkgs/tools/system/mcron/default.nix
index 1831041063b..1831041063b 100644
--- a/pkgs/tools/system/mcron/default.nix
+++ b/nixpkgs/pkgs/tools/system/mcron/default.nix
diff --git a/pkgs/tools/system/mcron/install-vixie-programs.patch b/nixpkgs/pkgs/tools/system/mcron/install-vixie-programs.patch
index d268ecb4a0a..d268ecb4a0a 100644
--- a/pkgs/tools/system/mcron/install-vixie-programs.patch
+++ b/nixpkgs/pkgs/tools/system/mcron/install-vixie-programs.patch
diff --git a/pkgs/tools/system/memtester/default.nix b/nixpkgs/pkgs/tools/system/memtester/default.nix
index ff6ccb534fb..ff6ccb534fb 100644
--- a/pkgs/tools/system/memtester/default.nix
+++ b/nixpkgs/pkgs/tools/system/memtester/default.nix
diff --git a/pkgs/tools/system/minijail/default.nix b/nixpkgs/pkgs/tools/system/minijail/default.nix
index 2b4d1deb9f9..2b4d1deb9f9 100644
--- a/pkgs/tools/system/minijail/default.nix
+++ b/nixpkgs/pkgs/tools/system/minijail/default.nix
diff --git a/pkgs/tools/system/monit/default.nix b/nixpkgs/pkgs/tools/system/monit/default.nix
index f4238e27248..f4238e27248 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/nixpkgs/pkgs/tools/system/monit/default.nix
diff --git a/pkgs/tools/system/mq-cli/default.nix b/nixpkgs/pkgs/tools/system/mq-cli/default.nix
index 930bf8382c6..930bf8382c6 100644
--- a/pkgs/tools/system/mq-cli/default.nix
+++ b/nixpkgs/pkgs/tools/system/mq-cli/default.nix
diff --git a/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix
index 4f8cfb966e8..4f8cfb966e8 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/nixpkgs/pkgs/tools/system/netdata/default.nix
diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
index 138787b98f1..138787b98f1 100644
--- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
+++ b/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
diff --git a/pkgs/tools/system/nq/default.nix b/nixpkgs/pkgs/tools/system/nq/default.nix
index 89c84c8c9ca..89c84c8c9ca 100644
--- a/pkgs/tools/system/nq/default.nix
+++ b/nixpkgs/pkgs/tools/system/nq/default.nix
diff --git a/pkgs/tools/system/nvtop/default.nix b/nixpkgs/pkgs/tools/system/nvtop/default.nix
index 0e7a5d4a311..0e7a5d4a311 100644
--- a/pkgs/tools/system/nvtop/default.nix
+++ b/nixpkgs/pkgs/tools/system/nvtop/default.nix
diff --git a/pkgs/tools/system/opencl-info/default.nix b/nixpkgs/pkgs/tools/system/opencl-info/default.nix
index d1c3d0ec6c0..d1c3d0ec6c0 100644
--- a/pkgs/tools/system/opencl-info/default.nix
+++ b/nixpkgs/pkgs/tools/system/opencl-info/default.nix
diff --git a/pkgs/tools/system/pciutils/default.nix b/nixpkgs/pkgs/tools/system/pciutils/default.nix
index b773529a0d7..b773529a0d7 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/nixpkgs/pkgs/tools/system/pciutils/default.nix
diff --git a/pkgs/tools/system/pcstat/default.nix b/nixpkgs/pkgs/tools/system/pcstat/default.nix
index 5a1bad1092d..5a1bad1092d 100644
--- a/pkgs/tools/system/pcstat/default.nix
+++ b/nixpkgs/pkgs/tools/system/pcstat/default.nix
diff --git a/pkgs/tools/system/pcstat/deps.nix b/nixpkgs/pkgs/tools/system/pcstat/deps.nix
index 809bde1122f..809bde1122f 100644
--- a/pkgs/tools/system/pcstat/deps.nix
+++ b/nixpkgs/pkgs/tools/system/pcstat/deps.nix
diff --git a/pkgs/tools/system/plan9port/builder.sh b/nixpkgs/pkgs/tools/system/plan9port/builder.sh
index f5c447ea0a5..f5c447ea0a5 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/nixpkgs/pkgs/tools/system/plan9port/builder.sh
diff --git a/pkgs/tools/system/plan9port/darwin-cfframework.patch b/nixpkgs/pkgs/tools/system/plan9port/darwin-cfframework.patch
index 01541af92e3..01541af92e3 100644
--- a/pkgs/tools/system/plan9port/darwin-cfframework.patch
+++ b/nixpkgs/pkgs/tools/system/plan9port/darwin-cfframework.patch
diff --git a/pkgs/tools/system/plan9port/darwin-sw_vers.patch b/nixpkgs/pkgs/tools/system/plan9port/darwin-sw_vers.patch
index 3e61c83e540..3e61c83e540 100644
--- a/pkgs/tools/system/plan9port/darwin-sw_vers.patch
+++ b/nixpkgs/pkgs/tools/system/plan9port/darwin-sw_vers.patch
diff --git a/pkgs/tools/system/plan9port/default.nix b/nixpkgs/pkgs/tools/system/plan9port/default.nix
index 9a4a2238558..9a4a2238558 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/nixpkgs/pkgs/tools/system/plan9port/default.nix
diff --git a/pkgs/tools/system/plan9port/tmpdir.patch b/nixpkgs/pkgs/tools/system/plan9port/tmpdir.patch
index e8200a177a2..e8200a177a2 100644
--- a/pkgs/tools/system/plan9port/tmpdir.patch
+++ b/nixpkgs/pkgs/tools/system/plan9port/tmpdir.patch
diff --git a/pkgs/tools/system/procodile/Gemfile b/nixpkgs/pkgs/tools/system/procodile/Gemfile
index 77e4bb430e9..77e4bb430e9 100644
--- a/pkgs/tools/system/procodile/Gemfile
+++ b/nixpkgs/pkgs/tools/system/procodile/Gemfile
diff --git a/pkgs/tools/system/procodile/Gemfile.lock b/nixpkgs/pkgs/tools/system/procodile/Gemfile.lock
index 7989b7bf1f7..7989b7bf1f7 100644
--- a/pkgs/tools/system/procodile/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/system/procodile/Gemfile.lock
diff --git a/pkgs/tools/system/procodile/default.nix b/nixpkgs/pkgs/tools/system/procodile/default.nix
index 3ae80a312ed..3ae80a312ed 100644
--- a/pkgs/tools/system/procodile/default.nix
+++ b/nixpkgs/pkgs/tools/system/procodile/default.nix
diff --git a/pkgs/tools/system/procodile/gemset.nix b/nixpkgs/pkgs/tools/system/procodile/gemset.nix
index 36ec2a9cf18..36ec2a9cf18 100644
--- a/pkgs/tools/system/procodile/gemset.nix
+++ b/nixpkgs/pkgs/tools/system/procodile/gemset.nix
diff --git a/pkgs/tools/system/proot/default.nix b/nixpkgs/pkgs/tools/system/proot/default.nix
index 5ff8ff95f8a..5ff8ff95f8a 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/nixpkgs/pkgs/tools/system/proot/default.nix
diff --git a/pkgs/tools/system/ps_mem/default.nix b/nixpkgs/pkgs/tools/system/ps_mem/default.nix
index bde4429c481..bde4429c481 100644
--- a/pkgs/tools/system/ps_mem/default.nix
+++ b/nixpkgs/pkgs/tools/system/ps_mem/default.nix
diff --git a/pkgs/tools/system/psensor/default.nix b/nixpkgs/pkgs/tools/system/psensor/default.nix
index 83d281642bd..83d281642bd 100644
--- a/pkgs/tools/system/psensor/default.nix
+++ b/nixpkgs/pkgs/tools/system/psensor/default.nix
diff --git a/pkgs/tools/system/psstop/default.nix b/nixpkgs/pkgs/tools/system/psstop/default.nix
index 4d413e60c77..4d413e60c77 100644
--- a/pkgs/tools/system/psstop/default.nix
+++ b/nixpkgs/pkgs/tools/system/psstop/default.nix
diff --git a/pkgs/tools/system/r10k/Gemfile b/nixpkgs/pkgs/tools/system/r10k/Gemfile
index c9363ff3dbd..c9363ff3dbd 100644
--- a/pkgs/tools/system/r10k/Gemfile
+++ b/nixpkgs/pkgs/tools/system/r10k/Gemfile
diff --git a/pkgs/tools/system/r10k/Gemfile.lock b/nixpkgs/pkgs/tools/system/r10k/Gemfile.lock
index f399068b56e..f399068b56e 100644
--- a/pkgs/tools/system/r10k/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/system/r10k/Gemfile.lock
diff --git a/pkgs/tools/system/r10k/default.nix b/nixpkgs/pkgs/tools/system/r10k/default.nix
index 56e4e4f94fa..56e4e4f94fa 100644
--- a/pkgs/tools/system/r10k/default.nix
+++ b/nixpkgs/pkgs/tools/system/r10k/default.nix
diff --git a/pkgs/tools/system/r10k/gemset.nix b/nixpkgs/pkgs/tools/system/r10k/gemset.nix
index b918fe788b5..b918fe788b5 100644
--- a/pkgs/tools/system/r10k/gemset.nix
+++ b/nixpkgs/pkgs/tools/system/r10k/gemset.nix
diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix
index 73c1b488155..73c1b488155 100644
--- a/pkgs/tools/system/rofi-systemd/default.nix
+++ b/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix
diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix
index 64c184a6122..64c184a6122 100644
--- a/pkgs/tools/system/rowhammer-test/default.nix
+++ b/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix
diff --git a/pkgs/tools/system/rsyslog/default.nix b/nixpkgs/pkgs/tools/system/rsyslog/default.nix
index 9d3cbbf79eb..9d3cbbf79eb 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/nixpkgs/pkgs/tools/system/rsyslog/default.nix
diff --git a/pkgs/tools/system/rsyslog/fix-gnutls-detection.patch b/nixpkgs/pkgs/tools/system/rsyslog/fix-gnutls-detection.patch
index c8955ea57dc..c8955ea57dc 100644
--- a/pkgs/tools/system/rsyslog/fix-gnutls-detection.patch
+++ b/nixpkgs/pkgs/tools/system/rsyslog/fix-gnutls-detection.patch
diff --git a/pkgs/tools/system/runit/default.nix b/nixpkgs/pkgs/tools/system/runit/default.nix
index 78306907079..78306907079 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/nixpkgs/pkgs/tools/system/runit/default.nix
diff --git a/pkgs/tools/system/runit/fix-ar-ranlib.patch b/nixpkgs/pkgs/tools/system/runit/fix-ar-ranlib.patch
index c65a037d524..c65a037d524 100644
--- a/pkgs/tools/system/runit/fix-ar-ranlib.patch
+++ b/nixpkgs/pkgs/tools/system/runit/fix-ar-ranlib.patch
diff --git a/pkgs/tools/system/s-tui/default.nix b/nixpkgs/pkgs/tools/system/s-tui/default.nix
index 924269b6637..924269b6637 100644
--- a/pkgs/tools/system/s-tui/default.nix
+++ b/nixpkgs/pkgs/tools/system/s-tui/default.nix
diff --git a/pkgs/tools/system/s6-rc/default.nix b/nixpkgs/pkgs/tools/system/s6-rc/default.nix
index 95d4b376d0a..95d4b376d0a 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/nixpkgs/pkgs/tools/system/s6-rc/default.nix
diff --git a/pkgs/tools/system/s6/default.nix b/nixpkgs/pkgs/tools/system/s6/default.nix
index efdf173a22c..efdf173a22c 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/nixpkgs/pkgs/tools/system/s6/default.nix
diff --git a/pkgs/tools/system/safe-rm/default.nix b/nixpkgs/pkgs/tools/system/safe-rm/default.nix
index 571f70e0756..571f70e0756 100644
--- a/pkgs/tools/system/safe-rm/default.nix
+++ b/nixpkgs/pkgs/tools/system/safe-rm/default.nix
diff --git a/pkgs/tools/system/safecopy/default.nix b/nixpkgs/pkgs/tools/system/safecopy/default.nix
index ce0779c0999..ce0779c0999 100644
--- a/pkgs/tools/system/safecopy/default.nix
+++ b/nixpkgs/pkgs/tools/system/safecopy/default.nix
diff --git a/pkgs/tools/system/setserial/default.nix b/nixpkgs/pkgs/tools/system/setserial/default.nix
index 68ea32e1e8a..68ea32e1e8a 100644
--- a/pkgs/tools/system/setserial/default.nix
+++ b/nixpkgs/pkgs/tools/system/setserial/default.nix
diff --git a/pkgs/tools/system/sg3_utils/default.nix b/nixpkgs/pkgs/tools/system/sg3_utils/default.nix
index 67145bc3cc5..67145bc3cc5 100644
--- a/pkgs/tools/system/sg3_utils/default.nix
+++ b/nixpkgs/pkgs/tools/system/sg3_utils/default.nix
diff --git a/pkgs/tools/system/sleuthkit/default.nix b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix
index 7c90d41da18..7c90d41da18 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix
diff --git a/pkgs/tools/system/smartmontools/default.nix b/nixpkgs/pkgs/tools/system/smartmontools/default.nix
index 2da76cce0cd..2da76cce0cd 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/nixpkgs/pkgs/tools/system/smartmontools/default.nix
diff --git a/pkgs/tools/system/smartmontools/smartmontools.patch b/nixpkgs/pkgs/tools/system/smartmontools/smartmontools.patch
index 144b2be2d33..144b2be2d33 100644
--- a/pkgs/tools/system/smartmontools/smartmontools.patch
+++ b/nixpkgs/pkgs/tools/system/smartmontools/smartmontools.patch
diff --git a/pkgs/tools/system/socklog/default.nix b/nixpkgs/pkgs/tools/system/socklog/default.nix
index 9f2cc225747..9f2cc225747 100644
--- a/pkgs/tools/system/socklog/default.nix
+++ b/nixpkgs/pkgs/tools/system/socklog/default.nix
diff --git a/pkgs/tools/system/storebrowse/default.nix b/nixpkgs/pkgs/tools/system/storebrowse/default.nix
index e3b58a50c92..e3b58a50c92 100644
--- a/pkgs/tools/system/storebrowse/default.nix
+++ b/nixpkgs/pkgs/tools/system/storebrowse/default.nix
diff --git a/pkgs/tools/system/stress-ng/default.nix b/nixpkgs/pkgs/tools/system/stress-ng/default.nix
index 7d3e62d7beb..7d3e62d7beb 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/nixpkgs/pkgs/tools/system/stress-ng/default.nix
diff --git a/pkgs/tools/system/stress/default.nix b/nixpkgs/pkgs/tools/system/stress/default.nix
index 1595e8347e1..1595e8347e1 100644
--- a/pkgs/tools/system/stress/default.nix
+++ b/nixpkgs/pkgs/tools/system/stress/default.nix
diff --git a/pkgs/tools/system/suid-chroot/default.nix b/nixpkgs/pkgs/tools/system/suid-chroot/default.nix
index 9697748e056..9697748e056 100644
--- a/pkgs/tools/system/suid-chroot/default.nix
+++ b/nixpkgs/pkgs/tools/system/suid-chroot/default.nix
diff --git a/pkgs/tools/system/supervise/default.nix b/nixpkgs/pkgs/tools/system/supervise/default.nix
index 3834b3762f0..3834b3762f0 100644
--- a/pkgs/tools/system/supervise/default.nix
+++ b/nixpkgs/pkgs/tools/system/supervise/default.nix
diff --git a/pkgs/tools/system/symlinks/default.nix b/nixpkgs/pkgs/tools/system/symlinks/default.nix
index 93a6bbf0c75..93a6bbf0c75 100644
--- a/pkgs/tools/system/symlinks/default.nix
+++ b/nixpkgs/pkgs/tools/system/symlinks/default.nix
diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix
index 881fda241ed..881fda241ed 100644
--- a/pkgs/tools/system/syslog-ng-incubator/default.nix
+++ b/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/nixpkgs/pkgs/tools/system/syslog-ng/default.nix
index d070e1673c2..d070e1673c2 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/nixpkgs/pkgs/tools/system/syslog-ng/default.nix
diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix
index 3f23624071f..3f23624071f 100644
--- a/pkgs/tools/system/systemd-journal2gelf/default.nix
+++ b/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix
diff --git a/pkgs/tools/system/testdisk/default.nix b/nixpkgs/pkgs/tools/system/testdisk/default.nix
index ad11cd2e3b6..ad11cd2e3b6 100644
--- a/pkgs/tools/system/testdisk/default.nix
+++ b/nixpkgs/pkgs/tools/system/testdisk/default.nix
diff --git a/pkgs/tools/system/thermald/default.nix b/nixpkgs/pkgs/tools/system/thermald/default.nix
index 7afa91abf13..7afa91abf13 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/nixpkgs/pkgs/tools/system/thermald/default.nix
diff --git a/pkgs/tools/system/thinkfan/default.nix b/nixpkgs/pkgs/tools/system/thinkfan/default.nix
index f3b4ab8440e..f3b4ab8440e 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/nixpkgs/pkgs/tools/system/thinkfan/default.nix
diff --git a/pkgs/tools/system/throttled/default.nix b/nixpkgs/pkgs/tools/system/throttled/default.nix
index 4f52b5e0945..4f52b5e0945 100644
--- a/pkgs/tools/system/throttled/default.nix
+++ b/nixpkgs/pkgs/tools/system/throttled/default.nix
diff --git a/pkgs/tools/system/tm/default.nix b/nixpkgs/pkgs/tools/system/tm/default.nix
index cbb1fd88669..cbb1fd88669 100644
--- a/pkgs/tools/system/tm/default.nix
+++ b/nixpkgs/pkgs/tools/system/tm/default.nix
diff --git a/pkgs/tools/system/tre-command/default.nix b/nixpkgs/pkgs/tools/system/tre-command/default.nix
index 6050b2a709e..6050b2a709e 100644
--- a/pkgs/tools/system/tre-command/default.nix
+++ b/nixpkgs/pkgs/tools/system/tre-command/default.nix
diff --git a/pkgs/tools/system/tree/default.nix b/nixpkgs/pkgs/tools/system/tree/default.nix
index 0163d550217..0163d550217 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/nixpkgs/pkgs/tools/system/tree/default.nix
diff --git a/pkgs/tools/system/ts/default.nix b/nixpkgs/pkgs/tools/system/ts/default.nix
index 79ba7d89304..79ba7d89304 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/nixpkgs/pkgs/tools/system/ts/default.nix
diff --git a/pkgs/tools/system/uefitool/common.nix b/nixpkgs/pkgs/tools/system/uefitool/common.nix
index 7d5ee82dcf9..7d5ee82dcf9 100644
--- a/pkgs/tools/system/uefitool/common.nix
+++ b/nixpkgs/pkgs/tools/system/uefitool/common.nix
diff --git a/pkgs/tools/system/uefitool/variants.nix b/nixpkgs/pkgs/tools/system/uefitool/variants.nix
index cced17e6ddd..cced17e6ddd 100644
--- a/pkgs/tools/system/uefitool/variants.nix
+++ b/nixpkgs/pkgs/tools/system/uefitool/variants.nix
diff --git a/pkgs/tools/system/undaemonize/default.nix b/nixpkgs/pkgs/tools/system/undaemonize/default.nix
index 0f33a8d34c3..0f33a8d34c3 100644
--- a/pkgs/tools/system/undaemonize/default.nix
+++ b/nixpkgs/pkgs/tools/system/undaemonize/default.nix
diff --git a/pkgs/tools/system/uptimed/default.nix b/nixpkgs/pkgs/tools/system/uptimed/default.nix
index 2e856aaf9be..2e856aaf9be 100644
--- a/pkgs/tools/system/uptimed/default.nix
+++ b/nixpkgs/pkgs/tools/system/uptimed/default.nix
diff --git a/pkgs/tools/system/uptimed/no-var-spool-install.patch b/nixpkgs/pkgs/tools/system/uptimed/no-var-spool-install.patch
index f591aad4b50..f591aad4b50 100644
--- a/pkgs/tools/system/uptimed/no-var-spool-install.patch
+++ b/nixpkgs/pkgs/tools/system/uptimed/no-var-spool-install.patch
diff --git a/pkgs/tools/system/vbetool/default.nix b/nixpkgs/pkgs/tools/system/vbetool/default.nix
index 06ae2862662..06ae2862662 100644
--- a/pkgs/tools/system/vbetool/default.nix
+++ b/nixpkgs/pkgs/tools/system/vbetool/default.nix
diff --git a/pkgs/tools/system/vboot_reference/default.nix b/nixpkgs/pkgs/tools/system/vboot_reference/default.nix
index 1391a2a5ed2..1391a2a5ed2 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/nixpkgs/pkgs/tools/system/vboot_reference/default.nix
diff --git a/pkgs/tools/system/vboot_reference/dont_static_link.patch b/nixpkgs/pkgs/tools/system/vboot_reference/dont_static_link.patch
index 506b942e246..506b942e246 100644
--- a/pkgs/tools/system/vboot_reference/dont_static_link.patch
+++ b/nixpkgs/pkgs/tools/system/vboot_reference/dont_static_link.patch
diff --git a/pkgs/tools/system/which/default.nix b/nixpkgs/pkgs/tools/system/which/default.nix
index 12aac2508cb..12aac2508cb 100644
--- a/pkgs/tools/system/which/default.nix
+++ b/nixpkgs/pkgs/tools/system/which/default.nix
diff --git a/pkgs/tools/system/wsmancli/default.nix b/nixpkgs/pkgs/tools/system/wsmancli/default.nix
index da502946781..da502946781 100644
--- a/pkgs/tools/system/wsmancli/default.nix
+++ b/nixpkgs/pkgs/tools/system/wsmancli/default.nix
diff --git a/pkgs/tools/system/xe/default.nix b/nixpkgs/pkgs/tools/system/xe/default.nix
index 62423ff594f..62423ff594f 100644
--- a/pkgs/tools/system/xe/default.nix
+++ b/nixpkgs/pkgs/tools/system/xe/default.nix
diff --git a/pkgs/tools/system/yeshup/default.nix b/nixpkgs/pkgs/tools/system/yeshup/default.nix
index 42060aed295..42060aed295 100644
--- a/pkgs/tools/system/yeshup/default.nix
+++ b/nixpkgs/pkgs/tools/system/yeshup/default.nix
diff --git a/pkgs/tools/text/a2ps/default.nix b/nixpkgs/pkgs/tools/text/a2ps/default.nix
index f423bd7ea1c..f423bd7ea1c 100644
--- a/pkgs/tools/text/a2ps/default.nix
+++ b/nixpkgs/pkgs/tools/text/a2ps/default.nix
diff --git a/pkgs/tools/text/agrep/default.nix b/nixpkgs/pkgs/tools/text/agrep/default.nix
index 902067b3d53..902067b3d53 100644
--- a/pkgs/tools/text/agrep/default.nix
+++ b/nixpkgs/pkgs/tools/text/agrep/default.nix
diff --git a/pkgs/tools/text/aha/default.nix b/nixpkgs/pkgs/tools/text/aha/default.nix
index 7dc07664fce..7dc07664fce 100644
--- a/pkgs/tools/text/aha/default.nix
+++ b/nixpkgs/pkgs/tools/text/aha/default.nix
diff --git a/pkgs/tools/text/amber/default.nix b/nixpkgs/pkgs/tools/text/amber/default.nix
index 935b6a60729..935b6a60729 100644
--- a/pkgs/tools/text/amber/default.nix
+++ b/nixpkgs/pkgs/tools/text/amber/default.nix
diff --git a/pkgs/tools/text/ansifilter/default.nix b/nixpkgs/pkgs/tools/text/ansifilter/default.nix
index bc265c5a5ae..bc265c5a5ae 100644
--- a/pkgs/tools/text/ansifilter/default.nix
+++ b/nixpkgs/pkgs/tools/text/ansifilter/default.nix
diff --git a/pkgs/tools/text/ascii/default.nix b/nixpkgs/pkgs/tools/text/ascii/default.nix
index b01ce7773e3..b01ce7773e3 100644
--- a/pkgs/tools/text/ascii/default.nix
+++ b/nixpkgs/pkgs/tools/text/ascii/default.nix
diff --git a/pkgs/tools/text/bcat/Gemfile b/nixpkgs/pkgs/tools/text/bcat/Gemfile
index a25a2e89097..a25a2e89097 100644
--- a/pkgs/tools/text/bcat/Gemfile
+++ b/nixpkgs/pkgs/tools/text/bcat/Gemfile
diff --git a/pkgs/tools/text/bcat/Gemfile.lock b/nixpkgs/pkgs/tools/text/bcat/Gemfile.lock
index 09108977c71..09108977c71 100644
--- a/pkgs/tools/text/bcat/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/text/bcat/Gemfile.lock
diff --git a/pkgs/tools/text/bcat/default.nix b/nixpkgs/pkgs/tools/text/bcat/default.nix
index e8000f17cde..e8000f17cde 100644
--- a/pkgs/tools/text/bcat/default.nix
+++ b/nixpkgs/pkgs/tools/text/bcat/default.nix
diff --git a/pkgs/tools/text/bcat/gemset.nix b/nixpkgs/pkgs/tools/text/bcat/gemset.nix
index 75de0e5cf38..75de0e5cf38 100644
--- a/pkgs/tools/text/bcat/gemset.nix
+++ b/nixpkgs/pkgs/tools/text/bcat/gemset.nix
diff --git a/pkgs/tools/text/boxes/default.nix b/nixpkgs/pkgs/tools/text/boxes/default.nix
index 8325c6c08f3..8325c6c08f3 100644
--- a/pkgs/tools/text/boxes/default.nix
+++ b/nixpkgs/pkgs/tools/text/boxes/default.nix
diff --git a/pkgs/tools/text/catdoc/default.nix b/nixpkgs/pkgs/tools/text/catdoc/default.nix
index 64ef092f36b..64ef092f36b 100644
--- a/pkgs/tools/text/catdoc/default.nix
+++ b/nixpkgs/pkgs/tools/text/catdoc/default.nix
diff --git a/pkgs/tools/text/catdocx/default.nix b/nixpkgs/pkgs/tools/text/catdocx/default.nix
index adf9d17815b..adf9d17815b 100644
--- a/pkgs/tools/text/catdocx/default.nix
+++ b/nixpkgs/pkgs/tools/text/catdocx/default.nix
diff --git a/pkgs/tools/text/cconv/default.nix b/nixpkgs/pkgs/tools/text/cconv/default.nix
index 3b80af365f6..3b80af365f6 100644
--- a/pkgs/tools/text/cconv/default.nix
+++ b/nixpkgs/pkgs/tools/text/cconv/default.nix
diff --git a/pkgs/tools/text/codesearch/default.nix b/nixpkgs/pkgs/tools/text/codesearch/default.nix
index 521b4c5b284..521b4c5b284 100644
--- a/pkgs/tools/text/codesearch/default.nix
+++ b/nixpkgs/pkgs/tools/text/codesearch/default.nix
diff --git a/pkgs/tools/text/codesearch/deps.nix b/nixpkgs/pkgs/tools/text/codesearch/deps.nix
index 2d1dad70634..2d1dad70634 100644
--- a/pkgs/tools/text/codesearch/deps.nix
+++ b/nixpkgs/pkgs/tools/text/codesearch/deps.nix
diff --git a/pkgs/tools/text/colordiff/default.nix b/nixpkgs/pkgs/tools/text/colordiff/default.nix
index 46fdf29ad46..46fdf29ad46 100644
--- a/pkgs/tools/text/colordiff/default.nix
+++ b/nixpkgs/pkgs/tools/text/colordiff/default.nix
diff --git a/pkgs/tools/text/coloursum/default.nix b/nixpkgs/pkgs/tools/text/coloursum/default.nix
index 5cac5a9f90e..5cac5a9f90e 100644
--- a/pkgs/tools/text/coloursum/default.nix
+++ b/nixpkgs/pkgs/tools/text/coloursum/default.nix
diff --git a/pkgs/tools/text/convertlit/default.nix b/nixpkgs/pkgs/tools/text/convertlit/default.nix
index ffc2dc1c4d5..ffc2dc1c4d5 100644
--- a/pkgs/tools/text/convertlit/default.nix
+++ b/nixpkgs/pkgs/tools/text/convertlit/default.nix
diff --git a/pkgs/tools/text/copyright-update/default.nix b/nixpkgs/pkgs/tools/text/copyright-update/default.nix
index 9a405674dc7..9a405674dc7 100644
--- a/pkgs/tools/text/copyright-update/default.nix
+++ b/nixpkgs/pkgs/tools/text/copyright-update/default.nix
diff --git a/pkgs/tools/text/csvkit/default.nix b/nixpkgs/pkgs/tools/text/csvkit/default.nix
index d2c710d10f8..d2c710d10f8 100644
--- a/pkgs/tools/text/csvkit/default.nix
+++ b/nixpkgs/pkgs/tools/text/csvkit/default.nix
diff --git a/pkgs/tools/text/dadadodo/default.nix b/nixpkgs/pkgs/tools/text/dadadodo/default.nix
index 5f6b0a8a605..5f6b0a8a605 100644
--- a/pkgs/tools/text/dadadodo/default.nix
+++ b/nixpkgs/pkgs/tools/text/dadadodo/default.nix
diff --git a/pkgs/tools/text/diction/default.nix b/nixpkgs/pkgs/tools/text/diction/default.nix
index f43cd94a83e..f43cd94a83e 100644
--- a/pkgs/tools/text/diction/default.nix
+++ b/nixpkgs/pkgs/tools/text/diction/default.nix
diff --git a/pkgs/tools/text/diffr/default.nix b/nixpkgs/pkgs/tools/text/diffr/default.nix
index c032d2e8b36..c032d2e8b36 100644
--- a/pkgs/tools/text/diffr/default.nix
+++ b/nixpkgs/pkgs/tools/text/diffr/default.nix
diff --git a/pkgs/tools/text/diffstat/default.nix b/nixpkgs/pkgs/tools/text/diffstat/default.nix
index bf4ff279f8f..bf4ff279f8f 100644
--- a/pkgs/tools/text/diffstat/default.nix
+++ b/nixpkgs/pkgs/tools/text/diffstat/default.nix
diff --git a/pkgs/tools/text/diffutils/default.nix b/nixpkgs/pkgs/tools/text/diffutils/default.nix
index 67f397dbe48..67f397dbe48 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/nixpkgs/pkgs/tools/text/diffutils/default.nix
diff --git a/pkgs/tools/text/discount/default.nix b/nixpkgs/pkgs/tools/text/discount/default.nix
index c1183d4c5a0..c1183d4c5a0 100644
--- a/pkgs/tools/text/discount/default.nix
+++ b/nixpkgs/pkgs/tools/text/discount/default.nix
diff --git a/pkgs/tools/text/discount/fix-configure-path.patch b/nixpkgs/pkgs/tools/text/discount/fix-configure-path.patch
index 045b369b4b6..045b369b4b6 100644
--- a/pkgs/tools/text/discount/fix-configure-path.patch
+++ b/nixpkgs/pkgs/tools/text/discount/fix-configure-path.patch
diff --git a/pkgs/tools/text/dos2unix/default.nix b/nixpkgs/pkgs/tools/text/dos2unix/default.nix
index b7efe02f4cd..b7efe02f4cd 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/nixpkgs/pkgs/tools/text/dos2unix/default.nix
diff --git a/pkgs/tools/text/ebook-tools/default.nix b/nixpkgs/pkgs/tools/text/ebook-tools/default.nix
index 7dcd94e5363..7dcd94e5363 100644
--- a/pkgs/tools/text/ebook-tools/default.nix
+++ b/nixpkgs/pkgs/tools/text/ebook-tools/default.nix
diff --git a/pkgs/tools/text/enca/default.nix b/nixpkgs/pkgs/tools/text/enca/default.nix
index 6cfb4721066..6cfb4721066 100644
--- a/pkgs/tools/text/enca/default.nix
+++ b/nixpkgs/pkgs/tools/text/enca/default.nix
diff --git a/pkgs/tools/text/enscript/default.nix b/nixpkgs/pkgs/tools/text/enscript/default.nix
index 24ac649026a..24ac649026a 100644
--- a/pkgs/tools/text/enscript/default.nix
+++ b/nixpkgs/pkgs/tools/text/enscript/default.nix
diff --git a/pkgs/tools/text/epubcheck/default.nix b/nixpkgs/pkgs/tools/text/epubcheck/default.nix
index 4e117ab7a48..4e117ab7a48 100644
--- a/pkgs/tools/text/epubcheck/default.nix
+++ b/nixpkgs/pkgs/tools/text/epubcheck/default.nix
diff --git a/pkgs/tools/text/esh/default.nix b/nixpkgs/pkgs/tools/text/esh/default.nix
index 231a16bdc1b..231a16bdc1b 100644
--- a/pkgs/tools/text/esh/default.nix
+++ b/nixpkgs/pkgs/tools/text/esh/default.nix
diff --git a/pkgs/tools/text/fanficfare/default.nix b/nixpkgs/pkgs/tools/text/fanficfare/default.nix
index 105a2d3308f..105a2d3308f 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/nixpkgs/pkgs/tools/text/fanficfare/default.nix
diff --git a/pkgs/tools/text/gawk/default.nix b/nixpkgs/pkgs/tools/text/gawk/default.nix
index 0d5a50570f5..0d5a50570f5 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/nixpkgs/pkgs/tools/text/gawk/default.nix
diff --git a/pkgs/tools/text/gawk/gawk-with-extensions.nix b/nixpkgs/pkgs/tools/text/gawk/gawk-with-extensions.nix
index 751e5181bb5..751e5181bb5 100644
--- a/pkgs/tools/text/gawk/gawk-with-extensions.nix
+++ b/nixpkgs/pkgs/tools/text/gawk/gawk-with-extensions.nix
diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/nixpkgs/pkgs/tools/text/gawk/gawkextlib.nix
index e15b2d4e257..e15b2d4e257 100644
--- a/pkgs/tools/text/gawk/gawkextlib.nix
+++ b/nixpkgs/pkgs/tools/text/gawk/gawkextlib.nix
diff --git a/pkgs/tools/text/gawk/setup-hook.sh b/nixpkgs/pkgs/tools/text/gawk/setup-hook.sh
index d568cb8c7dd..d568cb8c7dd 100644
--- a/pkgs/tools/text/gawk/setup-hook.sh
+++ b/nixpkgs/pkgs/tools/text/gawk/setup-hook.sh
diff --git a/pkgs/tools/text/gist/default.nix b/nixpkgs/pkgs/tools/text/gist/default.nix
index 7091031d28f..7091031d28f 100644
--- a/pkgs/tools/text/gist/default.nix
+++ b/nixpkgs/pkgs/tools/text/gist/default.nix
diff --git a/pkgs/tools/text/glogg/default.nix b/nixpkgs/pkgs/tools/text/glogg/default.nix
index 6e9ff5170f2..6e9ff5170f2 100644
--- a/pkgs/tools/text/glogg/default.nix
+++ b/nixpkgs/pkgs/tools/text/glogg/default.nix
diff --git a/pkgs/tools/text/gnugrep/default.nix b/nixpkgs/pkgs/tools/text/gnugrep/default.nix
index 87c8fdfd890..87c8fdfd890 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/nixpkgs/pkgs/tools/text/gnugrep/default.nix
diff --git a/pkgs/tools/text/gnupatch/CVE-2018-6951.patch b/nixpkgs/pkgs/tools/text/gnupatch/CVE-2018-6951.patch
index 22d5f061c33..22d5f061c33 100644
--- a/pkgs/tools/text/gnupatch/CVE-2018-6951.patch
+++ b/nixpkgs/pkgs/tools/text/gnupatch/CVE-2018-6951.patch
diff --git a/pkgs/tools/text/gnupatch/CVE-2018-6952.patch b/nixpkgs/pkgs/tools/text/gnupatch/CVE-2018-6952.patch
index 2da323c6984..2da323c6984 100644
--- a/pkgs/tools/text/gnupatch/CVE-2018-6952.patch
+++ b/nixpkgs/pkgs/tools/text/gnupatch/CVE-2018-6952.patch
diff --git a/pkgs/tools/text/gnupatch/CVE-2019-13636.patch b/nixpkgs/pkgs/tools/text/gnupatch/CVE-2019-13636.patch
index e62c3d41753..e62c3d41753 100644
--- a/pkgs/tools/text/gnupatch/CVE-2019-13636.patch
+++ b/nixpkgs/pkgs/tools/text/gnupatch/CVE-2019-13636.patch
diff --git a/pkgs/tools/text/gnupatch/CVE-2019-13638-and-CVE-2018-20969.patch b/nixpkgs/pkgs/tools/text/gnupatch/CVE-2019-13638-and-CVE-2018-20969.patch
index 38caff628aa..38caff628aa 100644
--- a/pkgs/tools/text/gnupatch/CVE-2019-13638-and-CVE-2018-20969.patch
+++ b/nixpkgs/pkgs/tools/text/gnupatch/CVE-2019-13638-and-CVE-2018-20969.patch
diff --git a/pkgs/tools/text/gnupatch/default.nix b/nixpkgs/pkgs/tools/text/gnupatch/default.nix
index b85d16ea4e9..b85d16ea4e9 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/nixpkgs/pkgs/tools/text/gnupatch/default.nix
diff --git a/pkgs/tools/text/gnused/422.nix b/nixpkgs/pkgs/tools/text/gnused/422.nix
index 3a9856c3dd3..3a9856c3dd3 100644
--- a/pkgs/tools/text/gnused/422.nix
+++ b/nixpkgs/pkgs/tools/text/gnused/422.nix
diff --git a/pkgs/tools/text/gnused/default.nix b/nixpkgs/pkgs/tools/text/gnused/default.nix
index 3d73bfba657..3d73bfba657 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/nixpkgs/pkgs/tools/text/gnused/default.nix
diff --git a/pkgs/tools/text/grin/default.nix b/nixpkgs/pkgs/tools/text/grin/default.nix
index 837ec5b7a5f..837ec5b7a5f 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/nixpkgs/pkgs/tools/text/grin/default.nix
diff --git a/pkgs/tools/text/grip-search/default.nix b/nixpkgs/pkgs/tools/text/grip-search/default.nix
index 921691a40af..921691a40af 100644
--- a/pkgs/tools/text/grip-search/default.nix
+++ b/nixpkgs/pkgs/tools/text/grip-search/default.nix
diff --git a/pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch b/nixpkgs/pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch
index 671293cda5b..671293cda5b 100644
--- a/pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch
+++ b/nixpkgs/pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch
diff --git a/pkgs/tools/text/groff/default.nix b/nixpkgs/pkgs/tools/text/groff/default.nix
index ec7e724d1fc..ec7e724d1fc 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/nixpkgs/pkgs/tools/text/groff/default.nix
diff --git a/pkgs/tools/text/groff/site.tmac b/nixpkgs/pkgs/tools/text/groff/site.tmac
index 8ef1040ca4a..8ef1040ca4a 100644
--- a/pkgs/tools/text/groff/site.tmac
+++ b/nixpkgs/pkgs/tools/text/groff/site.tmac
diff --git a/pkgs/tools/text/gtranslator/default.nix b/nixpkgs/pkgs/tools/text/gtranslator/default.nix
index b871ac6ffaa..b871ac6ffaa 100644
--- a/pkgs/tools/text/gtranslator/default.nix
+++ b/nixpkgs/pkgs/tools/text/gtranslator/default.nix
diff --git a/pkgs/tools/text/gucci/default.nix b/nixpkgs/pkgs/tools/text/gucci/default.nix
index 58f1768bfa1..58f1768bfa1 100644
--- a/pkgs/tools/text/gucci/default.nix
+++ b/nixpkgs/pkgs/tools/text/gucci/default.nix
diff --git a/pkgs/tools/text/gucci/deps.nix b/nixpkgs/pkgs/tools/text/gucci/deps.nix
index 8e2cc5af3bf..8e2cc5af3bf 100644
--- a/pkgs/tools/text/gucci/deps.nix
+++ b/nixpkgs/pkgs/tools/text/gucci/deps.nix
diff --git a/pkgs/tools/text/highlight/default.nix b/nixpkgs/pkgs/tools/text/highlight/default.nix
index 51cafeb8c4a..51cafeb8c4a 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/nixpkgs/pkgs/tools/text/highlight/default.nix
diff --git a/pkgs/tools/text/html-tidy/default.nix b/nixpkgs/pkgs/tools/text/html-tidy/default.nix
index e31db437850..e31db437850 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/nixpkgs/pkgs/tools/text/html-tidy/default.nix
diff --git a/pkgs/tools/text/html2text/default.nix b/nixpkgs/pkgs/tools/text/html2text/default.nix
index 19448475548..19448475548 100644
--- a/pkgs/tools/text/html2text/default.nix
+++ b/nixpkgs/pkgs/tools/text/html2text/default.nix
diff --git a/pkgs/tools/text/hyx/default.nix b/nixpkgs/pkgs/tools/text/hyx/default.nix
index 70745266fe5..70745266fe5 100644
--- a/pkgs/tools/text/hyx/default.nix
+++ b/nixpkgs/pkgs/tools/text/hyx/default.nix
diff --git a/pkgs/tools/text/hyx/no-wall-by-default.patch b/nixpkgs/pkgs/tools/text/hyx/no-wall-by-default.patch
index 48ee20eff17..48ee20eff17 100644
--- a/pkgs/tools/text/hyx/no-wall-by-default.patch
+++ b/nixpkgs/pkgs/tools/text/hyx/no-wall-by-default.patch
diff --git a/pkgs/tools/text/icdiff/default.nix b/nixpkgs/pkgs/tools/text/icdiff/default.nix
index 79bcf90718b..79bcf90718b 100644
--- a/pkgs/tools/text/icdiff/default.nix
+++ b/nixpkgs/pkgs/tools/text/icdiff/default.nix
diff --git a/pkgs/tools/text/invoice2data/default.nix b/nixpkgs/pkgs/tools/text/invoice2data/default.nix
index 0e2e4cedfc2..0e2e4cedfc2 100644
--- a/pkgs/tools/text/invoice2data/default.nix
+++ b/nixpkgs/pkgs/tools/text/invoice2data/default.nix
diff --git a/pkgs/tools/text/ispell/default.nix b/nixpkgs/pkgs/tools/text/ispell/default.nix
index 2f61536ed2c..2f61536ed2c 100644
--- a/pkgs/tools/text/ispell/default.nix
+++ b/nixpkgs/pkgs/tools/text/ispell/default.nix
diff --git a/pkgs/tools/text/ispell/patches/0007-Use-termios.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0007-Use-termios.patch
index 299e3c01ab1..299e3c01ab1 100644
--- a/pkgs/tools/text/ispell/patches/0007-Use-termios.patch
+++ b/nixpkgs/pkgs/tools/text/ispell/patches/0007-Use-termios.patch
diff --git a/pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch
index 21b44d505db..21b44d505db 100644
--- a/pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch
+++ b/nixpkgs/pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch
diff --git a/pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch
index dbe0db9a053..dbe0db9a053 100644
--- a/pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch
+++ b/nixpkgs/pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch
diff --git a/pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch
index 5e77b6a4f37..5e77b6a4f37 100644
--- a/pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch
+++ b/nixpkgs/pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch
diff --git a/pkgs/tools/text/ispell/patches/0012-Fix-getline.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0012-Fix-getline.patch
index ea966d67792..ea966d67792 100644
--- a/pkgs/tools/text/ispell/patches/0012-Fix-getline.patch
+++ b/nixpkgs/pkgs/tools/text/ispell/patches/0012-Fix-getline.patch
diff --git a/pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch
index 9c0aedb67d7..9c0aedb67d7 100644
--- a/pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch
+++ b/nixpkgs/pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch
diff --git a/pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch
index 8902018dab5..8902018dab5 100644
--- a/pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch
+++ b/nixpkgs/pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch
diff --git a/pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch
index 392d94d27d3..392d94d27d3 100644
--- a/pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch
+++ b/nixpkgs/pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch
diff --git a/pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch
index fd35ee34ec1..fd35ee34ec1 100644
--- a/pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch
+++ b/nixpkgs/pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch
diff --git a/pkgs/tools/text/ispell/patches/0025-Languages.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0025-Languages.patch
index ffa114d28a1..ffa114d28a1 100644
--- a/pkgs/tools/text/ispell/patches/0025-Languages.patch
+++ b/nixpkgs/pkgs/tools/text/ispell/patches/0025-Languages.patch
diff --git a/pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch
index bf687f04413..bf687f04413 100644
--- a/pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch
+++ b/nixpkgs/pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch
diff --git a/pkgs/tools/text/jsawk/default.nix b/nixpkgs/pkgs/tools/text/jsawk/default.nix
index c7f4002e2d3..c7f4002e2d3 100644
--- a/pkgs/tools/text/jsawk/default.nix
+++ b/nixpkgs/pkgs/tools/text/jsawk/default.nix
diff --git a/pkgs/tools/text/jumanpp/default.nix b/nixpkgs/pkgs/tools/text/jumanpp/default.nix
index 6be7106f2b9..6be7106f2b9 100644
--- a/pkgs/tools/text/jumanpp/default.nix
+++ b/nixpkgs/pkgs/tools/text/jumanpp/default.nix
diff --git a/pkgs/tools/text/kakasi/default.nix b/nixpkgs/pkgs/tools/text/kakasi/default.nix
index 62645573259..62645573259 100644
--- a/pkgs/tools/text/kakasi/default.nix
+++ b/nixpkgs/pkgs/tools/text/kakasi/default.nix
diff --git a/pkgs/tools/text/kdiff3/default.nix b/nixpkgs/pkgs/tools/text/kdiff3/default.nix
index d55ed89e633..d55ed89e633 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/nixpkgs/pkgs/tools/text/kdiff3/default.nix
diff --git a/pkgs/tools/text/kramdown-rfc2629/Gemfile b/nixpkgs/pkgs/tools/text/kramdown-rfc2629/Gemfile
index 9b3347860b6..9b3347860b6 100644
--- a/pkgs/tools/text/kramdown-rfc2629/Gemfile
+++ b/nixpkgs/pkgs/tools/text/kramdown-rfc2629/Gemfile
diff --git a/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock b/nixpkgs/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock
index f4f16580c0c..f4f16580c0c 100644
--- a/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock
diff --git a/pkgs/tools/text/kramdown-rfc2629/default.nix b/nixpkgs/pkgs/tools/text/kramdown-rfc2629/default.nix
index 945c676ca18..945c676ca18 100644
--- a/pkgs/tools/text/kramdown-rfc2629/default.nix
+++ b/nixpkgs/pkgs/tools/text/kramdown-rfc2629/default.nix
diff --git a/pkgs/tools/text/kramdown-rfc2629/gemset.nix b/nixpkgs/pkgs/tools/text/kramdown-rfc2629/gemset.nix
index 65d1c234de2..65d1c234de2 100644
--- a/pkgs/tools/text/kramdown-rfc2629/gemset.nix
+++ b/nixpkgs/pkgs/tools/text/kramdown-rfc2629/gemset.nix
diff --git a/pkgs/tools/text/kytea/default.nix b/nixpkgs/pkgs/tools/text/kytea/default.nix
index 621408866e8..621408866e8 100644
--- a/pkgs/tools/text/kytea/default.nix
+++ b/nixpkgs/pkgs/tools/text/kytea/default.nix
diff --git a/pkgs/tools/text/kytea/gcc-O3.patch b/nixpkgs/pkgs/tools/text/kytea/gcc-O3.patch
index 71b1d0c3b16..71b1d0c3b16 100644
--- a/pkgs/tools/text/kytea/gcc-O3.patch
+++ b/nixpkgs/pkgs/tools/text/kytea/gcc-O3.patch
diff --git a/pkgs/tools/text/languagetool/default.nix b/nixpkgs/pkgs/tools/text/languagetool/default.nix
index 8d9e44f1b86..8d9e44f1b86 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/nixpkgs/pkgs/tools/text/languagetool/default.nix
diff --git a/pkgs/tools/text/link-grammar/default.nix b/nixpkgs/pkgs/tools/text/link-grammar/default.nix
index ce9b0bfa883..ce9b0bfa883 100644
--- a/pkgs/tools/text/link-grammar/default.nix
+++ b/nixpkgs/pkgs/tools/text/link-grammar/default.nix
diff --git a/pkgs/tools/text/lv/default.nix b/nixpkgs/pkgs/tools/text/lv/default.nix
index 3e96858f9c9..3e96858f9c9 100644
--- a/pkgs/tools/text/lv/default.nix
+++ b/nixpkgs/pkgs/tools/text/lv/default.nix
diff --git a/pkgs/tools/text/mairix/default.nix b/nixpkgs/pkgs/tools/text/mairix/default.nix
index e72824db627..e72824db627 100644
--- a/pkgs/tools/text/mairix/default.nix
+++ b/nixpkgs/pkgs/tools/text/mairix/default.nix
diff --git a/pkgs/tools/text/mairix/mmap.patch b/nixpkgs/pkgs/tools/text/mairix/mmap.patch
index 241083f2dde..241083f2dde 100644
--- a/pkgs/tools/text/mairix/mmap.patch
+++ b/nixpkgs/pkgs/tools/text/mairix/mmap.patch
diff --git a/pkgs/tools/text/markdown-pp/default.nix b/nixpkgs/pkgs/tools/text/markdown-pp/default.nix
index f479c221b65..f479c221b65 100644
--- a/pkgs/tools/text/markdown-pp/default.nix
+++ b/nixpkgs/pkgs/tools/text/markdown-pp/default.nix
diff --git a/pkgs/tools/text/mawk/default.nix b/nixpkgs/pkgs/tools/text/mawk/default.nix
index 81d11e2aae7..81d11e2aae7 100644
--- a/pkgs/tools/text/mawk/default.nix
+++ b/nixpkgs/pkgs/tools/text/mawk/default.nix
diff --git a/pkgs/tools/text/mb2md/default.nix b/nixpkgs/pkgs/tools/text/mb2md/default.nix
index 91c958cf067..91c958cf067 100644
--- a/pkgs/tools/text/mb2md/default.nix
+++ b/nixpkgs/pkgs/tools/text/mb2md/default.nix
diff --git a/pkgs/tools/text/mdbook/default.nix b/nixpkgs/pkgs/tools/text/mdbook/default.nix
index b21523ce863..b21523ce863 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/nixpkgs/pkgs/tools/text/mdbook/default.nix
diff --git a/pkgs/tools/text/mdcat/default.nix b/nixpkgs/pkgs/tools/text/mdcat/default.nix
index 6b19251acf8..6b19251acf8 100644
--- a/pkgs/tools/text/mdcat/default.nix
+++ b/nixpkgs/pkgs/tools/text/mdcat/default.nix
diff --git a/pkgs/tools/text/mecab/base.nix b/nixpkgs/pkgs/tools/text/mecab/base.nix
index e97980ef3d2..e97980ef3d2 100644
--- a/pkgs/tools/text/mecab/base.nix
+++ b/nixpkgs/pkgs/tools/text/mecab/base.nix
diff --git a/pkgs/tools/text/mecab/default.nix b/nixpkgs/pkgs/tools/text/mecab/default.nix
index 0b7e7e86df1..0b7e7e86df1 100644
--- a/pkgs/tools/text/mecab/default.nix
+++ b/nixpkgs/pkgs/tools/text/mecab/default.nix
diff --git a/pkgs/tools/text/mecab/ipadic.nix b/nixpkgs/pkgs/tools/text/mecab/ipadic.nix
index 3b011787c7c..3b011787c7c 100644
--- a/pkgs/tools/text/mecab/ipadic.nix
+++ b/nixpkgs/pkgs/tools/text/mecab/ipadic.nix
diff --git a/pkgs/tools/text/mecab/nodic.nix b/nixpkgs/pkgs/tools/text/mecab/nodic.nix
index 1cbc31be4ee..1cbc31be4ee 100644
--- a/pkgs/tools/text/mecab/nodic.nix
+++ b/nixpkgs/pkgs/tools/text/mecab/nodic.nix
diff --git a/pkgs/tools/text/miller/default.nix b/nixpkgs/pkgs/tools/text/miller/default.nix
index 1fc462bad8b..1fc462bad8b 100644
--- a/pkgs/tools/text/miller/default.nix
+++ b/nixpkgs/pkgs/tools/text/miller/default.nix
diff --git a/pkgs/tools/text/mir-qualia/default.nix b/nixpkgs/pkgs/tools/text/mir-qualia/default.nix
index 0a9b3777783..0a9b3777783 100644
--- a/pkgs/tools/text/mir-qualia/default.nix
+++ b/nixpkgs/pkgs/tools/text/mir-qualia/default.nix
diff --git a/pkgs/tools/text/mpage/default.nix b/nixpkgs/pkgs/tools/text/mpage/default.nix
index 6665b377ccf..6665b377ccf 100644
--- a/pkgs/tools/text/mpage/default.nix
+++ b/nixpkgs/pkgs/tools/text/mpage/default.nix
diff --git a/pkgs/tools/text/multitran/data/default.nix b/nixpkgs/pkgs/tools/text/multitran/data/default.nix
index d4b4902303b..d4b4902303b 100644
--- a/pkgs/tools/text/multitran/data/default.nix
+++ b/nixpkgs/pkgs/tools/text/multitran/data/default.nix
diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix
index ae4ece899a4..ae4ece899a4 100644
--- a/pkgs/tools/text/multitran/libbtree/default.nix
+++ b/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix
diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix
index 4470511f616..4470511f616 100644
--- a/pkgs/tools/text/multitran/libfacet/default.nix
+++ b/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix
diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix
index baccdfdedba..baccdfdedba 100644
--- a/pkgs/tools/text/multitran/libmtquery/default.nix
+++ b/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix
diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix
index 9b214e6b502..9b214e6b502 100644
--- a/pkgs/tools/text/multitran/libmtsupport/default.nix
+++ b/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix
diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix
index ca65c567c66..ca65c567c66 100644
--- a/pkgs/tools/text/multitran/mtutils/default.nix
+++ b/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix
diff --git a/pkgs/tools/text/namazu/default.nix b/nixpkgs/pkgs/tools/text/namazu/default.nix
index 59cfc86efbf..59cfc86efbf 100644
--- a/pkgs/tools/text/namazu/default.nix
+++ b/nixpkgs/pkgs/tools/text/namazu/default.nix
diff --git a/pkgs/tools/text/nawk/default.nix b/nixpkgs/pkgs/tools/text/nawk/default.nix
index a746c454435..a746c454435 100644
--- a/pkgs/tools/text/nawk/default.nix
+++ b/nixpkgs/pkgs/tools/text/nawk/default.nix
diff --git a/pkgs/tools/text/nkf/default.nix b/nixpkgs/pkgs/tools/text/nkf/default.nix
index 8a314d44843..8a314d44843 100644
--- a/pkgs/tools/text/nkf/default.nix
+++ b/nixpkgs/pkgs/tools/text/nkf/default.nix
diff --git a/pkgs/tools/text/numdiff/default.nix b/nixpkgs/pkgs/tools/text/numdiff/default.nix
index f7543dc0f70..f7543dc0f70 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/nixpkgs/pkgs/tools/text/numdiff/default.nix
diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix
index cdc6878bb5a..cdc6878bb5a 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix
diff --git a/pkgs/tools/text/ocrmypdf/liblept.patch b/nixpkgs/pkgs/tools/text/ocrmypdf/liblept.patch
index ed413a8b37b..ed413a8b37b 100644
--- a/pkgs/tools/text/ocrmypdf/liblept.patch
+++ b/nixpkgs/pkgs/tools/text/ocrmypdf/liblept.patch
diff --git a/pkgs/tools/text/odt2txt/default.nix b/nixpkgs/pkgs/tools/text/odt2txt/default.nix
index 69277d0412d..69277d0412d 100644
--- a/pkgs/tools/text/odt2txt/default.nix
+++ b/nixpkgs/pkgs/tools/text/odt2txt/default.nix
diff --git a/pkgs/tools/text/opencc/default.nix b/nixpkgs/pkgs/tools/text/opencc/default.nix
index 01b16908fb7..01b16908fb7 100644
--- a/pkgs/tools/text/opencc/default.nix
+++ b/nixpkgs/pkgs/tools/text/opencc/default.nix
diff --git a/pkgs/tools/text/papertrail/Gemfile b/nixpkgs/pkgs/tools/text/papertrail/Gemfile
index 199cd1422aa..199cd1422aa 100755
--- a/pkgs/tools/text/papertrail/Gemfile
+++ b/nixpkgs/pkgs/tools/text/papertrail/Gemfile
diff --git a/pkgs/tools/text/papertrail/Gemfile.lock b/nixpkgs/pkgs/tools/text/papertrail/Gemfile.lock
index 0d1b2a6fbe6..0d1b2a6fbe6 100644
--- a/pkgs/tools/text/papertrail/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/text/papertrail/Gemfile.lock
diff --git a/pkgs/tools/text/papertrail/default.nix b/nixpkgs/pkgs/tools/text/papertrail/default.nix
index d20727f725a..d20727f725a 100644
--- a/pkgs/tools/text/papertrail/default.nix
+++ b/nixpkgs/pkgs/tools/text/papertrail/default.nix
diff --git a/pkgs/tools/text/papertrail/gemset.nix b/nixpkgs/pkgs/tools/text/papertrail/gemset.nix
index 91bfe319896..91bfe319896 100644
--- a/pkgs/tools/text/papertrail/gemset.nix
+++ b/nixpkgs/pkgs/tools/text/papertrail/gemset.nix
diff --git a/pkgs/tools/text/par/default.nix b/nixpkgs/pkgs/tools/text/par/default.nix
index 88325c38731..88325c38731 100644
--- a/pkgs/tools/text/par/default.nix
+++ b/nixpkgs/pkgs/tools/text/par/default.nix
diff --git a/pkgs/tools/text/patchutils/0.3.3.nix b/nixpkgs/pkgs/tools/text/patchutils/0.3.3.nix
index f50354199c3..f50354199c3 100644
--- a/pkgs/tools/text/patchutils/0.3.3.nix
+++ b/nixpkgs/pkgs/tools/text/patchutils/0.3.3.nix
diff --git a/pkgs/tools/text/patchutils/default.nix b/nixpkgs/pkgs/tools/text/patchutils/default.nix
index 902773f40fa..902773f40fa 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/nixpkgs/pkgs/tools/text/patchutils/default.nix
diff --git a/pkgs/tools/text/patchutils/drop-comments.patch b/nixpkgs/pkgs/tools/text/patchutils/drop-comments.patch
index e02693a5683..e02693a5683 100644
--- a/pkgs/tools/text/patchutils/drop-comments.patch
+++ b/nixpkgs/pkgs/tools/text/patchutils/drop-comments.patch
diff --git a/pkgs/tools/text/patchutils/generic.nix b/nixpkgs/pkgs/tools/text/patchutils/generic.nix
index 9d7ac4b53f0..9d7ac4b53f0 100644
--- a/pkgs/tools/text/patchutils/generic.nix
+++ b/nixpkgs/pkgs/tools/text/patchutils/generic.nix
diff --git a/pkgs/tools/text/peco/default.nix b/nixpkgs/pkgs/tools/text/peco/default.nix
index 9407e68ed16..9407e68ed16 100644
--- a/pkgs/tools/text/peco/default.nix
+++ b/nixpkgs/pkgs/tools/text/peco/default.nix
diff --git a/pkgs/tools/text/peco/deps.nix b/nixpkgs/pkgs/tools/text/peco/deps.nix
index 29bae2de5b5..29bae2de5b5 100644
--- a/pkgs/tools/text/peco/deps.nix
+++ b/nixpkgs/pkgs/tools/text/peco/deps.nix
diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix
index 342377b85ae..342377b85ae 100644
--- a/pkgs/tools/text/platinum-searcher/default.nix
+++ b/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix
diff --git a/pkgs/tools/text/platinum-searcher/deps.nix b/nixpkgs/pkgs/tools/text/platinum-searcher/deps.nix
index 04fb9bd4be3..04fb9bd4be3 100644
--- a/pkgs/tools/text/platinum-searcher/deps.nix
+++ b/nixpkgs/pkgs/tools/text/platinum-searcher/deps.nix
diff --git a/pkgs/tools/text/podiff/default.nix b/nixpkgs/pkgs/tools/text/podiff/default.nix
index a71ef2f06bd..a71ef2f06bd 100644
--- a/pkgs/tools/text/podiff/default.nix
+++ b/nixpkgs/pkgs/tools/text/podiff/default.nix
diff --git a/pkgs/tools/text/poedit/default.nix b/nixpkgs/pkgs/tools/text/poedit/default.nix
index 4d29c380483..4d29c380483 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/nixpkgs/pkgs/tools/text/poedit/default.nix
diff --git a/pkgs/tools/text/popfile/default.nix b/nixpkgs/pkgs/tools/text/popfile/default.nix
index 5e76e354173..5e76e354173 100644
--- a/pkgs/tools/text/popfile/default.nix
+++ b/nixpkgs/pkgs/tools/text/popfile/default.nix
diff --git a/pkgs/tools/text/proselint/default.nix b/nixpkgs/pkgs/tools/text/proselint/default.nix
index 27e9c80bc7d..27e9c80bc7d 100644
--- a/pkgs/tools/text/proselint/default.nix
+++ b/nixpkgs/pkgs/tools/text/proselint/default.nix
diff --git a/pkgs/tools/text/qgrep/default.nix b/nixpkgs/pkgs/tools/text/qgrep/default.nix
index c45398e31a1..c45398e31a1 100644
--- a/pkgs/tools/text/qgrep/default.nix
+++ b/nixpkgs/pkgs/tools/text/qgrep/default.nix
diff --git a/pkgs/tools/text/qprint/default.nix b/nixpkgs/pkgs/tools/text/qprint/default.nix
index 8f998e3a26d..8f998e3a26d 100644
--- a/pkgs/tools/text/qprint/default.nix
+++ b/nixpkgs/pkgs/tools/text/qprint/default.nix
diff --git a/pkgs/tools/text/qshowdiff/default.nix b/nixpkgs/pkgs/tools/text/qshowdiff/default.nix
index 9cf9349badb..9cf9349badb 100644
--- a/pkgs/tools/text/qshowdiff/default.nix
+++ b/nixpkgs/pkgs/tools/text/qshowdiff/default.nix
diff --git a/pkgs/tools/text/reckon/Gemfile b/nixpkgs/pkgs/tools/text/reckon/Gemfile
index f708ddd9366..f708ddd9366 100644
--- a/pkgs/tools/text/reckon/Gemfile
+++ b/nixpkgs/pkgs/tools/text/reckon/Gemfile
diff --git a/pkgs/tools/text/reckon/Gemfile.lock b/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock
index 0ede7e2a256..0ede7e2a256 100644
--- a/pkgs/tools/text/reckon/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock
diff --git a/pkgs/tools/text/reckon/default.nix b/nixpkgs/pkgs/tools/text/reckon/default.nix
index 261149229b6..261149229b6 100644
--- a/pkgs/tools/text/reckon/default.nix
+++ b/nixpkgs/pkgs/tools/text/reckon/default.nix
diff --git a/pkgs/tools/text/reckon/gemset.nix b/nixpkgs/pkgs/tools/text/reckon/gemset.nix
index e1e4a43188d..e1e4a43188d 100644
--- a/pkgs/tools/text/reckon/gemset.nix
+++ b/nixpkgs/pkgs/tools/text/reckon/gemset.nix
diff --git a/pkgs/tools/text/recode/default.nix b/nixpkgs/pkgs/tools/text/recode/default.nix
index e1c3d87bdcb..e1c3d87bdcb 100644
--- a/pkgs/tools/text/recode/default.nix
+++ b/nixpkgs/pkgs/tools/text/recode/default.nix
diff --git a/pkgs/tools/text/replace/default.nix b/nixpkgs/pkgs/tools/text/replace/default.nix
index 3549e7c1c94..3549e7c1c94 100644
--- a/pkgs/tools/text/replace/default.nix
+++ b/nixpkgs/pkgs/tools/text/replace/default.nix
diff --git a/pkgs/tools/text/replace/malloc.patch b/nixpkgs/pkgs/tools/text/replace/malloc.patch
index 1ee95c4bae1..1ee95c4bae1 100644
--- a/pkgs/tools/text/replace/malloc.patch
+++ b/nixpkgs/pkgs/tools/text/replace/malloc.patch
diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix
index df54724d384..df54724d384 100644
--- a/pkgs/tools/text/ripgrep-all/default.nix
+++ b/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix
diff --git a/pkgs/tools/text/ripgrep/default.nix b/nixpkgs/pkgs/tools/text/ripgrep/default.nix
index 963ef99c68a..963ef99c68a 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/nixpkgs/pkgs/tools/text/ripgrep/default.nix
diff --git a/pkgs/tools/text/rpl/default.nix b/nixpkgs/pkgs/tools/text/rpl/default.nix
index 7ac3790f8a9..7ac3790f8a9 100644
--- a/pkgs/tools/text/rpl/default.nix
+++ b/nixpkgs/pkgs/tools/text/rpl/default.nix
diff --git a/pkgs/tools/text/rst2html5/default.nix b/nixpkgs/pkgs/tools/text/rst2html5/default.nix
index 83ac2d4d766..83ac2d4d766 100644
--- a/pkgs/tools/text/rst2html5/default.nix
+++ b/nixpkgs/pkgs/tools/text/rst2html5/default.nix
diff --git a/pkgs/tools/text/ruby-zoom/Gemfile b/nixpkgs/pkgs/tools/text/ruby-zoom/Gemfile
index 4bb5d8c175d..4bb5d8c175d 100644
--- a/pkgs/tools/text/ruby-zoom/Gemfile
+++ b/nixpkgs/pkgs/tools/text/ruby-zoom/Gemfile
diff --git a/pkgs/tools/text/ruby-zoom/Gemfile.lock b/nixpkgs/pkgs/tools/text/ruby-zoom/Gemfile.lock
index 820a972d106..820a972d106 100644
--- a/pkgs/tools/text/ruby-zoom/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/text/ruby-zoom/Gemfile.lock
diff --git a/pkgs/tools/text/ruby-zoom/default.nix b/nixpkgs/pkgs/tools/text/ruby-zoom/default.nix
index c3953840836..c3953840836 100644
--- a/pkgs/tools/text/ruby-zoom/default.nix
+++ b/nixpkgs/pkgs/tools/text/ruby-zoom/default.nix
diff --git a/pkgs/tools/text/ruby-zoom/gemset.nix b/nixpkgs/pkgs/tools/text/ruby-zoom/gemset.nix
index f4c637aadf8..f4c637aadf8 100644
--- a/pkgs/tools/text/ruby-zoom/gemset.nix
+++ b/nixpkgs/pkgs/tools/text/ruby-zoom/gemset.nix
diff --git a/pkgs/tools/text/ruplacer/default.nix b/nixpkgs/pkgs/tools/text/ruplacer/default.nix
index 7fdde0b3a69..7fdde0b3a69 100644
--- a/pkgs/tools/text/ruplacer/default.nix
+++ b/nixpkgs/pkgs/tools/text/ruplacer/default.nix
diff --git a/pkgs/tools/text/schema2ldif/default.nix b/nixpkgs/pkgs/tools/text/schema2ldif/default.nix
index 5df4e90ff1a..5df4e90ff1a 100644
--- a/pkgs/tools/text/schema2ldif/default.nix
+++ b/nixpkgs/pkgs/tools/text/schema2ldif/default.nix
diff --git a/pkgs/tools/text/sd/default.nix b/nixpkgs/pkgs/tools/text/sd/default.nix
index 3b4a6edba0f..3b4a6edba0f 100644
--- a/pkgs/tools/text/sd/default.nix
+++ b/nixpkgs/pkgs/tools/text/sd/default.nix
diff --git a/pkgs/tools/text/sgml/jade/default.nix b/nixpkgs/pkgs/tools/text/sgml/jade/default.nix
index 2cc40510121..2cc40510121 100644
--- a/pkgs/tools/text/sgml/jade/default.nix
+++ b/nixpkgs/pkgs/tools/text/sgml/jade/default.nix
diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix
index cf3b2bad6c9..cf3b2bad6c9 100644
--- a/pkgs/tools/text/sgml/openjade/default.nix
+++ b/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix
diff --git a/pkgs/tools/text/sgml/openjade/msggen.patch b/nixpkgs/pkgs/tools/text/sgml/openjade/msggen.patch
index d59573fa49c..d59573fa49c 100644
--- a/pkgs/tools/text/sgml/openjade/msggen.patch
+++ b/nixpkgs/pkgs/tools/text/sgml/openjade/msggen.patch
diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix
index ade640dac7a..ade640dac7a 100644
--- a/pkgs/tools/text/sgml/opensp/default.nix
+++ b/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix
diff --git a/pkgs/tools/text/sgml/opensp/setup-hook.sh b/nixpkgs/pkgs/tools/text/sgml/opensp/setup-hook.sh
index 5bace3c6688..5bace3c6688 100644
--- a/pkgs/tools/text/sgml/opensp/setup-hook.sh
+++ b/nixpkgs/pkgs/tools/text/sgml/opensp/setup-hook.sh
diff --git a/pkgs/tools/text/shab/default.nix b/nixpkgs/pkgs/tools/text/shab/default.nix
index 02d2d545122..02d2d545122 100644
--- a/pkgs/tools/text/shab/default.nix
+++ b/nixpkgs/pkgs/tools/text/shab/default.nix
diff --git a/pkgs/tools/text/shfmt/default.nix b/nixpkgs/pkgs/tools/text/shfmt/default.nix
index 0bcd663ae5a..0bcd663ae5a 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/nixpkgs/pkgs/tools/text/shfmt/default.nix
diff --git a/pkgs/tools/text/shocco/default.nix b/nixpkgs/pkgs/tools/text/shocco/default.nix
index f657df5b780..f657df5b780 100644
--- a/pkgs/tools/text/shocco/default.nix
+++ b/nixpkgs/pkgs/tools/text/shocco/default.nix
diff --git a/pkgs/tools/text/sift/default.nix b/nixpkgs/pkgs/tools/text/sift/default.nix
index c2a4cf22ea6..c2a4cf22ea6 100644
--- a/pkgs/tools/text/sift/default.nix
+++ b/nixpkgs/pkgs/tools/text/sift/default.nix
diff --git a/pkgs/tools/text/sift/deps.nix b/nixpkgs/pkgs/tools/text/sift/deps.nix
index 038555fa3ca..038555fa3ca 100644
--- a/pkgs/tools/text/sift/deps.nix
+++ b/nixpkgs/pkgs/tools/text/sift/deps.nix
diff --git a/pkgs/tools/text/silver-searcher/bash-completion.patch b/nixpkgs/pkgs/tools/text/silver-searcher/bash-completion.patch
index 30e8c72389b..30e8c72389b 100644
--- a/pkgs/tools/text/silver-searcher/bash-completion.patch
+++ b/nixpkgs/pkgs/tools/text/silver-searcher/bash-completion.patch
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/nixpkgs/pkgs/tools/text/silver-searcher/default.nix
index 2c28f9ea5a5..2c28f9ea5a5 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/nixpkgs/pkgs/tools/text/silver-searcher/default.nix
diff --git a/pkgs/tools/text/smu/default.nix b/nixpkgs/pkgs/tools/text/smu/default.nix
index 50bceb4fcb3..50bceb4fcb3 100644
--- a/pkgs/tools/text/smu/default.nix
+++ b/nixpkgs/pkgs/tools/text/smu/default.nix
diff --git a/pkgs/tools/text/snippetpixie/default.nix b/nixpkgs/pkgs/tools/text/snippetpixie/default.nix
index 585c183a81c..585c183a81c 100644
--- a/pkgs/tools/text/snippetpixie/default.nix
+++ b/nixpkgs/pkgs/tools/text/snippetpixie/default.nix
diff --git a/pkgs/tools/text/source-highlight/default.nix b/nixpkgs/pkgs/tools/text/source-highlight/default.nix
index 8e937fe8518..8e937fe8518 100644
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/nixpkgs/pkgs/tools/text/source-highlight/default.nix
diff --git a/pkgs/tools/text/staccato/default.nix b/nixpkgs/pkgs/tools/text/staccato/default.nix
index a68d2266b43..a68d2266b43 100644
--- a/pkgs/tools/text/staccato/default.nix
+++ b/nixpkgs/pkgs/tools/text/staccato/default.nix
diff --git a/pkgs/tools/text/tab/default.nix b/nixpkgs/pkgs/tools/text/tab/default.nix
index b7855bc7532..b7855bc7532 100644
--- a/pkgs/tools/text/tab/default.nix
+++ b/nixpkgs/pkgs/tools/text/tab/default.nix
diff --git a/pkgs/tools/text/transifex-client/default.nix b/nixpkgs/pkgs/tools/text/transifex-client/default.nix
index 403adaf71b6..403adaf71b6 100644
--- a/pkgs/tools/text/transifex-client/default.nix
+++ b/nixpkgs/pkgs/tools/text/transifex-client/default.nix
diff --git a/pkgs/tools/text/txt2tags/default.nix b/nixpkgs/pkgs/tools/text/txt2tags/default.nix
index 100124043ed..100124043ed 100644
--- a/pkgs/tools/text/txt2tags/default.nix
+++ b/nixpkgs/pkgs/tools/text/txt2tags/default.nix
diff --git a/pkgs/tools/text/uni2ascii/default.nix b/nixpkgs/pkgs/tools/text/uni2ascii/default.nix
index ccf17695f6c..ccf17695f6c 100644
--- a/pkgs/tools/text/uni2ascii/default.nix
+++ b/nixpkgs/pkgs/tools/text/uni2ascii/default.nix
diff --git a/pkgs/tools/text/unoconv/default.nix b/nixpkgs/pkgs/tools/text/unoconv/default.nix
index aed7554e170..aed7554e170 100644
--- a/pkgs/tools/text/unoconv/default.nix
+++ b/nixpkgs/pkgs/tools/text/unoconv/default.nix
diff --git a/pkgs/tools/text/unrtf/default.nix b/nixpkgs/pkgs/tools/text/unrtf/default.nix
index 93611ec5531..93611ec5531 100644
--- a/pkgs/tools/text/unrtf/default.nix
+++ b/nixpkgs/pkgs/tools/text/unrtf/default.nix
diff --git a/pkgs/tools/text/untex/default.nix b/nixpkgs/pkgs/tools/text/untex/default.nix
index f9c7e3cdfc6..f9c7e3cdfc6 100644
--- a/pkgs/tools/text/untex/default.nix
+++ b/nixpkgs/pkgs/tools/text/untex/default.nix
diff --git a/pkgs/tools/text/vale/default.nix b/nixpkgs/pkgs/tools/text/vale/default.nix
index 308f893e73b..308f893e73b 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/nixpkgs/pkgs/tools/text/vale/default.nix
diff --git a/pkgs/tools/text/wdiff/default.nix b/nixpkgs/pkgs/tools/text/wdiff/default.nix
index 001ed1addaa..001ed1addaa 100644
--- a/pkgs/tools/text/wdiff/default.nix
+++ b/nixpkgs/pkgs/tools/text/wdiff/default.nix
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/nixpkgs/pkgs/tools/text/wgetpaste/default.nix
index 3360fd4cbe0..3360fd4cbe0 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/nixpkgs/pkgs/tools/text/wgetpaste/default.nix
diff --git a/pkgs/tools/text/xidel/default.nix b/nixpkgs/pkgs/tools/text/xidel/default.nix
index 92ad2e00588..92ad2e00588 100644
--- a/pkgs/tools/text/xidel/default.nix
+++ b/nixpkgs/pkgs/tools/text/xidel/default.nix
diff --git a/pkgs/tools/text/xml/basex/basex.svg b/nixpkgs/pkgs/tools/text/xml/basex/basex.svg
index 9d476cec2ca..9d476cec2ca 100644
--- a/pkgs/tools/text/xml/basex/basex.svg
+++ b/nixpkgs/pkgs/tools/text/xml/basex/basex.svg
diff --git a/pkgs/tools/text/xml/basex/default.nix b/nixpkgs/pkgs/tools/text/xml/basex/default.nix
index 704ccede799..704ccede799 100644
--- a/pkgs/tools/text/xml/basex/default.nix
+++ b/nixpkgs/pkgs/tools/text/xml/basex/default.nix
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix
index 7ac624caff1..7ac624caff1 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix
diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix
index b38c2b3e34d..b38c2b3e34d 100644
--- a/pkgs/tools/text/xml/jing-trang/default.nix
+++ b/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix
diff --git a/pkgs/tools/text/xml/rnv/default.nix b/nixpkgs/pkgs/tools/text/xml/rnv/default.nix
index 21869cef4ee..21869cef4ee 100644
--- a/pkgs/tools/text/xml/rnv/default.nix
+++ b/nixpkgs/pkgs/tools/text/xml/rnv/default.nix
diff --git a/pkgs/tools/text/xml/rxp/default.nix b/nixpkgs/pkgs/tools/text/xml/rxp/default.nix
index 093f1b0aec7..093f1b0aec7 100644
--- a/pkgs/tools/text/xml/rxp/default.nix
+++ b/nixpkgs/pkgs/tools/text/xml/rxp/default.nix
diff --git a/pkgs/tools/text/xml/xml2/default.nix b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix
index 3be952358b6..3be952358b6 100644
--- a/pkgs/tools/text/xml/xml2/default.nix
+++ b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix
diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/nixpkgs/pkgs/tools/text/xml/xmlformat/default.nix
index 8dfec26e811..8dfec26e811 100644
--- a/pkgs/tools/text/xml/xmlformat/default.nix
+++ b/nixpkgs/pkgs/tools/text/xml/xmlformat/default.nix
diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/nixpkgs/pkgs/tools/text/xml/xmloscopy/default.nix
index 5d085e41196..5d085e41196 100644
--- a/pkgs/tools/text/xml/xmloscopy/default.nix
+++ b/nixpkgs/pkgs/tools/text/xml/xmloscopy/default.nix
diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix
index 4fe6ad6b3dc..4fe6ad6b3dc 100644
--- a/pkgs/tools/text/xml/xmlstarlet/default.nix
+++ b/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix
diff --git a/pkgs/tools/text/xml/xpf/default.nix b/nixpkgs/pkgs/tools/text/xml/xpf/default.nix
index b35053d362b..b35053d362b 100644
--- a/pkgs/tools/text/xml/xpf/default.nix
+++ b/nixpkgs/pkgs/tools/text/xml/xpf/default.nix
diff --git a/pkgs/tools/text/xsv/default.nix b/nixpkgs/pkgs/tools/text/xsv/default.nix
index cf44782432c..cf44782432c 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/nixpkgs/pkgs/tools/text/xsv/default.nix
diff --git a/pkgs/tools/text/xurls/default.nix b/nixpkgs/pkgs/tools/text/xurls/default.nix
index c8d10a6e269..c8d10a6e269 100644
--- a/pkgs/tools/text/xurls/default.nix
+++ b/nixpkgs/pkgs/tools/text/xurls/default.nix
diff --git a/pkgs/tools/text/yaml-merge/default.nix b/nixpkgs/pkgs/tools/text/yaml-merge/default.nix
index 95a94cee7c4..95a94cee7c4 100644
--- a/pkgs/tools/text/yaml-merge/default.nix
+++ b/nixpkgs/pkgs/tools/text/yaml-merge/default.nix
diff --git a/pkgs/tools/text/zimreader/default.nix b/nixpkgs/pkgs/tools/text/zimreader/default.nix
index 177f9326dd2..177f9326dd2 100644
--- a/pkgs/tools/text/zimreader/default.nix
+++ b/nixpkgs/pkgs/tools/text/zimreader/default.nix
diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix
index 27334bf09b4..27334bf09b4 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix
diff --git a/pkgs/tools/toml2nix/default.nix b/nixpkgs/pkgs/tools/toml2nix/default.nix
index ac4de4eee14..ac4de4eee14 100644
--- a/pkgs/tools/toml2nix/default.nix
+++ b/nixpkgs/pkgs/tools/toml2nix/default.nix
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix
index 44c5f6d1f24..44c5f6d1f24 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile
index f9329a80a81..f9329a80a81 100644
--- a/pkgs/tools/typesetting/asciidoctor/Gemfile
+++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
index 02081e117d6..02081e117d6 100644
--- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix
index 20bbe782d91..20bbe782d91 100644
--- a/pkgs/tools/typesetting/asciidoctor/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix
index 02700962eb2..02700962eb2 100644
--- a/pkgs/tools/typesetting/asciidoctor/gemset.nix
+++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix
diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix
index 39e7eab34ab..39e7eab34ab 100644
--- a/pkgs/tools/typesetting/asciidoctorj/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix
diff --git a/pkgs/tools/typesetting/biber/default.nix b/nixpkgs/pkgs/tools/typesetting/biber/default.nix
index e42681dbd83..e42681dbd83 100644
--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/biber/default.nix
diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/nixpkgs/pkgs/tools/typesetting/djvu2pdf/default.nix
index cb667e6b121..cb667e6b121 100644
--- a/pkgs/tools/typesetting/djvu2pdf/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/djvu2pdf/default.nix
diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix
index 7200909660b..7200909660b 100644
--- a/pkgs/tools/typesetting/docbook2odf/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix
diff --git a/pkgs/tools/typesetting/docbook2x/db2x_texixml-to-stdout.patch b/nixpkgs/pkgs/tools/typesetting/docbook2x/db2x_texixml-to-stdout.patch
index 8daa5c87a66..8daa5c87a66 100644
--- a/pkgs/tools/typesetting/docbook2x/db2x_texixml-to-stdout.patch
+++ b/nixpkgs/pkgs/tools/typesetting/docbook2x/db2x_texixml-to-stdout.patch
diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix
index 5309e4555b4..5309e4555b4 100644
--- a/pkgs/tools/typesetting/docbook2x/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix
diff --git a/pkgs/tools/typesetting/fop/default.nix b/nixpkgs/pkgs/tools/typesetting/fop/default.nix
index 0b5c79756bd..0b5c79756bd 100644
--- a/pkgs/tools/typesetting/fop/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/fop/default.nix
diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/nixpkgs/pkgs/tools/typesetting/git-latexdiff/default.nix
index c214bd3cac7..c214bd3cac7 100644
--- a/pkgs/tools/typesetting/git-latexdiff/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/git-latexdiff/default.nix
diff --git a/pkgs/tools/typesetting/git-latexdiff/version-test.patch b/nixpkgs/pkgs/tools/typesetting/git-latexdiff/version-test.patch
index 243bd90f900..243bd90f900 100644
--- a/pkgs/tools/typesetting/git-latexdiff/version-test.patch
+++ b/nixpkgs/pkgs/tools/typesetting/git-latexdiff/version-test.patch
diff --git a/pkgs/tools/typesetting/halibut/default.nix b/nixpkgs/pkgs/tools/typesetting/halibut/default.nix
index f0ed44351a2..f0ed44351a2 100644
--- a/pkgs/tools/typesetting/halibut/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/halibut/default.nix
diff --git a/pkgs/tools/typesetting/hevea/default.nix b/nixpkgs/pkgs/tools/typesetting/hevea/default.nix
index 2a126ac5c83..2a126ac5c83 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/hevea/default.nix
diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix
index 7fca57ab9d2..7fca57ab9d2 100644
--- a/pkgs/tools/typesetting/htmldoc/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix
diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix
index ff63ece3417..ff63ece3417 100644
--- a/pkgs/tools/typesetting/kindlegen/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix
diff --git a/pkgs/tools/typesetting/lout/builder.sh b/nixpkgs/pkgs/tools/typesetting/lout/builder.sh
index 61459e48b7f..61459e48b7f 100755
--- a/pkgs/tools/typesetting/lout/builder.sh
+++ b/nixpkgs/pkgs/tools/typesetting/lout/builder.sh
diff --git a/pkgs/tools/typesetting/lout/default.nix b/nixpkgs/pkgs/tools/typesetting/lout/default.nix
index 85c0bacf315..85c0bacf315 100644
--- a/pkgs/tools/typesetting/lout/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/lout/default.nix
diff --git a/pkgs/tools/typesetting/mmark/default.nix b/nixpkgs/pkgs/tools/typesetting/mmark/default.nix
index 064e75ecbdc..064e75ecbdc 100644
--- a/pkgs/tools/typesetting/mmark/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/mmark/default.nix
diff --git a/pkgs/tools/typesetting/mmark/deps.nix b/nixpkgs/pkgs/tools/typesetting/mmark/deps.nix
index 47f964c6a47..47f964c6a47 100644
--- a/pkgs/tools/typesetting/mmark/deps.nix
+++ b/nixpkgs/pkgs/tools/typesetting/mmark/deps.nix
diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix
index 4cdbac7d638..4cdbac7d638 100644
--- a/pkgs/tools/typesetting/multimarkdown/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix
diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix
index 9f62671a4fa..9f62671a4fa 100644
--- a/pkgs/tools/typesetting/odpdown/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix
diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix
index 1090ad300f7..1090ad300f7 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix
diff --git a/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch b/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch
index 8e1d9dfc191..8e1d9dfc191 100644
--- a/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch
+++ b/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch
diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix
index dee6ec3c6ff..dee6ec3c6ff 100644
--- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix
diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix
index c8e27fb5a6e..c8e27fb5a6e 100644
--- a/pkgs/tools/typesetting/pdf2odt/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix
diff --git a/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch b/nixpkgs/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch
index 1425aa5ae6a..1425aa5ae6a 100644
--- a/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch
+++ b/nixpkgs/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch
diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/nixpkgs/pkgs/tools/typesetting/pdfgrep/default.nix
index 20da90961dd..20da90961dd 100644
--- a/pkgs/tools/typesetting/pdfgrep/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/pdfgrep/default.nix
diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix
index f8b17be01dd..f8b17be01dd 100644
--- a/pkgs/tools/typesetting/pdfsandwich/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix
diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix
index 72f25ef099b..72f25ef099b 100644
--- a/pkgs/tools/typesetting/pdftk/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix
diff --git a/pkgs/tools/typesetting/psutils/default.nix b/nixpkgs/pkgs/tools/typesetting/psutils/default.nix
index 39beab751a7..39beab751a7 100644
--- a/pkgs/tools/typesetting/psutils/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/psutils/default.nix
diff --git a/pkgs/tools/typesetting/rubber/default.nix b/nixpkgs/pkgs/tools/typesetting/rubber/default.nix
index 21d83dd1dd0..21d83dd1dd0 100644
--- a/pkgs/tools/typesetting/rubber/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/rubber/default.nix
diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix
index 6a2ebb089d2..6a2ebb089d2 100644
--- a/pkgs/tools/typesetting/satysfi/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix
diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix
index 011a8f24ece..011a8f24ece 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix
diff --git a/pkgs/tools/typesetting/sile/default.nix b/nixpkgs/pkgs/tools/typesetting/sile/default.nix
index 3b6ec809869..3b6ec809869 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/sile/default.nix
diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix
index b06b2e25fcc..b06b2e25fcc 100644
--- a/pkgs/tools/typesetting/skribilo/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix
diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix
index be218cda535..be218cda535 100644
--- a/pkgs/tools/typesetting/sshlatex/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix
diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix
index c78e60996bb..c78e60996bb 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix
diff --git a/pkgs/tools/typesetting/ted/default.nix b/nixpkgs/pkgs/tools/typesetting/ted/default.nix
index a03432b729a..a03432b729a 100644
--- a/pkgs/tools/typesetting/ted/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/ted/default.nix
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix
index 787f19d91f4..787f19d91f4 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix
diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix
index cc9432f6f22..cc9432f6f22 100644
--- a/pkgs/tools/typesetting/tex/dblatex/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix
diff --git a/pkgs/tools/typesetting/tex/latexrun/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/latexrun/default.nix
index 6d64b536502..6d64b536502 100644
--- a/pkgs/tools/typesetting/tex/latexrun/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/latexrun/default.nix
diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix
index db0ec6d9bea..db0ec6d9bea 100644
--- a/pkgs/tools/typesetting/tex/lkproof/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix
diff --git a/pkgs/tools/typesetting/tex/nix/animatedot.sh b/nixpkgs/pkgs/tools/typesetting/tex/nix/animatedot.sh
index f038b83ff7a..f038b83ff7a 100644
--- a/pkgs/tools/typesetting/tex/nix/animatedot.sh
+++ b/nixpkgs/pkgs/tools/typesetting/tex/nix/animatedot.sh
diff --git a/pkgs/tools/typesetting/tex/nix/copy-includes.pl b/nixpkgs/pkgs/tools/typesetting/tex/nix/copy-includes.pl
index 2cec62fc7cb..2cec62fc7cb 100644
--- a/pkgs/tools/typesetting/tex/nix/copy-includes.pl
+++ b/nixpkgs/pkgs/tools/typesetting/tex/nix/copy-includes.pl
diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/nix/default.nix
index 4ee45bf4bc8..4ee45bf4bc8 100644
--- a/pkgs/tools/typesetting/tex/nix/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/nix/default.nix
diff --git a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh b/nixpkgs/pkgs/tools/typesetting/tex/nix/dot2pdf.sh
index 71cf601dfac..71cf601dfac 100644
--- a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh
+++ b/nixpkgs/pkgs/tools/typesetting/tex/nix/dot2pdf.sh
diff --git a/pkgs/tools/typesetting/tex/nix/dot2ps.sh b/nixpkgs/pkgs/tools/typesetting/tex/nix/dot2ps.sh
index dd8de4a23db..dd8de4a23db 100644
--- a/pkgs/tools/typesetting/tex/nix/dot2ps.sh
+++ b/nixpkgs/pkgs/tools/typesetting/tex/nix/dot2ps.sh
diff --git a/pkgs/tools/typesetting/tex/nix/find-includes.pl b/nixpkgs/pkgs/tools/typesetting/tex/nix/find-includes.pl
index 41675e939f6..41675e939f6 100644
--- a/pkgs/tools/typesetting/tex/nix/find-includes.pl
+++ b/nixpkgs/pkgs/tools/typesetting/tex/nix/find-includes.pl
diff --git a/pkgs/tools/typesetting/tex/nix/find-lhs2tex-includes.sh b/nixpkgs/pkgs/tools/typesetting/tex/nix/find-lhs2tex-includes.sh
index 2dc12aa517a..2dc12aa517a 100644
--- a/pkgs/tools/typesetting/tex/nix/find-lhs2tex-includes.sh
+++ b/nixpkgs/pkgs/tools/typesetting/tex/nix/find-lhs2tex-includes.sh
diff --git a/pkgs/tools/typesetting/tex/nix/lhs2tex.sh b/nixpkgs/pkgs/tools/typesetting/tex/nix/lhs2tex.sh
index bfef3df6b0e..bfef3df6b0e 100644
--- a/pkgs/tools/typesetting/tex/nix/lhs2tex.sh
+++ b/nixpkgs/pkgs/tools/typesetting/tex/nix/lhs2tex.sh
diff --git a/pkgs/tools/typesetting/tex/nix/run-latex.sh b/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh
index 7a5767f9c06..7a5767f9c06 100644
--- a/pkgs/tools/typesetting/tex/nix/run-latex.sh
+++ b/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh
diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/nixpkgs/pkgs/tools/typesetting/tex/pgf/1.x.nix
index 9215a1e0ac4..9215a1e0ac4 100644
--- a/pkgs/tools/typesetting/tex/pgf/1.x.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/pgf/1.x.nix
diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/nixpkgs/pkgs/tools/typesetting/tex/pgf/2.x.nix
index 56e50e44408..56e50e44408 100644
--- a/pkgs/tools/typesetting/tex/pgf/2.x.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/pgf/2.x.nix
diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/nixpkgs/pkgs/tools/typesetting/tex/pgf/3.x.nix
index 0835c7c547d..0835c7c547d 100644
--- a/pkgs/tools/typesetting/tex/pgf/3.x.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/pgf/3.x.nix
diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix
index fcdebedb7d8..fcdebedb7d8 100644
--- a/pkgs/tools/typesetting/tex/pgfplots/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix
diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/pplatex/default.nix
index 01777f3dd42..01777f3dd42 100644
--- a/pkgs/tools/typesetting/tex/pplatex/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/pplatex/default.nix
diff --git a/pkgs/tools/typesetting/tex/tetex/clang.patch b/nixpkgs/pkgs/tools/typesetting/tex/tetex/clang.patch
index 50d83f62443..50d83f62443 100644
--- a/pkgs/tools/typesetting/tex/tetex/clang.patch
+++ b/nixpkgs/pkgs/tools/typesetting/tex/tetex/clang.patch
diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix
index ac317fd51dc..ac317fd51dc 100644
--- a/pkgs/tools/typesetting/tex/tetex/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix
diff --git a/pkgs/tools/typesetting/tex/tetex/environment.patch b/nixpkgs/pkgs/tools/typesetting/tex/tetex/environment.patch
index 6e652849b77..6e652849b77 100644
--- a/pkgs/tools/typesetting/tex/tetex/environment.patch
+++ b/nixpkgs/pkgs/tools/typesetting/tex/tetex/environment.patch
diff --git a/pkgs/tools/typesetting/tex/tetex/extramembot.patch b/nixpkgs/pkgs/tools/typesetting/tex/tetex/extramembot.patch
index f6c954fcfa5..f6c954fcfa5 100644
--- a/pkgs/tools/typesetting/tex/tetex/extramembot.patch
+++ b/nixpkgs/pkgs/tools/typesetting/tex/tetex/extramembot.patch
diff --git a/pkgs/tools/typesetting/tex/tetex/getline.patch b/nixpkgs/pkgs/tools/typesetting/tex/tetex/getline.patch
index c82c1b3ac36..c82c1b3ac36 100644
--- a/pkgs/tools/typesetting/tex/tetex/getline.patch
+++ b/nixpkgs/pkgs/tools/typesetting/tex/tetex/getline.patch
diff --git a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh b/nixpkgs/pkgs/tools/typesetting/tex/tetex/setup-hook.sh
index 5faef7fe5df..5faef7fe5df 100644
--- a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh
+++ b/nixpkgs/pkgs/tools/typesetting/tex/tetex/setup-hook.sh
diff --git a/pkgs/tools/typesetting/tex/texlive/UPGRADING.md b/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md
index 3f37184e5d3..3f37184e5d3 100644
--- a/pkgs/tools/typesetting/tex/texlive/UPGRADING.md
+++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix
index 9eaa81e144b..9eaa81e144b 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix
diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix
index a4b0fb99f3e..a4b0fb99f3e 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix
index 44dc45fdfb2..44dc45fdfb2 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix
diff --git a/pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patch b/nixpkgs/pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patch
index 0e927e24fd0..0e927e24fd0 100644
--- a/pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patch
+++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patch
diff --git a/pkgs/tools/typesetting/tex/texlive/fixHashes.sh b/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixHashes.sh
index 439660682e2..439660682e2 100755
--- a/pkgs/tools/typesetting/tex/texlive/fixHashes.sh
+++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixHashes.sh
diff --git a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
index f6cd70c0aa3..f6cd70c0aa3 100644
--- a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/pkgs.nix
index 31680913a9d..31680913a9d 100644
--- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/pkgs.nix
diff --git a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh b/nixpkgs/pkgs/tools/typesetting/tex/texlive/setup-hook.sh
index 5faef7fe5df..5faef7fe5df 100644
--- a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh
+++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/setup-hook.sh
diff --git a/pkgs/tools/typesetting/tex/texlive/texlinks.diff b/nixpkgs/pkgs/tools/typesetting/tex/texlive/texlinks.diff
index 97770cc812f..97770cc812f 100644
--- a/pkgs/tools/typesetting/tex/texlive/texlinks.diff
+++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/texlinks.diff
diff --git a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/nixpkgs/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
index 8c29c8e76ae..8c29c8e76ae 100644
--- a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
+++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix
index 5ee1adda483..5ee1adda483 100644
--- a/pkgs/tools/typesetting/tikzit/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix
diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix
index eb026e5557e..eb026e5557e 100644
--- a/pkgs/tools/typesetting/xmlroff/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix
index b5b03b470cd..b5b03b470cd 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix
diff --git a/pkgs/tools/video/atomicparsley/default.nix b/nixpkgs/pkgs/tools/video/atomicparsley/default.nix
index a4089636b95..a4089636b95 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/nixpkgs/pkgs/tools/video/atomicparsley/default.nix
diff --git a/pkgs/tools/video/bento4/default.nix b/nixpkgs/pkgs/tools/video/bento4/default.nix
index 4dea8dba6ed..4dea8dba6ed 100644
--- a/pkgs/tools/video/bento4/default.nix
+++ b/nixpkgs/pkgs/tools/video/bento4/default.nix
diff --git a/pkgs/tools/video/bento4/libap4.patch b/nixpkgs/pkgs/tools/video/bento4/libap4.patch
index ca2936003b8..ca2936003b8 100644
--- a/pkgs/tools/video/bento4/libap4.patch
+++ b/nixpkgs/pkgs/tools/video/bento4/libap4.patch
diff --git a/pkgs/tools/video/dvgrab/default.nix b/nixpkgs/pkgs/tools/video/dvgrab/default.nix
index 8fe2a70dcb4..8fe2a70dcb4 100644
--- a/pkgs/tools/video/dvgrab/default.nix
+++ b/nixpkgs/pkgs/tools/video/dvgrab/default.nix
diff --git a/pkgs/tools/video/flvtool2/default.nix b/nixpkgs/pkgs/tools/video/flvtool2/default.nix
index 037e07c7228..037e07c7228 100644
--- a/pkgs/tools/video/flvtool2/default.nix
+++ b/nixpkgs/pkgs/tools/video/flvtool2/default.nix
diff --git a/pkgs/tools/video/gopro/default.nix b/nixpkgs/pkgs/tools/video/gopro/default.nix
index f783b086345..f783b086345 100644
--- a/pkgs/tools/video/gopro/default.nix
+++ b/nixpkgs/pkgs/tools/video/gopro/default.nix
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/nixpkgs/pkgs/tools/video/mjpegtools/default.nix
index 3e72d8b8af5..3e72d8b8af5 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/nixpkgs/pkgs/tools/video/mjpegtools/default.nix
diff --git a/pkgs/tools/video/rav1e/default.nix b/nixpkgs/pkgs/tools/video/rav1e/default.nix
index b57fa540837..b57fa540837 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/nixpkgs/pkgs/tools/video/rav1e/default.nix
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/nixpkgs/pkgs/tools/video/rtmpdump/default.nix
index 06c035552e5..06c035552e5 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/nixpkgs/pkgs/tools/video/rtmpdump/default.nix
diff --git a/pkgs/tools/video/swfmill/default.nix b/nixpkgs/pkgs/tools/video/swfmill/default.nix
index 3832f3c3be0..3832f3c3be0 100644
--- a/pkgs/tools/video/swfmill/default.nix
+++ b/nixpkgs/pkgs/tools/video/swfmill/default.nix
diff --git a/pkgs/tools/video/swftools/default.nix b/nixpkgs/pkgs/tools/video/swftools/default.nix
index d75405ab309..d75405ab309 100644
--- a/pkgs/tools/video/swftools/default.nix
+++ b/nixpkgs/pkgs/tools/video/swftools/default.nix
diff --git a/pkgs/tools/video/swftools/swftools.patch b/nixpkgs/pkgs/tools/video/swftools/swftools.patch
index c7eb89f9b3e..c7eb89f9b3e 100644
--- a/pkgs/tools/video/swftools/swftools.patch
+++ b/nixpkgs/pkgs/tools/video/swftools/swftools.patch
diff --git a/pkgs/tools/video/untrunc/default.nix b/nixpkgs/pkgs/tools/video/untrunc/default.nix
index c7b76e0cb6e..c7b76e0cb6e 100644
--- a/pkgs/tools/video/untrunc/default.nix
+++ b/nixpkgs/pkgs/tools/video/untrunc/default.nix
diff --git a/pkgs/tools/video/vnc2flv/default.nix b/nixpkgs/pkgs/tools/video/vnc2flv/default.nix
index 561c8cf7d78..561c8cf7d78 100644
--- a/pkgs/tools/video/vnc2flv/default.nix
+++ b/nixpkgs/pkgs/tools/video/vnc2flv/default.nix
diff --git a/pkgs/tools/video/vncrec/default.nix b/nixpkgs/pkgs/tools/video/vncrec/default.nix
index 857524661bf..857524661bf 100644
--- a/pkgs/tools/video/vncrec/default.nix
+++ b/nixpkgs/pkgs/tools/video/vncrec/default.nix
diff --git a/pkgs/tools/video/yamdi/default.nix b/nixpkgs/pkgs/tools/video/yamdi/default.nix
index b9b16e4d8ec..b9b16e4d8ec 100644
--- a/pkgs/tools/video/yamdi/default.nix
+++ b/nixpkgs/pkgs/tools/video/yamdi/default.nix
diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
index a27e006053f..a27e006053f 100644
--- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
diff --git a/pkgs/tools/virtualization/awless/default.nix b/nixpkgs/pkgs/tools/virtualization/awless/default.nix
index 57a68b86809..57a68b86809 100644
--- a/pkgs/tools/virtualization/awless/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/awless/default.nix
diff --git a/pkgs/tools/virtualization/aws/default.nix b/nixpkgs/pkgs/tools/virtualization/aws/default.nix
index 618a45075c9..618a45075c9 100644
--- a/pkgs/tools/virtualization/aws/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/aws/default.nix
diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix
index fabdd535774..fabdd535774 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix
diff --git a/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch b/nixpkgs/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch
index 00cb7d070c6..00cb7d070c6 100644
--- a/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch
+++ b/nixpkgs/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix
index 580c2f9a01f..580c2f9a01f 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix
diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix
index 1c7613b4893..1c7613b4893 100644
--- a/pkgs/tools/virtualization/cloudmonkey/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix
diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix
index 910f2822c6f..910f2822c6f 100644
--- a/pkgs/tools/virtualization/cri-tools/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix
index a781f3a4424..a781f3a4424 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix
diff --git a/pkgs/tools/virtualization/distrobuilder/deps.nix b/nixpkgs/pkgs/tools/virtualization/distrobuilder/deps.nix
index 7f79d8931fc..7f79d8931fc 100644
--- a/pkgs/tools/virtualization/distrobuilder/deps.nix
+++ b/nixpkgs/pkgs/tools/virtualization/distrobuilder/deps.nix
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix
index e8172066800..e8172066800 100644
--- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/writable.patch b/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/writable.patch
index 54c2228911e..54c2228911e 100644
--- a/pkgs/tools/virtualization/ec2-ami-tools/writable.patch
+++ b/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/writable.patch
diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix
index 86ad36886c9..86ad36886c9 100644
--- a/pkgs/tools/virtualization/ec2-api-tools/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix
diff --git a/pkgs/tools/virtualization/ec2-utils/default.nix b/nixpkgs/pkgs/tools/virtualization/ec2-utils/default.nix
index 1605bcfa43b..1605bcfa43b 100644
--- a/pkgs/tools/virtualization/ec2-utils/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/ec2-utils/default.nix
diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix
index cb31a66ea72..cb31a66ea72 100644
--- a/pkgs/tools/virtualization/euca2ools/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix
diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
index 0daa01f85bb..0daa01f85bb 100644
--- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix
index 48255ca68a7..48255ca68a7 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix
diff --git a/pkgs/tools/virtualization/govc/default.nix b/nixpkgs/pkgs/tools/virtualization/govc/default.nix
index b53c211d379..b53c211d379 100644
--- a/pkgs/tools/virtualization/govc/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/govc/default.nix
diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix
index d7696be85e4..d7696be85e4 100644
--- a/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix
diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix
index 10103be2630..10103be2630 100644
--- a/pkgs/tools/virtualization/marathonctl/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix
diff --git a/pkgs/tools/virtualization/marathonctl/deps.nix b/nixpkgs/pkgs/tools/virtualization/marathonctl/deps.nix
index 39efaab9535..39efaab9535 100644
--- a/pkgs/tools/virtualization/marathonctl/deps.nix
+++ b/nixpkgs/pkgs/tools/virtualization/marathonctl/deps.nix
diff --git a/pkgs/tools/virtualization/mininet/default.nix b/nixpkgs/pkgs/tools/virtualization/mininet/default.nix
index 0ee27d36e0a..0ee27d36e0a 100644
--- a/pkgs/tools/virtualization/mininet/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/mininet/default.nix
diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix
index 94a19c5375e..94a19c5375e 100644
--- a/pkgs/tools/virtualization/nixos-container/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix
diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh b/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh
index 0fe8ab811a1..0fe8ab811a1 100644
--- a/pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh
+++ b/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh
diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 2a9625501b6..2a9625501b6 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl
diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix
index 79dd4e4551a..79dd4e4551a 100644
--- a/pkgs/tools/virtualization/rootlesskit/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix
diff --git a/pkgs/tools/virtualization/udocker/default.nix b/nixpkgs/pkgs/tools/virtualization/udocker/default.nix
index 5f4d982d86d..5f4d982d86d 100644
--- a/pkgs/tools/virtualization/udocker/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/udocker/default.nix
diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix
index 4a81e8fe48b..4a81e8fe48b 100644
--- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix
diff --git a/pkgs/tools/virtualization/xe-guest-utilities/ip-address.patch b/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/ip-address.patch
index 185f259ef70..185f259ef70 100644
--- a/pkgs/tools/virtualization/xe-guest-utilities/ip-address.patch
+++ b/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/ip-address.patch
diff --git a/pkgs/tools/wayland/ydotool/default.nix b/nixpkgs/pkgs/tools/wayland/ydotool/default.nix
index d8b6ad4ff87..d8b6ad4ff87 100644
--- a/pkgs/tools/wayland/ydotool/default.nix
+++ b/nixpkgs/pkgs/tools/wayland/ydotool/default.nix
diff --git a/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix
index c543af2405c..c543af2405c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/nixpkgs/pkgs/top-level/aliases.nix
diff --git a/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix
index 6bfeaf0acf2..6bfeaf0acf2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/nixpkgs/pkgs/top-level/all-packages.nix
diff --git a/pkgs/top-level/beam-packages.nix b/nixpkgs/pkgs/top-level/beam-packages.nix
index a2405107563..a2405107563 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/nixpkgs/pkgs/top-level/beam-packages.nix
diff --git a/pkgs/top-level/config.nix b/nixpkgs/pkgs/top-level/config.nix
index 7a5b4bdd179..7a5b4bdd179 100644
--- a/pkgs/top-level/config.nix
+++ b/nixpkgs/pkgs/top-level/config.nix
diff --git a/pkgs/top-level/coq-packages.nix b/nixpkgs/pkgs/top-level/coq-packages.nix
index 3fa3d30aa94..3fa3d30aa94 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/nixpkgs/pkgs/top-level/coq-packages.nix
diff --git a/pkgs/top-level/darwin-packages.nix b/nixpkgs/pkgs/top-level/darwin-packages.nix
index 9423aa30725..9423aa30725 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/nixpkgs/pkgs/top-level/darwin-packages.nix
diff --git a/pkgs/top-level/default.nix b/nixpkgs/pkgs/top-level/default.nix
index 904ef8d3979..904ef8d3979 100644
--- a/pkgs/top-level/default.nix
+++ b/nixpkgs/pkgs/top-level/default.nix
diff --git a/pkgs/top-level/dotnet-packages.nix b/nixpkgs/pkgs/top-level/dotnet-packages.nix
index 35cbcebb242..35cbcebb242 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/nixpkgs/pkgs/top-level/dotnet-packages.nix
diff --git a/pkgs/top-level/emacs-packages.nix b/nixpkgs/pkgs/top-level/emacs-packages.nix
index 1853c7eb8ac..1853c7eb8ac 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/nixpkgs/pkgs/top-level/emacs-packages.nix
diff --git a/pkgs/top-level/emscripten-packages.nix b/nixpkgs/pkgs/top-level/emscripten-packages.nix
index ceb2d5e16f7..ceb2d5e16f7 100644
--- a/pkgs/top-level/emscripten-packages.nix
+++ b/nixpkgs/pkgs/top-level/emscripten-packages.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/nixpkgs/pkgs/top-level/haskell-packages.nix
index c4c18b264f1..c4c18b264f1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/nixpkgs/pkgs/top-level/haskell-packages.nix
diff --git a/pkgs/top-level/haxe-packages.nix b/nixpkgs/pkgs/top-level/haxe-packages.nix
index 06b82a478a8..06b82a478a8 100644
--- a/pkgs/top-level/haxe-packages.nix
+++ b/nixpkgs/pkgs/top-level/haxe-packages.nix
diff --git a/pkgs/top-level/impure.nix b/nixpkgs/pkgs/top-level/impure.nix
index 3ba6c08a140..3ba6c08a140 100644
--- a/pkgs/top-level/impure.nix
+++ b/nixpkgs/pkgs/top-level/impure.nix
diff --git a/pkgs/top-level/java-packages.nix b/nixpkgs/pkgs/top-level/java-packages.nix
index 73ed6bf9162..73ed6bf9162 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/nixpkgs/pkgs/top-level/java-packages.nix
diff --git a/pkgs/top-level/lua-packages.nix b/nixpkgs/pkgs/top-level/lua-packages.nix
index 7f29d47a993..7f29d47a993 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/nixpkgs/pkgs/top-level/lua-packages.nix
diff --git a/pkgs/top-level/make-tarball.nix b/nixpkgs/pkgs/top-level/make-tarball.nix
index 288971403f1..288971403f1 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/nixpkgs/pkgs/top-level/make-tarball.nix
diff --git a/pkgs/top-level/metrics.nix b/nixpkgs/pkgs/top-level/metrics.nix
index 244b0ce7a66..244b0ce7a66 100644
--- a/pkgs/top-level/metrics.nix
+++ b/nixpkgs/pkgs/top-level/metrics.nix
diff --git a/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix
index f90068e00eb..f90068e00eb 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix
diff --git a/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix
index 2dc64f63465..2dc64f63465 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/nixpkgs/pkgs/top-level/perl-packages.nix
diff --git a/pkgs/top-level/php-packages.nix b/nixpkgs/pkgs/top-level/php-packages.nix
index 8a610392110..8a610392110 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/nixpkgs/pkgs/top-level/php-packages.nix
diff --git a/pkgs/top-level/pure-packages.nix b/nixpkgs/pkgs/top-level/pure-packages.nix
index a1600888032..a1600888032 100644
--- a/pkgs/top-level/pure-packages.nix
+++ b/nixpkgs/pkgs/top-level/pure-packages.nix
diff --git a/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix
index 955cd768c4e..955cd768c4e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/nixpkgs/pkgs/top-level/python-packages.nix
diff --git a/pkgs/top-level/release-cross.nix b/nixpkgs/pkgs/top-level/release-cross.nix
index 5e392ff1b88..5e392ff1b88 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/nixpkgs/pkgs/top-level/release-cross.nix
diff --git a/pkgs/top-level/release-lib.nix b/nixpkgs/pkgs/top-level/release-lib.nix
index 7e7cac95b9c..7e7cac95b9c 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/nixpkgs/pkgs/top-level/release-lib.nix
diff --git a/pkgs/top-level/release-python.nix b/nixpkgs/pkgs/top-level/release-python.nix
index 8b7240e21a3..8b7240e21a3 100644
--- a/pkgs/top-level/release-python.nix
+++ b/nixpkgs/pkgs/top-level/release-python.nix
diff --git a/pkgs/top-level/release-small.nix b/nixpkgs/pkgs/top-level/release-small.nix
index ab7e4ce00d7..ab7e4ce00d7 100644
--- a/pkgs/top-level/release-small.nix
+++ b/nixpkgs/pkgs/top-level/release-small.nix
diff --git a/pkgs/top-level/release.nix b/nixpkgs/pkgs/top-level/release.nix
index b8ce1fcbce5..b8ce1fcbce5 100644
--- a/pkgs/top-level/release.nix
+++ b/nixpkgs/pkgs/top-level/release.nix
diff --git a/pkgs/top-level/ruby-packages.nix b/nixpkgs/pkgs/top-level/ruby-packages.nix
index c1abb67e256..c1abb67e256 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/nixpkgs/pkgs/top-level/ruby-packages.nix
diff --git a/pkgs/top-level/splice.nix b/nixpkgs/pkgs/top-level/splice.nix
index a093442d369..a093442d369 100644
--- a/pkgs/top-level/splice.nix
+++ b/nixpkgs/pkgs/top-level/splice.nix
diff --git a/pkgs/top-level/stage.nix b/nixpkgs/pkgs/top-level/stage.nix
index 9e07d2bf061..9e07d2bf061 100644
--- a/pkgs/top-level/stage.nix
+++ b/nixpkgs/pkgs/top-level/stage.nix
diff --git a/pkgs/top-level/static.nix b/nixpkgs/pkgs/top-level/static.nix
index 0de1db7d99b..0de1db7d99b 100644
--- a/pkgs/top-level/static.nix
+++ b/nixpkgs/pkgs/top-level/static.nix
diff --git a/pkgs/top-level/unix-tools.nix b/nixpkgs/pkgs/top-level/unix-tools.nix
index 56bab2fe411..56bab2fe411 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/nixpkgs/pkgs/top-level/unix-tools.nix
diff --git a/pkgs/top-level/wine-packages.nix b/nixpkgs/pkgs/top-level/wine-packages.nix
index 88ea6a00f8c..88ea6a00f8c 100644
--- a/pkgs/top-level/wine-packages.nix
+++ b/nixpkgs/pkgs/top-level/wine-packages.nix
diff --git a/overlays/default.nix b/overlays/default.nix
new file mode 100644
index 00000000000..da474e91cdf
--- /dev/null
+++ b/overlays/default.nix
@@ -0,0 +1,18 @@
+/* Overlays in LIBKOOKIE are split into three parts
+ * 
+ * patches: upstream but with cool stuff
+ * staging: things that might become upstream
+ * kookie: scripts and utils that won't leave LIBKOOKIE
+ */
+
+self: super: {
+
+  barrel-blog = self.callPackage ./kookie/barrel-blog { inherit (super); };
+  invoice = self.callPackage ./kookie/invoice { inherit (super); };
+  spacekookie-de = self.callPackage ./kookie/spacekookie-de { inherit (super); };
+
+  nodemcu-uploader = self.callPackage ./staging/nodemcu-uploader { };
+  pleroma = self.callPackage ./staging/pleroma { };
+  
+  htop = self.callPackage ./patches/htop { inherit (super) htop; };
+}
diff --git a/overlays/kookie/barrel-blog/default.nix b/overlays/kookie/barrel-blog/default.nix
new file mode 100644
index 00000000000..15c2e58d5ce
--- /dev/null
+++ b/overlays/kookie/barrel-blog/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+let
+  json = with builtins; fromJSON (readFile ./meta.json);
+  master = json.rev;
+  masterSha256 = json.sha256;
+in
+  stdenv.mkDerivation rec {
+    name = "barrel-blog";
+
+    src = fetchFromGitHub {
+      owner = "spacekookie";
+      repo = "barrel";
+      rev = master;
+      sha256 = masterSha256;
+    }; 
+
+    buildInputs = with pythonPackages; [ pelican webassets markdown ];
+
+    installPhase = ''
+      cd docs/
+      pelican content
+      cp -rv output $out
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A static website running on https://barrel.spacekookie.de";
+      homepage = "https://barrel.spacekookie.de";
+      license = licenses.mit;
+    };
+  }
+
diff --git a/overlays/kookie/barrel-blog/meta.json b/overlays/kookie/barrel-blog/meta.json
new file mode 100644
index 00000000000..3f1a908d973
--- /dev/null
+++ b/overlays/kookie/barrel-blog/meta.json
@@ -0,0 +1,6 @@
+{
+    "owner": "spacekookie",
+    "repo": "barrel",
+    "rev": "ee5a17c97ac5315388f015ce59c98da3b6a895ce",
+    "sha256": "0n566x8y87pc3ynxqj7sv7cwsj4fhpz2pwn2mhhyjyqpyrq0khfc"
+}
\ No newline at end of file
diff --git a/overlays/kookie/invoice/README.md b/overlays/kookie/invoice/README.md
new file mode 100644
index 00000000000..500fb5929fe
--- /dev/null
+++ b/overlays/kookie/invoice/README.md
@@ -0,0 +1,54 @@
+# invoice
+
+A tool that generates invoices with `pandoc`, `xelatex` and `yaml`.
+A descriptor file is required in order to make all of this work.
+These are independent of the tooling and template and should be
+client specific. Following is a small example of what it should
+look like:
+
+```yaml
+---
+invoice-nr: 2019-1234
+date: 2019-06-09
+author: Alice Anonymous
+city: Metropolis
+from:
+- Cyberstreet 69
+- XX51F5 Metropolis
+- alice.anonymous@mail.cyber
+- + 69 (0) 13 37 13 12
+ustid: Your Tax ID here
+bank: Evil Bank (i.e. a bank)
+bank_iban: Your IBAN
+bank_bic: Your Bank BIC
+to:
+- Client Name
+- Client Address
+- ...
+VAT: 19 # Depends on the country you live in
+service:
+- description: Looking cool
+  price: 255
+  details:
+    - Making all your other employees look silly
+    - Telling really bad jokes
+- description: Being awesome
+  price: 615
+  details: Its in the title!
+
+currency: EUR
+lang: english
+
+# Typography and layout
+fontsize: 10pt
+geometry: a4paper, left=43mm, right=43mm, top=51mm, bottom=17mm
+---
+```
+
+Then point the script at this descriptor:
+
+```
+$ invoice clients/client_name.yml
+```
+
+This will then generate `clients/client_name.pdf` as an invoice
diff --git a/overlays/kookie/invoice/default.nix b/overlays/kookie/invoice/default.nix
new file mode 100644
index 00000000000..cdf0f1537ac
--- /dev/null
+++ b/overlays/kookie/invoice/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, makeWrapper, coreutils, findutils,
+  gawk, pandoc, gnumake, texlive }:
+
+stdenv.mkDerivation {
+  pname = "invoice";
+  version = "0.1.0";
+  src = ./.;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/{bin,share}
+    cp invoice.sh $out/bin/invoice
+    cp template.tex $out/share/
+
+    wrapProgram $out/bin/invoice \
+      --set PATH $out/bin:${stdenv.lib.makeBinPath
+        [ coreutils findutils gawk gnumake pandoc texlive.combined.scheme-full ]} \
+      --set TEMPLATE_FILE $out/share/template.tex
+  '';
+
+
+  meta = with stdenv.lib; {
+    description = "Generate dynamic invoices based on yaml descriptors";
+    homepage = "https://git.sr.ht/~spacekookie/libkookie/";
+    license = licenses.gpl3;
+  };
+}
+
diff --git a/overlays/kookie/invoice/invoice.sh b/overlays/kookie/invoice/invoice.sh
new file mode 100755
index 00000000000..ff6a22b1112
--- /dev/null
+++ b/overlays/kookie/invoice/invoice.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -ueo pipefail
+
+SOURCE=$1
+
+if [ -z $SOURCE ]; then
+  echo "Usage: invoice <file>"
+  exit 2
+fi
+
+TARGET=$(dirname $SOURCE)
+ACCOUNT=$(basename $SOURCE .yml)
+
+# The reason behind this awk madness is that we want to be able to write
+# a date as yyyy-mm-dd in the invoice descriptor, but LaTeX needs the
+# date as three elements to fill in a {d}{m}{y} pattern. Thus we replace
+# a simple "date" line with three seperate fields that we can then read
+# from LaTeX
+cat $SOURCE | xargs -d '\n' -L 1 \
+  | awk -F '-' '{ if(match($0, /date/)) { gsub(/date: /,"", $1); \
+    print "date_year: " $1 "\n" "date_month: " $2 "\n" "date_day: " $3 } \
+    else { print $0} }' \
+  | pandoc - -o $TARGET/$ACCOUNT.pdf --template=$TEMPLATE_FILE --pdf-engine=xelatex
diff --git a/overlays/kookie/invoice/template.tex b/overlays/kookie/invoice/template.tex
new file mode 100644
index 00000000000..0e04455c0bc
--- /dev/null
+++ b/overlays/kookie/invoice/template.tex
@@ -0,0 +1,143 @@
+%!TEX TS-program = xelatex
+%!TEX encoding = UTF-8 Unicode
+
+\documentclass[$fontsize$, a4paper]{scrartcl}
+
+% LAYOUT
+%--------------------------------
+\usepackage{geometry} 
+\geometry{$geometry$}
+\pagenumbering{gobble}
+\usepackage[document]{ragged2e}
+\usepackage{scrlayer-scrpage}
+
+% TYPOGRAPHY
+%--------------------------------
+\usepackage{fontspec} 
+\usepackage{xunicode}
+\usepackage{xltxtra}
+
+\setlength{\parskip}{1em}
+
+% Command required by how Pandoc handles the list conversion
+\providecommand{\tightlist} {
+  \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}
+}
+
+% TABLE CUSTOMIZATION
+%--------------------------------
+\usepackage{spreadtab}
+\usepackage[compact]{titlesec}
+\usepackage{hhline}
+\usepackage{enumitem}
+\usepackage{arydshln}
+
+\titlespacing*{\section}{0pt}{3pt}{-7pt}
+\renewcommand{\arraystretch}{1.5}
+\setlist{nolistsep}
+\setlist[itemize]{leftmargin=0.5cm}
+\setlength{\tabcolsep}{9pt}
+
+
+% LANGUAGE
+%--------------------------------
+$if(lang)$
+\usepackage{polyglossia}
+\setmainlanguage{german}
+$endif$
+
+% PDF SETUP
+%--------------------------------
+\usepackage[xetex, bookmarks, colorlinks, breaklinks]{hyperref}
+\hypersetup
+{
+  pdfauthor={$author$},
+  pdfsubject=Rechnungs Nr. $invoice-nr$,
+  pdftitle=Rechnungs Nr. $invoice-nr$,
+  linkcolor=blue,
+  citecolor=blue,
+  filecolor=black,
+  urlcolor=blue
+}
+
+\usepackage[nodayofweek]{datetime}
+\newdate{date}{$date_day$}{$date_month$}{$date_year$}
+\date{\displaydate{date}}
+
+% DOCUMENT
+%--------------------------------
+
+\ohead{
+    \textsc{\textbf{$author$}} \\
+    $for(from)$
+    \textsc{$from$} \\
+    $endfor$
+    \textsc{USt-IdNr: $ustid$} \\
+    \vspace{1em}
+}
+
+\begin{document}
+
+\vspace{1em}
+
+\normalsize \sffamily
+$for(to)$
+$to$\\
+$endfor$
+
+\vspace{6em}
+
+\begin{flushright}
+  \small
+  $city$, \displaydate{date}
+\end{flushright}
+
+\vspace{1em}
+
+\section*{\textsc{Rechnung} \textsc{\#$invoice-nr$}}
+\footnotesize
+\newcounter{pos}
+\setcounter{pos}{0}
+\STautoround*{2} % Get spreadtab to always display the decimal part
+$if(commasep)$\STsetdecimalsep{,}$endif$ % Use comma as decimal separator
+
+\begin{spreadtab}{{tabular}[t t t]{lp{8.2cm}r}}
+  \hdashline[1pt/1pt]
+  @ \noalign{\vskip 2mm} \textbf{Pos.} & @ \textbf{Description} & @ \textbf{Prices in $currency$} \\ \hline
+      $for(service)$ @ \noalign{\vskip 2mm} \refstepcounter{pos} \thepos 
+        & @ $service.description$ 
+        $if(service.details)$\newline \begin{itemize} 
+          $for(service.details)$\scriptsize \item $service.details$ 
+          $endfor$ \end{itemize}
+          $endif$ & $service.price$\\$endfor$ \noalign{\vskip 2mm} \hline
+  $if(VAT)$
+    @ & @ \multicolumn{1}{r}{Subtotal:}                & :={sum(c1:[0,-1])} \\ \hhline{~~-}
+    @ & @ \multicolumn{1}{r}{VAT $VAT$\%:}             & $VAT$/100*[0,-1]   \\ \hhline{~~-}
+  $else$
+    @ & @ \multicolumn{1}{r}{Subtotal:}                & :={sum(c1:[0,-1])} \\ \hhline{~~-}
+    @ & @ \multicolumn{1}{r}{USt. Nullregelung:}       & 0                  \\ \hhline{~~-}
+  $endif$
+  @ & @ \multicolumn{1}{r}{\textbf{Total:}}   & \textbf{:={$if(VAT)$[0,-1]+[0,-2]$else$[0,-2]$endif$}} \\ \hhline{~~-}
+\end{spreadtab}
+
+\vspace{15mm}
+
+\sffamily
+\small
+
+$post_details$
+
+bitte überweisen Sie den folgenden Betrag in den nächsten 14 Tagen:
+
+\strong{Kontoinhaber}: $author$ \\
+\strong{Kreditinstitut}: $bank$ \\
+\strong{IBAN}: $bank_iban$ \\
+\strong{BIC}: $bank_bic$
+
+Mit freundlichen Grüßen,
+
+\medskip
+
+$author$
+
+\end{document}
diff --git a/overlays/kookie/spacekookie-de/default.nix b/overlays/kookie/spacekookie-de/default.nix
new file mode 100644
index 00000000000..38ac94dbf55
--- /dev/null
+++ b/overlays/kookie/spacekookie-de/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchgit, python3Packages }:
+
+stdenv.mkDerivation rec {
+  name = "spacekookie.de";
+
+  src = fetchgit {
+    url = "https://git.sr.ht/~spacekookie/website";
+    rev = "f6ca92954f6b825f933f685cb3c27990b96b1721";
+    sha256 = "0414351da5hy1096lrmmpm2jwdrxb8j5v59ccz6ayzpv1vwxk5qd";
+  }; 
+
+  buildInputs = with python3Packages; [ pelican webassets markdown ];
+
+  installPhase = ''
+      pelican content
+      cp -rv output $out
+    '';
+
+  meta = with stdenv.lib; {
+    description = "The `about` and `blog` part of spacekookie.de";
+    homepage = "https://spacekookie.de";
+    license = licenses.mit;
+  };
+}
+
diff --git a/overlays/patches/htop/0001-htop-untruncated-username.patch b/overlays/patches/htop/0001-htop-untruncated-username.patch
new file mode 100644
index 00000000000..1456cf04362
--- /dev/null
+++ b/overlays/patches/htop/0001-htop-untruncated-username.patch
@@ -0,0 +1,136 @@
+From: Alyssa Ross <hi@alyssa.is>
+Subject: [PATCH v2] Make "spacekookie" fit untruncated as a user name
+Date: Fri, 15 Mar 2019 18:18:22 +0000
+
+---
+This version of the increases the length of the column header as well as
+the values, so columns after USER don't have misaligned headers.
+
+ Process.c                          | 10 +++++-----
+ darwin/Platform.c                  |  2 +-
+ dragonflybsd/DragonFlyBSDProcess.c |  2 +-
+ freebsd/FreeBSDProcess.c           |  2 +-
+ linux/LinuxProcess.c               |  2 +-
+ openbsd/OpenBSDProcess.c           |  2 +-
+ solaris/SolarisProcess.c           |  2 +-
+ unsupported/Platform.c             |  2 +-
+ 8 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/Process.c b/Process.c
+index 54c41af..41d30a3 100644
+--- a/Process.c
++++ b/Process.c
+@@ -480,13 +480,13 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
+       if (Process_getuid != (int) this->st_uid)
+          attr = CRT_colors[PROCESS_SHADOW];
+       if (this->user) {
+-         xSnprintf(buffer, n, "%-9s ", this->user);
++         xSnprintf(buffer, n, "%-11s ", this->user);
+       } else {
+-         xSnprintf(buffer, n, "%-9d ", this->st_uid);
++         xSnprintf(buffer, n, "%-11d ", this->st_uid);
+       }
+-      if (buffer[9] != '\0') {
+-         buffer[9] = ' ';
+-         buffer[10] = '\0';
++      if (buffer[11] != '\0') {
++         buffer[11] = ' ';
++         buffer[12] = '\0';
+       }
+       break;
+    }
+diff --git a/darwin/Platform.c b/darwin/Platform.c
+index 1dce8b6..d603fd2 100644
+--- a/darwin/Platform.c
++++ b/darwin/Platform.c
+@@ -93,7 +93,7 @@ ProcessFieldData Process_fields[] = {
+    [ST_UID] = { .name = "ST_UID", .title = " UID ", .description = "User ID of the process owner", .flags = 0, },
+    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
+    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
+-   [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
++   [USER] = { .name = "USER", .title = "USER        ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
+    [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
+    [TGID] = { .name = "TGID", .title = "   TGID ", .description = "Thread group ID (i.e. process ID)", .flags = 0, },
+diff --git a/dragonflybsd/DragonFlyBSDProcess.c b/dragonflybsd/DragonFlyBSDProcess.c
+index dade106..19d075d 100644
+--- a/dragonflybsd/DragonFlyBSDProcess.c
++++ b/dragonflybsd/DragonFlyBSDProcess.c
+@@ -77,7 +77,7 @@ ProcessFieldData Process_fields[] = {
+    [ST_UID] = { .name = "ST_UID", .title = " UID ", .description = "User ID of the process owner", .flags = 0, },
+    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
+    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
+-   [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
++   [USER] = { .name = "USER", .title = "USER        ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
+    [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
+    [TGID] = { .name = "TGID", .title = "   TGID ", .description = "Thread group ID (i.e. process ID)", .flags = 0, },
+diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c
+index f81fadf..1ed6c2a 100644
+--- a/freebsd/FreeBSDProcess.c
++++ b/freebsd/FreeBSDProcess.c
+@@ -76,7 +76,7 @@ ProcessFieldData Process_fields[] = {
+    [ST_UID] = { .name = "ST_UID", .title = " UID ", .description = "User ID of the process owner", .flags = 0, },
+    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
+    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
+-   [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
++   [USER] = { .name = "USER", .title = "USER        ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
+    [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
+    [TGID] = { .name = "TGID", .title = "   TGID ", .description = "Thread group ID (i.e. process ID)", .flags = 0, },
+diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c
+index 5f69707..1288155 100644
+--- a/linux/LinuxProcess.c
++++ b/linux/LinuxProcess.c
+@@ -206,7 +206,7 @@ ProcessFieldData Process_fields[] = {
+    [ST_UID] = { .name = "ST_UID", .title = " UID ", .description = "User ID of the process owner", .flags = 0, },
+    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
+    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
+-   [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
++   [USER] = { .name = "USER", .title = "USER        ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
+    [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
+    [TGID] = { .name = "TGID", .title = "   TGID ", .description = "Thread group ID (i.e. process ID)", .flags = 0, },
+diff --git a/openbsd/OpenBSDProcess.c b/openbsd/OpenBSDProcess.c
+index 70f9653..ed90cf2 100644
+--- a/openbsd/OpenBSDProcess.c
++++ b/openbsd/OpenBSDProcess.c
+@@ -150,7 +150,7 @@ ProcessFieldData Process_fields[] = {
+       .flags = 0, },
+    [USER] = {
+       .name = "USER",
+-      .title = "USER      ",
++      .title = "USER        ",
+       .description = "Username of the process owner (or user ID if name cannot be determined)",
+       .flags = 0, },
+    [TIME] = {
+diff --git a/solaris/SolarisProcess.c b/solaris/SolarisProcess.c
+index 31f488e..7452e94 100644
+--- a/solaris/SolarisProcess.c
++++ b/solaris/SolarisProcess.c
+@@ -93,7 +93,7 @@ ProcessFieldData Process_fields[] = {
+    [ST_UID] = { .name = "ST_UID", .title = " UID ", .description = "User ID of the process owner", .flags = 0, },
+    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
+    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
+-   [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
++   [USER] = { .name = "USER", .title = "USER        ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
+    [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
+    [TGID] = { .name = "TGID", .title = "   TGID ", .description = "Thread group ID (i.e. process ID)", .flags = 0, },
+diff --git a/unsupported/Platform.c b/unsupported/Platform.c
+index ba84419..cf5b09d 100644
+--- a/unsupported/Platform.c
++++ b/unsupported/Platform.c
+@@ -53,7 +53,7 @@ ProcessFieldData Process_fields[] = {
+    [ST_UID] = { .name = "ST_UID", .title = " UID ", .description = "User ID of the process owner", .flags = 0, },
+    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
+    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
+-   [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
++   [USER] = { .name = "USER", .title = "USER        ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
+    [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
+    [TGID] = { .name = "TGID", .title = "   TGID ", .description = "Thread group ID (i.e. process ID)", .flags = 0, },
+--
+2.19.2
+
+
diff --git a/overlays/patches/htop/default.nix b/overlays/patches/htop/default.nix
new file mode 100644
index 00000000000..11d2e664f5c
--- /dev/null
+++ b/overlays/patches/htop/default.nix
@@ -0,0 +1,19 @@
+/* HTOP CUSTOM COLUMN LENGTHS
+ *
+ * My nick (spacekookie) is too long to be displayed
+ * in an htop column. This custom patches fixes this
+ *
+ * (<3)
+ */
+{ htop, fetchFromGitHub, autoreconfHook }:
+
+htop.overrideAttrs ({ src, patches ? [], nativeBuildInputs ? [], ... }: {
+  src = fetchFromGitHub {
+    repo = "htop";
+    owner = "hishamhm";
+    rev = "402e46bb82964366746b86d77eb5afa69c279539";
+    sha256 = "0akyspxl80h2kgp6nhbhnz9v5265pi6d57i6l90pf50l92z61sw7";
+  };
+  nativeBuildInputs = nativeBuildInputs ++ [ autoreconfHook ];
+  patches = patches ++ [ ./0001-htop-untruncated-username.patch ];
+})
diff --git a/overlays/staging/nodemcu-uploader/default.nix b/overlays/staging/nodemcu-uploader/default.nix
new file mode 100644
index 00000000000..43176a9c890
--- /dev/null
+++ b/overlays/staging/nodemcu-uploader/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, python2, python2Packages, ... }:
+
+python2.pkgs.buildPythonApplication rec {
+  pname = "nodemcu-uploader";
+  version = "0.4.3";
+
+  src = python2.pkgs.fetchPypi {
+    inherit pname version;
+    sha256 = "13nlc2gr85pw7kcfirzi3k8rqybmdwhsxnndixvayis1fm80bsrf";
+  };
+
+  propagatedBuildInputs = with python2.pkgs; [ pyserial wrapt ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Lalalala";
+    homepage = https://www.foo.org;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ spacekookie ];
+  };
+}
diff --git a/overlays/staging/pleroma/default.nix b/overlays/staging/pleroma/default.nix
new file mode 100644
index 00000000000..1e1cc2d58eb
--- /dev/null
+++ b/overlays/staging/pleroma/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, pkgs, fetchFromGitLab, ... }:
+
+stdenv.mkDerivation rec {
+  name = "pleroma-${version}";
+  version = "0.9.0";
+
+  src = fetchFromGitLab rec {
+    domain = "git.pleroma.social";
+    owner = "pleroma";
+    repo = "pleroma";
+    rev = "v${version}";
+    sha256 = "1k33h3j67ywrmkrjr1hvb53j3zsvszb4rfraak1vsh7jn4j6a0wl";
+  };
+
+  installPhase = ''
+    cp -r $src $out
+  '';
+
+  meta = with lib; {
+    description = "A free, federated social networking server built on open protocols";
+    license = licenses.agpl3;
+    maintainers = [ maintainers.spacekookie ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
deleted file mode 100644
index 4ec37dc5b54..00000000000
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-{ stdenv, makeWrapper, fetchurl, dpkg
-, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
-, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3
-, xorg, autoPatchelfHook, systemd, libnotify
-}:
-
-let deps = [
-    alsaLib
-    atk
-    cairo
-    cups
-    dbus
-    expat
-    fontconfig
-    freetype
-    gdk-pixbuf
-    glib
-    gnome2.GConf
-    pango
-    gtk3
-    libnotify
-    xorg.libX11
-    xorg.libXScrnSaver
-    xorg.libXcomposite
-    xorg.libXcursor
-    xorg.libXdamage
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libXrandr
-    xorg.libXrender
-    xorg.libXtst
-    xorg.libxcb
-    nspr
-    nss
-    systemd
-  ];
-
-in
-
-stdenv.mkDerivation rec {
-  pname = "mullvad-vpn";
-  version = "2019.10";
-
-  src = fetchurl {
-    url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
-    sha256 = "0nckbhfpf4r5l5h22jcv93b5i9y2sc8lhcaffsg2ld804h5ygbbq";
-  };
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    dpkg
-  ];
-
-  buildInputs = deps;
-
-  dontBuild = true;
-  dontConfigure = true;
-
-  unpackPhase = "dpkg-deb -x $src .";
-
-  runtimeDependencies = [ systemd.lib libnotify ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/mullvad $out/bin
-
-    mv usr/share/* $out/share
-    mv usr/bin/* $out/bin
-    mv opt/Mullvad\ VPN/* $out/share/mullvad
-
-    sed -i 's|\/opt\/Mullvad.*VPN|'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop
-
-    ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/
-    ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon
-
-    runHook postInstall
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/mullvad/mullvadvpn-app";
-    description = "Client for Mullvad VPN";
-    changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md";
-    license = licenses.gpl3;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers ;[ filalex77 xfix ];
-  };
-
-}
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
deleted file mode 100644
index 8becdcd6a45..00000000000
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg
-, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop
-, withLibevent ? true, luaevent ? null
-, withDBI ? true, luadbi ? null
-# use withExtraLibs to add additional dependencies of community modules
-, withExtraLibs ? [ ]
-, withOnlyInstalledCommunityModules ? [ ]
-, withCommunityModules ? [ ] }:
-
-assert withLibevent -> luaevent != null;
-assert withDBI -> luadbi != null;
-
-with stdenv.lib;
-
-
-stdenv.mkDerivation rec {
-  version = "0.11.3"; # also update communityModules
-  pname = "prosody";
-
-  src = fetchurl {
-    url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
-    sha256 = "11xz4milv2962qf75vrdwsvd8sy2332nf69202rmvz5989pvvnng";
-  };
-
-  # A note to all those merging automated updates: Please also update this
-  # attribute as some modules might not be compatible with a newer prosody
-  # version.
-  communityModules = fetchhg {
-    url = "https://hg.prosody.im/prosody-modules";
-    rev = "b54e98d5c4a1";
-    sha256 = "0bzn92j48krb2zhp9gn5bbn5sg0qv15j5lpxfszwqdln3lpmrvzg";
-  };
-
-  buildInputs = [
-    lua5 makeWrapper libidn openssl
-  ]
-  # Lua libraries
-  ++ [
-    luasocket luasec luaexpat luafilesystem luabitop
-  ]
-  ++ optional withLibevent luaevent
-  ++ optional withDBI luadbi
-  ++ withExtraLibs;
-
-
-  configureFlags = [
-    "--ostype=linux"
-    "--with-lua-include=${lua5}/include"
-    "--with-lua=${lua5}"
-  ];
-
-  postInstall = ''
-      ${concatMapStringsSep "\n" (module: ''
-        cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
-      '') (withCommunityModules ++ withOnlyInstalledCommunityModules)}
-      wrapProgram $out/bin/prosody \
-        --prefix LUA_PATH ';' "$LUA_PATH" \
-        --prefix LUA_CPATH ';' "$LUA_CPATH"
-      wrapProgram $out/bin/prosodyctl \
-        --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \
-        --prefix LUA_PATH ';' "$LUA_PATH" \
-        --prefix LUA_CPATH ';' "$LUA_CPATH"
-    '';
-
-  passthru.communityModules = withCommunityModules;
-
-  meta = {
-    description = "Open-source XMPP application server written in Lua";
-    license = licenses.mit;
-    homepage = https://prosody.im;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ fpletz globin ];
-  };
-}
diff --git a/roots/hyperion.nix b/roots/hyperion.nix
new file mode 100644
index 00000000000..bcb9aae740d
--- /dev/null
+++ b/roots/hyperion.nix
@@ -0,0 +1,91 @@
+/* TOP LEVEL DEVICE CONFIGURATION FOR
+ * 
+ *    hyperion (Hetzner EX41 root server)
+ *
+ * This file only contains settings that are specific to this one
+ * device (hardware and things outside of nix, like partitions).
+ *
+ * This file is part of LIBKOOKIE, a collection of nix expressions.
+ * LIBKOOKIE is licensed under the GPL-3.0 (or later) -- see LICENSE
+ */
+
+{ lib, config, pkgs, ... }:
+
+{
+  imports = [
+    # General machine base setup
+    <home-manager/nixos>
+    ../modules/nix
+    ../modules/base
+
+    # Server base setup
+    ../modules/server
+    ../modules/server/nginx
+
+    # Modules enabled on this server
+    ../modules/server/blog
+    #../modules/server/gitlab-ci
+    ../modules/server/prosody
+    ../modules/server/quassel
+    #../modules/server/syncthing
+    ../modules/server/tor
+
+    # Define allowed ssh users
+    #../modules/users/spacekookie
+    #../modules/users/qyliss
+  ];
+
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  boot.loader.grub.copyKernels = true;
+
+  boot.loader.grub.efiSupport = false;
+  boot.zfs.devNodes = "/dev";
+  boot.loader.grub.zfsSupport = true;
+  boot.loader.grub.device = "/dev/sdb";
+
+  hardware.cpu.intel.updateMicrocode = true;
+
+  networking = {
+    dhcpcd.enable = false;
+    defaultGateway = "95.216.98.1";
+    nameservers = [ "1.1.1.1" ];
+    interfaces.enp0s31f6 = {
+      ipv4.addresses = [ { address = "95.216.98.55"; prefixLength = 26; } ];
+    };
+
+    # NAT settings for wireguard
+    nat.enable = true;
+    nat.externalInterface = "eth0";
+    nat.internalInterfaces = [ "intranet" ];
+  };
+
+  networking.hostName = "hyperion"; # Define your hostname.
+  networking.hostId = "d83bebd1";
+
+  networking.wireguard.interfaces."intranet" = {
+    ips = [ "10.13.12.1" ];
+    listenPort = 51820;
+    privateKeyFile = "/var/lib/wireguard/keys/private";
+
+    peers = [
+      { publicKey = "NHMpnZW6h/MwxWcjztpwH5NN44jS9lB1b5T5jby1i1A=";
+        allowedIPs = [ "10.13.12.2/32" ]; }
+      { publicKey = "U/EmC6uMGqrLOd+lqfquDcUShPHgoulN35Dan6RAqyU=";
+        allowedIPs = [ "10.13.12.3/32" ]; }
+      { publicKey = "yh8gU4otkndmSsVBuaPMxxFHem45FE3POvSAWi8LEik=";
+        allowedIPs = [ "10.13.12.4/32" ]; }
+
+      { publicKey = "cPvj0SPITg1twz3DprtQgehJDOAhOL/hnXlB5ZS6Fi4=";
+        endpoint = "85.119.82.108:51820";
+        allowedIPs = [ "10.172.171.0/24" ]; }
+    ];
+  };
+  
+  # FIXME: Change this, but I wanna know what will break first
+  time.timeZone = "Europe/Berlin";
+
+  # TODO: Should this be in here or `users` root?
+  users.mutableUsers = false;
+  system.stateVersion = "19.03";
+}
diff --git a/roots/tempest.nix b/roots/tempest.nix
new file mode 100644
index 00000000000..5dcfd0699ad
--- /dev/null
+++ b/roots/tempest.nix
@@ -0,0 +1,70 @@
+/* TOP LEVEL DEVICE CONFIGURATION FOR
+ * 
+ *    tempst (AMD workstation)
+ *
+ * This file only contains settings that are specific to this one
+ * device (hardware and things outside of nix, like partitions).
+ *
+ * This file is part of LIBKOOKIE, a collection of nix expressions.
+ * LIBKOOKIE is licensed under the GPL-3.0 (or later) -- see LICENSE
+ */
+
+{ lib, config, pkgs, ... }:
+
+{
+  nixpkgs.config.allowUnfree = true;
+
+  imports = [
+    <home-manager/nixos>
+    ../modules/nix
+    ../modules/base
+  ];
+  
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  hardware.enableRedistributableFirmware = true;
+  
+  boot.loader.grub = {
+    copyKernels = true;
+    device = "/dev/disk/by-id/ata-Samsung_SSD_850_EVO_500GB_S2RBNB0J340787H";
+    zfsSupport = true;
+    enableCryptodisk = true;
+  };
+
+  boot.extraModprobeConfig = "options kvm_item nested=1";
+  boot.cleanTmpDir = true;
+  boot.tmpOnTmpfs = true;
+  boot.supportedFilesystems = [ "zfs" "exfat" ];
+
+  fileSystems."/" = {
+    device = "zroot";
+    fsType = "zfs";
+
+    encrypted = {
+      enable = true;
+      label = "lvm";
+      blkDev = "/dev/disk/by-uuid/7444569c-3f9c-4870-89c2-efa2632f533d";
+    };
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/a5140cc3-08b9-4b5f-9854-aa97c47027b8";
+    fsType = "ext4";
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/3ff907d0-5e9d-419e-bc98-41653b615725"; }
+  ];
+
+  nix.maxJobs = 16;
+  i18n.consoleFont = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
+
+  # The protagonist's ship in Mass Effect: Andromeda
+  networking.hostName = "tempest";
+  networking.hostId = "ef9611bf";
+
+  system.stateVersion = "19.03";
+  users.users.spacekookie.hashedPassword = "$6$rounds=1000000$SJCdQsnp.nL8r$ilM9bdZhxmHPT6mns0Z2sNtIxe4xBDi1.qLybNrDKZeeL8ctNHsF95F4QCvc0kQm4A1EMtwun5YStr4sSz8Yi/";
+}
diff --git a/roots/uwu.nix b/roots/uwu.nix
new file mode 100644
index 00000000000..d41634ca9e3
--- /dev/null
+++ b/roots/uwu.nix
@@ -0,0 +1,83 @@
+/* TOP LEVEL DEVICE CONFIGURATION FOR
+ * 
+ *    uwu (Thinkpad X230)
+ *
+ * This file only contains settings that are specific to this one
+ * device (hardware and things outside of nix, like partitions).
+ *
+ * This file is part of LIBKOOKIE, a collection of nix expressions.
+ * LIBKOOKIE is licensed under the GPL-3.0 (or later) -- see LICENSE
+ */
+
+{ lib, config, pkgs, ... }:
+
+{
+  nixpkgs.config.allowUnfree = true;
+
+  imports = [
+    <home-manager/nixos>
+    ../modules/nix
+    ../modules/base
+    ../modules/workstation
+    ../modules/workstation/hardware/trackpoint
+  ];
+  
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "ehci_pci" "ahci" "sd_mod" "sdhci_pci" ];
+  hardware.enableRedistributableFirmware = true;
+  
+  boot.loader.grub = {
+    copyKernels = true;
+    device = "/dev/sda";
+    zfsSupport = true;
+    enableCryptodisk = true;
+  };
+
+  boot.extraModprobeConfig = "options kvm_item nested=1";
+  boot.zfs.devNodes = "/dev"; # FIXME: Why do I set this?
+  boot.cleanTmpDir = true;
+  boot.tmpOnTmpfs = true;
+  boot.supportedFilesystems = [ "zfs" "exfat" ];
+
+  fileSystems."/" = {
+    device = "zroot";
+    fsType = "zfs";
+
+    encrypted = {
+      enable = true;
+      label = "lvm";
+      blkDev = "/dev/disk/by-uuid/f1440abd-99e3-46a8-aa36-7824972fee54";
+    };
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/672c497c-18aa-4b00-ac95-78e810363d81";
+    fsType = "ext3";
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/bd3d5c22-eed0-4371-ae25-456b8dfe9356"; }
+  ];
+
+  nix.maxJobs = lib.mkDefault 4;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+
+  # owo
+  networking.hostName = "uwu";
+  networking.hostId = "a82ecf29";
+  networking.wireguard.interfaces."intranet" = {
+    ips = [ "10.13.12.3" ];
+    privateKeyFile = "/var/lib/wg/private";
+    peers = [
+      { publicKey = "ugHG/NOqM/9hde9EmWpu7XsCpjT3WQbjLK99IGHtdjQ=";
+        allowedIPs = [ "10.13.12.0/24" "10.172.171.0/24" ];
+        endpoint = "hyperion.kookie.space:51820";
+        persistentKeepalive = 25; }
+    ];
+  };
+
+  system.stateVersion = "19.03";
+  users.users.spacekookie.hashedPassword = "$6$rounds=1000000$22ypycQ2AlCCv8iC$RrzyAbCX3D518nCgfR3MTqZhfK.GAclme7EQlKTlqH4oV1YvGd/aHdTfe59iMpf/J18tqEO2aSXsevTVQz2yW.";
+  
+}